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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/applets/battery
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2011-01-13 19:54:00
Message-ID: 20110113195400.A4FB0AC8B3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1214256 by aseigo:

delayed init of bright OSD; better yet: it's where it is used so we can easily \
guarantee it's existence no matter where this method is called from


 M  +7 -5      battery.cpp  


--- trunk/KDE/kdebase/workspace/plasma/generic/applets/battery/battery.cpp \
#1214255:1214256 @@ -577,7 +577,6 @@
     QGraphicsLinearLayout *buttonLayout = new QGraphicsLinearLayout;
     buttonLayout->setSpacing(0.0);
     buttonLayout->addStretch();
-    //buttonLayout->addItem(m_profileCombo);
 
     // Sleep and Hibernate buttons
     QSet<Solid::PowerManagement::SleepState> sleepstates = \
Solid::PowerManagement::supportedSleepStates(); @@ -624,10 +623,6 @@
     controls->setLayout(controlsLayout);
 
     setupFonts();
-
-    m_brightnessOSD = new BrightnessOSDWidget();
-    QDBusConnection::sessionBus().connect("org.kde.Solid.PowerManagement", \
                "/org/kde/Solid/PowerManagement", "org.kde.Solid.PowerManagement",
-                                          "brightnessChanged", this, \
SLOT(showBrightnessOSD(int)));  }
 
 void Battery::popupEvent(bool show)
@@ -1104,6 +1099,13 @@
 void Battery::showBrightnessOSD(int brightness)
 {
     // code adapted from KMix
+    if (!m_brightnessOSD) {
+        m_brightnessOSD = new BrightnessOSDWidget();
+        QDBusConnection::sessionBus().connect("org.kde.Solid.PowerManagement", \
"/org/kde/Solid/PowerManagement", "org.kde.Solid.PowerManagement", +                  \
"brightnessChanged", this, SLOT(showBrightnessOSD(int))); +
+    }
+
     m_brightnessOSD->setCurrentBrightness(brightness);
     m_brightnessOSD->show();
     m_brightnessOSD->activateOSD(); //Enable the hide timer


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