Skip to content

Commit 217b851

Browse files
committed
Omit group separator by default
1 parent 13a727c commit 217b851

File tree

3 files changed

+25
-21
lines changed

3 files changed

+25
-21
lines changed

src/app/main.cpp

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,9 +1144,16 @@ int main( int argc, char *argv[] )
11441144
QString i18nPath = QgsApplication::i18nPath();
11451145
QString myUserTranslation = mySettings.value( QStringLiteral( "locale/userLocale" ), "" ).toString();
11461146
QString myGlobalLocale = mySettings.value( QStringLiteral( "locale/globalLocale" ), "" ).toString();
1147-
bool myOmitGroupSeparatorFlag = mySettings.value( QStringLiteral( "locale/omitGroupSeparator" ), true ).toBool();
1147+
bool myShowGroupSeparatorFlag = false; // Default to false
11481148
bool myLocaleOverrideFlag = mySettings.value( QStringLiteral( "locale/overrideFlag" ), false ).toBool();
11491149

1150+
// Override Show Group Separator if the global override flag is set
1151+
if ( myLocaleOverrideFlag )
1152+
{
1153+
// Default to false again
1154+
myShowGroupSeparatorFlag = mySettings.value( QStringLiteral( "locale/showGroupSeparator" ), false ).toBool();
1155+
}
1156+
11501157
//
11511158
// Priority of translation is:
11521159
// - command line
@@ -1183,19 +1190,16 @@ int main( int argc, char *argv[] )
11831190
}
11841191

11851192
// Number settings
1186-
if ( myLocaleOverrideFlag )
1193+
QLocale currentLocale;
1194+
if ( myShowGroupSeparatorFlag )
11871195
{
1188-
QLocale currentLocale;
1189-
if ( myOmitGroupSeparatorFlag )
1190-
{
1191-
currentLocale.setNumberOptions( currentLocale.numberOptions() |= QLocale::NumberOption::OmitGroupSeparator );
1192-
}
1193-
else
1194-
{
1195-
currentLocale.setNumberOptions( currentLocale.numberOptions() &= ! QLocale::NumberOption::OmitGroupSeparator );
1196-
}
1197-
QLocale::setDefault( currentLocale );
1196+
currentLocale.setNumberOptions( currentLocale.numberOptions() &= !QLocale::NumberOption::OmitGroupSeparator );
1197+
}
1198+
else
1199+
{
1200+
currentLocale.setNumberOptions( currentLocale.numberOptions() |= QLocale::NumberOption::OmitGroupSeparator );
11981201
}
1202+
QLocale::setDefault( currentLocale );
11991203

12001204

12011205
QTranslator qgistor( nullptr );

src/app/qgsoptions.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
9797
connect( mCurrentVariablesQGISChxBx, &QCheckBox::toggled, this, &QgsOptions::mCurrentVariablesQGISChxBx_toggled );
9898
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsOptions::showHelp );
9999
connect( cboGlobalLocale, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), [ = ]( int ) { updateSampleLocaleText( ); } );
100-
connect( cbOmitGroupSeparator, &QCheckBox::toggled, this, [ = ]( bool ) { updateSampleLocaleText(); } );
100+
connect( cbShowGroupSeparator, &QCheckBox::toggled, this, [ = ]( bool ) { updateSampleLocaleText(); } );
101101

102102
// QgsOptionsDialogBase handles saving/restoring of geometry, splitter and current tab states,
103103
// switching vertical tabs between icon/text to icon-only modes (splitter collapsed to left),
@@ -908,7 +908,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
908908
QString mySystemLocale = QLocale().name();
909909
lblSystemLocale->setText( tr( "Detected active locale on your system: %1" ).arg( mySystemLocale ) );
910910
QString myUserLocale = mSettings->value( QStringLiteral( "locale/userLocale" ), QString() ).toString();
911-
bool omitGroupSeparator = mSettings->value( QStringLiteral( "locale/omitGroupSeparator" ), false ).toBool();
911+
bool showGroupSeparator = mSettings->value( QStringLiteral( "locale/showGroupSeparator" ), false ).toBool();
912912
QString myGlobalLocale = mSettings->value( QStringLiteral( "locale/globalLocale" ), QString() ).toString();
913913
QStringList myI18nList = i18nList();
914914
Q_FOREACH ( const QString &l, myI18nList )
@@ -922,7 +922,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
922922
cboGlobalLocale->setCurrentIndex( cboGlobalLocale->findData( myGlobalLocale ) );
923923
bool myLocaleOverrideFlag = mSettings->value( QStringLiteral( "locale/overrideFlag" ), false ).toBool();
924924
grpLocale->setChecked( myLocaleOverrideFlag );
925-
cbOmitGroupSeparator->setChecked( omitGroupSeparator );
925+
cbShowGroupSeparator->setChecked( showGroupSeparator );
926926

927927

928928
//set elements in digitizing tab
@@ -1599,7 +1599,7 @@ void QgsOptions::saveOptions()
15991599
mSettings->setValue( QStringLiteral( "locale/globalLocale" ), cboGlobalLocale->currentData( ).toString() );
16001600

16011601
// Number settings
1602-
mSettings->setValue( QStringLiteral( "locale/omitGroupSeparator" ), cbOmitGroupSeparator->isChecked( ) );
1602+
mSettings->setValue( QStringLiteral( "locale/showGroupSeparator" ), cbShowGroupSeparator->isChecked( ) );
16031603

16041604
// Gdal skip driver list
16051605
if ( mLoadedGdalDriverList )
@@ -2370,13 +2370,13 @@ void QgsOptions::refreshSchemeComboBox()
23702370
void QgsOptions::updateSampleLocaleText()
23712371
{
23722372
QLocale locale( cboGlobalLocale->currentData( ).toString() );
2373-
if ( cbOmitGroupSeparator->isChecked( ) )
2373+
if ( cbShowGroupSeparator->isChecked( ) )
23742374
{
2375-
locale.setNumberOptions( locale.numberOptions() |= QLocale::NumberOption::OmitGroupSeparator );
2375+
locale.setNumberOptions( locale.numberOptions() &= ! QLocale::NumberOption::OmitGroupSeparator );
23762376
}
23772377
else
23782378
{
2379-
locale.setNumberOptions( locale.numberOptions() &= ! QLocale::NumberOption::OmitGroupSeparator );
2379+
locale.setNumberOptions( locale.numberOptions() |= QLocale::NumberOption::OmitGroupSeparator );
23802380
}
23812381
lblLocaleSample->setText( tr( "Sample date: %1 money: %2 int: %3 float: %4" ).arg(
23822382
QDate::currentDate().toString( locale.dateFormat( QLocale::FormatType::ShortFormat ) ),

src/ui/qgsoptionsbase.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,9 @@
399399
<widget class="QComboBox" name="cboGlobalLocale"/>
400400
</item>
401401
<item row="3" column="1">
402-
<widget class="QCheckBox" name="cbOmitGroupSeparator">
402+
<widget class="QCheckBox" name="cbShowGroupSeparator">
403403
<property name="text">
404-
<string>Omit group (thousand) separator</string>
404+
<string>Show group (thousand) separator</string>
405405
</property>
406406
</widget>
407407
</item>

0 commit comments

Comments
 (0)