Improved 'Replace text' for script editor

Author: serhmarch

src/core/CMakeLists.txt

@@ -56,6 +56,7 @@ set(HEADERS
     gui/dialogs/core_dialogs.h
     gui/project/core_projectdelegate.h
     gui/project/core_projectmodel.h
+    gui/project/core_projecttreeview.h
     gui/project/core_projectui.h
     gui/dataview/core_dataviewdelegate.h
     gui/dataview/core_dataviewmanager.h
@@ -103,6 +104,7 @@ set(SOURCES
     gui/dialogs/core_dialogs.cpp             
     gui/project/core_projectdelegate.cpp
     gui/project/core_projectmodel.cpp
+    gui/project/core_projecttreeview.cpp
     gui/project/core_projectui.cpp
     gui/dataview/core_dataviewdelegate.cpp
     gui/dataview/core_dataviewmanager.cpp

src/core/gui/core_windowmanager.cpp

@@ -56,7 +56,7 @@ mbCoreWindowManager::mbCoreWindowManager(mbCoreUi *ui, mbCoreDataViewManager *da
     m_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     m_area->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     m_area->setTabPosition(QTabWidget::South);
-    m_area->setTabsClosable(true);
+    m_area->setTabsClosable(false);
     m_area->setTabsMovable(true);
     connect(m_area, &QMdiArea::subWindowActivated, this, &mbCoreWindowManager::subWindowActivated);
 

src/server/gui/dialogs/server_dialogfindreplace.cpp

@@ -148,7 +148,10 @@ void mbServerDialogFindReplace::replace()
     mbServerBaseScriptEditor *se = mbServer::global()->ui()->scriptManager()->activeScriptEditor();
     if (se)
     {
-        se->replaceText(ui->cmbReplace->currentText());
+        int flags = getFindFlags();
+        se->replaceText(ui->cmbFind->currentText(),
+                        ui->cmbReplace->currentText(),
+                        flags);
     }
 }
 
@@ -159,7 +162,10 @@ void mbServerDialogFindReplace::replaceAll()
     mbServerBaseScriptEditor *se = mbServer::global()->ui()->scriptManager()->activeScriptEditor();
     if (se)
     {
-        se->replaceTextAll(ui->cmbReplace->currentText());
+        int flags = getFindFlags();
+        se->replaceTextAll(ui->cmbFind->currentText(),
+                           ui->cmbReplace->currentText(),
+                           flags);
     }
 }
 

src/server/gui/script/editor/server_scripteditor.cpp

@@ -153,21 +153,30 @@ bool mbServerScriptEditor::findText(const QString &text, int findFlags)
     return this->find(text, tFindFlags);
 }
 
-bool mbServerScriptEditor::replaceText(const QString &replacement)
+bool mbServerScriptEditor::replaceText(const QString &text, const QString &replacement, int findFlags)
 {
     QTextCursor cursor = textCursor();
     if (!cursor.hasSelection())
+    {
+        findText(text, findFlags);
         return false;
+    }
 
     // Store selected text before replacement
     QString selectedText = cursor.selectedText();
+    if (text != selectedText)
+    {
+        findText(text, findFlags);
+        return false;
+    }
 
     // Replace current selection
     cursor.insertText(replacement);
 
     // Move to the next occurrence
+    QTextDocument::FindFlags tFindFlags = toQTextDocumentFindFlags(findFlags);
     QTextDocument *doc = document();
-    QTextCursor next = doc->find(selectedText, cursor);
+    QTextCursor next = doc->find(selectedText, cursor, tFindFlags);
 
     if (next.isNull())
         return true;
@@ -177,16 +186,9 @@ bool mbServerScriptEditor::replaceText(const QString &replacement)
     return true;
 }
 
-bool mbServerScriptEditor::replaceTextAll(const QString &replacement)
+bool mbServerScriptEditor::replaceTextAll(const QString &text, const QString &replacement, int findFlags)
 {
-    QTextCursor cursor = textCursor();
-    if (!cursor.hasSelection())
-        return false;
-
-    QString selectedText = cursor.selectedText();
-    if (selectedText.isEmpty())
-        return false;
-
+    QTextDocument::FindFlags tFindFlags = toQTextDocumentFindFlags(findFlags);
     moveCursor(QTextCursor::Start);
     bool replaced = false;
 
@@ -207,7 +209,7 @@ bool mbServerScriptEditor::replaceTextAll(const QString &replacement)
     */
 
     this->textCursor().beginEditBlock();
-    while (this->find(selectedText))
+    while (this->find(text, tFindFlags))
     {
         this->textCursor().insertText(replacement);
         replaced = true;

src/server/gui/script/editor/server_scripteditor.h

@@ -66,8 +66,8 @@ class mbServerScriptEditor : public QPlainTextEdit
     void lineNumberAreaPaintEvent(QPaintEvent *event);
     int lineNumberAreaWidth();
     bool findText(const QString &text, int findFlags);
-    bool replaceText(const QString &replacement);
-    bool replaceTextAll(const QString &replacement);
+    bool replaceText(const QString &text, const QString &replacement, int findFlags);
+    bool replaceTextAll(const QString &text, const QString &replacement, int findFlags);
 
 protected:
     void resizeEvent(QResizeEvent *event) override;