rpms/kdebase-workspace/devel kdebase-workspace-4.3.0-classicmenu-logout.patch, NONE, 1.1 kdebase-workspace.spec, 1.298, 1.299
Kevin Kofler
kkofler at fedoraproject.org
Sun Sep 27 11:17:13 UTC 2009
- Previous message (by thread): rpms/f-spot/F-10 0001-fix-parallel-build.patch, NONE, 1.1 facebook-exporter-duplicate-label-fix.patch, NONE, 1.1 0001-use-system-Mono.Addins-if-available.patch, 1.1, 1.2 f-spot.spec, 1.85, 1.86
- Next message (by thread): rpms/f-spot/F-10 .cvsignore,1.21,1.22 sources,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24073/devel
Modified Files:
kdebase-workspace.spec
Added Files:
kdebase-workspace-4.3.0-classicmenu-logout.patch
Log Message:
* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
- support "Leave..." which brings up complete shutdown dialog in classic menu
kdebase-workspace-4.3.0-classicmenu-logout.patch:
core/itemhandlers.cpp | 4 ++++
simpleapplet/simpleapplet.cpp | 4 ++++
simpleapplet/simpleapplet.h | 3 ++-
3 files changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE kdebase-workspace-4.3.0-classicmenu-logout.patch ---
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/core/itemhandlers.cpp 2009-06-03 13:54:20.000000000 +0200
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp 2009-08-25 23:56:08.000000000 +0200
@@ -160,6 +160,10 @@
type = KWorkSpace::ShutdownTypeReboot;
} else if (m_logoutAction == "shutdown") {
type = KWorkSpace::ShutdownTypeHalt;
+ } else if (m_logoutAction == "leave") {
+ // This one brings up the dialog, for use in the classic menu.
+ confirm = KWorkSpace::ShutdownConfirmYes;
+ type = KWorkSpace::ShutdownTypeDefault;
}
//FIXME: the proper fix is to implement the KWorkSpace methods for Windows
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp 2009-06-09 18:08:02.000000000 +0200
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp 2009-08-25 23:44:22.000000000 +0200
@@ -187,6 +187,7 @@
case Shutdown: return i18n("Shutdown");
case Logout: return i18n("Logout");
case Leave: return i18n("Leave");
+ case LeaveDialog: return i18n("Leave...");
}
return QString();
}
@@ -212,6 +213,7 @@
case Shutdown: return "system-shutdown";
case Logout: return "system-log-out";
case Leave: return "system-shutdown";
+ case LeaveDialog: return "system-shutdown";
}
return QString();
}
@@ -652,6 +654,8 @@
d->menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
} else if(vtname == "Logout") {
d->menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
+ } else if(vtname == "LeaveDialog") {
+ d->menuview->addAction(KIcon(d->viewIcon(LeaveDialog)), d->viewText(LeaveDialog))->setData(KUrl("leave:/leave"));
} else if(vtname == "Leave") {
Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(d->menuview);
leavemodel->updateModel();
diff -ur kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h
--- kdebase-workspace-4.3.0/plasma/applets/kickoff/simpleapplet/simpleapplet.h 2009-03-27 15:46:41.000000000 +0100
+++ kdebase-workspace-4.3.0-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h 2009-08-25 23:40:02.000000000 +0200
@@ -59,7 +59,8 @@
Restart, ///< Restart Action
Shutdown, ///< Shutdown Action
Logout, ///< Logout Action
- Leave ///< Leave Menu
+ Leave, ///< Leave Menu
+ LeaveDialog ///< Leave Dialog Action
};
/**
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- kdebase-workspace.spec 25 Sep 2009 14:11:37 -0000 1.298
+++ kdebase-workspace.spec 27 Sep 2009 11:17:13 -0000 1.299
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
Name: kdebase-workspace
Version: 4.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -31,6 +31,10 @@ Patch14: kdebase-workspace-4.2.0-klipper
Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
# show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch
+# allow adding a "Leave..." button which brings up the complete shutdown dialog
+# to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
+# default Leave submenu
+Patch17: kdebase-workspace-4.3.0-classicmenu-logout.patch
# upstream patches:
# 4.3 branch
@@ -263,6 +267,7 @@ Requires: akonadi
# kio_sysinfo based on OpenSUSE's patch
%patch15 -p1 -b .kio_sysinfo
%patch16 -p1 -b .showremainingtime
+%patch17 -p1 -b .classicmenu-logout
# upstream patches
%patch100 -p5 -b .plasmaCrash
@@ -600,6 +605,9 @@ fi
%changelog
+* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
+- support "Leave..." which brings up complete shutdown dialog in classic menu
+
* Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-7
- don't include googlegadgets on RHEL
- Previous message (by thread): rpms/f-spot/F-10 0001-fix-parallel-build.patch, NONE, 1.1 facebook-exporter-duplicate-label-fix.patch, NONE, 1.1 0001-use-system-Mono.Addins-if-available.patch, 1.1, 1.2 f-spot.spec, 1.85, 1.86
- Next message (by thread): rpms/f-spot/F-10 .cvsignore,1.21,1.22 sources,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list