Changeset 878

Timestamp:

Nov 26, 2007, 2:20:00 PM (18 years ago)

Author:

Gregg Young

Message:

Added "Save as" and readonly file handling to internal editor; clean up ext path not checked on start up; Updated history.

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• dll/defview.c (modified) (1 diff)
• dll/fm3dlg.h (modified) (1 diff)
• dll/fm3dll.str (modified) (3 diffs)
• dll/fm3res.rc (modified) (3 diffs)
• dll/fm3str.h (modified) (4 diffs)
• dll/init.c (modified) (1 diff)
• dll/mle.h (modified) (3 diffs)
• dll/notebook.c (modified) (2 diffs)
• dll/viewer.c (modified) (11 diffs)

trunk/HISTORY

@@ -2 +2 @@
 
 3.09(pre)
- o Correct hex edit buffer sizing to avoid data loss
- o Use CopyPresParams to fix presparam inconsistencies in menus
- o Correct variable cast to fix hex code display problem
+ o Add "Save as" menu item to internal viewer (Gregg)
+ o Eliminate deletion of ext path if it was not valid on startup
+ allow saving of a currently not valid ext path with warning (Gregg)
+ o Internal editor now handles readonly files (Gregg)
+ o Correct hex edit buffer sizing to avoid data loss (Steven)
+ o Use CopyPresParams to fix presparam inconsistencies in menus  (Gregg)
+ o Correct variable cast to fix hex code display problem (Gregg)
 
 3.08

trunk/dll/defview.c

@@ -309 +309 @@
                            WINDOWED | SEPARATE |
                            ((fViewChild) ? CHILD : 0), NULL, dummy, NULL);
-              }
+              }
+              else if (fUseNewViewer) {
+                if (fExternalViewer || strcmp(realappname, FM3Str))
+                  hwndParent = HWND_DESKTOP;
+                StartViewer(hwndParent, 5, filename, hwndFrame);
+              }
               else
                 StartMLEEditor(hwndParent, 5, filename, hwndFrame);

trunk/dll/fm3dlg.h

@@ -329 +329 @@
 #define MLE_VIEWHTTP                                                                            21741
 #define MLE_VIEWFTP                                                                             21742
+#define MLE_EXPORTAS                                                                    21743
 
 #define SRCH_FRAME                                                                                      21800

trunk/dll/fm3dll.str

@@ -331 +331 @@
 No files found.
 FM/2: View HELP files
-\nModule: %s Line number: %u 
+\nModule: %s Line number: %u
                                   Error Message Information
 \nModule: %s Line number: %u\nOS/2 error: %d\nClass: %s\nAction: %s\nLocation: %s
@@ -876 +876 @@
 
 Fatal Error:
-
+%s is not a valid directory\nDo you wish to delete it?
 Version:
 FM/2 Lite
@@ -1005 +1005 @@
 %lu bytes/sector, %lu sector%s/unit
 Stats not meaningful
+%s is marked Read Only\n You will need to change its name to save.\n Select: yes to continue, no to open in viewer
+%s is marked Read Only\n You will need to change its name to save.
 $Id$

trunk/dll/fm3res.rc

@@ -28 +28 @@
   30 Aug 07 SHL Add accelerator support to QuickList windows
   05 Sep 07 SHL Small change for OpenWatcom wrc compat
+  26 Nov 07 GKY Added "Save as" to internal editor
 
 ***********************************************************************/
@@ -1730 +1731 @@
       MENUITEM "~Insert file...\tCtrl + i",       MLE_INSERTFILE
       MENUITEM "~Save file...\tCtrl + s",         MLE_EXPORTFILE
+      MENUITEM "Save ~as...\tCtrl + e",           MLE_EXPORTAS
       MENUITEM "~Change filename...\tCtrl + c",   MLE_SETEXPORTFILE
       MENUITEM "",                          -1,     MIS_SEPARATOR
