Fixed issue #501. Rename Window->Close Window to Window->Close pattern.

(grafted from 3831b343e88f7b875ba191f467a056a247d50db2)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-06-07 11:51:41 +03:00
parent 4acdf7f71d
commit 8f46a9666a
3 changed files with 16 additions and 5 deletions

View File

@ -34,6 +34,7 @@
- [#492] Valentina crashes when add an increment. - [#492] Valentina crashes when add an increment.
- [#493] Error in seam allowance drawing. - [#493] Error in seam allowance drawing.
- [#468] Error - Tape 'Save As' should set 'Read Only' to false. - [#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 # Version 0.4.4 April 12, 2016
- Updated measurement templates with all measurements. Added new template Aldrich/Women measurements. - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.

View File

@ -2453,7 +2453,7 @@ void MainWindow::Clear()
qCDebug(vMainWindow, "Returned to Draw mode."); qCDebug(vMainWindow, "Returned to Draw mode.");
pattern->Clear(); pattern->Clear();
qCDebug(vMainWindow, "Clearing pattern."); qCDebug(vMainWindow, "Clearing pattern.");
if (not curFile.isEmpty()) if (not curFile.isEmpty() && not doc->MPath().isEmpty())
{ {
watcher->removePath(AbsoluteMPath(curFile, doc->MPath())); watcher->removePath(AbsoluteMPath(curFile, doc->MPath()));
} }
@ -2464,6 +2464,10 @@ void MainWindow::Clear()
sceneDetails->clear(); sceneDetails->clear();
ArrowTool(); ArrowTool();
comboBoxDraws->clear(); comboBoxDraws->clear();
ui->actionDraw->setEnabled(false);
ui->actionDetails->setEnabled(false);
ui->actionLayout->setEnabled(false);
ui->actionNewDraw->setEnabled(false);
ui->actionOptionDraw->setEnabled(false); ui->actionOptionDraw->setEnabled(false);
ui->actionSave->setEnabled(false); ui->actionSave->setEnabled(false);
ui->actionSaveAs->setEnabled(false); ui->actionSaveAs->setEnabled(false);
@ -3632,7 +3636,7 @@ void MainWindow::CreateActions()
connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties); connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties);
ui->actionPattern_properties->setEnabled(false); ui->actionPattern_properties->setEnabled(false);
connect(ui->actionEdit_pattern_code, &QAction::triggered, this, &MainWindow::EditPatternCode); 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->actionShowCurveDetails, &QAction::triggered, this, &MainWindow::ActionCurveDetailsMode);
connect(ui->actionLoadIndividual, &QAction::triggered, this, &MainWindow::LoadIndividual); connect(ui->actionLoadIndividual, &QAction::triggered, this, &MainWindow::LoadIndividual);
connect(ui->actionLoadStandard, &QAction::triggered, this, &MainWindow::LoadStandard); connect(ui->actionLoadStandard, &QAction::triggered, this, &MainWindow::LoadStandard);

View File

@ -1251,7 +1251,7 @@
<property name="title"> <property name="title">
<string>Window</string> <string>Window</string>
</property> </property>
<addaction name="actionCloseWindow"/> <addaction name="actionClosePattern"/>
</widget> </widget>
<widget class="QMenu" name="menuHistory"> <widget class="QMenu" name="menuHistory">
<property name="title"> <property name="title">
@ -1975,9 +1975,15 @@
<enum>QAction::NoRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionCloseWindow"> <action name="actionClosePattern">
<property name="text"> <property name="text">
<string>Close window</string> <string>Close pattern</string>
</property>
<property name="iconText">
<string>Close pattern</string>
</property>
<property name="toolTip">
<string>Close pattern</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string notr="true"/> <string notr="true"/>