Changeset 229

Timestamp:

Sep 23, 2020, 11:29:15 PM (5 years ago)

Author:

Gregg Young

Message:

Get language switches to work without a restart. Allow reduce desktop to work with autosize and allow resize. Stop automatically selecting allow resize on deselect of autosize.

File:

• trunk/settings.c (modified) (6 diffs)

trunk/settings.c ¶

@@ -1332 +1332 @@
             WinCheckButton(hwnd, CHK_TSKBARGROW,
                            plswData->Settings.bTskBarGrow);
-            if (!plswData->Settings.bTaskBarAlwaysVisible ||
-                plswData->Settings.bAllowResize ||
-                plswData->Settings.bTskBarGrow)
+            if (!plswData->Settings.bTaskBarAlwaysVisible )
                 WinEnableControl(hwnd, CHK_REDUCEDSK,FALSE);
             else
@@ -1495 +1493 @@
                     plswData->Settings.bAllowResize = bValue;
                     if (plswData->Settings.bAllowResize) {
-                        if (plswData->Settings.bReduceDsk)
+                        /*if (plswData->Settings.bReduceDsk)
                             UpdateDesktopWorkarea(plswData, TRUE);
                         WinCheckButton(hwnd, CHK_REDUCEDSK, FALSE);
-                        plswData->Settings.bReduceDsk = FALSE;
+                        plswData->Settings.bReduceDsk = FALSE;*/
                     }
                     if (bValue) {
@@ -1517 +1515 @@
                     plswData->Settings.bTskBarGrow = bValue;
                     WinEnableControl(hwnd, CHK_ALLOWRESIZE, !bValue);
-                    WinCheckButton(hwnd, CHK_ALLOWRESIZE, !bValue);
+                    //WinCheckButton(hwnd, CHK_ALLOWRESIZE, !bValue);
                     plswData->Settings.bAllowResize = !bValue;
                     if (!bValue) {
@@ -1529 +1527 @@
                     if (bValue) {
                         WinPostMsg(plswData->hwndTaskBarClient, WM_SIZE, 0, 0);
-                        if (plswData->Settings.bReduceDsk)
+                        /*if (plswData->Settings.bReduceDsk)
                             UpdateDesktopWorkarea(plswData, TRUE);
                         WinCheckButton(hwnd, CHK_REDUCEDSK, FALSE);
-                        plswData->Settings.bReduceDsk = FALSE;
+                        plswData->Settings.bReduceDsk = FALSE;*/
                     }
                     else
@@ -1564 +1562 @@
             }
 #ifndef XWORKPLACE
-            if (!plswData->Settings.bTaskBarAlwaysVisible ||
-                plswData->Settings.bAllowResize ||
-                plswData->Settings.bTskBarGrow) {
+            if (!plswData->Settings.bTaskBarAlwaysVisible)  {
                 WinEnableControl(hwnd, CHK_REDUCEDSK,FALSE);
             }
@@ -1900 +1896 @@
                     }
                     else {
+                        UCHAR ucFont[30];
+                        HMQ hmq;
+
                         plswData->Settings.usLanguage = usLangArr[sIndex];
+                        if (plswData->Settings.usLanguage == RU ||
+                            plswData->Settings.usLanguage == CZ ||
+                            plswData->Settings.usLanguage == PL) {
+                            strcpy(ucFont, "10.Times New Roman MT 30");
+                            WinSetPresParam(plswData->hwndMenu, PP_FONTNAMESIZE, strlen(ucFont), ucFont);
+                        }
+                        else
+                            WinRemovePresParam(plswData->hwndMenu, PP_FONTNAMESIZE);
+
+                        if (plswData->Settings.usLanguage == RU) {
+                            hmq = WinQueryWindowULong( plswData->hwndPopup, QWL_HMQ);
+                            WinSetCp(hmq, 866);
+                        }
+                        else if (plswData->Settings.usLanguage == CZ ||
+                                 plswData->Settings.usLanguage == PL) {
+                            hmq = WinQueryWindowULong( plswData->hwndPopup, QWL_HMQ);
+                            WinSetCp(hmq, 852);
+                        }
+                        else {
+                            hmq = WinQueryWindowULong( plswData->hwndPopup, QWL_HMQ);
+                            WinSetCp(hmq, 850);
+                        }
 #ifdef XWORKPLACE
                        if (WgtQueryXWPWidgetBasePath (szHelpFile)) {