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

List:       kde-commits
Subject:    KDE/kdebase/workspace/powerdevil/daemon
From:       Dario Freddi <drf () kde ! org>
Date:       2011-01-02 17:50:00
Message-ID: 20110102175000.D29F8AC8AE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1210946 by dafre:

BUG: 261456

Restore power button handling - and delegate it to Qt.

 M  +12 -0     powerdevilcore.cpp  
 M  +1 -0      powerdevilcore.h  


--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilcore.cpp #1210945:1210946
@@ -172,6 +172,13 @@
                                     KAction::ShortcutTypes(KAction::ActiveShortcut | \
KAction::DefaultShortcut),  KAction::NoAutoloading);
     connect(globalAction, SIGNAL(triggered(bool)), SLOT(suspendToDisk()));
+
+    globalAction = actionCollection->addAction("PowerOff");
+    //globalAction->setText(i18nc("Global shortcut", "Power Off button"));
+    globalAction->setGlobalShortcut(KShortcut(Qt::Key_PowerOff),
+                                    KAction::ShortcutTypes(KAction::ActiveShortcut | \
KAction::DefaultShortcut), +                                    \
KAction::NoAutoloading); +    connect(globalAction, SIGNAL(triggered(bool)), \
SLOT(powerOffButtonTriggered()));  }
 
 void Core::checkBatteryStatus()
@@ -662,6 +669,11 @@
     }
 }
 
+void Core::powerOffButtonTriggered()
+{
+    emit m_backend->buttonPressed(PowerDevil::BackendInterface::PowerButton);
 }
 
+}
+
 #include "powerdevilcore.moc"
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilcore.h #1210945:1210946
@@ -137,6 +137,7 @@
     void onDeviceRemoved(const QString &udi);
     void onCriticalBatteryTimerExpired();
     void checkBatteryStatus();
+    void powerOffButtonTriggered();
 };
 
 }


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