Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

PropertiesView and View now follow Settings::units.

Browse Source
This commit is contained in:
Jim Evins
2016-04-14 23:10:38 -04:00
parent 2f7f4b2041
commit 783ede0a03
28 changed files with 559 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/Settings.cpp
+6 -6
View File
@@ -50,30 +50,30 @@ Settings* Settings::instance()
}
glabels::Distance::Units Settings::units()
glabels::Units Settings::units()
{
// Guess at a suitable default
QString defaultIdString;
if ( QLocale::system().measurementSystem() == QLocale::ImperialSystem )
{
defaultIdString = glabels::Distance::toId( glabels::Distance::Units::IN );
defaultIdString = glabels::Units(glabels::Units::IN).toIdString();
}
else
{
defaultIdString = glabels::Distance::toId( glabels::Distance::Units::MM );
defaultIdString = glabels::Units(glabels::Units::MM).toIdString();
}
mInstance->beginGroup( "Locale" );
QString idString = mInstance->value( "units", defaultIdString ).toString();
mInstance->endGroup();
return glabels::Distance::toUnits( idString );
return glabels::Units( idString );
}
void Settings::setUnits( glabels::Distance::Units units )
void Settings::setUnits( const glabels::Units& units )
{
QString idString = glabels::Distance::toId( units );
QString idString = units.toIdString();
mInstance->beginGroup( "Locale" );
mInstance->setValue( "units", idString );