Changeset 41 for trunk/settings.cpp

Timestamp:

Mar 17, 2018, 11:00:45 PM (7 years ago)

Author:

Gregg Young

Message:

Fix hang on non-full screen capture of window with a menu open; Fix failure of widow to come to the top when program set as always on top are running. Add part of window title to auto file names; Major overhaul of settings dialog for Gotcha Quiet. More _QUIET_ ifdefs added to split code where Gotcha and Gotcha Quiet differ.

File:

• trunk/settings.cpp (modified) (5 diffs)

trunk/settings.cpp

@@ -232 +232 @@
         hwndPage[0] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) WindowProcedure,
                                   GETMODULE, ID_DLG_SETTINGSPAGE0, this);
-        hwndPage[1] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page1Procedure,
+        hwndPage[1] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page2Procedure,
+                                  GETMODULE, ID_DLG_SETTINGSPAGE2, this);
+        hwndPage[2] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page1Procedure,
                                   GETMODULE, ID_DLG_SETTINGSPAGE1, this);
-        hwndPage[2] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page2Procedure,
-                                  GETMODULE, ID_DLG_SETTINGSPAGE2, this);
         hwndPage[3] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page4Procedure,
                                   GETMODULE, ID_DLG_SETTINGSPAGE4, this);
@@ -267 +267 @@
     //WinSetFocus (WinWindowFromID (hwndDlg, WID_PB_OK), TRUE);
     //WinSetFocus( hwndPage[0], TRUE );
+#ifdef _QUIET_
+    if (HACCEL haccel = WinLoadAccelTable (hab, GETMODULE, 1)) {
+        int rc = WinSetAccelTable (hab, haccel, hwndDlg);
+        _PmpfF(( " Acceltable %i", rc));
+    }
+#endif
     WinSetActiveWindow( HWND_DESKTOP, hwndPage[0] );
 #ifdef _DOLOGDEBUG_
@@ -280 +286 @@
     LogDebug( "Dialog: checkpoint 8" );
 #endif
-
+#ifndef _QUIET_
     // it ain't the best way to do it, but ...
     SetIdlePriority(QueryFlag(SEI_IDLEPRIORITY));
-
+#endif
     for (i = 0; i < COUNT_PAGES; i++)
         hwndPage[i] = NULL;
@@ -1134 +1140 @@
 //#if 1
     pszPageTab[0] = RSTR (IDS_MAINWIN);
-    pszPageTab[1] = RSTR (IDS_PAGESAVE);
-    pszPageTab[2] = RSTR (IDS_PAGEMISC);
+    pszPageTab[1] = RSTR (IDS_PAGEMISC);
+    pszPageTab[2] = RSTR (IDS_PAGESAVE);
     pszPageTab[3] = RSTR (IDS_PAGELANGUAGE);
 #else
@@ -1158 +1164 @@
 //#if 1
     pszPageTab[0] = RSTR (IDS_MAINWIN);
-    pszPageTab[1] = RSTR (IDS_PAGESAVE);
-    pszPageTab[2] = RSTR (IDS_PAGEMISC);
+    pszPageTab[1] = RSTR (IDS_PAGEMISC);
+    pszPageTab[2] = RSTR (IDS_PAGESAVE);
     pszPageTab[3] = RSTR (IDS_PAGELANGUAGE);
 #else