From fbeb56c959c897716cf63056ea68b24a4c4eec43 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 7 Jun 2016 11:49:06 +0300 Subject: [PATCH] Fixed issue #501. Rename Window->Close Window to Window->Close pattern. --HG-- branch : release --- ChangeLog.txt | 1 + src/app/valentina/mainwindow.cpp | 6 +++++- src/app/valentina/mainwindow.ui | 24 +++++++++++++++--------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index b9bbbf091..34d9786e8 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -6,6 +6,7 @@ - [#492] Valentina crashes when add an increment. - [#493] Error in seam allowance drawing. - [#468] Error - Tape 'Save As' should set 'Read Only' to false. +- [#501] Rename Window->Close Window to Window->Close pattern # Version 0.4.4 April 12, 2016 - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements. diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 171a0e0b3..333f17c50 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -2227,6 +2227,10 @@ void MainWindow::Clear() sceneDetails->clear(); ArrowTool(); comboBoxDraws->clear(); + ui->actionDraw->setEnabled(false); + ui->actionDetails->setEnabled(false); + ui->actionLayout->setEnabled(false); + ui->actionNewDraw->setEnabled(false); ui->actionOptionDraw->setEnabled(false); ui->actionSave->setEnabled(false); ui->actionSaveAs->setEnabled(false); @@ -3334,7 +3338,7 @@ void MainWindow::CreateActions() connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties); ui->actionPattern_properties->setEnabled(false); connect(ui->actionEdit_pattern_code, &QAction::triggered, this, &MainWindow::EditPatternCode); - connect(ui->actionCloseWindow, &QAction::triggered, this, &MainWindow::ResetWindow); + connect(ui->actionClosePattern, &QAction::triggered, this, &MainWindow::ResetWindow); connect(ui->actionShowCurveDetails, &QAction::triggered, this, &MainWindow::ActionCurveDetailsMode); connect(ui->actionLoadIndividual, &QAction::triggered, this, &MainWindow::LoadIndividual); connect(ui->actionLoadStandard, &QAction::triggered, this, &MainWindow::LoadStandard); diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui index 60cc169c3..0e8cab612 100644 --- a/src/app/valentina/mainwindow.ui +++ b/src/app/valentina/mainwindow.ui @@ -375,7 +375,7 @@ 0 0 - 100 + 130 58 @@ -461,7 +461,7 @@ 0 0 - 100 + 130 156 @@ -625,7 +625,7 @@ 0 0 - 100 + 130 196 @@ -867,7 +867,7 @@ 0 0 - 100 + 130 58 @@ -953,8 +953,8 @@ 0 0 - 98 - 58 + 130 + 386 @@ -1102,7 +1102,7 @@ Window - + @@ -1814,9 +1814,15 @@ QAction::NoRole - + - Close window + Close pattern + + + Close pattern + + + Close pattern