@@ -1850 +1852 @@
    "R",      MLE_TOGGLEREADONLY,        CONTROL,SHIFT
    "s",      MLE_EXPORTFILE,            CONTROL
+   "e",      MLE_EXPORTAS,              CONTROL
    "f",      MLE_FINDFIRST,             CONTROL
    "I",      MLE_SENSITIVE,             SHIFT,CONTROL

trunk/dll/fm3str.h

@@ -16 +16 @@
   31 Mar 07 GKY Removed IDS_WC window class names
   06 Apr 07 GKY Add error message for drg work around
+  26 Nov 07 GKY Added new readonly in editor & ext path
 
 ***********************************************************************/
@@ -25 +26 @@
 // Last string reserved for cvs id
 
-#define IDS_NUMSTRS                                           1007
+#define IDS_NUMSTRS                                           1009
 
 #define IDS_OPENBUTTONHELP                                    0
@@ -843 +844 @@
 #define IDS_USUALDISCTEXT                                     860
 #define IDS_FATALERRORTEXT                                    876
+#define IDS_EXTPATHNOTVALIDTEXT                               877
 #define IDS_VERSIONTEXT                                       878
 #define IDS_FM2LITETEXT                                       879
@@ -969 +971 @@
 #define IDS_SECTORSTEXT                                      1004
 #define IDS_STATSMEANINGLESSTEXT                             1005
+#define IDS_EDITREADONLYFILETEXT                             1006
+#define IDS_EDITREADONLYFILETEXT2                            1007

trunk/dll/init.c

@@ -37 +37 @@
   01 Sep 07 GKY Use xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
   10 Nov 07 GKY Get thousands separator from country info for file sizes.
+  26 Nov 07 GKY Eliminate check of ext path on start up
 
 ***********************************************************************/

trunk/dll/mle.h

@@ -1 @@
-/**************************************************************************/
-/*                  MLE text editor/viewer source code                    */
-/*                    copyright (c) 1993 by M. Kimes                      */
-/*                        All rights reserved                             */
-/**************************************************************************/
+/***********************************************************************
+
+  $Id$
+
+  headers for internal viewer/editor
+
+  Copyright (c) 1993-98 M. Kimes
+  Copyright (c) 2002, 2006 Steven H. Levine
+
+  26 Nov 07 Add items to XMLEWNDPTR struct for "Save as" & readonly file handling
+
+***********************************************************************/
 
 /* MLE support macros */
@@ -235 +242 @@
   CHAR exportfilename[1027];
   CHAR importfilename[1027];
+  BOOL fileattrreadonly;
   FATTRS fattrs;
   ULONG cp;
@@ -240 +248 @@
   ULONG lastpos;
   BOOL killme;
+  BOOL saveas;
   BOOL dontclose;
   HWND hwndRestore, hwndFrame, hwndParent;

trunk/dll/notebook.c

@@ -20 +20 @@
   19 Aug 07 SHL Sync with SaveDirCnrState mods
   21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the rigth to the left pane
+  26 Nov 07 GKY Allow a currently nonvalid path in the ext path field with warning
 
 ***********************************************************************/
