Fixed #6344 - enabling/disabling accents sstripping settings dialog

diff --git a/src/plugins/xdxf/XdxfLoadDialog.cpp b/src/plugins/xdxf/XdxfLoadDialog.cpp
index c3ce79e..269bb87 100644 (file)
--- a/src/plugins/xdxf/XdxfLoadDialog.cpp
+++ b/src/plugins/xdxf/XdxfLoadDialog.cpp
@@ -66,9 +66,22 @@ XdxfLoadDialog::XdxfLoadDialog(QWidget *parent) :
     connect(addButton, SIGNAL(clicked()),
             this, SLOT(addDictionary()));
 
+    connect(cacheCheckBox, SIGNAL(toggled(bool)),
+            SLOT(setGenerateCache(bool)));
+
+    connect(accentsCheckBox, SIGNAL(clicked(bool)), SLOT(setAccents(bool)));
+    lastAccents = accentsCheckBox->isChecked();
     _dicitonaryFilePath = QString();
 }
 
+
+
+void XdxfLoadDialog::setAccents(bool state) {
+    lastAccents = state;
+}
+
+
+
 void XdxfLoadDialog::selectFile() {
     QString fileName = QFileDialog::getOpenFileName(this,
                                      tr("Select dictionary file"),
@@ -102,6 +115,17 @@ bool XdxfLoadDialog::generateCache() {
     return _generateCache;
 }
 
+void XdxfLoadDialog::setGenerateCache(bool generate) {
+    _generateCache = generate;
+
+    if(generate)
+        accentsCheckBox->setChecked(true);
+    else
+        accentsCheckBox->setChecked(lastAccents);
+
+    accentsCheckBox->setEnabled(!generate);
+}
+
 Settings* XdxfLoadDialog::getSettings(QWidget *parent) {
     XdxfLoadDialog loadDialog(parent);
     Settings* settings = new Settings;

diff --git a/src/plugins/xdxf/XdxfLoadDialog.h b/src/plugins/xdxf/XdxfLoadDialog.h
index 2c6d47f..d3a8bf5 100644 (file)
--- a/src/plugins/xdxf/XdxfLoadDialog.h
+++ b/src/plugins/xdxf/XdxfLoadDialog.h
@@ -54,6 +54,8 @@ public slots:
 private Q_SLOTS:
     void selectFile();
     void addDictionary();
+    void setGenerateCache(bool);
+    void setAccents(bool);
 
 private:
     QPushButton* addButton;
@@ -66,6 +68,7 @@ private:
     QHBoxLayout* cacheLayout;
     QString _dicitonaryFilePath;
     bool _generateCache;
+    bool lastAccents;
 
 };
 

diff --git a/src/plugins/xdxf/XdxfSettingsDialog.cpp b/src/plugins/xdxf/XdxfSettingsDialog.cpp
index 7afb707..7143737 100644 (file)
--- a/src/plugins/xdxf/XdxfSettingsDialog.cpp
+++ b/src/plugins/xdxf/XdxfSettingsDialog.cpp
@@ -70,6 +70,8 @@ XdxfSettingsDialog::XdxfSettingsDialog(XdxfPlugin *plugin, QWidget *parent) :
     cacheCheckBox = new QCheckBox(tr("Optimize for quicker searches (may take some time)"),this);
     if(plugin->settings()->value("cached") == "true") {
         cacheCheckBox->setChecked(true);
+        accentsCheckBox->setChecked(true);
+        accentsCheckBox->setEnabled(false);
         _generateCache = true;
     }
     else {
@@ -94,11 +96,28 @@ XdxfSettingsDialog::XdxfSettingsDialog(XdxfPlugin *plugin, QWidget *parent) :
     connect(cacheCheckBox, SIGNAL(toggled(bool)),
             SLOT(setGenerateCache(bool)));
 
+    connect(accentsCheckBox, SIGNAL(clicked(bool)), SLOT(setAccents(bool)));
+
+
     _dicitonaryFilePath = plugin->settings()->value("path");
+    lastAccents = accentsCheckBox->isChecked();
+}
+
+
+void XdxfSettingsDialog::setAccents(bool state) {
+    lastAccents = state;
 }
 
+
 void XdxfSettingsDialog::setGenerateCache(bool generate) {
     _generateCache = generate;
+
+    if(generate)
+        accentsCheckBox->setChecked(true);
+    else
+        accentsCheckBox->setChecked(lastAccents);
+
+    accentsCheckBox->setEnabled(!generate);
 }
 
 bool XdxfSettingsDialog::generateCache() {

diff --git a/src/plugins/xdxf/XdxfSettingsDialog.h b/src/plugins/xdxf/XdxfSettingsDialog.h
index be7510b..4baf322 100644 (file)
--- a/src/plugins/xdxf/XdxfSettingsDialog.h
+++ b/src/plugins/xdxf/XdxfSettingsDialog.h
@@ -47,6 +47,7 @@ public:
 private Q_SLOTS:
     void selectFile();
     void setGenerateCache(bool);
+    void setAccents(bool);
 
 private:
     QLabel* infoLabel;
@@ -61,6 +62,8 @@ private:
     QString _dicitonaryFilePath;
     bool _generateCache;
     XdxfPlugin* plugin;
+    bool lastAccents;
+
 };
 
 #endif // XDXFSETTINGSDIALOG_H