Added history support for Find/Replace dialog

Author: serhmarch

src/server/gui/dialogs/server_dialogfindreplace.cpp

@@ -4,8 +4,22 @@
 #include <gui/server_ui.h>
 #include <gui/server_windowmanager.h>
 
+#define MAX_FIND_COMBO_SZ 20
+
+mbServerDialogFindReplace::Strings::Strings() :
+    cachePrefix (QStringLiteral("Ui.Dialogs.FindReplace.")),
+    findComboBox(QStringLiteral("findComboBox"))
+{
+}
+
+const mbServerDialogFindReplace::Strings &mbServerDialogFindReplace::Strings::instance()
+{
+    static const Strings s;
+    return s;
+}
+
 mbServerDialogFindReplace::mbServerDialogFindReplace(QWidget *parent) :
-    QDialog(parent),
+    mbCoreDialogBase(Strings::instance().cachePrefix, parent),
     ui(new Ui::mbServerDialogFindReplace)
 {
     ui->setupUi(this);
@@ -20,6 +34,40 @@ mbServerDialogFindReplace::~mbServerDialogFindReplace()
     delete ui;
 }
 
+MBSETTINGS mbServerDialogFindReplace::cachedSettings() const
+{
+    const Strings &ds = Strings::instance();
+    const QString &prefix = ds.cachePrefix;
+
+    QStringList lsFindComboBox;
+    for (int i = 0; i < ui->cmbFind->count(); ++i)
+        lsFindComboBox.append(ui->cmbFind->itemText(i));
+    MBSETTINGS m = mbCoreDialogBase::cachedSettings();
+    m[prefix+ds.findComboBox] = lsFindComboBox;
+    return m;
+}
+
+void mbServerDialogFindReplace::setCachedSettings(const MBSETTINGS &settings)
+{
+    mbCoreDialogBase::setCachedSettings(settings);
+    const Strings &ds = Strings::instance();
+    const QString &prefix = ds.cachePrefix;
+
+    MBSETTINGS::const_iterator it;
+    MBSETTINGS::const_iterator end = settings.end();
+    it = settings.find(prefix+ds.findComboBox);
+    if (it != end)
+    {
+        QStringList ls = it.value().toStringList();
+        int i = 0;
+        Q_FOREACH(const QString &s, ls)
+        {
+            ui->cmbFind->insertItem(i, s);
+            ++i;
+        }
+    }
+}
+
 void mbServerDialogFindReplace::execFindReplace(bool replace)
 {
     if (replace)
@@ -34,12 +82,14 @@ void mbServerDialogFindReplace::execFindReplace(bool replace)
 
 void mbServerDialogFindReplace::findNext()
 {
+    processFindCombo();
     int flags = getFindFlags();
     mbServer::global()->ui()->windowManager()->find(ui->cmbFind->currentText(), flags);
 }
 
 void mbServerDialogFindReplace::findPrevious()
 {
+    processFindCombo();
     int flags = getFindFlags();
     flags |= mb::FindBackward;
     mbServer::global()->ui()->windowManager()->find(ui->cmbFind->currentText(), flags);
@@ -57,3 +107,27 @@ int mbServerDialogFindReplace::getFindFlags()
     if (ui->chbMatchWord->isChecked()) flags |= mb::FindWholeWords     ;
     return flags;
 }
+
+void mbServerDialogFindReplace::processFindCombo()
+{
+    QComboBox *cmb = ui->cmbFind;
+    QString text = cmb->currentText();
+    if (text.size())
+    {
+        if (text != cmb->itemText(0))
+        {
+            int i = cmb->findText(text);
+            if (i > 0)
+            {
+                cmb->removeItem(i);
+                cmb->insertItem(0, text);
+                cmb->setCurrentText(text);
+            }
+            else if (i < 0)
+                cmb->insertItem(0, text);
+
+            while (cmb->count() > MAX_FIND_COMBO_SZ)
+                cmb->removeItem(MAX_FIND_COMBO_SZ);
+        }
+    }
+}

src/server/gui/dialogs/server_dialogfindreplace.h

@@ -1,22 +1,36 @@
 #ifndef SERVER_DIALOGFINDREPLACE_H
 #define SERVER_DIALOGFINDREPLACE_H
 
-#include <QDialog>
+#include <gui/dialogs/core_dialogedit.h>
 
 namespace Ui {
 class mbServerDialogFindReplace;
 }
 
 class mbServerWindowManager;
 
-class mbServerDialogFindReplace : public QDialog
+class mbServerDialogFindReplace : public mbCoreDialogBase
 {
     Q_OBJECT
 
+public:
+    struct Strings : public mbCoreDialogBase::Strings
+    {
+        const QString cachePrefix;
+        const QString findComboBox;
+
+        Strings();
+        static const Strings &instance();
+    };
+
 public:
     explicit mbServerDialogFindReplace(QWidget *parent = nullptr);
     ~mbServerDialogFindReplace();
 
+public:
+    MBSETTINGS cachedSettings() const override;
+    void setCachedSettings(const MBSETTINGS &settings) override;
+
 public:
     void execFindReplace(bool replace = false);
 
@@ -27,6 +41,7 @@ public Q_SLOTS:
 
 private:
     int getFindFlags();
+    void processFindCombo();
 
 private:
     Ui::mbServerDialogFindReplace *ui;

src/server/gui/dialogs/server_dialogs.cpp

@@ -57,6 +57,7 @@ mbServerDialogs::~mbServerDialogs()
 MBSETTINGS mbServerDialogs::cachedSettings() const
 {
     MBSETTINGS m = mbCoreDialogs::cachedSettings();
+    mb::unite(m, m_findReplace->cachedSettings());
     mb::unite(m, m_simaction->cachedSettings());
     mb::unite(m, m_scriptModule->cachedSettings());
     return m;
@@ -65,6 +66,7 @@ MBSETTINGS mbServerDialogs::cachedSettings() const
 void mbServerDialogs::setCachedSettings(const MBSETTINGS &settings)
 {
     mbCoreDialogs::setCachedSettings(settings);
+    m_findReplace->setCachedSettings(settings);
     m_simaction->setCachedSettings(settings);
     m_scriptModule->setCachedSettings(settings);
 }