@@ -207 +208 @@
         if (IsFile(extractpath)) {
           ulResult = saymsg(MB_YESNOCANCEL | MB_ICONQUESTION | MB_DEFBUTTON1, HWND_DESKTOP,
-                     "Bad pathname", "%s is not a valid directory\nDo you wish to delete it?",
+                            GetPString(IDS_WARNINGTEXT),
+                            GetPString(IDS_EXTPATHNOTVALIDTEXT),
                             extractpath);
           if (ulResult == MBID_YES)

trunk/dll/viewer.c

@@ -14 +14 @@
   30 Mar 07 GKY Remove GetPString for window class names
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  26 Nov 07 GKY Allow open of readonly files in the editor with warning
+  26 Nov 07 GKY Add "Save as" menu option to editor
 
 ***********************************************************************/
@@ -64 +66 @@
   XMLEWNDPTR *vw;
   ULONG flFrameFlags = FCF_SYSMENU | FCF_SIZEBORDER | FCF_ICON |
-    FCF_TITLEBAR | FCF_MINMAX | FCF_MENU | FCF_ACCELTABLE | FCF_NOBYTEALIGN;
+      FCF_TITLEBAR | FCF_MINMAX | FCF_MENU | FCF_ACCELTABLE | FCF_NOBYTEALIGN;
+  ULONG ulResult;
+  BOOL OpenInViewer = FALSE, readonly = FALSE;
+  FILESTATUS3 fs3;
 
   if (fExternalViewer || strcmp(realappname, FM3Str))
     hwndClient = HWND_DESKTOP;
-  if ((flags & 1) && fUseNewViewer)
-    return StartViewer(hwndClient, (USHORT) flags, filename, hwndRestore);
+  DosQueryPathInfo(filename, FIL_STANDARD, &fs3, sizeof(fs3));
+  if (fs3.attrFile & FILE_READONLY) {
+    ulResult = saymsg(MB_YESNOCANCEL | MB_ICONQUESTION | MB_DEFBUTTON1, HWND_DESKTOP,
+                      GetPString(IDS_WARNINGTEXT),
+                      GetPString(IDS_EDITREADONLYFILETEXT),
+                      filename);
+    switch (ulResult){
+    case MBID_YES:{
+      readonly = TRUE;
+      break;
+    }
+
+    case MBID_NO:
+      if (fUseNewViewer)
+        return StartViewer(hwndClient, (USHORT) flags, filename, hwndRestore);
+      else{
+        OpenInViewer = TRUE;
+        break;
+      }
+
+    case MBID_CANCEL:
+        return (HWND) 0;
+    }
+  }
 
   vw = xmallocz(sizeof(XMLEWNDPTR), pszSrcFile, __LINE__);
@@ -75 +102 @@
     return (HWND) 0;
   vw->size = sizeof(XMLEWNDPTR);
+  if (readonly)
+    vw->fileattrreadonly = TRUE;
+  else
+    vw->fileattrreadonly = FALSE;
   if (flags & 1) {
     if (flags & 8)
@@ -95 +126 @@
     flFrameFlags |= FCF_TASKLIST;
   hwndFrame = WinCreateStdWindow(hwndClient,
-                                 WS_VISIBLE,
+                                 0,
                                  &flFrameFlags,
                                  WC_MLEEDITOR,
                                  NullStr,
-                                 WS_VISIBLE | fwsAnimate,
+                                 fwsAnimate,
                                  FM3ModHandle, MLE_FRAME, &hwnd);
   if (hwndFrame) {
@@ -143 +174 @@
                       SWP_ACTIVATE);
     }
-    MLEsetreadonly(hwndMLE, ((flags & 1) != 0));
+    if (OpenInViewer | (flags & 1))
+      MLEsetreadonly(hwndMLE, ((flags & 1) != 0));
     WinSetWindowPtr(hwnd, QWL_USER, (PVOID) vw);
     if (!PostMsg(hwnd, UM_SETUP, MPVOID, MPFROMLONG(hwndClient)))
@@ -731 +763 @@
           if (temp == MBID_CANCEL)
             break;
-          if (temp == MBID_YES)
+          if (temp == MBID_YES){
             WinSendMsg(hwnd,
-                       WM_COMMAND, MPFROM2SHORT(MLE_EXPORTFILE, 0), MPVOID);
+                       WM_COMMAND, MPFROM2SHORT(MLE_EXPORTFILE, 0), MPVOID);
+            if (vw->fileattrreadonly) {
+              temp = saymsg(MB_OKCANCEL | MB_ICONEXCLAMATION,
+                            hwnd, NullStr, "File is readonly and has not been saved");
+              if (temp == MBID_CANCEL)
+                return 0;
+            }
+          }
         }
         MLEclearall(hwndMLE);
@@ -770 +809 @@
       break;
 
