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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/applets/systemtray/ui
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2011-01-25 2:07:36
Message-ID: 20110125020736.68453AC8B9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1216839 by aseigo:

move code out of init() and into places that might make a bit more sense


 M  +19 -16    applet.cpp  


--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/ui/applet.cpp #1216838:1216839
@@ -114,6 +114,20 @@
     setPopupAlignment(Qt::AlignRight);
     setAspectRatioMode(Plasma::IgnoreAspectRatio);
     setHasConfigurationInterface(true);
+
+    connect(s_manager, SIGNAL(taskAdded(SystemTray::Task*)),
+            m_taskArea, SLOT(addTask(SystemTray::Task*)));
+    //TODO: we re-add the task when it changed: slightly silly!
+    connect(s_manager, SIGNAL(taskChanged(SystemTray::Task*)),
+            m_taskArea, SLOT(addTask(SystemTray::Task*)));
+    connect(s_manager, SIGNAL(taskRemoved(SystemTray::Task*)),
+            m_taskArea, SLOT(removeTask(SystemTray::Task*)));
+
+    connect(m_taskArea, SIGNAL(sizeHintChanged(Qt::SizeHint)),
+            this, SLOT(propogateSizeHintChange(Qt::SizeHint)));
+
+    connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
+            this, SLOT(themeChanged()));
 }
 
 Applet::~Applet()
@@ -144,22 +158,6 @@
 
 void Applet::init()
 {
-    connect(s_manager, SIGNAL(taskAdded(SystemTray::Task*)),
-            m_taskArea, SLOT(addTask(SystemTray::Task*)));
-    //TODO: we re-add the task when it changed: slightly silly!
-    connect(s_manager, SIGNAL(taskChanged(SystemTray::Task*)),
-            m_taskArea, SLOT(addTask(SystemTray::Task*)));
-    connect(s_manager, SIGNAL(taskRemoved(SystemTray::Task*)),
-            m_taskArea, SLOT(removeTask(SystemTray::Task*)));
-
-    connect(m_taskArea, SIGNAL(sizeHintChanged(Qt::SizeHint)),
-            this, SLOT(propogateSizeHintChange(Qt::SizeHint)));
-
-    connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
-            this, SLOT(themeChanged()));
-
-    QTimer::singleShot(0, this, SLOT(checkDefaultApplets()));
-    configChanged();
 }
 
 bool Applet::isFirstRun()
@@ -249,6 +247,11 @@
         }
     }
 
+    if (constraints & Plasma::StartupCompletedConstraint) {
+        QTimer::singleShot(0, this, SLOT(checkDefaultApplets()));
+        configChanged();
+    }
+
     s_manager->forwardConstraintsEvent(constraints, this);
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]