1 files changed, 42 insertions, 44 deletions

diff --git a/CPP/7zip/UI/FileManager/SettingsPage.cpp b/CPP/7zip/UI/FileManager/SettingsPage.cpp
index 866b0b2d..7a51e1b7 100755..100644
--- a/CPP/7zip/UI/FileManager/SettingsPage.cpp
+++ b/CPP/7zip/UI/FileManager/SettingsPage.cpp
@@ -2,10 +2,10 @@
 
 #include "StdAfx.h"
 
-#include "Common/StringConvert.h"
+#include "../../../Common/StringConvert.h"
 
 #ifndef UNDER_CE
-#include "Windows/MemoryLock.h"
+#include "../../../Windows/MemoryLock.h"
 #endif
 
 #include "HelpUtils.h"
@@ -17,17 +17,16 @@
 
 using namespace NWindows;
 
-static CIDLangPair kIDLangPairs[] =
+static const UInt32 kLangIDs[] =
 {
-  { IDC_SETTINGS_SHOW_DOTS, 0x03010401},
-  { IDC_SETTINGS_SHOW_REAL_FILE_ICONS, 0x03010402},
-  { IDC_SETTINGS_SHOW_SYSTEM_MENU, 0x03010410},
-  { IDC_SETTINGS_FULL_ROW, 0x03010420},
-  { IDC_SETTINGS_SHOW_GRID, 0x03010421},
-  { IDC_SETTINGS_SINGLE_CLICK, 0x03010422},
-  // { IDC_SETTINGS_UNDERLINE, 0x03010423}
-  { IDC_SETTINGS_ALTERNATIVE_SELECTION, 0x03010430},
-  { IDC_SETTINGS_LARGE_PAGES, 0x03010440}
+  IDX_SETTINGS_SHOW_DOTS,
+  IDX_SETTINGS_SHOW_REAL_FILE_ICONS,
+  IDX_SETTINGS_SHOW_SYSTEM_MENU,
+  IDX_SETTINGS_FULL_ROW,
+  IDX_SETTINGS_SHOW_GRID,
+  IDX_SETTINGS_SINGLE_CLICK,
+  IDX_SETTINGS_ALTERNATIVE_SELECTION,
+  IDX_SETTINGS_LARGE_PAGES
 };
 
 static LPCWSTR kEditTopic = L"FM/options.htm#settings";
