mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-06-12 07:55:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add global option for showing window title on titlebar

Browse Source 
When the window title from current session is emtpy, fallback to using
tab title.

CCBUG: 162326
REVIEW: 103978
This commit is contained in:
Jekyll Wu
2012-02-19 15:19:37 +08:00
parent 2ba24db12c
commit 4fb4da4c75
6 changed files with 67 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/MainWindow.cpp
View File

@@ -184,6 +184,8 @@ void MainWindow::disconnectController(SessionController* controller)
{
disconnect(controller , SIGNAL(titleChanged(ViewProperties*))
, this , SLOT(activeViewTitleChanged(ViewProperties*)));
disconnect(controller , SIGNAL(rawTitleChanged())
, this , SLOT(updateWindowCaption()));
// KXmlGuiFactory::removeClient() will try to access actions associated
// with the controller internally, which may not be valid after the controller
@@ -206,11 +208,14 @@ void MainWindow::activeViewChanged(SessionController* controller)
if (_pluggedController)
disconnectController(_pluggedController);
// listen for title changes from the current session
Q_ASSERT(controller);
_pluggedController = controller;
// listen for title changes from the current session
connect(controller , SIGNAL(titleChanged(ViewProperties*)) ,
this , SLOT(activeViewTitleChanged(ViewProperties*)));
connect(controller , SIGNAL(rawTitleChanged()) ,
this , SLOT(updateWindowCaption()));
controller->setShowMenuAction(_toggleMenuBarAction);
guiFactory()->addClient(controller);
@@ -221,15 +226,33 @@ void MainWindow::activeViewChanged(SessionController* controller)
// update session title to match newly activated session
activeViewTitleChanged(controller);
_pluggedController = controller;
// Update window icon to newly activated session's icon
updateWindowIcon();
}
void MainWindow::activeViewTitleChanged(ViewProperties* properties)
{
setPlainCaption(properties->title());
Q_UNUSED(properties);
updateWindowCaption();
}
void MainWindow::updateWindowCaption()
{
if ( !_pluggedController)
return;
const QString& title = _pluggedController->title();
const QString& userTitle = _pluggedController->userTitle();
// use tab title as caption by default
QString caption = title;
// use window title as caption only when enabled and it is not empty
if ( KonsoleSettings::showWindowTitleOnTitleBar() && !userTitle.isEmpty() ) {
caption = userTitle;
}
setCaption(caption);
}
void MainWindow::updateWindowIcon()
@@ -561,6 +584,8 @@ void MainWindow::applyKonsoleSettings()
_viewManager->updateNavigationOptions(options);
// setAutoSaveSettings("MainWindow", KonsoleSettings::saveGeometryOnExit());
updateWindowCaption();
}
void MainWindow::activateMenuBar()