+    case MLE_EXPORTAS:
+      vw->saveas = TRUE;
+      WinSendMsg(hwnd,
+                 WM_COMMAND, MPFROM2SHORT(MLE_SETEXPORTFILE, 0), MPVOID);
+      break;
+
     case IDM_RENAME:
     case MLE_SETEXPORTFILE:
       if (vw && !MLEgetreadonly(hwndMLE)) {
 
-        CHAR filename[1027];
+        CHAR filename[1027];
+        ULONG ulResult;
 
         strcpy(filename, vw->exportfilename);
-        if (export_filename(hwnd, filename, 1)) {
+        if (export_filename(hwnd, filename, !vw->fileattrreadonly)) {
           if (stricmp(filename, vw->exportfilename)) {
-            vw->ch = TRUE;
-            MLEsetchanged(hwndMLE, TRUE);
+            vw->ch = TRUE;
+            vw->fileattrreadonly = FALSE;
+            MLEsetchanged(hwndMLE, TRUE);
             strcpy(vw->exportfilename, filename);
-            WinSendMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
-          }
+            WinSendMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
+            if (vw->saveas) {
+              vw->saveas = FALSE;
+              WinSendMsg(hwnd,
+                         WM_COMMAND, MPFROM2SHORT(MLE_EXPORTFILE, 0), MPVOID);
+            }
+          }
+          else if (vw->fileattrreadonly){
+              ulResult = saymsg(MB_OKCANCEL | MB_ICONQUESTION | MB_DEFBUTTON1, HWND_DESKTOP,
+                                GetPString(IDS_WARNINGTEXT),
+                                GetPString(IDS_EDITREADONLYFILETEXT2),
+                                filename);
+              if (ulResult == MBID_OK){
+                WinSendMsg(hwnd,
+                           WM_COMMAND, MPFROM2SHORT(MLE_SETEXPORTFILE, 0), MPVOID);
+                break;
+              }
+              else
+                vw->saveas = FALSE;
+          }
+          else if (vw->saveas = TRUE) {
+            vw->saveas = FALSE;
+            WinSendMsg(hwnd,
+                       WM_COMMAND, MPFROM2SHORT(MLE_EXPORTFILE, 0), MPVOID);
+          }
         }
       }
@@ -789 +859 @@
 
     case MLE_EXPORTFILE:
+      if (vw->fileattrreadonly){
+        WinSendMsg(hwnd,
+                   WM_COMMAND, MPFROM2SHORT(MLE_SETEXPORTFILE, 0), MPVOID);
+        break;
+      }
       if (!MLEgetreadonly(hwndMLE)) {
 
@@ -807 +882 @@
           FILE *fp;
 
-          fp = xfopen(vw->exportfilename, "r+", pszSrcFile, __LINE__);
+          fp = fopen(vw->exportfilename, "r+"); //, pszSrcFile, __LINE__);
           if (fp) {
             oldsize = filelength(fileno(fp));
@@ -942 +1017 @@
 
         strcpy(filename, vw->exportfilename);
-        if (export_filename(hwnd, filename, 1))
+        if (export_filename(hwnd, filename, !vw->fileattrreadonly))
           MLEdoblock(hwndMLE, WRITE, filename);
       }
@@ -1138 +1213 @@
         if (temp == MBID_CANCEL)
           return 0;
-        if (temp == MBID_YES)
+        if (temp == MBID_YES){
           WinSendMsg(hwnd,
-                     WM_COMMAND, MPFROM2SHORT(MLE_EXPORTFILE, 0), MPVOID);
+                     WM_COMMAND, MPFROM2SHORT(MLE_EXPORTFILE, 0), MPVOID);
+          if (vw->fileattrreadonly) {
+            temp = saymsg(MB_OKCANCEL | MB_ICONEXCLAMATION,
+                          hwnd, NullStr, "File is readonly and has not been saved");
+            if (temp == MBID_CANCEL)
+                return 0;
+          }
+        }
       }
     }