rpms/kdebase-workspace/F-10 kdebase-workspace-4.3.0-classicmenu-logout.patch, NONE, 1.1 kdebase-workspace.spec, 1.192, 1.193
Kevin Kofler
kkofler at fedoraproject.org
Sun Sep 27 13:47:49 UTC 2009
- Previous message (by thread): rpms/kdebase-workspace/F-11 kdebase-workspace-4.3.0-classicmenu-logout.patch, NONE, 1.1 kdebase-workspace.spec, 1.242, 1.243
- Next message (by thread): rpms/Cython/F-11 .cvsignore, 1.9, 1.10 Cython.spec, 1.13, 1.14 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13094/F-10
Modified Files:
kdebase-workspace.spec
Added Files:
kdebase-workspace-4.3.0-classicmenu-logout.patch
Log Message:
Sync from devel:
* 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
* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
- rhel cleanup
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/F-10/kdebase-workspace.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- kdebase-workspace.spec 23 Sep 2009 12:47:06 -0000 1.192
+++ kdebase-workspace.spec 27 Sep 2009 13:47:49 -0000 1.193
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
Name: kdebase-workspace
Version: 4.3.1
-Release: 5%{?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
@@ -63,9 +67,12 @@ BuildRequires: akonadi-devel
BuildRequires: bluez-libs-devel
BuildRequires: ConsoleKit-devel
BuildRequires: desktop-file-utils
+%if 0%{?fedora}
BuildRequires: google-gadgets-devel >= 0.10.5
-BuildRequires: glib2-devel
+BuildRequires: qedje-devel >= 0.4.0
BuildRequires: gpsd-devel
+%endif
+BuildRequires: glib2-devel
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdelibs-experimental-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
@@ -84,7 +91,6 @@ BuildRequires: polkit-qt-devel
BuildRequires: qimageblitz-devel
BuildRequires: soprano-devel
BuildRequires: python-devel
-BuildRequires: qedje-devel >= 0.4.0
# used for the Logitech mouse KCM, disabled until #399931 is fixed
# BuildRequires: libusb-devel
@@ -261,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
@@ -451,12 +458,14 @@ fi
%{_kde4_libdir}/kde4/kwin*_*.so
%{_kde4_libdir}/kde4/plasma_animator_default.so
%{_kde4_libdir}/kde4/plasma_applet_*.so
+%if 0%{?fedora}
%{_kde4_libdir}/kde4/plasma_appletscript_qedje.so
+%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
+%endif
%{_kde4_libdir}/kde4/plasma_appletscriptengine_dashboard.so
%{_kde4_libdir}/kde4/plasma_appletscriptengine_webapplet.so
%{_kde4_libdir}/kde4/plasma_containment_*.so
%{_kde4_libdir}/kde4/plasma_engine_*.so
-%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
%{_kde4_libdir}/kde4/plasma-geolocation-ip.so
%{_kde4_libdir}/kde4/plasma_package*_*.so
%{_kde4_libdir}/kde4/plasma_wallpaper_*.so
@@ -474,12 +483,14 @@ fi
%{_kde4_libdir}/libsystemsettingsview.so
%{_kde4_libdir}/kconf_update_bin/*
%{_mandir}/man1/plasmaengineexplorer.1*
+%if 0%{?fedora}
# googlegadgets
%exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
%exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
%exclude %{_kde4_appsdir}/plasma/plasmoids/ggl_*
%exclude %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
%exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%endif
# python widget
%exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
# akonadi
@@ -554,6 +565,7 @@ fi
%{_kde4_iconsdir}/Oxygen_Zion/
%{_kde4_iconsdir}/Oxygen_Zion_Big/
+%if 0%{?fedora}
%files googlegadgets
%defattr(-,root,root,-)
%{_kde4_libdir}/kde4/plasma_package_ggl.so
@@ -561,6 +573,7 @@ fi
%{_kde4_datadir}/kde4/apps/plasma/plasmoids/ggl_*
%{_kde4_datadir}/kde4/services/plasma-applet-ggl*
%{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%endif
%if 0%{?with_polkit_09}
%files -n PolicyKit-kde
@@ -592,6 +605,15 @@ 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
+
+* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
+- rhel cleanup
+
* Wed Sep 23 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.1-5
- fix spontaneous Plasma crashes due to uninitialized vars
- Previous message (by thread): rpms/kdebase-workspace/F-11 kdebase-workspace-4.3.0-classicmenu-logout.patch, NONE, 1.1 kdebase-workspace.spec, 1.242, 1.243
- Next message (by thread): rpms/Cython/F-11 .cvsignore, 1.9, 1.10 Cython.spec, 1.13, 1.14 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list