Changeset 1547 for trunk/dll/collect.c

Timestamp:

Oct 24, 2010, 8:32:55 PM (15 years ago)

Author:

Gregg Young

Message:

Improvements to collector opening directory container from the path of the selected item. More completely matches the change requested (Ticket 362).

File:

• trunk/dll/collect.c (modified) (3 diffs)

trunk/dll/collect.c

@@ -1755 +1755 @@
 
       case IDM_WALKDIR:
-      case IDM_OPENWINDOW:
+      case IDM_OPENDIRWINDOW:
+      case IDM_OPENDIRICON:
+      case IDM_OPENDIRDETAILS:
+      case IDM_OPENDIRTREE:
         {
           CHAR newpath[CCHMAXPATH];
@@ -1767 +1770 @@
           else
             strcpy(newpath, pFM2SaveDirectory);
-          if (SHORT1FROMMP(mp1) == IDM_WALKDIR)
-            WinDlgBox(HWND_DESKTOP, dcd->hwndParent, WalkAllDlgProc,
-                      FM3ModHandle, WALK_FRAME, MPFROMP(newpath));
-          if (!*newpath)
-            break;
-          WinSendMsg(hwnd, UM_OPENWINDOWFORME, MPFROMP(newpath), MPVOID);
+          if (*newpath) {
+            switch (SHORT1FROMMP(mp1)) {
+            case IDM_WALKDIR:
+              WinDlgBox(HWND_DESKTOP, dcd->hwndParent, WalkAllDlgProc,
+                        FM3ModHandle, WALK_FRAME, MPFROMP(newpath));
+              break;
+            case IDM_OPENDIRWINDOW:
+              WinSendMsg(hwnd, UM_OPENWINDOWFORME, MPFROMP(newpath), MPVOID);
+              break;
+            case IDM_OPENDIRICON:
+              OpenObject(newpath, PCSZ_ICON, hwnd);
+              break;
+            case IDM_OPENDIRDETAILS:
+              OpenObject(newpath, Details, hwnd);
+              break;
+            case IDM_OPENDIRTREE:
+              OpenObject(newpath, PCSZ_TREE, hwnd);
+              break;
+            default:
+              break;
+            }
+          }
         }
         break;
@@ -2211 +2230 @@
       case IDM_UPDATE:
       case IDM_COLLECTFROMFILE:
-      //case IDM_OPENWINDOW:
+      case IDM_OPENWINDOW:
       case IDM_OPENSETTINGS:
       case IDM_OPENDEFAULT: