rpms/kdebase-workspace/devel kdebase-workspace-4.3.98-plasma-konsole.patch, NONE, 1.1 .cvsignore, 1.46, 1.47 kdebase-workspace.spec, 1.355, 1.356 sources, 1.54, 1.55 kdebase-workspace-4.3.75-plasma-konsole.patch, 1.2, NONE kdebase-workspace-4.3.90-missing_include.patch, 1.3, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23840

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.3.98-plasma-konsole.patch 
Removed Files:
	kdebase-workspace-4.3.75-plasma-konsole.patch 
	kdebase-workspace-4.3.90-missing_include.patch 
Log Message:
* Sun Jan 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-1
- KDE 4.3.98 (4.4rc3)


kdebase-workspace-4.3.98-plasma-konsole.patch:
 menu.cpp |   17 +++++++++++++++--
 menu.h   |    2 ++
 2 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-workspace-4.3.98-plasma-konsole.patch ---
diff -up kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.cpp.plasma-konsole kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.cpp
--- kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.cpp.plasma-konsole	2010-01-31 13:30:37.000000000 -0600
+++ kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.cpp	2010-01-31 19:19:23.000000000 -0600
@@ -30,6 +30,7 @@
 #include <KDebug>
 #include <KIcon>
 #include <KMenu>
+#include <ktoolinvocation.h>
 
 #include <Plasma/Containment>
 #include <Plasma/Corona>
@@ -46,6 +47,7 @@
 
 ContextMenu::ContextMenu(QObject *parent, const QVariantList &args)
     : Plasma::ContainmentActions(parent, args),
+      m_runKonsoleAction(0),
       m_runCommandAction(0),
       m_lockScreenAction(0),
       m_logoutAction(0),
@@ -77,8 +79,8 @@ void ContextMenu::init(const KConfigGrou
         defaultEnabled << true << true << true << true << true;
     } else {
         //FIXME ugly code!
-        m_allActions << "_context" << "_run_command" << "add widgets" << "_add panel" << "add sibling containment" << "remove" << "lock widgets" << "zoom in" << "zoom out" << "_sep1" << "_lock_screen" << "_logout" << "_sep2" << "configure" << "configure shortcuts" << "_sep3" << "_wallpaper";
-        defaultEnabled << true << true << true << true << false << true << true << false << false << true << true << true << true << true << false << true << true;
+        m_allActions << "_context" << "_run_konsole" << "_run_command" << "add widgets" << "_add panel" << "add sibling containment" << "remove" << "lock widgets" << "zoom in" << "zoom out" << "_sep1" << "_lock_screen" << "_logout" << "_sep2" << "configure" << "configure shortcuts" << "_sep3" << "_wallpaper";
+        defaultEnabled << true << true << true << true << true << false << true << true << false << false << true << true << true << true << true << false << true << true;
     }
 
     for (int i = 0; i < m_allActions.count(); ++i) {
@@ -95,6 +97,10 @@ void ContextMenu::init(const KConfigGrou
         //panel does its own config action atm... FIXME how do I fit it in properly?
         //can I do something with configureRequested? damn privateslot...
     } else {
+        m_runKonsoleAction = new QAction(i18n("Konsole"), this);
+        m_runKonsoleAction->setIcon(KIcon("terminal"));
+        connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole()));
+
         m_runCommandAction = new QAction(i18n("Run Command..."), this);
         m_runCommandAction->setIcon(KIcon("system-run"));
         connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
