Changeset 1083

Timestamp:

07/20/08 17:31:07 (6 weeks ago)

Author:

jbs

Message:

Ticket 114: Support user-selectable env. strings in Tree container.

Location:

trunk/dll

Files:

• filldir.c (modified) (3 diffs)
• fm3res.dlg (modified) (2 diffs)
• init.c (modified) (3 diffs)
• ipf/notebook.ipf (modified) (2 diffs)
• notebook.c (modified) (4 diffs)
• notebook.h (modified) (2 diffs)

trunk/dll/filldir.c

@@ -43 +43 @@
   07 Jul 08 SHL Use NULL rather than NullStr in FreeCnrItemData
   16 JUL 08 GKY Use TMP directory for temp files
+  20 Jul 08 JBS Ticket 114: Support user-selectable env. strings in Tree container.
 
 ***********************************************************************/
@@ -65 +66 @@
 #include "misc.h"                       // GetTidForWindow
 #include "fortify.h"                    // 06 May 08 SHL
+#include "notebook.h"                   // INI file fields
 #include "fm3dll.h"
 
@@ -1384 +1386 @@
         char *p, *pp;
 
-        p = GetPString(IDS_ENVVARNAMES);
+        p = pszTreeEnvVarList;
         while (*p == ' ')
           p++;

trunk/dll/fm3res.dlg

@@ -34 +34 @@
   29 Feb 08 GKY Add presparams & update appearence of "Sizes" dialog
   19 Jul 08 JBS Ticket 197: Support accelerator keys in setting dialogs.
+  20 Jul 08 JBS Ticket 114: Support user-selectable env. strings in Tree container.
 
 ***********************************************************************/
@@ -1946 +1947 @@
         AUTOCHECKBOX    "Show ~env. vars in Tree", CFGT_SHOWENV, 4, 32, 132,
                         10
+        ENTRYFIELD      "", CFGT_ENVVARLIST, 120, 32, 196, 8, ES_MARGIN | ES_AUTOSCROLL
         PUSHBUTTON      "~Help", IDM_HELP, 8, 4, 40, 14, BS_NOPOINTERFOCUS |
                         WS_GROUP

trunk/dll/init.c

@@ -52 +52 @@
   17 Jul 08 SHL Reduce code bulk in fUseTmp setup
   19 Jul 08 GKY Use pFM2SaveDirectory, MakeTempName and move temp files to TMP subdirectory if (TMP).
+  20 Jul 08 JBS Ticket 114: Support user-selectable env. strings in Tree container.
 
 ***********************************************************************/
@@ -1085 +1086 @@
   if (!mailrun)
     return 0; //already complained
+  pszTreeEnvVarList = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!pszTreeEnvVarList)
+    return 0; //already complained
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "ShowTarget", &fShowTarget, &size);
@@ -1176 +1180 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "ShowEnv", &fShowEnv, &size);
+  size = MaxComLineStrg;
+  PrfQueryProfileData(fmprof, appname, "TreeEnvVarList", pszTreeEnvVarList, &size);
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "LeaveTree", &fLeaveTree, &size);

trunk/dll/ipf/notebook.ipf

@@ -13 +13 @@
 .* 13 Aug 07 SHL Tweak scanning page
 .* 06 Jul 08 GKY Update delete/undelete to include the option of using the XWP trashcan
+.* 20 Jul 08 JBS Ticket 114: Support user-selectable env. strings in Tree container.
 .*
 .***********************************************************************
@@ -344 +345 @@
 The :hp6.Show env. vars in Tree:ehp6. toggle determines whether FM/2
 shows a few environment variable lists (like PATH, DPATH and LIBPATH)
-in the Drive Tree.
+in the Drive Tree. Use the entry field to specify a blank-separated
+list of the desired environment variables.
 
 

trunk/dll/notebook.c

@@ -37 +37 @@
                 DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
   19 Jul 08 JBS Ticket 197: Support accelerator keys in setting dialogs.
+  20 Jul 08 JBS Ticket 114: Support user-selectable env. strings in Tree container.
 
 ***********************************************************************/
@@ -1169 +1170 @@
   switch (msg) {
   case WM_INITDLG:
+    WinSendDlgItemMsg(hwnd, CFGT_ENVVARLIST, EM_SETTEXTLIMIT,
+                      MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -1182 +1185 @@
     WinCheckButton(hwnd, CFGT_SWITCHTREEEXPAND, fSwitchTreeExpand);
     WinCheckButton(hwnd, CFGT_SHOWENV, fShowEnv);
+    WinSetDlgItemText(hwnd, CFGT_ENVVARLIST, pszTreeEnvVarList);
     return 0;
 
@@ -1262 +1266 @@
     fShowEnv = WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV);
     PrfWriteProfileData(fmprof, appname, "ShowEnv", &fShowEnv, sizeof(BOOL));
+    {
+      char * pszTemp = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+      if (pszTemp)
+      {
+        WinQueryDlgItemText(hwnd, CFGT_ENVVARLIST, MaxComLineStrg, pszTemp);
+        strupr(pszTemp);
+        if (strcmp(pszTemp, pszTreeEnvVarList))
+        {
+          strcpy(pszTreeEnvVarList, pszTemp);
+          PrfWriteProfileString(fmprof, appname, "TreeEnvVarList", pszTreeEnvVarList);
+          if (hwndTree && fShowEnv) {
+            PostMsg(WinWindowFromID
+                    (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
+                    MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+          }
+        }
+        free(pszTemp);
+      } else {
+        // Report error?
+      }
+    }
     break;
   }

trunk/dll/notebook.h

@@ -11 +11 @@
   14 Feb 08 SHL Refactor from fm3dll.h
   29 Feb 08 GKY Refactor global command line variables to notebook.h
+  20 Jul 08 JBS Ticket 114: Support user-selectable env. strings in Tree container.
 
 ***********************************************************************/
@@ -37 +38 @@
 
 DATADEF CHAR *editor, *viewer, *virus, *compare, *binview, *bined,
-  *dircompare, *ftprun, *httprun, *mailrun;
+  *dircompare, *ftprun, *httprun, *mailrun, *pszTreeEnvVarList;
 DATADEF CHAR ftprundir[CCHMAXPATH], httprundir[CCHMAXPATH],
   mailrundir[CCHMAXPATH], targetdir[CCHMAXPATH];