rpms/kdebase-workspace/devel kdebase-workspace-4.0.4-kickoff-suspend.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 kdebase-workspace.spec, 1.80, 1.81 sources, 1.11, 1.12
Than Ngo (than)
fedora-extras-commits at redhat.com
Mon May 26 13:00:03 UTC 2008
Author: than
Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6250
Modified Files:
.cvsignore kdebase-workspace.spec sources
Added Files:
kdebase-workspace-4.0.4-kickoff-suspend.patch
Log Message:
4.1 beta1
kdebase-workspace-4.0.4-kickoff-suspend.patch:
--- NEW FILE kdebase-workspace-4.0.4-kickoff-suspend.patch ---
diff -up kdebase-workspace-4.0.4/plasma/applets/kickoff/CMakeLists.txt.orig kdebase-workspace-4.0.4/plasma/applets/kickoff/CMakeLists.txt
--- kdebase-workspace-4.0.4/plasma/applets/kickoff/CMakeLists.txt.orig 2008-03-27 21:34:51.000000000 +0100
+++ kdebase-workspace-4.0.4/plasma/applets/kickoff/CMakeLists.txt 2008-05-24 21:38:18.000000000 +0200
@@ -55,13 +55,13 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug)
# Kickoff Plasma Applet
set ( Applet_SRCS ${Kickoff_SRCS} applet/applet.cpp )
kde4_add_plugin(plasma_applet_launcher ${Applet_SRCS})
-target_link_libraries(plasma_applet_launcher plasma ${Kickoff_LIBS})
+target_link_libraries(plasma_applet_launcher plasma solidcontrol ${Kickoff_LIBS})
install(TARGETS plasma_applet_launcher DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES applet/plasma-applet-launcher.desktop DESTINATION ${SERVICES_INSTALL_DIR})
# Simple KMenu Plasma Applet
set ( SimpleApplet_SRCS ${Kickoff_SRCS} simpleapplet/menuview.cpp simpleapplet/simpleapplet.cpp )
kde4_add_plugin(plasma_applet_simplelauncher ${SimpleApplet_SRCS})
-target_link_libraries(plasma_applet_simplelauncher plasma ${Kickoff_LIBS})
+target_link_libraries(plasma_applet_simplelauncher plasma solidcontrol ${Kickoff_LIBS})
install(TARGETS plasma_applet_simplelauncher DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES simpleapplet/plasma-applet-simplelauncher.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff -up kdebase-workspace-4.0.4/plasma/applets/kickoff/core/itemhandlers.cpp.orig kdebase-workspace-4.0.4/plasma/applets/kickoff/core/itemhandlers.cpp
--- kdebase-workspace-4.0.4/plasma/applets/kickoff/core/itemhandlers.cpp.orig 2008-03-27 21:34:51.000000000 +0100
+++ kdebase-workspace-4.0.4/plasma/applets/kickoff/core/itemhandlers.cpp 2008-05-24 21:38:18.000000000 +0200
@@ -29,6 +29,8 @@
#include <KService>
#include <KToolInvocation>
#include <solid/powermanagement.h>
+#include <solid/control/powermanager.h>
+#include <kjob.h>
// KDE Base
#include <kworkspace/kworkspace.h>
@@ -83,6 +85,18 @@ bool LeaveItemHandler::openUrl(const QUr
// decouple dbus call, otherwise we'll run into a dead-lock
QTimer::singleShot(0, this, SLOT(logout()));
return true;
+ } else if (m_logoutAction == "standby") {
+ // decouple dbus call, otherwise we'll run into a dead-lock
+ QTimer::singleShot(0, this, SLOT(standby()));
+ return true;
+ } else if (m_logoutAction == "suspendram") {
+ // decouple dbus call, otherwise we'll run into a dead-lock
+ QTimer::singleShot(0, this, SLOT(suspendRAM()));
+ return true;
+ } else if (m_logoutAction == "suspenddisk") {
+ // decouple dbus call, otherwise we'll run into a dead-lock
+ QTimer::singleShot(0, this, SLOT(suspendDisk()));
+ return true;
}
return false;
@@ -128,3 +142,27 @@ void LeaveItemHandler::switchUser()
krunner.switchUser();
}
}
+
+void LeaveItemHandler::standby()
+{
+ Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::Standby;
+ KJob *job = Solid::Control::PowerManager::suspend( spdMethod );
+ if (job != 0)
+ job->start();
+}
+
+void LeaveItemHandler::suspendRAM()
+{
+ Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::ToRam;
+ KJob *job = Solid::Control::PowerManager::suspend( spdMethod );
+ if (job != 0)
+ job->start();
+}
+
+void LeaveItemHandler::suspendDisk()
+{
+ Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::ToDisk;
+ KJob *job = Solid::Control::PowerManager::suspend( spdMethod );
+ if (job != 0)
+ job->start();
+}
diff -up kdebase-workspace-4.0.4/plasma/applets/kickoff/core/itemhandlers.h.orig kdebase-workspace-4.0.4/plasma/applets/kickoff/core/itemhandlers.h
--- kdebase-workspace-4.0.4/plasma/applets/kickoff/core/itemhandlers.h.orig 2008-03-27 21:34:51.000000000 +0100
+++ kdebase-workspace-4.0.4/plasma/applets/kickoff/core/itemhandlers.h 2008-05-24 21:40:54.000000000 +0200
@@ -42,6 +42,9 @@ private Q_SLOTS:
void logout();
void lock();
void switchUser();
+ void standby();
+ void suspendRAM();
+ void suspendDisk();
private:
QString m_logoutAction;
diff -up kdebase-workspace-4.0.4/plasma/applets/kickoff/core/leavemodel.cpp.orig kdebase-workspace-4.0.4/plasma/applets/kickoff/core/leavemodel.cpp
--- kdebase-workspace-4.0.4/plasma/applets/kickoff/core/leavemodel.cpp.orig 2008-03-27 21:34:51.000000000 +0100
+++ kdebase-workspace-4.0.4/plasma/applets/kickoff/core/leavemodel.cpp 2008-05-24 21:39:19.000000000 +0200
@@ -27,6 +27,7 @@
#include <KLocalizedString>
#include <KIcon>
#include <solid/powermanagement.h>
+#include <solid/control/powermanager.h>
// Local
#include "core/models.h"
@@ -77,6 +78,21 @@ QStandardItem* LeaveModel::createStandar
item->setIcon(KIcon("system-restart"));
item->setData(i18n("Restart the computer"),Kickoff::SubTitleRole);
}
+ else if (basename == "standby") {
+ item->setText(i18n("Standby"));
+ item->setIcon(KIcon("system-suspend"));
+ item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole);
+ }
+ else if (basename == "suspenddisk") {
+ item->setText(i18n("Suspend to Disk"));
+ item->setIcon(KIcon("system-suspend-hibernate"));
+ item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole);
+ }
+ else if (basename == "suspendram") {
+ item->setText(i18n("Suspend to RAM"));
+ item->setIcon(KIcon("system-suspend-hibernate"));
+ item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole);
+ }
else {
item->setText(basename);
item->setData(url,Kickoff::SubTitleRole);
@@ -122,6 +138,22 @@ LeaveModel::LeaveModel(QObject *parent)
systemOptions->appendRow(hibernateOption);
}
+ Solid::Control::PowerManager::SuspendMethods spdMethods = Solid::Control::PowerManager::supportedSuspendMethods();
+ if( spdMethods & Solid::Control::PowerManager::Standby ) {
+ QStandardItem *standbyOption = createStandardItem("leave:/standby");
+ systemOptions->appendRow(standbyOption);
+ }
+
+ if( spdMethods & Solid::Control::PowerManager::ToRam ) {
+ QStandardItem *suspendramOption = createStandardItem("leave:/suspendram");
+ systemOptions->appendRow(suspendramOption);
+ }
+
+ if( spdMethods & Solid::Control::PowerManager::ToDisk ) {
+ QStandardItem *suspenddiskOption = createStandardItem("leave:/suspenddisk");
+ systemOptions->appendRow(suspenddiskOption);
+ }
+
// Shutdown
QStandardItem *shutDownOption = createStandardItem("leave:/shutdown");
systemOptions->appendRow(shutDownOption);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 7 May 2008 00:02:53 -0000 1.9
+++ .cvsignore 26 May 2008 12:59:24 -0000 1.10
@@ -1 +1,2 @@
kdebase-workspace-4.0.72.tar.bz2
+kdebase-workspace-4.0.80.tar.bz2
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kdebase-workspace.spec 21 May 2008 14:01:29 -0000 1.80
+++ kdebase-workspace.spec 26 May 2008 12:59:24 -0000 1.81
@@ -4,9 +4,9 @@
Summary: K Desktop Environment - Workspace
Name: kdebase-workspace
-Version: 4.0.72
+Version: 4.0.80
-Release: 4%{?dist}
+Release: 1%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -42,6 +42,7 @@
# #444141: Initial wallpaper chooser has "EOS" preselected but wallpaper is "Fedora Waves"
#Â http://websvn.kde.org/?view=rev&revision=801651
Patch203: kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch
+Patch204: kdebase-workspace-4.0.4-kickoff-suspend.patch
# upgrade path for former kde-redhat'ers
Obsoletes: kdebase-kdm < 6:%{version}-%{release}
@@ -157,6 +158,7 @@
# FIXME/TODO: fails to apply
#%patch201 -p1 -b .kde#158301
%patch203 -p0 -b .plasma-default-wallpaper-config
+%patch204 -p1 -b .kickoff-suspend
%build
@@ -278,6 +280,9 @@
%changelog
+* Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
+- 4.1 beta1
+
* Wed May 21 2008 Than Ngo <than at redhat.com> 4.0.72-4
- fix #447030, hyperlinks do not open correctly in firefox
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 7 May 2008 00:02:53 -0000 1.11
+++ sources 26 May 2008 12:59:24 -0000 1.12
@@ -1 +1 @@
-afab232c830d056d720c2d6fa4d7e78e kdebase-workspace-4.0.72.tar.bz2
+01a05d8830a942a54f8c92f353a24174 kdebase-workspace-4.0.80.tar.bz2
More information about the fedora-extras-commits
mailing list