@@ -179,6 +185,8 @@ QAction *ContextMenu::action(const QStri
         if (c->corona() && c->corona()->immutability() == Plasma::Mutable) {
             return c->corona()->action("add panel");
         }
+    } else if (name == "_run_konsole") {
+        return m_runKonsoleAction;
     } else if (name == "_run_command") {
         if (KAuthorized::authorizeKAction("run_command")) {
             return m_runCommandAction;
@@ -198,6 +206,11 @@ QAction *ContextMenu::action(const QStri
     return 0;
 }
 
+void ContextMenu::runKonsole()
+{
+    KToolInvocation::invokeTerminal(QString(), QDir::homePath());
+}
+
 void ContextMenu::runCommand()
 {
     if (!KAuthorized::authorizeKAction("run_command")) {
diff -up kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.h.plasma-konsole kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.h
--- kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.h.plasma-konsole	2010-01-31 13:30:37.000000000 -0600
+++ kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.h	2010-01-31 19:17:49.000000000 -0600
@@ -41,12 +41,14 @@ public:
     void save(KConfigGroup &config);
 
 public slots:
+    void runKonsole();
     void runCommand();
     void lockScreen();
     void startLogout();
     void logout();
 
 private:
+    QAction *m_runKonsoleAction;
     QAction *m_runCommandAction;
     QAction *m_lockScreenAction;
     QAction *m_logoutAction;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	20 Jan 2010 16:29:41 -0000	1.46
+++ .cvsignore	1 Feb 2010 01:27:56 -0000	1.47
@@ -1 +1 @@
-kdebase-workspace-4.3.95.tar.bz2
+kdebase-workspace-4.3.98.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -p -r1.355 -r1.356
--- kdebase-workspace.spec	30 Jan 2010 16:44:27 -0000	1.355
+++ kdebase-workspace.spec	1 Feb 2010 01:27:56 -0000	1.356
@@ -21,8 +21,8 @@
 
 Summary: KDE Workspace
 Name:    kdebase-workspace
-Version: 4.3.95
-Release: 2%{?dist}
+Version: 4.3.98
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -31,7 +31,7 @@ Source0: ftp://ftp.kde.org/pub/kde/unsta
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdebase-workspace-4.3.95-redhat-startkde.patch
-Patch2: kdebase-workspace-4.3.75-plasma-konsole.patch
+Patch2: kdebase-workspace-4.3.98-plasma-konsole.patch
 Patch3: kdebase-workspace-4.3.75-show_systemsettings.patch
 Patch4: kdebase-workspace-4.3.95-ck-shutdown.patch
 # 441062: packagekit tools do not show icons correctly on KDE
@@ -45,6 +45,7 @@ Patch14: kdebase-workspace-4.2.0-klipper
 Patch15: kdebase-workspace-4.3.75-kio_sysinfo.patch
 # show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
 # currently requires backport from pre-4.3.80 trunk (Patch100)
+## FIXME/TODO: needs rebasing (and doesn't seem to work?) -- Rex
 Patch16: kdebase-workspace-4.3.75-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
@@ -60,7 +61,6 @@ Patch50: kdebase-workspace-4.3.3-kde#171
 # FIXME: Not upstreamed yet --Ben (4.3.80)
 #Patch51: http://bazaar.launchpad.net/~kubuntu-members/kdebase-workspace/ubuntu/annotate/head%3A/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff
 Patch51: kdebase-workspace-4.3.95-brightness_keys.patch
-Patch100: kdebase-workspace-4.3.90-missing_include.patch
 
 
 # moving to non-multilib hack
@@ -293,7 +293,7 @@ Requires: akonadi
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
-%patch16 -p1 -b .showremainingtime
+#patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
 %if 0%{?plymouth_hack_spool}
 %patch19 -p1 -b .kdm_plymouth
@@ -304,7 +304,6 @@ Requires: akonadi
 %patch50 -p1 -b .kde#171685
 # kubuntu patches
 %patch51 -p1 -b .brightness_keys
-%patch100 -p1 -b .missing_include
 
 
 %build
@@ -655,6 +654,9 @@ fi
 
 
 %changelog
+* Sun Jan 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-1
+- KDE 4.3.98 (4.4rc3)
+
 * Sat Jan 30 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.95-2
 - ck-shutdown: don't offer shutdown/restart when not allowed by CK (#529644)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	20 Jan 2010 16:29:41 -0000	1.54
+++ sources	1 Feb 2010 01:27:56 -0000	1.55
@@ -1 +1 @@
-65cf8ac8c10d2db00360951520837d08  kdebase-workspace-4.3.95.tar.bz2
+34baa70da178a8599746407e88b1c184  kdebase-workspace-4.3.98.tar.bz2


--- kdebase-workspace-4.3.75-plasma-konsole.patch DELETED ---


--- kdebase-workspace-4.3.90-missing_include.patch DELETED ---