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

Fix confusion. Current size and height should provide infomation about

Browse Source 
measurements units.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-09-07 10:42:09 +03:00
parent cefb4f7474
commit 7c03d366e4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -560,8 +560,8 @@ void TMainWindow::changeEvent(QEvent *event)
ui->labelBaseHeightValue->setText(QString().setNum(m->BaseHeight()) + QChar(QChar::Space) + ui->labelBaseHeightValue->setText(QString().setNum(m->BaseHeight()) + QChar(QChar::Space) +
UnitsToStr(m->MUnit(), true)); UnitsToStr(m->MUnit(), true));
labelGradationHeights = new QLabel(tr("Height:")); labelGradationHeights->setText(tr("Height (%1):").arg(UnitsToStr(mUnit)));
labelGradationSizes = new QLabel(tr("Size:")); labelGradationSizes->setText(tr("Size (%1):").arg(UnitsToStr(mUnit)));
} }
else else
{ {
@ -2052,13 +2052,13 @@ void TMainWindow::InitWindow()
const QStringList listHeights = VMeasurement::WholeListHeights(mUnit); const QStringList listHeights = VMeasurement::WholeListHeights(mUnit);
const QStringList listSizes = VMeasurement::WholeListSizes(mUnit); const QStringList listSizes = VMeasurement::WholeListSizes(mUnit);
labelGradationHeights = new QLabel(tr("Height:")); labelGradationHeights = new QLabel(tr("Height (%1):").arg(UnitsToStr(mUnit)));
gradationHeights = SetGradationList(labelGradationHeights, listHeights); gradationHeights = SetGradationList(labelGradationHeights, listHeights);
SetDefaultHeight(static_cast<int>(data->height())); SetDefaultHeight(static_cast<int>(data->height()));
connect(gradationHeights, &QComboBox::currentTextChanged, connect(gradationHeights, &QComboBox::currentTextChanged,
this, &TMainWindow::ChangedHeight); this, &TMainWindow::ChangedHeight);
labelGradationSizes = new QLabel(tr("Size:")); labelGradationSizes = new QLabel(tr("Size (%1):").arg(UnitsToStr(mUnit)));
gradationSizes = SetGradationList(labelGradationSizes, listSizes); gradationSizes = SetGradationList(labelGradationSizes, listSizes);
SetDefaultSize(static_cast<int>(data->size())); SetDefaultSize(static_cast<int>(data->size()));
connect(gradationSizes, &QComboBox::currentTextChanged, connect(gradationSizes, &QComboBox::currentTextChanged,