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

trunk/dll/treecnr.c

@@ -59 +59 @@
   01 Jan 09 GKY Add Seek and Scan to drives & directory context menus pass drive/dir as search root
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
+  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
 
 ***********************************************************************/
@@ -1220 +1223 @@
           WinSetWindowText(WinWindowFromID(dcd->hwndFrame,
                                            MAIN_STATUS), pci->pszFileName);
-        if (fMoreButtons && hwndName) {
+        if (fMoreButtons && hwndName) {
+          CHAR szDate[11];
+
+          DateFormat(szDate, pci->date);
           WinSetWindowText(hwndName, pci->pszFileName);
-          sprintf(str,
-                  "%04u/%02u/%02u %02u:%02u:%02u",
-                  pci->date.year,
-                  pci->date.month,
-                  pci->date.day,
-                  pci->time.hours, pci->time.minutes, pci->time.seconds);
+          sprintf(str, "%s %02u%s%02u%s%02u", szDate,
+                  pci->time.hours, TimeSeparator,
+                  pci->time.minutes, TimeSeparator, pci->time.seconds);
           WinSetWindowText(hwndDate, str);
           WinSetWindowText(hwndAttr, pci->pszDispAttr);
@@ -1837 +1840 @@
                 UnFlesh(hwnd, pci);
                 PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-                DosBeep(250, 100);
+                if (!fAlertBeepOff)
+                  DosBeep(250, 100);
               }
             }
@@ -1905 +1909 @@
           !(pci->flags & RECFLAGS_ENV) && IsFullName(pci->pszFileName)) {
         if (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_INVALID) {
-          DosBeep(50, 100);
+          if (!fAlertBeepOff)
+            DosBeep(50, 100);
           if (hwndStatus)
             WinSetWindowText(hwndStatus, GetPString(IDS_RESCANSUGTEXT));
@@ -3208 +3213 @@
                                               SV_CYMINMAXBUTTON), hwndFrame,
                                               HWND_TOP, IDM_OPENWINDOW, NULL, NULL)) {
-          Win_Error2(hwndFrame, hwndParent, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndFrame, hwndParent, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         }
       }
@@ -3225 +3230 @@
                                              * 2), 22, hwndFrame, HWND_TOP,
                              MAIN_STATUS, NULL, NULL)) {
-          Win_Error2(hwndFrame, hwndParent, pszSrcFile, __LINE__,
-                     IDS_WINCREATEWINDOW);
+          Win_Error(hwndFrame, hwndParent, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         }
       }
@@ -3258 +3263 @@
                                      HWND_TOP, (ULONG) TREE_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);