[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kanagram] src: Clean up VocabSettings code.
From:       Jeremy Whiting <jpwhiting () kde ! org>
Date:       2014-08-31 20:50:54
Message-ID: E1XOC5O-0004YE-8M () scm ! kde ! org
[Download RAW message or body]

Git commit 1b45cc2b9f7f2bb358ec40c59b8e5e6a61740b6e by Jeremy Whiting.
Committed on 31/08/2014 at 20:50.
Pushed by whiting into branch 'master'.

Clean up VocabSettings code.
Fix connection to KConfigDialog signal that changed.

M  +1    -1    src/kanagramenginehelper.cpp
M  +1    -2    src/mainsettings.cpp
M  +17   -18   src/vocabsettings.cpp

http://commits.kde.org/kanagram/1b45cc2b9f7f2bb358ec40c59b8e5e6a61740b6e

diff --git a/src/kanagramenginehelper.cpp b/src/kanagramenginehelper.cpp
index 73c7af6..da173ca 100755
--- a/src/kanagramenginehelper.cpp
+++ b/src/kanagramenginehelper.cpp
@@ -384,7 +384,7 @@ void KanagramEngineHelper::slotShowSettings()
     {
         m_configDialog = new KConfigDialog( NULL, "settings", KanagramSettings::self() );
         //m_configDialog->setAttribute(Qt::WA_DeleteOnClose);
-        connect(m_configDialog, SIGNAL(finished()), this, SLOT(reloadSettings()));
+        connect(m_configDialog, SIGNAL(settingsChanged(QString)), this, SLOT(reloadSettings()));
 
         // add the main settings page
         MainSettings * mainSettingsPage = new MainSettings( m_configDialog );
diff --git a/src/mainsettings.cpp b/src/mainsettings.cpp
index 7bc014a..253c7ac 100755
--- a/src/mainsettings.cpp
+++ b/src/mainsettings.cpp
@@ -37,8 +37,7 @@ MainSettings::MainSettings(QWidget *parent) : QWidget(parent)
     m_parent = (KConfigDialog*)parent;
 
     slotToggleAdvancedSettings();
-    connect(parent, SIGNAL(applyClicked()), this, SLOT(slotUpdateLanguage()));
-    connect(parent, SIGNAL(okClicked()), this, SLOT(slotUpdateLanguage()));
+    connect(parent, SIGNAL(settingsChanged(QString)), this, SLOT(slotUpdateLanguage()));
     connect(languageComboBox, SIGNAL(activated(int)), this, SLOT(slotSetDirty()));
     connect(scoringPointCheckbox,SIGNAL(toggled(bool)),this,SLOT(slotToggleAdvancedSettings()));
     populateLanguageBox();
diff --git a/src/vocabsettings.cpp b/src/vocabsettings.cpp
index dce2775..d611951 100755
--- a/src/vocabsettings.cpp
+++ b/src/vocabsettings.cpp
@@ -19,21 +19,19 @@
  ***************************************************************************/
 
 #include "vocabsettings.h"
-#include "vocabedit.h"
-
 
-#include <kconfigdialog.h>
-#include <qfileinfo.h>
+#include <KConfigDialog>
+#include <KNS3/DownloadDialog>
 
-#include <kns3/downloaddialog.h>
-#include <kns3/button.h>
 #include <sharedkvtmlfiles.h>
-#include <keduvocdocument.h>
-#include <kanagramsettings.h>
 
 #include <QIcon>
+#include <QFileInfo>
 #include <QtCore/QPointer>
 
+#include "kanagramsettings.h"
+#include "vocabedit.h"
+
 VocabSettings::VocabSettings(QWidget *parent) : QWidget(parent), m_parent(NULL)
 {
     setupUi(this);
@@ -55,11 +53,12 @@ void VocabSettings::refreshView()
     lviewVocab->clear();
 
     SharedKvtmlFiles::sortDownloadedFiles();
-    m_fileList = SharedKvtmlFiles::fileNames(KanagramSettings::dataLanguage());
-    m_titleList = SharedKvtmlFiles::titles(KanagramSettings::dataLanguage());
-    m_commentList = SharedKvtmlFiles::comments(KanagramSettings::dataLanguage());
+    QString language = KanagramSettings::dataLanguage();
+    m_fileList = SharedKvtmlFiles::fileNames(language);
+    m_titleList = SharedKvtmlFiles::titles(language);
+    m_commentList = SharedKvtmlFiles::comments(language);
 
-    for(int i = 0; i < m_fileList.size(); i++)
+    for (int i = 0; i < m_fileList.size(); i++)
     {
         QTreeWidgetItem *item = new QTreeWidgetItem(lviewVocab, 0);
         item->setText( 0, m_titleList[i] );
@@ -71,7 +70,7 @@ void VocabSettings::refreshView()
 
 void VocabSettings::on_btnEdit_clicked()
 {
-    if(lviewVocab->currentItem())
+    if (lviewVocab->currentItem())
     {
         int index = m_itemMap[lviewVocab->currentItem()];
         VocabEdit *vocabEdit = new VocabEdit(this, m_fileList[index]);
@@ -89,18 +88,18 @@ void VocabSettings::on_btnCreateNew_clicked()
 
 void VocabSettings::on_btnDownloadNew_clicked()
 {
-    QPointer<KNS3::DownloadDialog> hotNewStuffdialog = new KNS3::DownloadDialog( "kanagram.knsrc" );
-    hotNewStuffdialog->exec();
-    if ( hotNewStuffdialog->changedEntries().size() > 0 ){
+    QPointer<KNS3::DownloadDialog> dialog = new KNS3::DownloadDialog( "kanagram.knsrc" );
+    dialog->exec();
+    if ( dialog->changedEntries().size() > 0 ){
         refreshView();
     }
 
-    delete hotNewStuffdialog;
+    delete dialog;
 }
 
 void VocabSettings::slotSelectionChanged(QTreeWidgetItem *item)
 {
-    int index = m_itemMap[item];
+    int index = m_itemMap.value(item);
     bool writeable = QFileInfo(m_fileList[index]).isWritable();
     btnEdit->setEnabled(writeable);
 }
[prev in list] [next in list] [prev in thread] [next in thread]