Changeset 99 for trunk/settings.cpp

Timestamp:

Jul 23, 2021, 10:11:05 PM (4 years ago)

Author:

Gregg Young

Message:

Fix some settings notebook font issues; minor clean up;

File:

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

trunk/settings.cpp

@@ -98 +98 @@
 Settings :: Settings (VOID) :
 #ifdef _QUIET_
-//#if 1
     ththSettings(apse, "gotchaq.ini", L_PROFILEVERSION)
 #else
@@ -108 +107 @@
         SetLong( SEI_SERIALTIME, QueryLong( SEI_SERIALTIME ) * 20 );
         SetFlag( SEI_UPDATE178DONE );
-    } else {
+    } /*else {
         //DisplayError( "NOT Updated", "true" );
-    }
+        } */
 #ifdef _QUIET_
     HINI hini = PrfOpenProfile (hab, "gotchaq.ini");
@@ -465 +464 @@
            HMQ hmq = WinQueryWindowULong( hwnd, QWL_HMQ);
            WinSetCp(hmq, 1207);
-           strcpy(ucFont, "8.Times New Roman MT 30");
+           strcpy(ucFont, "9.Times New Roman MT 30");
            WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
 
@@ -517 +516 @@
                UniFreeUconvObject(uconv_object1207);
         }
-        else {
-        strcpy(ucFont, "10.WarpSans");
+        /*else {
+        strcpy(ucFont, "9.WarpSans");
         WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
-        }
+        } */
             
         return MRESULT (FALSE);
@@ -658 +657 @@
         }
         HMQ hmq;
-        BOOL bUniCodeFont;
+        BOOL bUniCodeFont = FALSE;
         CHAR ucFont[FACESIZE];
 
@@ -677 +676 @@
 
         if (bUniCodeFont) {
-            strcpy(ucFont, "8.Times New Roman MT 30");
+            strcpy(ucFont, "9.Times New Roman MT 30");
             WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
         }
-        else {
-            strcpy(ucFont, "10.WarpSans");
+        /*else {
+            strcpy(ucFont, "9.WarpSans");
             WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
-        }
+        } */
 
 #ifdef _DOLOGDEBUG_
@@ -690 +689 @@
         return MRESULT (FALSE);
     }
-
-    case WM_DRAWITEM:
-
-        POWNERITEM poItem;
-        HPS hps;
-        RECTL       rcl,          // window area
-                    rclClip;      // clipping region for drawn text
-        POINTL      ptl;          // current text position
-        FATTRS      fontAttrs;    // current font attributes
-        FONTMETRICS fm;           // current font metr
-
-
-        poItem = POWNERITEM (mp2);
-
-        //hps = WinBeginPaint( hwnd, NULLHANDLE, NULLHANDLE );
-        memset( &fontAttrs, 0, sizeof(FATTRS) );
-        PmpfF(("PageID %i", poItem->hItem));
-        // set the font attributes and create the logical font
-        fontAttrs.usRecordLength = sizeof(FATTRS);
-        fontAttrs.usCodePage     = 852;
-        fontAttrs.fsType         = FATTR_TYPE_MBCS;
-        fontAttrs.fsFontUse      = FATTR_FONTUSE_NOMIX;
-        strcpy( fontAttrs.szFacename, "10.WarpSans");
-        GpiCreateLogFont( poItem->hps, NULL, 1L, &fontAttrs );
-        GpiSetCharSet( poItem->hps, 1L );
-        // paint the window background
-        //WinQueryWindowRect( hwnd, &rcl ); ????
-        WinFillRect( hps, &poItem->rclItem, SYSCLR_WINDOW );
-        GpiQueryFontMetrics( poItem->hps, sizeof(FONTMETRICS), &fm );
-        rclClip.xLeft   = poItem->rclItem.xLeft + fm.lAveCharWidth;
-        rclClip.yBottom = poItem->rclItem.yBottom + fm.lXHeight;
-        rclClip.xRight  = poItem->rclItem.xRight - fm.lAveCharWidth;
-        rclClip.yTop    = poItem->rclItem.yTop - fm.lXHeight;
-        ptl.x = rclClip.xLeft;
-        ptl.y = rclClip.yTop - fm.lExternalLeading - fm.lMaxAscender;
-        GpiCharStringPosAt( poItem->hps, &ptl, &rclClip, CHS_CLIP,
-                           /*Strlen(pszPageTab[i])*/5, (PCH) /*pszPageTab[i]*/ "Test", NULL );
-        WinEndPaint( hps );
-
-        //poItem->hwnd = hwndNB;            /*  Window handle. */
-        //poItem->hps = hps;             /*  Presentation-space handle. */
-        //poItem->fsState = BKS_BACKPAGESTR | BKS_MAJORTABTOP | BKS_TABBEDDIALOG;         /*  State. */
-        //poItem->fsAttribute = BKA_MAJOR | BKA_AUTOPAGESIZE;     /*  Attribute. */
-        //poItem->rclItem; ????        /*  Item rectangle. */
-        //poItem->hItem = idPage[i];
-
-        break;
 
     case WM_COMMAND:
@@ -903 +855 @@
     switch (msg)
     {
-    case WM_INITDLG:
+    case WM_INITDLG: {
 #ifdef _DOLOGDEBUG_
         LogDebug( "Page1Procedure: start WM_INITDLG" );
@@ -912 +864 @@
 #endif
         HMQ hmq;
-        BOOL bUniCodeFont;
+        BOOL bUniCodeFont = FALSE;
         CHAR ucFont[FACESIZE];
         
@@ -931 +883 @@
 
         if (bUniCodeFont) {
-            strcpy(ucFont, "8.Times New Roman MT 30");
+            strcpy(ucFont, "9.Times New Roman MT 30");
             WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
         }
-        //else
-           // WinRemovePresParam(hwnd, PP_FONTNAMESIZE);
+        /*else {
+            strcpy(ucFont, "9.WarpSans");
+            WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
+        } */
         return MRESULT (FALSE);
-
+    }
     case WM_COMMAND:
 
@@ -1123 +1077 @@
     switch (msg)
     {
-    case WM_INITDLG:
+    case WM_INITDLG: {
 #ifdef _DOLOGDEBUG_
         LogDebug( "Page3Procedure: start WM_INITDLG" );
@@ -1132 +1086 @@
 #endif
         HMQ hmq;
-        BOOL bUniCodeFont;
+        BOOL bUniCodeFont = FALSE;
         CHAR ucFont[FACESIZE];
         
@@ -1151 +1105 @@
 
         if (bUniCodeFont) {
-            strcpy(ucFont, "8.Times New Roman MT 30");
+            strcpy(ucFont, "9.Times New Roman MT 30");
             WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
         }
-        //else
-        //    WinRemovePresParam(hwnd, PP_FONTNAMESIZE);
+        /*else {
+            strcpy(ucFont, "9.WarpSans");
+            WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
+        } */
         return MRESULT (FALSE);
+    }
 
     case WM_COMMAND:
@@ -1374 +1331 @@
             if (pset->GetLangID() == RU || pset->GetLangID() == CZ || pset->GetLangID() == PL ||
                pset->GetLangID() == IT) {
-                strcpy(ucFont, "8.Times New Roman MT 30");
+                strcpy(ucFont, "9.Times New Roman MT 30");
                 WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
             }