Ticket #10053: 0001-improved-find-and-replace-in-styleedit.patch

src/apps/stylededit/FindWindow.cpp

@@ -24 +24 @@
 
 #undef B_TRANSLATION_CONTEXT
 #define B_TRANSLATION_CONTEXT "FindandReplaceWindow"
-
+bool FindWindow::alredyExist = false;
 
 FindWindow::FindWindow(BRect frame, BHandler* _handler, BString* searchString,
     bool caseState, bool wrapState, bool backState)
-    : BWindow(frame, "FindWindow", B_MODAL_WINDOW,
+    : BWindow(frame, B_TRANSLATE("Find Window"), B_FLOATING_WINDOW,
         B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS,
         B_CURRENT_WORKSPACE)
 {
+    alredyExist = true;
+    
     AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED));
 
     fSearchString = new BTextControl("", B_TRANSLATE("Find:"), NULL, NULL);
@@ -74 +76 @@
 }
 
 
+FindWindow::~FindWindow()
+{
+    alredyExist = false;    
+}
+
+
 void
 FindWindow::MessageReceived(BMessage* msg)
 {

src/apps/stylededit/FindWindow.h

@@ -23 +23 @@
                         FindWindow(BRect frame, BHandler* handler,
                             BString* searchString, bool caseState,
                             bool wrapState, bool backState);
+                        ~FindWindow();
 
         virtual void    MessageReceived(BMessage* message);
         virtual void    DispatchMessage(BMessage* message, BHandler* handler);
+        
+        static bool     alredyExist;
 
     private:
         void            _SendMessage();

src/apps/stylededit/ReplaceWindow.cpp

@@ -27 +27 @@
 
 #undef B_TRANSLATION_CONTEXT
 #define B_TRANSLATION_CONTEXT "FindandReplaceWindow"
+bool ReplaceWindow::alredyExist = false;
 
 ReplaceWindow::ReplaceWindow(BRect frame, BHandler* _handler,
     BString* searchString,  BString* replaceString,
     bool caseState, bool wrapState, bool backState)
-    : BWindow(frame, "ReplaceWindow", B_MODAL_WINDOW,
+    : BWindow(frame, B_TRANSLATE("Replace Window"), B_FLOATING_WINDOW,
         B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS,
         B_CURRENT_WORKSPACE)
 {
+    alredyExist = true;
+    
     AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED));
 
     fSearchString = new BTextControl("", B_TRANSLATE("Find:"), NULL, NULL);
@@ -92 +95 @@
 }
 
 
+ReplaceWindow::~ReplaceWindow()
+{
+    alredyExist = false;
+}
+
+
 void
 ReplaceWindow::MessageReceived(BMessage* msg)
 {

src/apps/stylededit/ReplaceWindow.h

@@ -26 +26 @@
                         ReplaceWindow(BRect frame, BHandler* _handler,
                             BString* searchString, BString* replaceString,
                             bool caseState, bool wrapState, bool backState);
+                        ~ReplaceWindow();
 
         virtual void    MessageReceived(BMessage* message);
         virtual void    DispatchMessage(BMessage* message, BHandler* handler);
+        
+        static bool         alredyExist;
 
     private:
         void            _SendMessage(uint32 what);

src/apps/stylededit/StyledEditWindow.cpp

@@ -235 +235 @@
             break;
         case MENU_FIND:
         {
-            BRect findWindowFrame(100, 100, 400, 235);
-            BWindow* window = new FindWindow(findWindowFrame, this,
-                &fStringToFind, fCaseSensitive, fWrapAround, fBackSearch);
-            window->Show();
+            if (!FindWindow::alredyExist) {
+                BRect findWindowFrame(100, 100, 400, 235);
+                BWindow* window = new FindWindow(findWindowFrame, this,
+                    &fStringToFind, fCaseSensitive, fWrapAround, fBackSearch);
+                window->Show();
+            }
             break;
         }
         case MSG_SEARCH:
@@ -1353 +1355 @@
     }
 
     // info about position of caret may live in the file attributes
-    int32 position = 0;
+    int32 position;
     if (documentNode.ReadAttr("be:caret_position", B_INT32_TYPE, 0,
-            &position, sizeof(position)) != sizeof(position))
-        position = 0;
-
-    fTextView->Select(position, position);
-    fTextView->ScrollToOffset(position);
+            &position, sizeof(position)) == sizeof(position))
+    {
+        fTextView->Select(position, position);
+        fTextView->ScrollToOffset(position);
+    } else {    
+        fTextView->Select(0, 0);
+        fTextView->ScrollToOffset(0);
+    }
 }
 
 
@@ -1669 +1674 @@
         return true;
     }
 
+    if ((start = viewText.FindFirst(string, 0)) == B_ERROR) {
+        BAlert* alert = new BAlert(B_TRANSLATE("Not found"),
+            B_TRANSLATE("Nothing was found in the entre file."),
+                B_TRANSLATE("Ok"));
+        alert->SetShortcut(0, B_ENTER);
+        alert->Go();
+    } else {
+        BAlert* alert = new BAlert(B_TRANSLATE("End of file"),
+            B_TRANSLATE("End of file reached. "
+                "Continue from the start of document?"),
+                B_TRANSLATE("Yes"), B_TRANSLATE("No"));
+        alert->SetShortcut(0, B_ENTER);
+        alert->SetShortcut(1, B_ESCAPE);
+        int32 answer = alert->Go();
+        if(answer == 0) {
+            finish = start + length;
+            fTextView->Select(start, finish);
+            if(scrollToOccurence)
+                fTextView->ScrollToSelection();
+        }
+        return true;
+    }
+    
     return false;
 }