@@ -36,21 +35,20 @@ extern bool IsLargePageSupported();
 
 bool CSettingsPage::OnInit()
 {
-  LangSetDlgItemsText(HWND(*this), kIDLangPairs, sizeof(kIDLangPairs) / sizeof(kIDLangPairs[0]));
-
-  CheckButton(IDC_SETTINGS_SHOW_DOTS, ReadShowDots());
-  CheckButton(IDC_SETTINGS_SHOW_SYSTEM_MENU, ReadShowSystemMenu());
-  CheckButton(IDC_SETTINGS_SHOW_REAL_FILE_ICONS, ReadShowRealFileIcons());
-
-  CheckButton(IDC_SETTINGS_FULL_ROW, ReadFullRow());
-  CheckButton(IDC_SETTINGS_SHOW_GRID, ReadShowGrid());
-  CheckButton(IDC_SETTINGS_ALTERNATIVE_SELECTION, ReadAlternativeSelection());
+  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
+
+  CheckButton(IDX_SETTINGS_SHOW_DOTS, ReadShowDots());
+  CheckButton(IDX_SETTINGS_SHOW_SYSTEM_MENU, Read_ShowSystemMenu());
+  CheckButton(IDX_SETTINGS_SHOW_REAL_FILE_ICONS, ReadShowRealFileIcons());
+  CheckButton(IDX_SETTINGS_FULL_ROW, ReadFullRow());
+  CheckButton(IDX_SETTINGS_SHOW_GRID, ReadShowGrid());
+  CheckButton(IDX_SETTINGS_ALTERNATIVE_SELECTION, ReadAlternativeSelection());
   if (IsLargePageSupported())
-    CheckButton(IDC_SETTINGS_LARGE_PAGES, ReadLockMemoryEnable());
+    CheckButton(IDX_SETTINGS_LARGE_PAGES, ReadLockMemoryEnable());
   else
-    EnableItem(IDC_SETTINGS_LARGE_PAGES, false);
-  CheckButton(IDC_SETTINGS_SINGLE_CLICK, ReadSingleClick());
-  // CheckButton(IDC_SETTINGS_UNDERLINE, ReadUnderline());
+    EnableItem(IDX_SETTINGS_LARGE_PAGES, false);
+  CheckButton(IDX_SETTINGS_SINGLE_CLICK, ReadSingleClick());
+  // CheckButton(IDX_SETTINGS_UNDERLINE, ReadUnderline());
 
   // EnableSubItems();
 
@@ -60,30 +58,30 @@ bool CSettingsPage::OnInit()
 /*
 void CSettingsPage::EnableSubItems()
 {
-  EnableItem(IDC_SETTINGS_UNDERLINE, IsButtonCheckedBool(IDC_SETTINGS_SINGLE_CLICK));
+  EnableItem(IDX_SETTINGS_UNDERLINE, IsButtonCheckedBool(IDX_SETTINGS_SINGLE_CLICK));
 }
 */
 
 LONG CSettingsPage::OnApply()
 {
-  SaveShowDots(IsButtonCheckedBool(IDC_SETTINGS_SHOW_DOTS));
-  SaveShowSystemMenu(IsButtonCheckedBool(IDC_SETTINGS_SHOW_SYSTEM_MENU));
-  SaveShowRealFileIcons(IsButtonCheckedBool(IDC_SETTINGS_SHOW_REAL_FILE_ICONS));
+  SaveShowDots(IsButtonCheckedBool(IDX_SETTINGS_SHOW_DOTS));
+  Save_ShowSystemMenu(IsButtonCheckedBool(IDX_SETTINGS_SHOW_SYSTEM_MENU));
+  SaveShowRealFileIcons(IsButtonCheckedBool(IDX_SETTINGS_SHOW_REAL_FILE_ICONS));
 
-  SaveFullRow(IsButtonCheckedBool(IDC_SETTINGS_FULL_ROW));
-  SaveShowGrid(IsButtonCheckedBool(IDC_SETTINGS_SHOW_GRID));
-  SaveAlternativeSelection(IsButtonCheckedBool(IDC_SETTINGS_ALTERNATIVE_SELECTION));
+  SaveFullRow(IsButtonCheckedBool(IDX_SETTINGS_FULL_ROW));
+  SaveShowGrid(IsButtonCheckedBool(IDX_SETTINGS_SHOW_GRID));
+  SaveAlternativeSelection(IsButtonCheckedBool(IDX_SETTINGS_ALTERNATIVE_SELECTION));
   #ifndef UNDER_CE
   if (IsLargePageSupported())
   {
-    bool enable = IsButtonCheckedBool(IDC_SETTINGS_LARGE_PAGES);
-    NSecurity::EnableLockMemoryPrivilege(enable);
+    bool enable = IsButtonCheckedBool(IDX_SETTINGS_LARGE_PAGES);
+    NSecurity::EnablePrivilege_LockMemory(enable);
     SaveLockMemoryEnable(enable);
   }
   #endif
   
-  SaveSingleClick(IsButtonCheckedBool(IDC_SETTINGS_SINGLE_CLICK));
-  // SaveUnderline(IsButtonCheckedBool(IDC_SETTINGS_UNDERLINE));
+  SaveSingleClick(IsButtonCheckedBool(IDX_SETTINGS_SINGLE_CLICK));
+  // SaveUnderline(IsButtonCheckedBool(IDX_SETTINGS_UNDERLINE));
 
   return PSNRET_NOERROR;
 }
@@ -97,18 +95,18 @@ bool CSettingsPage::OnButtonClicked(int buttonID, HWND buttonHWND)
 {
   switch(buttonID)
   {
-    case IDC_SETTINGS_SINGLE_CLICK:
+    case IDX_SETTINGS_SINGLE_CLICK:
     /*
       EnableSubItems();
       break;
     */
-    case IDC_SETTINGS_SHOW_DOTS:
-    case IDC_SETTINGS_SHOW_SYSTEM_MENU:
-    case IDC_SETTINGS_SHOW_REAL_FILE_ICONS:
-    case IDC_SETTINGS_FULL_ROW:
-    case IDC_SETTINGS_SHOW_GRID:
-    case IDC_SETTINGS_ALTERNATIVE_SELECTION:
-    case IDC_SETTINGS_LARGE_PAGES:
+    case IDX_SETTINGS_SHOW_DOTS:
+    case IDX_SETTINGS_SHOW_SYSTEM_MENU:
+    case IDX_SETTINGS_SHOW_REAL_FILE_ICONS:
+    case IDX_SETTINGS_FULL_ROW:
+    case IDX_SETTINGS_SHOW_GRID:
+    case IDX_SETTINGS_ALTERNATIVE_SELECTION:
+    case IDX_SETTINGS_LARGE_PAGES:
       Changed();
       return true;
   }