diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2011-04-25 13:37:00 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:45:18 +0200 |
commit | 75a4a592e5ccda30715f93563d741b83e0dcf39e (patch) | |
tree | 502f745607e77a2c4386ad38d818ddcafe81489c /source/kde/kdebase/konsole_right_click-185466.patch | |
parent | b76270bf9e6dd375e495fec92140a79a79415d27 (diff) | |
download | current-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.gz |
Slackware 13.37slackware-13.37
Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!
Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.
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.
As always, thanks to the Slackware community for testing, suggestions,
and feedback. :-)
Have fun!
Diffstat (limited to 'source/kde/kdebase/konsole_right_click-185466.patch')
-rw-r--r-- | source/kde/kdebase/konsole_right_click-185466.patch | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/source/kde/kdebase/konsole_right_click-185466.patch b/source/kde/kdebase/konsole_right_click-185466.patch new file mode 100644 index 00000000..a3e19ab5 --- /dev/null +++ b/source/kde/kdebase/konsole_right_click-185466.patch @@ -0,0 +1,99 @@ +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) |