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

List:       kde-commits
Subject:    extragear/pim/ksig
From:       Pino Toscano <pino () kde ! org>
Date:       2012-09-21 22:30:00
Message-ID: 20120921223000.A365EAC7E8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1317217 by pino:

port configuration to kconfig xt


 M  +2 -0      CMakeLists.txt  
 M  +14 -34    ksig.cpp  
 M  +0 -5      ksig.h  
 A             ksig.kcfg  
 A             settings.kcfgc  
 M  +4 -9      siggenerator.cpp  


--- trunk/extragear/pim/ksig/CMakeLists.txt #1317216:1317217
@@ -16,6 +16,8 @@
    ksig.cpp 
    main.cpp )
 
+kde4_add_kcfg_files(ksig_SRCS settings.kcfgc)
+
 kde4_add_executable(ksig ${ksig_SRCS})
 
 target_link_libraries(ksig ${KDE4_KDEUI_LIBS})
--- trunk/extragear/pim/ksig/ksig.cpp #1317216:1317217
@@ -20,8 +20,6 @@
 #include <kstandardaction.h>
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <kconfig.h>
-#include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
@@ -36,8 +34,9 @@
 #include <qsortfilterproxymodel.h>
 #include <qsplitter.h>
 #include <qtreeview.h>
-#include <kconfiggroup.h>
 
+#include <settings.h>
+
 ////////////////////////////////////////////////////////////////////////////////
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
@@ -170,42 +169,23 @@
 void KSig::readConfig()
 {
     setAutoSaveSettings();
-    KSharedConfig::Ptr config = KGlobal::config();
-    {
-	KConfigGroup group(config, "Settings");
-	if(splitter) {
-	    QList<int> sizes;
 
-	    sizes.append(group.readEntry("ListSize", -1));
-	    sizes.append(group.readEntry("EditSize", -1));
-
-	    if(sizes[0] > 0 && sizes[1] > 0)
+    QList<int> sizes;
+    sizes.append(Settings::listSize());
+    sizes.append(Settings::editSize());
+    if(sizes.at(0) > 0 && sizes.at(1) > 0)
 		splitter->setSizes(sizes);
 	}
 
-	header = group.readEntry("Header");
-	footer = group.readEntry("Footer");
-    }
-}
-
 void KSig::writeConfig()
 {
-    KSharedConfig::Ptr config = KGlobal::config();
-    {
-	KConfigGroup group(config, "Settings");
-	if(splitter) {
-	    QList<int> sizes = splitter->sizes();
+    const QList<int> sizes = splitter->sizes();
+    Settings::setListSize(sizes.at(0));
+    Settings::setEditSize(sizes.at(1));
 
-	    group.writeEntry("ListSize", sizes[0]);
-	    group.writeEntry("EditSize", sizes[1]);
+    Settings::self()->writeConfig();
 	}
 
-	group.writeEntry("Header", header);
-	group.writeEntry("Footer", footer);
-    }
-    config->sync();
-}
-
 bool KSig::queryClose()
 {
     if(changed) {
@@ -263,9 +243,9 @@
     bool ok = false;
     const QString caption = i18n("Edit Header");
     const QString label = i18n("Standard signature header:");
-    const QString text = KInputDialog::getMultiLineText(caption, label, header, &ok, this);
+    const QString text = KInputDialog::getMultiLineText(caption, label, Settings::header(), &ok, this);
     if(ok)
-	setHeader(text);
+	Settings::setHeader(text);
 }
 
 void KSig::editFooter()
@@ -273,9 +253,9 @@
     bool ok = false;
     const QString caption = i18n("Edit Footer");
     const QString label = i18n("Standard signature footer:");
-    const QString text = KInputDialog::getMultiLineText(caption, label, footer, &ok, this);
+    const QString text = KInputDialog::getMultiLineText(caption, label, Settings::footer(), &ok, this);
     if(ok)
-	setFooter(text);
+	Settings::setFooter(text);
 }
 
 void KSig::updateList()
--- trunk/extragear/pim/ksig/ksig.h #1317216:1317217
@@ -54,17 +54,12 @@
     
     void editHeader();
     void editFooter();
-    void setHeader(const QString &text) { header = text; writeConfig(); }
-    void setFooter(const QString &text) { footer = text; writeConfig(); }
 
     void updateList();
     void updateEdit();
     void updateStatus();
 
 private:
-    QString header;
-    QString footer;
-
     QSplitter *splitter;
     QTreeView *m_treeView;
     SigModel *m_model;
--- trunk/extragear/pim/ksig/siggenerator.cpp #1317216:1317217
@@ -20,22 +20,17 @@
 #include <qabstractitemmodel.h>
 #include <qdatetime.h>
 
-#include <kconfiggroup.h>
-#include <kglobal.h>
 #include <krandom.h>
-#include <ksharedconfig.h>
 
+#include <settings.h>
+
 SigGenerator::SigGenerator(QAbstractItemModel *model, int role)
     : m_model(model)
     , m_role(role)
+    , header(Settings::header())
+    , footer(Settings::footer())
 {
-    KSharedConfig::Ptr config = KGlobal::config();
-    {
-	KConfigGroup group(config, "Settings");
-	header = group.readEntry("Header");
-	footer = group.readEntry("Footer");
     }
-}
 
 SigGenerator::~SigGenerator()
 {
[prev in list] [next in list] [prev in thread] [next in thread]