Changeset 1547 for trunk/dll

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).

Location:

trunk/dll

Files:

• collect.c (modified) (3 diffs)
• eas.c (modified) (1 diff)
• fm3dll2.h (modified) (1 diff)
• fm3res.rc (modified) (1 diff)

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:

trunk/dll/eas.c

@@ -1050 +1050 @@
       if (eap->head)
         Free_FEAList(eap->head);
+      xfree(mp2, pszSrcFile, __LINE__);
       free(eap);
       if (hptrIcon)

trunk/dll/fm3dll2.h

@@ -397 +397 @@
 #define IDM_PARTITIONLVM    1164
 #define IDM_OPENSUBCNRMENU  1165
+#define IDM_OPENDIRICON     1166
+#define IDM_OPENDIRDETAILS  1167
+#define IDM_OPENDIRTREE     1168
+#define IDM_OPENDIRWINDOW   1169
 
 #define IDM_UTILITIESMENU   2000

trunk/dll/fm3res.rc

@@ -1531 +1531 @@
   SUBMENU  "~Open",             IDM_OPENSUBMENU
   {
-         MENUITEM "Default\tF6",     IDM_OPENDEFAULT
-         MENUITEM "~Settings\tF7",   IDM_OPENSETTINGS
-  }
-  SUBMENU  "Open directory container",     IDM_OPENSUBCNRMENU
-  {
-         MENUITEM "Open container", IDM_OPENWINDOW
-         MENUITEM "Walk to open",   IDM_WALKDIR
+         MENUITEM "~Default\tF6",              IDM_OPENDEFAULT
+         MENUITEM "~Settings\tF7",            IDM_OPENSETTINGS
+         MENUITEM "~Open directory container", IDM_OPENDIRWINDOW
+         MENUITEM "~Walk to open",             IDM_WALKDIR
+         MENUITEM "WPS directory ~Icon",       IDM_OPENDIRICON
+         MENUITEM "WPS directory D~etails",    IDM_OPENDIRDETAILS
+         MENUITEM "WPS directory ~Tree",       IDM_OPENDIRTREE
   }
   SUBMENU "Create objects",     IDM_OBJECTSUBMENU