rpms/kdebase/FC-6 kdebase-3.5.5-suspend.patch, NONE, 1.1 kdebase.spec, 1.241, 1.242

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebase/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26406

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.5-suspend.patch 
Log Message:
add hibernate/suspend in shutdown dialog


kdebase-3.5.5-suspend.patch:
 shutdowndlg.cpp |   40 +++++++++++++++++++++++++++++++++++++++-
 shutdowndlg.h   |    8 ++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.5-suspend.patch ---
--- kdebase-3.5.5/ksmserver/shutdowndlg.h.tn	2006-11-06 12:50:17.000000000 +0100
+++ kdebase-3.5.5/ksmserver/shutdowndlg.h	2006-11-07 15:50:59.000000000 +0100
@@ -17,6 +17,9 @@
 
 #include <kapplication.h>
 
+#define SUSPEND_TYPE_HIBERNATE 0
+#define SUSPEND_TYPE_STANDBY 1
+
 // The (singleton) widget that makes the desktop gray.
 class KSMShutdownFeedback : public QWidget
 {
@@ -54,6 +57,7 @@
     void slotHalt();
     void slotReboot();
     void slotReboot(int);
+    void slotSuspend();
 
 protected:
     ~KSMShutdownDlg() {};
@@ -64,6 +68,10 @@
     QString m_bootOption;
     QPopupMenu *targets;
     QStringList rebootOptions;
+    KPushButton *btnSuspend;
+    int suspendType;
+    void keyPressEvent( QKeyEvent *e);
+    void keyReleaseEvent( QKeyEvent *e );
 };
 
 class KSMDelayedPushButton : public KPushButton
--- kdebase-3.5.5/ksmserver/shutdowndlg.cpp.tn	2006-11-06 12:50:05.000000000 +0100
+++ kdebase-3.5.5/ksmserver/shutdowndlg.cpp	2006-11-07 16:02:27.000000000 +0100
@@ -87,7 +87,7 @@
 
 KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
                                 bool maysd, KApplication::ShutdownType sdtype )
-  : QDialog( parent, 0, TRUE, WType_Popup ), targets(0)
+  : QDialog( parent, 0, TRUE, WType_Popup ), targets(0), btnSuspend(0)
     // this is a WType_Popup on purpose. Do not change that! Not
     // having a popup here has severe side effects.
 {
@@ -132,6 +132,13 @@
 
     if (maysd) {
 
+        // hibernate and standby
+        suspendType = SUSPEND_TYPE_STANDBY;
+        btnSuspend = new KPushButton( KGuiItem( i18n("&Suspend Computer"), "down"), frame );
+        btnSuspend->setFont( btnFont );
+        buttonlay->addWidget( btnSuspend );
+        connect(btnSuspend, SIGNAL(clicked()), SLOT(slotSuspend()));
+
         // Shutdown
         KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit"), frame );
         btnHalt->setFont( btnFont );
@@ -274,3 +281,34 @@
   popt->stop();
   setDown(false);
 }
+
+void KSMShutdownDlg::slotSuspend()
+{
+    switch ( suspendType ) {
+       case SUSPEND_TYPE_HIBERNATE: system("/usr/bin/pm-hibernate"); break;
+       case SUSPEND_TYPE_STANDBY: system("/usr/bin/pm-suspend"); break;
+    }
+    reject();
+}
+
+void KSMShutdownDlg::keyPressEvent( QKeyEvent *e )
+{
+   switch ( e->key() ) {
+      case Key_Shift:
+         btnSuspend->setText("&Hibernate Computer");
+         suspendType = SUSPEND_TYPE_HIBERNATE;
+      default:
+         e->ignore();
+   }
+}
+
+void KSMShutdownDlg::keyReleaseEvent( QKeyEvent *e )
+{
+   switch( e->key() ) {
+      case Key_Shift:
+         btnSuspend->setText("&Suspend Computer");
+         suspendType = SUSPEND_TYPE_STANDBY;
+      default:
+         e->ignore();
+   }
+}


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-6/kdebase.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- kdebase.spec	3 Nov 2006 15:54:32 -0000	1.241
+++ kdebase.spec	7 Nov 2006 15:29:08 -0000	1.242
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.5
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -59,6 +59,7 @@
 Patch23: kdebase-3.5.4-antialias.patch
 Patch24: kdebase-3.5.4-tango-icon-theme.patch
 Patch25: kdebase-3.5.4-konqueror-shortcut.patch
+Patch26: kdebase-3.5.5-suspend.patch
 
 # upstream patches
 Patch500: kdebase-3.5.5-kde#134816.patch
@@ -178,6 +179,7 @@
 %patch23 -p1 -b .antialias
 %patch24 -p1 -b .tango-icon-theme
 %patch25 -p1 -b .konqueror-shortcut
+%patch26 -p1 -b .suspend
 
 # upstream patches
 %patch500 -p0 -b .kde#134816
@@ -560,6 +562,9 @@
 %exclude %{_libdir}/libkdeinit_*.so
 
 %changelog
+* Tue Nov 07 2006 Than Ngo <than at redhat.com> 6:3.5.5-0.5.fc6
+- add hibernate/suspend in shutdown dialog
+
 * Fri Nov 03 2006 Than Ngo <than at redhat.com> 6:3.5.5-0.4.fc6
 - rebuild