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

List:       kde-commits
Subject:    playground/base/plasma/applets/paste
From:       Petri Damstén <petri.damsten () kdemail ! net>
Date:       2008-04-29 6:44:21
Message-ID: 1209451461.998732.23567.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 802327 by pdamsten:

Config -> SnippetConfig

 M  +2 -2      CMakeLists.txt  
 D             config.cpp  
 D             config.h  
 D             config.ui  
 M  +7 -8      paste.cpp  
 M  +2 -2      paste.h  
 A             snippetconfig.cpp   config.cpp#802324 [License: GPL (v2+)]
 A             snippetconfig.h   config.h#802324 [License: GPL (v2+)]
 A             snippetconfig.ui   config.ui#802324


--- trunk/playground/base/plasma/applets/paste/CMakeLists.txt #802326:802327
@@ -8,11 +8,11 @@
     paste.cpp
     sendkeys.cpp
     list.cpp
-    config.cpp
+    snippetconfig.cpp
 )
 kde4_add_ui_files(paste_SRCS
     list.ui
-    config.ui
+    snippetconfig.ui
 )
 kde4_add_plugin(plasma_applet_paste ${paste_SRCS})
 target_link_libraries(plasma_applet_paste
--- trunk/playground/base/plasma/applets/paste/paste.cpp #802326:802327
@@ -18,7 +18,7 @@
 #include "paste.h"
 #include "sendkeys.h"
 #include "list.h"
-#include "config.h"
+#include "snippetconfig.h"
 #include <plasma/widgets/icon.h>
 #include <plasma/containment.h>
 #include <plasma/theme.h>
@@ -33,7 +33,7 @@
 #include <QByteArray>
 
 Paste::Paste(QObject *parent, const QVariantList &args)
-    : Plasma::Applet(parent, args), m_config(0)
+    : Plasma::Applet(parent, args), m_snippetConfig(0)
 {
     setHasConfigurationInterface(true);
     int iconSize = IconSize(KIconLoader::Desktop);
@@ -133,19 +133,18 @@
 
 void Paste::createConfigurationInterface(KConfigDialog *parent)
 {
-    m_config = new Config;
-    //m_config->setCaption(i18n("Configure Paste Snippets"));
+    m_snippetConfig = new SnippetConfig;
+    m_snippetConfig->setData(m_snippets);
+
     parent->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Apply );
-    parent->addPage(m_config, i18n("Texts"), "edit-paste");
+    parent->addPage(m_snippetConfig, i18n("Texts"), "edit-paste");
     connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
     connect(parent, SIGNAL(okClicked()), this, SLOT(configAccepted()));
-
-    m_config->setData(m_snippets);
 }
 
 void Paste::configAccepted()
 {
-    m_snippets = m_config->getData();
+    m_snippetConfig->getData(&m_snippets);
     KConfigGroup cg = config();
 
     cg.writeEntry("snippets", toString(m_snippets));
--- trunk/playground/base/plasma/applets/paste/paste.h #802326:802327
@@ -22,7 +22,7 @@
 #include <Plasma/Applet>
 
 class ListForm;
-class Config;
+class SnippetConfig;
 class QGraphicsLinearLayout;
 class QGraphicsProxyWidget;
 namespace Plasma {
@@ -47,7 +47,7 @@
 
     private:
         ListForm *m_list;
-        Config *m_config;
+        SnippetConfig *m_snippetConfig;
         QGraphicsLinearLayout *m_layout;
         Plasma::Icon *m_icon;
         QGraphicsProxyWidget *m_proxy;
[prev in list] [next in list] [prev in thread] [next in thread]