Changeset 1675 for trunk/dll/mainwnd.c

Timestamp:

Dec 31, 2012, 12:15:44 AM (13 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

File:

• trunk/dll/mainwnd.c (modified) (6 diffs)

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;