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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-04-08 8:38:59
Message-ID: 1207643939.050031.24187.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 794655 by aseigo:

use createConfigurationInterface


 M  +9 -14     analog-clock/clock.cpp  
 M  +2 -1      analog-clock/clock.h  
 M  +7 -0      tasks/abstracttaskitem.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/analog-clock/clock.cpp #794654:794655
@@ -37,6 +37,7 @@
 #include <QPushButton>
 #include <QSpinBox>
 
+#include <KConfigDialog>
 #include <KDebug>
 #include <KLocale>
 #include <KIcon>
@@ -122,27 +123,21 @@
     update();
 }
 
-void Clock::showConfigurationInterface() //TODO: Make the size settable
+void Clock::createConfigurationInterface(KConfigDialog *parent)
 {
-     if (m_dialog == 0) {
-        m_dialog = new KDialog;
-        m_dialog->setCaption( i18nc("@title:window","Configure Clock") );
+    //TODO: Make the size settable
+    QWidget *widget = new QWidget();
+    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(), "chronometer");
 
-        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()) );
-
-    }
-
     ui.timeZones->setSelected(m_timezone, true);
     ui.timeZones->setEnabled(m_timezone != "Local");
     ui.localTimeZone->setChecked(m_timezone == "Local");
     ui.showTimeStringCheckBox->setChecked(m_showTimeString);
     ui.showSecondHandCheckBox->setChecked(m_showSecondHand);
-    m_dialog->show();
 }
 
 void Clock::configAccepted()
--- trunk/KDE/kdebase/workspace/plasma/applets/analog-clock/clock.h #794654:794655
@@ -60,13 +60,14 @@
 
     public slots:
         void dataUpdated(const QString &name, const Plasma::DataEngine::Data &data);
-        void showConfigurationInterface();
 
     protected slots:
 //         void acceptedTimeStringState(bool);
         void configAccepted();
         void moveSecondHand();
+        void createConfigurationInterface(KConfigDialog *parent);
 
+
     private:
         void drawHand(QPainter *p, qreal rotation, const QString &handName);
         void connectToEngine();
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.cpp #794654:794655
@@ -156,6 +156,13 @@
 
 void AbstractTaskItem::setTaskFlags(TaskFlags flags)
 {
+    if (_flags & TaskWantsAttention != flags & TaskWantsAttention) {
+        if (flags & TaskWantsAttention) {
+            // start attention getting
+        } else {
+            // stop attention getting
+        }
+    }
     _flags = flags;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]