Windows:Continuation of fix of tab navigation in various dialogs

Author: idrassi

src/Common/Common.rc

@@ -296,12 +296,12 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTI
 CAPTION "New Security Token Keyfile Properties"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
+    COMBOBOX        IDC_SELECTED_TOKEN,77,13,140,43,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_TOKEN_KEYFILE_NAME,77,32,140,13,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,128,61,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,183,61,50,14
-    COMBOBOX        IDC_SELECTED_TOKEN,77,13,140,43,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Security token:",IDT_SECURITY_TOKEN,11,15,62,8,0,WS_EX_RIGHT
     LTEXT           "Keyfile name:",IDT_TOKEN_KEYFILE_NAME,12,34,61,8,0,WS_EX_RIGHT
-    EDITTEXT        IDC_TOKEN_KEYFILE_NAME,77,32,140,13,ES_AUTOHSCROLL
     GROUPBOX        "",IDC_STATIC,5,2,228,51
 END
 

src/Format/Format.rc

@@ -267,11 +267,11 @@ IDD_SYSENC_RESCUE_DISK_CREATION_DLG DIALOGEX 0, 0, 276, 193
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+    CONTROL         "Skip Rescue Disk verification",IDC_SKIP_RESCUE_VERIFICATION,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,166,273,10
     EDITTEXT        IDC_RESCUE_DISK_ISO_PATH,0,180,201,13,ES_AUTOHSCROLL
     PUSHBUTTON      "Bro&wse...",IDC_BROWSE,204,179,70,14
     LTEXT           "",IDT_RESCUE_DISK_INFO,0,1,273,137
-    CONTROL         "Skip Rescue Disk verification",IDC_SKIP_RESCUE_VERIFICATION,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,166,273,10
 END
 
 IDD_SYSENC_COLLECTING_RANDOM_DATA_DLG DIALOGEX 0, 0, 276, 193
@@ -446,11 +446,11 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     EDITTEXT        IDC_PIM,74,0,42,14,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "Display PIM",IDC_SHOW_PIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,74,17,196,10
     LTEXT           "",IDC_BOX_HELP,0,32,273,142
     RTEXT           "Volume PIM:",IDT_PIM,1,3,69,8
     LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,120,3,153,8
     LTEXT           "Information on PIM",IDC_LINK_PIM_INFO,0,179,273,8,SS_NOTIFY
-    CONTROL         "Display PIM",IDC_SHOW_PIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,74,17,196,10
 END
 
 

src/Mount/Mount.rc

@@ -215,6 +215,8 @@ BEGIN
     PUSHBUTTON      "Browse...",IDC_BROWSE_DIRS,228,28,57,14
     CONTROL         "Include VeraCrypt Volume Creation Wizard",IDC_COPY_WIZARD,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,48,258,10
+    CONTROL         "Include VeraCrypt Volume Expander",IDC_COPY_EXPANDER,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,62,258,10
     CONTROL         "Do nothing",IDC_AUTORUN_DISABLE,"Button",BS_AUTORADIOBUTTON,15,115,262,10
     CONTROL         "&Start VeraCrypt",IDC_AUTORUN_START,"Button",BS_AUTORADIOBUTTON,15,126,262,11
     CONTROL         "&Auto-mount VeraCrypt volume (specified below)",IDC_AUTORUN_MOUNT,
@@ -227,6 +229,8 @@ BEGIN
     CONTROL         "Mount volume as read-&only",IDC_MOUNT_READONLY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,22,224,256,10
     CONTROL         "&Cache password in driver memory",IDC_TRAV_CACHE_PASSWORDS,
                     "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,22,237,256,10
+    CONTROL         "Include PIM when caching a password",IDC_PREF_CACHE_PIM,
+                    "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,22,250,256,10
     DEFPUSHBUTTON   "Create",IDC_CREATE,173,278,57,14
     PUSHBUTTON      "Close",IDCLOSE,236,278,57,14
     GROUPBOX        "File Settings",IDT_FILE_SETTINGS,6,7,287,71
@@ -236,10 +240,6 @@ BEGIN
     LTEXT           "Create traveler disk files at (traveler disk root directory):",IDT_TRAVEL_ROOT,18,19,259,8
     GROUPBOX        "Mount Settings",IDT_MOUNT_SETTINGS,13,152,272,114,WS_DISABLED
     LTEXT           "Upon insertion of traveler disk: ",IDT_TRAVEL_INSERTION,13,102,263,8
-    CONTROL         "Include VeraCrypt Volume Expander",IDC_COPY_EXPANDER,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,62,258,10
-    CONTROL         "Include PIM when caching a password",IDC_PREF_CACHE_PIM,
-                    "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,22,250,256,10
 END
 
 IDD_HOTKEYS_DLG DIALOGEX 0, 0, 389, 257

src/Setup/Setup.rc

@@ -134,9 +134,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT           "Click Uninstall to remove VeraCrypt from this system.",IDT_UNINSTALL_DIR,8,8,334,8
     LISTBOX         IDC_LOG_WINDOW,7,21,335,179,LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL
+    CONTROL         "Create System &Restore point",IDC_SYSTEM_RESTORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,215,194,10
     DEFPUSHBUTTON   "&Uninstall",IDC_UNINSTALL,236,213,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,292,213,50,14
-    CONTROL         "Create System &Restore point",IDC_SYSTEM_RESTORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,215,194,10
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,2,206,347,1,WS_EX_STATICEDGE
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,1,1,348,1,WS_EX_STATICEDGE
 END
@@ -242,11 +242,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTI
 CAPTION "VeraCrypt Setup Wizard"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
+    COMBOBOX        IDC_LANGUAGES_LIST,42,36,164,155,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON   "OK",IDOK,102,54,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,157,54,50,14
     ICON            IDI_SETUP,IDC_STATIC,10,10,32,32
     LTEXT           "Select the language to use during the installation:",IDC_SELECT_LANGUAGE_LABEL,42,13,158,17
-    COMBOBOX        IDC_LANGUAGES_LIST,42,36,164,155,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END