Save/Restore checkBox values for Find/Replace dialog

Author: serhmarch

src/server/gui/dialogs/server_dialogfindreplace.cpp

@@ -10,7 +10,8 @@
 mbServerDialogFindReplace::Strings::Strings() :
     cachePrefix    (QStringLiteral("Ui.Dialogs.FindReplace.")),
     findComboBox   (QStringLiteral("findComboBox")),
-    replaceComboBox(QStringLiteral("replaceComboBox"))
+    replaceComboBox(QStringLiteral("replaceComboBox")),
+    flags          (QStringLiteral("flags"))
 {
 }
 
@@ -57,6 +58,7 @@ MBSETTINGS mbServerDialogFindReplace::cachedSettings() const
     MBSETTINGS m = mbCoreDialogBase::cachedSettings();
     m[prefix+ds.findComboBox   ] = lsFindComboBox   ;
     m[prefix+ds.replaceComboBox] = lsReplaceComboBox;
+    m[prefix+ds.flags          ] = getFindFlags()   ;
     return m;
 }
 
@@ -68,6 +70,7 @@ void mbServerDialogFindReplace::setCachedSettings(const MBSETTINGS &settings)
 
     MBSETTINGS::const_iterator it;
     MBSETTINGS::const_iterator end = settings.end();
+    bool ok;
 
     it = settings.find(prefix+ds.findComboBox);
     if (it != end)
@@ -92,6 +95,14 @@ void mbServerDialogFindReplace::setCachedSettings(const MBSETTINGS &settings)
             ++i;
         }
     }
+
+    it = settings.find(prefix+ds.flags);
+    if (it != end)
+    {
+        int flags = it.value().toInt(&ok);
+        if (ok)
+            setFindFlags(flags);
+    }
 }
 
 void mbServerDialogFindReplace::execFindReplace(bool replace)
@@ -189,7 +200,7 @@ void mbServerDialogFindReplace::replaceAll()
     }
 }
 
-int mbServerDialogFindReplace::getFindFlags()
+int mbServerDialogFindReplace::getFindFlags() const
 {
     int flags = 0;
     flags |= mb::FindCaseSensitively   * (ui->chbMatchCase        ->isChecked());
@@ -200,6 +211,15 @@ int mbServerDialogFindReplace::getFindFlags()
     return flags;
 }
 
+void mbServerDialogFindReplace::setFindFlags(int flags)
+{
+    ui->chbMatchCase        ->setChecked(flags & mb::FindCaseSensitively  );
+    ui->chbMatchWord        ->setChecked(flags & mb::FindWholeWords       );
+    ui->chbEscapeSequence   ->setChecked(flags & mb::FindEscapeSequence   );
+    ui->chbRegularExpression->setChecked(flags & mb::FindRegularExpression);
+    ui->chbLoopSearch       ->setChecked(flags & mb::FindLoopSearch       );
+}
+
 void mbServerDialogFindReplace::processCombo(QComboBox *cmb)
 {
     QString text = cmb->currentText();

src/server/gui/dialogs/server_dialogfindreplace.h

@@ -21,6 +21,7 @@ class mbServerDialogFindReplace : public mbCoreDialogBase
         const QString cachePrefix;
         const QString findComboBox;
         const QString replaceComboBox;
+        const QString flags;
 
         Strings();
         static const Strings &instance();
@@ -44,7 +45,8 @@ public Q_SLOTS:
     void replaceAll();
 
 private:
-    int getFindFlags();
+    int getFindFlags() const;
+    void setFindFlags(int flags);
     void processCombo(QComboBox *cmb);
 
 private: