Changeset 1395 for trunk/dll/seeall.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/seeall.c (modified) (13 diffs)

trunk/dll/seeall.c

@@ -42 +42 @@
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
   11 Jan 08 GKY Change flag on GetMLEFont to 3 from 11 to give a larger selection of mono spaced fonts
+  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
 
 ***********************************************************************/
@@ -1028 +1031 @@
                       (hs > 1) ?
                       GetPString(IDS_ARETEXT) : GetPString(IDS_ISTEXT));
-            if (ro || hs || sysdir)
+            if ((ro || hs || sysdir) && !fAlertBeepOff)
               DosBeep(300, 100);
             strcat(prompt, GetPString(IDS_DELPROMPT6TEXT));
@@ -1150 +1153 @@
                 x != 1 ? GetPString(IDS_ARETEXT) : GetPString(IDS_ISTEXT));
         WinSetWindowText(WinWindowFromID(hwndFrame, SEEALL_STATUS), message);
-        if (toupper(*path) < 'C')
+        if (toupper(*path) < 'C' && !fAlertBeepOff)
           DosBeep(1000, 25);
         DosSleep(16);                   // 05 Aug 07 GKY 33
@@ -1210 +1213 @@
                                   0, 0, HWND_TOP, SEEALL_OBJ, NULL, NULL);
         if (!hwndObj) {
-          Win_Error2(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(HWND_OBJECT, HWND_DESKTOP, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
           if (!PostMsg(ad->hwndClient, WM_CLOSE, MPVOID, MPVOID))
             WinSendMsg(ad->hwndClient, WM_CLOSE, MPVOID, MPVOID);
@@ -1652 +1655 @@
                   &d2->date, &d2->time,
                   &d1->date, &d1->time);
-    /*(d1->date.year > d2->date.year) ? 1 :
-    (d1->date.year < d2->date.year) ? -1 :
-    (d1->date.month > d2->date.month) ? 1 :
-    (d1->date.month < d2->date.month) ? -1 :
-    (d1->date.day > d2->date.day) ? 1 :
-    (d1->date.day < d2->date.day) ? -1 :
-    (d1->time.hours > d2->time.hours) ? 1 :
-    (d1->time.hours < d2->time.hours) ? -1 :
-    (d1->time.minutes > d2->time.minutes) ? 1 :
-    (d1->time.minutes < d2->time.minutes) ? -1 :
-    (d1->time.twosecs > d2->time.twosecs) ? 1 :
-    (d1->time.twosecs < d2->time.twosecs) ? -1 : 0;*/
 
   if (!ret)
@@ -2336 +2327 @@
   ALLDATA *ad = WinQueryWindowPtr(hwnd, QWL_USER);
   POINTL ptl;
-  CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81];
+  CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81], szDate[11];
   ULONG len, y;
 
@@ -2371 +2362 @@
   }
   CommaFmtULL(szCmmaFmtFileSize,
-              sizeof(szCmmaFmtFileSize), ad->afindex[y]->cbFile, ' ');
+              sizeof(szCmmaFmtFileSize), ad->afindex[y]->cbFile, ' ');
+  FDateFormat(szDate, ad->afindex[y]->date);
   len = sprintf(szBuff,
-                "%c%-*.*s  %-12s  %c%c%c%c%c  %04u/%02u/%02u %02u:%02u:%02u ",
+                "%c%-*.*s  %-12s  %c%c%c%c%c  %s %02u%s%02u%s%02u ",
                 whichfile == ad->cursored - 1 ? '>' : ' ',
                 ad->fullnames ? ad->longestw : ad->longest,
@@ -2385 +2377 @@
                 "-S"[((ad->afindex[y]->attrFile & FILE_SYSTEM) != 0)],
                 "-D"[((ad->afindex[y]->attrFile & FILE_DIRECTORY) != 0)],
-                ad->afindex[y]->date.year + 1980,
-                ad->afindex[y]->date.month,
-                ad->afindex[y]->date.day,
-                ad->afindex[y]->time.hours,
-                ad->afindex[y]->time.minutes,
+                szDate,
+                ad->afindex[y]->time.hours, TimeSeparator,
+                ad->afindex[y]->time.minutes, TimeSeparator,
                 ad->afindex[y]->time.twosecs * 2);
   GpiCharStringAt(hps, &ptl, len, szBuff);
@@ -2653 +2643 @@
                                             SEEALL_STATUS, NULL, NULL);
           if (!pAD->hwndStatus)
-            Win_Error2(hwndFrame, hwnd, pszSrcFile, __LINE__,
-                       IDS_WINCREATEWINDOW);
+            Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
+                      PCSZ_WINCREATEWINDOW);
           else {
             PFNWP oldproc;
@@ -3440 +3430 @@
       pAD->multiplier = 1;
       if (!pAD->afindexcnt) {
-        DosBeep(250, 50);
+        if (!fAlertBeepOff)
+          DosBeep(250, 50);
         PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
       }
       else {
-        DosBeep(1000, 25);
+        if (!fAlertBeepOff)
+          DosBeep(1000, 25);
         WinInvalidateRect(hwnd, NULL, FALSE);
         PostMsg(hwnd, UM_SETUP3, MPVOID, MPVOID);
@@ -3467 +3459 @@
       register ULONG x;
       ULONG y, len, numlines;
-      CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81];
+      CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81], szDate[11];
       BOOL inverted, hidsys, reado, wascursored;
 
@@ -3555 +3547 @@
                                              [COLORS_CURSOREDNORMALBACK]]);
             CommaFmtULL(szCmmaFmtFileSize,
-                        sizeof(szCmmaFmtFileSize), pAD->afindex[y]->cbFile, ' ');
+                        sizeof(szCmmaFmtFileSize), pAD->afindex[y]->cbFile, ' ');
+            FDateFormat(szDate, pAD->afindex[y]->date);
             len =
               sprintf(szBuff,
-                      "%c%-*.*s  %-12s  %c%c%c%c%c  %04u/%02u/%02u %02u:%02u:%02u ",
+                      "%c%-*.*s  %-12s  %c%c%c%c%c  %s %02u%s%02u%s%02u ",
                       wascursored ? '>' : ' ',
                       pAD->fullnames ? pAD->longestw : pAD->longest,
@@ -3570 +3563 @@
                       "-H"[((pAD->afindex[y]->attrFile & FILE_HIDDEN) != 0)],
                       "-S"[((pAD->afindex[y]->attrFile & FILE_SYSTEM) != 0)],
-                      "-D"[((pAD->afindex[y]->attrFile & FILE_DIRECTORY) !=
-                            0)], pAD->afindex[y]->date.year + 1980,
-                      pAD->afindex[y]->date.month, pAD->afindex[y]->date.day,
-                      pAD->afindex[y]->time.hours,
-                      pAD->afindex[y]->time.minutes,
+                      "-D"[((pAD->afindex[y]->attrFile & FILE_DIRECTORY) != 0)],
+                      szDate,
+                      pAD->afindex[y]->time.hours, TimeSeparator,
+                      pAD->afindex[y]->time.minutes, TimeSeparator,
                       pAD->afindex[y]->time.twosecs * 2);
             GpiCharStringAt(hpsp, &ptl, len, szBuff);