Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-03 16:30:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: when dconfig no value, use system format

Browse Source 
Log:
This commit is contained in:
chenhongtao 2024-01-19 16:06:27 +08:00 committed by deepin-bot[bot]
parent ee030a6505
commit ca4408c660
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frame/window/components/datetimedisplayer.cpp
View File

@ -78,27 +78,38 @@ DateTimeDisplayer::DateTimeDisplayer(bool showMultiRow, QWidget *parent)
void DateTimeDisplayer::initDConfig() void DateTimeDisplayer::initDConfig()
{ {
QLocale currentLocale = QLocale::system();
if (!m_config->isValid()) if (!m_config->isValid())
return; return;
if (!m_config->isDefaultValue(localeName_key)) { if (!m_config->isDefaultValue(localeName_key)) {
m_locale = QLocale(m_config->value(localeName_key).toString()); m_locale = QLocale(m_config->value(localeName_key).toString());
} else {
m_locale = currentLocale;
} }
if (!m_config->isDefaultValue(shortDateFormat_key)) { if (!m_config->isDefaultValue(shortDateFormat_key)) {
m_shortDateFormatStr = m_config->value(shortDateFormat_key).toString(); m_shortDateFormatStr = m_config->value(shortDateFormat_key).toString();
} else {
m_shortDateFormatStr = currentLocale.dateFormat(QLocale::ShortFormat);
} }
if (!m_config->isDefaultValue(shortTimeFormat_key)) { if (!m_config->isDefaultValue(shortTimeFormat_key)) {
m_shortTimeFormatStr = m_config->value(shortTimeFormat_key).toString(); m_shortTimeFormatStr = m_config->value(shortTimeFormat_key).toString();
} else {
m_shortTimeFormatStr = currentLocale.timeFormat(QLocale::ShortFormat);
} }
if (!m_config->isDefaultValue(longTimeFormat_key)) { if (!m_config->isDefaultValue(longTimeFormat_key)) {
m_longTimeFormatStr = m_config->value(longTimeFormat_key).toString(); m_longTimeFormatStr = m_config->value(longTimeFormat_key).toString();
} else {
m_longTimeFormatStr = currentLocale.timeFormat(QLocale::LongFormat);
} }
if (!m_config->isDefaultValue(longDateFormat_key)) { if (!m_config->isDefaultValue(longDateFormat_key)) {
m_longDateFormatStr = m_config->value(longDateFormat_key).toString(); m_longDateFormatStr = m_config->value(longDateFormat_key).toString();
} else {
m_longTimeFormatStr = currentLocale.dateFormat(QLocale::LongFormat);
} }
connect(m_config, &DTK_CORE_NAMESPACE::DConfig::valueChanged, this, [this] (const QString &key) { connect(m_config, &DTK_CORE_NAMESPACE::DConfig::valueChanged, this, [this] (const QString &key) {