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

fix: error datetime tooltip

Browse Source 
issue: https://github.com/linuxdeepin/developer-center/issues/7056
log: correct longtimeformat and timeformat str
This commit is contained in:
tsic404 2024-01-23 17:16:58 +08:00 committed by deepin-bot[bot]
parent 3939ca9c12
commit 7097ae7f3c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,12 @@ void DateTimeDisplayer::initDConfig()
m_shortDateFormatStr = currentLocale.dateFormat(QLocale::ShortFormat); m_shortDateFormatStr = currentLocale.dateFormat(QLocale::ShortFormat);
} }
if (!m_config->isDefaultValue(shortDateFormat_key)) {
m_longDateFormatStr = m_config->value(longDateFormat_key).toString();
} else {
m_longDateFormatStr = currentLocale.dateFormat(QLocale::LongFormat);
}
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 { } else {
@ -106,12 +112,6 @@ void DateTimeDisplayer::initDConfig()
m_longTimeFormatStr = currentLocale.timeFormat(QLocale::LongFormat); m_longTimeFormatStr = currentLocale.timeFormat(QLocale::LongFormat);
} }
if (!m_config->isDefaultValue(longDateFormat_key)) {
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) {
if (key == shortDateFormat_key) { if (key == shortDateFormat_key) {
m_shortDateFormatStr = m_config->value(key).toString(); m_shortDateFormatStr = m_config->value(key).toString();