Changeset 1675

Timestamp:

Dec 31, 2012, 12:15:44 AM (12 years ago)

Author:

Gregg Young

Message:

Enhance traget directory drop to give the option of changing the directory or carrying out an operation to the current target; Added an error message for target=None; Added parameter to SetTargetDir. Ticket 373

Location:

trunk/dll

Files:

• collect.c (modified) (1 diff)
• dircnrs.c (modified) (1 diff)
• fm3res.rc (modified) (2 diffs)
• fm3str.h (modified) (2 diffs)
• mainwnd.c (modified) (6 diffs)
• mkdir.c (modified) (3 diffs)
• mkdir.h (modified) (2 diffs)
• notebook.c (modified) (2 diffs)
• seeall.c (modified) (1 diff)
• treecnr.c (modified) (1 diff)

trunk/dll/collect.c ¶

@@ -1707 +1707 @@
       switch (SHORT1FROMMP(mp1)) {
       case IDM_SETTARGET:
-        SetTargetDir(hwnd, FALSE);
+        SetTargetDir(hwnd, FALSE, NULL);
         break;
 

trunk/dll/dircnrs.c ¶

@@ -1814 +1814 @@
       switch (SHORT1FROMMP(mp1)) {
       case IDM_SETTARGET:
-        SetTargetDir(hwnd, FALSE);
+        SetTargetDir(hwnd, FALSE, NULL);
         break;
 

trunk/dll/fm3res.rc ¶

@@ -62 +62 @@
                 copy, move and delete operations
   05 Sep 12 SHL Sync collector menu with docs
+  30 Dec 12 GKY Enhance traget directory drop to give the option of changing the directory or carrying out an
+                operation to the current target; Added an error message for target = None;
   
 ***********************************************************************/
@@ -3403 +3405 @@
     IDS_FM2CMDHELPTEXT2                   "\r\rType ""/SAVE"" or ""/NOSAVE"" to save (or not) cmd lines between sessions.\r\r[Up arrow] or [down arrow] or [+] button for listbox of previous command lines, then [Delete] to remove one or [Enter] to reuse.\r\rOr type a command to be executed"
     IDS_FM2CMDHELPTEXT3                   " (metastrings like %%a available.)\r\rDouble-click entry field to simulate hitting [Enter].\r\rF5 is the accelerator for this mini-command line."
+    IDS_DROPSETSTARGET                    "Do you wish to use this directory as the new target directory? \nYes sets target\nNo proceeds with drag/drop operation to current target"
+    IDS_NOTARGETSET                       "A target directory has not been set"
   END
 

trunk/dll/fm3str.h ¶

@@ -46 +46 @@
   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
+  30 Dec 12 GKY Enhance traget directory drop to give the option of changing the directory or carrying out an
+                operation to the current target; Added an error message for target = None;
 
 ***********************************************************************/
@@ -107 +109 @@
 #define IDS_INIFAILURETEXT                                    51
 #define IDS_DUPLICATEHOTKEYTEXT                               52
+#define IDS_DROPSETSTARGET                                    53
+#define IDS_NOTARGETSET                                       54
 #define IDS_HELPCMDTEXT                                       56
 #define IDS_ZEROBYTETEXT                                      58

trunk/dll/mainwnd.c ¶

@@ -1824 +1824 @@
       SetPresParams(hwnd,
                     &RGBGREY, &rgb, &RGBGREY, FNT_8HELVETICA);
-      SetTargetDir(hwnd, TRUE);
+      SetTargetDir(hwnd, TRUE, NULL);
     }
     return 0;
@@ -1899 +1899 @@
 
   case DM_DROP:
-    if (targetdir) {
+    if (targetdir && strlen(targetdir) > 2) {
       CNRDRAGINFO cnd;
       LISTINFO *li;
-      ULONG action = UM_ACTION;
+      ULONG action = UM_ACTION, ret;
 
       if (emphasized) {
@@ -1916 +1916 @@
       CheckPmDrgLimit(cnd.pDragInfo);
       if (li) {
+        if (!li->list[1] && !IsFile(li->list[0])) {
+          ret = saymsg(MB_YESNO,
+                   HWND_DESKTOP,
+                       NullStr,
+                       GetPString(IDS_DROPSETSTARGET));
+          if (ret == MBID_YES) {
+            SetTargetDir(hwnd, TRUE, li->list[0]);
+            break;
+          }
+        }
         strcpy(li->targetpath, targetdir);
         strcat(li->targetpath, PCSZ_BACKSLASH);
@@ -2033 +2043 @@
           FreeListInfo(li);
         else
-          WinSendMsg(hwndTree, UM_ACTION, MPFROMP(li), MPFROMLONG(action));
-      }
-      break;
+          WinSendMsg(hwndTree, UM_ACTION, MPFROMP(li), MPFROMLONG(action));
+    }
+    else {
+      CNRDRAGINFO cnd;
+      LISTINFO *li;
+
+      if (emphasized) {
+        emphasized = FALSE;
+        DrawTargetEmphasis(hwnd, emphasized);
+      }
+      memset(&cnd, 0, sizeof(cnd));
+      cnd.pDragInfo = (PDRAGINFO) mp1;
+      cnd.pRecord = NULL;
+      li = DoFileDrop(hwnd,
+                      NULL,
+                      TRUE, MPFROM2SHORT(TREE_CNR, CN_DROP), MPFROMP(&cnd));
+      CheckPmDrgLimit(cnd.pDragInfo);
+      if (li && !li->list[1] && !IsFile(li->list[0]))
+        SetTargetDir(hwnd, TRUE, li->list[0]);
+      else
+        saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
+               GetPString(IDS_WARNINGTEXT),
+               GetPString(IDS_NOTARGETSET));
+    }
+    break;
 
   case WM_CHAR:
@@ -3438 +3470 @@
     PrfQueryProfileString(fmprof, FM3Str, szKey, NULL, targetdir, sizeof(targetdir));
     PrfWriteProfileString(fmprof, FM3Str, "TargetDir", targetdir);
-    SetTargetDir(NULLHANDLE, TRUE);
+    SetTargetDir(NULLHANDLE, TRUE, NULL);
   }
   size = sizeof(SWP);
@@ -4725 +4757 @@
 
   case IDM_SETTARGET:
-    SetTargetDir(hwnd, FALSE);
+    SetTargetDir(hwnd, FALSE, NULL);
     break;
 

trunk/dll/mkdir.c ¶

@@ -15 +15 @@
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
   23 Oct 10 GKY Add ForwardslashToBackslash function to streamline code
+  30 Dec 12 GKY Enhance traget directory drop to give the option of changing the directory or carrying out an
+                operation to the current target; Added an error message for target=None;
+                Added parameter to SetTargetDir
 
 ***********************************************************************/
@@ -224 +227 @@
 }
 
