Changeset 125

Timestamp:

Aug 14, 2021, 7:06:23 PM (4 years ago)

Author:

Gregg Young

Message:

Update About setting page; improve unicode font selection;

Location:

trunk

Files:

• id.h (modified) (4 diffs)
• settings.cpp (modified) (10 diffs)

trunk/id.h

@@ -72 +72 @@
 #define WID_CAPTURETYPE           38
 #define WID_LB_LANGUAGES          39
-#define WID_LB_LANGUAGESHELP      40
 #define WID_PB_HELP               42
 #define WID_LB_FILEFORMAT         43
@@ -80 +79 @@
 // These must be sequential with END last
 #define WID_ST_COPYRIGHT          400
-#define WID_ST_PROGRAM            401
-#define WID_ST_HELPFILE           402
-#define WID_ST_LANGNOTE           403
-#define WID_ST_END                404
+#define WID_ST_COPYRIGHT1         401
+#define WID_ST_COPYRIGHT2         402
+#define WID_ST_COPYRIGHT3         403
+#define WID_ST_COPYRIGHT4         404
+#define WID_ST_PROGRAM            405
+#define WID_ST_LANGNOTE           406
+#define WID_ST_END                407
 
 #define IDM_SSWPOPUP              1
@@ -143 +145 @@
 #define ES 34
 #define RU 7
-#define JP 81
+#define JA 81
 #define PL 48
 #define BR 55
+#define FR 33
+#define KO 82
+#define NL 31
+#define TW 88
+#define CN 86
 
 #define IDS_SETTINGS                        3
@@ -193 +200 @@
 
 #define LANG_COPYRIGHT                      300
-#define LANG_PROGRAM                        301
-#define LANG_HELPFILE                       302
-#define LANG_RESTART                        303
+#define LANG_COPYRIGHT1                     301
+#define LANG_COPYRIGHT2                     302
+#define LANG_COPYRIGHT3                     303
+#define LANG_COPYRIGHT4                     304
+#define LANG_PROGRAM                        305
+#define LANG_RESTART                        306
 
 #define MAIN_HELP_TABLE                     1

trunk/settings.cpp

@@ -620 +620 @@
             }
             break;
-
+#ifndef _QUIET_
         case WID_PB_ABOUT:
             AboutBox (hwnd);
             break;
-
+#endif
         case DID_CANCEL:
             {
@@ -1298 +1298 @@
             WinSetCp(hmq, 1207); // UPF-8 Unicode
             WinRemovePresParam(hwnd, PP_FONTNAMESIZE);
+#ifndef _QUIET_ //??
             pset->GetLanguages(WinWindowFromID (hwnd, WID_LB_LANGUAGES));
-
+#endif
 #ifdef _DOLOGDEBUG_
             LogDebug( "Page4Procedure: WM_INITDLG: after GetLanguages()" );
 #endif
-            HDIR          hdir;
-            ULONG         c, fl;
-            FILEFINDBUF3  findbuf;
-            APIRET        rc;
-            PSZ           psz;
-
-            // find all hlps and add the names to the language list
-            fl   = FILE_NORMAL;
-            hdir = HDIR_CREATE;
-            c    = 1;
-            rc   = DosFindFirst ("*.hlp", &hdir, fl, &findbuf,
-                                 sizeof (findbuf), &c, FIL_STANDARD);
-#ifdef _DOLOGDEBUG_
-            LogDebug( "Page4Procedure: WM_INITDLG: Entering help file loop ..." );
-#endif
-            while (!rc)
-            {
-#ifdef _DOLOGDEBUG_
-                LogDebug( "Page4Procedure: WM_INITDLG: Doing '%s' ...", findbuf.achName );
-#endif
-                if ((psz = strchr (findbuf.achName, '.')))
-                    *psz = '\0';
-                findbuf.achName[0] = toupper (findbuf.achName[0]);
-                WinInsertLboxItem (WinWindowFromID (hwnd, WID_LB_LANGUAGESHELP),
-                                   LIT_END, findbuf.achName);
-                c = 1;
-                rc = DosFindNext (hdir, &findbuf, sizeof (findbuf), &c);
-            }
-            DosFindClose (hdir);
-#ifdef _DOLOGDEBUG_
-            LogDebug( "Page4Procedure: WM_INITDLG: help file loop done." );
-#endif
-
+#ifndef _QUIET_
             WinSendMsg (hwnd, UM_SETTINGS2DIALOG, 0,0);
 
@@ -1341 +1310 @@
                 WinEnableWindow (WinWindowFromID (hwnd, WID_ST_LANGNOTE),
                                  FALSE);
+#endif
 #ifdef _DOLOGDEBUG_
             LogDebug( "Page4Procedure: end WM_INITDLG" );
@@ -1386 +1356 @@
             if (uconv_object1207)
                 UniFreeUconvObject(uconv_object1207);
-            
-            if (pset->GetLangID() == RU || pset->GetLangID() == CZ || pset->GetLangID() == PL) {
+            CHAR *env, *p;
+            env = getenv("OSDIR");
+            p = env;
+            p++;
+            if (!stricmp(p, ":\\sys")) {
+                strcpy(ucFont, "9.Workplace Sans");
+                WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
+            }
+            /*if (pset->GetLangID() == RU || pset->GetLangID() == CZ || pset->GetLangID() == PL) {*/
+            else {
                 strcpy(ucFont, "9.Times New Roman MT 30");
                 WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
             }
-            else if (g_installer) {
-                strcpy(ucFont, "9.WarpSans");
+            /*else if (g_installer) {
+                strcpy(ucFont, 9.WarpSans");
                 WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
-            }
+            } */
         return MRESULT (FALSE);
         }
@@ -1402 +1380 @@
             WinPostMsg( g_hwndSettingsDialog, msg, mp1, mp2 );
         return MRESULT( FALSE );
-
+#ifndef _QUIET_
     case UM_SETTINGS2DIALOG:
         {
@@ -1437 +1415 @@
                 WinSendDlgItemMsg (hwnd, WID_LB_LANGUAGES, LM_SELECTITEM,
                                    MPFROMSHORT (0), MPFROMSHORT (TRUE));
-            hwndLB = WinWindowFromID (hwnd, WID_LB_LANGUAGESHELP);
-            c = WinQueryLboxCount (hwndLB);
-
-            for (i = 0; i < c; i++)
-            {
-#ifdef _DOLOGDEBUG_
-                LogDebug( "Page4Procedure: UM_SETTINGS2DIALOG: i.2 = %d", i );
-#endif
-                WinQueryLboxItemText (hwndLB, i, ach, sizeof (ach));
-                if (stricmp (pset->QueryString (SEI_LANGUAGEHELP), ach) == 0)
-                    break;
-            }
-#ifdef _DOLOGDEBUG_
-            LogDebug( "Page4Procedure: UM_SETTINGS2DIALOG: after loop 2" );
-#endif
-            if (i < c)
-                WinSendDlgItemMsg (hwnd, WID_LB_LANGUAGESHELP, LM_SELECTITEM,
-                                   MPFROMSHORT (i), MPFROMSHORT (TRUE));
-            else
-                WinSendDlgItemMsg (hwnd, WID_LB_LANGUAGESHELP, LM_SELECTITEM,
-                                   MPFROMSHORT (0), MPFROMSHORT (TRUE));
 #ifdef _DOLOGDEBUG_
             LogDebug( "Page4Procedure: end UM_SETTINGS2DIALOG" );
@@ -1463 +1420 @@
         }
         return MRESULT (FALSE);
-
+#endif
     case WM_DESTROY:
 #ifndef _QUIET_
@@ -1594 +1551 @@
 
 // ** SelectLanguage ****************************************************** /*FOLD00*/
-
+#ifndef _QUIET_
 VOID Settings :: SelectLanguage (VOID)
 {
@@ -1614 +1571 @@
     Dialog (TRUE);
 }
+#endif
 
 // ** GetLanguages ******************************************************** /*FOLD00*/
-
+#ifndef _QUIET_ //??
 USHORT Settings :: GetLanguages (HWND hwnd)
 {
@@ -1713 +1671 @@
     return 1;
 }
-
+#endif
 // ** GetFileExtension **************************************************** /*FOLD00*/