Ticket #3065: styled_patch2.patch

src/apps/stylededit/StyledEditWindow.cpp

@@ -1 @@
-/*
+/* 
  * Copyright 2002-2010, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
- *
+ * 
  * Authors:
  *      Mattias Sundblad
  *      Andrew Bachmann
  *      Philippe Saint-Pierre
  *      Jonas Sundström
- */
+ */ 
 
 
 #include "Constants.h"
@@ -70 +70 @@
 }
 
 
-// #pragma mark -
+// #pragma mark - 
 
 
 StyledEditWindow::StyledEditWindow(BRect frame, int32 id, uint32 encoding)
@@ -447 +447 @@
             fClearItem->SetEnabled(false);
             break;
         case TEXT_CHANGED:
-            if (fUndoFlag) {
-                if (fUndoCleans) {
-                    // we cleaned!
-                    fClean = true;
-                    fUndoCleans = false;
-                } else if (fClean) {
-                    // if we were clean
-                    // then a redo will make us clean again
-                    fRedoCleans = true;
-                    fClean = false;
+            if (!fDiscardFakeChanged)
+            {
+                if (fUndoFlag) {
+                    if (fUndoCleans) {
+                        // we cleaned!
+                        fClean = true;
+                        fUndoCleans = false;
+                    } else if (fClean) {
+                        // if we were clean
+                        // then a redo will make us clean again
+                        fRedoCleans = true;
+                        fClean = false;
+                    }
+                    // set mode
+                    fCanUndo = false;
+                    fCanRedo = true;
+                    fUndoItem->SetLabel(B_TRANSLATE("Redo typing"));
+                    fUndoItem->SetEnabled(true);
+                    fUndoFlag = false;
+                } else {
+                    if (fRedoFlag && fRedoCleans) {
+                        // we cleaned!
+                        fClean = true;
+                        fRedoCleans = false;
+                    } else if (fClean) {
+                        // if we were clean
+                        // then an undo will make us clean again
+                        fUndoCleans = true;
+                        fClean = false;
+                    } else {
+                        // no more cleaning from undo now...
+                        fUndoCleans = false;
+                    }
+                    // set mode
+                    fCanUndo = true;
+                    fCanRedo = false;
+                    fUndoItem->SetLabel(B_TRANSLATE("Undo typing"));
+                    fUndoItem->SetEnabled(true);
+                    fRedoFlag = false;
                 }
-                // set mode
-                fCanUndo = false;
-                fCanRedo = true;
-                fUndoItem->SetLabel(B_TRANSLATE("Redo typing"));
-                fUndoItem->SetEnabled(true);
-                fUndoFlag = false;
-            } else {
-                if (fRedoFlag && fRedoCleans) {
-                    // we cleaned!
-                    fClean = true;
-                    fRedoCleans = false;
-                } else if (fClean) {
-                    // if we were clean
-                    // then an undo will make us clean again
-                    fUndoCleans = true;
-                    fClean = false;
+                if (fClean) {
+                    fRevertItem->SetEnabled(false);
+                    fSaveItem->SetEnabled(fSaveMessage == NULL);
                 } else {
-                    // no more cleaning from undo now...
-                    fUndoCleans = false;
+                    fRevertItem->SetEnabled(fSaveMessage != NULL);
+                    fSaveItem->SetEnabled(true);
                 }
-                // set mode
-                fCanUndo = true;
-                fCanRedo = false;
-                fUndoItem->SetLabel(B_TRANSLATE("Undo typing"));
-                fUndoItem->SetEnabled(true);
-                fRedoFlag = false;
-            }
-            if (fClean) {
-                fRevertItem->SetEnabled(false);
-                fSaveItem->SetEnabled(fSaveMessage == NULL);
             } else {
-                fRevertItem->SetEnabled(fSaveMessage != NULL);
-                fSaveItem->SetEnabled(true);
+                fDiscardFakeChanged = false;
             }
             break;
 
@@ -517 +522 @@
     BMessage documents;
     be_roster->GetRecentDocuments(&documents, 9, NULL, APP_SIGNATURE);
 
-    // delete old items..
-    //    shatty: it would be preferable to keep the old
-    //            menu around instead of continuously thrashing
-    //            the menu, but unfortunately there does not
-    //            seem to be a straightforward way to update it
-    // going backwards may simplify memory management
+    //  delete old items..
+    //          shatty: it would be preferable to keep the old
+    //              menu around instead of continuously thrashing
+    //              the menu, but unfortunately there does not
+    //              seem to be a straightforward way to update it
+    //              going backwards may simplify memory management
     for (int i = fRecentMenu->CountItems(); i-- > 0;) {
         delete fRecentMenu->RemoveItem(i);
     }
@@ -863 +868 @@
     int32 currentLine = 0;
     while (currentLine < linesInDocument) {
         float currentHeight = 0;
-        while (currentHeight < printableRect.Height() && currentLine < linesInDocument) {
+        while (currentHeight < printableRect.Height() 
+            && currentLine < linesInDocument) {
             currentHeight += fTextView->LineHeight(currentLine);
             if (currentHeight < printableRect.Height())
                 currentLine++;
@@ -958 +964 @@
     documentPath.Append(name);
     get_ref_for_path(documentPath.Path(), &documentRef);
 
-    return *ref == documentRef;
+    return (*ref) == documentRef;
 }
 
 
@@ -992 +998 @@
     fCaseSensitive = false;
     fWrapAround = false;
     fBackSearch = false;
+    
+    // fake changed message flag
+    fDiscardFakeChanged = false;
 
     // add menubar
     fMenuBar = new BMenuBar(BRect(0, 0, 0, 0), "menubar");
@@ -1028 +1037 @@
         new BMessage(MENU_NEW), 'N'));
     menuItem->SetTarget(be_app);
 
-    menu->AddItem(menuItem = new BMenuItem(fRecentMenu =
-        new BMenu(B_TRANSLATE("Open" B_UTF8_ELLIPSIS)),
-            new BMessage(MENU_OPEN)));
+    menu->AddItem(menuItem = new BMenuItem(
+        fRecentMenu = new BMenu(B_TRANSLATE("Open" B_UTF8_ELLIPSIS)),
+        new BMessage(MENU_OPEN)));
     menuItem->SetShortcut('O', 0);
     menuItem->SetTarget(be_app);
     menu->AddSeparatorItem();
@@ -1043 +1052 @@
     menuItem->SetShortcut('S', B_SHIFT_KEY);
     menuItem->SetEnabled(true);
 
-    menu->AddItem(fRevertItem =
-        new BMenuItem(B_TRANSLATE("Revert to saved" B_UTF8_ELLIPSIS),
+    menu->AddItem(
+        fRevertItem = new BMenuItem(
+        B_TRANSLATE("Revert to saved" B_UTF8_ELLIPSIS), 
         new BMessage(MENU_REVERT)));
     fRevertItem->SetEnabled(false);
-    menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Close"),
+    menu->AddItem(
+        menuItem = new BMenuItem(B_TRANSLATE("Close"), 
         new BMessage(MENU_CLOSE), 'W'));
 
     menu->AddSeparatorItem();
@@ -1148 +1159 @@
         BLUE, new BMessage(FONT_COLOR)));
     fFontColorMenu->AddItem(fCyanItem = new ColorMenuItem(B_TRANSLATE("Cyan"),
         CYAN, new BMessage(FONT_COLOR)));
-    fFontColorMenu->AddItem(fMagentaItem = new ColorMenuItem(B_TRANSLATE("Magenta"),
+    fFontColorMenu->AddItem(
+        fMagentaItem = new ColorMenuItem(B_TRANSLATE("Magenta"),
         MAGENTA, new BMessage(FONT_COLOR)));
     fFontColorMenu->AddItem(fYellowItem = new ColorMenuItem(B_TRANSLATE("Yellow"),
         YELLOW, new BMessage(FONT_COLOR)));
@@ -1324 +1336 @@
 
         BString text;
         if (status == B_BAD_TYPE)
+        {
             bs_printf(&text,
-                B_TRANSLATE("Error loading \"%s\":\n\tUnsupported format"), name);
-        else
+                B_TRANSLATE("Error loading \"%s\":\n\t"
+                "Unsupported format.\n"
+                "The file may contain raw data."), name);
+            _ShowAlert(text, B_TRANSLATE("OK"), "", "", B_WARNING_ALERT);
+        } else {    
             bs_printf(&text, B_TRANSLATE("Error loading \"%s\":\n\t%s"),
                 name, strerror(status));
-
-        _ShowAlert(text, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
-        return status;
+            _ShowAlert(text, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
+            return status;
+        }
+        
+        // If the type of the file is bad we display it as binary data
+        status = file.Seek(0, SEEK_SET);
+        if (status != B_OK)
+        {
+            return status;
+        }
+        char buf[1024];
+        ssize_t read_data;
+        while ((read_data = file.Read(buf, 1023)) > 0)
+        {
+            buf[(int)read_data] = '\0';
+            fTextView->Insert(buf, (const text_run_array*) NULL);
+        }
+        fDiscardFakeChanged = true;
     }
 
     // update alignment

src/apps/stylededit/StyledEditWindow.h

@@ -133 +133 @@
             bool                fCaseSensitive;
             bool                fWrapAround;
             bool                fBackSearch;
+            // When loading a binary file a fake changed message 
+            // is generated from the StyleEditView
+            // and with this flag we ignore this message
+            bool                fDiscardFakeChanged;
 
             StyledEditView*     fTextView;
             BScrollView*        fScrollView;