-void SetTargetDir(HWND hwnd, BOOL justshow)
+/*
+ * SetTargetDir sets or unsets the target directory
+ * either from the walk dialog or a directory dropped
+ * on the drivesback bar which is passed as "newtarget".
+ * justshow allows you to update the target without opening
+ * the walk dialog.
+ */
+void SetTargetDir(HWND hwnd, BOOL justshow, PSZ newtarget)
 {
 
@@ -250 +260 @@
     }
   }
-
+  if (newtarget && justshow)
+    strcpy(targetdir, newtarget);
   if (hwndBack) {
     if (fShowTarget)

trunk/dll/mkdir.h ¶

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2008 Steven H. Levine
+  Copyright (c) 2013 Steven H. Levine
 
   Change log
+  30 Dec 12 GKY Enhance traget directory drop to give the option of changing the directory or carrying out an
+                operation to the current target; Added an error message for target=None;
+                Added parameter to SetTargetDir
 
 ***********************************************************************/
@@ -19 +22 @@
 BOOL PMMkDir(HWND hwnd, CHAR * filename, BOOL copy);
 APIRET SetDir(HWND hwndClient, HWND hwnd, CHAR * dir, INT flags);
-void SetTargetDir(HWND hwnd, BOOL justshow);
+void SetTargetDir(HWND hwnd, BOOL justshow, PSZ newtarget);
 
 // Data declarations

trunk/dll/notebook.c ¶

@@ -1574 +1574 @@
 
   case UM_SETUP5:
-    SetTargetDir(hwnd, FALSE);
+    SetTargetDir(hwnd, FALSE, NULL);
     WinSetDlgItemText(hwnd, CFGG_TARGETDIR, targetdir);
     return 0;
@@ -2200 +2200 @@
           PostMsg(WinQueryWindow(hwndMain, QW_PARENT),
                   WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
-        SetTargetDir(hwnd, TRUE);
+        SetTargetDir(hwnd, TRUE, NULL);
       }
       dummy = WinQueryButtonCheckstate(hwnd, CFGM_SEPARATEPARMS);

trunk/dll/seeall.c ¶

@@ -3985 +3985 @@
     switch (SHORT1FROMMP(mp1)) {
     case IDM_SETTARGET:
-      SetTargetDir(hwnd, FALSE);
+      SetTargetDir(hwnd, FALSE, NULL);
       break;
 

trunk/dll/treecnr.c ¶

@@ -2395 +2395 @@
       switch (SHORT1FROMMP(mp1)) {
       case IDM_SETTARGET:
-        SetTargetDir(hwnd, FALSE);
+        SetTargetDir(hwnd, FALSE, NULL);
         break;