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

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

Browse Source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2016-06-07 11:49:06 +03:00
parent b2f3affb34
commit fbeb56c959
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -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.

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

@ -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);

24
src/app/valentina/mainwindow.ui
View File

@ -375,7 +375,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<width>130</width>
<height>58</height>
</rect>
</property>
@ -461,7 +461,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<width>130</width>
<height>156</height>
</rect>
</property>
@ -625,7 +625,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<width>130</width>
<height>196</height>
</rect>
</property>
@ -867,7 +867,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<width>130</width>
<height>58</height>
</rect>
</property>
@ -953,8 +953,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>58</height>
<width>130</width>
<height>386</height>
</rect>
</property>
<attribute name="icon">
@ -1102,7 +1102,7 @@
<property name="title">
<string>Window</string>
</property>
<addaction name="actionCloseWindow"/>
<addaction name="actionClosePattern"/>
</widget>
<widget class="QMenu" name="menuHistory">
<property name="title">
@ -1814,9 +1814,15 @@
<enum>QAction::NoRole</enum>
</property>
</action>
<action name="actionCloseWindow">
<action name="actionClosePattern">
<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 name="shortcut">
<string notr="true"/>