Changeset 1670

Timestamp:

Aug 13, 2012, 3:33:25 AM (13 years ago)

Author:

Gregg Young

Message:

Add ability to change and save PresParam to compare dialog (Ticket 443) Fix loading of a list file in the right compare container (Ticket 489) Allow for selection of include subdirectories or a list file on initial startup of compare dirs (Ticket 145)

Location:

trunk/dll

Files:

• comp.c (modified) (8 diffs)
• comp.h (modified) (2 diffs)
• fm3dlg.h (modified) (2 diffs)
• fm3res.dlg (modified) (2 diffs)
• mainwnd.c (modified) (2 diffs)
• mainwnd2.c (modified) (2 diffs)
• walkem.c (modified) (4 diffs)
• walkem.h (modified) (2 diffs)

trunk/dll/comp.c ¶

@@ -78 +78 @@
   12 Jun 11 GKY Added SleepIfNeeded in the container fill loop
   02 Jan 12 GKY Added pszFmtFileSize to container info to fix loss of file sizes on move and copy.
+  12 Aug 12 GKY Add ability to change and save PresParam
+  12 Aug 12 GKY Fix loading of a list file in the right compare container
+  12 Aug 12 GKY Allow for selection of include subdirectories or a list file on initial startup of compare dirs
 
 ***********************************************************************/
@@ -1689 +1692 @@
           } // if have rightdir
           fclose(fp);
-        }
+        }
+        FillDirList(cmp->rightdir, lenr, cmp->includesubdirs,
+                    &filesr, &cmp->cmp->totalright, &numallocr);
       } // if snapshot file
 
@@ -2220 +2225 @@
       SetCnrCols(GetHwndLeft(hwnd), TRUE);
       SetCnrCols(GetHwndRight(hwnd), TRUE);
+      if (cmp->listfile) {
+        CHAR fullname[CCHMAXPATH];
+
+        strcpy(fullname, PCSZ_STARDOTPMD);
+        if (insert_filename(HWND_DESKTOP, fullname, TRUE, FALSE) &&
+            *fullname && !strchr(fullname, '*') && !strchr(fullname, '?'))
+          strcpy(cmp->rightlist, fullname);
+      }
       WinSendMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
       WinSendMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
       PostMsg(hwnd, UM_STRETCH, MPVOID, MPVOID);
       {
-        USHORT ids[] = { COMP_LEFTDIR, COMP_RIGHTDIR, COMP_TOTALLEFT,
-                         COMP_TOTALRIGHT, COMP_SELLEFT, COMP_SELRIGHT,
-                         0
-                       };
+        USHORT ids[] = {COMP_FRAME, COMP_LEFTDIR, COMP_RIGHTDIR, COMP_COLLECT,
+                        COMP_VIEW, COMP_NOTE, COMP_TOTALLEFT, COMP_SELLEFT, COMP_TOTALRIGHT,
+                        COMP_SELRIGHT, COMP_CNRMENU, COMP_DIRMENU, COMP_MENU,
+                        COMP_INCLUDESUBDIRS, COMP_SETDIRS, COMP_COPYLEFT, COMP_MOVELEFT,
+                        COMP_DELETELEFT, COMP_COPYRIGHT, COMP_MOVERIGHT, COMP_DELETERIGHT,
+                        COMP_TOTALLEFTHDR, COMP_SELLEFTHDR, COMP_TOTALRIGHTHDR,
+                        COMP_SELRIGHTHDR, COMP_FILTER, COMP_HIDENOTSELECTED, 0};
         UINT x;
+        CHAR s[24];
+
         for (x = 0; ids[x]; x++) {
-          //fixme to allow user to change presparams 1-10-09 GKY
-          SetPresParams(WinWindowFromID(hwnd, ids[x]),
+          //fixme to allow user to change presparams 1-10-09 GKY
+          sprintf(s, "CompDir%i", ids[x]);
+          RestorePresParams(WinWindowFromID(hwnd, ids[x]), s);
+          /*SetPresParams(WinWindowFromID(hwnd, ids[x]),
                         &RGBGREY,
-                        &RGBBLACK, &RGBBLACK, FNT_8HELVETICA);
+                        &RGBBLACK, &RGBBLACK, FNT_8HELVETICA);*/
         }
       }
@@ -2680 +2700 @@
       COMPARE *forthread;
       CNRINFO cnri;
+      if (cmp->includesubdirs)
+        WinCheckButton(hwnd, COMP_INCLUDESUBDIRS, TRUE);
       cmp->includesubdirs = WinQueryButtonCheckstate(hwnd,
-                                                     COMP_INCLUDESUBDIRS);
+                                                     COMP_INCLUDESUBDIRS);
       memset(&cnri, 0, sizeof(CNRINFO));
       cnri.cb = sizeof(CNRINFO);
@@ -2719 +2741 @@
           WinSetDlgItemText(hwnd, COMP_NOTE,
                             (CHAR *) GetPString(IDS_COMPHOLDREADDISKTEXT));
-          SetButtonEnables(cmp, FALSE);
+          SetButtonEnables(cmp, FALSE);
+          cmp->includesubdirs = FALSE;
           cmp->selleft = 0;
           cmp->selright = 0;
@@ -3053 +3076 @@
         wa.size = sizeof(wa);
         strcpy(wa.szCurrentPath1, cmp->leftdir);
-        strcpy(wa.szCurrentPath2, cmp->rightdir);
+        strcpy(wa.szCurrentPath2, cmp->rightdir);
+        wa.includesubdirs = WinQueryButtonCheckstate(hwnd,
+                                                     COMP_INCLUDESUBDIRS);
         if (WinDlgBox(HWND_DESKTOP,
                       hwnd,
@@ -3063 +3088 @@
             !IsFile(wa.szCurrentPath2)) {
           strcpy(cmp->leftdir, wa.szCurrentPath1);
-          strcpy(cmp->rightdir, wa.szCurrentPath2);
-          *cmp->rightlist = 0;
+          strcpy(cmp->rightdir, wa.szCurrentPath2);
+          cmp->includesubdirs = wa.includesubdirs;
+          if (!cmp->includesubdirs)
+            WinCheckButton(hwnd, COMP_INCLUDESUBDIRS, FALSE);
+          cmp->listfile = wa.listfile;
+          if (cmp->listfile) {
+            CHAR fullname[CCHMAXPATH];
+    
+            strcpy(fullname, PCSZ_STARDOTPMD);
+            if (insert_filename(HWND_DESKTOP, fullname, TRUE, FALSE) &&
+                *fullname && !strchr(fullname, '*') && !strchr(fullname, '?'))
+              strcpy(cmp->rightlist, fullname);
+          }
+          else
+            *cmp->rightlist = 0;
           PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
           PostMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
@@ -3127 +3165 @@
         SWP swp;
         ULONG size = sizeof(SWP);
-
+        USHORT ids[] = {COMP_FRAME, COMP_LEFTDIR, COMP_RIGHTDIR, COMP_COLLECT,
+                        COMP_VIEW, COMP_NOTE, COMP_TOTALLEFT, COMP_SELLEFT, COMP_TOTALRIGHT,
+                        COMP_SELRIGHT, COMP_CNRMENU, COMP_DIRMENU, COMP_MENU,
+                        COMP_INCLUDESUBDIRS, COMP_SETDIRS, COMP_COPYLEFT, COMP_MOVELEFT,
+                        COMP_DELETELEFT, COMP_COPYRIGHT, COMP_MOVERIGHT, COMP_DELETERIGHT,
+                        COMP_TOTALLEFTHDR, COMP_SELLEFTHDR, COMP_TOTALRIGHTHDR,
+                        COMP_SELRIGHTHDR, COMP_FILTER, COMP_HIDENOTSELECTED, 0};
+        UINT x;
+        CHAR s[24];
         WinQueryWindowPos(hwnd, &swp);
         PrfWriteProfileData(fmprof, FM3Str, "CompDir.Position", (PVOID) &swp,
-                            size);
+                            size);
+        for (x = 0; ids[x]; x++) {
+          //fixme to allow user to change presparams 1-10-09 GKY
+          sprintf(s, "CompDir%i", ids[x]);
+          SavePresParams(WinWindowFromID(hwnd, ids[x]), s);
+        }
       }
       WinDismissDlg(hwnd, 0);

trunk/dll/comp.h ¶

@@ -12 +12 @@
   18 Jan 08 SHL Sync with count update mods
   27 Sep 09 SHL Support AND'ed selections
+  12 Aug 12 GKY Allow for selection of include subdirectories or a list file on initial startup of compare dirs
 
 ***********************************************************************/
@@ -55 +56 @@
   BOOL stop;                            // Requests thread stop
   BOOL includesubdirs;
+  BOOL listfile;
   INT action;                           // IDM_...
   UINT selleft;                         // # selected

trunk/dll/fm3dlg.h ¶

@@ -42 +42 @@
   04 Aug 12 GKY Changes to allow copy and move over readonly files with a warning dialog; also added a warning dialog
                 for delete of readonly files
+  12 Aug 12 GKY Allow for selection of include subdirectories or a list file on initial startup of compare dirs
 
 ***********************************************************************/
@@ -195 +196 @@
 #define WALK2_FRAME                                                                             20850
 #define WALK2_PATH                                                                              20851
-#define WALK2_DRIVELIST                                                                 20852
-#define WALK2_DIRLIST                                                                   20853
+#define WALK2_DRIVELIST                                                                         20852
+#define WALK2_DIRLIST                                                                           20853
+#define WALK2_INCLUDESUBDIRS                                                                    20854
+#define WALK2_LOADLISTFILE                                                                      20855
 
 #define AD_FRAME                                                                                        20900

trunk/dll/fm3res.dlg ¶

