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

trunk/dll/dircnrs.c

@@ -54 +54 @@
   26 Dec 08 GKY Fixed DROPHELP to check for copy as default is action is DO_DEFAULT
   01 Jan 09 GKY Add Seek and Scan to drives & directory context menus pass drive/dir as search root
+  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
+  07 Feb 09 GKY Move repeated strings to PCSZs.
+  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
 
 ***********************************************************************/
@@ -987 +991 @@
           ULONG size;
 
-          strcpy(filename, "*.LST");
+          strcpy(filename, PCSZ_STARDOTLST);
           size = CCHMAXPATH;
           PrfQueryProfileData(fmprof, appname, "SaveToListName",
@@ -1470 +1474 @@
 
       CNRINFO cnri;
-      CHAR s[CCHMAXPATH * 2], tf[81], tb[81];
+      CHAR s[CCHMAXPATH * 2], tf[81], tb[81], szDate[11];
       PCNRITEM pci;
 
@@ -1500 +1504 @@
             if (fSplitStatus && hwndStatus2) {
               CommaFmtULL(tb, sizeof(tb), pci->cbFile + pci->easize, ' ');
-              if (!fMoreButtons)
-                sprintf(s,
-                        " %s  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
+              if (!fMoreButtons) {
+                DateFormat(szDate, pci->date);
+                sprintf(s, " %s  %s %02u%s%02u%s%02u  [%s]  %s",
                         tb,
-                        pci->date.year,
-                        pci->date.month,
-                        pci->date.day,
-                        pci->time.hours,
-                        pci->time.minutes,
+                        szDate,
+                        pci->time.hours,
+                        TimeSeparator,
+                        pci->time.minutes,
+                        TimeSeparator,
                         pci->time.seconds,
-                        pci->pszDispAttr, pci->pszFileName);
+                        pci->pszDispAttr, pci->pszFileName);
+              }
               else {
                 *tf = 0;
@@ -1525 +1530 @@
               WinSetWindowText(hwndStatus2, NullStr);
             if (fMoreButtons) {
-              WinSetWindowText(hwndName, pci->pszFileName);
-              sprintf(s,
-                      "%04u/%02u/%02u %02u:%02u:%02u",
-                      pci->date.year,
-                      pci->date.month,
-                      pci->date.day,
-                      pci->time.hours, pci->time.minutes, pci->time.seconds);
+              WinSetWindowText(hwndName, pci->pszFileName);
+              DateFormat(szDate, pci->date);
+              sprintf(s, "%s %02u%s%02u%s%02u",
+                      szDate,
+                      pci->time.hours, TimeSeparator,
+                      pci->time.minutes, TimeSeparator,
+                      pci->time.seconds);
               WinSetWindowText(hwndDate, s);
               WinSetWindowText(hwndAttr, pci->pszDispAttr);
@@ -2827 +2832 @@
                 Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
                           GetPString(IDS_CANTFINDDIRTEXT),
-                          pci->pszFileName);
-                DosBeep(250,100);
+                          pci->pszFileName);
+                if (!fErrorBeepOff)
+                  DosBeep(250,100);
                 driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
                 UnFlesh(hwnd, pci);
@@ -3322 +3328 @@
                 if (fSplitStatus && hwndStatus2) {
                   CommaFmtULL(tb, sizeof(tb), pci->cbFile + pci->easize, ' ');
-                  if (!fMoreButtons) {
-                    sprintf(s, " %s  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
-                            tb, pci->date.year,
-                            pci->date.month, pci->date.day, pci->time.hours,
-                            pci->time.minutes, pci->time.seconds,
+                  if (!fMoreButtons) {
+                    CHAR date[11];
+
+                    DateFormat(date, pci->date);
+                    sprintf(s, " %s  %s %02u%s%02u%s%02u  [%s]  %s",
+                            tb, date, pci->time.hours, TimeSeparator,
+                            pci->time.minutes, TimeSeparator, pci->time.seconds,
                             pci->pszDispAttr, pci->pszFileName);
                   }
@@ -3341 +3349 @@
                   WinSetWindowText(hwndStatus2, s);
                 }
-                if (fMoreButtons) {
-                  WinSetWindowText(hwndName, pci->pszFileName);
-                  sprintf(s, "%04u/%02u/%02u %02u:%02u:%02u",
-                          pci->date.year, pci->date.month,
-                          pci->date.day, pci->time.hours, pci->time.minutes,
-                          pci->time.seconds);
+                if (fMoreButtons) {
+                  CHAR szDate[11];
+
+                  WinSetWindowText(hwndName, pci->pszFileName);
+                  DateFormat(szDate, pci->date);
+                  sprintf(s, "%s %02u%s%02u%s%02u",
+                          szDate, pci->time.hours, TimeSeparator, pci->time.minutes,
+                          TimeSeparator, pci->time.seconds);
                   WinSetWindowText(hwndDate, s);
                   WinSetWindowText(hwndAttr, pci->pszDispAttr);
@@ -3677 +3687 @@
                                        HWND_TOP, (ULONG) DIR_CNR, NULL, NULL);
         if (!dcd->hwndCnr) {
-          Win_Error2(hwndClient, hwndClient, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndClient, hwndClient, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
           PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
           free(dcd);