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

List:       kde-commits
Subject:    playground/base/plasma/applets/showdesktop
From:       Andre Duffeck <andre () duffeck ! de>
Date:       2007-11-22 7:46:42
Message-ID: 1195717602.812297.17308.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 739969 by duffeck:

Toggle the dashboard instead of minimizing all windows


 M  +4 -14     showdesktop.cpp  
 M  +0 -6      showdesktop.h  


--- trunk/playground/base/plasma/applets/showdesktop/showdesktop.cpp #739968:739969
@@ -21,6 +21,7 @@
 
 // Qt
 #include <QX11Info>
+#include <QDBusInterface>
 
 // KDE
 #include <KIcon>
@@ -31,7 +32,7 @@
 #include <plasma/widgets/icon.h>
 
 ShowDesktop::ShowDesktop(QObject *parent, const QVariantList &args)
-    : Plasma::Applet(parent, args), net(NETRootInfo( QX11Info::display(), NET::Supported))
+    : Plasma::Applet(parent, args)
 {
     Plasma::HBoxLayout *layout = new Plasma::HBoxLayout(this);
     layout->setMargin(-2);
@@ -42,11 +43,6 @@
     //layout->addItem(icon);
     connect(icon, SIGNAL(pressed(bool, QGraphicsSceneMouseEvent*)), 
         SLOT(toggleShowDesktop(bool,QGraphicsSceneMouseEvent*)));
-
-    m_showingDesktop = KWindowSystem::showingDesktop();
-
-    connect(KWindowSystem::self(), SIGNAL(showingDesktopChanged(bool)), 
-        SLOT(showingDesktopChanged(bool)));
 }
 
 QSizeF ShowDesktop::contentSizeHint() const
@@ -59,20 +55,14 @@
     return 0;
 }
 
-void ShowDesktop::showingDesktopChanged(bool showing)
-{
-    m_showingDesktop = showing;
-}
-
 void ShowDesktop::toggleShowDesktop(bool pressed, QGraphicsSceneMouseEvent *event)
 {
     Q_UNUSED(event);
     if (!pressed) {
         return;
     }
-
-    net.setShowingDesktop( !m_showingDesktop );
-    m_showingDesktop = !m_showingDesktop;
+    QDBusInterface plasmaApp( "org.kde.plasma", "/App" );
+    plasmaApp.call( "toggleDashboard" );
 }
 
 #include "showdesktop.moc"
--- trunk/playground/base/plasma/applets/showdesktop/showdesktop.h #739968:739969
@@ -20,8 +20,6 @@
 #ifndef SHOWDESKTOP_H
 #define SHOWDESKTOP_H
 
- 
-#include <NETRootInfo>
 
 #include <Plasma/Applet>
 
@@ -37,10 +35,6 @@
 
     protected slots:
         void toggleShowDesktop(bool pressed, QGraphicsSceneMouseEvent *event);
-        void showingDesktopChanged( bool showing );
-    private:
-        bool m_showingDesktop;
-        NETRootInfo net;
 };
 
 K_EXPORT_PLASMA_APPLET(showdesktop, ShowDesktop)
[prev in list] [next in list] [prev in thread] [next in thread]