Changeset 922

Timestamp:

Jan 13, 2008, 8:50:30 PM (17 years ago)

Author:

Gregg Young

Message:

Get Subjectwidth/left working in the collector

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• dll/dircnrs.h (modified) (1 diff)
• dll/init.c (modified) (1 diff)
• dll/misc.c (modified) (1 diff)
• dll/notebook.c (modified) (5 diffs)

trunk/HISTORY ¶

@@ -9 +9 @@
  o Rework Config menu.  Move some to submenu.  Add drag&drop dialog toggle. (Steven)
  o Rework Walk dialog.  Put entry field at the top. (Steven)
+ o Get Subjectwidth/left working in the collector. (Gregg)
 
 3.09

trunk/dll/dircnrs.h ¶

@@ -125 +125 @@
   BOOL detailsladate, detailslatime, detailscrdate, detailscrtime,
     detailslongname, detailsea, detailssize, detailssubject,
-    detailslwdate, detailslwtime, detailsattr, detailsicon;
+    detailslwdate, detailslwtime, detailsattr, detailsicon,
+    fSubjectInLeftPane, fSubjectLengthMax, SubjectDisplayWidth;
   CHAR **lastselection;
   USHORT shiftstate;

trunk/dll/init.c ¶

@@ -1305 +1305 @@
   PrfQueryProfileData(fmprof, appname, "SubjectInLeftPane", &fSubjectInLeftPane,
                       &size);
-  size = sizeof(ULONG);
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "SubjectLengthMax", &fSubjectLengthMax,
-                      &size);
+                      &size);
   if (fSubjectLengthMax)
     SubjectDisplayWidth = 0;

trunk/dll/misc.c ¶

@@ -1316 +1316 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, s, (PVOID) bool, &size);
+  strcpy(eos, "SubjectInLeftPane");
+  if (dcd)
+    bool = &dcd->fSubjectInLeftPane;
+  else
+    bool = &fSubjectInLeftPane;
+  *bool = fSubjectInLeftPane;
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, appname, s, (PVOID) bool, &size);
+  strcpy(eos, "SubjectLengthMax");
+  if (dcd)
+    bool = &dcd->fSubjectLengthMax;
+  else
+    bool = &fSubjectLengthMax;
+  *bool = fSubjectLengthMax;
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, appname, s, (PVOID) bool, &size);
+  if (dcd) {
+    if (dcd->fSubjectLengthMax)
+      dcd->SubjectDisplayWidth = 0;
+    else {
+      strcpy(eos, "SubjectDisplayWidth");
+      bool = &dcd->SubjectDisplayWidth;
+      *bool = SubjectDisplayWidth;
+      size = sizeof(ULONG);
+      PrfQueryProfileData(fmprof, appname, s, (PVOID) bool, &size);
+      if (dcd->SubjectDisplayWidth < 50)
+        dcd->SubjectDisplayWidth = 0;
+      else if (dcd->SubjectDisplayWidth > 1000)
+        dcd->SubjectDisplayWidth = 1000;
+    }
+  }
+  else {
+    if (fSubjectLengthMax)
+      SubjectDisplayWidth = 0;
+    else {
+      strcpy(eos, "SubjectDisplayWidth");
+      bool = &SubjectDisplayWidth;
+      *bool = SubjectDisplayWidth;
+      size = sizeof(ULONG);
+      PrfQueryProfileData(fmprof, appname, s, (PVOID) bool, &size);
+      if (SubjectDisplayWidth < 50)
+        SubjectDisplayWidth = 0;
+      else if (SubjectDisplayWidth > 1000)
+        SubjectDisplayWidth = 1000;
+    }
+  }
 }
 

trunk/dll/notebook.c ¶

@@ -1679 +1679 @@
       WinCheckButton(hwnd, CFG5_SUBJECTLENGTHMAX, fSubjectLengthMax);
       WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETCURRENTVALUE,
-                      MPFROMLONG(SubjectDisplayWidth), MPVOID);
+                        MPFROMLONG(SubjectDisplayWidth), MPVOID);
     }
     return 0;
@@ -1813 +1813 @@
     fSubjectLengthMax = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX);
     PrfWriteProfileData(fmprof, appname, "SubjectLengthMax",
-                        &fSubjectInLeftPane, sizeof(BOOL));
+                        &fSubjectLengthMax, sizeof(BOOL));
     PrfWriteProfileData(fmprof, appname, "DirCnr.SubjectLengthMax",
-                        &fSubjectInLeftPane, sizeof(BOOL));
+                        &fSubjectLengthMax, sizeof(BOOL));
     *mask.prompt = 0;
     PrfWriteProfileData(fmprof, appname, "DirFilter", &mask, sizeof(MASK));
@@ -1966 +1966 @@
   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, EM_SETTEXTLIMIT,
                       MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
@@ -2028 +2032 @@
       WinCheckButton(hwnd, CFG5_SHOWCRTIME, dcd.detailscrtime);
       WinCheckButton(hwnd, CFG5_SHOWATTR, dcd.detailsattr);
+      WinCheckButton(hwnd, CFG5_SUBJECTINLEFTPANE, dcd.fSubjectInLeftPane);
+      WinCheckButton(hwnd, CFG5_SUBJECTLENGTHMAX, dcd.fSubjectLengthMax);
+      WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_SETCURRENTVALUE,
+                        MPFROMLONG(dcd.SubjectDisplayWidth), MPVOID);
+
     }
     return 0;
@@ -2136 +2145 @@
       dcd.detailsattr = WinQueryButtonCheckstate(hwnd, CFG5_SHOWATTR);
       PrfWriteProfileData(fmprof, appname, "Collector.DetailsAttr",
-                          &dcd.detailsattr, sizeof(BOOL));
+                          &dcd.detailsattr, sizeof(BOOL));
+      dcd.fSubjectInLeftPane = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTINLEFTPANE);
+      PrfWriteProfileData(fmprof, appname, "Collector.SubjectInLeftPane",
+                          &dcd.fSubjectInLeftPane, sizeof(BOOL));
+      dcd.fSubjectLengthMax = WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX);
+      PrfWriteProfileData(fmprof, appname, "Collector.SubjectLengthMax",
+                          &dcd.fSubjectLengthMax, sizeof(BOOL));
       *mask.prompt = 0;
       PrfWriteProfileData(fmprof,
-                          appname, "CollectorFilter", &mask, sizeof(MASK));
+                          appname, "CollectorFilter", &mask, sizeof(MASK));
+      {
+        if (!WinQueryButtonCheckstate(hwnd, CFG5_SUBJECTLENGTHMAX)) {
+          WinSendDlgItemMsg(hwnd, CFG5_SUBJECTDISPLAYWIDTH, SPBM_QUERYVALUE,
+                            MPFROMP(&dcd.SubjectDisplayWidth), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+          if (dcd.SubjectDisplayWidth < 50)
+            dcd.SubjectDisplayWidth = 0;
+          else if (dcd.SubjectDisplayWidth > 1000)
+            dcd.SubjectDisplayWidth = 1000;
+        }
+        else
+          dcd.SubjectDisplayWidth = 0;
+        PrfWriteProfileData(fmprof,
+                            appname, "Collector.SubjectDisplayWidth",
+                            &dcd.SubjectDisplayWidth, sizeof(ULONG));
+      }
     }
     break;