@@ -54 +54 @@
   04 Aug 12 GKY Changes to allow copy and move over readonly files with a warning dialog; also added a warning dialog
                 for delete of readonly files
+  12 Aug 12 GKY Allow for selection of include subdirectories or a list file on initial startup of compare dirs
   
 ***********************************************************************/
@@ -2250 +2251 @@
         PUSHBUTTON      "~Help", IDM_HELP, 147, 4, 40, 14, BS_NOPOINTERFOCUS
         PUSHBUTTON      "Cancel", DID_CANCEL, 288, 4, 40, 14
+        AUTOCHECKBOX    "~Include subdirs", WALK2_INCLUDESUBDIRS, 60, 4, 60,
+                        8, BS_NOPOINTERFOCUS | WS_GROUP
+        AUTOCHECKBOX    "~Load list file", WALK2_LOADLISTFILE, 199, 4, 60,
+                        8, BS_NOPOINTERFOCUS | WS_GROUP               
     END
 END

trunk/dll/mainwnd.c ¶

@@ -112 +112 @@
   03 Oct 11 SHL Minor code cleanup
   05 Aug 12 GKY Make the Target Directory (DriveBar) a drop target.
+  12 Aug 12 GKY Allow for selection of include subdirectories or a list file on initial startup of compare dirs
 
 ***********************************************************************/
@@ -4785 +4786 @@
             cmp->size = sizeof(COMPARE);
             strcpy(cmp->leftdir, wa.szCurrentPath1);
-            strcpy(cmp->rightdir, wa.szCurrentPath2);
+            strcpy(cmp->rightdir, wa.szCurrentPath2);
+            cmp->listfile = wa.listfile;
+            cmp->includesubdirs = wa.includesubdirs;
             cmp->hwndParent = hwnd;
             cmp->dcd.hwndParent = hwnd;

trunk/dll/mainwnd2.c ¶

@@ -41 +41 @@
   11 Apr 10 GKY Fix drive tree rescan failure and program hang caused by event sem
                 never being posted
+  12 Aug 12 GKY Allow for selection of include subdirectories or a list file on initial startup of compare dirs
 
 ***********************************************************************/
@@ -554 +555 @@
             strcpy(cmp->leftdir, wa.szCurrentPath1);
             strcpy(cmp->rightdir, wa.szCurrentPath2);
+            cmp->listfile = wa.listfile;
+            cmp->includesubdirs = wa.includesubdirs;
             cmp->hwndParent = hwnd;
             cmp->dcd.hwndParent = hwnd;

trunk/dll/walkem.c ¶

@@ -37 +37 @@
   06 Oct 09 SHL Ctrl-select selects Walk Dialog listbox entry, but suppresses action
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  12 Aug 12 GKY Allow for selection of include subdirectories or a list file on initial startup of compare dirs
 
 ***********************************************************************/
@@ -1436 +1437 @@
                     WinWindowFromID(hwnd, WALK2_DRIVELIST),
                     WinWindowFromID(hwnd, WALK2_DIRLIST),
-                    wa->szCurrentPath2, FALSE);
+                    wa->szCurrentPath2, FALSE);
+    WinEnableWindow(WinWindowFromID(hwnd, WALK2_INCLUDESUBDIRS), TRUE);
+    WinEnableWindow(WinWindowFromID(hwnd, WALK2_LOADLISTFILE), TRUE);
+    if (wa->includesubdirs)
+      WinCheckButton(hwnd, WALK2_INCLUDESUBDIRS, TRUE);
     if (!PostMsg(hwnd, UM_SETUP4, MPVOID, MPVOID))
       okay = TRUE;
@@ -1508 +1513 @@
         WinSendDlgItemMsg(hwnd, SHORT1FROMMP(mp1), LM_QUERYITEMTEXT,
                           MPFROM2SHORT(sSelect, CCHMAXPATH),
-                          MPFROMP(szBuffer));
+                          MPFROMP(szBuffer));
     }
     switch (SHORT1FROMMP(mp1)) {
@@ -1681 +1686 @@
     }
     WinSetDlgItemText(hwnd, WALK2_PATH, wa->szCurrentPath2);
+    wa->includesubdirs = WinQueryButtonCheckstate(hwnd, WALK2_INCLUDESUBDIRS);
+    wa->listfile = WinQueryButtonCheckstate(hwnd, WALK2_LOADLISTFILE);
     switch (SHORT1FROMMP(mp1)) {
     case DID_OK:

trunk/dll/walkem.h ¶

@@ -10 +10 @@
 
   17 Jul 08 SHL Baseline
+  12 Aug 12 GKY Allow for selection of include subdirectories or a list file on initial startup of compare dirs
 
 ***********************************************************************/
@@ -26 +27 @@
   CHAR szCurrentPath1[CCHMAXPATH];
   CHAR szCurrentPath2[CCHMAXPATH];
+  BOOL includesubdirs;
+  BOOL listfile;
+
 }
 WALK2;