Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 10:52:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kcontrol: do not write default values to the config from locale KCM

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-07-30 03:04:48 +03:00
parent 963b430924
commit c9f049c347
1 changed files with 52 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
kcontrol/locale/kcmlocale.cpp
View file

@ -366,18 +366,59 @@ void KCMLocale::save()
localegroup.writeEntry("Language", localelanguage); localegroup.writeEntry("Language", localelanguage);
const int localebinary = m_binarybox->itemData(m_binarybox->currentIndex()).toInt(); const int localebinary = m_binarybox->itemData(m_binarybox->currentIndex()).toInt();
localegroup.writeEntry("BinaryUnitDialect", localebinary); localegroup.writeEntry("BinaryUnitDialect", localebinary);
// when the value is same as the default do not store it in the config (it may change)
const QLocale locale(localelanguage);
const int localemeasure = m_measurebox->itemData(m_measurebox->currentIndex()).toInt(); const int localemeasure = m_measurebox->itemData(m_measurebox->currentIndex()).toInt();
localegroup.writeEntry("MeasurementSystem", localemeasure); if (localemeasure != int(locale.measurementSystem())) {
// TODO: when the format is same as the default do not write it to the config (it may change) localegroup.writeEntry("MeasurementSystem", localemeasure);
localegroup.writeEntry("ShortDateFormat", m_dateshortedit->text()); } else {
localegroup.writeEntry("LongDateFormat", m_datelongedit->text()); localegroup.deleteEntry("MeasurementSystem");
localegroup.writeEntry("NarrowDateFormat", m_datenarrowedit->text()); }
localegroup.writeEntry("ShortTimeFormat", m_timeshortedit->text()); if (m_dateshortedit->text() != locale.dateFormat(QLocale::ShortFormat)) {
localegroup.writeEntry("LongTimeFormat", m_timelongedit->text()); localegroup.writeEntry("ShortDateFormat", m_dateshortedit->text());
localegroup.writeEntry("NarrowTimeFormat", m_timenarrowedit->text()); } else {
localegroup.writeEntry("ShortDateTimeFormat", m_datetimeshortedit->text()); localegroup.deleteEntry("ShortDateFormat");
localegroup.writeEntry("LongDateTimeFormat", m_datetimelongedit->text()); }
localegroup.writeEntry("NarrowDateTimeFormat", m_datetimenarrowedit->text()); if (m_datelongedit->text() != locale.dateFormat(QLocale::LongFormat)) {
localegroup.writeEntry("LongDateFormat", m_datelongedit->text());
} else {
localegroup.deleteEntry("LongDateFormat");
}
if (m_datenarrowedit->text() != locale.dateFormat(QLocale::NarrowFormat)) {
localegroup.writeEntry("NarrowDateFormat", m_datenarrowedit->text());
} else {
localegroup.deleteEntry("NarrowDateFormat");
}
if (m_timeshortedit->text() != locale.timeFormat(QLocale::ShortFormat)) {
localegroup.writeEntry("ShortTimeFormat", m_timeshortedit->text());
} else {
localegroup.deleteEntry("ShortTimeFormat");
}
if (m_timelongedit->text() != locale.timeFormat(QLocale::LongFormat)) {
localegroup.writeEntry("LongTimeFormat", m_timelongedit->text());
} else {
localegroup.deleteEntry("LongTimeFormat");
}
if (m_timenarrowedit->text() != locale.timeFormat(QLocale::NarrowFormat)) {
localegroup.writeEntry("NarrowTimeFormat", m_timenarrowedit->text());
} else {
localegroup.deleteEntry("NarrowTimeFormat");
}
if (m_datetimeshortedit->text() != locale.dateTimeFormat(QLocale::ShortFormat)) {
localegroup.writeEntry("ShortDateTimeFormat", m_datetimeshortedit->text());
} else {
localegroup.deleteEntry("ShortDateTimeFormat");
}
if (m_datetimelongedit->text() != locale.dateTimeFormat(QLocale::LongFormat)) {
localegroup.writeEntry("LongDateTimeFormat", m_datetimelongedit->text());
} else {
localegroup.deleteEntry("LongDateTimeFormat");
}
if (m_datetimenarrowedit->text() != locale.dateTimeFormat(QLocale::NarrowFormat)) {
localegroup.writeEntry("NarrowDateTimeFormat", m_datetimenarrowedit->text());
} else {
localegroup.deleteEntry("NarrowDateTimeFormat");
}
localegroup.sync(); localegroup.sync();
emit changed(false); emit changed(false);