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

DiffEditor: Add indication on failure

Browse Source 
Task-number: QTCREATORBUG-15051
Change-Id: If8beef268fa6390f2ff8f36996354f9685b70d80
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-09-09 22:12:19 +03:00
committed by Orgad Shaneh
parent 7adb56afde
commit 6cac3b73ab
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/diffeditor/diffview.cpp
View File

@@ -131,9 +131,11 @@ void UnifiedView::setDiff(const QList<FileData> &diffFileList, const QString &wo
void UnifiedView::endOperation(bool success)
{
Q_UNUSED(success);
QTC_ASSERT(m_widget, return);
m_widget->restoreState();
if (success)
m_widget->restoreState();
else
m_widget->clear(tr("Failed"));
}
void UnifiedView::setCurrentDiffFileIndex(int index)
@@ -194,9 +196,11 @@ void SideBySideView::setDiff(const QList<FileData> &diffFileList, const QString
void SideBySideView::endOperation(bool success)
{
Q_UNUSED(success);
QTC_ASSERT(m_widget, return);
m_widget->restoreState();
if (success)
m_widget->restoreState();
else
m_widget->clear(tr("Failed"));
}
void SideBySideView::setSync(bool sync)