rpms/kdebase-workspace/devel kdebase-workspace-4.2.95-plasma-konsole.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 kdebase-workspace.spec, 1.237, 1.238 sources, 1.37, 1.38 kdebase-workspace-4.2.85-plasma-konsole.patch, 1.1, NONE

[Than Ngo]

Author: than

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

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.2.95-plasma-konsole.patch 
Removed Files:
	kdebase-workspace-4.2.85-plasma-konsole.patch 
Log Message:
4.3rc1


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

--- NEW FILE kdebase-workspace-4.2.95-plasma-konsole.patch ---
diff -up kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp.plasma-konsole kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp.plasma-konsole	2009-06-17 22:07:42.000000000 +0200
+++ kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp	2009-06-26 12:00:49.000000000 +0200
@@ -41,6 +41,7 @@
 #include <KRun>
 #include <KStandardDirs>
 #include <KWindowSystem>
+#include <ktoolinvocation.h>
 
 #include <Plasma/Corona>
 #include <Plasma/Animator>
@@ -65,6 +66,7 @@ DefaultDesktop::DefaultDesktop(QObject *
       m_runCommandAction(0),
       m_lockScreenAction(0),
       m_logoutAction(0),
+      m_runKonsoleAction(0),
       dropping(false)
 {
     qRegisterMetaType<QImage>("QImage");
@@ -203,6 +205,11 @@ void DefaultDesktop::runCommand()
     krunner.display();
 }
 
+void DefaultDesktop::runKonsole()
+{
+    KToolInvocation::invokeTerminal(QString(), QDir::homePath());
+}
+
 void DefaultDesktop::lockScreen()
 {
     if (!KAuthorized::authorizeKAction("lock_screen")) {
@@ -253,6 +260,10 @@ QList<QAction*> DefaultDesktop::contextu
             m_addPanelAction->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);
         m_runCommandAction->setIcon(KIcon("system-run"));
         connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
@@ -272,6 +283,8 @@ QList<QAction*> DefaultDesktop::contextu
 
     QList<QAction*> actions;
 
+    actions.append(m_runKonsoleAction);
+
     if (KAuthorized::authorizeKAction("run_command")) {
         actions.append(m_runCommandAction);
     }
diff -up kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h.plasma-konsole kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h
--- kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h.plasma-konsole	2009-04-05 22:00:17.000000000 +0200
+++ kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h	2009-06-26 11:49:24.000000000 +0200
@@ -70,6 +70,7 @@ protected:
     void dropEvent(QGraphicsSceneDragDropEvent *event);
 
 protected Q_SLOTS:
+    void runKonsole();
     void runCommand();
 
     void lockScreen();
@@ -89,6 +90,7 @@ private:
     QAction *m_lockDesktopAction;
     QAction *m_appletBrowserAction;
     QAction *m_addPanelAction;
+    QAction *m_runKonsoleAction;
     QAction *m_runCommandAction;
     QAction *m_setupDesktopAction;
     QAction *m_lockScreenAction;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	3 Jun 2009 22:16:30 -0000	1.31
+++ .cvsignore	26 Jun 2009 10:09:21 -0000	1.32
@@ -1 +1,2 @@
 kdebase-workspace-4.2.90.tar.bz2
+kdebase-workspace-4.2.95.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- kdebase-workspace.spec	19 Jun 2009 02:52:31 -0000	1.237
+++ kdebase-workspace.spec	26 Jun 2009 10:09:21 -0000	1.238
@@ -2,9 +2,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.2.90
+Version: 4.2.95
 
-Release: 3%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -12,7 +12,7 @@ URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdebase-workspace-4.2.85-redhat-startkde.patch
-Patch2: kdebase-workspace-4.2.85-plasma-konsole.patch
+Patch2: kdebase-workspace-4.2.95-plasma-konsole.patch
 Patch3: kdebase-workspace-4.2.90-show_systemsettings.patch
 Patch4: kdebase-workspace-4.2.85-ck-shutdown.patch
 Patch5: kdebase-workspace-4.2.90-MALLOC_CHECK.patch
@@ -500,6 +500,9 @@ fi
 
 
 %changelog
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
 * Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-3
 - startkde: make MALLOC_CHECK opt-in (default off)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	3 Jun 2009 22:16:30 -0000	1.37
+++ sources	26 Jun 2009 10:09:21 -0000	1.38
@@ -1 +1 @@
-97946c6e8ca4eb1c9ecefbe8b387d935  kdebase-workspace-4.2.90.tar.bz2
+fd95cf684f517bf45f8c26e0896d0593  kdebase-workspace-4.2.95.tar.bz2


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