Changeset 1043 for trunk/dll

Timestamp:

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

Author:

Gregg Young

Message:

Rest of changes for using trashcan as a delete option (ticket 43)

Location:

trunk/dll

Files:

• fm3dlg.h (modified) (3 diffs)
• fm3dll.h (modified) (1 diff)
• fm3res.dlg (modified) (3 diffs)

trunk/dll/fm3dlg.h

@@ -19 +19 @@
   21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the right to the left pane
   11 Jan 08 SHL Correct all to 3 column tabs since dialog editors assume this
-  29 Feb 08 GKY Changes to enable user settable command line length  
+  29 Feb 08 GKY Changes to enable user settable command line length
 
 ***********************************************************************/
@@ -628 +628 @@
 #define CFGG_VERIFYWRITES                                                               25206
 #define CFGG_DNDDLG                                                                             25207
-#define CFGG_DEFAULTDELETEPERM                                          25208
+#define CFGG_DEFAULTDELETEPERM                                          25208
 #define CFGG_PRINTER                                                                            25209
 #define CFGG_NODEAD                                                                             25210
@@ -637 +637 @@
 #define CFGG_TARGETDIR                                                                  25215
 #define CFGG_CMDLNLNGTH                                                                 25216
+#define CFGG_TRASHCAN                                                                   25217
 
 #define CFGB_FRAME                                                                      25250

trunk/dll/fm3dll.h

@@ -1142 +1142 @@
   fSubjectLengthMax, fNoLargeFileSupport, fNoMailtoMailRun,
   fHttpRunWPSDefault, fFtpRunWPSDefault, fLibPathStrictMailRun,
-  fLibPathStrictHttpRun, fLibPathStrictFtpRun, fCancelAction;
+  fLibPathStrictHttpRun, fLibPathStrictFtpRun, fCancelAction, fTrashCan;
 DATADEF BOOL detailsladate, detailslatime, detailscrdate, detailscrtime,
   detailslongname, detailsea, detailssize, detailssubject,

trunk/dll/fm3res.dlg

@@ -2753 +2753 @@
         AUTOCHECKBOX    "Con~firm target", CFGG_CONFIRMTARGET, 4, 56, 106,
                         10
-        LTEXT           "Target directory:", -1, 4, 44, 102, 8
-        ENTRYFIELD      "", CFGG_TARGETDIR, 6, 32, 246, 8, ES_MARGIN
+        LTEXT           "Target directory:", -1, 4, 34, 102, 8
+        ENTRYFIELD      "", CFGG_TARGETDIR, 6, 22, 246, 8, ES_MARGIN
         AUTOCHECKBOX    "~Link sets icon", CFGG_LINKSETSICON, 122, 128, 106,
                         10
@@ -2760 +2760 @@
                         132, 10
         AUTOCHECKBOX    "~Drag&drop dialog", CFGG_DNDDLG, 122, 104, 106, 10
-        AUTOCHECKBOX    "Default delete ~perm.", CFGG_DEFAULTDELETEPERM, 122,
+        AUTOCHECKBOX    "Default delete ~permanent", CFGG_DEFAULTDELETEPERM, 122,
                         92, 106, 10
         CONTROL         "'Momm~y, make it stop!'", CFGG_NODEAD, 122, 80, 106,
@@ -2766 +2766 @@
         AUTOCHECKBOX    "FM/~2 deletes dragged items", CFGG_FM2DELETES, 122,
                         68, 130, 10
-        LTEXT           "Command line length", -1, 122, 56, 60, 10, NOT WS_GROUP
-        CONTROL         "", CFGG_CMDLNLNGTH, 184, 56, 44, 10, WC_SPINBUTTON,
+        AUTOCHECKBOX    "Delete = move to trashcan", CFGG_TRASHCAN, 122, 56, 106,
+                        10
+        LTEXT           "Command line length:", -1, 122, 44, 60, 10, NOT WS_GROUP
+        CONTROL         "", CFGG_CMDLNLNGTH, 184, 46, 44, 10, WC_SPINBUTTON,
                         SPBS_NUMERICONLY | SPBS_MASTER | SPBS_SERVANT |
                         SPBS_JUSTCENTER | WS_TABSTOP | SPBS_FASTSPIN |