Merge with develop
--HG-- branch : feature
This commit is contained in:
commit
6d5b6bed54
|
@ -248,7 +248,7 @@ void DialogIndividualMeasurements::InitUnits()
|
|||
{
|
||||
ui->comboBoxUnits->addItem(tr("Centimeters"), QVariant(VDomDocument::UnitsToStr(Unit::Cm)));
|
||||
ui->comboBoxUnits->addItem(tr("Milimiters"), QVariant(VDomDocument::UnitsToStr(Unit::Mm)));
|
||||
ui->comboBoxUnits->addItem(tr("Inches"), QVariant(VDomDocument::UnitsToStr(Unit::Inch, true)));
|
||||
ui->comboBoxUnits->addItem(tr("Inches"), QVariant(VDomDocument::UnitsToStr(Unit::Inch)));
|
||||
|
||||
const QString checkedUnit = qApp->getSettings()->value("configuration/unit", "cm").toString();
|
||||
// set default unit
|
||||
|
|
|
@ -196,8 +196,7 @@ void MainWindow::ActionNewPP()
|
|||
|
||||
pattern->ClearGObjects();
|
||||
//Create single point
|
||||
const quint32 id = pattern->AddGObject(new VPointF(qApp->toPixel((10+comboBoxDraws->count()*5)), qApp->toPixel(10),
|
||||
"А", 5, 10));
|
||||
const quint32 id = pattern->AddGObject(new VPointF(20+comboBoxDraws->count()*5, 20, "А", 5, 10));
|
||||
VToolSinglePoint *spoint = new VToolSinglePoint(doc, pattern, id, Source::FromGui, patternPieceName, path);
|
||||
sceneDraw->addItem(spoint);
|
||||
connect(spoint, &VToolPoint::ChoosedTool, sceneDraw, &VMainGraphicsScene::ChoosedItem);
|
||||
|
|
|
@ -466,7 +466,7 @@ QString VDomDocument::UnitsToStr(const Unit &unit, const bool translate)
|
|||
}
|
||||
else
|
||||
{
|
||||
result = "mm";
|
||||
result = UnitMM;
|
||||
}
|
||||
break;
|
||||
case Unit::Cm:
|
||||
|
@ -476,17 +476,17 @@ QString VDomDocument::UnitsToStr(const Unit &unit, const bool translate)
|
|||
}
|
||||
else
|
||||
{
|
||||
result = "cm";
|
||||
result = UnitCM;
|
||||
}
|
||||
break;
|
||||
case Unit::Inch:
|
||||
if (translate)
|
||||
{
|
||||
result = QObject::tr("in", "inch abbreviation");
|
||||
result = QObject::tr("inch");
|
||||
}
|
||||
else
|
||||
{
|
||||
result = "inch";//I decided use full name in xml file.
|
||||
result = UnitINCH;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
@ -496,7 +496,7 @@ QString VDomDocument::UnitsToStr(const Unit &unit, const bool translate)
|
|||
}
|
||||
else
|
||||
{
|
||||
result = "cm";
|
||||
result = UnitCM;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user