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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/shells/screensaver
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-11-10 5:36:44
Message-ID: 1226295404.167942.4245.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 882226 by aseigo:

merge activate/deactive into one setActive call; leave some implementation notes


 M  +2 -3      org.kde.plasma-overlay.App.xml  
 M  +16 -17    plasmaapp.cpp  
 M  +1 -7      plasmaapp.h  


--- trunk/KDE/kdebase/workspace/plasma/shells/screensaver/org.kde.plasma-overlay.App.xml #882225:882226
@@ -3,10 +3,9 @@
   <interface name="org.kde.plasmaoverlay.App">
     <signal name="hidden">
     </signal>
-    <method name="activate">
+    <method name="setActive">
+      <arg name="activate" type="b" direction="in"/>
     </method>
-    <method name="deactivate">
-    </method>
     <method name="lock">
     </method>
     <method name="quit">
--- trunk/KDE/kdebase/workspace/plasma/shells/screensaver/plasmaapp.cpp #882225:882226
@@ -255,29 +255,26 @@
 }
 
 
-void PlasmaApp::activate()
+void PlasmaApp::setActive(bool activate)
 {
-    if (m_view) {
+    if (!m_view) {
+        return;
+    }
+
+    if (activate) {
         m_view->setWindowOpacity(m_activeOpacity);
         m_view->showView();
         m_view->containment()->openToolBox();
-    }
-}
-
-void PlasmaApp::deactivate()
-{
-    if (m_view) {
-        if (m_view->isVisible()) {
-            if (qFuzzyCompare(m_idleOpacity, qreal(0.0))) {
-                m_view->hideView();
-            } else {
-                lock();
-                m_view->setWindowOpacity(m_idleOpacity);
-                m_view->containment()->closeToolBox();
-            }
+    } else if (m_view->isVisible()) {
+        if (qFuzzyCompare(m_idleOpacity + 1.0, qreal(1.0))) {
+            m_view->hideView();
         } else {
             lock();
+            m_view->setWindowOpacity(m_idleOpacity);
+            m_view->containment()->closeToolBox();
         }
+    } else {
+        lock();
     }
 }
 
@@ -308,6 +305,7 @@
         c->setItemIndexMethod(QGraphicsScene::NoIndex);
         c->initializeLayout();
 
+        //aseigo: put this "setup" code in a method that can be called later.
         if (KCmdLineArgs::parsedArgs()->isSet("setup")) {
             if (c->immutability() == Plasma::UserImmutable) {
                 c->setImmutability(Plasma::Mutable);
@@ -367,9 +365,10 @@
 
     connect(m_view, SIGNAL(hidden()), SLOT(lock()));
     connect(m_view, SIGNAL(hidden()), SIGNAL(hidden()));
+    //aseigo: put this "setup" code ito a setup method
     if (KCmdLineArgs::parsedArgs()->isSet("setup")) {
         m_view->enableSetupMode();
-        activate();
+        setActive(true);
     } else {
         kDebug() << "checking lockprocess is still around";
         QDBusInterface lockprocess("org.kde.krunner_lock", "/LockProcess",
--- trunk/KDE/kdebase/workspace/plasma/shells/screensaver/plasmaapp.h #882225:882226
@@ -65,15 +65,9 @@
     /**
      * tell plasma to go into active mode, ready for interaction
      */
-    void activate();
+    void setActive(bool activate);
 
     /**
-     * tell plasma to go into idle mode
-     * this does not mean exit, it just means the computer is idle
-     */
-    void deactivate();
-
-    /**
      * lock widgets
      */
     void lock();
[prev in list] [next in list] [prev in thread] [next in thread]