fix 2

katahiromz · Apr 2, 2024 · af4632d · af4632d
1 parent 1abfb37
commit af4632d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/GUI.cpp b/GUI.cpp
@@ -5763,24 +5763,24 @@ ViewSettingsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
             ::CheckDlgButton(hwnd, chx6, BST_CHECKED);
         if (xg_bShowCaret)
             ::CheckDlgButton(hwnd, chx7, BST_CHECKED);
-        if (xg_bShowDoubleFrameLetters)
+        if (xg_bShowDoubleFrame)
             ::CheckDlgButton(hwnd, chx8, BST_CHECKED);
-        if (xg_nViewMode == XG_VIEW_SKELETON)
+        if (xg_bShowDoubleFrameLetters)
             ::CheckDlgButton(hwnd, chx9, BST_CHECKED);
-        if (xg_bNumCroMode)
+        if (xg_nViewMode == XG_VIEW_SKELETON)
             ::CheckDlgButton(hwnd, chx10, BST_CHECKED);
-        if (xg_bLowercase)
+        if (xg_bNumCroMode)
             ::CheckDlgButton(hwnd, chx11, BST_CHECKED);
-        if (xg_bHiragana)
+        if (xg_bLowercase)
             ::CheckDlgButton(hwnd, chx12, BST_CHECKED);
-        if (xg_bCheckingAnswer)
+        if (xg_bHiragana)
             ::CheckDlgButton(hwnd, chx13, BST_CHECKED);
-        if (xg_bShowDoubleFrame)
+        if (xg_bCheckingAnswer)
             ::CheckDlgButton(hwnd, chx14, BST_CHECKED);
         if (!xg_bSolved) {
             ::EnableWindow(::GetDlgItem(hwnd, chx4), FALSE);
             ::EnableWindow(::GetDlgItem(hwnd, chx5), FALSE);
-            ::EnableWindow(::GetDlgItem(hwnd, chx13), FALSE);
+            ::EnableWindow(::GetDlgItem(hwnd, chx14), FALSE);
         }
         // ズームを初期化。
         s_strFit = XgLoadStringDx1(IDS_FITWHOLE);
@@ -5845,13 +5845,13 @@ ViewSettingsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
                     xg_bShowAnswer = (::IsDlgButtonChecked(hwnd, chx5) == BST_CHECKED);
                     xg_bShowNumbering = (::IsDlgButtonChecked(hwnd, chx6) == BST_CHECKED);
                     xg_bShowCaret = (::IsDlgButtonChecked(hwnd, chx7) == BST_CHECKED);
-                    xg_bShowDoubleFrameLetters = (::IsDlgButtonChecked(hwnd, chx8) == BST_CHECKED);
-                    xg_nViewMode = ((::IsDlgButtonChecked(hwnd, chx9) == BST_CHECKED) ? XG_VIEW_SKELETON : XG_VIEW_NORMAL);
-                    xg_bNumCroMode = (::IsDlgButtonChecked(hwnd, chx10) == BST_CHECKED);
-                    xg_bLowercase = (::IsDlgButtonChecked(hwnd, chx11) == BST_CHECKED);
-                    xg_bHiragana = (::IsDlgButtonChecked(hwnd, chx12) == BST_CHECKED);
-                    xg_bCheckingAnswer = (::IsDlgButtonChecked(hwnd, chx13) == BST_CHECKED);
-                    xg_bShowDoubleFrame = (::IsDlgButtonChecked(hwnd, chx14) == BST_CHECKED);
+                    xg_bShowDoubleFrame = (::IsDlgButtonChecked(hwnd, chx8) == BST_CHECKED);
+                    xg_bShowDoubleFrameLetters = (::IsDlgButtonChecked(hwnd, chx9) == BST_CHECKED);
+                    xg_nViewMode = ((::IsDlgButtonChecked(hwnd, chx10) == BST_CHECKED) ? XG_VIEW_SKELETON : XG_VIEW_NORMAL);
+                    xg_bNumCroMode = (::IsDlgButtonChecked(hwnd, chx11) == BST_CHECKED);
+                    xg_bLowercase = (::IsDlgButtonChecked(hwnd, chx12) == BST_CHECKED);
+                    xg_bHiragana = (::IsDlgButtonChecked(hwnd, chx13) == BST_CHECKED);
+                    xg_bCheckingAnswer = (::IsDlgButtonChecked(hwnd, chx14) == BST_CHECKED);
 
                     // コンボボックスの設定を適用する。
                     WCHAR szText[128];

