Changeset 796

Timestamp:

Aug 22, 2007, 1:22:27 AM (18 years ago)

Author:

Gregg Young

Message:

Make subject column in dircnrs movable from one pane to the other; allow column to be sized truncating long subjects

Location:

trunk

Files:

• HISTORY (modified) (2 diffs)
• dll/fm3dlg.h (modified) (2 diffs)
• dll/fm3dll.h (modified) (3 diffs)
• dll/fm3res.dlg (modified) (4 diffs)
• dll/init.c (modified) (3 diffs)
• dll/ipf/notebook.ipf (modified) (2 diffs)
• dll/misc.c (modified) (1 diff)
• dll/notebook.c (modified) (5 diffs)

trunk/HISTORY

@@ -10 +10 @@
  o Rework states logic to allow longer state names, tickets #109, #31 (Steven)
  o Report delta time in debug messages (Steven)
+ o Improved container load times by increasing the number of files processed in each
+   pass; "FileBuf" is now settable most places (See readme since most will need to
+   reset this manually). (Gregg)
+ o Added BldFullPathName cleaned up comp dirs code fix right left misalignment(Steven)
+ o Added BldQuotedFileName and BldQuotedFullPathName to streamline code. (Steven, Gregg)
+ o Increased limit on Subject EA to 1024 from 40. (Gregg)
+ o Corrected dir sizes accel key to ctrl + z. (Gregg)
+ o Fixed addition of ff in Hex notation by archiver editor. (John)
+ o Updated build instructions on FM/2 Wiki. (David)
+ o Dir sizes correct some sizing and positioning issues. (Steve)
+ o Removed error message in eas.c which caused seek and scan for text including eas to fail on
+   read only files. (Gregg)
+ o Fixed unnecessary menu item removal when FM/2 is run as the WPS.(Gregg)
  o Fixed the restore of the settings under "Include in details view" on the "DirView"
    tab of the configuration notebook, Ticket 118/71 (John)
+ o Subject column can be moved to left side of split bar in directory container 
+   and/or sized which will truncate long subjects (Gregg)
 
 3.06
@@ -1286 +1301 @@
 
 $Id$
+

trunk/dll/fm3dlg.h

@@ -17 +17 @@
   02 Jan 07 GKY Add always paths opt to extract
   07 Jan 07 GKY Add remember search flags to seek and scan
+  21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the rigth to the left pane
 
 ***********************************************************************/
@@ -713 +714 @@
 #define CFG5_FILTER                                                                             25519
 #define CFG5_EXTERNALCOLLECTOR                                  25520
+#define CFG5_SUBJECTLENGTHMAX                                                           25521
+#define CFG5_SUBJECTDISPLAYWIDTH                                                        25522
+#define CFG5_SUBJECTINLEFTPANE                                                          25523
 
 #define CFGTS_FRAME                     25599

trunk/dll/fm3dll.h

@@ -60 +60 @@
   19 Aug 07 SHL Move FILESTOGET_MIN/MAX here
   19 Aug 07 SHL Update SaveDirCnrState return
+  21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the rigth to the left pane
 
 ***********************************************************************/
@@ -1380 +1381 @@
   fSwitchTreeExpand, fCollapseFirst, fFilesInTree, fNoDead,
   fThreadNotes, fOkayMinimize, fRunning, fDullMin, fBlueLED,
-  fViewChild, fShowEnv, fLeaveTree,  fNoFoldMenu,
+  fViewChild, fShowEnv, fLeaveTree, fNoFoldMenu, fSubjectInLeftPane,
   fCustomFileDlg, fSaveMiniCmds, fSaveBigCmds, fNoTileUpdate,
   fFM2Deletes, fAutoAddAllDirs, fConfirmTarget, fChangeTarget,
-  fFirstTime, fShowTarget, fNoFinger, fDrivebarHelp, fCheckMM;
+  fFirstTime, fShowTarget, fNoFinger, fDrivebarHelp, fCheckMM,
+  fSubjectLengthMax;
 DATADEF BOOL detailsladate, detailslatime, detailscrdate, detailscrtime,
   detailslongname, detailsea, detailssize, detailssubject,
@@ -1427 +1429 @@
 #define FILESTOGET_MAX  4096
 
-DATADEF ULONG ulCnrType, FilesToGet, AutoviewHeight, TreeWidth, FM3UL;
+DATADEF ULONG ulCnrType, FilesToGet, AutoviewHeight, TreeWidth, FM3UL, SubjectDisplayWidth;
 DATADEF long prnwidth, prnlength, prntmargin, prnbmargin, prnlmargin,
   prnrmargin, prnspacing, prntabspaces;

trunk/dll/fm3res.dlg

@@ -29 +29 @@
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
   13 Aug 07 SHL Tweak scanning page
+  21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the rigth to the left pane
 
 ***********************************************************************/
@@ -1619 +1620 @@
         GROUPBOX        "Include in detail view:", -1, 4, 16, 236, 72, NOT
                         WS_GROUP
