diff --git a/src/win32/AboutDialog.cpp b/src/win32/AboutDialog.cpp index 7848b050..86a39891 100644 --- a/src/win32/AboutDialog.cpp +++ b/src/win32/AboutDialog.cpp @@ -69,7 +69,7 @@ BOOL AboutDialog::OnInitDialog() m_translator.SubclassDlgItem(IDC_TRANSLATOR_URL, this); } - m_link.SetWindowText("http://vbam.bountysource.com"); + m_link.SetWindowText("https://vbam.bountysource.com"); return TRUE; // return TRUE unless you set the focus to a control // EXCEPTION: OCX Property Pages should return FALSE diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc index a9909259..712ff5c5 100644 --- a/src/win32/VBA.rc +++ b/src/win32/VBA.rc @@ -142,7 +142,7 @@ BEGIN ICON 101,IDC_STATIC,6,6,21,20 CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,30,6,120,8 CTEXT "Copyright © 2006 VBA development team",IDC_STATIC,6,36,144,8 - CTEXT "http://vbam.bountysource.com",IDC_URL,7,90,144,8 + CTEXT "https://vbam.bountysource.com",IDC_URL,7,90,144,8 CTEXT "Contributions by Costis",IDC_STATIC,6,48,144,8 CTEXT "Version",IDC_STATIC,30,18,60,8 CTEXT "",IDC_VERSION,90,18,60,8,SS_NOPREFIX @@ -1872,59 +1872,59 @@ END IDR_ACCELERATOR ACCELERATORS BEGIN - "1", ID_OPTIONS_VIDEO_LAYERS_BG0, VIRTKEY, CONTROL, NOINVERT - "1", ID_OPTIONS_JOYPAD_AUTOFIRE_A, VIRTKEY, ALT, NOINVERT - "2", ID_OPTIONS_VIDEO_LAYERS_BG1, VIRTKEY, CONTROL, NOINVERT - "2", ID_OPTIONS_JOYPAD_AUTOFIRE_B, VIRTKEY, ALT, NOINVERT - "3", ID_OPTIONS_VIDEO_LAYERS_BG2, VIRTKEY, CONTROL, NOINVERT - "3", ID_OPTIONS_JOYPAD_AUTOFIRE_L, VIRTKEY, ALT, NOINVERT - "4", ID_OPTIONS_VIDEO_LAYERS_BG3, VIRTKEY, CONTROL, NOINVERT - "4", ID_OPTIONS_JOYPAD_AUTOFIRE_R, VIRTKEY, ALT, NOINVERT - "5", ID_OPTIONS_VIDEO_LAYERS_OBJ, VIRTKEY, CONTROL, NOINVERT - "6", ID_OPTIONS_VIDEO_LAYERS_WIN0, VIRTKEY, CONTROL, NOINVERT - "7", ID_OPTIONS_VIDEO_LAYERS_WIN1, VIRTKEY, CONTROL, NOINVERT - "8", ID_OPTIONS_VIDEO_LAYERS_OBJWIN, VIRTKEY, CONTROL, NOINVERT - "B", ID_TOOLS_REWIND, VIRTKEY, CONTROL, NOINVERT "C", ID_CHEATS_SEARCHFORCHEATS, VIRTKEY, CONTROL, NOINVERT - "L", ID_FILE_LOAD, VIRTKEY, CONTROL, NOINVERT "N", ID_DEBUG_NEXTFRAME, VIRTKEY, CONTROL, NOINVERT + "X", ID_FILE_EXIT, VIRTKEY, CONTROL, NOINVERT + "L", ID_FILE_LOAD, VIRTKEY, CONTROL, NOINVERT + VK_F1, ID_FILE_LOADGAME_SLOT1, VIRTKEY, NOINVERT + VK_F10, ID_FILE_LOADGAME_SLOT10, VIRTKEY, NOINVERT + VK_F2, ID_FILE_LOADGAME_SLOT2, VIRTKEY, NOINVERT + VK_F3, ID_FILE_LOADGAME_SLOT3, VIRTKEY, NOINVERT + VK_F4, ID_FILE_LOADGAME_SLOT4, VIRTKEY, NOINVERT + VK_F5, ID_FILE_LOADGAME_SLOT5, VIRTKEY, NOINVERT + VK_F6, ID_FILE_LOADGAME_SLOT6, VIRTKEY, NOINVERT + VK_F7, ID_FILE_LOADGAME_SLOT7, VIRTKEY, NOINVERT + VK_F8, ID_FILE_LOADGAME_SLOT8, VIRTKEY, NOINVERT + VK_F9, ID_FILE_LOADGAME_SLOT9, VIRTKEY, NOINVERT + VK_F1, ID_FILE_MRU_FILE1, VIRTKEY, CONTROL, NOINVERT + VK_F10, ID_FILE_MRU_FILE10, VIRTKEY, CONTROL, NOINVERT + VK_F2, ID_FILE_MRU_FILE2, VIRTKEY, CONTROL, NOINVERT + VK_F3, ID_FILE_MRU_FILE3, VIRTKEY, CONTROL, NOINVERT + VK_F4, ID_FILE_MRU_FILE4, VIRTKEY, CONTROL, NOINVERT + VK_F5, ID_FILE_MRU_FILE5, VIRTKEY, CONTROL, NOINVERT + VK_F6, ID_FILE_MRU_FILE6, VIRTKEY, CONTROL, NOINVERT + VK_F7, ID_FILE_MRU_FILE7, VIRTKEY, CONTROL, NOINVERT + VK_F8, ID_FILE_MRU_FILE8, VIRTKEY, CONTROL, NOINVERT + VK_F9, ID_FILE_MRU_FILE9, VIRTKEY, CONTROL, NOINVERT "O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT "P", ID_FILE_PAUSE, VIRTKEY, CONTROL, NOINVERT VK_PAUSE, ID_FILE_PAUSE, VIRTKEY, NOINVERT "R", ID_FILE_RESET, VIRTKEY, CONTROL, NOINVERT "S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT - VK_ESCAPE, ID_FILE_TOGGLEMENU, VIRTKEY, NOINVERT - VK_F1, ID_FILE_LOADGAME_SLOT1, VIRTKEY, NOINVERT - VK_F1, ID_FILE_MRU_FILE1, VIRTKEY, CONTROL, NOINVERT VK_F1, ID_FILE_SAVEGAME_SLOT1, VIRTKEY, SHIFT, NOINVERT - VK_F10, ID_FILE_LOADGAME_SLOT10, VIRTKEY, NOINVERT - VK_F10, ID_FILE_MRU_FILE10, VIRTKEY, CONTROL, NOINVERT VK_F10, ID_FILE_SAVEGAME_SLOT10, VIRTKEY, SHIFT, NOINVERT - VK_F2, ID_FILE_LOADGAME_SLOT2, VIRTKEY, NOINVERT - VK_F2, ID_FILE_MRU_FILE2, VIRTKEY, CONTROL, NOINVERT VK_F2, ID_FILE_SAVEGAME_SLOT2, VIRTKEY, SHIFT, NOINVERT - VK_F3, ID_FILE_LOADGAME_SLOT3, VIRTKEY, NOINVERT - VK_F3, ID_FILE_MRU_FILE3, VIRTKEY, CONTROL, NOINVERT VK_F3, ID_FILE_SAVEGAME_SLOT3, VIRTKEY, SHIFT, NOINVERT - VK_F4, ID_FILE_LOADGAME_SLOT4, VIRTKEY, NOINVERT - VK_F4, ID_FILE_MRU_FILE4, VIRTKEY, CONTROL, NOINVERT VK_F4, ID_FILE_SAVEGAME_SLOT4, VIRTKEY, SHIFT, NOINVERT - VK_F5, ID_FILE_LOADGAME_SLOT5, VIRTKEY, NOINVERT - VK_F5, ID_FILE_MRU_FILE5, VIRTKEY, CONTROL, NOINVERT VK_F5, ID_FILE_SAVEGAME_SLOT5, VIRTKEY, SHIFT, NOINVERT - VK_F6, ID_FILE_LOADGAME_SLOT6, VIRTKEY, NOINVERT - VK_F6, ID_FILE_MRU_FILE6, VIRTKEY, CONTROL, NOINVERT VK_F6, ID_FILE_SAVEGAME_SLOT6, VIRTKEY, SHIFT, NOINVERT - VK_F7, ID_FILE_LOADGAME_SLOT7, VIRTKEY, NOINVERT - VK_F7, ID_FILE_MRU_FILE7, VIRTKEY, CONTROL, NOINVERT VK_F7, ID_FILE_SAVEGAME_SLOT7, VIRTKEY, SHIFT, NOINVERT - VK_F8, ID_FILE_LOADGAME_SLOT8, VIRTKEY, NOINVERT - VK_F8, ID_FILE_MRU_FILE8, VIRTKEY, CONTROL, NOINVERT VK_F8, ID_FILE_SAVEGAME_SLOT8, VIRTKEY, SHIFT, NOINVERT - VK_F9, ID_FILE_LOADGAME_SLOT9, VIRTKEY, NOINVERT - VK_F9, ID_FILE_MRU_FILE9, VIRTKEY, CONTROL, NOINVERT VK_F9, ID_FILE_SAVEGAME_SLOT9, VIRTKEY, SHIFT, NOINVERT - "X", ID_FILE_EXIT, VIRTKEY, CONTROL, NOINVERT + VK_ESCAPE, ID_FILE_TOGGLEMENU, VIRTKEY, NOINVERT + "1", ID_OPTIONS_JOYPAD_AUTOFIRE_A, VIRTKEY, ALT, NOINVERT + "2", ID_OPTIONS_JOYPAD_AUTOFIRE_B, VIRTKEY, ALT, NOINVERT + "3", ID_OPTIONS_JOYPAD_AUTOFIRE_L, VIRTKEY, ALT, NOINVERT + "4", ID_OPTIONS_JOYPAD_AUTOFIRE_R, VIRTKEY, ALT, NOINVERT + "1", ID_OPTIONS_VIDEO_LAYERS_BG0, VIRTKEY, CONTROL, NOINVERT + "2", ID_OPTIONS_VIDEO_LAYERS_BG1, VIRTKEY, CONTROL, NOINVERT + "3", ID_OPTIONS_VIDEO_LAYERS_BG2, VIRTKEY, CONTROL, NOINVERT + "4", ID_OPTIONS_VIDEO_LAYERS_BG3, VIRTKEY, CONTROL, NOINVERT + "5", ID_OPTIONS_VIDEO_LAYERS_OBJ, VIRTKEY, CONTROL, NOINVERT + "8", ID_OPTIONS_VIDEO_LAYERS_OBJWIN, VIRTKEY, CONTROL, NOINVERT + "6", ID_OPTIONS_VIDEO_LAYERS_WIN0, VIRTKEY, CONTROL, NOINVERT + "7", ID_OPTIONS_VIDEO_LAYERS_WIN1, VIRTKEY, CONTROL, NOINVERT + "B", ID_TOOLS_REWIND, VIRTKEY, CONTROL, NOINVERT END diff --git a/src/win32/vba.rc2 b/src/win32/vba.rc2 index 02f7ae02..fb1f82a9 100644 --- a/src/win32/vba.rc2 +++ b/src/win32/vba.rc2 @@ -1,56 +1,56 @@ -#ifndef _MAC -#include "../AutoBuild.h" - -#if _MSC_VER >= 1400 -// use modern icon -IDI_ICON ICON DISCARDABLE "vbavista.ico" -#else -// use traditional icon -IDI_ICON ICON DISCARDABLE "gbadvance.ico" -#endif - - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION FILEVER - PRODUCTVERSION PRODUCTVER - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "VisualBoyAdvance comes with NO WARRANTY. Use it at your own risk.\0" - VALUE "CompanyName", "http://vba.ngemu.com/\0" - VALUE "FileDescription", "VisualBoyAdvance emulator\0" - VALUE "FileVersion", STRFILEVER - VALUE "InternalName", "VisualBoyAdvance\0" - VALUE "LegalCopyright", "Copyright © 2006 VBA development team\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "VisualBoyAdvance.exe\0" - VALUE "PrivateBuild", "0\0" - VALUE "ProductName", "VisualBoyAdvance emulator\0" - VALUE "ProductVersion", STRPRODUCTVER - VALUE "SpecialBuild", "0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC +#ifndef _MAC +#include "../AutoBuild.h" + +#if _MSC_VER >= 1400 +// use modern icon +IDI_ICON ICON DISCARDABLE "vbavista.ico" +#else +// use traditional icon +IDI_ICON ICON DISCARDABLE "gbadvance.ico" +#endif + + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION FILEVER + PRODUCTVERSION PRODUCTVER + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x29L +#else + FILEFLAGS 0x28L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "VisualBoyAdvance comes with NO WARRANTY. Use it at your own risk.\0" + VALUE "CompanyName", "https://vbam.bountysource.com/\0" + VALUE "FileDescription", "VBA-M : VisualBoyAdvance emulator\0" + VALUE "FileVersion", STRFILEVER + VALUE "InternalName", "VisualBoyAdvance\0" + VALUE "LegalCopyright", "Copyright © 2006 VBA development team\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "VisualBoyAdvance.exe\0" + VALUE "PrivateBuild", "0\0" + VALUE "ProductName", "VBA-M - Modified VisualBoyAdvance\0" + VALUE "ProductVersion", STRPRODUCTVER + VALUE "SpecialBuild", "0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC