ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added a few missing menu items to the French & Danish menus. 

Added a new option to resize the window to its default size.
Better menu item names for the French menu.
This commit is contained in:
luigi__ 2008-12-28 00:06:21 +00:00
parent 58d2d84b0a
commit 5babff7a65
2 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
desmume/src/windows/main.cpp
View File

@ -2461,40 +2461,40 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
ScaleScreen(hwnd, windowSize); ScaleScreen(hwnd, windowSize);
WritePrivateProfileInt("Video","Window Size",windowSize,IniName); WritePrivateProfileInt("Video","Window Size",windowSize,IniName);
MainWindow->checkMenu(IDC_WINDOW1X, MF_BYCOMMAND | ((windowSize==1)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW1X, MF_BYCOMMAND | MF_CHECKED);
MainWindow->checkMenu(IDC_WINDOW2X, MF_BYCOMMAND | ((windowSize==2)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW2X, MF_BYCOMMAND | MF_UNCHECKED);
MainWindow->checkMenu(IDC_WINDOW3X, MF_BYCOMMAND | ((windowSize==3)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW3X, MF_BYCOMMAND | MF_UNCHECKED);
MainWindow->checkMenu(IDC_WINDOW4X, MF_BYCOMMAND | ((windowSize==4)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW4X, MF_BYCOMMAND | MF_UNCHECKED);
break; break;
case IDC_WINDOW2X: case IDC_WINDOW2X:
windowSize=2; windowSize=2;
ScaleScreen(hwnd, windowSize); ScaleScreen(hwnd, windowSize);
WritePrivateProfileInt("Video","Window Size",windowSize,IniName); WritePrivateProfileInt("Video","Window Size",windowSize,IniName);
MainWindow->checkMenu(IDC_WINDOW1X, MF_BYCOMMAND | ((windowSize==1)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW1X, MF_BYCOMMAND | MF_UNCHECKED);
MainWindow->checkMenu(IDC_WINDOW2X, MF_BYCOMMAND | ((windowSize==2)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW2X, MF_BYCOMMAND | MF_CHECKED);
MainWindow->checkMenu(IDC_WINDOW3X, MF_BYCOMMAND | ((windowSize==3)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW3X, MF_BYCOMMAND | MF_UNCHECKED);
MainWindow->checkMenu(IDC_WINDOW4X, MF_BYCOMMAND | ((windowSize==4)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW4X, MF_BYCOMMAND | MF_UNCHECKED);
break; break;
case IDC_WINDOW3X: case IDC_WINDOW3X:
windowSize=3; windowSize=3;
ScaleScreen(hwnd, windowSize); ScaleScreen(hwnd, windowSize);
WritePrivateProfileInt("Video","Window Size",windowSize,IniName); WritePrivateProfileInt("Video","Window Size",windowSize,IniName);
MainWindow->checkMenu(IDC_WINDOW1X, MF_BYCOMMAND | ((windowSize==1)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW1X, MF_BYCOMMAND | MF_UNCHECKED);
MainWindow->checkMenu(IDC_WINDOW2X, MF_BYCOMMAND | ((windowSize==2)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW2X, MF_BYCOMMAND | MF_UNCHECKED);
MainWindow->checkMenu(IDC_WINDOW3X, MF_BYCOMMAND | ((windowSize==3)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW3X, MF_BYCOMMAND | MF_CHECKED);
MainWindow->checkMenu(IDC_WINDOW4X, MF_BYCOMMAND | ((windowSize==4)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW4X, MF_BYCOMMAND | MF_UNCHECKED);
break; break;
case IDC_WINDOW4X: case IDC_WINDOW4X:
windowSize=4; windowSize=4;
ScaleScreen(hwnd, windowSize); ScaleScreen(hwnd, windowSize);
WritePrivateProfileInt("Video","Window Size",windowSize,IniName); WritePrivateProfileInt("Video","Window Size",windowSize,IniName);
MainWindow->checkMenu(IDC_WINDOW1X, MF_BYCOMMAND | ((windowSize==1)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW1X, MF_BYCOMMAND | MF_UNCHECKED);
MainWindow->checkMenu(IDC_WINDOW2X, MF_BYCOMMAND | ((windowSize==2)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW2X, MF_BYCOMMAND | MF_UNCHECKED);
MainWindow->checkMenu(IDC_WINDOW3X, MF_BYCOMMAND | ((windowSize==3)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW3X, MF_BYCOMMAND | MF_UNCHECKED);
MainWindow->checkMenu(IDC_WINDOW4X, MF_BYCOMMAND | ((windowSize==4)?MF_CHECKED:MF_UNCHECKED)); MainWindow->checkMenu(IDC_WINDOW4X, MF_BYCOMMAND | MF_CHECKED);
break; break;
case IDC_FORCERATIO: case IDC_FORCERATIO:
@ -2515,6 +2515,12 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
WritePrivateProfileInt("Video","Window Force Ratio",1,IniName); WritePrivateProfileInt("Video","Window Force Ratio",1,IniName);
} }
break; break;
case IDM_DEFSIZE:
{
ScaleScreen(hwnd, 1.0f);
}
break;
} }

43
desmume/src/windows/resources.rc
View File

@ -124,6 +124,9 @@ BEGIN
MENUITEM "Gem Skærmbillede &Som...", IDM_PRINTSCREEN MENUITEM "Gem Skærmbillede &Som...", IDM_PRINTSCREEN
MENUITEM "&Hurtigt Skærmbillede", IDM_QUICK_PRINTSCREEN MENUITEM "&Hurtigt Skærmbillede", IDM_QUICK_PRINTSCREEN
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Record AVI", IDM_FILE_RECORDAVI
MENUITEM "Stop AVI", IDM_FILE_STOPAVI
MENUITEM SEPARATOR
MENUITEM "&Afslut\tAlt F4", IDM_QUIT MENUITEM "&Afslut\tAlt F4", IDM_QUIT
END END
POPUP "&Emulation" POPUP "&Emulation"
@ -148,6 +151,7 @@ BEGIN
MENUITEM "4x", IDC_WINDOW4X MENUITEM "4x", IDC_WINDOW4X
END END
MENUITEM "&Bevar Højde og Bredde", IDC_FORCERATIO MENUITEM "&Bevar Højde og Bredde", IDC_FORCERATIO
MENUITEM "Default size", IDM_DEFSIZE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Display Frame Counter", ID_VIEW_FRAMECOUNTER MENUITEM "Display Frame Counter", ID_VIEW_FRAMECOUNTER
MENUITEM "Display Fps", ID_VIEW_DISPLAYFPS MENUITEM "Display Fps", ID_VIEW_DISPLAYFPS
@ -196,6 +200,8 @@ BEGIN
MENUITEM "Vis &Tiles", IDM_TILE MENUITEM "Vis &Tiles", IDM_TILE
MENUITEM "Vis M&aps", IDM_MAP MENUITEM "Vis M&aps", IDM_MAP
MENUITEM "Vis &OAM", IDM_OAM MENUITEM "Vis &OAM", IDM_OAM
MENUITEM "Vis Matrices", IDM_MATRIX_VIEWER
MENUITEM "Vis Lights", IDM_LIGHT_VIEWER
MENUITEM SEPARATOR MENUITEM SEPARATOR
POPUP "&Vis &Lag" POPUP "&Vis &Lag"
BEGIN BEGIN
@ -872,6 +878,7 @@ BEGIN
MENUITEM "4x", IDC_WINDOW4X MENUITEM "4x", IDC_WINDOW4X
END END
MENUITEM "&Force Maintain Ratio", IDC_FORCERATIO MENUITEM "&Force Maintain Ratio", IDC_FORCERATIO
MENUITEM "Default size", IDM_DEFSIZE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Display Frame Counter", ID_VIEW_FRAMECOUNTER MENUITEM "Display Frame Counter", ID_VIEW_FRAMECOUNTER
MENUITEM "Display FPS", ID_VIEW_DISPLAYFPS MENUITEM "Display FPS", ID_VIEW_DISPLAYFPS
@ -1821,8 +1828,11 @@ BEGIN
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Import Backup Memory", IDM_IMPORTBACKUPMEMORY MENUITEM "Import Backup Memory", IDM_IMPORTBACKUPMEMORY
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Save Screenshot &As...", IDM_PRINTSCREEN MENUITEM "Capture d'écr&an...", IDM_PRINTSCREEN
MENUITEM "&Quick Screenshot", IDM_QUICK_PRINTSCREEN MENUITEM "Capture d'écran rapide", IDM_QUICK_PRINTSCREEN
MENUITEM SEPARATOR
MENUITEM "Enregistrer une vidéo", IDM_FILE_RECORDAVI
MENUITEM "Arrêter l'enregistrement", IDM_FILE_STOPAVI
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Quitter\tAlt F4", IDM_QUIT MENUITEM "&Quitter\tAlt F4", IDM_QUIT
END END
@ -1840,21 +1850,22 @@ BEGIN
MENUITEM "180", IDC_ROTATE180 MENUITEM "180", IDC_ROTATE180
MENUITEM "270", IDC_ROTATE270 MENUITEM "270", IDC_ROTATE270
END END
POPUP "Window &Size" POPUP "Taille de la fenêtre"
BEGIN BEGIN
MENUITEM "1x", IDC_WINDOW1X MENUITEM "1x", IDC_WINDOW1X
MENUITEM "2x", IDC_WINDOW2X MENUITEM "2x", IDC_WINDOW2X
MENUITEM "3x", IDC_WINDOW3X MENUITEM "3x", IDC_WINDOW3X
MENUITEM "4x", IDC_WINDOW4X MENUITEM "4x", IDC_WINDOW4X
END END
MENUITEM "&Force Maintain Ratio", IDC_FORCERATIO MENUITEM "Conserver le ratio", IDC_FORCERATIO
MENUITEM "Taille par défaut", IDM_DEFSIZE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Display Frame Counter", ID_VIEW_FRAMECOUNTER MENUITEM "Compteur d'images", ID_VIEW_FRAMECOUNTER
MENUITEM "Display Fps", ID_VIEW_DISPLAYFPS MENUITEM "Framerate", ID_VIEW_DISPLAYFPS
END END
POPUP "&Config" POPUP "&Config"
BEGIN BEGIN
POPUP "&Save Type" POPUP "Média de &sauvegarde"
BEGIN BEGIN
MENUITEM "Autodetect", IDC_SAVETYPE1 MENUITEM "Autodetect", IDC_SAVETYPE1
MENUITEM "EEPROM 4kbit", IDC_SAVETYPE2 MENUITEM "EEPROM 4kbit", IDC_SAVETYPE2
@ -1863,9 +1874,9 @@ BEGIN
MENUITEM "FRAM 256kbit", IDC_SAVETYPE5 MENUITEM "FRAM 256kbit", IDC_SAVETYPE5
MENUITEM "FLASH 2mbit", IDC_SAVETYPE6 MENUITEM "FLASH 2mbit", IDC_SAVETYPE6
END END
MENUITEM "Control Config", IDM_CONFIG MENUITEM "Config. des contrôles", IDM_CONFIG
MENUITEM "Sound Settings", IDM_SOUNDSETTINGS MENUITEM "Config. du son", IDM_SOUNDSETTINGS
MENUITEM "Firmware Settings", IDM_FIRMSETTINGS MENUITEM "Config. du firmware", IDM_FIRMSETTINGS
POPUP "&Frame Skip" POPUP "&Frame Skip"
BEGIN BEGIN
MENUITEM "Auto", IDC_FRAMESKIPAUTO MENUITEM "Auto", IDC_FRAMESKIPAUTO
@ -1880,7 +1891,7 @@ BEGIN
MENUITEM "8", IDC_FRAMESKIP8 MENUITEM "8", IDC_FRAMESKIP8
MENUITEM "9", IDC_FRAMESKIP9 MENUITEM "9", IDC_FRAMESKIP9
END END
POPUP "&Language" POPUP "&Langage"
BEGIN BEGIN
MENUITEM "English", IDC_LANGENGLISH MENUITEM "English", IDC_LANGENGLISH
MENUITEM "French", IDC_LANGFRENCH MENUITEM "French", IDC_LANGFRENCH
@ -1889,13 +1900,15 @@ BEGIN
END END
POPUP "&Outils" POPUP "&Outils"
BEGIN BEGIN
MENUITEM "&Desassembleur", IDM_DISASSEMBLER MENUITEM "&Désassembleur", IDM_DISASSEMBLER
MENUITEM "Visualiser la &memoire", IDM_MEMORY MENUITEM "Visualiser la &memoire", IDM_MEMORY
MENUITEM "Visualiser les &registres", IDM_IOREG MENUITEM "Visualiser les &registres", IDM_IOREG
MENUITEM "Visualiser les &palettes", IDM_PAL MENUITEM "Visualiser les &palettes", IDM_PAL
MENUITEM "Visualiser les &tiles", IDM_TILE MENUITEM "Visualiser les &tiles", IDM_TILE
MENUITEM "Visualiser les m&aps", IDM_MAP MENUITEM "Visualiser les m&aps", IDM_MAP
MENUITEM "Visualiser les &oams", IDM_OAM MENUITEM "Visualiser les &oams", IDM_OAM
MENUITEM "Visualiser les matrices", IDM_MATRIX_VIEWER
MENUITEM "Visualiser les lights", IDM_LIGHT_VIEWER
MENUITEM SEPARATOR MENUITEM SEPARATOR
POPUP "&Visualiser les &couches" POPUP "&Visualiser les &couches"
BEGIN BEGIN
@ -1910,11 +1923,11 @@ BEGIN
MENUITEM "Sub BG 3", IDM_SBG3, CHECKED MENUITEM "Sub BG 3", IDM_SBG3, CHECKED
END END
END END
POPUP "&Help" POPUP "?"
BEGIN BEGIN
MENUITEM "&Website", IDM_WEBSITE MENUITEM "Site &web", IDM_WEBSITE
MENUITEM "&Forums", IDM_FORUM MENUITEM "&Forums", IDM_FORUM
MENUITEM "&Submit a bug report", IDM_SUBMITBUGREPORT MENUITEM "&Soumettre un report de bug", IDM_SUBMITBUGREPORT
END END
END END