+        GROUPBOX        "Subject Column Settings:", -1, 120, 90, 110, 48, NOT WS_GROUP
         AUTORADIOBUTTON "Icon", CFG5_ICON, 12, 118, 42, 10,
                         BS_NOCURSORSELECT | WS_GROUP | WS_TABSTOP
@@ -1628 +1630 @@
                         BS_NOCURSORSELECT | WS_TABSTOP
         AUTOCHECKBOX    "MiniIcons", CFG5_MINIICONS, 12, 94, 58, 10
+        AUTOCHECKBOX    "Subject Left", CFG5_SUBJECTINLEFTPANE, 128, 118, 66, 10
+        AUTOCHECKBOX    "Subject Max Width", CFG5_SUBJECTLENGTHMAX, 128, 106, 66, 10
         AUTOCHECKBOX    "Field Titles", CFG5_SHOWTITLES, 12, 68, 66, 10,
                         WS_GROUP
@@ -1642 +1646 @@
         AUTOCHECKBOX    "CR Dates", CFG5_SHOWCRDATE, 164, 56, 66, 10
         AUTOCHECKBOX    "CR Times", CFG5_SHOWCRTIME, 164, 44, 66, 10
+        LTEXT           "Subject Width", -1, 128, 92, 45, 12, NOT WS_GROUP
+        CONTROL         "", CFG5_SUBJECTDISPLAYWIDTH, 175, 96, 45, 12, WC_SPINBUTTON,
+                        SPBS_ALLCHARACTERS  | SPBS_MASTER |
+                        SPBS_JUSTCENTER | WS_TABSTOP | SPBS_FASTSPIN |
+                        WS_VISIBLE
         ENTRYFIELD      "", CFG5_FILTER, 45, 4, 192, 8, ES_MARGIN |
                         ES_READONLY | WS_GROUP
-        PUSHBUTTON      "~Help", IDM_HELP, 168, 98, 40, 14, BS_NOPOINTERFOCUS |
-                        WS_GROUP
-        PUSHBUTTON      "~Undo", IDM_UNDO, 168, 116, 40, 14, BS_NOPOINTERFOCUS
+        PUSHBUTTON      "~Help", IDM_HELP, 250, 68, 40, 14, BS_NOPOINTERFOCUS |
+                        WS_GROUP
+        PUSHBUTTON      "~Undo", IDM_UNDO, 250, 85, 40, 14, BS_NOPOINTERFOCUS
     END
 END

trunk/dll/init.c

@@ -31 +31 @@
   18 Aug 07 JBS Added code to read Details* keys from the INI file (Ticket 118)
   19 Aug 07 SHL Ensure FilesToGet in valid range
+  21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the rigth to the left pane
 
 ***********************************************************************/
@@ -1272 +1273 @@
                       &size);
   size = sizeof(ULONG);
-  PrfQueryProfileData(fmprof, appname, "FilesToGet", (PVOID)&FilesToGet,
+  PrfQueryProfileData(fmprof, appname, "FilesToGet", (PVOID) &FilesToGet,
                       &size);
   if (FilesToGet < FILESTOGET_MIN)
@@ -1319 +1320 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "DetailsIcon", (PVOID) &detailsicon,
-                      &size);
+                      &size);
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, appname, "SubjectInLeftPane", (PVOID) &fSubjectInLeftPane,
+                      &size);
+  size = sizeof(ULONG);
+  PrfQueryProfileData(fmprof, appname, "SubjectDisplayWidth", (PVOID) &SubjectDisplayWidth,
+                      &size);
+  if (SubjectDisplayWidth < 50)
+    SubjectDisplayWidth = 0;
+  else if (SubjectDisplayWidth > 1000)
+    SubjectDisplayWidth = 1000;
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, appname, "SubjectLengthMax", (PVOID) &fSubjectLengthMax,
+                      &size);
 
   /* load pointers and icons we use */

trunk/dll/ipf/notebook.ipf

@@ -153 +153 @@
 full size or in miniature in views that show icons.
 :p.
+The :hp6.Subject Column Settings:ehp6. section allows you to set the width of
+of the subject column which can be quite wide if you have any long subjects
+in a directory. The :hp6.Subject Width:ehp6. spin button will show 0 if the
+:hp6.Subject Max Width:ehp6. button (which sets the column to the width of
+the longest subject in the directory) is selected. In addition you can move the
+subject column to the left side of the slide bar by selecting :hp6.Subject
+Left:ehp6.
+
+:p.
 The :hp6.Field Titles:ehp6. group (analogous to the Views->Details Setup
 submenu) allows you to control what is shown in a Details view. Each
@@ -323 +332 @@
 all expanded branches in the tree before switching because of one of the
 two above switch events.
-This option is will significantly slow down switching
+This option will significantly slow down switching
 if you a large number of directories in the Drive Tree.
 :p.

trunk/dll/misc.c

@@ -516 +516 @@
     // Fill in column info for subjects
 
