Commit 69a99f0a authored by Joel Nordell's avatar Joel Nordell
Browse files

add current editor filename (and, on macosx, proxy icon) to titlebar

parent bb6f56f5
...@@ -770,6 +770,8 @@ bool EditorManager::closeEditors(const QList<IEditor*> editorsToClose, bool askA ...@@ -770,6 +770,8 @@ bool EditorManager::closeEditors(const QList<IEditor*> editorsToClose, bool askA
setCurrentView(m_d->m_splitter->findView(currentView)); setCurrentView(m_d->m_splitter->findView(currentView));
if (IEditor *e = currentView->currentEditor()) if (IEditor *e = currentView->currentEditor())
activateEditor(currentView, e); activateEditor(currentView, e);
else
emit currentEditorChanged(0);
} }
return !closingFailed; return !closingFailed;
......
...@@ -393,6 +393,8 @@ SessionManager::SessionManager(QObject *parent) ...@@ -393,6 +393,8 @@ SessionManager::SessionManager(QObject *parent)
this, SLOT(setEditorCodec(Core::IEditor *, QString))); this, SLOT(setEditorCodec(Core::IEditor *, QString)));
connect(ProjectExplorerPlugin::instance(), SIGNAL(currentProjectChanged(ProjectExplorer::Project *)), connect(ProjectExplorerPlugin::instance(), SIGNAL(currentProjectChanged(ProjectExplorer::Project *)),
this, SLOT(updateWindowTitle())); this, SLOT(updateWindowTitle()));
connect(m_core->editorManager(), SIGNAL(currentEditorChanged(Core::IEditor*)),
this, SLOT(updateWindowTitle()));
} }
SessionManager::~SessionManager() SessionManager::~SessionManager()
...@@ -921,6 +923,13 @@ void SessionManager::updateWindowTitle() ...@@ -921,6 +923,13 @@ void SessionManager::updateWindowTitle()
if (Project *currentProject = ProjectExplorerPlugin::instance()->currentProject()) if (Project *currentProject = ProjectExplorerPlugin::instance()->currentProject())
windowTitle.prepend(currentProject->name() + " - "); windowTitle.prepend(currentProject->name() + " - ");
} }
if (m_core->editorManager()->currentEditor()) {
QFileInfo fi(m_core->editorManager()->currentEditor()->file()->fileName());
windowTitle.prepend(fi.fileName() + " - ");
m_core->mainWindow()->setWindowFilePath(fi.absoluteFilePath());
} else {
m_core->mainWindow()->setWindowFilePath(QString());
}
m_core->mainWindow()->setWindowTitle(windowTitle); m_core->mainWindow()->setWindowTitle(windowTitle);
} }
......
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