rpms/kdebase-workspace/devel kdebase-workspace-4.0.3-menu-switch.patch, NONE, 1.1 kdebase-workspace.spec, 1.56, 1.57

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22754/devel

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.3-menu-switch.patch 
Log Message:
* Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-4
- backport context menu switch between Kickoff and simple menu from 4.1

kdebase-workspace-4.0.3-menu-switch.patch:

--- NEW FILE kdebase-workspace-4.0.3-menu-switch.patch ---
diff -ur kdebase-workspace-4.0.3/plasma/applets/kickoff/applet/applet.cpp kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/applet/applet.cpp
--- kdebase-workspace-4.0.3/plasma/applets/kickoff/applet/applet.cpp	2008-03-27 21:34:51.000000000 +0100
+++ kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/applet/applet.cpp	2008-03-31 16:02:13.000000000 +0200
@@ -79,6 +79,13 @@
     delete d;
 }
 
+void LauncherApplet::init()
+{
+    QAction* switcher = new QAction(i18n("Switch to Classic Menu Style"), this);
+    d->actions.append(switcher);
+    connect(switcher, SIGNAL(triggered(bool)), this, SLOT(switchMenuStyle()));
+}
+
 Qt::Orientations LauncherApplet::expandingDirections() const
 {
     return 0;
@@ -212,4 +219,9 @@
     d->icon->setPressed();
 }
 
+QList<QAction*> LauncherApplet::contextActions()
+{
+  return d->actions;
+}
+
 #include "applet.moc"
diff -ur kdebase-workspace-4.0.3/plasma/applets/kickoff/applet/applet.h kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/applet/applet.h
--- kdebase-workspace-4.0.3/plasma/applets/kickoff/applet/applet.h	2008-03-27 21:34:51.000000000 +0100
+++ kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/applet/applet.h	2008-03-31 15:54:34.000000000 +0200
@@ -44,10 +44,14 @@
         LauncherApplet(QObject *parent, const QVariantList &args);
         virtual ~LauncherApplet();
 
+        void init();
+
         virtual QSizeF sizeHint() const;
         void constraintsUpdated(Plasma::Constraints constraints);
         Qt::Orientations expandingDirections() const;
 
+        virtual QList<QAction*> contextActions();
+
 public slots:
         void showConfigurationInterface();
         void switchMenuStyle();
diff -ur kdebase-workspace-4.0.3/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.0.3/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2008-03-27 21:34:51.000000000 +0100
+++ kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2008-03-31 15:54:34.000000000 +0200
@@ -148,6 +148,10 @@
 
     Kickoff::UrlItemLauncher::addGlobalHandler(Kickoff::UrlItemLauncher::ExtensionHandler,"desktop",new Kickoff::ServiceItemHandler);
     Kickoff::UrlItemLauncher::addGlobalHandler(Kickoff::UrlItemLauncher::ProtocolHandler, "leave", new Kickoff::LeaveItemHandler);
+
+    QAction* switcher = new QAction(i18n("Switch to Kickoff Menu Style"), this);
+    d->actions.append(switcher);
+    connect(switcher, SIGNAL(triggered(bool)), this, SLOT(switchMenuStyle()));
 }
     
 QSizeF MenuLauncherApplet::sizeHint() const
@@ -331,4 +335,9 @@
     }
 }
 
+QList<QAction*> MenuLauncherApplet::contextActions()
+{
+  return d->actions;
+}
+
 #include "simpleapplet.moc"
diff -ur kdebase-workspace-4.0.3/plasma/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/simpleapplet/simpleapplet.h
--- kdebase-workspace-4.0.3/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2008-03-27 21:34:51.000000000 +0100
+++ kdebase-workspace-4.0.3-menu-switch/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2008-03-31 15:54:34.000000000 +0200
@@ -57,6 +57,8 @@
         void constraintsUpdated(Plasma::Constraints constraints);
         Qt::Orientations expandingDirections() const;
 
+        virtual QList<QAction*> contextActions();
+
 public slots:
         void showConfigurationInterface();
         void switchMenuStyle();


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdebase-workspace.spec	29 Mar 2008 07:58:42 -0000	1.56
+++ kdebase-workspace.spec	31 Mar 2008 14:07:27 -0000	1.57
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.3
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -25,6 +25,10 @@
 # and the config parts reverted in http://websvn.kde.org/?view=rev&revision=790454
 # due to new strings. This patch reverts rev 790454 and restores the full backport.
 Patch100: kdebase-workspace-4.0.3-kde#155362.patch
+# backport of http://websvn.kde.org/?view=rev&revision=780495 from 4.1
+# (fixed version of http://websvn.kde.org/?view=rev&revision=790063
+# which was reverted in http://websvn.kde.org/?view=rev&revision=790104)
+Patch101: kdebase-workspace-4.0.3-menu-switch.patch
 
 # upstream patch
 
@@ -119,6 +123,7 @@
 %patch5 -p1 -b .ck-shutdown
 
 # upstream patches
+%patch101 -p1 -b .menu-switch
 %patch100 -p0 -b .kde#155362
 
 %build
@@ -232,6 +237,9 @@
 
 
 %changelog
+* Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-4
+- backport context menu switch between Kickoff and simple menu from 4.1
+
 * Sat Mar 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-3
 - add support for shutdown/reboot through ConsoleKit >= 0.2.4 (#431817)