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

trunk/dll/rename.c

@@ -14 +14 @@
   30 Dec 07 GKY Use TestFDates for comparing dates
   25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis
+  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
 
 ***********************************************************************/
@@ -86 +88 @@
 
         FILESTATUS3L fs1, fs2;
-        CHAR s[CCHMAXPATH * 2], *p, chkname[CCHMAXPATH], szCmmaFmtFileSize[81];
+        CHAR s[CCHMAXPATH * 2], *p, chkname[CCHMAXPATH], szCmmaFmtFileSize[81], szDate[11];
         INT sourceexists = 0, targetexists = 0,
             sourcenewer = 0, sourcesmaller = 0;
@@ -103 +105 @@
           CommaFmtULL(szCmmaFmtFileSize,
                       sizeof(szCmmaFmtFileSize), fs1.cbFile, ' ');
-          sprintf(s,
-                  " %s%s %ss %04u/%02u/%02u %02u:%02u:%02u",
+          FDateFormat(szDate, fs1.fdateLastWrite);
+          sprintf(s, " %s%s %ss %s %02u%s%02u%s%02u",
                   fs1.attrFile & FILE_DIRECTORY ?
                     GetPString(IDS_DIRBRKTTEXT) : NullStr,
                   szCmmaFmtFileSize,
                   GetPString(IDS_BYTETEXT),
-                  fs1.fdateLastWrite.year + 1980,
-                  fs1.fdateLastWrite.month,
-                  fs1.fdateLastWrite.day,
-                  fs1.ftimeLastWrite.hours,
-                  fs1.ftimeLastWrite.minutes, fs1.ftimeLastWrite.twosecs * 2);
+                  szDate,
+                  fs1.ftimeLastWrite.hours, TimeSeparator,
+                  fs1.ftimeLastWrite.minutes, TimeSeparator, fs1.ftimeLastWrite.twosecs * 2);
           WinSetDlgItemText(hwnd, REN_SOURCEINFO, s);
           sourceexists = 1;
@@ -131 +131 @@
           CommaFmtULL(szCmmaFmtFileSize,
                       sizeof(szCmmaFmtFileSize), fs2.cbFile, ' ');
-          sprintf(s,
-                  " %s%s %ss %04u/%02u/%02u %02u:%02u:%02u",
+          FDateFormat(szDate, fs2.fdateLastWrite);
+          sprintf(s, " %s%s %ss %s %02u%s%02u%s%02u",
                   fs2.attrFile & FILE_DIRECTORY ?
                     GetPString(IDS_DIRBRKTTEXT) : NullStr,
                   szCmmaFmtFileSize,
                   GetPString(IDS_BYTETEXT),
-                  fs2.fdateLastWrite.year + 1980,
-                  fs2.fdateLastWrite.month,
-                  fs2.fdateLastWrite.day,
-                  fs2.ftimeLastWrite.hours,
-                  fs2.ftimeLastWrite.minutes, fs2.ftimeLastWrite.twosecs * 2);
+                  szDate,
+                  fs2.ftimeLastWrite.hours, TimeSeparator,
+                  fs2.ftimeLastWrite.minutes, TimeSeparator, fs2.ftimeLastWrite.twosecs * 2);
           WinSetDlgItemText(hwnd, REN_TARGETINFO, s);
           targetexists = 1;
@@ -327 +325 @@
             if (SetDir(WinQueryWindow(WinQueryWindow(hwnd, QW_PARENT),
                                       QW_OWNER), hwnd, path, 0)) {
-              DosBeep(250, 100);
+              if (!fAlertBeepOff)
+                DosBeep(250, 100);
               WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, REN_TARGET));
               break;
@@ -335 +334 @@
         }
         else {
-          DosBeep(250, 100);
+          if (!fAlertBeepOff)
+            DosBeep(250, 100);
           WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, REN_TARGET));
         }