rpms/kdebase-workspace/devel kdebase-workspace-4.0.2-plasma-konsole.patch, NONE, 1.1 kdebase-workspace.spec, 1.44, 1.45

[Than Ngo (than)]

Author: than

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.2-plasma-konsole.patch 
Log Message:
add konsole in desktop menu


kdebase-workspace-4.0.2-plasma-konsole.patch:

--- NEW FILE kdebase-workspace-4.0.2-plasma-konsole.patch ---
diff -up kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.h.orig kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.h
--- kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.h.orig	2008-03-04 16:18:19.000000000 +0100
+++ kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.h	2008-03-04 16:18:58.000000000 +0100
@@ -83,6 +83,7 @@ public:
                         const QRect& contentsRect);
 
 protected Q_SLOTS:
+    void runKonsole();
     void runCommand();
     void configure();
     void applyConfig();
@@ -100,6 +101,7 @@ private:
 
     QAction *m_lockDesktopAction;
     QAction *m_appletBrowserAction;
+    QAction *m_runKonsoleAction;
     QAction *m_runCommandAction;
     QAction *m_setupDesktopAction;
     QAction *m_lockScreenAction;
diff -up kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.cpp.orig kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.cpp.orig	2008-03-04 15:45:16.000000000 +0100
+++ kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.cpp	2008-03-06 13:29:54.000000000 +0100
@@ -37,6 +37,7 @@
 #include <KStandardDirs>
 #include <KSvgRenderer>
 #include <KWindowSystem>
+#include <KProcess>
 
 #include "plasma/corona.h"
 #include "plasma/appletbrowser.h"
@@ -59,6 +60,7 @@ DefaultDesktop::DefaultDesktop(QObject *
     : Containment(parent, args),
       m_lockDesktopAction(0),
       m_appletBrowserAction(0),
+      m_runKonsoleAction(0),
       m_runCommandAction(0),
       m_lockScreenAction(0),
       m_logoutAction(0),
@@ -307,6 +309,13 @@ void DefaultDesktop::runCommand()
     }
 }
 
+void DefaultDesktop::runKonsole()
+{
+    KProcess proc;
+    proc << KStandardDirs::locate("exe", "konsole");
+    proc.execute();
+}
+
 void DefaultDesktop::lockScreen()
 {
     if (!KAuthorized::authorizeKAction("lock_screen")) {
@@ -332,6 +341,10 @@ QList<QAction*> DefaultDesktop::contextA
         connect(m_appletBrowserAction, SIGNAL(triggered(bool)), this, SIGNAL(showAddWidgets()));
         m_appletBrowserAction->setIcon(KIcon("list-add"));
 
+        m_runKonsoleAction = new QAction(i18n("Konsole"), this);
+        connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole()));
+        m_runKonsoleAction->setIcon(KIcon("terminal"));
+
         m_runCommandAction = new QAction(i18n("Run Command..."), this);
         connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
         m_runCommandAction->setIcon(KIcon("system-run"));
@@ -362,6 +375,8 @@ QList<QAction*> DefaultDesktop::contextA
 
     QList<QAction*> actions;
 
+    actions.append(m_runKonsoleAction);
+
     if (KAuthorized::authorizeKAction("run_command")) {
         actions.append(m_runCommandAction);
     }


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdebase-workspace.spec	6 Mar 2008 09:26:01 -0000	1.44
+++ kdebase-workspace.spec	6 Mar 2008 12:38:02 -0000	1.45
@@ -16,6 +16,7 @@
 Patch1: kdebase-workspace-4.0.1-redhat-startkde.patch
 Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch
 Patch3: kdebase-workspace-4.0.2-Gestures.patch
+Patch4: kdebase-workspace-4.0.2-plasma-konsole.patch
 
 # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
 # backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886
@@ -109,6 +110,9 @@
 # ConsoleKit support for KDM (#228111, kde#147790)
 %patch2 -p1 -b .consolekit
 %patch3 -p1 -b .gestures
+%patch4 -p1 -b .plase-konsole
+
+# upstream patches
 %patch100 -p1 -b .kde#155362
 %patch101 -p1 -b .kcontrol-crash
 
@@ -225,6 +229,7 @@
 %changelog
 * Tue Mar 04 2008 Than Ngo <than at redhat.com> 4.0.2-4
 - disable gestures as default
+- add konsole in desktop menu
 
 * Mon Mar 03 2008 Than Ngo <than at redhat.com> 4.0.2-3
 - apply upstream patch to fix crash in khotkeys