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

issue #654 tape : standard changed to multisize in the GUI

Browse Source 
--HG--
branch : develop
This commit is contained in:
Ronan Le Tiec 2017-07-11 18:47:23 +02:00
parent 052896b960
commit 5b79acd2bb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/tape/dialogs/dialognewmeasurements.cpp
View File

@ -183,7 +183,7 @@ void DialogNewMeasurements::InitMTypes()
ui->comboBoxMType->blockSignals(true); ui->comboBoxMType->blockSignals(true);
ui->comboBoxMType->clear(); ui->comboBoxMType->clear();
ui->comboBoxMType->addItem(tr("Individual"), static_cast<int>(MeasurementsType::Individual)); ui->comboBoxMType->addItem(tr("Individual"), static_cast<int>(MeasurementsType::Individual));
ui->comboBoxMType->addItem(tr("Standard"), static_cast<int>(MeasurementsType::Standard)); ui->comboBoxMType->addItem(tr("Multisize"), static_cast<int>(MeasurementsType::Standard));
ui->comboBoxMType->blockSignals(false); ui->comboBoxMType->blockSignals(false);
int index = ui->comboBoxMType->findData(val); int index = ui->comboBoxMType->findData(val);

2
src/app/tape/tmainwindow.cpp
View File

@ -2848,7 +2848,7 @@ bool TMainWindow::LoadFromExistingFile(const QString &path)
if (mType == MeasurementsType::Standard) if (mType == MeasurementsType::Standard)
{ {
VException e(tr("Export from standard measurements is not supported.")); VException e(tr("Export from multisize measurements is not supported."));
throw e; throw e;
} }
else else

4
src/app/tape/tmainwindow.ui
View File

@ -850,7 +850,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>835</width> <width>835</width>
<height>25</height> <height>19</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@ -1132,7 +1132,7 @@
<normaloff>.</normaloff>.</iconset> <normaloff>.</normaloff>.</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Open standard ...</string> <string>Open multisize ...</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::NoRole</enum> <enum>QAction::NoRole</enum>