aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring. Use QScopeGuard.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-06-25 11:08:47 +03:00
parent 250510d87d
commit 51893d9f4a
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/valentina/mainwindow.cpp
View File

@ -65,6 +65,12 @@
#include "../qmuparser/qmuparsererror.h" #include "../qmuparser/qmuparsererror.h"
#include "../vtools/dialogs/support/dialogeditlabel.h" #include "../vtools/dialogs/support/dialogeditlabel.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
#include "../vmisc/backport/qscopeguard.h"
#else
#include <QScopeGuard>
#endif
#include <QInputDialog> #include <QInputDialog>
#include <QtDebug> #include <QtDebug>
#include <QMessageBox> #include <QMessageBox>
@ -4928,11 +4934,12 @@ void MainWindow::CreateMeasurements()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void MainWindow::ExportLayoutAs() void MainWindow::ExportLayoutAs()
{ {
auto Uncheck = qScopeGuard([this] {ui->toolButtonLayoutExportAs->setChecked(false);});
if (isLayoutStale) if (isLayoutStale)
{ {
if (ContinueIfLayoutStale() == QMessageBox::No) if (ContinueIfLayoutStale() == QMessageBox::No)
{ {
ui->toolButtonLayoutExportAs->setChecked(false);
return; return;
} }
} }
@ -4945,7 +4952,6 @@ void MainWindow::ExportLayoutAs()
if (m_dialogSaveLayout->exec() == QDialog::Rejected) if (m_dialogSaveLayout->exec() == QDialog::Rejected)
{ {
m_dialogSaveLayout.clear(); m_dialogSaveLayout.clear();
ui->toolButtonLayoutExportAs->setChecked(false);
return; return;
} }
@ -4955,17 +4961,17 @@ void MainWindow::ExportLayoutAs()
catch (const VException &e) catch (const VException &e)
{ {
m_dialogSaveLayout.clear(); m_dialogSaveLayout.clear();
ui->toolButtonLayoutExportAs->setChecked(false);
qCritical("%s\n\n%s\n\n%s", qUtf8Printable(tr("Export error.")), qCritical("%s\n\n%s\n\n%s", qUtf8Printable(tr("Export error.")),
qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation())); qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation()));
return; return;
} }
ui->toolButtonLayoutExportAs->setChecked(false);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void MainWindow::ExportDetailsAs() void MainWindow::ExportDetailsAs()
{ {
auto Uncheck = qScopeGuard([this] {ui->toolButtonDetailExportAs->setChecked(false);});
QVector<DetailForLayout> detailsInLayout = SortDetailsForLayout(pattern->DataPieces()); QVector<DetailForLayout> detailsInLayout = SortDetailsForLayout(pattern->DataPieces());
if (detailsInLayout.count() == 0) if (detailsInLayout.count() == 0)
@ -4997,7 +5003,6 @@ void MainWindow::ExportDetailsAs()
if (m_dialogSaveLayout->exec() == QDialog::Rejected) if (m_dialogSaveLayout->exec() == QDialog::Rejected)
{ {
m_dialogSaveLayout.clear(); m_dialogSaveLayout.clear();
ui->toolButtonDetailExportAs->setChecked(false);
return; return;
} }
@ -5007,12 +5012,10 @@ void MainWindow::ExportDetailsAs()
catch (const VException &e) catch (const VException &e)
{ {
m_dialogSaveLayout.clear(); m_dialogSaveLayout.clear();
ui->toolButtonDetailExportAs->setChecked(false);
qCritical("%s\n\n%s\n\n%s", qUtf8Printable(tr("Export error.")), qCritical("%s\n\n%s\n\n%s", qUtf8Printable(tr("Export error.")),
qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation())); qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation()));
return; return;
} }
ui->toolButtonDetailExportAs->setChecked(false);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------