@@ -97,7 +97,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
97
97
connect ( mCurrentVariablesQGISChxBx , &QCheckBox::toggled, this , &QgsOptions::mCurrentVariablesQGISChxBx_toggled );
98
98
connect ( buttonBox, &QDialogButtonBox::helpRequested, this , &QgsOptions::showHelp );
99
99
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 (); } );
101
101
102
102
// QgsOptionsDialogBase handles saving/restoring of geometry, splitter and current tab states,
103
103
// 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
908
908
QString mySystemLocale = QLocale ().name ();
909
909
lblSystemLocale->setText ( tr ( " Detected active locale on your system: %1" ).arg ( mySystemLocale ) );
910
910
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 ();
912
912
QString myGlobalLocale = mSettings ->value ( QStringLiteral ( " locale/globalLocale" ), QString () ).toString ();
913
913
QStringList myI18nList = i18nList ();
914
914
Q_FOREACH ( const QString &l, myI18nList )
@@ -922,7 +922,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
922
922
cboGlobalLocale->setCurrentIndex ( cboGlobalLocale->findData ( myGlobalLocale ) );
923
923
bool myLocaleOverrideFlag = mSettings ->value ( QStringLiteral ( " locale/overrideFlag" ), false ).toBool ();
924
924
grpLocale->setChecked ( myLocaleOverrideFlag );
925
- cbOmitGroupSeparator ->setChecked ( omitGroupSeparator );
925
+ cbShowGroupSeparator ->setChecked ( showGroupSeparator );
926
926
927
927
928
928
// set elements in digitizing tab
@@ -1599,7 +1599,7 @@ void QgsOptions::saveOptions()
1599
1599
mSettings ->setValue ( QStringLiteral ( " locale/globalLocale" ), cboGlobalLocale->currentData ( ).toString () );
1600
1600
1601
1601
// Number settings
1602
- mSettings ->setValue ( QStringLiteral ( " locale/omitGroupSeparator " ), cbOmitGroupSeparator ->isChecked ( ) );
1602
+ mSettings ->setValue ( QStringLiteral ( " locale/showGroupSeparator " ), cbShowGroupSeparator ->isChecked ( ) );
1603
1603
1604
1604
// Gdal skip driver list
1605
1605
if ( mLoadedGdalDriverList )
@@ -2370,13 +2370,13 @@ void QgsOptions::refreshSchemeComboBox()
2370
2370
void QgsOptions::updateSampleLocaleText ()
2371
2371
{
2372
2372
QLocale locale ( cboGlobalLocale->currentData ( ).toString () );
2373
- if ( cbOmitGroupSeparator ->isChecked ( ) )
2373
+ if ( cbShowGroupSeparator ->isChecked ( ) )
2374
2374
{
2375
- locale.setNumberOptions ( locale.numberOptions () |= QLocale::NumberOption::OmitGroupSeparator );
2375
+ locale.setNumberOptions ( locale.numberOptions () &= ! QLocale::NumberOption::OmitGroupSeparator );
2376
2376
}
2377
2377
else
2378
2378
{
2379
- locale.setNumberOptions ( locale.numberOptions () &= ! QLocale::NumberOption::OmitGroupSeparator );
2379
+ locale.setNumberOptions ( locale.numberOptions () |= QLocale::NumberOption::OmitGroupSeparator );
2380
2380
}
2381
2381
lblLocaleSample->setText ( tr ( " Sample date: %1 money: %2 int: %3 float: %4" ).arg (
2382
2382
QDate::currentDate ().toString ( locale.dateFormat ( QLocale::FormatType::ShortFormat ) ),
0 commit comments