rpms/kdebase-workspace/devel kdebase-workspace-4.3.75-plasma-konsole.patch, 1.1, 1.2 kdebase-workspace.spec, 1.316, 1.317
Kevin Kofler
kkofler at fedoraproject.org
Sat Nov 28 01:12:18 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31015/devel
Modified Files:
kdebase-workspace-4.3.75-plasma-konsole.patch
kdebase-workspace.spec
Log Message:
* Sat Nov 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.3.svn1048496
- rebase plasma-konsole patch
kdebase-workspace-4.3.75-plasma-konsole.patch:
menu.cpp | 17 +++++++++++++++--
menu.h | 2 ++
2 files changed, 17 insertions(+), 2 deletions(-)
Index: kdebase-workspace-4.3.75-plasma-konsole.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.3.75-plasma-konsole.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebase-workspace-4.3.75-plasma-konsole.patch 24 Nov 2009 16:34:32 -0000 1.1
+++ kdebase-workspace-4.3.75-plasma-konsole.patch 28 Nov 2009 01:12:18 -0000 1.2
@@ -1,70 +1,81 @@
-diff -up kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.cpp.plasma-konsole kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.cpp
---- kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.cpp.plasma-konsole 2009-06-17 22:07:42.000000000 +0200
-+++ kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.cpp 2009-06-26 12:00:49.000000000 +0200
-@@ -41,6 +41,7 @@
- #include <KRun>
- #include <KStandardDirs>
- #include <KWindowSystem>
+diff -ur kdebase-workspace-4.3.75svn1048496/plasma/generic/containmentactions/contextmenu/menu.cpp kdebase-workspace-4.3.75svn1048496-plasma-konsole/plasma/generic/containmentactions/contextmenu/menu.cpp
+--- kdebase-workspace-4.3.75svn1048496/plasma/generic/containmentactions/contextmenu/menu.cpp 2009-10-26 10:14:51.000000000 +0100
++++ kdebase-workspace-4.3.75svn1048496-plasma-konsole/plasma/generic/containmentactions/contextmenu/menu.cpp 2009-11-28 02:07:59.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include <KDebug>
+ #include <KIcon>
+ #include <KMenu>
+#include <ktoolinvocation.h>
+ #include <Plasma/Containment>
#include <Plasma/Corona>
- #include <Plasma/Animator>
-@@ -65,6 +66,7 @@ DefaultDesktop::DefaultDesktop(QObject *
+@@ -48,6 +49,7 @@
+ : Plasma::ContainmentActions(parent, args),
+ m_addPanelsMenu(0),
+ m_addPanelAction(0),
++ m_runKonsoleAction(0),
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"));
- }
+@@ -80,8 +82,8 @@
+ 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) {
+@@ -130,6 +132,10 @@
+ //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);
-+ connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole()));
+ 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()));
-@@ -272,6 +283,8 @@ QList<QAction*> DefaultDesktop::contextu
-
- QList<QAction*> actions;
+@@ -220,6 +226,8 @@
+ return m_separator3;
+ } else if (name == "_add panel") {
+ return m_addPanelAction;
++ } else if (name == "_run_konsole") {
++ return m_runKonsoleAction;
+ } else if (name == "_run_command") {
+ if (KAuthorized::authorizeKAction("run_command")) {
+ return m_runCommandAction;
+@@ -309,6 +317,11 @@
+ }
+ }
-+ actions.append(m_runKonsoleAction);
++void ContextMenu::runKonsole()
++{
++ KToolInvocation::invokeTerminal(QString(), QDir::homePath());
++}
+
- if (KAuthorized::authorizeKAction("run_command")) {
- actions.append(m_runCommandAction);
- }
-diff -up kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.h.plasma-konsole kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.h
---- kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.h.plasma-konsole 2009-04-05 22:00:17.000000000 +0200
-+++ kdebase-workspace-4.2.95/plasma/desktop/containments/desktop/desktop.h 2009-06-26 11:49:24.000000000 +0200
-@@ -70,6 +70,7 @@ protected:
- void dropEvent(QGraphicsSceneDragDropEvent *event);
+ void ContextMenu::runCommand()
+ {
+ if (!KAuthorized::authorizeKAction("run_command")) {
+diff -ur kdebase-workspace-4.3.75svn1048496/plasma/generic/containmentactions/contextmenu/menu.h kdebase-workspace-4.3.75svn1048496-plasma-konsole/plasma/generic/containmentactions/contextmenu/menu.h
+--- kdebase-workspace-4.3.75svn1048496/plasma/generic/containmentactions/contextmenu/menu.h 2009-10-15 18:33:38.000000000 +0200
++++ kdebase-workspace-4.3.75svn1048496-plasma-konsole/plasma/generic/containmentactions/contextmenu/menu.h 2009-11-28 02:01:05.000000000 +0100
+@@ -43,6 +43,7 @@
+ public slots:
+ void updateImmutability(const Plasma::ImmutabilityType immutable);
- protected Q_SLOTS:
+ void runKonsole();
void runCommand();
void lockScreen();
-@@ -89,6 +90,7 @@ private:
- QAction *m_lockDesktopAction;
- QAction *m_appletBrowserAction;
+@@ -55,6 +56,7 @@
+ private:
+ QMenu *m_addPanelsMenu;
QAction *m_addPanelAction;
+ QAction *m_runKonsoleAction;
QAction *m_runCommandAction;
- QAction *m_setupDesktopAction;
QAction *m_lockScreenAction;
+ QAction *m_logoutAction;
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- kdebase-workspace.spec 25 Nov 2009 16:17:21 -0000 1.316
+++ kdebase-workspace.spec 28 Nov 2009 01:12:18 -0000 1.317
@@ -9,7 +9,7 @@
Summary: K Desktop Environment - Workspace
Name: kdebase-workspace
Version: 4.3.75
-Release: 0.2.%{alphatag}%{?dist}
+Release: 0.3.%{alphatag}%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}%{?alphatag}.tar.bz2
License: GPLv2
@@ -18,8 +18,7 @@ URL: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: kdebase-workspace-4.3.75-redhat-startkde.patch
-# TODO: Disable for now, may be do-able in kde-settings now
-#Patch2: kdebase-workspace-4.3.75-plasma-konsole.patch
+Patch2: kdebase-workspace-4.3.75-plasma-konsole.patch
Patch3: kdebase-workspace-4.3.75-show_systemsettings.patch
Patch4: kdebase-workspace-4.2.85-ck-shutdown.patch
# 441062: packagekit tools do not show icons correctly on KDE
@@ -268,7 +267,7 @@ Requires: akonadi
# RH/Fedora-specific startkde changes
%patch1 -p1 -b .redhat-startkde
-#patch2 -p1 -b .plasma-konsole
+%patch2 -p1 -b .plasma-konsole
%patch3 -p1 -b .show_systemsettings
# ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
%patch4 -p1 -b .ck-shutdown
@@ -620,11 +619,14 @@ fi
%changelog
+* Sat Nov 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.3.svn1048496
+- rebase plasma-konsole patch
+
* Wed Nov 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.75-0.2.svn1048496
- Requires: PolicyKit-authentication-agent unconditionally
* Sat Nov 21 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
-- Update to 4.3.75 snapshot
+- update to 4.3.75 snapshot
* Wed Nov 18 2009 Lukáš Tinkl <ltinkl at redhat.com> 4.3.3-8
- correctly try to deduce LANG (kubuntu_13_startkde_set_country.diff)
More information about the fedora-extras-commits
mailing list