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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets
From:       Davide Bettio <davbet () aliceposta ! it>
Date:       2008-04-28 11:56:08
Message-ID: 1209383768.927072.5289.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 802043 by bettio:

We must use createConfigurationInterface instead of showConfigurationInterface as described in the API.


 M  +7 -15     devicenotifier/devicenotifier.cpp  
 M  +1 -3      devicenotifier/devicenotifier.h  
 M  +9 -17     tasks/tasks.cpp  
 M  +3 -2      tasks/tasks.h  


--- trunk/KDE/kdebase/workspace/plasma/applets/devicenotifier/devicenotifier.cpp #802042:802043
@@ -29,7 +29,7 @@
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
 
-#include <KDialog>
+#include <KConfigDialog>
 #include <KMessageBox>
 #include <KRun>
 #include <KStandardDirs>
@@ -64,7 +64,6 @@
       m_icon(0),
       m_layout(0),
       m_proxy(0),
-      m_dialog(0),
       m_displayTime(0),
       m_numberItems(0),
       m_itemsValidity(0),
@@ -180,7 +179,6 @@
         delete m_proxy;
     }
     delete m_widget;
-    delete m_dialog;
     delete m_hotplugModel;
     delete m_timer;
 }
@@ -370,25 +368,19 @@
     m_widget->clearFocus();
 }
 
-void DeviceNotifier::showConfigurationInterface()
+void DeviceNotifier::createConfigurationInterface(KConfigDialog *parent)
 {
-    if (m_dialog == 0) {
         kDebug() << "DeviceNotifier:: Enter in configuration interface";
-        m_dialog = new KDialog;
-        m_dialog->setCaption(i18n("Configure New Device Notifier"));
-
         QWidget *widget = new QWidget;
         ui.setupUi(widget);
-        m_dialog->setMainWidget(widget);
-        m_dialog->setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
-        connect(m_dialog, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
-        connect(m_dialog, SIGNAL(okClicked()), this, SLOT(configAccepted()));
+        parent->setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
+        connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
+        connect(parent, SIGNAL(okClicked()), this, SLOT(configAccepted()));
+        parent->addPage(widget, parent->windowTitle(), "drive-removable-media-usb-pendrive");
+
         ui.spinTime->setValue(m_displayTime);
         ui.spinItems->setValue(m_numberItems);
         ui.spinTimeItems->setValue(m_itemsValidity);
-    }
-
-    m_dialog->show();
 }
 
 void DeviceNotifier::configAccepted()
--- trunk/KDE/kdebase/workspace/plasma/applets/devicenotifier/devicenotifier.h #802042:802043
@@ -36,7 +36,6 @@
 
 class QStandardItemModel;
 class QGraphicsLinearLayout;
-class KDialog;
 
 namespace Notifier
 {
@@ -81,7 +80,7 @@
         void onSourceAdded(const QString &name);
         void onSourceRemoved(const QString &name);
         void dataUpdated(const QString &source, Plasma::DataEngine::Data data);
-        void showConfigurationInterface();
+        void createConfigurationInterface(KConfigDialog *parent);
         void configAccepted();
         void slotOnItemClicked(const QModelIndex &);
         void onTimerExpired();
@@ -102,7 +101,6 @@
         Plasma::Icon *m_icon;
         QGraphicsLinearLayout *m_layout;
         QGraphicsProxyWidget * m_proxy;
-        KDialog *m_dialog;
         int m_displayTime;
         int m_numberItems;
         int m_itemsValidity;
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/tasks.cpp #802042:802043
@@ -24,7 +24,7 @@
 #include "ui_tasksConfig.h"
 
 // KDE
-#include <KDialog>
+#include <KConfigDialog>
 
 // Qt
 #include <QGraphicsSceneWheelEvent>
@@ -37,8 +37,7 @@
 #include <plasma/theme.h>
 
 Tasks::Tasks(QObject* parent, const QVariantList &arguments)
- : Plasma::Applet(parent, arguments),
-   m_dialog(0)
+ : Plasma::Applet(parent, arguments)
 {
     setHasConfigurationInterface(true);
     setAspectRatioMode(Qt::IgnoreAspectRatio);
@@ -50,7 +49,6 @@
 
 Tasks::~Tasks()
 {
-    delete m_dialog;
 }
 
 void Tasks::init()
@@ -261,26 +259,20 @@
     return true;
 }
 
-void Tasks::showConfigurationInterface()
+void Tasks::createConfigurationInterface(KConfigDialog *parent)
 {
-    if (m_dialog == 0) {
-        m_dialog = new KDialog;
-        m_dialog->setCaption(i18n("Configure Taskbar"));
+     QWidget *widget = new QWidget;
+     m_ui.setupUi(widget);
+     parent->setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
+     connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
+     connect(parent, SIGNAL(okClicked()), this, SLOT(configAccepted()));
+     parent->addPage(widget, parent->windowTitle());
 
-        QWidget *widget = new QWidget;
-        m_ui.setupUi(widget);
-        m_dialog->setMainWidget(widget);
-        m_dialog->setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
-
-        connect(m_dialog, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
-        connect(m_dialog, SIGNAL(okClicked()), this, SLOT(configAccepted()));
-    }
 #ifdef TOOLTIP_MANAGER
     m_ui.showTooltip->setChecked(m_showTooltip);
 #endif
     m_ui.showOnlyCurrentDesktop->setChecked(m_showOnlyCurrentDesktop);
     m_ui.showOnlyCurrentScreen->setChecked(m_showOnlyCurrentScreen);
-    m_dialog->show();
 }
 
 void Tasks::configAccepted()
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/tasks.h #802042:802043
@@ -66,8 +66,10 @@
         void init();
 
         void constraintsEvent(Plasma::Constraints constraints);
-        void showConfigurationInterface();
 
+public slots:
+        void createConfigurationInterface(KConfigDialog *parent);
+
 protected slots:
         void configAccepted();
         virtual void wheelEvent(QGraphicsSceneWheelEvent *);
@@ -107,7 +109,6 @@
         bool m_showOnlyCurrentScreen;
         Plasma::LayoutAnimator *m_animator;
         QGraphicsLinearLayout *m_layout;
-        KDialog *m_dialog;
         Ui::tasksConfig m_ui;
         QList<TaskPtr> m_tasks;
         QTimer m_screenTimer;
[prev in list] [next in list] [prev in thread] [next in thread]