Changeset 1041

Timestamp:

Jul 7, 2008, 1:30:30 AM (17 years ago)

Author:

Gregg Young

Message:

Adds optional support for delete being move to X/Eworkplace trashcan (ticket 43)

Location:

trunk/dll

Files:

• collect.c (modified) (2 diffs)
• common.c (modified) (2 diffs)
• dircnrs.c (modified) (4 diffs)
• ipf/context.ipf (modified) (3 diffs)
• ipf/notebook.ipf (modified) (2 diffs)
• ipf/tutor.ipf (modified) (3 diffs)
• notebook.c (modified) (3 diffs)

trunk/dll/collect.c

@@ -48 +48 @@
   15 Feb 08 GKY Fix "collect" so it updates recollected files and unhides them if needed
   29 Feb 08 GKY Use xfree where appropriate
+  06 Jul 08 GKY Update delete/undelete to include move to and open XWP trashcan
 
 ***********************************************************************/
@@ -1794 +1795 @@
 
       case IDM_UNDELETE:
-        {
+        {
           PCNRITEM pci;
-          CHAR path[CCHMAXPATH];
-
-          pci = (PCNRITEM) CurrentRecord(hwnd);
-          if (pci) {
-            strcpy(path, pci->pszFileName);
-            MakeValidDir(path);
-            WinDlgBox(HWND_DESKTOP, hwnd, UndeleteDlgProc, FM3ModHandle,
-                      UNDEL_FRAME, MPFROMP(path));
+          CHAR path[CCHMAXPATH];
+          HOBJECT hObject;
+          HWND hwndDesktop;
+
+          hObject = WinQueryObject("<XWP_TRASHCAN>");
+          if (hObject != NULLHANDLE && fTrashCan) {
+            hwndDesktop = WinQueryDesktopWindow((HAB) 0, NULLHANDLE);
+            WinSetFocus(HWND_DESKTOP, hwndDesktop);
+            WinOpenObject(hObject, 0, TRUE);
+          }
+          else {
+            pci = (PCNRITEM) CurrentRecord(hwnd);
+            if (pci && (INT) pci != -1) {
+              strcpy(path, pci->pszFileName);
+              MakeValidDir(path);
+              WinDlgBox(HWND_DESKTOP, hwnd, UndeleteDlgProc, FM3ModHandle,
+                        UNDEL_FRAME, MPFROMP(path));
+            }
           }
         }

trunk/dll/common.c

@@ -21 +21 @@
   26 Aug 07 SHL Change to DosSleep(0)
   29 Feb 08 GKY Use xfree where appropriate
+  06 Jul 08 GKY Update delete/undelete to include move to and open XWP trashcan
 
 ***********************************************************************/
@@ -237 +238 @@
     break;
   case IDM_UNDELETE:
-    WinDlgBox(HWND_DESKTOP,
-              hwnd, UndeleteDlgProc, FM3ModHandle, UNDEL_FRAME, MPFROMP(dv));
+    {
+      HOBJECT hObject;
+      HWND hwndDesktop;
+
+      hObject = WinQueryObject("<XWP_TRASHCAN>");
+      if (hObject != NULLHANDLE && fTrashCan) {
+        hwndDesktop = WinQueryDesktopWindow((HAB) 0, NULLHANDLE);
+        WinSetFocus(HWND_DESKTOP, hwndDesktop);
+        WinOpenObject(hObject, 0, TRUE);
+      }
+    else
+      WinDlgBox(HWND_DESKTOP,
+                hwnd,
+                UndeleteDlgProc,
+                FM3ModHandle, UNDEL_FRAME, MPFROMP(dv));
+    }
     break;
   case IDM_CHKDSK:

trunk/dll/dircnrs.c

@@ -40 +40 @@
   21 Jun 08 GKY Fix columns to honor preferences on new container open.
   22 Jun 08 GKY Included free_... functions for fortify checking
+  06 Jul 08 GKY Update delete/undelete to include move to and open XWP trashcan
 
 ***********************************************************************/
@@ -53 +54 @@
 #define INCL_DOSERRORS
 #define INCL_LONGLONG
+#define INCL_WINWORKPLACE
 
 #include "fm3dlg.h"
@@ -2035 +2037 @@
         {
           PCNRITEM pci;
-          CHAR path[CCHMAXPATH];
-
-          pci = (PCNRITEM) CurrentRecord(hwnd);
-          if (pci && (INT) pci != -1) {
-            strcpy(path, pci->pszFileName);
-            MakeValidDir(path);
-            WinDlgBox(HWND_DESKTOP, hwnd, UndeleteDlgProc, FM3ModHandle,
-                      UNDEL_FRAME, MPFROMP(path));
+          CHAR path[CCHMAXPATH];
+          HOBJECT hObject;
+          HWND hwndDesktop;
+
+          hObject = WinQueryObject("<XWP_TRASHCAN>");
+          if (hObject != NULLHANDLE && fTrashCan) {
+            hwndDesktop = WinQueryDesktopWindow((HAB) 0, NULLHANDLE);
+            WinSetFocus(HWND_DESKTOP, hwndDesktop);
+            WinOpenObject(hObject, 0, TRUE);
+          }
+          else {
+            pci = (PCNRITEM) CurrentRecord(hwnd);
+            if (pci && (INT) pci != -1) {
+              strcpy(path, pci->pszFileName);
+              MakeValidDir(path);
+              WinDlgBox(HWND_DESKTOP, hwnd, UndeleteDlgProc, FM3ModHandle,
+                        UNDEL_FRAME, MPFROMP(path));
+            }
           }
         }
@@ -2048 +2060 @@
 
       case IDM_UNDELETESPEC:
-        WinDlgBox(HWND_DESKTOP,
-                  hwnd,
-                  UndeleteDlgProc,
-                  FM3ModHandle, UNDEL_FRAME, MPFROMP(dcd->directory));
-        break;
+        {
+          HOBJECT hObject;
+          HWND hwndDesktop;
+
+          hObject = WinQueryObject("<XWP_TRASHCAN>");
+          if (hObject != NULLHANDLE && fTrashCan) {
+            hwndDesktop = WinQueryDesktopWindow((HAB) 0, NULLHANDLE);
+            WinSetFocus(HWND_DESKTOP, hwndDesktop);
+            WinOpenObject(hObject, 0, TRUE);
+          }
+        else
+          WinDlgBox(HWND_DESKTOP,
+                    hwnd,
+                    UndeleteDlgProc,
+                    FM3ModHandle, UNDEL_FRAME, MPFROMP(dcd->directory));
+        }
+        break;
 
       case IDM_RESORT:

trunk/dll/ipf/context.ipf

@@ -11 +11 @@
 .* 03 Mar 07 GKY Update that file systems other than HPFS support long names
 .* 29 Feb 08 GKY Document unhide menu item
+.* 06 Jul 08 GKY Update delete/undelete to include option of using the XWP trashcan
 .*
 .***********************************************************************
@@ -363 +364 @@
 :p.
 :hp6.Delete:ehp6. deletes objects. If the :link reftype=hd
-res=92400.Confirm Delete:elink. toggle is on or one or more directories
+res=99950.Confirm Delete:elink. toggle is on or if one or more directories
 are among the selected objects, you get a dialog showing the selected
 objects and asking you to confirm that you really meant what you said.
 In that dialog you have a chance to remove some of the objects. If you
 have OS/2's Undelete enabled for the drive on which the objects reside, they
-may be recoverable. :artwork runin name='\bitmaps\file.bmp'. :artwork runin name='\bitmaps\fldr.bmp'.
+may be recoverable. You also have the option of having the files moved to the
+Xworkplaces/Eworkplace trahshcan from which they may be restorable.:link reftype=hd
+res=99950.Delete = move to trashcan:elink.
+:artwork runin name='\bitmaps\file.bmp'. :artwork runin name='\bitmaps\fldr.bmp'.
 :p.
 :artwork name='..\..\bitmaps\permdel.bmp' align=center.
@@ -746 +750 @@
 :artwork name='..\..\bitmaps\undelete.bmp' align=center.
 :p.
-This leads to a dialog that interfaces with UNDELETE.COM to allow you to
+If you have res=99950.Delete = move to trashcan:elink. enabled undelete
+will open the trahscan to facilitate resoring files. You will need to
+rescan the directory containers in order to see the restored files. Otherwise,
+this leads to a dialog that interfaces with UNDELETE.COM to allow you to
 undelete files. The drive that will be operated on is determined by the
 highlighted object in the directory tree. This dialog filters out files

trunk/dll/ipf/notebook.ipf

@@ -12 +12 @@
 .* 20 Mar 07 DG  Add description for Mommy make it stop
 .* 13 Aug 07 SHL Tweak scanning page
+.* 06 Jul 08 GKY Update delete/undelete to include the option of using the XWP trashcan
 .*
 .***********************************************************************
@@ -674 +675 @@
 the "=" is the operating system default pointer.
 :p.
+:hp6.Delete = move to trashcan:ehp6. controls what happens to files when
+they are deleted. The default (not Checked) will keep the same behavior
+FM/2 has always had. It will move the files to the OS/2 Deldir if it is
+specified in config.sys. Otherwise it will simply delete the files
+permanently. If this is selected and you have the trashcan from Xworkplace
+or Eworkplace installed the files will be moved to the trashcan for possible
+later restore.
+:p.
 If the :hp6.Confirm target:ehp6. checkbox is checked, as it is by
 default, FM/2 allows you to confirm the target directory to be used when

trunk/dll/ipf/tutor.ipf

@@ -9 +9 @@
 .*
 .* 05 Jan 07 GKY Update extraction tutorial
+.* 06 Jul 08 GKY Update delete tutorial to include move to trashcan
 .*
 .***********************************************************************
@@ -347 +348 @@
 :artwork name='..\..\bitmaps\permdel.bmp' align=left.
 :p.
-There are two styles of deleting under FM/2 -- a "regular" delete, that
+There are three styles of deleting under FM/2 -- a "regular" delete, that
 leaves the objects capable of being undeleted using OS/2's UNDELETE
-command or FM/2's Undelete Utility, and a "permanent" delete that does
+command or FM/2's Undelete Utility, or uses the Xworkplace/Eworkplace
+trashcan for file recovery, and a "permanent" delete that does
 not leave the object recoverable. "Permanent" deletions are usually
 faster than "recoverable" deletions. You can select which type you want
@@ -358 +360 @@
 is enabled to do non-permanent deletions. See :link reftype=launch
 object='VIEW.EXE' data='CMDREF.INF UNDELETE'.UNDELETE:elink. in the OS/2
-online help. Note&colon. FM/2 does not use the "Trashcan" that comes with
-eWorkPlace or XWorkPlace for non-permanent deletions. If you wish to use the
-"Trashcan" you can drag the items directly to it from FM/2.
+online help.
 :p.
 You can delete objects in many ways&colon.

trunk/dll/notebook.c

@@ -30 +30 @@
   22 Feb 08 JBS Ticket 230: Fix/improve various code related to state or presparam values in the INI file.
   29 Feb 08 GKY Changes to enable user settable command line length
-  29 Feb 08 GKY Use xfree where appropriate
   08 Mar 08 JBS Ticket 230: Replace prefixless INI keys for default directory containers with
-                keys using a "DirCnr." prefix
+  keys using a "DirCnr." prefix
+  06 Jul 08 GKY Update delete/undelete to include move to and open XWP trashcan
 
 ***********************************************************************/
@@ -1115 +1115 @@
     WinCheckButton(hwnd, CFGG_CONFIRMTARGET, fConfirmTarget);
     WinSetDlgItemText(hwnd, CFGG_TARGETDIR, targetdir);
+    WinCheckButton(hwnd, CFGG_TRASHCAN, fTrashCan);
     WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_SETCURRENTVALUE,
                       MPFROMLONG(MaxComLineStrg), MPVOID);
@@ -1217 +1218 @@
     fFM2Deletes = WinQueryButtonCheckstate(hwnd, CFGG_FM2DELETES);
     PrfWriteProfileData(fmprof, FM3Str, "FM2Deletes",
-                        &fFM2Deletes, sizeof(BOOL));
+                        &fFM2Deletes, sizeof(BOOL));
+    fTrashCan = WinQueryButtonCheckstate(hwnd, CFGG_TRASHCAN);
+    PrfWriteProfileData(fmprof, FM3Str, "TrashCan",
+                        &fTrashCan, sizeof(BOOL));
     fConfirmTarget = WinQueryButtonCheckstate(hwnd, CFGG_CONFIRMTARGET);
     PrfWriteProfileData(fmprof, appname, "ConfirmTarget",