-    pfi = pfi->pNextFieldInfo;
-    pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
-    if (isCompCnr)
-      pfi->flData |= CFA_FIREADONLY;
-    pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
-    pfi->pTitleData = isCompCnr ? GetPString(IDS_STATUS) :
+    if (fSubjectInLeftPane) {
+      pfi = pfi->pNextFieldInfo;
+      pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
+      if (isCompCnr)
+        pfi->flData |= CFA_FIREADONLY;
+      pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
+      pfi->pTitleData = isCompCnr ? GetPString(IDS_STATUS) :
                                   GetPString(IDS_SUBJ);
-    pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
-
-    // Store the current pfi value as that will be used to indicate the
-    // last column in the lefthand container window (we have a splitbar)
-
-    pfiLastLeftCol = pfi;
+      pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
+      pfi->cxWidth = SubjectDisplayWidth;
+
+      // Store the current pfi value as that will be used to indicate the
+      // last column in the lefthand container window (we have a splitbar)
+
+      pfiLastLeftCol = pfi;
+    }
+    else {
+      // Store the current pfi value as that will be used to indicate the
+      // last column in the lefthand container window (we have a splitbar)
+
+      pfiLastLeftCol = pfi;
+      pfi = pfi->pNextFieldInfo;
+      pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
+      if (isCompCnr)
+        pfi->flData |= CFA_FIREADONLY;
+      pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
+      pfi->pTitleData = isCompCnr ? GetPString(IDS_STATUS) :
+                                  GetPString(IDS_SUBJ);
+      pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
+      pfi->cxWidth = SubjectDisplayWidth;
+    }
 
     // Fill in column information for the file size

trunk/dll/notebook.c

@@ -19 +19 @@
   13 Aug 07 SHL Rework FilesToGet min/max to match how DosFindFirst/Next works
   19 Aug 07 SHL Sync with SaveDirCnrState mods
+  21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the rigth to the left pane
 
 ***********************************************************************/
@@ -594 +595 @@
         WinCheckButton(hwnd, CFG6_SORTNAME, TRUE);
       if (TreesortFlags & SORT_REVERSE)
-        WinCheckButton(hwnd, CFG6_SORTREVERSE, TRUE);
+        WinCheckButton(hwnd, CFG6_SORTREVERSE, TRUE);
     }
     return 0;
@@ -1341 +1342 @@
   switch (msg) {
   case WM_INITDLG:
+    WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETTEXTLIMIT,
+                      MPFROMSHORT(8), MPVOID);
+    WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_OVERRIDESETLIMITS,
+                      MPFROMLONG(1000), MPFROMLONG(50));
     WinSendDlgItemMsg(hwnd,
                       CFG5_FILTER,
@@ -1394 +1399 @@
       strcpy(mask.prompt, GetPString(IDS_DEFDIRFILTERTITLETEXT));
       WinSetDlgItemText(hwnd, CFG5_FILTER, mask.szMask);
+      WinCheckButton(hwnd, CFG5_SUBJECTINLEFTPANE, fSubjectInLeftPane);
+      WinCheckButton(hwnd, CFG5_SUBJECTLENGTHMAX, fSubjectLengthMax);
+      WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETCURRENTVALUE,
+                      MPFROMLONG(SubjectDisplayWidth), MPVOID);
     }
     return 0;
@@ -1519 +1528 @@
                         &detailsattr, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.DetailsAttr",
-                        &detailsattr, sizeof(BOOL));
+                        &detailsattr, sizeof(BOOL));
+    fSubjectInLeftPane = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTINLEFTPANE);
+    PrfWriteProfileData(fmprof, appname, "SubjectInLeftPane",
+                        &fSubjectInLeftPane, sizeof(BOOL));
+    PrfWriteProfileData(fmprof, appname, "DirCnr.SubjectInLeftPane",
+                        &fSubjectInLeftPane, sizeof(BOOL));
+    fSubjectLengthMax = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX);
+    PrfWriteProfileData(fmprof, appname, "SubjectLengthMax",
+                        &fSubjectInLeftPane, sizeof(BOOL));
+    PrfWriteProfileData(fmprof, appname, "DirCnr.SubjectLengthMax",
+                        &fSubjectInLeftPane, sizeof(BOOL));
     *mask.prompt = 0;
     PrfWriteProfileData(fmprof, appname, "DirFilter", &mask, sizeof(MASK));
+    {
+        if (!WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX)) {
+        WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_QUERYVALUE,
+                        MPFROMP(&SubjectDisplayWidth), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+        if (SubjectDisplayWidth < 50)
+          SubjectDisplayWidth  = 0;
+        else if (SubjectDisplayWidth > 1000)
+          SubjectDisplayWidth = 1000;
+        }
+        else
+          SubjectDisplayWidth  = 0;
+        PrfWriteProfileData(fmprof,
+                            appname, "SubjectDisplayWidth",
+                            &SubjectDisplayWidth, sizeof(ULONG));
+        PrfWriteProfileData(fmprof,
+                            appname, "DirCnr.SubjectDisplayWidth",
+                            &SubjectDisplayWidth, sizeof(ULONG));
+    }
     break;
   }