Skip to content

chore: datetime plugin tweak #1706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kegechen merged 1 commit into from
Sep 13, 2024
Merged

chore: datetime plugin tweak #1706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
236 changes: 210 additions & 26 deletions src/plugin-datetime/operation/datetimemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "dccfactory.h"
#include "timezoneMap/timezone_map_util.h"
#include "datetimeworker.h"
#include "zoneinfomodel.h"

#include <unicode/locid.h>
#include <unicode/unistr.h>
Expand All @@ -13,32 +14,65 @@
#include <QTimeZone>
#include <QSettings>
#include <QCoreApplication>
#include <QStringListModel>
static installer::ZoneInfoList g_totalZones;

DatetimeModel::DatetimeModel(QObject *parent)
: QObject(parent)
, m_ntp(true)
, m_bUse24HourType(true)
, m_work(new DatetimeWorker(this, this))
{
connect(this, &DatetimeModel::NTPChanged, m_work, &DatetimeWorker::setNTP);
connect(this, &DatetimeModel::hourTypeChanged, m_work, &DatetimeWorker::set24HourType);
static QString getDescription(const ZoneInfo &zoneInfo)
{
const QDateTime localTime(QDateTime::currentDateTime());
const double timeDelta = (zoneInfo.getUTCOffset() - localTime.offsetFromUtc()) / 3600.0;
QString dateLiteral;
if (localTime.time().hour() + timeDelta >= 24) {
dateLiteral = DatetimeModel::tr("Tomorrow");
} else if (localTime.time().hour() + timeDelta <= 0) {
dateLiteral = DatetimeModel::tr("Yesterday");
} else {
dateLiteral = DatetimeModel::tr("Today");
}

int decimalNumber = 1;
//小时取余,再取分钟,将15分钟的双倍只显示一位小数,其他的都显示两位小数
switch ((zoneInfo.getUTCOffset() - localTime.offsetFromUtc()) % 3600 / 60 / 15) {
case -1:
case -3:
case 1:
case 3:
decimalNumber = 2;
break;
default:
decimalNumber = 1;
break;
}

QString description;
if (timeDelta > 0) {
description = DatetimeModel::tr("%1 hours earlier than local").arg(QString::number(timeDelta, 'f', decimalNumber));
} else {
description = DatetimeModel::tr("%1 hours later than local").arg(QString::number(-timeDelta, 'f', decimalNumber));
}

return description;
}

void DatetimeModel::setNTP(bool ntp)
static QString getUtcOffsetText(int utcOffset)
{
if (m_ntp != ntp) {
m_ntp = ntp;
Q_EMIT NTPChanged(ntp);
QString gmData;
int utcOff = utcOffset / 3600;
if (utcOff >= 0) {
gmData = QString("(UTC+%1:%2)").arg(utcOff, 2, 10, QLatin1Char('0')).arg(utcOffset % 3600 / 60, 2, 10, QLatin1Char('0'));
} else {
gmData = QString("(UTC%1:%2)").arg(utcOff, 3, 10, QLatin1Char('0')).arg(utcOffset % 3600 / 60, 2, 10, QLatin1Char('0'));
}

return gmData;
}

void DatetimeModel::set24HourFormat(bool state)
static QString getDisplayText(const ZoneInfo &zoneInfo)
{
if (m_bUse24HourType != state) {
m_bUse24HourType = state;
Q_EMIT hourTypeChanged(state);
}
QString gmData = getUtcOffsetText(zoneInfo.getUTCOffset());
QString cityName = zoneInfo.getZoneCity().isEmpty() ? zoneInfo.getZoneName() : zoneInfo.getZoneCity();

return QString("%1 %2").arg(cityName).arg(gmData);
}

static QStringList timeZoneList(const installer::ZoneInfoList &zoneInfoList, QMap<QString, QString> &cache)
Expand All @@ -63,6 +97,48 @@ static QStringList timeZoneList(const installer::ZoneInfoList &zoneInfoList, QMa
return timezoneList;
}

DatetimeModel::DatetimeModel(QObject *parent)
: QObject(parent)
, m_ntp(true)
, m_bUse24HourType(true)
, m_work(new DatetimeWorker(this, this))
{
connect(this, &DatetimeModel::ntpChanged, m_work, &DatetimeWorker::setNTP);
connect(this, &DatetimeModel::hourTypeChanged, m_work, &DatetimeWorker::set24HourType);
connect(this, &DatetimeModel::NTPServerChanged, m_work, &DatetimeWorker::setNtpServer);
// 设置ntp地址失败回退到之前的地址
connect(this, &DatetimeModel::NTPServerNotChanged, this, &DatetimeModel::setNtpServerAddress);

connect(this, &DatetimeModel::userTimeZoneAdded, m_work, [this](const ZoneInfo &zone){
m_work->addUserTimeZone(zone.getZoneName());
});
connect(this, &DatetimeModel::userTimeZoneRemoved, m_work, &DatetimeWorker::removeUserTimeZone);
// set timezone
connect(this, &DatetimeModel::timeZoneChanged, m_work, &DatetimeWorker::setTimezone);
}

void DatetimeModel::setNTP(bool ntp)
{
if (m_ntp != ntp) {
m_ntp = ntp;
Q_EMIT ntpChanged(ntp);
}
}

void DatetimeModel::set24HourFormat(bool state)
{
if (m_bUse24HourType != state) {
m_bUse24HourType = state;
Q_EMIT hourTypeChanged(state);
}
}

void DatetimeModel::setDateTime(const QDateTime &dateTime)
{
if (m_work)
m_work->setDatetime(dateTime);
}

QStringList DatetimeModel::zones(int x, int y, int map_width, int map_height)
{
using namespace installer;
Expand Down Expand Up @@ -94,22 +170,44 @@ QPoint DatetimeModel::zonePosition(const QString &timezone, int map_width, int m
return QPoint(x, y);
}

QStringList DatetimeModel::zonesComplitionList()
QStringList DatetimeModel::zoneIdList()
{
using namespace installer;
if (g_totalZones.empty())
g_totalZones = GetZoneInfoList();

auto complitionList = timeZoneList(g_totalZones, m_timezoneCache);
// "上海": "Asia/Shanghai"
for (const auto &zone : m_timezoneCache.values()) {
// m_timezoneCache.keys == complitionList
if (!m_timezoneCache.contains(zone)) {
complitionList << zone;
}
QStringList list;
for (const auto& info : g_totalZones) {
list << info.timezone;
}

return list;
}

QString DatetimeModel::zoneDisplayName(const QString &zoneName)
{
if (m_work) {
auto zoneInfo = m_work->GetZoneInfo(zoneName);
QString utcOffsetText = getUtcOffsetText(zoneInfo.getUTCOffset());
QString cityName = zoneInfo.getZoneCity().isEmpty() ? zoneInfo.getZoneName() : zoneInfo.getZoneCity();
return QString("%1 %2").arg(utcOffsetText).arg(cityName);
}
return QString();
}

QSortFilterProxyModel *DatetimeModel::searchModel()
{
if (m_searchModel)
return m_searchModel;

m_searchModel = new QSortFilterProxyModel(this);

return complitionList;
auto sourceModel = new dccV25::ZoneInfoModel(this);
m_searchModel->setSourceModel(sourceModel);
m_searchModel->setFilterRole(dccV25::ZoneInfoModel::SearchTextRole);
m_searchModel->setFilterCaseSensitivity(Qt::CaseInsensitive);

return m_searchModel;
}

QStringList DatetimeModel::languagesAndRegions()
Expand Down Expand Up @@ -148,6 +246,35 @@ QStringList DatetimeModel::languagesAndRegions()
return langAndRegions;
}

void DatetimeModel::addUserTimeZoneByName(const QString &zoneName)
{
if (!m_timezoneCache.contains(zoneName)) {
qWarning() << "timezone cache not contain.." << zoneName;
return;
}
QString zoneId = m_timezoneCache.value(zoneName);

if (m_userZoneIds.contains(zoneId)) {
qWarning() << "user timezone already existed";
return;
}

if (m_work)
m_work->addUserTimeZone(zoneId);
}
void DatetimeModel::removeUserTimeZoneByName(const QString &name)
{
// displayText list
auto zonelist = userTimeZoneText(0);
int index = zonelist.indexOf(name);
if (index < 0) {
qWarning() << name << "Not found in User TimeZones";
return;
}

removeUserTimeZone(m_userTimeZones.value(index));
}

#ifndef DCC_DISABLE_TIMEZONE
QString DatetimeModel::systemTimeZoneId() const
{
Expand Down Expand Up @@ -343,6 +470,63 @@ void DatetimeModel::setRegions(const Regions &regions)
}
}

QStringList DatetimeModel::userTimeZoneText(int index) const
{
QStringList userTimeZoneList;
for (const ZoneInfo &zoneInfo : m_userTimeZones) {
QString text;
switch (index) {
case 1:
text = getDescription(zoneInfo);
break;
case 2:
text = QString::number(zoneInfo.getUTCOffset());
break;
case 3:
text = zoneInfo.getZoneName();
break;
case 4:
text = zoneInfo.getZoneCity();
break;
default:
text = getDisplayText(zoneInfo);
break;
}
userTimeZoneList << text;
}

return userTimeZoneList;
}

QString DatetimeModel::currentTimeZoneName() const
{
return getDescription(m_currentTimeZone);
}

QString DatetimeModel::timeZoneDispalyName() const
{
return getDisplayText(m_currentSystemTimeZone);
}

int DatetimeModel::currentTimeZoneIndex() const
{
using namespace installer;
if (g_totalZones.empty())
g_totalZones = GetZoneInfoList();

int index = -1;
const QString &zoneName = m_currentSystemTimeZone.getZoneName();
for (int i = 0; i < g_totalZones.size(); ++i) {
const auto &zoneInfo = g_totalZones.value(i);
if (zoneName == zoneInfo.timezone) {
index = i;
break;
}
}

return index;
}

DCC_FACTORY_CLASS(DatetimeModel)

#include "datetimemodel.moc"
31 changes: 26 additions & 5 deletions src/plugin-datetime/operation/datetimemodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,33 @@

#include "zoneinfo.h"
#include "regionproxy.h"
#include "zonesearchmodel.h"
#include "zoneinfomodel.h"

class DatetimeWorker;
class DatetimeModel : public QObject
{
Q_OBJECT
friend class DatetimeWorker;
Q_PROPERTY(QString shortDateFormat READ shortDateFormat WRITE setShortDateFormat NOTIFY shortDateFormatChanged FINAL)
Q_PROPERTY(QString longDateFormat READ longDateFormat WRITE setLongDateFormat NOTIFY longDateFormatChanged FINAL)
Q_PROPERTY(QString longTimeFormat READ longTimeFormat WRITE setLongTimeFormat NOTIFY longTimeFormatChanged FINAL)
Q_PROPERTY(bool ntpEnabled READ nTP WRITE setNTP NOTIFY ntpChanged FINAL)
Q_PROPERTY(bool use24HourFormat READ use24HourFormat WRITE set24HourFormat NOTIFY hourTypeChanged FINAL)
Q_PROPERTY(QString ntpServerAddress READ ntpServerAddress WRITE setNtpServerAddress NOTIFY NTPServerChanged FINAL)
Q_PROPERTY(QStringList ntpServerList READ ntpServerList WRITE setNTPServerList NOTIFY NTPServerListChanged FINAL)
Q_PROPERTY(QString timeZoneDispalyName READ timeZoneDispalyName NOTIFY currentSystemTimeZoneChanged)
Q_PROPERTY(int currentTimeZoneIndex READ currentTimeZoneIndex NOTIFY currentSystemTimeZoneChanged)
Q_PROPERTY(QString systemTimeZone READ getTimeZone WRITE setTimeZoneInfo NOTIFY timeZoneChanged FINAL)
Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged FINAL)

public:
using Regions = QMap<QString, QLocale>;

explicit DatetimeModel(QObject *parent = nullptr);

inline bool nTP() const { return m_ntp; }
void setNTP(bool ntp);
inline bool get24HourFormat() const { return m_bUse24HourType; }
inline bool use24HourFormat() const { return m_bUse24HourType; }

QList<ZoneInfo> userTimeZones() const;
void addUserTimeZone(const ZoneInfo &zone);
Expand Down Expand Up @@ -92,8 +104,11 @@ class DatetimeModel : public QObject
inline Regions regions() const { return m_regions; }
void setRegions(const Regions &regions);

QString timeZoneDispalyName() const;
int currentTimeZoneIndex() const;

Q_SIGNALS:
void NTPChanged(bool value);
void ntpChanged(bool value);
void hourTypeChanged(bool value);
void userTimeZoneAdded(const ZoneInfo &zone);
void userTimeZoneRemoved(const ZoneInfo &zone);
Expand All @@ -119,11 +134,17 @@ class DatetimeModel : public QObject

public Q_SLOTS:
void set24HourFormat(bool state);
void setDateTime(const QDateTime &dateTime);
QStringList zones(int x, int y, int map_width, int map_height);
QPoint zonePosition(const QString &timezone, int map_width, int map_height);
QStringList zonesComplitionList();
QStringList zoneIdList();
QString zoneDisplayName(const QString &zoneName);
QSortFilterProxyModel *searchModel();
QStringList languagesAndRegions();
void addUserTimeZoneByName(const QString &name);
void removeUserTimeZoneByName(const QString &name);
QStringList userTimeZoneText(int index) const;
QString currentTimeZoneName() const;

private:
bool m_ntp;
Expand Down Expand Up @@ -153,8 +174,8 @@ public Q_SLOTS:
QString m_paperFormat;
RegionFormat m_regionFormat;
QMap<QString, QString> m_timezoneCache;
dccV25::ZoneSearchModel *m_searchMode = nullptr;
DatetimeWorker *m_work = nullptr;
QSortFilterProxyModel *m_searchModel = nullptr;
};

#endif // DATETIMEMODEL_H
4 changes: 2 additions & 2 deletions src/plugin-datetime/operation/datetimeworker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void DatetimeWorker::setAutoHide()
}
void DatetimeWorker::setNTPError()
{
Q_EMIT m_model->NTPChanged(m_model->nTP());
Q_EMIT m_model->ntpChanged(m_model->nTP());
setAutoHide();
}

Expand Down Expand Up @@ -137,7 +137,7 @@ void DatetimeWorker::setNtpServer(QString server)
{
qInfo() << "Try set server : " << server;

if (server.isEmpty() && server == m_timedateInter->nTPServer())
if (server.isEmpty() || server == m_timedateInter->nTPServer())
return;
m_timedateInter->SetNTPServer(server, tr("Authentication is required to change NTP server"), this, SLOT(SetNTPServerFinished()), SLOT(SetNTPServerError()));
}
Expand Down
Loading