Fix #57

katahiromz · Apr 3, 2024 · 2e2f7b4 · 2e2f7b4
1 parent 67f1445
commit 2e2f7b4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/XgGenerative.cpp b/XgGenerative.cpp
@@ -7,12 +7,14 @@ XgGenerativeDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     switch (uMsg)
     {
     case WM_INITDIALOG:
-        xg_ahSyncedDialogs[I_SYNCED_VIEW_SETTINGS] = hwnd;
+        xg_ahSyncedDialogs[I_SYNCED_GENERATIVE] = hwnd;
         // チェックボックスを初期化。
         if (xg_bNoGeneratedMsg)
             ::CheckDlgButton(hwnd, chx1, BST_CHECKED);
         if (xg_bNoCanceledMsg)
             ::CheckDlgButton(hwnd, chx2, BST_CHECKED);
+        if (xg_bAutoRetry)
+            ::CheckDlgButton(hwnd, chx3, BST_CHECKED);
         return TRUE;
 
     case WM_COMMAND:
@@ -21,6 +23,7 @@ XgGenerativeDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
         {
         case chx1:
         case chx2:
+        case chx3:
             if (HIWORD(wParam) == BN_CLICKED)
                 PropSheet_Changed(GetParent(hwnd), hwnd);
             break;
@@ -32,15 +35,10 @@ XgGenerativeDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
             NMHDR *pnmhdr = (NMHDR *)lParam;
             switch (pnmhdr->code) {
             case PSN_APPLY: // 適用
-                {
-                    // 元に戻す情報を取得。
-                    auto sa1 = std::make_shared<XG_UndoData_SetAll>();
-                    sa1->Get();
-
-                    // チェックボックスから設定を取得する。
-                    xg_bNoGeneratedMsg = (::IsDlgButtonChecked(hwnd, chx1) == BST_CHECKED);
-                    xg_bNoCanceledMsg = (::IsDlgButtonChecked(hwnd, chx2) == BST_CHECKED);
-                }
+                // チェックボックスから設定を取得する。
+                xg_bNoGeneratedMsg = (::IsDlgButtonChecked(hwnd, chx1) == BST_CHECKED);
+                xg_bNoCanceledMsg = (::IsDlgButtonChecked(hwnd, chx2) == BST_CHECKED);
+                xg_bAutoRetry = (::IsDlgButtonChecked(hwnd, chx3) == BST_CHECKED);
                 break;
             }
         }

diff --git a/lang/en_US.rc b/lang/en_US.rc
@@ -124,7 +124,7 @@ IDB_DELETEPAT BITMAP "res/1033_Bitmap_102.bmp"
         MENUITEM "Find a &solution\tF5", ID_SOLVE
         MENUITEM "Find a solution (without &adding blocks)\tF7", ID_SOLVENOADDBLACK
         MENUITEM SEPARATOR
-        MENUITEM "&Retry regularly", ID_RETRYIFTIMEOUT
+        MENUITEM "Auto &retry", ID_RETRYIFTIMEOUT
         MENUITEM SEPARATOR
         MENUITEM "Show ans&wer\tCtrl+M", ID_SHOWSOLUTION
         MENUITEM "Hi&de answer\tCtrl+M", ID_NOSOLUTION
@@ -627,7 +627,7 @@ FONT 9, "Tahoma"
     AUTOCHECKBOX "Show &Answer", chx3, 10, 35, 85, 14
     AUTOCHECKBOX "Choose a pattern from &PAT.txt automatically", chx4, 120, 35, 160, 14
     AUTOCHECKBOX "&SmartResolution", chx2, 10, 60, 75, 14, NOT WS_VISIBLE
-    AUTOCHECKBOX "Re&try regularly", chx1, 95, 60, 110, 14
+    AUTOCHECKBOX "Auto &retry", chx1, 95, 60, 110, 14
     LTEXT "Max. Word &Length:", stc1, 10, 87, 65, 12
     EDITTEXT edt3, 80, 85, 30, 14, ES_NUMBER | ES_RIGHT
     CONTROL "", scr3, "msctls_updown32", UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_SETBUDDYINT, 103, 90, 12, 20
@@ -1557,6 +1557,7 @@ FONT 9, "Tahoma"
 {
     AUTOCHECKBOX "Do not display ""Generated a &problem""", chx1, 10, 5, 200, 15
     AUTOCHECKBOX "Do not display ""&Cancelled""", chx2, 10, 25, 200, 15
+    AUTOCHECKBOX "Auto &retry", chx3, 10, 45, 200, 15
 }
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/lang/ja_JP.rc b/lang/ja_JP.rc
@@ -124,7 +124,7 @@ IDB_DELETEPAT BITMAP "res/1041_Bitmap_102.bmp"
         MENUITEM "解を求める(&R)\tF5", ID_SOLVE
         MENUITEM "解を求める(黒マス追加なし) (&B)\tF7", ID_SOLVENOADDBLACK
         MENUITEM SEPARATOR
-        MENUITEM "一定時間が過ぎたら再試行(&T)", ID_RETRYIFTIMEOUT
+        MENUITEM "自動で再試行(&T)", ID_RETRYIFTIMEOUT
         MENUITEM SEPARATOR
         MENUITEM "答えを表示する(&W)\tCtrl+M", ID_SHOWSOLUTION
         MENUITEM "答えを表示しない(&D)\tCtrl+M", ID_NOSOLUTION
@@ -630,7 +630,7 @@ FONT 9, "MS UI Gothic"
     AUTOCHECKBOX "答えを表示する(&A)", chx3, 10, 35, 85, 14
     AUTOCHECKBOX "&PAT.txtから黒マスパターンを自動的に選ぶ", chx4, 120, 35, 160, 14
     AUTOCHECKBOX "スマート解決(&S)", chx2, 10, 60, 75, 14, NOT WS_VISIBLE
-    AUTOCHECKBOX "一定時間が過ぎたら再試行(&T)", chx1, 95, 60, 110, 14
+    AUTOCHECKBOX "自動で再試行(&T)", chx1, 95, 60, 110, 14
     LTEXT "最大単語長(&L):", stc1, 10, 87, 60, 12
     EDITTEXT edt3, 80, 85, 30, 14, ES_NUMBER | ES_RIGHT
     CONTROL "", scr3, "msctls_updown32", UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_SETBUDDYINT, 103, 90, 12, 20
@@ -1561,6 +1561,7 @@ FONT 9, "MS UI Gothic"
 {
     AUTOCHECKBOX "「問題を生成しました」を表示しない(&P)", chx1, 10, 5, 200, 15
     AUTOCHECKBOX "「キャンセルしました」を表示しない(&C)", chx2, 10, 25, 200, 15
+    AUTOCHECKBOX "自動で再試行(&T)", chx3, 10, 45, 200, 15
 }
 
 //////////////////////////////////////////////////////////////////////////////