Commit a95222fe authored by Kurt Hindenburg's avatar Kurt Hindenburg

Fix issue where the context menu popup no longer appeared after closing a tab.

BUG: 185466

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=1216490
parent 2f7a42e7
......@@ -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*>&)) );
......
......@@ -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);
......@@ -181,7 +182,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)
......
......@@ -377,6 +377,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()
......
......@@ -175,6 +175,12 @@ signals:
*/
void activeViewChanged(SessionController* controller);
/**
* Emitted when the current session needs unplugged from factory().
* @param controller The controller associated with the active 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment