Remove accelerators customization feature, closes #221

Add english accelerators Add russian accelerators Add ukrainian accelerators Delete settings hotkeys dialog Remove unused resource strings
evpobr · Jan 12, 2018 · b2e6672 · b2e6672
1 parent bf958c2
commit b2e6672
Show file tree

Hide file tree

Showing 19 changed files with 289 additions and 2,360 deletions.
diff --git a/FBE/FBE.cpp b/FBE/FBE.cpp
@@ -115,9 +115,6 @@ int Run(LPTSTR /*lpstrCmdLine*/ = NULL, int nCmdShow = SW_SHOWDEFAULT)
 
 	SetThreadUILanguage(MAKELANGID(_Settings.GetInterfaceLanguageID(), SUBLANG_DEFAULT));
 
-	U::InitKeycodes();
-	U::InitSettingsHotkeyGroups();
-
 	if (wndMain.CreateEx() == NULL)
 	{
 		ATLTRACE(L"Main window creation failed!\n");

diff --git a/FBE/FBE.rc b/FBE/FBE.rc
diff --git a/FBE/FBE.vcxproj b/FBE/FBE.vcxproj
@@ -370,7 +370,6 @@ link.exe /OUT:"$(SolutionDir)x64\$(Configuration)\en-US\FBE.exe.mui" /DLL /NOENT
     <ClCompile Include="script.cpp" />
     <ClCompile Include="Settings.cpp" />
     <ClCompile Include="SettingsDlg.cpp" />
-    <ClCompile Include="SettingsHotkeysPage.cpp" />
     <ClCompile Include="SettingsOtherPage.cpp" />
     <ClCompile Include="SettingsWordsPage.cpp" />
     <ClCompile Include="Speller.cpp" />
@@ -457,7 +456,6 @@ link.exe /OUT:"$(SolutionDir)x64\$(Configuration)\en-US\FBE.exe.mui" /DLL /NOENT
     <ClInclude Include="XMLSerializer\Serializable.h" />
     <ClInclude Include="Settings.h" />
     <ClInclude Include="SettingsDlg.h" />
-    <ClInclude Include="SettingsHotkeysPage.h" />
     <ClInclude Include="SettingsOtherPage.h" />
     <ClInclude Include="SettingsWordsPage.h" />
     <ClInclude Include="Speller.h" />

diff --git a/FBE/FBE.vcxproj.filters b/FBE/FBE.vcxproj.filters
@@ -103,9 +103,6 @@
     <ClCompile Include="SettingsWordsPage.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SettingsHotkeysPage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="TableDialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -230,9 +227,6 @@
     <ClInclude Include="SettingsWordsPage.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SettingsHotkeysPage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="TableDialog.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/FBE/Localization/FBE.ru-RU/FBE.rc b/FBE/Localization/FBE.ru-RU/FBE.rc
diff --git a/FBE/Localization/FBE.ru-RU/resource.h b/FBE/Localization/FBE.ru-RU/resource.h
@@ -193,7 +193,6 @@
 #define IDS_SETTINGS_WORDS_ADD_ERR_CAP  248
 #define IDS_HOTKEY_SYMBOL_SUPERSCRIPT_THREE 249
 #define IDS_SETTINGS_WORDS_ADD_ERR_SYM  249
-#define IDD_SETTINGS_HOTKEYS            250
 #define IDS_HOTKEY_SYMBOL_MULTIPLICATION_SIGN 250
 #define IDS_WORDS_WLIST_WORD            250
 #define IDS_HOTKEY_SYMBOL_DIVISION_SIGN 251
@@ -365,34 +364,22 @@
 #define IDC_STATIC_AB_LINKS             1066
 #define IDC_CHANGE_KEYB                 1067
 #define IDC_LIST1                       1068
-#define IDC_LIST_HOTKEYS_GROUPS         1068
 #define IDC_SPELL_SUGG_LIST             1068
 #define IDC_LIST2                       1069
-#define IDC_LIST_HOTKEYS                1069
 #define IDC_EDIT1                       1070
-#define IDC_EDIT_HOTKEY                 1070
 #define IDC_EDIT_NEW                    1070
 #define IDC_SPELL_BEDWORD               1070
 #define IDC_SPELL_CUSTOMDICT            1070
 #define IDC_CUSTOM_DICT                 1070
 #define IDC_CONTRIBS                    1070
 #define IDC_JPEGQUALITY                 1070
 #define IDC_BUTTON1                     1071
-#define IDC_BUTTON_DEFAULT              1071
 #define IDC_BUTTON_ADD                  1071
 #define IDC_WORDS_FR_EDIT_REPL          1071
 #define IDC_NEW_WORD                    1071
 #define IDC_SPELL_REPLACEMENT           1071
-#define IDC_STATIC_HOTKEY_DESCRIPTION   1072
 #define IDC_EDIT_LV                     1072
 #define IDC_BUTTON_DESEL                1072
-#define IDC_EDIT_HOTKEY_DESCRIPTION     1073
-#define IDC_STATIC_HOTKEYS_GROUPS       1074
-#define IDC_STATIC_HOTKEYS              1075
-#define IDC_BUTTON_HOTKEY_DELETE        1076
-#define IDC_BUTTON_HOTKEY_ASSIGN        1077
-#define IDC_EDIT_HOTKEY_COLLISION       1078
-#define IDC_STATIC_HOTKEY_COLLISION     1079
 #define IDC_STATIC_HOTKEY_ACTIONS       1080
 #define IDC_COMBOBOXEX1                 1081
 #define IDC_LIST_WORDS                  1084