summaryrefslogtreecommitdiffstats
path: root/source/kde/kdebase/konsole_right_click-185466.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2012-09-26 01:10:42 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:51:55 +0200
commit9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
treeb428a16618e36ed864a8d76ea3435e19a452bf90 /source/kde/kdebase/konsole_right_click-185466.patch
parent75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
downloadcurrent-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.xz
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
Diffstat (limited to 'source/kde/kdebase/konsole_right_click-185466.patch')
-rw-r--r--source/kde/kdebase/konsole_right_click-185466.patch99
1 files changed, 0 insertions, 99 deletions
diff --git a/source/kde/kdebase/konsole_right_click-185466.patch b/source/kde/kdebase/konsole_right_click-185466.patch
deleted file mode 100644
index a3e19ab58..000000000
--- a/source/kde/kdebase/konsole_right_click-185466.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Index: tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp
-===================================================================
---- tmp.orig/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp
-+++ tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp
-@@ -86,6 +86,8 @@ MainWindow::MainWindow()
- connect( _viewManager , SIGNAL(empty()) , this , SLOT(close()) );
- connect( _viewManager , SIGNAL(activeViewChanged(SessionController*)) , this ,
- SLOT(activeViewChanged(SessionController*)) );
-+ connect( _viewManager , SIGNAL(unplugController(SessionController*)) , this ,
-+ SLOT(disconnectController(SessionController*)) );
- connect( _viewManager , SIGNAL(viewPropertiesChanged(const QList<ViewProperties*>&)) ,
- bookmarkHandler() , SLOT(setViews(const QList<ViewProperties*>&)) );
-
-Index: tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.h
-===================================================================
---- tmp.orig/kdebase-4.5.5/apps/konsole/src/MainWindow.h
-+++ tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.h
-@@ -161,6 +161,7 @@ class MainWindow : public KXmlGuiWindow
- void showShortcutsDialog();
- void newFromProfile(Profile::Ptr profile);
- void activeViewChanged(SessionController* controller);
-+ void disconnectController(SessionController* controller);
- void activeViewTitleChanged(ViewProperties*);
-
- void sessionListChanged(const QList<QAction*>& actions);
-@@ -179,7 +180,6 @@ class MainWindow : public KXmlGuiWindow
- void setupActions();
- void setupWidgets();
- QString activeSessionDir() const;
-- void disconnectController(SessionController* controller);
-
- // sets the active shortcuts of actions in 'dest' to the shortcuts of actions
- // with the same name in 'source' (see KAction::ActiveShortcut)
-Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp
-===================================================================
---- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp
-+++ tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp
-@@ -376,6 +376,10 @@ void ViewManager::sessionFinished()
- }
- }
-
-+ // This is needed to remove this controller from factory() in
-+ // order to prevent BUG: 185466 - disappearing menu popup
-+ if (_pluggedController)
-+ emit unplugController(_pluggedController);
- }
-
- void ViewManager::focusActiveView()
-@@ -744,6 +748,9 @@ void ViewManager::viewCloseRequest(QWidg
- focusActiveView();
- updateDetachViewState();
- }
-+ if (_pluggedController)
-+ emit unplugController(_pluggedController);
-+
- }
-
- TerminalDisplay* ViewManager::createTerminalDisplay(Session* session)
-Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.h
-===================================================================
---- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewManager.h
-+++ tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.h
-@@ -175,6 +175,12 @@ signals:
- void activeViewChanged(SessionController* controller);
-
- /**
-+ * Emitted when the current session needs to be unplugged from factory().
-+ * @param controller The controller associated with the view
-+ */
-+ void unplugController(SessionController* controller);
-+
-+ /**
- * Emitted when the list of view properties ( as returned by viewProperties() ) changes.
- * This occurs when views are added to or removed from the active container, or
- * if the active container is changed.
-Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp
-===================================================================
---- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp
-+++ tmp/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp
-@@ -448,6 +448,7 @@ TabbedViewContainer::TabbedViewContainer
- _closeTabButton->setIcon(KIcon("tab-close"));
- _closeTabButton->adjustSize();
- _closeTabButton->setHidden(true);
-+ _closeTabButton->setEnabled(false);
-
- connect( _tabBar , SIGNAL(currentChanged(int)) , this , SLOT(currentTabChanged(int)) );
- connect( _tabBar , SIGNAL(tabDoubleClicked(int)) , this , SLOT(tabDoubleClicked(int)) );
-@@ -500,9 +501,11 @@ TabbedViewContainer::TabbedViewContainer
- i18nc("@action:inmenu", "&Rename Tab..."), this,
- SLOT(tabContextMenuRenameTab()));
-
-+/* bug 185466
- _contextPopupMenu->addAction(KIcon("tab-close"),
- i18nc("@action:inmenu", "&Close Tab"), this,
- SLOT(tabContextMenuCloseTab()));
-+*/
-
- }
- void TabbedViewContainer::setNewViewMenu(QMenu* menu)