feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move displayName from IEditor to IDocument

Browse Source 
The display name is not editor instance specific, but belongs to the
document.

Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Eike Ziller
2013-07-04 22:25:15 +02:00
parent 81eba6f984
commit 113c5600c9
57 changed files with 177 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/designer/formwindowfile.cpp
View File

@@ -52,7 +52,8 @@ FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *pare
: Core::TextDocument(parent),
m_mimeType(QLatin1String(Designer::Constants::FORM_MIMETYPE)),
m_shouldAutoSave(false),
m_formWindow(form)
m_formWindow(form),
m_isModified(false)
{
// Designer needs UTF-8 regardless of settings.
setCodec(QTextCodec::codecForName("UTF-8"));
@@ -60,6 +61,7 @@ FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *pare
this, SLOT(slotFormWindowRemoved(QDesignerFormWindowInterface*)));
connect(m_formWindow->commandHistory(), SIGNAL(indexChanged(int)),
this, SLOT(setShouldAutoSave()));
connect(m_formWindow, SIGNAL(changed()), SLOT(updateIsModified()));
}
bool FormWindowFile::save(QString *errorString, const QString &name, bool autoSave)
@@ -94,11 +96,9 @@ bool FormWindowFile::save(QString *errorString, const QString &name, bool autoSa
return false;
}
emit setDisplayName(fi.fileName());
m_formWindow->setDirty(false);
setFilePath(fi.absoluteFilePath());
emit changed();
emit saved();
return true;
}
@@ -106,9 +106,16 @@ bool FormWindowFile::save(QString *errorString, const QString &name, bool autoSa
void FormWindowFile::setFilePath(const QString &newName)
{
m_formWindow->setFileName(newName);
QFileInfo fi(newName);
emit setDisplayName(fi.fileName());
IDocument::setFilePath(fi.absoluteFilePath());
IDocument::setFilePath(newName);
}
void FormWindowFile::updateIsModified()
{
bool value = m_formWindow && m_formWindow->isDirty();
if (value == m_isModified)
return;
m_isModified = value;
emit changed();
}
bool FormWindowFile::shouldAutoSave() const