diff --git a/lang/en_US.rc b/lang/en_US.rc
@@ -1533,13 +1533,13 @@ FONT 9, "Tahoma"
     AUTOCHECKBOX "&Answer", chx5, 10, 85, 95, 15
     AUTOCHECKBOX "&Numbering", chx6, 10, 105, 95, 15
     AUTOCHECKBOX "&Caret", chx7, 10, 125, 95, 15
-    AUTOCHECKBOX "&Double-frame letters", chx8, 115, 5, 95, 15
-    AUTOCHECKBOX "Skeleton &view", chx9, 115, 25, 95, 15
-    AUTOCHECKBOX "NumCro &mode", chx10, 115, 45, 95, 15
-    AUTOCHECKBOX "lo&wercase", chx11, 115, 65, 95, 15
-    AUTOCHECKBOX "&Hiragana", chx12, 115, 85, 95, 15
-    AUTOCHECKBOX "Checking ans&wer", chx13, 115, 105, 95, 15
-    AUTOCHECKBOX "Double-&frame", chx14, 115, 125, 95, 15
+    AUTOCHECKBOX "Double-&frame", chx8, 115, 5, 95, 15
+    AUTOCHECKBOX "&Double-frame letters", chx9, 115, 25, 95, 15
+    AUTOCHECKBOX "Skeleton &view", chx10, 115, 45, 95, 15
+    AUTOCHECKBOX "NumCro &mode", chx11, 115, 65, 95, 15
+    AUTOCHECKBOX "lo&wercase", chx12, 115, 85, 95, 15
+    AUTOCHECKBOX "&Hiragana", chx13, 115, 105, 95, 15
+    AUTOCHECKBOX "Checking ans&wer", chx14, 115, 125, 95, 15
     RTEXT "&Zoom:", -1, 15, 150, 35, 10, SS_CENTERIMAGE | NOT WS_GROUP
     COMBOBOX cmb1, 60, 150, 95, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
 }

diff --git a/lang/ja_JP.rc b/lang/ja_JP.rc
@@ -1536,13 +1536,13 @@ FONT 9, "MS UI Gothic"
     AUTOCHECKBOX "答え(&A)", chx5, 10, 85, 95, 15
     AUTOCHECKBOX "番号(&N)", chx6, 10, 105, 95, 15
     AUTOCHECKBOX "キャレット(&C)", chx7, 10, 125, 95, 15
-    AUTOCHECKBOX "二重マスの文字(&D)", chx8, 115, 5, 95, 15
-    AUTOCHECKBOX "スケルトン ビュー(&V)", chx9, 115, 25, 95, 15
-    AUTOCHECKBOX "ナンクロモード(&M)", chx10, 115, 45, 95, 15
-    AUTOCHECKBOX "lo&wercase", chx11, 115, 65, 95, 15
-    AUTOCHECKBOX "ひらがな(&H)", chx12, 115, 85, 95, 15
-    AUTOCHECKBOX "答え合わせ(&W)", chx13, 115, 105, 95, 15
-    AUTOCHECKBOX "二重マス(&F)", chx14, 115, 125, 95, 15
+    AUTOCHECKBOX "二重マス(&F)", chx8, 115, 5, 95, 15
+    AUTOCHECKBOX "二重マスの文字(&D)", chx9, 115, 25, 95, 15
+    AUTOCHECKBOX "スケルトン ビュー(&V)", chx10, 115, 45, 95, 15
+    AUTOCHECKBOX "ナンクロモード(&M)", chx11, 115, 65, 95, 15
+    AUTOCHECKBOX "lo&wercase", chx12, 115, 85, 95, 15
+    AUTOCHECKBOX "ひらがな(&H)", chx13, 115, 105, 95, 15
+    AUTOCHECKBOX "答え合わせ(&W)", chx14, 115, 125, 95, 15
     RTEXT "ズーム(&Z):", -1, 15, 150, 35, 10, SS_CENTERIMAGE | NOT WS_GROUP
     COMBOBOX cmb1, 60, 150, 95, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
 }