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

End file opening if error occurred.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-12-06 18:47:19 +02:00
parent a820b20fc2
commit 36f586ec58
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2181,9 +2181,7 @@ void MainWindow::Clear()
qCDebug(vMainWindow, "Reseting main window."); qCDebug(vMainWindow, "Reseting main window.");
lock.reset(); lock.reset();
qCDebug(vMainWindow, "Unlocked pattern file."); qCDebug(vMainWindow, "Unlocked pattern file.");
ui->actionDetails->setChecked(true);
ui->actionDraw->setChecked(true); ui->actionDraw->setChecked(true);
ui->actionLayout->setEnabled(true);
qCDebug(vMainWindow, "Returned to Draw mode."); qCDebug(vMainWindow, "Returned to Draw mode.");
pattern->Clear(); pattern->Clear();
qCDebug(vMainWindow, "Clearing pattern."); qCDebug(vMainWindow, "Clearing pattern.");
@ -3418,14 +3416,15 @@ bool MainWindow::LoadPattern(const QString &fileName, const QString& customMeasu
doc->SetPath(RelativeMPath(fileName, customMeasureFile)); doc->SetPath(RelativeMPath(fileName, customMeasureFile));
} }
qApp->setPatternUnit(doc->MUnit()); qApp->setPatternUnit(doc->MUnit());
QString path = AbsoluteMPath(fileName, doc->MPath()); const QString path = AbsoluteMPath(fileName, doc->MPath());
if (not path.isEmpty()) if (not path.isEmpty())
{ {
// Check if exist // Check if exist
path = CheckPathToMeasurements(fileName, path); const QString newPath = CheckPathToMeasurements(fileName, path);
if (path.isEmpty()) if (newPath.isEmpty())
{ {
qApp->setOpeningPattern();// End opening file
Clear(); Clear();
qCCritical(vMainWindow, "%s", qUtf8Printable(tr("The measurements file '%1' could not be found.") qCCritical(vMainWindow, "%s", qUtf8Printable(tr("The measurements file '%1' could not be found.")
.arg(path))); .arg(path)));
@ -3436,10 +3435,11 @@ bool MainWindow::LoadPattern(const QString &fileName, const QString& customMeasu
return false; return false;
} }
if (not LoadMeasurements(path)) if (not LoadMeasurements(newPath))
{ {
qCCritical(vMainWindow, "%s", qUtf8Printable(tr("The measurements file '%1' could not be found.") qCCritical(vMainWindow, "%s", qUtf8Printable(tr("The measurements file '%1' could not be found.")
.arg(path))); .arg(newPath)));
qApp->setOpeningPattern();// End opening file
Clear(); Clear();
if (not VApplication::CheckGUI()) if (not VApplication::CheckGUI())
{ {
@ -3461,6 +3461,7 @@ bool MainWindow::LoadPattern(const QString &fileName, const QString& customMeasu
{ {
qCCritical(vMainWindow, "%s\n\n%s\n\n%s", qUtf8Printable(tr("File error.")), qCCritical(vMainWindow, "%s\n\n%s\n\n%s", qUtf8Printable(tr("File error.")),
qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation())); qUtf8Printable(e.ErrorMessage()), qUtf8Printable(e.DetailedInformation()));
qApp->setOpeningPattern();// End opening file
Clear(); Clear();
if (not VApplication::CheckGUI()) if (not VApplication::CheckGUI())
{ {
@ -3490,10 +3491,9 @@ bool MainWindow::LoadPattern(const QString &fileName, const QString& customMeasu
//Fit scene size to best size for first show //Fit scene size to best size for first show
ZoomFirstShow(); ZoomFirstShow();
qApp->setOpeningPattern();// End opening file
ui->actionDraw->setChecked(true); ui->actionDraw->setChecked(true);
} }
qApp->setOpeningPattern();// End opening file
return true; return true;
} }