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

Fix reloading behavior of image viewer.

Browse Source 
The image viewer is not able to save, so we should not ask.

Task-number: QTCREATORBUG-5966
Change-Id: I947520d7450704abda8395e8aaae56dfe7842328
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Eike Ziller
2012-03-08 08:42:29 +01:00
parent 764ce45ea7
commit 8e8168fc5c
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -667,7 +667,8 @@ bool DocumentManager::saveDocument(IDocument *document, const QString &fileName,
}
*isReadOnly = false;
}
QMessageBox::critical(d->m_mainWindow, tr("File Error"), errorString);
QMessageBox::critical(d->m_mainWindow, tr("File Error"),
tr("Error while saving file: %1").arg(errorString));
out:
ret = false;
}
@@ -992,7 +993,10 @@ void DocumentManager::checkForReload()
// check if IDocument wants us to ask
if (document->reloadBehavior(trigger, type) == IDocument::BehaviorSilent) {
// content change or removed, IDocument wants silent handling
success = document->reload(&errorString, IDocument::FlagReload, type);
if (type == IDocument::TypeRemoved)
editorsToClose << EditorManager::instance()->editorsForDocument(document);
else
success = document->reload(&errorString, IDocument::FlagReload, type);
// IDocument wants us to ask
} else if (type == IDocument::TypeContents) {
// content change, IDocument wants to ask user

9
src/plugins/imageviewer/imageviewerfile.cpp
View File

@@ -65,6 +65,15 @@ ImageViewerFile::~ImageViewerFile()
delete d;
}
Core::IDocument::ReloadBehavior ImageViewerFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
if (type == TypeRemoved || type == TypePermissions)
return BehaviorSilent;
if (type == TypeContents && state == TriggerInternal && !isModified())
return BehaviorSilent;
return BehaviorAsk;
}
bool ImageViewerFile::reload(QString *errorString,
Core::IDocument::ReloadFlag flag,
Core::IDocument::ChangeType type)

1
src/plugins/imageviewer/imageviewerfile.h
View File

@@ -61,6 +61,7 @@ public:
bool isModified() const;
bool isSaveAsAllowed() const;
virtual ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
bool reload(QString *errorString, ReloadFlag flag, ChangeType type);
void setMimetype(const QString &mimetype);