From 62e57edf4ce08e89d76c2324fec15ea65ed9de2d Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 21 Apr 2010 14:11:36 +0200
Subject: [PATCH] Remove the window modified indicator feature from non-Mac
again.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It creates too much headache with widgets calling setWindowTitle
themselves and Qt spilling out warnings about missing "[*]".
Reviewed-by: Thorbjørn Lindeijer
---
src/plugins/coreplugin/editormanager/editormanager.cpp | 4 ++++
src/plugins/projectexplorer/session.cpp | 6 +-----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 637899e1ef8..da4bca7efd9 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1529,7 +1529,9 @@ void EditorManager::updateActions()
fName = curEditor->displayName();
}
+#ifdef Q_WS_MAC
window()->setWindowModified(curEditor->file()->isModified());
+#endif
if (curEditor->file()->isModified() && curEditor->file()->isReadOnly()) {
// we are about to change a read-only file, warn user
showEditorInfoBar(QLatin1String("Core.EditorManager.MakeWritable"),
@@ -1538,8 +1540,10 @@ void EditorManager::updateActions()
} else {
hideEditorInfoBar(QLatin1String("Core.EditorManager.MakeWritable"));
}
+#ifdef Q_WS_MAC
} else { // curEditor
window()->setWindowModified(false);
+#endif
}
m_d->m_saveAction->setEnabled(curEditor != 0 && curEditor->file()->isModified());
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index 6c8efb443a4..dcd120f1a0e 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -926,14 +926,10 @@ void SessionManager::updateWindowTitle()
if (m_core->editorManager()->currentEditor()) {
QFileInfo fi(m_core->editorManager()->currentEditor()->file()->fileName());
QString fileName = fi.fileName();
- // [*] is placeholder for a windowModified marker, set in editor manager
if (!fileName.isEmpty())
- windowTitle.prepend(fileName + "[*] - ");
- else
- windowTitle.append("[*]"); // placeholder will be removed by Qt)
+ windowTitle.prepend(fileName + " - ");
m_core->mainWindow()->setWindowFilePath(fi.absoluteFilePath());
} else {
- windowTitle.append("[*]"); // placeholder for windowModified property (is removed by Qt)
m_core->mainWindow()->setWindowFilePath(QString());
}
m_core->mainWindow()->setWindowTitle(windowTitle);
--
GitLab