Changeset 1666

Timestamp:

Aug 5, 2012, 10:47:46 PM (13 years ago)

Author:

Gregg Young

Message:

Added an accel key for Unlock;minor code cleanup

Location:

trunk/dll

Files:

• fm3res.rc (modified) (7 diffs)
• worker.c (modified) (1 diff)

trunk/dll/fm3res.rc

@@ -937 +937 @@
   "U",         IDM_UUDECODE,          SHIFT,CONTROL
   "u",         IDM_UPDATE,            CONTROL
+  "V",         IDM_UNLOCKFILE,        SHIFT,CONTROL
   "v",         IDM_VIEW,              CONTROL
   "w",         IDM_WALKDIR,           CONTROL
@@ -1277 +1278 @@
   MENUITEM "Extract...\tCtrl + x",IDM_EXTRACT
   MENUITEM "UUDecode...\tCtrl + U", IDM_UUDECODE
-  MENUITEM "UnLock file", IDM_UNLOCKFILE
+  MENUITEM "UnLock file...\tCtrl + V", IDM_UNLOCKFILE
   MENUITEM "",                  -1,                   MIS_SEPARATOR
   SUBMENU "~Delete",            IDM_DELETESUBMENU
@@ -1567 +1568 @@
   MENUITEM "Extract...\tCtrl + x",  IDM_EXTRACT
   MENUITEM "UUDecode...\tCtrl + U", IDM_UUDECODE
-  MENUITEM "UnLock file", IDM_UNLOCKFILE
+  MENUITEM "UnLock file...\tCtrl + V", IDM_UNLOCKFILE
   MENUITEM "",                  -1,                   MIS_SEPARATOR
   SUBMENU "~Delete",            IDM_DELETESUBMENU
@@ -1770 +1771 @@
   "U",         IDM_UUDECODE,          SHIFT,CONTROL
   "u",         IDM_UPDATE,            CONTROL
+  "V",         IDM_UNLOCKFILE,        SHIFT,CONTROL
   "v",         IDM_VIEW,              CONTROL
   "x",         IDM_EXTRACT,           CONTROL
@@ -2162 +2164 @@
          MENUITEM "Extract from selected...\tCtrl + x",IDM_EXTRACT
          MENUITEM "UUDecode selected...\tCtrl + U",IDM_UUDECODE
-         MENUITEM "UnLock file", IDM_UNLOCKFILE
+         MENUITEM "UnLock file...\tCtrl + V", IDM_UNLOCKFILE
          MENUITEM "Co~llect selected\tCtrl + C", IDM_COLLECT
          MENUITEM "Save full path(s) to ~clipboard\tCtrl + [",IDM_SAVETOCLIP
@@ -2243 +2245 @@
   MENUITEM "Extract from selected...\tCtrl + x",IDM_EXTRACT
   MENUITEM "UUDecode selected...\tCtrl + U",IDM_UUDECODE
-  MENUITEM "UnLock file", IDM_UNLOCKFILE
+  MENUITEM "UnLock file...\tCtrl + V", IDM_UNLOCKFILE
   MENUITEM "Co~llect selected\tCtrl + C", IDM_COLLECT
   MENUITEM "Save full path(s) to ~clipboard\tCtrl + [",IDM_SAVETOCLIP
@@ -2298 +2300 @@
   "s",         IDM_SUBJECT,           CONTROL
   "U",         IDM_UUDECODE,          SHIFT,CONTROL
+  "V",         IDM_UNLOCKFILE,        SHIFT,CONTROL
   "x",         IDM_EXTRACT,           CONTROL
   "+",         IDM_DESELECTMASK,      SHIFT,CONTROL

trunk/dll/worker.c

@@ -463 +463 @@
 
               case IDM_UNLOCKFILE:
-                runemf2(SEPARATE | KEEP | WINDOWED//| INVISIBLE | BACKGROUND
-                        | WAIT,
-                        HWND_DESKTOP, pszSrcFile, __LINE__,
-                        NULL, NULL, "%s %s", PCSZ_UNLOCKEXE, wk->li->list[x]);
+                if (IsFile(wk->li->list[x]) > 0 && fUnlock) {
+                  runemf2(SEPARATE | INVISIBLE | BACKGROUND | WAIT,
+                          HWND_DESKTOP, pszSrcFile, __LINE__,
+                          NULL, NULL, "%s %s", PCSZ_UNLOCKEXE, wk->li->list[x]);
+                }
                 break;