Changeset 1395 for trunk/dll/datamin.c

Timestamp:

Feb 8, 2009, 2:48:16 AM (17 years ago)

Author:

Gregg Young

Message:

Allow user to turn off alert and/or error beeps in settings notebook. Ticket 341 Move repeated strings to PCSZs. Ticket 6 Add *DateFormat functions to format dates based on locale Ticket 28 Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error Ticket 6

File:

• trunk/dll/datamin.c (modified) (6 diffs)

trunk/dll/datamin.c

@@ -25 +25 @@
                 Dos/Win programs from being inserted into the execute dialog with message why.
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
 
 ***********************************************************************/
@@ -260 +262 @@
                              MINI_X,
                              MINI_Y, hwnd, HWND_TOP, ids[c], NULL, NULL)) {
-          Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__, IDS_WINCREATEWINDOW);
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         }
         x += (MINI_X + 4);
@@ -318 +321 @@
                                  WS_VISIBLE, x, y, MINI_X, MINI_Y, hwnd,
                                  HWND_TOP, MINI_DRIVEA + c, NULL, NULL)) {
-              Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__,
-                         IDS_WINCREATEWINDOW);
+              Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                        PCSZ_WINCREATEWINDOW);
             }
             numdrives++;
@@ -747 +750 @@
   case UM_TIMER:
     {
-      CHAR s[134];
+      CHAR s[134], szDate[11];
       DATETIME dt;
 
@@ -754 +757 @@
                         HWND_TOP, 0, 0, 0, 0, SWP_ZORDER);
       if (counter && (counter % 19) && (counter % 20)) {
-        if (!DosGetDateTime(&dt)) {
+        if (!DosGetDateTime(&dt)) {
+          DTDateFormat(szDate, dt);
           sprintf(s,
-                  " %02hu:%02hu:%02hu  %s %04u/%02u/%02u",
-                  dt.hours,
-                  dt.minutes,
+                  " %02hu%s%02hu%s%02hu  %s %s",
+                  dt.hours, TimeSeparator,
+                  dt.minutes, TimeSeparator,
                   dt.seconds,
                   GetPString(IDS_SUNDAY + dt.weekday),
-                  dt.year, dt.month, dt.day);
+                  szDate);
           WinSetDlgItemText(hwnd, MINI_TIME, s);
         }
@@ -944 +948 @@
                   numdays, GetPString(IDS_DAYTEXT), &"s"[numdays == 1L]);
         nummins = val % (60L * 24L);
-        sprintf(s + strlen(s), " %lu:%02lu", nummins / 60, nummins % 60);
+        sprintf(s + strlen(s), " %lu%s%02lu", nummins / 60, TimeSeparator, nummins % 60);
         WinSetDlgItemText(hwnd, MINI_TIME, s);
       }