diff -Nru kylin-calendar-4.10.0.0/debian/changelog kylin-calendar-4.10.0.0/debian/changelog
--- kylin-calendar-4.10.0.0/debian/changelog 2024-08-23 14:14:28.000000000 +0800
+++ kylin-calendar-4.10.0.0/debian/changelog 2024-12-16 10:12:04.000000000 +0800
@@ -1,3 +1,45 @@
+kylin-calendar (4.10.0.0-ok2.17) nile; urgency=medium
+
+ * BUG: 无
+ * 需求：无
+ * 其他改动说明：更新2025年节假日
+ * 其他改动影响域：无
+
+ -- jiawei <jiawei@kylinos.cn> Mon, 16 Dec 2024 10:12:04 +0800
+
+kylin-calendar (4.10.0.0-ok2.16) nile; urgency=medium
+
+ * BUG：无
+ * 任务号：#369491 【交互动效】【日历】托盘面板交互动效调整
+ * 其他改动说明：无
+ * 其他改动影响域：无
+
+ -- jiawei <jiawei@kylinos.cn> Wed, 16 Oct 2024 16:58:29 +0800
+
+kylin-calendar (4.10.0.0-ok2.15) nile; urgency=medium
+
+ * 更新0920维哈柯翻译
+
+ -- Kevin Duan <duankaiwen@kylinos.cn> Fri, 20 Sep 2024 15:47:45 +0800
+
+kylin-calendar (4.10.0.0-ok2.14) nile; urgency=medium
+
+ * BUG: 无
+ * 需求：无
+ * 其他改动说明：解决日历最小字体下时间字体过小问题
+ * 其他改动影响域：无
+
+ -- jiawei <jiawei@kylinos.cn> Fri, 20 Sep 2024 15:47:45 +0800
+
+kylin-calendar (4.10.0.0-ok2.13) nile; urgency=medium
+
+ * BUG: 无
+ * 需求：无
+ * 其他改动说明：添加删除日程的Dbus接口
+ * 其他改动影响域：无
+
+ -- jiawei <jiawei@kylinos.cn> Wed, 18 Sep 2024 16:47:10 +0800
+
kylin-calendar (4.10.0.0-ok2.12) nile; urgency=medium
* BUG: #I9STQ3【日历】未适配字体大小，仅添加日程按钮适配
diff -Nru kylin-calendar-4.10.0.0/debian/patches/0038-40-Dbus.patch kylin-calendar-4.10.0.0/debian/patches/0038-40-Dbus.patch
--- kylin-calendar-4.10.0.0/debian/patches/0038-40-Dbus.patch 1970-01-01 08:00:00.000000000 +0800
+++ kylin-calendar-4.10.0.0/debian/patches/0038-40-Dbus.patch 2024-12-16 10:12:04.000000000 +0800
@@ -0,0 +1,1381 @@
+From: =?utf-8?b?6JKL6IOc6L6+?= <jiangshengda@kylinos.cn>
+Date: Wed, 18 Sep 2024 08:56:02 +0000
+Subject: =?utf-8?b?ITQwIOa3u+WKoOWIoOmZpOaXpeeoi+eahERidXPmjqXlj6MgTWVyZ2Ug?=
+ =?utf-8?b?cHVsbCByZXF1ZXN0ICE0MCBmcm9tIOi0vuWogS9vcGVua3lsaW4vbmlsZQ==?=
+
+---
+ lunarcalendarwidget/calendardatabase.cpp | 824 ++++++++++++++++-----------
+ lunarcalendarwidget/calendardatabase.h | 10 +-
+ lunarcalendarwidget/notificationsadaptor.cpp | 86 +--
+ lunarcalendarwidget/notificationsadaptor.h | 42 +-
+ 4 files changed, 558 insertions(+), 404 deletions(-)
+
+diff --git a/lunarcalendarwidget/calendardatabase.cpp b/lunarcalendarwidget/calendardatabase.cpp
+index 37348a9..cfd2a6a 100644
+--- a/lunarcalendarwidget/calendardatabase.cpp
++++ b/lunarcalendarwidget/calendardatabase.cpp
+@@ -19,7 +19,7 @@ CalendarDataBase::CalendarDataBase(QObject *parent) : QObject(parent)
+ userName = getenv("USER"); //获取当前用户名
+ xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
+ XorWayland = getenv("XDG_SESSION_TYPE");
+- qDebug()<<XorWayland;//wayland 下应该是WAYLAND_DISPLAY=wayland-0 和X11的DISPLAY=:0不一样
++ qDebug() << XorWayland; //wayland 下应该是WAYLAND_DISPLAY=wayland-0 和X11的DISPLAY=:0不一样
+ qDebug() << QSqlDatabase::drivers(); //当前环境支持哪些数据库
+ m_dataBase = QSqlDatabase::addDatabase("QSQLITE");
+ QString dirPath = QString(getenv("HOME")) + "/.config/.kylin_calendar_Schedule2.db";
+@@ -39,17 +39,22 @@ CalendarDataBase::CalendarDataBase(QObject *parent) : QObject(parent)
+ void CalendarDataBase::deleteschedule()
+ {
+ QSqlQuery query;
+- if (!query.exec("SELECT id FROM Schedule WHERE endrepeat < datetime('now','+1 day')")) {
++ if (!query.exec("SELECT id FROM Schedule WHERE endrepeat < datetime('now','+1 day')"))
++ {
+ qDebug() << "Error: Failed to execute query.";
+ return;
+ }
+ QString queryResult;
+- while (query.next()) {
++ while (query.next())
++ {
+ queryResult += query.value(0).toString() + " ";
+ }
+- if (!queryResult.isEmpty()) {
++ if (!queryResult.isEmpty())
++ {
+ processExpiredEvents(queryResult.trimmed());
+- } else {
++ }
++ else
++ {
+ qDebug() << "No expired events found.";
+ }
+ }
+@@ -60,27 +65,31 @@ void CalendarDataBase::deleteschedule()
+ */
+ void CalendarDataBase::processExpiredEvents(const QString& expiredIds)
+ {
+- QTemporaryFile tempFile;
+- if (!tempFile.open()) {
+- qDebug() << "Error: Failed to create temporary file.";
+- return;
+- }
++ QTemporaryFile tempFile;
++ if (!tempFile.open())
++ {
++ qDebug() << "Error: Failed to create temporary file.";
++ return;
++ }
+
+- QTextStream out(&tempFile);
+- QStringList crontabLines = getCurrentCrontab();
+- for (const QString& line : crontabLines) {
+- if(line.trimmed().isEmpty()){
+- continue;
+- }
+- QStringList parts = line.split('#');
+- if (parts.size() > 1 && expiredIds.contains(parts.last().trimmed())) {
+- continue;
+- }
+- out << line << "\n";
++ QTextStream out(&tempFile);
++ QStringList crontabLines = getCurrentCrontab();
++ for (const QString& line : crontabLines)
++ {
++ if(line.trimmed().isEmpty())
++ {
++ continue;
+ }
++ QStringList parts = line.split('#');
++ if (parts.size() > 1 && expiredIds.contains(parts.last().trimmed()))
++ {
++ continue;
++ }
++ out << line << "\n";
++ }
+
+- tempFile.close();
+- updateCrontabFromFile(tempFile.fileName());
++ tempFile.close();
++ updateCrontabFromFile(tempFile.fileName());
+ }
+ /**
+ * @brief CalendarDataBase::getCurrentCrontab
+@@ -89,34 +98,41 @@ void CalendarDataBase::processExpiredEvents(const QString& expiredIds)
+ */
+ QStringList CalendarDataBase::getCurrentCrontab()
+ {
+- QStringList crontabLines;
+- QProcess process;
+- process.start("crontab", QStringList() << "-l");
+- process.waitForFinished();
+- if (process.exitStatus() == QProcess::NormalExit && process.exitCode() == 0) {
+- QString output = process.readAllStandardOutput();
+- crontabLines = output.split('\n');
+- } else {
+- qDebug() << "Error: Failed to read current crontab.";
+- }
+- return crontabLines;
+- }
++ QStringList crontabLines;
++ QProcess process;
++ process.start("crontab", QStringList() << "-l");
++ process.waitForFinished();
++ if (process.exitStatus() == QProcess::NormalExit && process.exitCode() == 0)
++ {
++ QString output = process.readAllStandardOutput();
++ crontabLines = output.split('\n');
++ }
++ else
++ {
++ qDebug() << "Error: Failed to read current crontab.";
++ }
++ return crontabLines;
++}
+ /**
+ * @brief CalendarDataBase::updateCrontabFromFile
+ * @param filename
+ * 更新删除完毕的crontab
+ *
+ */
+-void CalendarDataBase::updateCrontabFromFile(const QString& filename) {
+- QProcess process;
+- process.start("crontab", QStringList() << filename);
+- process.waitForFinished();
+- if (process.exitStatus() == QProcess::NormalExit && process.exitCode() == 0) {
+- qDebug() << "Crontab updated successfully.";
+- } else {
+- qDebug() << "Error: Failed to update crontab.";
+- }
+- }
++void CalendarDataBase::updateCrontabFromFile(const QString& filename)
++{
++ QProcess process;
++ process.start("crontab", QStringList() << filename);
++ process.waitForFinished();
++ if (process.exitStatus() == QProcess::NormalExit && process.exitCode() == 0)
++ {
++ qDebug() << "Crontab updated successfully.";
++ }
++ else
++ {
++ qDebug() << "Error: Failed to update crontab.";
++ }
++}
+ /**
+ * @brief CalendarDataBase::add
+ * @param info
+@@ -131,167 +147,185 @@ void CalendarDataBase::add(const MarkInfo &info)
+ //如果返回的是0，说明用户从来没用过crontab 这个东西，要先把临时文件里面写入原来应该有的注释 再写自己的cron内容
+ c->start("crontab -l");
+ c->waitForFinished();
+- QString cronFilePath = "/var/spool/cron/crontabs/"+userName;
++ QString cronFilePath = "/var/spool/cron/crontabs/" + userName;
+ QString tmpFilePath = "/tmp/" + userName + ".tmp";
+ QString crontabContent = c->readAllStandardOutput();
+
+ QFile tmpFile(tmpFilePath);
+ QString targetId = "#" + id;
+- if (tmpFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
++ if (tmpFile.open(QIODevice::WriteOnly | QIODevice::Text))
++ {
+ QTextStream out(&tmpFile);
+ QStringList lines = crontabContent.split('\n'); // 将crontab内容按行分割
+- for (const QString &line : lines) {
+-// if (!line.contains(targetId)) { // 排除注释行
+-// out << line;
+-// }
++ for (const QString &line : lines)
++ {
++ // if (!line.contains(targetId)) { // 排除注释行
++ // out << line;
++ // }
+ }
+- qDebug()<<"code="<<code;
+- if(code == 1){//没成功
+- QString old = "# Edit this file to introduce tasks to be run by cron. \n"
+- "#\n"
+- "# Each task to run has to be defined through a single line\n"
+- "# indicating with different fields when the task will be run\n"
+- "# and what command to run for the task\n"
+- "#\n"
+- "# To define the time you can provide concrete values for\n"
+- "# minute (m), hour (h), day of month (dom), month (mon),\n"
+- "# and day of week (dow) or use '*' in these fields (for 'any').\n"
+- "#\n"
+- "# Notice that tasks will be started based on the cron's system\n"
+- "# daemon's notion of time and timezones.\n"
+- "#\n"
+- "# Output of the crontab jobs (including errors) is sent through\n"
+- "# email to the user the crontab file belongs to (unless redirected).\n"
+- "#\n"
+- "# For example, you can run a backup of all your user accounts\n"
+- "# at 5 a.m every week with:\n"
+- "# 0 5 * * 1 tar -zcf /var/backups/home.tgz /home/\n"
+- "#\n"
+- "# For more information see the manual pages of crontab(5) and cron(8)\n"
+- "#\n"
+- "# m h dom mon dow command\n";
+- out << old <<"\n";
+- }
+- QString cronLine;
+- //不重复 处理完毕
+- cronLine = QString("%1 %2 %3 %4 * XDG_RUNTIME_DIR=%5 DISPLAY=%6 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%7\" \"今天 %8 %9:%10\" #%11")
+- .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
+- .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
+- .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
+- .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
+- .arg(xdg_runtime_dir)
+- .arg(display)
+- .arg(info.m_descript).arg(info.shangwu)
+- .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
+- .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
+- .arg(info.m_markId);
+- if(AlarmType == 0){
+- cronLine = "";
+- }
+- if(AlarmType == 7){
+- cronLine = QString("%1 %2 %3 %4 * XDG_RUNTIME_DIR=%5 DISPLAY=%6 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%7\" \"明天 %8 %9:%10\" #%11")
+- .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
+- .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
+- .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
+- .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
+- .arg(xdg_runtime_dir)
+- .arg(display)
+- .arg(info.m_descript).arg(info.shangwu)
+- .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
+- .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
+- .arg(info.m_markId);
+- }
+- if(AlarmType == 10){
+- cronLine = QString("00 09 %1 %2 * XDG_RUNTIME_DIR=%3 DISPLAY=%4 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%5\" \"今天 全天 \" #%6")
+- .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
+- .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
+- .arg(xdg_runtime_dir)
+- .arg(display)
+- .arg(info.m_descript)
+- .arg(info.m_markId);
+- }
+- if(AlarmType == 9){
+- cronLine = QString("00 09 %1 %2 * XDG_RUNTIME_DIR=%3 DISPLAY=%4 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%5\" \"明天 全天\" #%6")
+- .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
+- .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
+- .arg(xdg_runtime_dir)
+- .arg(display)
+- .arg(info.m_descript)
+- .arg(info.m_markId);
+- }
+- if(AlarmType == 8){
+- cronLine = QString("%1 %2 %3 %4 * XDG_RUNTIME_DIR=%5 DISPLAY=%6 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%7\" \" %8 %9 %10:%11\" #%12")
+- .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
+- .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
+- .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
+- .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
+- .arg(xdg_runtime_dir)
+- .arg(display)
+- .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd")).arg(info.shangwu)
+- .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
+- .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
+- .arg(info.m_markId);
+- }
+- if(AlarmType == 11|| AlarmType == 12){
+- cronLine = QString("00 09 %1 %2 * XDG_RUNTIME_DIR=%3 DISPLAY=%4 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%5\" \" %6 全天\" #%7")
+- .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
+- .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
+- .arg(xdg_runtime_dir)
+- .arg(display)
+- .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd"))
+- .arg(info.m_markId);
+- }
+- if(RRuleType == 1){
+- cronLine = QString("%1 %2 * * * XDG_RUNTIME_DIR=%3 DISPLAY=%4 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%5\" \" %6 %7 %8:%9\" #%10")
+- .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
+- .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
+- .arg(xdg_runtime_dir)
+- .arg(display)
+- .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd")).arg(info.shangwu)
+- .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
+- .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
+- .arg(info.m_markId);
+- }else if(RRuleType == 3){
+- cronLine = QString("%1 %2 %3 * * XDG_RUNTIME_DIR=%4 DISPLAY=%5 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%6\" \" %7 %8 %9:%10\" #%11")
+- .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
+- .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
+- .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
+- .arg(xdg_runtime_dir)
+- .arg(display)
+- .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd")).arg(info.shangwu)
+- .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
+- .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
+- .arg(info.m_markId);
+- }else if(RRuleType == 2){
+- cronLine = QString("%1 %2 * * %3 XDG_RUNTIME_DIR=%4 DISPLAY=%5 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%6\" \" %7 %8 %9:%10\" #%11")
+- .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
+- .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
+- .arg(info.week)
+- .arg(xdg_runtime_dir)
+- .arg(display)
+- .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd")).arg(info.shangwu)
+- .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
+- .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
+- .arg(info.m_markId);
+- }else if(RRuleType == 4){
+- //如果2025的这个时候也提醒了 可以加一个info的年属性 判断一下 一年一换 crontab好像没有年的处理方式
+- cronLine = QString("%1 %2 %3 %4 * XDG_RUNTIME_DIR=%5 DISPLAY=%6 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%7\" \" %8 %9 %10:%11\" #%12")
+- .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
+- .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
+- .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
+- .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
+- .arg(xdg_runtime_dir)
+- .arg(display)
+- .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd")).arg(info.shangwu)
+- .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
+- .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
+- .arg(info.m_markId);
+- }
+- out << cronLine <<"\n";
+- tmpFile.close();
+- }else{
+- qDebug()<<"无法新建临时文件"<<tmpFile.errorString();
++ qDebug() << "code=" << code;
++ if(code == 1) //没成功
++ {
++ QString old = "# Edit this file to introduce tasks to be run by cron. \n"
++ "#\n"
++ "# Each task to run has to be defined through a single line\n"
++ "# indicating with different fields when the task will be run\n"
++ "# and what command to run for the task\n"
++ "#\n"
++ "# To define the time you can provide concrete values for\n"
++ "# minute (m), hour (h), day of month (dom), month (mon),\n"
++ "# and day of week (dow) or use '*' in these fields (for 'any').\n"
++ "#\n"
++ "# Notice that tasks will be started based on the cron's system\n"
++ "# daemon's notion of time and timezones.\n"
++ "#\n"
++ "# Output of the crontab jobs (including errors) is sent through\n"
++ "# email to the user the crontab file belongs to (unless redirected).\n"
++ "#\n"
++ "# For example, you can run a backup of all your user accounts\n"
++ "# at 5 a.m every week with:\n"
++ "# 0 5 * * 1 tar -zcf /var/backups/home.tgz /home/\n"
++ "#\n"
++ "# For more information see the manual pages of crontab(5) and cron(8)\n"
++ "#\n"
++ "# m h dom mon dow command\n";
++ out << old << "\n";
++ }
++ QString cronLine;
++ //不重复 处理完毕
++ cronLine = QString("%1 %2 %3 %4 * XDG_RUNTIME_DIR=%5 DISPLAY=%6 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%7\" \"今天 %8 %9:%10\" #%11")
++ .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
++ .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
++ .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
++ .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
++ .arg(xdg_runtime_dir)
++ .arg(display)
++ .arg(info.m_descript).arg(info.shangwu)
++ .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
++ .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
++ .arg(info.m_markId);
++ if(AlarmType == 0)
++ {
++ cronLine = "";
++ }
++ if(AlarmType == 7)
++ {
++ cronLine = QString("%1 %2 %3 %4 * XDG_RUNTIME_DIR=%5 DISPLAY=%6 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%7\" \"明天 %8 %9:%10\" #%11")
++ .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
++ .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
++ .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
++ .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
++ .arg(xdg_runtime_dir)
++ .arg(display)
++ .arg(info.m_descript).arg(info.shangwu)
++ .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
++ .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
++ .arg(info.m_markId);
++ }
++ if(AlarmType == 10)
++ {
++ cronLine = QString("00 09 %1 %2 * XDG_RUNTIME_DIR=%3 DISPLAY=%4 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%5\" \"今天 全天 \" #%6")
++ .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
++ .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
++ .arg(xdg_runtime_dir)
++ .arg(display)
++ .arg(info.m_descript)
++ .arg(info.m_markId);
+ }
++ if(AlarmType == 9)
++ {
++ cronLine = QString("00 09 %1 %2 * XDG_RUNTIME_DIR=%3 DISPLAY=%4 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%5\" \"明天 全天\" #%6")
++ .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
++ .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
++ .arg(xdg_runtime_dir)
++ .arg(display)
++ .arg(info.m_descript)
++ .arg(info.m_markId);
++ }
++ if(AlarmType == 8)
++ {
++ cronLine = QString("%1 %2 %3 %4 * XDG_RUNTIME_DIR=%5 DISPLAY=%6 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%7\" \" %8 %9 %10:%11\" #%12")
++ .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
++ .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
++ .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
++ .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
++ .arg(xdg_runtime_dir)
++ .arg(display)
++ .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd")).arg(info.shangwu)
++ .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
++ .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
++ .arg(info.m_markId);
++ }
++ if(AlarmType == 11 || AlarmType == 12)
++ {
++ cronLine = QString("00 09 %1 %2 * XDG_RUNTIME_DIR=%3 DISPLAY=%4 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%5\" \" %6 全天\" #%7")
++ .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
++ .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
++ .arg(xdg_runtime_dir)
++ .arg(display)
++ .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd"))
++ .arg(info.m_markId);
++ }
++ if(RRuleType == 1)
++ {
++ cronLine = QString("%1 %2 * * * XDG_RUNTIME_DIR=%3 DISPLAY=%4 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%5\" \" %6 %7 %8:%9\" #%10")
++ .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
++ .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
++ .arg(xdg_runtime_dir)
++ .arg(display)
++ .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd")).arg(info.shangwu)
++ .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
++ .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
++ .arg(info.m_markId);
++ }
++ else if(RRuleType == 3)
++ {
++ cronLine = QString("%1 %2 %3 * * XDG_RUNTIME_DIR=%4 DISPLAY=%5 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%6\" \" %7 %8 %9:%10\" #%11")
++ .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
++ .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
++ .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
++ .arg(xdg_runtime_dir)
++ .arg(display)
++ .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd")).arg(info.shangwu)
++ .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
++ .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
++ .arg(info.m_markId);
++ }
++ else if(RRuleType == 2)
++ {
++ cronLine = QString("%1 %2 * * %3 XDG_RUNTIME_DIR=%4 DISPLAY=%5 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%6\" \" %7 %8 %9:%10\" #%11")
++ .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
++ .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
++ .arg(info.week)
++ .arg(xdg_runtime_dir)
++ .arg(display)
++ .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd")).arg(info.shangwu)
++ .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
++ .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
++ .arg(info.m_markId);
++ }
++ else if(RRuleType == 4)
++ {
++ //如果2025的这个时候也提醒了 可以加一个info的年属性 判断一下 一年一换 crontab好像没有年的处理方式
++ cronLine = QString("%1 %2 %3 %4 * XDG_RUNTIME_DIR=%5 DISPLAY=%6 /usr/bin/notify-send -i kylin-calendar --app-name=日历 \"%7\" \" %8 %9 %10:%11\" #%12")
++ .arg(info.Alarm_end_minute < 10 ? "0" + QString::number(info.Alarm_end_minute) : QString::number(info.Alarm_end_minute))
++ .arg(info.Alarm_end_hour < 10 ? "0" + QString::number(info.Alarm_end_hour) : QString::number(info.Alarm_end_hour))
++ .arg(info.day < 10 ? "0" + QString::number(info.day) : QString::number(info.day))
++ .arg(info.month < 10 ? "0" + QString::number(info.month) : QString::number(info.month))
++ .arg(xdg_runtime_dir)
++ .arg(display)
++ .arg(info.m_descript).arg(info.m_markStartDate.toString("yyyy/MM/dd")).arg(info.shangwu)
++ .arg(info.hour < 10 ? "0" + QString::number(info.hour) : QString::number(info.hour))
++ .arg(info.minute < 10 ? "0" + QString::number(info.minute) : QString::number(info.minute))
++ .arg(info.m_markId);
++ }
++ out << cronLine << "\n";
++ tmpFile.close();
++ }
++ else
++ {
++ qDebug() << "无法新建临时文件" << tmpFile.errorString();
++ }
+ // 步骤3: 使用crontab命令将tmp文件内容设置为当前用户的crontab
+ QProcess *process = new QProcess(this);
+
+@@ -301,25 +335,31 @@ void CalendarDataBase::add(const MarkInfo &info)
+ arguments << "-c" << command;
+ process->start(program, arguments);
+ // 等待进程结束并检查其退出状态
+- if (!process->waitForFinished()) {
++ if (!process->waitForFinished())
++ {
+ qDebug() << "Error occurred while executing crontab command.";
+ return;
+- } else {
++ }
++ else
++ {
+ int exitCode = process->exitCode();
+ QString standardOutput = process->readAllStandardOutput();
+ QString standardError = process->readAllStandardError();
+- if (exitCode != 0) {
++ if (exitCode != 0)
++ {
+ qDebug() << "crontab command exited with code" << exitCode;
+ qDebug() << "Standard Output:" << standardOutput;
+ qDebug() << "Standard Error:" << standardError;
+ return ;
+- } else {
++ }
++ else
++ {
+ qDebug() << "crontab command executed successfully.";
+ }
+- QFile::remove(tmpFilePath);
+- delete process; //清对象
+- delete c;
+-}
++ QFile::remove(tmpFilePath);
++ delete process; //清对象
++ delete c;
++ }
+ }
+ /**
+ * @brief CalendarDataBase::update
+@@ -330,9 +370,9 @@ void CalendarDataBase::add(const MarkInfo &info)
+ */
+ void CalendarDataBase::update(const MarkInfo &info)
+ {
+- QString id = info.m_markId;
+- del(info);
+- add(info);
++ QString id = info.m_markId;
++ del(info);
++ add(info);
+ }
+ /**
+ * @brief CalendarDataBase::del
+@@ -344,71 +384,82 @@ void CalendarDataBase::del(const MarkInfo &info)
+ QProcess *c = new QProcess(this);
+ c->start("crontab -l");
+ c->waitForFinished();
+- QString cronFilePath = "/var/spool/cron/crontabs/"+userName;
++ QString cronFilePath = "/var/spool/cron/crontabs/" + userName;
+ QString tmpFilePath = "/tmp/" + userName + ".tmp";
+ QString crontabContent = c->readAllStandardOutput();
+ QString id = info.m_markId;
+- QString fileName = "/var/spool/cron/crontabs/"+userName;
++ QString fileName = "/var/spool/cron/crontabs/" + userName;
+ //步骤一 打开文件
+ QFile file(fileName);
+ //步骤二 创建一个临时文件用于存储不包含指定ID的行
+- QFile tempFile("/tmp/"+ userName + ".tmp");
++ QFile tempFile("/tmp/" + userName + ".tmp");
+ if (!tempFile.open(QIODevice::WriteOnly | QIODevice::Text))
+ {
+- qDebug() << "无法创建临时文件";
+- file.close();
+- return;
+- }
+- //步骤三 准备遍历
+-// QTextStream in(&file);
+- QTextStream out(&tempFile);
+-// QString line;
+- QStringList lines = crontabContent.split('\n');
+- QString targetId = "#" + id; // 加上#前缀来匹配文件中的格式
+- //开始遍历
+- for (const QString &line : lines) {
+- if (!line.contains(targetId) || line.startsWith("#")) { // 排除注释行 并且保留最开始的注释
+- out << line << "\n";
+- }
+- }
+-// file.close();
+- tempFile.close();
+- // 删除原文件并将临时文件重命名为原文件名
+- QProcess *process = new QProcess(this);
+- QString command = QString("crontab %1").arg(tmpFilePath);
+- QString program = "sh";
+- QStringList arguments;
+- arguments << "-c" << command;
+- process->start(program,arguments);
+- // 等待进程结束并检查其退出状态
+- if (!process->waitForFinished()) {
+- qDebug() << "Error occurred while executing crontab command.";
+- return;
+- } else {
+- int exitCode = process->exitCode();
+- QString standardOutput = process->readAllStandardOutput();
+- QString standardError = process->readAllStandardError();
+- if (exitCode != 0) {
+- qDebug() << "crontab command exited with code" << exitCode;
+- qDebug() << "Standard Output:" << standardOutput;
+- qDebug() << "Standard Error:" << standardError;
+- return ;
+- } else {
+- qDebug() << "crontab command executed successfully.";
+- }
+- QFile::remove(tmpFilePath);
+- delete process; //清对象
+-}
++ qDebug() << "无法创建临时文件";
++ file.close();
++ return;
++ }
++ //步骤三 准备遍历
++ // QTextStream in(&file);
++ QTextStream out(&tempFile);
++ // QString line;
++ QStringList lines = crontabContent.split('\n');
++ QString targetId = "#" + id; // 加上#前缀来匹配文件中的格式
++ //开始遍历
++ for (const QString &line : lines)
++ {
++ if (!line.contains(targetId) || line.startsWith("#")) // 排除注释行 并且保留最开始的注释
++ {
++ out << line << "\n";
++ }
++ }
++ // file.close();
++ tempFile.close();
++ // 删除原文件并将临时文件重命名为原文件名
++ QProcess *process = new QProcess(this);
++ QString command = QString("crontab %1").arg(tmpFilePath);
++ QString program = "sh";
++ QStringList arguments;
++ arguments << "-c" << command;
++ process->start(program, arguments);
++ // 等待进程结束并检查其退出状态
++ if (!process->waitForFinished())
++ {
++ qDebug() << "Error occurred while executing crontab command.";
++ return;
++ }
++ else
++ {
++ int exitCode = process->exitCode();
++ QString standardOutput = process->readAllStandardOutput();
++ QString standardError = process->readAllStandardError();
++ if (exitCode != 0)
++ {
++ qDebug() << "crontab command exited with code" << exitCode;
++ qDebug() << "Standard Output:" << standardOutput;
++ qDebug() << "Standard Error:" << standardError;
++ return ;
++ }
++ else
++ {
++ qDebug() << "crontab command executed successfully.";
++ }
++ QFile::remove(tmpFilePath);
++ delete process; //清对象
++ }
+ }
+ int CalendarDataBase::initDataBase()
+ {
+- if (!m_dataBase.open()) { //如果数据库打开失败，会弹出一个警告窗口;由于此类非指针类型因此是0
++ if (!m_dataBase.open()) //如果数据库打开失败，会弹出一个警告窗口;由于此类非指针类型因此是0
++ {
+
+ QMessageBox::warning(0, QObject::tr("Database Error"), m_dataBase.lastError().text());
+ m_dbStatus = DB_UNCONNECT;
+ return DB_UNCONNECT;
+
+- } else {
++ }
++ else
++ {
+
+ QSqlQuery query;
+ QString creatTableStr = "CREATE TABLE IF NOT EXISTS Schedule "
+@@ -435,11 +486,14 @@ int CalendarDataBase::initDataBase()
+ "allDayremind TEXT NOT NULL);";
+
+ query.prepare(creatTableStr);
+- if (!query.exec()) {
+- qDebug() << "建表失败!"<<query.lastError();
++ if (!query.exec())
++ {
++ qDebug() << "建表失败!" << query.lastError();
+ m_dbStatus = CREATE_TABLE_FAILED;
+ return CREATE_TABLE_FAILED;
+- } else {
++ }
++ else
++ {
+ qDebug() << "建表成功!";
+ m_dbStatus = DB_OP_SUCC;
+ return DB_OP_SUCC;
+@@ -452,15 +506,15 @@ int CalendarDataBase::insertDataSlot(const MarkInfo &info)
+ QString startDateStr = info.m_markStartDate.toString("yyyy-MM-dd");
+ QString endDateStr = info.m_markEndDate.toString("yyyy-MM-dd");
+ int day = info.day;
+- int month= info.month;
++ int month = info.month;
+ int hour = info.hour;
+
+ int minute = info.minute;
+ int end_hour = info.end_hour;
+- int end_minute =info.end_minute;
++ int end_minute = info.end_minute;
+ int end_day = info.end_day;
+ int end_month = info.end_month;
+- QString longtime=info.timeLong;
++ QString longtime = info.timeLong;
+ QString descript = info.m_descript;
+ QString remind = info.remind;
+ QString repeat = info.repeat;
+@@ -471,23 +525,26 @@ int CalendarDataBase::insertDataSlot(const MarkInfo &info)
+ bool isAllDay = info.m_isAllDay;
+ bool isLunar = info.m_isLunar;
+ QString alldayremind = info.AlldayRemind;
+- QString cmd = QString("insert into Schedule (%1) values('%2','%3','%4','%5','%6','%7','%8','%9','%10','%11','%12','%13','%14','%15','%16','%17','%18','%19','%20','%21','%22')")
+- .arg(ITEM_FIELD)
+- .arg(uniqueId)
+- .arg(day)
+- .arg(month)
+- .arg(hour)
+- .arg(minute)
+- .arg(end_hour)
+- .arg(end_minute)
+- .arg(end_day)
+- .arg(end_month).arg(descript).arg(startDateStr).arg(endDateStr).arg(remind).arg(repeat).arg(beginrepeat).arg(endrepeat.toString(Qt::ISODate)).arg(beginDateTime.toString(Qt::ISODate)).arg(endDateTime.toString(Qt::ISODate)).arg(isAllDay).arg(isLunar).arg(alldayremind);
++ QString cmd = QString("insert into Schedule (%1) values('%2','%3','%4','%5','%6','%7','%8','%9','%10','%11','%12','%13','%14','%15','%16','%17','%18','%19','%20','%21','%22')")
++ .arg(ITEM_FIELD)
++ .arg(uniqueId)
++ .arg(day)
++ .arg(month)
++ .arg(hour)
++ .arg(minute)
++ .arg(end_hour)
++ .arg(end_minute)
++ .arg(end_day)
++ .arg(end_month).arg(descript).arg(startDateStr).arg(endDateStr).arg(remind).arg(repeat).arg(beginrepeat).arg(endrepeat.toString(Qt::ISODate)).arg(beginDateTime.toString(Qt::ISODate)).arg(endDateTime.toString(Qt::ISODate)).arg(isAllDay).arg(isLunar).arg(alldayremind);
+ QSqlQuery query;
+- if (!query.exec(cmd)) {
++ if (!query.exec(cmd))
++ {
+ qDebug() << "query error :" << query.lastError();
+ m_dbStatus = DB_OP_ADD_FAILED;
+ return DB_OP_ADD_FAILED;
+- } else {
++ }
++ else
++ {
+ qDebug() << "插入成功!";
+ m_dbStatus = DB_OP_SUCC;
+ return DB_OP_SUCC;
+@@ -498,7 +555,7 @@ int CalendarDataBase::insertDataSlot(const MarkInfo &info)
+ int CalendarDataBase::searchDataSlot(const QDate &date)
+ {
+ QString startDateStr = date.toString("yyyy-MM-dd");
+-// int begin_day = ;
++ // int begin_day = ;
+ QString searchId;
+ QDate startDate;
+ QDate endDate;
+@@ -518,35 +575,42 @@ int CalendarDataBase::searchDataSlot(const QDate &date)
+ bool isAllDay;
+ bool isLunar;
+ MarkInfo resultInfo;
+- if (!m_dataBase.open()) { //如果数据库打开失败，会弹出一个警告窗口;由于此类非指针类型因此是0
++ if (!m_dataBase.open()) //如果数据库打开失败，会弹出一个警告窗口;由于此类非指针类型因此是0
++ {
+
+ QMessageBox::warning(0, QObject::tr("Database Error"), m_dataBase.lastError().text());
+ m_dbStatus = DB_UNCONNECT;
+ return DB_UNCONNECT;
+
+- } else {
++ }
++ else
++ {
+ //日程的展示需要的是开始时间-结束时间 时长 内容 例如09:30-10:00 30分钟 讨论会
+ QString searchCmd =
+ QString("select id,start_date,start_hour,start_minute,end_hour,end_minute,descript,remind,repeat,beginrepeat,endrepeat,beginDateTime,endDateTime,isAllDay,isLunar,end_date,allDayremind from Schedule where start_date = '%1'").arg(startDateStr);
+ QSqlQuery searchQuery;
+ searchQuery.exec(searchCmd);
+- if (!searchQuery.exec(searchCmd)) {
++ if (!searchQuery.exec(searchCmd))
++ {
+ qDebug() << "query error :" << searchQuery.lastError();
+ m_dbStatus = DB_OP_GET_FAILED;
+ return DB_OP_GET_FAILED;
+
+- } else {
++ }
++ else
++ {
+ m_markIdList.clear();
+ m_markInfoList.clear();
+- while (searchQuery.next()) {
++ while (searchQuery.next())
++ {
+ searchId = searchQuery.value(0).toString();
+ startDate = searchQuery.value(1).toDate();
+ start_hour = searchQuery.value(2).toInt(); //9
+ start_minute = searchQuery.value(3).toInt(); //30
+ end_hour = searchQuery.value(4).toInt(); //10
+ end_minute = searchQuery.value(5).toInt(); //0
+- timeLong = handleTimeLong(intToTime(start_hour,start_minute),intToTime(end_hour,end_minute));
+-// endDate = searchQuery.value(2).toDate();
++ timeLong = handleTimeLong(intToTime(start_hour, start_minute), intToTime(end_hour, end_minute));
++ // endDate = searchQuery.value(2).toDate();
+ descript = searchQuery.value(6).toString();
+ remind = searchQuery.value(7).toString();
+ repeat = searchQuery.value(8).toString();
+@@ -559,14 +623,14 @@ int CalendarDataBase::searchDataSlot(const QDate &date)
+
+ endDate = searchQuery.value(15).toDate();
+ alldayremind = searchQuery.value(16).toString();
+- resultInfo.m_markId= searchId;
+- resultInfo.m_markStartDate=startDate;
++ resultInfo.m_markId = searchId;
++ resultInfo.m_markStartDate = startDate;
+ resultInfo.hour = start_hour;
+ resultInfo.minute = start_minute;
+ resultInfo.end_hour = end_hour;
+ resultInfo.end_minute = end_minute;
+ resultInfo.timeLong = timeLong;
+- resultInfo.m_descript=descript;
++ resultInfo.m_descript = descript;
+ resultInfo.remind = remind;
+ resultInfo.repeat = repeat;
+ resultInfo.beginrepeat = beginrepeat;
+@@ -574,19 +638,22 @@ int CalendarDataBase::searchDataSlot(const QDate &date)
+ resultInfo.beginDateTime = beginDateTime;
+ resultInfo.endDateTime = endDateTime;
+ resultInfo.m_isAllDay = isAllDay;
+- resultInfo.m_isLunar=isLunar;
++ resultInfo.m_isLunar = isLunar;
+ resultInfo.m_markEndDate = endDate;
+ resultInfo.AlldayRemind = alldayremind;
+
+ m_markIdList.append(searchId);
+ m_markInfoList.append(resultInfo);
+ }
+- qDebug()<<m_markIdList;
+- if (searchId != "") {
++ qDebug() << m_markIdList;
++ if (searchId != "")
++ {
+ qDebug() << "找到符合条件的id一共有" << m_markIdList.count() << "条数据";
+ m_dbStatus = DB_OP_SUCC;
+ return DB_OP_SUCC;
+- } else {
++ }
++ else
++ {
+ m_dbStatus = DB_OP_GET_FAILED;
+ return DB_OP_GET_FAILED;
+ }
+@@ -597,29 +664,38 @@ int CalendarDataBase::searchDataSlot(const QDate &date)
+ int CalendarDataBase::deleteDataSlot(const MarkInfo &info)
+ {
+ QString markId = info.m_markId;
+- if (!m_dataBase.open()) { //如果数据库打开失败，会弹出一个警告窗口;由于此类非指针类型因此是0
++ if (!m_dataBase.open()) //如果数据库打开失败，会弹出一个警告窗口;由于此类非指针类型因此是0
++ {
+
+ QMessageBox::warning(0, QObject::tr("Database Error"), m_dataBase.lastError().text());
+ m_dbStatus = DB_UNCONNECT;
+ return DB_UNCONNECT;
+
+- } else {
++ }
++ else
++ {
+
+- if (markId != "") {
++ if (markId != "")
++ {
+
+ QString cmd = QString("delete from Schedule where id = '%1'").arg(markId);
+ QSqlQuery query;
+- if (!query.exec(cmd)) {
++ if (!query.exec(cmd))
++ {
+ qDebug() << "query error :" << query.lastError();
+ m_dbStatus = DB_OP_DEL_FAILED;
+ return DB_OP_DEL_FAILED;
+- } else {
++ }
++ else
++ {
+ qDebug() << "删除成功!";
+ m_dbStatus = DB_OP_SUCC;
+ return DB_OP_SUCC;
+ }
+
+- } else {
++ }
++ else
++ {
+
+ m_dbStatus = SCHEDULE_UNFOUND;
+ return SCHEDULE_UNFOUND;
+@@ -638,11 +714,11 @@ int CalendarDataBase::updateDataSlot(const MarkInfo &info)
+ QString startDateStr = info.m_markStartDate.toString("yyyy-MM-dd");
+ QString endDateStr = info.m_markEndDate.toString("yyyy-MM-dd");
+ int day = info.day;
+- int month= info.month;
++ int month = info.month;
+ int hour = info.hour;
+ int minute = info.minute;
+ int end_hour = info.end_hour;
+- int end_minute =info.end_minute;
++ int end_minute = info.end_minute;
+ int end_day = info.end_day;
+ int end_month = info.end_month;
+ QString descript = info.m_descript;
+@@ -656,39 +732,48 @@ int CalendarDataBase::updateDataSlot(const MarkInfo &info)
+ bool isAllDay = info.m_isAllDay;
+ bool isLunar = info.m_isLunar;
+
+- QString alldayremind =info.AlldayRemind;
+- if (!m_dataBase.open()) { //如果数据库打开失败，会弹出一个警告窗口;由于此类非指针类型因此是0
++ QString alldayremind = info.AlldayRemind;
++ if (!m_dataBase.open()) //如果数据库打开失败，会弹出一个警告窗口;由于此类非指针类型因此是0
++ {
+ QMessageBox::warning(0, QObject::tr("Database Error"), m_dataBase.lastError().text());
+ m_dbStatus = DB_UNCONNECT;
+ return DB_UNCONNECT;
+- } else {
+- if (uniqueId != "") {
++ }
++ else
++ {
++ if (uniqueId != "")
++ {
+ QString cmd =
+ QString("update Schedule set start_day='%1',start_month='%2',start_hour='%3',start_minute='%4',end_hour='%5',end_minute='%6',end_day='%7',end_month='%8',descript='%9',start_date='%10',end_date='%11',remind='%12',repeat='%13',beginrepeat='%14',endrepeat='%15',beginDateTime='%16',endDateTime='%17',isAllDay='%18',isLunar='%19',allDayremind='%20' where id = '%21'")
+- .arg(day)
+- .arg(month)
+- .arg(hour)
+- .arg(minute)
+- .arg(end_hour)
+- .arg(end_minute)
+- .arg(end_day)
+- .arg(end_month)
+- .arg(descript)
+- .arg(startDateStr).arg(endDateStr).arg(remind).arg(repeat).arg(beginrepeat).arg(endrepeat.toString(Qt::ISODate)).arg(beginDateTime.toString(Qt::ISODate)).arg(endDateTime.toString(Qt::ISODate)).arg(isAllDay).arg(isLunar).arg(alldayremind)
+- .arg(uniqueId);
+- qDebug()<<"cmd:"<<cmd;
++ .arg(day)
++ .arg(month)
++ .arg(hour)
++ .arg(minute)
++ .arg(end_hour)
++ .arg(end_minute)
++ .arg(end_day)
++ .arg(end_month)
++ .arg(descript)
++ .arg(startDateStr).arg(endDateStr).arg(remind).arg(repeat).arg(beginrepeat).arg(endrepeat.toString(Qt::ISODate)).arg(beginDateTime.toString(Qt::ISODate)).arg(endDateTime.toString(Qt::ISODate)).arg(isAllDay).arg(isLunar).arg(alldayremind)
++ .arg(uniqueId);
++ qDebug() << "cmd:" << cmd;
+ QSqlQuery query;
+- if (!query.exec(cmd)) {
++ if (!query.exec(cmd))
++ {
+ qDebug() << "query error :" << query.lastError();
+ m_dbStatus = DB_OP_ALTER_FAILED;
+ return DB_OP_ALTER_FAILED;
+- } else {
++ }
++ else
++ {
+ qDebug() << "修改成功!";
+ m_dbStatus = DB_OP_SUCC;
+ return DB_OP_SUCC;
+ }
+
+- } else {
++ }
++ else
++ {
+
+ m_dbStatus = SCHEDULE_UNFOUND;
+ return SCHEDULE_UNFOUND;
+@@ -701,7 +786,8 @@ int CalendarDataBase::updateDataSlot(const MarkInfo &info)
+ * @return 将得到的数据库内容转换成crontab格式 如果要添加日程id 可以在最后加一个#id
+ * 类似于* * * * * command #123 这样123不会影响正常cron服务，以后直接判断#后面的id 就删除单行
+ */
+-QString CalendarDataBase::convertToCronFormat(const QSqlRecord &record) {
++QString CalendarDataBase::convertToCronFormat(const QSqlRecord &record)
++{
+ QString minute = record.value("minute").toString();
+ QString hour = record.value("hour").toString();
+ QString dayOfMonth = record.value("day_of_month").toString();
+@@ -730,18 +816,23 @@ QString CalendarDataBase::convertToCronFormat(const QSqlRecord &record) {
+ * @brief CalendarDataBase::getAllCronJobs
+ * @return 获取所有的数据
+ */
+-QStringList CalendarDataBase::getAllCronJobs() {
++QStringList CalendarDataBase::getAllCronJobs()
++{
+ QSqlQuery query;
+ QString selectCronJobsStr = "SELECT start_time, end_time, start_date, end_date, command FROM Schedule;";
+ query.prepare(selectCronJobsStr);
+
+- if (!query.exec()) {
++ if (!query.exec())
++ {
+ qDebug() << "查询cron作业失败!";
+ m_dbStatus = CREATE_TABLE_FAILED;
+ return QStringList(); //返回一个空的
+- } else {
++ }
++ else
++ {
+ QStringList cronJobs;
+- while (query.next()) {
++ while (query.next())
++ {
+ QString cronJob = convertToCronFormat(query.record());
+ cronJobs.append(cronJob);
+ }
+@@ -778,7 +869,8 @@ QList<MarkInfo> CalendarDataBase::getMarkInfoList()
+ CalendarDataBase::~CalendarDataBase()
+ {
+ qDebug() << "析构RecorderDataBase";
+- if (m_dataBase.open()) {
++ if (m_dataBase.open())
++ {
+ m_dataBase.close();
+ }
+ }
+@@ -802,30 +894,35 @@ QTime CalendarDataBase::intToTime(int hour, int minute)
+ QString CalendarDataBase::handleTimeLong(QTime time1, QTime time2)
+ {
+ //确保结束时间大于开始时间
+- if (time1 > time2) {
++ if (time1 > time2)
++ {
+ QTime temp = time1;
+ time1 = time2;
+ time2 = temp;
+ }
+ // 计算时间差（以毫秒为单位）
+- int msecs = time1.msecsTo(time2);
+- // 转换为小时和分钟
+- int hours = msecs / (1000 * 60 * 60);
+- int mins = (msecs % (1000 * 60 * 60)) / (1000 * 60);
+- QString hour = QString::number(hours);
+- QString min = QString::number(mins);
+-// QString result = hour + "小时" + min +"分钟";
+- //构造结果字符串
+- QString result;
+- if (hours > 0) {
+- result = hour + tr("hour") + min + tr("minute");
+- } else {
+- result = min + tr("minute");
+- }
+- if(mins == 0){
+- result = hour + tr("hour");
+- }
+- return result;
++ int msecs = time1.msecsTo(time2);
++ // 转换为小时和分钟
++ int hours = msecs / (1000 * 60 * 60);
++ int mins = (msecs % (1000 * 60 * 60)) / (1000 * 60);
++ QString hour = QString::number(hours);
++ QString min = QString::number(mins);
++ // QString result = hour + "小时" + min +"分钟";
++ //构造结果字符串
++ QString result;
++ if (hours > 0)
++ {
++ result = hour + tr("hour") + min + tr("minute");
++ }
++ else
++ {
++ result = min + tr("minute");
++ }
++ if(mins == 0)
++ {
++ result = hour + tr("hour");
++ }
++ return result;
+ }
+ QStringList CalendarDataBase::getIdList()
+ {
+@@ -838,3 +935,44 @@ QList<MarkInfo> CalendarDataBase::getInfoList()
+ void CalendarDataBase::addShell()
+ {
+ }
++int CalendarDataBase::deleteDataSlotfromMarkID(QString markID)
++{
++ QString markId = markID;
++ if (!m_dataBase.open()) //如果数据库打开失败，会弹出一个警告窗口;由于此类非指针类型因此是0
++ {
++
++ QMessageBox::warning(0, QObject::tr("Database Error"), m_dataBase.lastError().text());
++ m_dbStatus = DB_UNCONNECT;
++ return DB_UNCONNECT;
++
++ }
++ else
++ {
++
++ if (markId != "")
++ {
++
++ QString cmd = QString("delete from Schedule where id = '%1'").arg(markId);
++ QSqlQuery query;
++ if (!query.exec(cmd))
++ {
++ qDebug() << "query error :" << query.lastError();
++ m_dbStatus = DB_OP_DEL_FAILED;
++ return DB_OP_DEL_FAILED;
++ }
++ else
++ {
++ qDebug() << "删除成功!";
++ m_dbStatus = DB_OP_SUCC;
++ return DB_OP_SUCC;
++ }
++
++ }
++ else
++ {
++
++ m_dbStatus = SCHEDULE_UNFOUND;
++ return SCHEDULE_UNFOUND;
++ }
++ }
++}
+diff --git a/lunarcalendarwidget/calendardatabase.h b/lunarcalendarwidget/calendardatabase.h
+index 6c70f6c..a009d2e 100644
+--- a/lunarcalendarwidget/calendardatabase.h
++++ b/lunarcalendarwidget/calendardatabase.h
+@@ -18,7 +18,8 @@ const QString ITEM_FIELD = "id,start_day,start_month,start_hour,start_minute,"
+ "remind,repeat,beginrepeat,endrepeat,beginDateTime,endDateTime,"
+ "isAllDay,isLunar,allDayremind"; //数据库字段
+ #define DATABASE_INSTANCE (CalendarDataBase::getInstance())
+-enum DB_RETURN_STATUS { //数据库操作结果返回表
++enum DB_RETURN_STATUS //数据库操作结果返回表
++{
+ DB_OP_SUCC = (0), //数据库操作成功
+ DB_UNCONNECT = (-1), //数据库连接失败导致的错误
+ INVALID_INPUT = (-2), //无效的输入值
+@@ -61,7 +62,7 @@ public:
+ void processExpiredEvents(const QString& expiredIds);
+ QStringList getCurrentCrontab();
+ void updateCrontabFromFile(const QString& filename);
+-// CSchceduleDlg *dlg = new CSchceduleDlg(1,QWidget,false);
++ // CSchceduleDlg *dlg = new CSchceduleDlg(1,QWidget,false);
+ DB_RETURN_STATUS getStatus(); //获取状态
+ QStringList getAllCronJobs(); //获取当前数据库里面每一行 然后转换成crontab形式
+ QString convertToCronFormat(const QSqlRecord &record); //格式转换
+@@ -69,8 +70,8 @@ public:
+ QStringList getMarkIdList(); //获取日程条Id列表
+ MarkInfo getMarkInfo(); //设置信息结构体
+ QList<MarkInfo> getMarkInfoList(); //设置日程条信息结构体列表
+- QTime intToTime(int hour ,int minute); //处理int 转换成时间的函数
+- QString handleTimeLong(QTime time1,QTime time2); //计算两个Time的时长 用来显示日程用
++ QTime intToTime(int hour, int minute); //处理int 转换成时间的函数
++ QString handleTimeLong(QTime time1, QTime time2); //计算两个Time的时长 用来显示日程用
+ void add(const MarkInfo &info); //增加日程在crontab
+ void update(const MarkInfo &info); //更新日程在crontab
+ void del(const MarkInfo &info); //删除日程在crontab
+@@ -90,6 +91,7 @@ public slots:
+ int deleteDataSlot(const MarkInfo &info);
+ int searchDataSlot(const QDate &date);
+ int updateDataSlot(const MarkInfo &info);
++ int deleteDataSlotfromMarkID(QString markID);
+
+ signals:
+
+diff --git a/lunarcalendarwidget/notificationsadaptor.cpp b/lunarcalendarwidget/notificationsadaptor.cpp
+index d0fed88..ba930fe 100644
+--- a/lunarcalendarwidget/notificationsadaptor.cpp
++++ b/lunarcalendarwidget/notificationsadaptor.cpp
+@@ -37,13 +37,13 @@ static const QString NotificationsDBusPath = "/org/ukui/calendar/Notifications";
+ NotificationsAdaptor::NotificationsAdaptor(QObject *parent) : QDBusAbstractAdaptor(parent)
+ {
+ // constructor
+-// this->parent() = parent;
++ // this->parent() = parent;
+ setAutoRelaySignals(true);
+ QDBusConnection connection = QDBusConnection::sessionBus();
+ connection.interface()->registerService(
+- NotificationsDBusService,
+- QDBusConnectionInterface::ReplaceExistingService,
+- QDBusConnectionInterface::AllowReplacement);
++ NotificationsDBusService,
++ QDBusConnectionInterface::ReplaceExistingService,
++ QDBusConnectionInterface::AllowReplacement);
+ connection.registerObject(NotificationsDBusPath, this);
+ }
+ NotificationsAdaptor::~NotificationsAdaptor()
+@@ -63,67 +63,77 @@ NotificationsAdaptor::~NotificationsAdaptor()
+ * @param markId id QDateTime::currentDateTime().toString("yyyyMMddhhmmss");获取
+ * @return
+ */
+-void NotificationsAdaptor::ScheduleNotification(int hour, int minute, int day, int month,int year,int end_minute,int end_hour, const QString m_descript)
++void NotificationsAdaptor::ScheduleNotification(int hour, int minute, int day, int month, int year, int end_minute, int end_hour, const QString m_descript)
+ {
+ //2024.7.12日程新需求 31068 如果开始时间结束时间都是空 按照全天处理
+- qDebug()<<"开始通过Dbus添加到日程";
+-// display = getenv("DISPLAY");
+-// userName = getenv("USER"); //获取当前用户名
+-// xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
++ qDebug() << "开始通过Dbus添加到日程";
++ // display = getenv("DISPLAY");
++ // userName = getenv("USER"); //获取当前用户名
++ // xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
+ MarkInfo info;
+ QDate beginDate(year, month, day);
+ info.m_markId = QDateTime::currentDateTime().toString("yyyyMMddhhmmss");
+ info.m_descript = m_descript;
+- info.minute= info.Alarm_end_minute = minute;
+- info.hour= info.Alarm_end_hour= hour;
++ info.minute = info.Alarm_end_minute = minute;
++ info.hour = info.Alarm_end_hour = hour;
+ info.day = day;
+ info.week = beginDate.dayOfWeek();
+ info.month = month;
+ info.m_markStartDate = beginDate;
+- if(hour <= 12){
++ if(hour <= 12)
++ {
+ info.shangwu = tr("morning");
+- }else{
++ }
++ else
++ {
+ info.shangwu = tr("afternoon");
+ }
+-// info.shangwu = shangwu;
++ // info.shangwu = shangwu;
+ info.end_hour = end_hour;
+- info.end_minute=end_minute;
+- if(hour == 0 && minute ==0 && end_hour == 0 && end_minute == 0 ||hour == 0 && minute ==0 || end_hour == 0 && end_minute == 0 ){
++ info.end_minute = end_minute;
++ if(hour == 0 && minute == 0 && end_hour == 0 && end_minute == 0 || hour == 0 && minute == 0 || end_hour == 0 && end_minute == 0 )
++ {
+ info.m_isAllDay = true;
+ CalendarDataBase::getInstance().AlarmType = 10;
+-// info.remind=tr("At 9am on the same day of the schedule");
+- info.AlldayRemind=tr("At 9am on the same day of the schedule");
+- info.hour = info.Alarm_end_hour= 0;
+- info.minute= info.Alarm_end_minute = 0;
++ // info.remind=tr("At 9am on the same day of the schedule");
++ info.AlldayRemind = tr("At 9am on the same day of the schedule");
++ info.hour = info.Alarm_end_hour = 0;
++ info.minute = info.Alarm_end_minute = 0;
+ info.end_hour = 23;
+ info.end_minute = 59;
+- }else{
+- info.m_isAllDay = false;
+- CalendarDataBase::getInstance().AlarmType = 1;
+- info.remind=tr("Schedule Begin");
+ }
+-// QDate date(QDate::currentDate().year(),month,day);//仅仅适合今年
+-// info.m_markStartDate=date;
+-// info.m_markEndDate=QDate::currentDate();
++ else
++ {
++ info.m_isAllDay = false;
++ CalendarDataBase::getInstance().AlarmType = 1;
++ info.remind = tr("Schedule Begin");
++ }
++ // QDate date(QDate::currentDate().year(),month,day);//仅仅适合今年
++ // info.m_markStartDate=date;
++ // info.m_markEndDate=QDate::currentDate();
+
+- info.end_day=0;
+- info.end_month=0;
+- info.timeLong="";
+-// info.remind=tr("Schedule Begin");
+- info.repeat=tr("No Repeat");
+- info.beginrepeat="";
+- info.endrepeat= QDateTime::currentDateTime();
++ info.end_day = 0;
++ info.end_month = 0;
++ info.timeLong = "";
++ // info.remind=tr("Schedule Begin");
++ info.repeat = tr("No Repeat");
++ info.beginrepeat = "";
++ info.endrepeat = QDateTime::currentDateTime();
+ info.beginDateTime = QDateTime(beginDate);
+- info.endDateTime= QDateTime::currentDateTime();
++ info.endDateTime = QDateTime::currentDateTime();
+
+ info.m_isLunar = false;
+-// info.AlldayRemind="";
++ // info.AlldayRemind="";
+ CalendarDataBase::getInstance().add(info);
+ CalendarDataBase::getInstance().insertDataSlot(info);
+- qDebug()<<"通过Dbus添加成功了";
++ qDebug() << "通过Dbus添加成功了";
+ }
+
+ void NotificationsAdaptor::OpenSchedule(int day, int month, int year)
+ {
+- Q_EMIT dayWantToChange(day,month,year);
++ Q_EMIT dayWantToChange(day, month, year);
++}
++void NotificationsAdaptor::DeleteSchedule(QString markid)
++{
++ CalendarDataBase::getInstance().deleteDataSlotfromMarkID(markid);
+ }
+diff --git a/lunarcalendarwidget/notificationsadaptor.h b/lunarcalendarwidget/notificationsadaptor.h
+index b5ec185..de0ee45 100644
+--- a/lunarcalendarwidget/notificationsadaptor.h
++++ b/lunarcalendarwidget/notificationsadaptor.h
+@@ -41,23 +41,26 @@ class NotificationsAdaptor : public QDBusAbstractAdaptor
+ Q_CLASSINFO("D-Bus Interface", "org.ukui.calendar.Notifications")
+ Q_CLASSINFO(
+ "D-Bus Introspection",
+- "<interface name=\"org.ukui.calendar.Notifications\">\n"
+- " <method name=\"ScheduleNotification\">\n"
+- " <arg direction=\"in\" type=\"i\" name=\"hour\"/>\n"
+- " <arg direction=\"in\" type=\"i\" name=\"minute\"/>\n"
+- " <arg direction=\"in\" type=\"i\" name=\"day\"/>\n"
+- " <arg direction=\"in\" type=\"i\" name=\"month\"/>\n"
+- " <arg direction=\"in\" type=\"i\" name=\"year\"/>\n"
+- " <arg direction=\"in\" type=\"i\" name=\"end_minute\"/>\n"
+- " <arg direction=\"in\" type=\"i\" name=\"end_hour\"/>\n"
+- " <arg direction=\"in\" type=\"s\" name=\"m_descript\"/>\n"
+- " </method>\n"
+- " <method name=\"OpenSchedule\">\n"
+- " <arg direction=\"in\" type=\"i\" name=\"day\"/>\n"
+- " <arg direction=\"in\" type=\"i\" name=\"month\"/>\n"
+- " <arg direction=\"in\" type=\"i\" name=\"year\"/>\n"
+- " </method>\n"
+- "</interface>\n"
++ "<interface name=\"org.ukui.calendar.Notifications\">\n"
++ " <method name=\"ScheduleNotification\">\n"
++ " <arg direction=\"in\" type=\"i\" name=\"hour\"/>\n"
++ " <arg direction=\"in\" type=\"i\" name=\"minute\"/>\n"
++ " <arg direction=\"in\" type=\"i\" name=\"day\"/>\n"
++ " <arg direction=\"in\" type=\"i\" name=\"month\"/>\n"
++ " <arg direction=\"in\" type=\"i\" name=\"year\"/>\n"
++ " <arg direction=\"in\" type=\"i\" name=\"end_minute\"/>\n"
++ " <arg direction=\"in\" type=\"i\" name=\"end_hour\"/>\n"
++ " <arg direction=\"in\" type=\"s\" name=\"m_descript\"/>\n"
++ " </method>\n"
++ " <method name=\"OpenSchedule\">\n"
++ " <arg direction=\"in\" type=\"i\" name=\"day\"/>\n"
++ " <arg direction=\"in\" type=\"i\" name=\"month\"/>\n"
++ " <arg direction=\"in\" type=\"i\" name=\"year\"/>\n"
++ " </method>\n"
++ " <method name=\"DeleteSchedule\">\n"
++ " <arg direction=\"in\" type=\"s\" name=\"markid\"/>\n"
++ " </method>\n"
++ "</interface>\n"
+ )
+ public:
+ NotificationsAdaptor(QObject *parent);
+@@ -68,8 +71,9 @@ public:
+ public:
+ void changeWidowpos(bool restore = false);// PROPERTIES
+ public Q_SLOTS: // METHODS
+- void ScheduleNotification(int hour, int minute, int day, int month,int year,int end_minute,int end_hour, const QString m_descript);
+- void OpenSchedule(int day,int month,int year);
++ void ScheduleNotification(int hour, int minute, int day, int month, int year, int end_minute, int end_hour, const QString m_descript);
++ void OpenSchedule(int day, int month, int year);
++ void DeleteSchedule(QString markid);
+ Q_SIGNALS:
+ void isShow(bool isV);
+ void dayWantToChange(int day, int month, int year);
diff -Nru kylin-calendar-4.10.0.0/debian/patches/0039-41.patch kylin-calendar-4.10.0.0/debian/patches/0039-41.patch
--- kylin-calendar-4.10.0.0/debian/patches/0039-41.patch 1970-01-01 08:00:00.000000000 +0800
+++ kylin-calendar-4.10.0.0/debian/patches/0039-41.patch 2024-12-16 10:12:04.000000000 +0800
@@ -0,0 +1,3963 @@
+From: =?utf-8?b?6JKL6IOc6L6+?= <jiangshengda@kylinos.cn>
+Date: Fri, 20 Sep 2024 08:07:10 +0000
+Subject: =?utf-8?b?ITQxIOS/ruWkjeaXtumXtOWtl+S9k+i/h+Wwj+mXrumimCBNZXJnZSBw?=
+ =?utf-8?b?dWxsIHJlcXVlc3QgITQxIGZyb20g6LS+5aiBL29wZW5reWxpbi9uaWxl?=
+
+---
+ lunarcalendarwidget/lunarcalendarwidget.cpp | 2139 +++++++++++++++++----------
+ 1 file changed, 1323 insertions(+), 816 deletions(-)
+
+diff --git a/lunarcalendarwidget/lunarcalendarwidget.cpp b/lunarcalendarwidget/lunarcalendarwidget.cpp
+index 17dff6a..fc99e7a 100644
+--- a/lunarcalendarwidget/lunarcalendarwidget.cpp
++++ b/lunarcalendarwidget/lunarcalendarwidget.cpp
+@@ -112,17 +112,21 @@ LunarCalendarWidget::LunarCalendarWidget(QWidget *parent) : QWidget(parent)
+ analysisWorktimeJs();
+ int res;
+ res = DATABASE_INSTANCE.initDataBase();
+- if (res != DB_OP_SUCC) {
++ if (res != DB_OP_SUCC)
++ {
+ qDebug() << "数据库加载失败" << __FILE__ << "," << __FUNCTION__ << "," << __LINE__;
+ }
+ CalendarDataBase::getInstance().deleteschedule();//删除已经过期的日程
+
+ CalendarDataBase::getInstance().searchDataSlot(date);
+ updateAllSchedule();
+- if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland") {
++ if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland")
++ {
+ // qputenv("QT_QPA_PLATFORM", "wayland"); //openKylin
+ isWayland = true;
+- } else {
++ }
++ else
++ {
+ isWayland = false;
+ }
+ btnYear = new QPushButton;
+@@ -136,18 +140,20 @@ LunarCalendarWidget::LunarCalendarWidget(QWidget *parent) : QWidget(parent)
+ widgetTime = new QWidget();
+ m_verLayoutTopLeft = new QVBoxLayout(widgetTime);
+ datelabel = new QLabel(this);
+- datelabel->setFixedSize(290,30);
++ datelabel->setFixedSize(290, 30);
+ timelabel = new QLabel(this);
+- timelabel->setFixedSize(290,35);
++ timelabel->setFixedSize(290, 35);
+ lunarlabel = new QLabel(this);
+ screen = QApplication::primaryScreen();
+ primaryScreenHeight = qApp->screenAt(QCursor::pos())->size().height() + qApp->screenAt(QCursor::pos())->geometry().y();
+ initGsettings();
+ QString vertical = "#666666";
+ QString hover = "#ffffff";
+- if (styleGsettings != nullptr) {
++ if (styleGsettings != nullptr)
++ {
+ QString currentTheme = styleGsettings->get(COLOR_THEME).toString();
+- if(currentTheme == "ukui-light"){
++ if(currentTheme == "ukui-light")
++ {
+ vertical = "#ffffff";
+ hover = "#999999";
+ }
+@@ -187,51 +193,61 @@ LunarCalendarWidget::LunarCalendarWidget(QWidget *parent) : QWidget(parent)
+ void LunarCalendarWidget::noSchedule()
+ {
+ m_scheduleWidget = new QWidget(this);
+- m_scheduleWidget->setContentsMargins(0,0,0,23);
++ m_scheduleWidget->setContentsMargins(0, 0, 0, 23);
+ m_scheduleWidget->setStyleSheet("background-color: transparent;");
+- m_scheduleWidget->setFixedSize(ORIGIN_CALENDAR_WIDTH,100);
++ m_scheduleWidget->setFixedSize(ORIGIN_CALENDAR_WIDTH, 100);
+ //scrollArea->setFixedSize(ORIGIN_CALENDAR_WIDTH, 140);
+ scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+ scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+- scheduleWidget = new schedule_item(this,false);
++ scheduleWidget = new schedule_item(this, false);
+ scheduleWidget->setStartTime("");
+ scheduleWidget->setDescription("");
+- labWidget->setContentsMargins(16,0,16,0);
+- yijiWidget->setContentsMargins(16,0,16,0);
++ labWidget->setContentsMargins(16, 0, 16, 0);
++ yijiWidget->setContentsMargins(16, 0, 16, 0);
+ item_layout->addWidget(scheduleWidget);
+ item_layout->addSpacing(2);
+ m_scheduleWidget->setLayout(item_layout);
+ scrollArea->setWidget(m_scheduleWidget);
+- if(panelHeight < this->height() || panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT || isExceedScreenHeight){
+- qDebug()<<"分辨率支持";
++ if(panelHeight < this->height() || panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT || isExceedScreenHeight)
++ {
++ qDebug() << "分辨率支持";
+ int height = qApp->screenAt(QCursor::pos())->size().height() + qApp->screenAt(QCursor::pos())->geometry().y();
+ QPoint currentPos = this->pos();
+ scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,panelHeight-SCROLLA);
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, panelHeight - SCROLLA);
+ m_scheduleWidget->setFixedHeight(100);
+ //scrollArea->setFixedSize(ORIGIN_CALENDAR_WIDTH, height*0.1);
+ scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+- this->move(currentPos.x(), SCROLLA-WIDGET_GAP);
++ this->move(currentPos.x(), SCROLLA - WIDGET_GAP);
+ isExceedScreenHeight = false;
+- }else{
++ }
++ else
++ {
+ QPoint currentPos = this->pos();
+- if(yijistate){
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
+ }
+- if(ScrollAreaNeedChange){
+- qDebug()<<"ScrollAreaNeedChange";
+- if(yijistate){
+- scrollArea->setFixedSize(420,80);
++ else
++ {
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ }
++ if(ScrollAreaNeedChange)
++ {
++ qDebug() << "ScrollAreaNeedChange";
++ if(yijistate)
++ {
++ scrollArea->setFixedSize(420, 80);
+
+- }else{
+-// scrollArea->setFixedSize(420,100);
+- scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
++ }
++ else
++ {
++ // scrollArea->setFixedSize(420,100);
++ scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+
+ }
+-// scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ // scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ this->move(currentPos.x(), panelHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP);
+ }
+ else
+@@ -239,65 +255,79 @@ void LunarCalendarWidget::noSchedule()
+ QRect rect;
+ int totalHeight = qApp->screenAt(QCursor::pos())->size().height() + qApp->screenAt(QCursor::pos())->geometry().y();//屏幕高度
+ int totalWidth = qApp->screenAt(QCursor::pos())->size().width() + qApp->screenAt(QCursor::pos())->geometry().x();
+- switch(position) {
++ switch(position)
++ {
+ case 0:
+-// this->move(currentPos.x(), panelHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP);
+-// if(yijistate){
+-// this->move(currentPos.x(), panelHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT -YIJI_HEIGHT - WIDGET_GAP);
+-// }
+-
+- if(yijistate){
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,totalHeight-panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-YIJI_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,totalHeight-panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- if(isRTLLanguage()){
+- qDebug()<<"QLocale::system().language();"<<QLocale::system().language();
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ // this->move(currentPos.x(), panelHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP);
++ // if(yijistate){
++ // this->move(currentPos.x(), panelHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT -YIJI_HEIGHT - WIDGET_GAP);
++ // }
++
++ if(yijistate)
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - YIJI_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(isRTLLanguage())
++ {
++ qDebug() << "QLocale::system().language();" << QLocale::system().language();
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 1:
+ //this->move(currentPos.x(), m_panelGsettings->get(PANEL_SIZE_KEY).toInt() + WIDGET_GAP);
+ //if(yijistate){
+ //this->move(currentPos.x(), m_panelGsettings->get(PANEL_SIZE_KEY).toInt() + WIDGET_GAP);
+ //}
+- if(yijistate){
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 2:
+- if(yijistate){
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+panelSize+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+panelSize+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + panelSize + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ else
++ {
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + panelSize + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ }
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 3:
+-// this->move(currentPos.x(), primaryScreenHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP);
+-// if(yijistate){
+-// this->move(currentPos.x(), primaryScreenHeight - this->height() - WIDGET_GAP);
+-
+-// }
+- if(yijistate){
+- rect.setRect(totalWidth-panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(totalWidth-panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ // this->move(currentPos.x(), primaryScreenHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP);
++ // if(yijistate){
++ // this->move(currentPos.x(), primaryScreenHeight - this->height() - WIDGET_GAP);
++
++ // }
++ if(yijistate)
++ {
++ rect.setRect(totalWidth - panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ rect.setRect(totalWidth - panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ default:
+ break;
+@@ -306,33 +336,33 @@ void LunarCalendarWidget::noSchedule()
+
+ }
+ m_horLayoutWidgetTop = new QHBoxLayout(this);
+- m_horLayoutWidgetTop->setContentsMargins(26,0,24,0);
++ m_horLayoutWidgetTop->setContentsMargins(26, 0, 24, 0);
+ m_horLayoutWidgetTop->addWidget(widgetTime);
+ m_horLayoutWidgetTop->addWidget(m_createScheduleButton);
+
+ m_verLayoutCalendar->setMargin(0);
+ m_verLayoutCalendar->setSpacing(0);
+ m_verLayoutCalendar->addLayout(m_horLayoutWidgetTop);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(lineUp);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(m_widgetTop);
+ m_verLayoutCalendar->addSpacing(18);
+ m_verLayoutCalendar->addWidget(widgetWeek);
+ m_verLayoutCalendar->addWidget(m_widgetDayBody, 1);
+ m_verLayoutCalendar->addWidget(widgetYearBody, 1);
+ m_verLayoutCalendar->addWidget(widgetmonthBody, 1);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(lineDown);
+ controlDownLine();
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(labWidget);
+ m_verLayoutCalendar->addWidget(yijiWidget);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ lineSchedule->setFixedHeight(1);
+
+ m_verLayoutCalendar->addWidget(lineSchedule);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(scrollArea);
+
+
+@@ -340,19 +370,22 @@ void LunarCalendarWidget::noSchedule()
+ void LunarCalendarWidget::updateFromItem(QString id)
+ {
+ QRect rect;
+- CustomMessageBox *msgBox = new CustomMessageBox(1,this);
++ CustomMessageBox *msgBox = new CustomMessageBox(1, this);
+ msgBox->SetText(tr("Are you sure you want to delete this event?"));
+ msgBox->setWindowFlags(msgBox->windowFlags() | Qt::WindowStaysOnTopHint);
+ // 获取屏幕中心点和尺寸
+ QPoint screenCenter = QApplication::desktop()->availableGeometry().center();
+ QSize dialogSize = msgBox->size();
+ // 计算对话框应显示的中心点坐标，并将其移动到屏幕中心
+-// msgBox->move(screenCenter.x() - dialogSize.width() / 2, screenCenter.y() - dialogSize.height() / 2);
+- rect.setRect(screenCenter.x() - dialogSize.width() / 2,screenCenter.y() - dialogSize.height() / 2,dialogSize.width(),dialogSize.height());
++ // msgBox->move(screenCenter.x() - dialogSize.width() / 2, screenCenter.y() - dialogSize.height() / 2);
++ rect.setRect(screenCenter.x() - dialogSize.width() / 2, screenCenter.y() - dialogSize.height() / 2, dialogSize.width(), dialogSize.height());
+
+- connect(msgBox, &CustomMessageBox::yesClicked, [&]() {
+- foreach(MarkInfo info, m_markInfoList) {
+- if (id == info.m_markId) {
++ connect(msgBox, &CustomMessageBox::yesClicked, [&]()
++ {
++ foreach(MarkInfo info, m_markInfoList)
++ {
++ if (id == info.m_markId)
++ {
+ emit DATABASE_INSTANCE.deleteDataSignal(info);
+ CalendarDataBase::getInstance().del(info);
+ updateAllSchedule();
+@@ -363,7 +396,8 @@ void LunarCalendarWidget::updateFromItem(QString id)
+ }
+ delete msgBox;
+ });
+- connect(msgBox, &CustomMessageBox::noClicked, [&]() {
++ connect(msgBox, &CustomMessageBox::noClicked, [&]()
++ {
+ delete msgBox;
+ });
+ msgBox->exec();
+@@ -377,13 +411,16 @@ void LunarCalendarWidget::twoLessSchedule()
+
+ int num = m_markInfoList.count();
+ m_scheduleWidget = new QWidget(this);
+- m_scheduleWidget->setContentsMargins(0,0,0,23);
++ m_scheduleWidget->setContentsMargins(0, 0, 0, 23);
+ m_scheduleWidget->setStyleSheet("background-color: transparent;");
+- if(num ==1){
++ if(num == 1)
++ {
+ m_scheduleWidget->setFixedHeight(107);
+ //scrollArea->setFixedSize(ORIGIN_CALENDAR_WIDTH, 140);//80是一个日程时候的日程区域高度
+ scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+- }else if(num ==2){
++ }
++ else if(num == 2)
++ {
+ m_scheduleWidget->setFixedHeight(170);
+ //scrollArea->setFixedSize(ORIGIN_CALENDAR_WIDTH, 140);//140是2个日程时候的日程区域高度
+ scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+@@ -392,20 +429,24 @@ void LunarCalendarWidget::twoLessSchedule()
+ //panelHeight 是除了任务栏之外的高度
+ QPoint currentPos = this->pos();
+ //如果需要调整滑动区域大小了 如果当前只有一个日程 无需滑动条，2个日程就需要了
+- if(ScrollAreaNeedChange){
+- qDebug()<<"ScrollAreaNeedChange";
++ if(ScrollAreaNeedChange)
++ {
++ qDebug() << "ScrollAreaNeedChange";
+
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);//根据设计稿的高度，770
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT); //根据设计稿的高度，770
+ this->move(currentPos.x(), panelHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP);
+
+- if(yijistate){
+- scrollArea->setFixedSize(420,80);
++ if(yijistate)
++ {
++ scrollArea->setFixedSize(420, 80);
+ }
+- else{
++ else
++ {
+ scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+ }
+-// scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+- if(num == 2){
++ // scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
++ if(num == 2)
++ {
+ scrollArea->verticalScrollBar()->setStyleSheet(ScrollAreaStyleSheet);
+
+ scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);//滑动条样式还没处理
+@@ -413,174 +454,205 @@ void LunarCalendarWidget::twoLessSchedule()
+ }
+ else
+ {
+- if(yijistate){
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+
+ }
+ QRect rect;
+ int totalHeight = qApp->screenAt(QCursor::pos())->size().height() + qApp->screenAt(QCursor::pos())->geometry().y();//屏幕高度
+ int totalWidth = qApp->screenAt(QCursor::pos())->size().width() + qApp->screenAt(QCursor::pos())->geometry().x();
+- switch(position) {
++ switch(position)
++ {
+ case 0:
+- if(yijistate){
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,totalHeight-panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-YIJI_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,totalHeight-panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- if(isRTLLanguage()){
+- qDebug()<<"QLocale::system().language();"<<QLocale::system().language();
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - YIJI_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(isRTLLanguage())
++ {
++ qDebug() << "QLocale::system().language();" << QLocale::system().language();
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 1:
+- if(yijistate){
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 2:
+- if(yijistate){
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+panelSize+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+panelSize+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + panelSize + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + panelSize + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 3:
+- if(yijistate){
+- rect.setRect(totalWidth-panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(totalWidth-panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ rect.setRect(totalWidth - panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ else
++ {
++ rect.setRect(totalWidth - panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ }
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ default:
+ break;
+ }
+ }
+
+- if(panelHeight < this->height() || panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT || isExceedScreenHeight){
+- if(ScrollAreaNeedChange){
+- qDebug()<<"不支持分辨率";
++ if(panelHeight < this->height() || panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT || isExceedScreenHeight)
++ {
++ if(ScrollAreaNeedChange)
++ {
++ qDebug() << "不支持分辨率";
+ }
+- else{
+- qDebug()<<"分辨率支持111";
++ else
++ {
++ qDebug() << "分辨率支持111";
+ int height = qApp->screenAt(QCursor::pos())->size().height() + qApp->screenAt(QCursor::pos())->geometry().y();
+ scrollArea->verticalScrollBar()->setStyleSheet(ScrollAreaStyleSheet);
+ QPoint currentPos = this->pos();
+ scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,panelHeight-SCROLLA);
+- m_scheduleWidget->setFixedHeight(100*num);
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, panelHeight - SCROLLA);
++ m_scheduleWidget->setFixedHeight(100 * num);
+ //scrollArea->setFixedSize(420, height*0.1);
+ scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+- this->move(currentPos.x(), SCROLLA-WIDGET_GAP);
++ this->move(currentPos.x(), SCROLLA - WIDGET_GAP);
+ isExceedScreenHeight = false;
+ }
+ }
+- foreach(info,m_markInfoList){
+- scheduleWidget = new schedule_item(this,true);
++ foreach(info, m_markInfoList)
++ {
++ scheduleWidget = new schedule_item(this, true);
+ QString time1;
+ QString time2;
+- if(timemodel == "12"){
++ if(timemodel == "12")
++ {
+ scheduleWidget->timemode = "12";
+- if(info.hour <= 12){
++ if(info.hour <= 12)
++ {
+ time1 = tr("morning");
+- }else{
++ }
++ else
++ {
+ time1 = tr("afternoon");
+- info.hour = info.hour-12;
++ info.hour = info.hour - 12;
+ // info.end_hour = info.end_hour-12;
+ }
+- if(info.end_hour < 12){
++ if(info.end_hour < 12)
++ {
+ time2 = tr("morning");
+- }else{
++ }
++ else
++ {
+ time2 = tr("afternoon");
+ // info.hour = info.hour-12;
+- info.end_hour = info.end_hour-12;
++ info.end_hour = info.end_hour - 12;
+ }
+
+- }else if(timemodel == "24"){
++ }
++ else if(timemodel == "24")
++ {
+ time1 = "";
+ time2 = "";
+ }
+
+- QString starttimeString = QString::number(info.hour)+":"+QString::number(info.minute);// 确保这是有效的格式
++ QString starttimeString = QString::number(info.hour) + ":" + QString::number(info.minute); // 确保这是有效的格式
+ QTime m_startTime = QTime::fromString(starttimeString, "h:m");
+ QString start = m_startTime.toString("hh:mm");
+- QString timeString = QString::number(info.end_hour)+":"+QString::number(info.end_minute);// 确保这是有效的格式
++ QString timeString = QString::number(info.end_hour) + ":" + QString::number(info.end_minute); // 确保这是有效的格式
+ QTime m_endTime = QTime::fromString(timeString, "h:m");
+ QString end = m_endTime.toString("hh:mm");
+
+ QString lineOne = QString(" %1%2-%3%4 ").arg(time1).arg(start).arg(time2).arg(end)
+- +info.timeLong;
+- if(info.m_isAllDay){
++ + info.timeLong;
++ if(info.m_isAllDay)
++ {
+ lineOne = tr(" allday");
+ }
+
+ scheduleWidget->setStartTime(lineOne);
+ scheduleWidget->adjustDate(this->date);
+- scheduleWidget->setEndTime(info.end_hour,info.end_minute,this->date,time2);
++ scheduleWidget->setEndTime(info.end_hour, info.end_minute, this->date, time2);
+ scheduleWidget->setDescription(info.m_descript);
+
+ scheduleWidget->setId(info.m_markId);
+- connect(scheduleWidget,&schedule_item::ScheduleClick,this,&LunarCalendarWidget::slotEditSchedule);
+- connect(scheduleWidget,&schedule_item::EditSchedule,this,&LunarCalendarWidget::slotEditSchedule);
++ connect(scheduleWidget, &schedule_item::ScheduleClick, this, &LunarCalendarWidget::slotEditSchedule);
++ connect(scheduleWidget, &schedule_item::EditSchedule, this, &LunarCalendarWidget::slotEditSchedule);
+ // connect(scheduleWidget,&schedule_item::updateSchedule1,this,&LunarCalendarWidget::updateFromItem);
+- connect(scheduleWidget,&schedule_item::updateWindow,this,&LunarCalendarWidget::updateFromItem);
++ connect(scheduleWidget, &schedule_item::updateWindow, this, &LunarCalendarWidget::updateFromItem);
+ item_layout->addWidget(scheduleWidget);
+ item_layout->addSpacing(2);
+
+ }
+- labWidget->setContentsMargins(16,0,16,0);
+- yijiWidget->setContentsMargins(16,0,16,0);
++ labWidget->setContentsMargins(16, 0, 16, 0);
++ yijiWidget->setContentsMargins(16, 0, 16, 0);
+ m_scheduleWidget->setLayout(item_layout);
+ scrollArea->setWidget(m_scheduleWidget);
+
+ m_horLayoutWidgetTop = new QHBoxLayout(this);
+- m_horLayoutWidgetTop->setContentsMargins(26,0,24,0);
++ m_horLayoutWidgetTop->setContentsMargins(26, 0, 24, 0);
+ m_horLayoutWidgetTop->addWidget(widgetTime);
+ m_horLayoutWidgetTop->addWidget(m_createScheduleButton);
+
+ m_verLayoutCalendar->setMargin(0);
+ m_verLayoutCalendar->setSpacing(0);
+ m_verLayoutCalendar->addLayout(m_horLayoutWidgetTop);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(lineUp);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(m_widgetTop);
+ m_verLayoutCalendar->addSpacing(18);
+ m_verLayoutCalendar->addWidget(widgetWeek);
+ m_verLayoutCalendar->addWidget(m_widgetDayBody, 1);
+ m_verLayoutCalendar->addWidget(widgetYearBody, 1);
+ m_verLayoutCalendar->addWidget(widgetmonthBody, 1);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(lineDown);
+ controlDownLine();
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(labWidget);
+ // if(yijistate){
+ m_verLayoutCalendar->addWidget(yijiWidget);
+ // }
+
+ //yiji框的下划线分割
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ lineSchedule->setFixedHeight(1);
+ m_verLayoutCalendar->addWidget(lineSchedule);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(scrollArea);
+ }
+ void LunarCalendarWidget::updateSchedule()
+@@ -590,7 +662,8 @@ void LunarCalendarWidget::updateSchedule()
+ scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ m_num = num;
+ //正常分辨率
+- if(!ScrollbarUnderTheResolution){
++ if(!ScrollbarUnderTheResolution)
++ {
+ if(num == 0)
+ {
+ noSchedule();
+@@ -601,13 +674,16 @@ void LunarCalendarWidget::updateSchedule()
+ {
+ twoLessSchedule();
+ }
+- else if(CalendarDataBase::getInstance().m_markInfoList.count()>2)
++ else if(CalendarDataBase::getInstance().m_markInfoList.count() > 2)
+ {
+- if(panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT){
++ if(panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
+ isExceedScreenHeight = true;
+ twoLessSchedule();
+ isExceedScreenHeight = false;
+- }else{
++ }
++ else
++ {
+ ThreeMoreSchedule();
+
+ }
+@@ -618,14 +694,14 @@ void LunarCalendarWidget::updateSchedule()
+ //极限分辨率
+ else
+ {
+- qDebug()<<"-------DisplayAtResolution";
++ qDebug() << "-------DisplayAtResolution";
+ DisplayAtResolution();
+ }
+ }
+
+ void LunarCalendarWidget::getFontInfo(QString &fontName, int &fontSize)
+ {
+- qDebug() << __FILE__ <<__FUNCTION__;
++ qDebug() << __FILE__ << __FUNCTION__;
+ fontName = m_fontName;
+ fontSize = m_fontSize;
+ }
+@@ -641,18 +717,23 @@ LunarCalendarWidget::~LunarCalendarWidget()
+
+ void LunarCalendarWidget::setColor(bool mdark_style)
+ {
+- if(mdark_style){
++ if(mdark_style)
++ {
+ weekTextColor = QColor(0, 0, 0);
+ weekBgColor = QColor(180, 180, 180);
+- if(calendar_gsettings!=nullptr){
++ if(calendar_gsettings != nullptr)
++ {
+ m_showLunar = calendar_gsettings->get(LUNAR_KEY).toString() == "lunar";
+ }
+ bgImage = ":/image/bg_calendar.png";
+ selectType = SelectType_Rect;
+- }else{
++ }
++ else
++ {
+ weekTextColor = QColor(255, 255, 255);
+ weekBgColor = QColor(0, 0, 0);
+- if(calendar_gsettings!=nullptr){
++ if(calendar_gsettings != nullptr)
++ {
+ m_showLunar = calendar_gsettings->get(LUNAR_KEY).toString() == "lunar";
+ }
+ bgImage = ":/image/bg_calendar.png";
+@@ -666,20 +747,25 @@ void LunarCalendarWidget::controlDownLine()
+ QString lang;
+ QString locale;
+ getLocale(lang, locale);
+- if((!lang.contains("zh",Qt::CaseInsensitive)) ||
+- (!locale.contains("zh",Qt::CaseInsensitive))) {
+- if(lineDown!=nullptr) {
++ if((!lang.contains("zh", Qt::CaseInsensitive)) ||
++ (!locale.contains("zh", Qt::CaseInsensitive)))
++ {
++ if(lineDown != nullptr)
++ {
+ lineDown->hide();
+ }
+ }
+- if(calendar_gsettings->get("calendar").toString() == "solarlunar") {
+- if(lineDown!=nullptr) {
++ if(calendar_gsettings->get("calendar").toString() == "solarlunar")
++ {
++ if(lineDown != nullptr)
++ {
+ lineDown->hide();
+ }
+ }
+ }
+
+-void LunarCalendarWidget::_timeUpdate() {
++void LunarCalendarWidget::_timeUpdate()
++{
+ QDateTime time = QDateTime::currentDateTime();
+ QLocale locale = (QLocale::system().name() == "zh_CN" ? (QLocale::Chinese) : (QLocale::English));
+
+@@ -687,7 +773,7 @@ void LunarCalendarWidget::_timeUpdate() {
+ QFont font(m_fontName);
+ datelabel->setText(_time);
+ font.setPixelSize(24);
+-// datelabel->setFont(font);
++ // datelabel->setFont(font);
+ QString strHoliday;
+ QString strSolarTerms;
+ QString strLunarFestival;
+@@ -695,36 +781,115 @@ void LunarCalendarWidget::_timeUpdate() {
+ QString strLunarMonth;
+ QString strLunarDay;
+
+- LunarCalendarInfo::Instance()->getLunarCalendarInfo(locale.toString(time,"yyyy").toInt(),
+- locale.toString(time,"MM").toInt(),
+- locale.toString(time,"dd").toInt(),
+- strHoliday,
+- strSolarTerms,
+- strLunarFestival,
+- strLunarYear,
+- strLunarMonth,
+- strLunarDay);
+-
+- if (QGSettings::isSchemaInstalled(QByteArray(CALENDAR_GSETTINGS_SCHEMAS))) {
++ LunarCalendarInfo::Instance()->getLunarCalendarInfo(locale.toString(time, "yyyy").toInt(),
++ locale.toString(time, "MM").toInt(),
++ locale.toString(time, "dd").toInt(),
++ strHoliday,
++ strSolarTerms,
++ strLunarFestival,
++ strLunarYear,
++ strLunarMonth,
++ strLunarDay);
++
++ if (QGSettings::isSchemaInstalled(QByteArray(CALENDAR_GSETTINGS_SCHEMAS)))
++ {
+ QGSettings(QByteArray(CALENDAR_GSETTINGS_SCHEMAS)).set(CALENDAR_LUNAR_DATE_KEY, QVariant(QString(strLunarMonth + strLunarDay)));
+ }
+
+ QString _date = SDK2CPP(kdk_system_get_longformat_date)() + " " + SDK2CPP(kdk_system_longweek)();
+- if (lunarstate) {
+- _date = _date + " "+strLunarMonth + strLunarDay;
++ if (lunarstate)
++ {
++ _date = _date + " " + strLunarMonth + strLunarDay;
++ }
++
++
++ if (style_settings != nullptr)
++ {
++ // 获取系统字体大小
++ float systemFontSize = style_settings->get(SYSTEM_FONT_SIZE).toFloat();
++
++ float systemFontSizeFloat = static_cast<float>(systemFontSize);
++ int datelabelFontSize, timelabelFontSize;
++
++ if (systemFontSizeFloat <= 10.0)
++ {
++ datelabelFontSize = 24;
++ timelabelFontSize = 14;
++ }
++ else if (systemFontSizeFloat <= 12.0)
++ {
++ datelabelFontSize = 26;
++ timelabelFontSize = 16;
++ }
++ else if (systemFontSizeFloat <= 13.5)
++ {
++ datelabelFontSize = 28;
++ timelabelFontSize = 18;
++ }
++ else if (systemFontSizeFloat <= 15.0)
++ {
++ datelabelFontSize = 30;
++ timelabelFontSize = 20;
++ }
++ else
++ {
++ datelabelFontSize = 24;
++ timelabelFontSize = 14;
++ }
++ font.setPixelSize(datelabelFontSize);
++ datelabel->setFont(font);
++ font.setPixelSize(timelabelFontSize);
++ timelabel->setFont(font);
++ // 监听系统字体变化的信号，并在变化时调整字体大小
++ connect(style_settings, &QGSettings::changed, this, [this](const QString &key)
++ {
++ if (key == SYSTEM_FONT_SIZE)
++ {
++ // 获取系统字体大小
++ float systemFontSize = style_settings->get(SYSTEM_FONT_SIZE).toFloat();
++ float systemFontSizeFloat = static_cast<float>(systemFontSize);
++ int datelabelFontSize, timelabelFontSize;
++ if (systemFontSizeFloat <= 10.0)
++ {
++ datelabelFontSize = 24;
++ timelabelFontSize = 14;
++ }
++ else if (systemFontSizeFloat <= 12.0)
++ {
++ datelabelFontSize = 26;
++ timelabelFontSize = 16;
++ }
++ else if (systemFontSizeFloat <= 13.5)
++ {
++ datelabelFontSize = 28;
++ timelabelFontSize = 18;
++ }
++ else if (systemFontSizeFloat <= 15.0)
++ {
++ datelabelFontSize = 30;
++ timelabelFontSize = 20;
++ }
++ else
++ {
++ // 默认或更大字体大小
++ datelabelFontSize = 24;
++ timelabelFontSize = 14;
++ }
++ QFont newDateLabelFont = datelabel->font();
++ QFont newTimeLabelFont = timelabel->font();
++ newDateLabelFont.setPixelSize(datelabelFontSize);
++ datelabel->setFont(newDateLabelFont);
++ newTimeLabelFont.setPixelSize(timelabelFontSize);
++ timelabel->setFont(newTimeLabelFont);
++ }
++ });
+ }
+ QFont timelabel_font;
+ QFontMetrics metrics(timelabel_font);
+ QString elided = metrics.elidedText(_date, Qt::ElideRight, 250);//250后用...省略
+ timelabel->setText(elided);
+ timelabel->setToolTip(_date);
+- font.setPixelSize(14);
+- if(isWayland)
+- {
+- font.setPointSize(12);
+- }
+-
+-// timelabel->setFont(font);
++ // timelabel->setFont(font);
+ QFont font1(m_font);
+ font1.setPixelSize(22);
+ if(isWayland)
+@@ -737,13 +902,13 @@ void LunarCalendarWidget::_timeUpdate() {
+ QFontMetrics fm(font1);
+ QFontMetrics fm2(font2);
+ int h = fm.boundingRect(datelabel->text()).height();
+- int h2=fm2.boundingRect(timelabel->text()).height();
++ int h2 = fm2.boundingRect(timelabel->text()).height();
+ datelabel->setAlignment(Qt::AlignLeft);
+ timelabel->setAlignment(Qt::AlignLeft);
+- datelabel->setFixedHeight(h+5);
+- timelabel->setFixedHeight(h2+10);
+- datelabel->setContentsMargins(0,0,0,0);
+- timelabel->setContentsMargins(0,0,0,0);
++ datelabel->setFixedHeight(h + 5);
++ timelabel->setFixedHeight(h2 + 10);
++ datelabel->setContentsMargins(0, 0, 0, 0);
++ timelabel->setContentsMargins(0, 0, 0, 0);
+
+ }
+
+@@ -783,46 +948,47 @@ void LunarCalendarWidget::initWidget()
+ m_font.setFamily(m_fontName);
+ m_font.setPixelSize(14);
+ QFont smallfont = m_font;
+- if(QLocale::system().name() != "zh_CN"){
++ if(QLocale::system().name() != "zh_CN")
++ {
+ smallfont.setPointSize(8);
+ }
+ //转到年显示
+ btnYear->setObjectName("btnYear");
+ btnYear->setFocusPolicy(Qt::NoFocus);
+ btnYear->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+-// btnYear->setFont(smallfont);
++ // btnYear->setFont(smallfont);
+ btnYear->setText(tr("Year"));
+ btnYear->setToolTip(tr("Year"));
+- btnYear->setFixedSize(56,36);
++ btnYear->setFixedSize(56, 36);
+
+ //btnYear->setStyle(new CustomStyle_pushbutton("ukui-default"));
+- connect(btnYear,&QPushButton::clicked,this,&LunarCalendarWidget::yearWidgetChange);
++ connect(btnYear, &QPushButton::clicked, this, &LunarCalendarWidget::yearWidgetChange);
+
+ //转到月显示
+ btnMonth->setObjectName("btnMonth");
+ btnMonth->setFocusPolicy(Qt::NoFocus);
+-// btnMonth->setFont(smallfont);
++ // btnMonth->setFont(smallfont);
+ btnMonth->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ btnMonth->setText(tr("Month"));
+ btnMonth->setToolTip(tr("Month"));
+- btnMonth->setFixedSize(56,36);
++ btnMonth->setFixedSize(56, 36);
+ //btnMonth->setStyle(new CustomStyle_pushbutton("ukui-default"));
+- connect(btnMonth,&QPushButton::clicked,this,&LunarCalendarWidget::monthWidgetChange);
++ connect(btnMonth, &QPushButton::clicked, this, &LunarCalendarWidget::monthWidgetChange);
+
+ //转到今天
+ btnToday->setObjectName("btnToday");
+ btnToday->setFocusPolicy(Qt::NoFocus);
+-// btnToday->setFont(smallfont);
++ // btnToday->setFont(smallfont);
+ //btnToday->setFixedWidth(40);
+ //btnToday->setStyle(new CustomStyle_pushbutton("ukui-default"));
+ btnToday->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ btnToday->setText(tr("Today"));
+ btnToday->setToolTip(tr("Today"));
+- btnToday->setFixedSize(56,36);
++ btnToday->setFixedSize(56, 36);
+
+- btnYear->setProperty("needTranslucent",true);
+- btnMonth->setProperty("needTranslucent",true);
+- btnToday->setProperty("needTranslucent",true);
++ btnYear->setProperty("needTranslucent", true);
++ btnMonth->setProperty("needTranslucent", true);
++ btnToday->setProperty("needTranslucent", true);
+ btnYear->setProperty("useButtonPalette", true);
+ btnMonth->setProperty("useButtonPalette", true);
+ btnToday->setProperty("useButtonPalette", true);
+@@ -831,21 +997,25 @@ void LunarCalendarWidget::initWidget()
+ cboxYearandMonthLabel = new QLabel();
+ cboxYearandMonthLabel->setFixedWidth(90);
+ cboxYearandMonthLabel->setFixedHeight(36);
+- if(isWayland){
++ if(isWayland)
++ {
+ cboxYearandMonthLabel->setFixedWidth(80);
+ }
+
+-// cboxYearandMonthLabel->setFont(m_font);
++ // cboxYearandMonthLabel->setFont(m_font);
+
+ //顶部横向布局
+ QHBoxLayout *layoutTop = new QHBoxLayout(m_widgetTop);
+ layoutTop->setContentsMargins(8, 0, 24, 0);
+ layoutTop->addSpacing(8);
+- if(isRTLLanguage()){
++ if(isRTLLanguage())
++ {
+ layoutTop->addWidget(btnNextYear);
+ layoutTop->addWidget(cboxYearandMonthLabel);
+ layoutTop->addWidget(btnPrevYear);
+- }else{
++ }
++ else
++ {
+ layoutTop->addWidget(btnPrevYear);
+ layoutTop->addWidget(cboxYearandMonthLabel);
+ layoutTop->addWidget(btnNextYear);
+@@ -880,7 +1050,8 @@ void LunarCalendarWidget::initWidget()
+ layoutWeek->setMargin(0);
+ layoutWeek->setSpacing(0);
+
+- for (int i = 0; i < 7; i++) {
++ for (int i = 0; i < 7; i++)
++ {
+ QLabel *lab = new QLabel;
+ lab->setObjectName(QString("WeekLabel_%1").arg(i));
+ QFont font(m_font);
+@@ -894,7 +1065,7 @@ void LunarCalendarWidget::initWidget()
+ //日期标签widget
+ m_widgetDayBody = new QWidget;
+ m_widgetDayBody->setObjectName("widgetDayBody");
+- m_widgetDayBody->setAttribute(Qt::WA_TransparentForMouseEvents,true);
++ m_widgetDayBody->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+ m_widgetDayBody->setMinimumHeight(350);
+ //日期标签布局
+ QGridLayout *layoutBodyDay = new QGridLayout(m_widgetDayBody);
+@@ -904,11 +1075,12 @@ void LunarCalendarWidget::initWidget()
+ layoutBodyDay->setVerticalSpacing(0);
+ // QDate currentDate = date;
+ //逐个添加日标签
+- for (int i = 0; i < 42; i++) {
++ for (int i = 0; i < 42; i++)
++ {
+ // QDate currentDate = date.addDays(i - date.dayOfWeek() +1);
+- LunarCalendarItem *lab = new LunarCalendarItem(m_fontName,false);
++ LunarCalendarItem *lab = new LunarCalendarItem(m_fontName, false);
+ lab->setObjectName(QString("DayLabel_%1").arg(i));
+- lab->setFixedSize(60,56);
++ lab->setFixedSize(60, 56);
+ lab->installEventFilter(this);
+ lab->worktime = worktime;
+ connect(lab, SIGNAL(clicked(QDate, LunarCalendarItem::DayType)), this, SLOT(labClicked(QDate, LunarCalendarItem::DayType)));
+@@ -920,7 +1092,7 @@ void LunarCalendarWidget::initWidget()
+ //年份标签widget
+ widgetYearBody = new QWidget;
+ widgetYearBody->setObjectName("widgetYearBody");
+- widgetYearBody->setAttribute(Qt::WA_TransparentForMouseEvents,true);
++ widgetYearBody->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+ widgetYearBody->setMinimumHeight(350);
+ //年份标签布局
+ QGridLayout *layoutBodyYear = new QGridLayout(widgetYearBody);
+@@ -929,7 +1101,8 @@ void LunarCalendarWidget::initWidget()
+ layoutBodyYear->setVerticalSpacing(0);
+
+ //逐个添加年标签
+- for (int i = 0; i < 12; i++) {
++ for (int i = 0; i < 12; i++)
++ {
+ LunarCalendarYearItem *labYear = new LunarCalendarYearItem(m_fontName);
+ labYear->setObjectName(QString("YEARLabel_%1").arg(i));
+ labYear->installEventFilter(this);
+@@ -942,7 +1115,7 @@ void LunarCalendarWidget::initWidget()
+ //月份标签widget
+ widgetmonthBody = new QWidget;
+ widgetmonthBody->setObjectName("widgetmonthBody");
+- widgetmonthBody->setAttribute(Qt::WA_TransparentForMouseEvents,true);
++ widgetmonthBody->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+ widgetmonthBody->setMinimumHeight(350);
+ //月份标签布局
+ QGridLayout *layoutBodyMonth = new QGridLayout(widgetmonthBody);
+@@ -951,7 +1124,8 @@ void LunarCalendarWidget::initWidget()
+ layoutBodyMonth->setVerticalSpacing(0);
+
+ //逐个添加月标签
+- for (int i = 0; i < 12; i++) {
++ for (int i = 0; i < 12; i++)
++ {
+ LunarCalendarMonthItem *labMonth = new LunarCalendarMonthItem(m_fontName);
+ labMonth->setObjectName(QString("MONTHLabel_%1").arg(i));
+ labMonth->installEventFilter(this);
+@@ -963,10 +1137,10 @@ void LunarCalendarWidget::initWidget()
+
+ QFont font(m_fontName);
+ font.setPixelSize(14);
+-// font.setPointSize(5);
+-// if(isWayland){
+-// font.setPointSize(12);
+-// }
++ // font.setPointSize(5);
++ // if(isWayland){
++ // font.setPointSize(12);
++ // }
+
+ labWidget = new QWidget();
+ labWidget->installEventFilter(this);
+@@ -974,16 +1148,16 @@ void LunarCalendarWidget::initWidget()
+ labBottom->installEventFilter(this);
+ yijichooseLabel = new QLabel();
+ yijichooseLabel->setText("宜忌");
+-// yijichooseLabel->setFont(font);
+-// yijichooseLabel->setFixedHeight(13);
++ // yijichooseLabel->setFont(font);
++ // yijichooseLabel->setFixedHeight(13);
+ yijichooseLabel->installEventFilter(this);
+
+-// labBottom->setFont(font);
+- labBottom->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
+-// labBottom->setFixedHeight(18);
+-// if(isWayland){
+-// labBottom->setFixedHeight(12);
+-// }
++ // labBottom->setFont(font);
++ labBottom->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
++ // labBottom->setFixedHeight(18);
++ // if(isWayland){
++ // labBottom->setFixedHeight(12);
++ // }
+ // labBottom->setFixedHeight(15);
+ yijichoose = new QCheckBox();
+ yijichoose->installEventFilter(this);
+@@ -1012,11 +1186,11 @@ void LunarCalendarWidget::initWidget()
+ //添加日程按钮
+ m_createScheduleButton = new kdk::KPushButton(this); //创建日程按钮
+ m_createScheduleButton->setText(tr("Add Schedule"));
+-// m_createScheduleButton->setStyleSheet("background-color: transparent;");
+- m_createScheduleButton->setFixedSize(96,36);
++ // m_createScheduleButton->setStyleSheet("background-color: transparent;");
++ m_createScheduleButton->setFixedSize(96, 36);
+
+
+- m_createScheduleButton->setProperty("needTranslucent",true);
++ m_createScheduleButton->setProperty("needTranslucent", true);
+ m_createScheduleButton->setProperty("useButtonPalette", true);
+
+ //主布局
+@@ -1030,53 +1204,64 @@ void LunarCalendarWidget::initWidget()
+
+ updateLayout();
+
+- connect(yijichoose,&QRadioButton::clicked,this,&LunarCalendarWidget::customButtonsClicked);
++ connect(yijichoose, &QRadioButton::clicked, this, &LunarCalendarWidget::customButtonsClicked);
+ const QByteArray style_id(CALENDAR_GSETTINGS_SCHEMAS);
+- if (QGSettings::isSchemaInstalled(style_id)) {
++ if (QGSettings::isSchemaInstalled(style_id))
++ {
+ int num = CalendarDataBase::getInstance().m_markInfoList.count();
+ yijiGsettings = new QGSettings(style_id);
+- bool currentTheme = yijiGsettings->get(YIJISTATUS).toBool();
+- yijichoose->setChecked(currentTheme);
+- if(currentTheme){
+- yiLabel->setVisible(true);
+- jiLabel->setVisible(true);
+- yijistate = true;
+- Q_EMIT yijiChangeUp(num);
+- }else{
+- yiLabel->setVisible(false);
+- jiLabel->setVisible(false);
+- yijistate = false;
+- Q_EMIT yijiChangeDown(num);
+- }
+- connect(yijiGsettings, &QGSettings::changed, this, [=](const QString &keys) {
+- if (keys == YIJISTATUS) {
+- bool currentTheme = yijiGsettings->get(YIJISTATUS).toBool();
+- yijichoose->setChecked(currentTheme);
+- if(currentTheme){
+- yiLabel->setVisible(true);
+- jiLabel->setVisible(true);
+- yijistate = true;
+- Q_EMIT yijiChangeUp(num);
+- }else{
+- yiLabel->setVisible(false);
+- jiLabel->setVisible(false);
+- yijistate = false;
+- Q_EMIT yijiChangeDown(num);
+- }
+-
++ bool currentTheme = yijiGsettings->get(YIJISTATUS).toBool();
++ yijichoose->setChecked(currentTheme);
++ if(currentTheme)
++ {
++ yiLabel->setVisible(true);
++ jiLabel->setVisible(true);
++ yijistate = true;
++ Q_EMIT yijiChangeUp(num);
++ }
++ else
++ {
++ yiLabel->setVisible(false);
++ jiLabel->setVisible(false);
++ yijistate = false;
++ Q_EMIT yijiChangeDown(num);
++ }
++ connect(yijiGsettings, &QGSettings::changed, this, [ = ](const QString &keys)
++ {
++ if (keys == YIJISTATUS)
++ {
++ bool currentTheme = yijiGsettings->get(YIJISTATUS).toBool();
++ yijichoose->setChecked(currentTheme);
++ if(currentTheme)
++ {
++ yiLabel->setVisible(true);
++ jiLabel->setVisible(true);
++ yijistate = true;
++ Q_EMIT yijiChangeUp(num);
++ }
++ else
++ {
++ yiLabel->setVisible(false);
++ jiLabel->setVisible(false);
++ yijistate = false;
++ Q_EMIT yijiChangeDown(num);
+ }
+- });
++
++ }
++ });
+ }
+
+- widgetWeek->setContentsMargins(16,0,16,0);
+- m_widgetDayBody->setContentsMargins(16,0,16,0);
+- widgetYearBody->setContentsMargins(16,0,16,0);
+- widgetmonthBody->setContentsMargins(16,0,16,0);
+- labWidget->setContentsMargins(16,0,16,0);
+- yijiWidget->setContentsMargins(16,0,16,0);
++ widgetWeek->setContentsMargins(16, 0, 16, 0);
++ m_widgetDayBody->setContentsMargins(16, 0, 16, 0);
++ widgetYearBody->setContentsMargins(16, 0, 16, 0);
++ widgetmonthBody->setContentsMargins(16, 0, 16, 0);
++ labWidget->setContentsMargins(16, 0, 16, 0);
++ yijiWidget->setContentsMargins(16, 0, 16, 0);
+ //绑定按钮和下拉框信号
+- connect(btnPrevYear, &kdk::KBorderlessButton::clicked, this, [=]() {
+- switch (m_currentType) {
++ connect(btnPrevYear, &kdk::KBorderlessButton::clicked, this, [ = ]()
++ {
++ switch (m_currentType)
++ {
+ case 0:
+ showPreviousMonth(true);
+ break;
+@@ -1088,8 +1273,10 @@ void LunarCalendarWidget::initWidget()
+ break;
+ }
+ });
+- connect(btnNextYear, &kdk::KBorderlessButton::clicked, this, [=](){
+- switch (m_currentType) {
++ connect(btnNextYear, &kdk::KBorderlessButton::clicked, this, [ = ]()
++ {
++ switch (m_currentType)
++ {
+ case 0:
+ showNextMonth(true);
+ break;
+@@ -1103,8 +1290,8 @@ void LunarCalendarWidget::initWidget()
+ });
+ connect(btnToday, SIGNAL(clicked(bool)), this, SLOT(showToday()));
+ //connect(this,&LunarCalendarWidget::DayClick,this,&LunarCalendarWidget::CreateSchedule);
+- connect(m_createScheduleButton,&QPushButton::clicked,this,&LunarCalendarWidget::slotAddSchedule);
+- yijichoose->setProperty("needTranslucent",true);
++ connect(m_createScheduleButton, &QPushButton::clicked, this, &LunarCalendarWidget::slotAddSchedule);
++ yijichoose->setProperty("needTranslucent", true);
+ }
+
+ void LunarCalendarWidget::slotShowMore()
+@@ -1116,7 +1303,7 @@ void LunarCalendarWidget::slotShowMore()
+ //双击弹出新建日程弹窗
+ void LunarCalendarWidget::CreateSchedule(QDate date)
+ {
+- dlg = new CSchceduleDlg(1,this,true);
++ dlg = new CSchceduleDlg(1, this, true);
+ dlg->m_beginDateEdit->setDate(date);
+ dlg->m_endDateEdit->setDate(date);
+ dlg->show();
+@@ -1125,24 +1312,25 @@ void LunarCalendarWidget::CreateSchedule(QDate date)
+ void LunarCalendarWidget::slotAddSchedule()
+ {
+ QRect rect;
+- dlg = new CSchceduleDlg(1,this,true);
++ dlg = new CSchceduleDlg(1, this, true);
+ dlg->setWindowFlags(dlg->windowFlags());
+ // 获取屏幕中心点和尺寸
+ QPoint screenCenter = QApplication::desktop()->availableGeometry().center();
+ QSize dialogSize = dlg->size();
+- qDebug()<<"获得的屏幕中心坐标是"<<screenCenter.x()<<screenCenter.y();
++ qDebug() << "获得的屏幕中心坐标是" << screenCenter.x() << screenCenter.y();
+ // 计算对话框应显示的中心点坐标，并将其移动到屏幕中心
+
+-// dlg->move(screenCenter.x() - dialogSize.width() / 2, screenCenter.y() - dialogSize.height() / 2);
+- rect.setRect(screenCenter.x() - dialogSize.width() / 2,screenCenter.y() - dialogSize.height() / 2,dialogSize.width(),dialogSize.height());
+- qDebug()<<"------------rect"<<rect;
+- KWindowSystem::setState(dlg->winId(),NET::SkipPager|NET::SkipTaskbar|NET::SkipSwitcher);
+- connect(dlg,&CSchceduleDlg::NeedDelete,this,[=](){
+- dlg->deleteLater();
++ // dlg->move(screenCenter.x() - dialogSize.width() / 2, screenCenter.y() - dialogSize.height() / 2);
++ rect.setRect(screenCenter.x() - dialogSize.width() / 2, screenCenter.y() - dialogSize.height() / 2, dialogSize.width(), dialogSize.height());
++ qDebug() << "------------rect" << rect;
++ KWindowSystem::setState(dlg->winId(), NET::SkipPager | NET::SkipTaskbar | NET::SkipSwitcher);
++ connect(dlg, &CSchceduleDlg::NeedDelete, this, [ = ]()
++ {
++ dlg->deleteLater();
+ });
+ dlg->setFocus();
+ dlg->show();
+- kdk::WindowManager::setGeometry(dlg->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(dlg->windowHandle(), rect);
+
+ }
+ void LunarCalendarWidget::slotEditSchedulefromMenu(QString id)
+@@ -1153,7 +1341,7 @@ void LunarCalendarWidget::slotEditSchedule(QString id)
+ {
+ // CalendarDataBase::getInstance().m_markInfoList;
+ QRect rect;
+- dlg = new CSchceduleDlg(0,this,true);
++ dlg = new CSchceduleDlg(0, this, true);
+ dlg->setId(id);
+ dlg->setStatusFromId(id);
+
+@@ -1161,18 +1349,19 @@ void LunarCalendarWidget::slotEditSchedule(QString id)
+ QPoint screenCenter = QApplication::desktop()->availableGeometry().center();
+ QSize dialogSize = dlg->size();
+ // 计算对话框应显示的中心点坐标，并将其移动到屏幕中心
+-// dlg->move(screenCenter.x() - dialogSize.width() / 2, screenCenter.y() - dialogSize.height() / 2);
+- rect.setRect(screenCenter.x() - dialogSize.width() / 2,screenCenter.y() - dialogSize.height() / 2,dialogSize.width(),dialogSize.height());
+- KWindowSystem::setState(dlg->winId(),NET::SkipPager|NET::SkipTaskbar|NET::SkipSwitcher);
++ // dlg->move(screenCenter.x() - dialogSize.width() / 2, screenCenter.y() - dialogSize.height() / 2);
++ rect.setRect(screenCenter.x() - dialogSize.width() / 2, screenCenter.y() - dialogSize.height() / 2, dialogSize.width(), dialogSize.height());
++ KWindowSystem::setState(dlg->winId(), NET::SkipPager | NET::SkipTaskbar | NET::SkipSwitcher);
+
+- connect(dlg, &QDialog::accepted, this, [=](){
++ connect(dlg, &QDialog::accepted, this, [ = ]()
++ {
+ updateAllSchedule();
+ updateLayout();
+ // 若有必要，也可以在这里发射信号 Q_EMIT Up(m_markInfoList.count());
+ });
+ dlg->setFocus();
+ dlg->show();
+- kdk::WindowManager::setGeometry(dlg->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(dlg->windowHandle(), rect);
+
+
+ }
+@@ -1183,18 +1372,19 @@ void LunarCalendarWidget::setLocaleCalendar()
+ {
+ #if 0
+ QStringList res = getLocale();
+- qDebug()<<"设置区域:"<<res.at(0);
++ qDebug() << "设置区域:" << res.at(0);
+ int isCN = res.at(0) == "zh_CN.UTF-8" ? 1 : 0;
+ #else
+ QString language;
+ QString locale;
+- QStringList res = getLocale(language,locale);
++ QStringList res = getLocale(language, locale);
+ qDebug() << language << locale;
+- qDebug()<<"设置区域:"<<res.at(0);
++ qDebug() << "设置区域:" << res.at(0);
+ //int isCN = res.at(0) == "zh_CN.UTF-8" ? 1 : 0;
+ bool isCN = language.contains("zh_CN");
+ #endif
+- if (FirstdayisSun){
++ if (FirstdayisSun)
++ {
+ labWeeks.at(0)->setText(tr("Sun"));
+ labWeeks.at(1)->setText(tr("Mon"));
+ labWeeks.at(2)->setText(tr("Tue"));
+@@ -1202,7 +1392,9 @@ void LunarCalendarWidget::setLocaleCalendar()
+ labWeeks.at(4)->setText(tr("Thur"));
+ labWeeks.at(5)->setText(tr("Fri"));
+ labWeeks.at(6)->setText(tr("Sat"));
+- }else {
++ }
++ else
++ {
+ labWeeks.at(0)->setText(tr("Mon"));
+ labWeeks.at(1)->setText(tr("Tue"));
+ labWeeks.at(2)->setText(tr("Wed"));
+@@ -1219,7 +1411,7 @@ QStringList LunarCalendarWidget::getLocale(QString &language, QString &locale)
+ //判断区域(美国/中国)
+ QString objpath;
+ unsigned int uid = getuid();
+- objpath = objpath +"/org/freedesktop/Accounts/User"+QString::number(uid);
++ objpath = objpath + "/org/freedesktop/Accounts/User" + QString::number(uid);
+ QString formats;
+ QString lang;
+ QStringList result;
+@@ -1227,20 +1419,25 @@ QStringList LunarCalendarWidget::getLocale(QString &language, QString &locale)
+ QDBusInterface localeInterface("org.freedesktop.Accounts",
+ objpath,
+ "org.freedesktop.DBus.Properties",
+- QDBusConnection::systemBus(),this);
+- QDBusReply<QMap<QString, QVariant>> reply = localeInterface.call("GetAll","org.freedesktop.Accounts.User");
+- if (reply.isValid()){
++ QDBusConnection::systemBus(), this);
++ QDBusReply<QMap<QString, QVariant>> reply = localeInterface.call("GetAll", "org.freedesktop.Accounts.User");
++ if (reply.isValid())
++ {
+ QMap<QString, QVariant> propertyMap;
+ propertyMap = reply.value();
+- if (propertyMap.keys().contains("FormatsLocale")) {
++ if (propertyMap.keys().contains("FormatsLocale"))
++ {
+ formats = propertyMap.find("FormatsLocale").value().toString();
+ locale = formats;
+ }
+- if(lang.isEmpty() && propertyMap.keys().contains("Language")) {
++ if(lang.isEmpty() && propertyMap.keys().contains("Language"))
++ {
+ lang = propertyMap.find("Language").value().toString();
+ language = lang;
+ }
+- } else {
++ }
++ else
++ {
+ qDebug() << "reply failed";
+ }
+ result.append(formats);
+@@ -1262,33 +1459,36 @@ void LunarCalendarWidget::analysisWorktimeJs()
+ file.close();
+
+ QJsonParseError parseJsonErr;
+- QJsonDocument document = QJsonDocument::fromJson(value.toUtf8(),&parseJsonErr);
++ QJsonDocument document = QJsonDocument::fromJson(value.toUtf8(), &parseJsonErr);
+ if(!(parseJsonErr.error == QJsonParseError::NoError))
+ {
+- qDebug()<<tr("解析json文件错误！");
++ qDebug() << tr("解析json文件错误！");
+ return;
+ }
+ QJsonObject jsonObject = document.object();
+ QStringList args = jsonObject.keys();
+
+- for (int i=0;i<args.count();i++) {
++ for (int i = 0; i < args.count(); i++)
++ {
+ if(jsonObject.contains(args.at(i)))
+ {
+ QJsonValue jsonValueList = jsonObject.value(args.at(i));
+ QJsonObject item = jsonValueList.toObject();
+ QStringList arg2 = item.keys();
+- for (int j=0;j<arg2.count();j++) {
+- worktimeinside.insert(arg2.at(j),item[arg2.at(j)].toString());
++ for (int j = 0; j < arg2.count(); j++)
++ {
++ worktimeinside.insert(arg2.at(j), item[arg2.at(j)].toString());
+ }
+ }
+- worktime.insert(args.at(i),worktimeinside);
++ worktime.insert(args.at(i), worktimeinside);
+ worktimeinside.clear();
+ }
+ }
+
+ void LunarCalendarWidget::yearWidgetChange()
+ {
+- if (widgetYearBody->isHidden()){
++ if (widgetYearBody->isHidden())
++ {
+ widgetYearBody->show();
+ widgetWeek->hide();
+ m_widgetDayBody->hide();
+@@ -1297,12 +1497,13 @@ void LunarCalendarWidget::yearWidgetChange()
+ m_savedYear = date.year();
+ qDebug () << m_savedYear;
+ }
+- else{
++ else
++ {
+ widgetYearBody->hide();
+ widgetWeek->show();
+ m_widgetDayBody->show();
+ widgetmonthBody->hide();
+- date.setDate(m_savedYear,date.month(),date.day());
++ date.setDate(m_savedYear, date.month(), date.day());
+ changeMode(0);
+ initDate();
+ }
+@@ -1311,14 +1512,16 @@ void LunarCalendarWidget::yearWidgetChange()
+
+ void LunarCalendarWidget::monthWidgetChange()
+ {
+- if(widgetmonthBody->isHidden()){
++ if(widgetmonthBody->isHidden())
++ {
+ widgetYearBody->hide();
+ widgetWeek->hide();
+ m_widgetDayBody->hide();
+ widgetmonthBody->show();
+ changeMode(1);
+ }
+- else{
++ else
++ {
+ widgetYearBody->hide();
+ widgetWeek->show();
+ m_widgetDayBody->show();
+@@ -1329,10 +1532,13 @@ void LunarCalendarWidget::monthWidgetChange()
+ void LunarCalendarWidget::changeMode(int mode)
+ {
+ m_currentType = mode;
+- if(mode == 1 || mode == 2) {
++ if(mode == 1 || mode == 2)
++ {
+ btnNextYear->setEnabled(false);
+ btnPrevYear->setEnabled(false);
+- } else {
++ }
++ else
++ {
+ btnNextYear->setEnabled(true);
+ btnPrevYear->setEnabled(true);
+ }
+@@ -1344,7 +1550,8 @@ void LunarCalendarWidget::initDate()
+ int year = date.year();
+ int month = date.month();
+ int day = date.day();
+- if(oneRun) {
++ if(oneRun)
++ {
+ downLabelHandle(date);
+ yijihandle(date);
+ oneRun = false;
+@@ -1355,9 +1562,12 @@ void LunarCalendarWidget::initDate()
+ btnClick = false;
+
+ cboxYearandMonthLabel->setAlignment(Qt::AlignCenter);
+- if(m_currentType != 2){
++ if(m_currentType != 2)
++ {
+ updateYearMonthString(year, month);
+- } else {
++ }
++ else
++ {
+ updateYearMonthString(m_savedYear, month);
+ }
+
+@@ -1370,12 +1580,15 @@ void LunarCalendarWidget::initDate()
+ pro = countDayPre;
+ //如果上月天数上月刚好一周则另外处理
+ int startPre, endPre, startNext, endNext, index, tempYear, tempMonth, tempDay;
+- if (0 == week) {
++ if (0 == week)
++ {
+ startPre = 0;
+ endPre = 7;
+ startNext = 0;
+ endNext = 42 - (countDay + 7);
+- } else {
++ }
++ else
++ {
+ startPre = 0;
+ endPre = week;
+ startNext = week + countDay;
+@@ -1385,13 +1598,15 @@ void LunarCalendarWidget::initDate()
+ //纠正1月份前面部分偏差,1月份前面部分是上一年12月份
+ tempYear = year;
+ tempMonth = month - 1;
+- if (tempMonth < 1) {
++ if (tempMonth < 1)
++ {
+ tempYear--;
+ tempMonth = 12;
+ }
+
+ //显示上月天数
+- for (int i = startPre; i < endPre; i++) {
++ for (int i = startPre; i < endPre; i++)
++ {
+ index = i;
+ tempDay = countDayPre - endPre + i + 1;
+
+@@ -1399,14 +1614,20 @@ void LunarCalendarWidget::initDate()
+ QString lunar = LunarCalendarInfo::Instance()->getLunarDay(tempYear, tempMonth, tempDay);
+ dayItems.at(index)->setDate(date, lunar, LunarCalendarItem::DayType_MonthPre);
+ int x = CalendarDataBase::getInstance().searchDataSlot(dayItems.at(index)->date);
+- if(x == DB_OP_SUCC){
++ if(x == DB_OP_SUCC)
++ {
+ dayItems.at(index)->hasSchedule = true;
+- }else{
++ }
++ else
++ {
+ dayItems.at(index)->hasSchedule = false;
+ }
+- if(date == QDate::currentDate()){
++ if(date == QDate::currentDate())
++ {
+ dayItems.at(index)->isToday = true;
+- }else{
++ }
++ else
++ {
+ dayItems.at(index)->isToday = false;
+ }
+
+@@ -1417,13 +1638,15 @@ void LunarCalendarWidget::initDate()
+ //纠正12月份后面部分偏差,12月份后面部分是下一年1月份
+ tempYear = year;
+ tempMonth = month + 1;
+- if (tempMonth > 12) {
++ if (tempMonth > 12)
++ {
+ tempYear++;
+ tempMonth = 1;
+ }
+
+ //显示下月天数
+- for (int i = startNext; i < endNext; i++) {
++ for (int i = startNext; i < endNext; i++)
++ {
+ index = 42 - endNext + i;
+ tempDay = i - startNext + 1;
+
+@@ -1431,14 +1654,20 @@ void LunarCalendarWidget::initDate()
+ QString lunar = LunarCalendarInfo::Instance()->getLunarDay(tempYear, tempMonth, tempDay);
+ dayItems.at(index)->setDate(date, lunar, LunarCalendarItem::DayType_MonthNext);
+ int x = CalendarDataBase::getInstance().searchDataSlot(dayItems.at(index)->date);
+- if(x == DB_OP_SUCC){
++ if(x == DB_OP_SUCC)
++ {
+ dayItems.at(index)->hasSchedule = true;
+- }else{
++ }
++ else
++ {
+ dayItems.at(index)->hasSchedule = false;
+ }
+- if(date == QDate::currentDate()){
++ if(date == QDate::currentDate())
++ {
+ dayItems.at(index)->isToday = true;
+- }else{
++ }
++ else
++ {
+ dayItems.at(index)->isToday = false;
+ }
+ }
+@@ -1449,7 +1678,8 @@ void LunarCalendarWidget::initDate()
+ QFont font(m_fontName);
+
+ //显示当前月
+- for (int i = week; i < (countDay + week); i++) {
++ for (int i = week; i < (countDay + week); i++)
++ {
+ index = (0 == week ? (i + 7) : i);
+ tempDay = i - week + 1;
+
+@@ -1457,58 +1687,68 @@ void LunarCalendarWidget::initDate()
+ QString lunar = LunarCalendarInfo::Instance()->getLunarDay(tempYear, tempMonth, tempDay);
+ dayItems.at(index)->setDate(date, lunar, LunarCalendarItem::DayType_MonthCurrent);
+ int x = CalendarDataBase::getInstance().searchDataSlot(dayItems.at(index)->date);
+- if(x == DB_OP_SUCC){
++ if(x == DB_OP_SUCC)
++ {
+ dayItems.at(index)->hasSchedule = true;
+- }else{
++ }
++ else
++ {
+ dayItems.at(index)->hasSchedule = false;
+ }
+- if(date == QDate::currentDate()){
++ if(date == QDate::currentDate())
++ {
+ dayItems.at(index)->isToday = true;
+- }else{
++ }
++ else
++ {
+ dayItems.at(index)->isToday = false;
+ }
+
+ }
+
+- for (int i=0;i<12;i++){
+- monthItems.at(i)->setDate(QDate(date.year(),i+1,1));
++ for (int i = 0; i < 12; i++)
++ {
++ monthItems.at(i)->setDate(QDate(date.year(), i + 1, 1));
+ yearItems.at(i)->setDate(date.addYears(i));
+ yearItems.at(i)->setFont(font);
+ monthItems.at(i)->setFont(font);
+ }
+ auto it = dayItems.begin();
+- for(;it!=dayItems.end();it++){
++ for(; it != dayItems.end(); it++)
++ {
+ (*it)->setFont(font);
+ }
+
+ auto itw = labWeeks.begin();
+ QFont f(m_fontName);
+ f.setPixelSize(14);
+- for(;itw!=labWeeks.end();itw++){
++ for(; itw != labWeeks.end(); itw++)
++ {
+ (*itw)->setFont(f);
+ }
+
+-// labBottom->setFont(m_font);
++ // labBottom->setFont(m_font);
+ labBottom->repaint();
+
+-// yijichooseLabel->setFont(m_font);
++ // yijichooseLabel->setFont(m_font);
+ yijichooseLabel->repaint();
+
+-// yiLabel->setFont(m_font);
+-// jiLabel->setFont(m_font);
++ // yiLabel->setFont(m_font);
++ // jiLabel->setFont(m_font);
+ yijiWidget->repaint();
+ QFont smallfont = m_font;
+- if(QLocale::system().name() != "zh_CN"){
++ if(QLocale::system().name() != "zh_CN")
++ {
+ smallfont.setPointSize(8);
+ }
+-// btnYear->setFont(smallfont);
++ // btnYear->setFont(smallfont);
+ btnYear->repaint();
+-// btnToday->setFont(smallfont);
++ // btnToday->setFont(smallfont);
+ btnToday->repaint();
+-// btnMonth->setFont(smallfont);
++ // btnMonth->setFont(smallfont);
+ btnMonth->repaint();
+ m_widgetTop->repaint();
+-// cboxYearandMonthLabel->setFont(m_font);
++ // cboxYearandMonthLabel->setFont(m_font);
+ cboxYearandMonthLabel->repaint();
+ }
+
+@@ -1519,74 +1759,88 @@ void LunarCalendarWidget::customButtonsClicked(int x)
+ int totalWidth = qApp->screenAt(QCursor::pos())->size().width() + qApp->screenAt(QCursor::pos())->geometry().x();
+ int m_panelPoistion = m_panelGsettings->get(PANEL_POSITION_KEY).toInt();
+ QRect rect;
+- if (x == 1) {
++ if (x == 1)
++ {
+ yiLabel->setVisible(true);
+ jiLabel->setVisible(true);
+ yijistate = true;
+- if (yijiGsettings) {
+- yijiGsettings->set(YIJISTATUS,QVariant(true));
++ if (yijiGsettings)
++ {
++ yijiGsettings->set(YIJISTATUS, QVariant(true));
+ }
+
+ QPoint currentPos = this->pos();
+
+ // this->setFixedSize(ORIGIN_CALENDAR_WIDTH,this->height()+YIJI_HEIGHT);
+ //2种情况1.目前屏幕大小 740 <x< 740+75 2.屏幕高度 x <740
+- if(LESSTWOSHCEDULE_CALENDAR_HEIGHT < panelHeight && panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT){
++ if(LESSTWOSHCEDULE_CALENDAR_HEIGHT < panelHeight && panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT)
++ {
+ ScrollAreaNeedChange = true;
+ updateLayout();
+ return;
+ }
+- else if(panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT){
++ else if(panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
+ ScrollbarUnderTheResolution = true;
+ updateLayout();
+ return;
+ }
+ //当位置在上方的时候 不需要move，只需要改变高度即可
+- if(position != 1){
+- if(isWayland){
++ if(position != 1)
++ {
++ if(isWayland)
++ {
+ //3右 0下 2左 1上
+- switch (m_panelPoistion) {
++ switch (m_panelPoistion)
++ {
+ case 0:
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,panelHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-YIJI_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, panelHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - YIJI_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 1:
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 2:
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+panelSize+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + panelSize + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 3:
+- rect.setRect(totalWidth-panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ rect.setRect(totalWidth - panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ }
+- }else{
+- this->move(currentPos.x(),currentPos.y()-YIJI_HEIGHT);
++ }
++ else
++ {
++ this->move(currentPos.x(), currentPos.y() - YIJI_HEIGHT);
+ }
+ }
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,this->height()+YIJI_HEIGHT);
+- } else {
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, this->height() + YIJI_HEIGHT);
++ }
++ else
++ {
+ yiLabel->setVisible(false);
+ jiLabel->setVisible(false);
+ // Q_EMIT yijiChangeDown(num);
+ yijistate = false;
+- if (yijiGsettings) {
+- yijiGsettings->set(YIJISTATUS,QVariant(false));
++ if (yijiGsettings)
++ {
++ yijiGsettings->set(YIJISTATUS, QVariant(false));
+ }
+
+- if(LESSTWOSHCEDULE_CALENDAR_HEIGHT<panelHeight && panelHeight<LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT){
++ if(LESSTWOSHCEDULE_CALENDAR_HEIGHT < panelHeight && panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT)
++ {
+ ScrollAreaNeedChange = false;
+ updateLayout();
+ return;
+ }
+- else if(panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT){
++ else if(panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
+ ScrollbarUnderTheResolution = true;
+ updateLayout();
+ return;
+@@ -1595,38 +1849,41 @@ void LunarCalendarWidget::customButtonsClicked(int x)
+
+ // this->setFixedSize(ORIGIN_CALENDAR_WIDTH,this->height()-YIJI_HEIGHT);
+ //当位置在上方的时候 不需要move，只需要改变高度即可
+- if(position!=1){
+- if(isWayland)
+- {
+- //3右 0下 2左 1上
+- switch (m_panelPoistion) {
+- case 0:
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,totalHeight-panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
+- break;
+- case 1:
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
+- break;
+- case 2:
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+panelSize+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
+- break;
+- case 3:
+- rect.setRect(totalWidth-panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
+- break;
+- }
+- }
+- else{
+- this->move(currentPos.x(),currentPos.y()+YIJI_HEIGHT);
+- }
+- }
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,this->height()-YIJI_HEIGHT);
++ if(position != 1)
++ {
++ if(isWayland)
++ {
++ //3右 0下 2左 1上
++ switch (m_panelPoistion)
++ {
++ case 0:
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
++ break;
++ case 1:
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
++ break;
++ case 2:
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + panelSize + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
++ break;
++ case 3:
++ rect.setRect(totalWidth - panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
++ break;
++ }
++ }
++ else
++ {
++ this->move(currentPos.x(), currentPos.y() + YIJI_HEIGHT);
++ }
++ }
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, this->height() - YIJI_HEIGHT);
+ }
+ }
+
+@@ -1653,14 +1910,14 @@ void LunarCalendarWidget::downLabelHandle(const QDate &date)
+ QString strLunarDay;
+
+ LunarCalendarInfo::Instance()->getLunarCalendarInfo(date.year(),
+- date.month(),
+- date.day(),
+- strHoliday,
+- strSolarTerms,
+- strLunarFestival,
+- strLunarYear,
+- strLunarMonth,
+- strLunarDay);
++ date.month(),
++ date.day(),
++ strHoliday,
++ strSolarTerms,
++ strLunarFestival,
++ strLunarYear,
++ strLunarMonth,
++ strLunarDay);
+
+ QString labBottomarg = strLunarYear + " " + strLunarMonth + strLunarDay;
+ labBottom->setText(labBottomarg);
+@@ -1678,10 +1935,10 @@ void LunarCalendarWidget::yijihandle(const QDate &date)
+ file.close();
+
+ QJsonParseError parseJsonErr;
+- QJsonDocument document = QJsonDocument::fromJson(value.toUtf8(),&parseJsonErr);
++ QJsonDocument document = QJsonDocument::fromJson(value.toUtf8(), &parseJsonErr);
+ if(!(parseJsonErr.error == QJsonParseError::NoError))
+ {
+- qDebug()<<tr("解析json文件错误！");
++ qDebug() << tr("解析json文件错误！");
+ yiLabel->setText(yi);
+ jiLabel->setText(ji);
+ return;
+@@ -1694,14 +1951,20 @@ void LunarCalendarWidget::yijihandle(const QDate &date)
+ QJsonObject item = jsonValueList.toObject();
+ QString yiString;
+ QString jiString;
+- if (item["y"].toString() == "." || item["y"].isNull()){
++ if (item["y"].toString() == "." || item["y"].isNull())
++ {
+ yiString = yi;
+- }else {
++ }
++ else
++ {
+ yiString = yi + item["y"].toString();
+ }
+- if (item["j"].toString() == "." || item["j"].isNull()){
++ if (item["j"].toString() == "." || item["j"].isNull())
++ {
+ jiString = ji;
+- }else {
++ }
++ else
++ {
+ jiString = ji + item["j"].toString();
+ }
+
+@@ -1713,9 +1976,11 @@ void LunarCalendarWidget::yijihandle(const QDate &date)
+ QString LunarCalendarWidget::toHK(QString str)
+ {
+ QString result;
+- for (int i =0;i<str.length();i++) {
++ for (int i = 0; i < str.length(); i++)
++ {
+ QString tmp = str.at(i);
+- if (m_zh_HK_dict.keys().contains(tmp)) {
++ if (m_zh_HK_dict.keys().contains(tmp))
++ {
+ tmp = m_zh_HK_dict.value(tmp);
+ }
+ result.append(tmp);
+@@ -1726,14 +1991,16 @@ QString LunarCalendarWidget::toHK(QString str)
+ void LunarCalendarWidget::yearChanged(const QString &arg1)
+ {
+ //如果是单击按钮切换的日期变动则不需要触发
+- if (btnClick) {
++ if (btnClick)
++ {
+ return;
+ }
+ int nIndex = arg1.indexOf(".");
+- if(-1 == nIndex){
++ if(-1 == nIndex)
++ {
+ return;
+ }
+- int year = arg1.mid(0,nIndex).toInt();
++ int year = arg1.mid(0, nIndex).toInt();
+ int month = arg1.mid(nIndex + 1).toInt();
+ int day = date.day();
+ dateChanged(year, month, day);
+@@ -1742,7 +2009,8 @@ void LunarCalendarWidget::yearChanged(const QString &arg1)
+ void LunarCalendarWidget::monthChanged(const QString &arg1)
+ {
+ //如果是单击按钮切换的日期变动则不需要触发
+- if (btnClick) {
++ if (btnClick)
++ {
+ return;
+ }
+
+@@ -1758,14 +2026,17 @@ void LunarCalendarWidget::labClicked(const QDate &date, const LunarCalendarItem:
+ updateAllSchedule();
+ updateLayout();
+ s_clickDate = date;
+- if (LunarCalendarItem::DayType_MonthPre == dayType){
++ if (LunarCalendarItem::DayType_MonthPre == dayType)
++ {
+ showPreviousMonth(false);
+ }
+- else if (LunarCalendarItem::DayType_MonthNext == dayType) {
++ else if (LunarCalendarItem::DayType_MonthNext == dayType)
++ {
+ showNextMonth(false);
+ }
+- else{
+- dayChanged(this->date,s_clickDate);
++ else
++ {
++ dayChanged(this->date, s_clickDate);
+ }
+ }
+
+@@ -1781,7 +2052,7 @@ void LunarCalendarWidget::updateYearClicked(const QDate &date, const LunarCalend
+ widgetmonthBody->hide();
+ s_clickDate = date;
+ changeDate(date);
+- dayChanged(date,QDate());
++ dayChanged(date, QDate());
+ changeMode(0);
+ initDate();
+ }
+@@ -1798,7 +2069,7 @@ void LunarCalendarWidget::updateMonthClicked(const QDate &date, const LunarCalen
+ widgetmonthBody->hide();
+ s_clickDate = date;
+ changeDate(date);
+- dayChanged(date,QDate());
++ dayChanged(date, QDate());
+ changeMode(0);
+ initDate();
+ }
+@@ -1808,7 +2079,8 @@ void LunarCalendarWidget::changeDate(const QDate &date)
+ int year = date.year();
+ int month = date.month();
+ int day = date.day();
+- if(oneRun) {
++ if(oneRun)
++ {
+ downLabelHandle(date);
+ yijihandle(date);
+ oneRun = false;
+@@ -1824,12 +2096,15 @@ void LunarCalendarWidget::changeDate(const QDate &date)
+
+ //如果上月天数上月刚好一周则另外处理
+ int startPre, endPre, startNext, endNext, index, tempYear, tempMonth, tempDay;
+- if (0 == week) {
++ if (0 == week)
++ {
+ startPre = 0;
+ endPre = 7;
+ startNext = 0;
+ endNext = 42 - (countDay + 7);
+- } else {
++ }
++ else
++ {
+ startPre = 0;
+ endPre = week;
+ startNext = week + countDay;
+@@ -1839,13 +2114,15 @@ void LunarCalendarWidget::changeDate(const QDate &date)
+ //纠正1月份前面部分偏差,1月份前面部分是上一年12月份
+ tempYear = year;
+ tempMonth = month - 1;
+- if (tempMonth < 1) {
++ if (tempMonth < 1)
++ {
+ tempYear--;
+ tempMonth = 12;
+ }
+
+ //显示上月天数
+- for (int i = startPre; i < endPre; i++) {
++ for (int i = startPre; i < endPre; i++)
++ {
+ index = i;
+ tempDay = countDayPre - endPre + i + 1;
+
+@@ -1857,13 +2134,15 @@ void LunarCalendarWidget::changeDate(const QDate &date)
+ //纠正12月份后面部分偏差,12月份后面部分是下一年1月份
+ tempYear = year;
+ tempMonth = month + 1;
+- if (tempMonth > 12) {
++ if (tempMonth > 12)
++ {
+ tempYear++;
+ tempMonth = 1;
+ }
+
+ //显示下月天数
+- for (int i = startNext; i < endNext; i++) {
++ for (int i = startNext; i < endNext; i++)
++ {
+ index = 42 - endNext + i;
+ tempDay = i - startNext + 1;
+
+@@ -1877,7 +2156,8 @@ void LunarCalendarWidget::changeDate(const QDate &date)
+ tempMonth = month;
+
+ //显示当前月
+- for (int i = week; i < (countDay + week); i++) {
++ for (int i = week; i < (countDay + week); i++)
++ {
+ index = (0 == week ? (i + 7) : i);
+ tempDay = i - week + 1;
+
+@@ -1886,13 +2166,14 @@ void LunarCalendarWidget::changeDate(const QDate &date)
+ dayItems.at(index)->setDate(date, lunar, LunarCalendarItem::DayType_MonthCurrent);
+ }
+
+- for (int i=0;i<12;i++){
++ for (int i = 0; i < 12; i++)
++ {
+ yearItems.at(i)->setDate(s_clickDate.addYears(i));
+- monthItems.at(i)->setDate(QDate(s_clickDate.year(),i+1,1));
++ monthItems.at(i)->setDate(QDate(s_clickDate.year(), i + 1, 1));
+ }
+ }
+
+-void LunarCalendarWidget::dayChanged(const QDate &date,const QDate &m_date)
++void LunarCalendarWidget::dayChanged(const QDate &date, const QDate &m_date)
+ {
+ //计算星期几,当前天对应标签索引=日期+星期几-1
+ int year = date.year();
+@@ -1900,17 +2181,21 @@ void LunarCalendarWidget::dayChanged(const QDate &date,const QDate &m_date)
+ int day = date.day();
+ int week = LunarCalendarInfo::Instance()->getFirstDayOfWeek(year, month, FirstdayisSun);
+ //选中当前日期,其他日期恢复,这里还有优化空间,比方说类似单选框机制
+- for (int i = 0; i < 42; i++) {
++ for (int i = 0; i < 42; i++)
++ {
+ //当月第一天是星期天要另外计算
+ int index = day + week - 1;
+- if (week == 0) {
++ if (week == 0)
++ {
+ index = day + 6;
+ }
+ dayItems.at(i)->setSelect(false);
+- if(dayItems.at(i)->getDate() == m_date) {
++ if(dayItems.at(i)->getDate() == m_date)
++ {
+ dayItems.at(i)->setSelect(i == index);
+ }
+- if (i == index) {
++ if (i == index)
++ {
+ downLabelHandle(dayItems.at(i)->getDate());
+ yijihandle(dayItems.at(i)->getDate());
+ }
+@@ -1926,7 +2211,8 @@ void LunarCalendarWidget::dayChanged(const QDate &date,const QDate &m_date)
+ void LunarCalendarWidget::dateChanged(int year, int month, int day)
+ {
+ //如果原有天大于28则设置为1,防止出错
+- if(year <= 1970 || year >=2099){
++ if(year <= 1970 || year >= 2099)
++ {
+ return ;
+ }
+ date.setDate(year, month, day > 28 ? 1 : day);
+@@ -1937,13 +2223,16 @@ bool LunarCalendarWidget::getShowLunar()
+ {
+ //语言是简体或繁体中文且区域是中国且GSetting的值时，
+ //这个时候才显示农历和黄历信息
+- QString lang,format;
+- getLocale(lang,format);
++ QString lang, format;
++ getLocale(lang, format);
+ //qInfo() << lang << format << (calendar_gsettings->get("calendar").toString() == "lunar") ;
+- if((lang.contains("zh_CN")||lang.contains("zh_HK")) &&
+- (calendar_gsettings->get("calendar").toString() == "lunar")){
++ if((lang.contains("zh_CN") || lang.contains("zh_HK")) &&
++ (calendar_gsettings->get("calendar").toString() == "lunar"))
++ {
+ m_showLunar = true;
+- }else {
++ }
++ else
++ {
+ m_showLunar = false;
+ }
+ return m_showLunar;
+@@ -1953,7 +2242,8 @@ void LunarCalendarWidget::setShowLunar(bool showLunar)
+ {
+ bool realShow = showLunar & yijistate;
+ //日界面需要重绘
+- for(auto i = 0 ;i < dayItems.size();i++) {
++ for(auto i = 0 ; i < dayItems.size(); i++)
++ {
+ dayItems.at(i)->setShowLunar(showLunar);
+ }
+ //日期字符串要重新写
+@@ -1964,7 +2254,7 @@ void LunarCalendarWidget::setShowLunar(bool showLunar)
+ //yijistate = realShow;
+ labWidget->setVisible(showLunar);
+ yijiWidget->setVisible(showLunar);
+-// yijichoose->setChecked(yijistate);
++ // yijichoose->setChecked(yijistate);
+ //重新布局当前窗口
+ Q_EMIT almanacChanged(realShow);
+ }
+@@ -2095,7 +2385,8 @@ void LunarCalendarWidget::showPreviousYear()
+ int year = date.year();
+ int month = date.month();
+ int day = date.day();
+- if (year <= 1901) {
++ if (year <= 1901)
++ {
+ return;
+ }
+
+@@ -2109,7 +2400,8 @@ void LunarCalendarWidget::showNextYear()
+ int year = date.year();
+ int month = date.month();
+ int day = date.day();
+- if (year >= 2099) {
++ if (year >= 2099)
++ {
+ return;
+ }
+
+@@ -2123,13 +2415,15 @@ void LunarCalendarWidget::showPreviousMonth(bool date_clicked)
+ int year = date.year();
+ int month = date.month();
+ int day = date.day();
+- if (year <= 1901 && month == 1) {
++ if (year <= 1901 && month == 1)
++ {
+ return;
+ }
+
+ //extra:
+ if (date_clicked) month--;
+- if (month < 1) {
++ if (month < 1)
++ {
+ month = 12;
+ year--;
+ }
+@@ -2142,13 +2436,15 @@ void LunarCalendarWidget::showNextMonth(bool date_clicked)
+ int year = date.year();
+ int month = date.month();
+ int day = date.day();
+- if (year >= 2099 ) {
++ if (year >= 2099 )
++ {
+ return;
+ }
+
+ //extra
+ if (date_clicked)month++;
+- if (month > 12) {
++ if (month > 12)
++ {
+ month = 1;
+ year++;
+ }
+@@ -2172,7 +2468,8 @@ void LunarCalendarWidget::updateAllSchedule()
+ Q_EMIT scheduleNum(m_num); ;
+ // 遍历所有 MarkInfo，提取开始小时和分钟
+ QList<int> startTimes;
+- for (MarkInfo info : m_markInfoList) {
++ for (MarkInfo info : m_markInfoList)
++ {
+ int startTime = info.hour * 60 + info.minute; // 将小时转换为分钟并加上分钟数
+ startTimes.append(startTime);
+ }
+@@ -2182,7 +2479,8 @@ void LunarCalendarWidget::updateAllSchedule()
+ for (int i = 0; i < startTimes.size(); ++i)
+ sortedIndices.append(i);
+
+- std::sort(sortedIndices.begin(), sortedIndices.end(), [&](int a, int b) {
++ std::sort(sortedIndices.begin(), sortedIndices.end(), [&](int a, int b)
++ {
+ return startTimes[a] < startTimes[b];
+ });
+
+@@ -2191,12 +2489,14 @@ void LunarCalendarWidget::updateAllSchedule()
+ sortedMarkInfoList.append(m_markInfoList[index]);
+
+ m_markInfoList = sortedMarkInfoList;
+- twiceInfo = m_markInfoList.mid(0,2);
++ twiceInfo = m_markInfoList.mid(0, 2);
+ remainInfo = m_markInfoList.mid(2);
+
+ }
+-bool LunarCalendarWidget::compare(MarkInfo info1 ,MarkInfo info2){
+- if(info1.hour != info2.hour){
++bool LunarCalendarWidget::compare(MarkInfo info1, MarkInfo info2)
++{
++ if(info1.hour != info2.hour)
++ {
+ return info1.hour < info2.hour;
+ }
+ return info1.minute < info2.minute;
+@@ -2212,7 +2512,7 @@ void LunarCalendarWidget::showToday()
+ changeMode(0);
+ initDate();
+ s_clickDate = date;
+- dayChanged(this->date,QDate());
++ dayChanged(this->date, QDate());
+ CalendarDataBase::getInstance().searchDataSlot(date);
+ // QPoint currentPos = this->pos();
+ // this->move(currentPos.x(),670);
+@@ -2222,7 +2522,8 @@ void LunarCalendarWidget::showToday()
+
+ void LunarCalendarWidget::setCalendarStyle(const LunarCalendarWidget::CalendarStyle &calendarStyle)
+ {
+- if (this->calendarStyle != calendarStyle) {
++ if (this->calendarStyle != calendarStyle)
++ {
+ this->calendarStyle = calendarStyle;
+ }
+ }
+@@ -2236,7 +2537,8 @@ void LunarCalendarWidget::setWeekNameFormat(bool FirstDayisSun)
+
+ void LunarCalendarWidget::setDate(const QDate &date)
+ {
+- if (this->date != date) {
++ if (this->date != date)
++ {
+ this->date = date;
+ initDate();
+ }
+@@ -2244,7 +2546,8 @@ void LunarCalendarWidget::setDate(const QDate &date)
+
+ void LunarCalendarWidget::setWeekTextColor(const QColor &weekTextColor)
+ {
+- if (this->weekTextColor != weekTextColor) {
++ if (this->weekTextColor != weekTextColor)
++ {
+ this->weekTextColor = weekTextColor;
+ initStyle();
+ }
+@@ -2252,7 +2555,8 @@ void LunarCalendarWidget::setWeekTextColor(const QColor &weekTextColor)
+
+ void LunarCalendarWidget::setWeekBgColor(const QColor &weekBgColor)
+ {
+- if (this->weekBgColor != weekBgColor) {
++ if (this->weekBgColor != weekBgColor)
++ {
+ this->weekBgColor = weekBgColor;
+ initStyle();
+ }
+@@ -2260,7 +2564,8 @@ void LunarCalendarWidget::setWeekBgColor(const QColor &weekBgColor)
+
+ void LunarCalendarWidget::setBgImage(const QString &bgImage)
+ {
+- if (this->bgImage != bgImage) {
++ if (this->bgImage != bgImage)
++ {
+ this->bgImage = bgImage;
+ initStyle();
+ }
+@@ -2268,7 +2573,8 @@ void LunarCalendarWidget::setBgImage(const QString &bgImage)
+
+ void LunarCalendarWidget::setSelectType(const LunarCalendarWidget::SelectType &selectType)
+ {
+- if (this->selectType != selectType) {
++ if (this->selectType != selectType)
++ {
+ this->selectType = selectType;
+ initStyle();
+ }
+@@ -2276,7 +2582,8 @@ void LunarCalendarWidget::setSelectType(const LunarCalendarWidget::SelectType &s
+
+ void LunarCalendarWidget::setBorderColor(const QColor &borderColor)
+ {
+- if (this->borderColor != borderColor) {
++ if (this->borderColor != borderColor)
++ {
+ this->borderColor = borderColor;
+ initStyle();
+ }
+@@ -2284,7 +2591,8 @@ void LunarCalendarWidget::setBorderColor(const QColor &borderColor)
+
+ void LunarCalendarWidget::setWeekColor(const QColor &weekColor)
+ {
+- if (this->weekColor != weekColor) {
++ if (this->weekColor != weekColor)
++ {
+ this->weekColor = weekColor;
+ initStyle();
+ }
+@@ -2292,7 +2600,8 @@ void LunarCalendarWidget::setWeekColor(const QColor &weekColor)
+
+ void LunarCalendarWidget::setSuperColor(const QColor &superColor)
+ {
+- if (this->superColor != superColor) {
++ if (this->superColor != superColor)
++ {
+ this->superColor = superColor;
+ initStyle();
+ }
+@@ -2300,7 +2609,8 @@ void LunarCalendarWidget::setSuperColor(const QColor &superColor)
+
+ void LunarCalendarWidget::setLunarColor(const QColor &lunarColor)
+ {
+- if (this->lunarColor != lunarColor) {
++ if (this->lunarColor != lunarColor)
++ {
+ this->lunarColor = lunarColor;
+ initStyle();
+ }
+@@ -2308,7 +2618,8 @@ void LunarCalendarWidget::setLunarColor(const QColor &lunarColor)
+
+ void LunarCalendarWidget::setCurrentTextColor(const QColor ¤tTextColor)
+ {
+- if (this->currentTextColor != currentTextColor) {
++ if (this->currentTextColor != currentTextColor)
++ {
+ this->currentTextColor = currentTextColor;
+ initStyle();
+ }
+@@ -2316,7 +2627,8 @@ void LunarCalendarWidget::setCurrentTextColor(const QColor ¤tTextColor)
+
+ void LunarCalendarWidget::setOtherTextColor(const QColor &otherTextColor)
+ {
+- if (this->otherTextColor != otherTextColor) {
++ if (this->otherTextColor != otherTextColor)
++ {
+ this->otherTextColor = otherTextColor;
+ initStyle();
+ }
+@@ -2324,7 +2636,8 @@ void LunarCalendarWidget::setOtherTextColor(const QColor &otherTextColor)
+
+ void LunarCalendarWidget::setSelectTextColor(const QColor &selectTextColor)
+ {
+- if (this->selectTextColor != selectTextColor) {
++ if (this->selectTextColor != selectTextColor)
++ {
+ this->selectTextColor = selectTextColor;
+ initStyle();
+ }
+@@ -2332,7 +2645,8 @@ void LunarCalendarWidget::setSelectTextColor(const QColor &selectTextColor)
+
+ void LunarCalendarWidget::setHoverTextColor(const QColor &hoverTextColor)
+ {
+- if (this->hoverTextColor != hoverTextColor) {
++ if (this->hoverTextColor != hoverTextColor)
++ {
+ this->hoverTextColor = hoverTextColor;
+ initStyle();
+ }
+@@ -2340,7 +2654,8 @@ void LunarCalendarWidget::setHoverTextColor(const QColor &hoverTextColor)
+
+ void LunarCalendarWidget::setCurrentLunarColor(const QColor ¤tLunarColor)
+ {
+- if (this->currentLunarColor != currentLunarColor) {
++ if (this->currentLunarColor != currentLunarColor)
++ {
+ this->currentLunarColor = currentLunarColor;
+ initStyle();
+ }
+@@ -2348,7 +2663,8 @@ void LunarCalendarWidget::setCurrentLunarColor(const QColor ¤tLunarColor)
+
+ void LunarCalendarWidget::setOtherLunarColor(const QColor &otherLunarColor)
+ {
+- if (this->otherLunarColor != otherLunarColor) {
++ if (this->otherLunarColor != otherLunarColor)
++ {
+ this->otherLunarColor = otherLunarColor;
+ initStyle();
+ }
+@@ -2356,7 +2672,8 @@ void LunarCalendarWidget::setOtherLunarColor(const QColor &otherLunarColor)
+
+ void LunarCalendarWidget::setSelectLunarColor(const QColor &selectLunarColor)
+ {
+- if (this->selectLunarColor != selectLunarColor) {
++ if (this->selectLunarColor != selectLunarColor)
++ {
+ this->selectLunarColor = selectLunarColor;
+ initStyle();
+ }
+@@ -2364,7 +2681,8 @@ void LunarCalendarWidget::setSelectLunarColor(const QColor &selectLunarColor)
+
+ void LunarCalendarWidget::setHoverLunarColor(const QColor &hoverLunarColor)
+ {
+- if (this->hoverLunarColor != hoverLunarColor) {
++ if (this->hoverLunarColor != hoverLunarColor)
++ {
+ this->hoverLunarColor = hoverLunarColor;
+ initStyle();
+ }
+@@ -2372,7 +2690,8 @@ void LunarCalendarWidget::setHoverLunarColor(const QColor &hoverLunarColor)
+
+ void LunarCalendarWidget::setCurrentBgColor(const QColor ¤tBgColor)
+ {
+- if (this->currentBgColor != currentBgColor) {
++ if (this->currentBgColor != currentBgColor)
++ {
+ this->currentBgColor = currentBgColor;
+ initStyle();
+ }
+@@ -2380,7 +2699,8 @@ void LunarCalendarWidget::setCurrentBgColor(const QColor ¤tBgColor)
+
+ void LunarCalendarWidget::setOtherBgColor(const QColor &otherBgColor)
+ {
+- if (this->otherBgColor != otherBgColor) {
++ if (this->otherBgColor != otherBgColor)
++ {
+ this->otherBgColor = otherBgColor;
+ initStyle();
+ }
+@@ -2388,7 +2708,8 @@ void LunarCalendarWidget::setOtherBgColor(const QColor &otherBgColor)
+
+ void LunarCalendarWidget::setSelectBgColor(const QColor &selectBgColor)
+ {
+- if (this->selectBgColor != selectBgColor) {
++ if (this->selectBgColor != selectBgColor)
++ {
+ this->selectBgColor = selectBgColor;
+ initStyle();
+ }
+@@ -2396,7 +2717,8 @@ void LunarCalendarWidget::setSelectBgColor(const QColor &selectBgColor)
+
+ void LunarCalendarWidget::setHoverBgColor(const QColor &hoverBgColor)
+ {
+- if (this->hoverBgColor != hoverBgColor) {
++ if (this->hoverBgColor != hoverBgColor)
++ {
+ this->hoverBgColor = hoverBgColor;
+ initStyle();
+ }
+@@ -2406,20 +2728,26 @@ void LunarCalendarWidget::changeMonth(bool forward)
+ int year = date.year();
+ int month = date.month();
+ int day = date.day();
+- if (year <= 1901 && month == 1) {
++ if (year <= 1901 && month == 1)
++ {
+ return;
+ }
+- if(forward){
+- month +=3;
+- if(month > 12) {
++ if(forward)
++ {
++ month += 3;
++ if(month > 12)
++ {
+ year += 1;
+- month -=12;
++ month -= 12;
+ }
+- }else{
+- month -=3;
+- if(month<=0){
+- year -=1;
+- month +=12;
++ }
++ else
++ {
++ month -= 3;
++ if(month <= 0)
++ {
++ year -= 1;
++ month += 12;
+ }
+ }
+
+@@ -2430,40 +2758,51 @@ void LunarCalendarWidget::changeYear(bool forward)
+ int year = date.year();
+ int month = date.month();
+ int day = date.day();
+- if (year <= 1901 || year >= 2099) {
++ if (year <= 1901 || year >= 2099)
++ {
+ return;
+ }
+
+ if(forward)
+- year +=3;
++ year += 3;
+ else
+- year -=3;
++ year -= 3;
+
+ dateChanged(year, month, day);
+ }
+-void LunarCalendarWidget::wheelEvent(QWheelEvent *event) {
++void LunarCalendarWidget::wheelEvent(QWheelEvent *event)
++{
+
+- if (scrollArea->underMouse()) {
+- if (scrollArea->TopOrButtom) {
+- event->ignore();
+- return;
+- }
+- }
++ if (scrollArea->underMouse())
++ {
++ if (scrollArea->TopOrButtom)
++ {
++ event->ignore();
++ return;
++ }
++ }
+
+- switch (m_currentType) {
++ switch (m_currentType)
++ {
+ case 0:
+- if (event->delta() > 100) {
++ if (event->delta() > 100)
++ {
+ showPreviousMonth();
+- } else if (event->delta() < -100) {
++ }
++ else if (event->delta() < -100)
++ {
+ showNextMonth();
+ }
+ break;
+
+ case 2:
+- if (event->delta() > 100) {
++ if (event->delta() > 100)
++ {
+ //向前三年
+ changeYear(false);
+- } else if (event->delta() < -100){
++ }
++ else if (event->delta() < -100)
++ {
+ //向后三年
+ changeYear(true);
+ }
+@@ -2480,30 +2819,42 @@ void LunarCalendarWidget::wheelEvent(QWheelEvent *event) {
+
+ bool LunarCalendarWidget::eventFilter(QObject *watched, QEvent *event)
+ {
+- if(event->type() == QEvent::MouseButtonPress){
++ if(event->type() == QEvent::MouseButtonPress)
++ {
+ QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
+- if(mouse!=nullptr) {
+- if(watched == this){
+- if(mouse->source() == Qt::MouseEventSynthesizedByQt){
++ if(mouse != nullptr)
++ {
++ if(watched == this)
++ {
++ if(mouse->source() == Qt::MouseEventSynthesizedByQt)
++ {
+ m_start_y = mouse->pos().y();
+ }
+- if(m_currentType == 0){
++ if(m_currentType == 0)
++ {
+ QPoint pt = m_widgetDayBody->mapFromGlobal(QCursor::pos());
+- for(auto w : dayItems){
++ for(auto w : dayItems)
++ {
+ if(w->geometry().contains(pt))
+ m_clickedWidget = w;
+
+ }
+- }else if(m_currentType == 2){
++ }
++ else if(m_currentType == 2)
++ {
+ QPoint pt = widgetYearBody->mapFromGlobal(QCursor::pos());
+- for(auto w : yearItems){
++ for(auto w : yearItems)
++ {
+ if(w->geometry().contains(pt))
+ m_clickedWidget = w;
+
+ }
+- }else if(m_currentType == 1){
++ }
++ else if(m_currentType == 1)
++ {
+ QPoint pt = widgetmonthBody->mapFromGlobal(QCursor::pos());
+- for(auto w: monthItems){
++ for(auto w : monthItems)
++ {
+ if(w->geometry().contains(pt))
+ m_clickedWidget = w;
+ }
+@@ -2511,18 +2862,25 @@ bool LunarCalendarWidget::eventFilter(QObject *watched, QEvent *event)
+ return false;
+ }
+ }
+- }else if(event->type()==QEvent::MouseButtonRelease){
++ }
++ else if(event->type() == QEvent::MouseButtonRelease)
++ {
+ //return -1;
+ QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
+- if(mouse!=nullptr) {
+- if(watched == this){
+- if(mouse->source() == Qt::MouseEventSynthesizedByQt){
++ if(mouse != nullptr)
++ {
++ if(watched == this)
++ {
++ if(mouse->source() == Qt::MouseEventSynthesizedByQt)
++ {
+ //触摸的释放
+ if(m_start_y == -1)
+ return false;
+
+- if( mouse->pos().y() - m_start_y > 100){
+- switch(m_currentType){
++ if( mouse->pos().y() - m_start_y > 100)
++ {
++ switch(m_currentType)
++ {
+ case 0:
+ showNextMonth();
+ break;
+@@ -2531,8 +2889,11 @@ bool LunarCalendarWidget::eventFilter(QObject *watched, QEvent *event)
+ break;
+ }
+ return false;
+- }else if(mouse->pos().y() - m_start_y < -100){
+- switch(m_currentType){
++ }
++ else if(mouse->pos().y() - m_start_y < -100)
++ {
++ switch(m_currentType)
++ {
+ case 0:
+ showPreviousMonth();
+ break;
+@@ -2544,10 +2905,12 @@ bool LunarCalendarWidget::eventFilter(QObject *watched, QEvent *event)
+ }
+ }
+ //鼠标抬起
+- if(m_clickedWidget==nullptr){
++ if(m_clickedWidget == nullptr)
++ {
+ return false;
+ }
+- if(m_clickedWidget->geometry().contains(m_widgetDayBody->mapFromGlobal(QCursor::pos()))){
++ if(m_clickedWidget->geometry().contains(m_widgetDayBody->mapFromGlobal(QCursor::pos())))
++ {
+ LunarCalendarItem *item = qobject_cast<LunarCalendarItem*>(m_clickedWidget);
+ if(dayItems.contains(item))
+ item->onSelected();
+@@ -2565,57 +2928,85 @@ bool LunarCalendarWidget::eventFilter(QObject *watched, QEvent *event)
+ }
+ }
+ }
+- else if (event->type()==QEvent::MouseMove){
++ else if (event->type() == QEvent::MouseMove)
++ {
+ QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
+- if(mouse!=nullptr) {
+- if(mouse->source()==Qt::MouseEventSynthesizedByQt){
++ if(mouse != nullptr)
++ {
++ if(mouse->source() == Qt::MouseEventSynthesizedByQt)
++ {
+ return -1;
+ }
+ }
+- if(m_currentType == 0){
+- for(auto w:dayItems){
+- if(w->geometry().contains(m_widgetDayBody->mapFromGlobal(QCursor::pos()))){
++ if(m_currentType == 0)
++ {
++ for(auto w : dayItems)
++ {
++ if(w->geometry().contains(m_widgetDayBody->mapFromGlobal(QCursor::pos())))
++ {
+ w->onEnter();
+- } else {
++ }
++ else
++ {
+ w->onLeave();
+ }
+ }
+- } else if(m_currentType == 2){
+- for(auto w:yearItems){
+- if(w->geometry().contains(widgetYearBody->mapFromGlobal(QCursor::pos()))){
++ }
++ else if(m_currentType == 2)
++ {
++ for(auto w : yearItems)
++ {
++ if(w->geometry().contains(widgetYearBody->mapFromGlobal(QCursor::pos())))
++ {
+ w->onEnter();
+- } else {
++ }
++ else
++ {
+ w->onLeave();
+ }
+ }
+- } else if(m_currentType == 1){
+- for(auto w:monthItems){
+- if(w->geometry().contains(widgetmonthBody->mapFromGlobal(QCursor::pos()))){
++ }
++ else if(m_currentType == 1)
++ {
++ for(auto w : monthItems)
++ {
++ if(w->geometry().contains(widgetmonthBody->mapFromGlobal(QCursor::pos())))
++ {
+ w->onEnter();
+- }else{
++ }
++ else
++ {
+ w->onLeave();
+ }
+ }
+ }
+ return false;
+- } else if(event->type()==QEvent::Enter){
++ }
++ else if(event->type() == QEvent::Enter)
++ {
+ LunarCalendarItem *item = qobject_cast<LunarCalendarItem*>(watched);
+- if(dayItems.contains(item) == true){
++ if(dayItems.contains(item) == true)
++ {
+ item->onEnter();
+ }
+ LunarCalendarYearItem *yItem = qobject_cast<LunarCalendarYearItem*>(watched);
+- if(yearItems.contains(yItem)){
++ if(yearItems.contains(yItem))
++ {
+ yItem->onEnter();
+ }
+- }else if(event->type()==QEvent::Leave){
++ }
++ else if(event->type() == QEvent::Leave)
++ {
+ for(auto day : dayItems)
+ day->onLeave();
+- for (auto month :monthItems)
++ for (auto month : monthItems)
+ month->onLeave();
+- for(auto year:yearItems)
++ for(auto year : yearItems)
+ year->onLeave();
+
+- } else if(event->type()==QEvent::WindowDeactivate){
++ }
++ else if(event->type() == QEvent::WindowDeactivate)
++ {
+ Q_EMIT NeedToHide();
+ this->hide();
+ return false;
+@@ -2626,9 +3017,10 @@ bool LunarCalendarWidget::eventFilter(QObject *watched, QEvent *event)
+ void LunarCalendarWidget::showCalendar(bool needShowToday)
+ {
+ show();
+- KWindowSystem::setState(winId(),NET::SkipPager|NET::SkipTaskbar|NET::SkipSwitcher);
++ KWindowSystem::setState(winId(), NET::SkipPager | NET::SkipTaskbar | NET::SkipSwitcher);
+
+- if(needShowToday) {
++ if(needShowToday)
++ {
+ showToday();
+ }
+ // isClicked = false;
+@@ -2637,17 +3029,22 @@ void LunarCalendarWidget::showCalendar(bool needShowToday)
+ void LunarCalendarWidget::initTransparency()
+ {
+ const QByteArray tranparency(TRANSPARENCY_SETTING);
+- if (QGSettings::isSchemaInstalled(tranparency)){
++ if (QGSettings::isSchemaInstalled(tranparency))
++ {
+ m_transparencySetting = new QGSettings(tranparency);
+- m_trans = m_transparencySetting->get(TRANSPARENCY_KEY).toDouble()*255;
++ m_trans = m_transparencySetting->get(TRANSPARENCY_KEY).toDouble() * 255;
+ update();
+- connect(m_transparencySetting,&QGSettings::changed,this,[=](const QString &key) {
+- if(key == TRANSPARENCY_KEY) {
+- m_trans = m_transparencySetting->get(TRANSPARENCY_KEY).toDouble()*255;
++ connect(m_transparencySetting, &QGSettings::changed, this, [ = ](const QString &key)
++ {
++ if(key == TRANSPARENCY_KEY)
++ {
++ m_trans = m_transparencySetting->get(TRANSPARENCY_KEY).toDouble() * 255;
+ update();
+ }
+ });
+- } else {
++ }
++ else
++ {
+ m_trans = 0.75;
+ update();
+ }
+@@ -2661,7 +3058,7 @@ void LunarCalendarWidget::paintEvent(QPaintEvent*e)
+ color.setAlpha(m_trans);
+ QBrush brush = QBrush(color);
+ p.setBrush(brush);
+- p.setRenderHints(QPainter::Antialiasing|QPainter::SmoothPixmapTransform);
++ p.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+ p.setPen(Qt::NoPen);
+ p.drawRect(opt.rect);
+ return QWidget::paintEvent(e);
+@@ -2679,11 +3076,11 @@ void PartLineWidget::paintEvent(QPaintEvent *event)
+ QRect rect = this->rect();
+
+ p.setRenderHint(QPainter::Antialiasing); // 反锯齿;
+- QColor color=qApp->palette().color(QPalette::BrightText);
++ QColor color = qApp->palette().color(QPalette::BrightText);
+ p.setBrush(color);
+ p.setOpacity(0.08);
+ p.setPen(Qt::NoPen);
+- p.drawRoundedRect(rect,0,0);
++ p.drawRoundedRect(rect, 0, 0);
+
+ QWidget::paintEvent(event);
+ }
+@@ -2697,7 +3094,8 @@ statelabel::statelabel() : QLabel()
+ //鼠标点击事件
+ void statelabel::mousePressEvent(QMouseEvent *event)
+ {
+- if (event->buttons() == Qt::LeftButton){
++ if (event->buttons() == Qt::LeftButton)
++ {
+ Q_EMIT labelclick();
+
+ }
+@@ -2706,7 +3104,8 @@ void statelabel::mousePressEvent(QMouseEvent *event)
+ //快捷键
+ void LunarCalendarWidget::keyPressEvent(QKeyEvent *ev)
+ {
+- if(ev->key()==Qt::Key_Escape) {
++ if(ev->key() == Qt::Key_Escape)
++ {
+ this->hide();
+ }
+ QWidget::keyPressEvent(ev);
+@@ -2714,25 +3113,34 @@ void LunarCalendarWidget::keyPressEvent(QKeyEvent *ev)
+
+ void LunarCalendarWidget::updateYearMonthString(int year, int month)
+ {
+- if(cboxYearandMonthLabel==nullptr){
++ if(cboxYearandMonthLabel == nullptr)
++ {
+ qInfo() << "widget is not initialized...";
+ return ;
+ }
+
+- QDate date(year,month,1);
++ QDate date(year, month, 1);
+ QString shortFmt = SDK2CPP(kdk_system_get_shortformat)();
+- shortFmt.replace("d","");
+- if(shortFmt.lastIndexOf(".") != -1){
+- shortFmt.replace("..",".");
+- } else if(shortFmt.lastIndexOf("-") != -1){
+- shortFmt.replace("--","-");
+- } else if(shortFmt.lastIndexOf("/") != -1){
+- shortFmt.replace("//","/");
+- } else {
+- qInfo() <<"Wrong date format...";
++ shortFmt.replace("d", "");
++ if(shortFmt.lastIndexOf(".") != -1)
++ {
++ shortFmt.replace("..", ".");
++ }
++ else if(shortFmt.lastIndexOf("-") != -1)
++ {
++ shortFmt.replace("--", "-");
++ }
++ else if(shortFmt.lastIndexOf("/") != -1)
++ {
++ shortFmt.replace("//", "/");
++ }
++ else
++ {
++ qInfo() << "Wrong date format...";
+ return ;
+ }
+- if(shortFmt.endsWith(".")||shortFmt.endsWith("/") || shortFmt.endsWith("-")){
++ if(shortFmt.endsWith(".") || shortFmt.endsWith("/") || shortFmt.endsWith("-"))
++ {
+ shortFmt.chop(1);
+ }
+ cboxYearandMonthLabel->setText(date.toString(shortFmt));
+@@ -2745,29 +3153,35 @@ void LunarCalendarWidget::updateLayout()
+ }
+ void LunarCalendarWidget::updateLayout1()
+ {
+- if(scrollArea){
++ if(scrollArea)
++ {
+ scrollArea->deleteLater();
+ scrollArea = nullptr; // 将指针设置为nullptr
+ }
+- qDebug()<<"no have such scrollArea";
++ qDebug() << "no have such scrollArea";
+ scrollArea = new CustomScrollArea(this);
+ scrollArea->setWidgetResizable(true);
+ scrollArea->setStyleSheet("background-color: transparent;");
+- if(m_verLayoutCalendar){
++ if(m_verLayoutCalendar)
++ {
+ delete m_verLayoutCalendar;
+ m_verLayoutCalendar = new QVBoxLayout(this);
+ }
+- else if(!m_verLayoutCalendar){
++ else if(!m_verLayoutCalendar)
++ {
+ m_verLayoutCalendar = new QVBoxLayout(this);
+ }
+- if(m_markInfoList.count()!=0){
+- if(label){
++ if(m_markInfoList.count() != 0)
++ {
++ if(label)
++ {
+ label->deleteLater();
+ label = nullptr;
+ }
+-// label = new ShowMoreLabel(this);
++ // label = new ShowMoreLabel(this);
+ }
+- if(scheduleWidget){
++ if(scheduleWidget)
++ {
+ scheduleWidget->deleteLater();
+ scheduleWidget = nullptr;
+ }
+@@ -2775,7 +3189,8 @@ void LunarCalendarWidget::updateLayout1()
+ void LunarCalendarWidget::onScreenGeometryChanged()
+ {
+ screen = qGuiApp->primaryScreen();
+- if (sender() == screen) {
++ if (sender() == screen)
++ {
+ updatePrimaryScreenHeight();
+ }
+ }
+@@ -2787,24 +3202,31 @@ void LunarCalendarWidget::updatePrimaryScreenHeight()
+ screenHeight = qApp->screenAt(QCursor::pos())->size().height() + qApp->screenAt(QCursor::pos())->geometry().y();
+ panelHeight = screenHeight - panelSize;
+
+- if(LESSTWOSHCEDULE_CALENDAR_HEIGHT < panelHeight && panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT){
++ if(LESSTWOSHCEDULE_CALENDAR_HEIGHT < panelHeight && panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT)
++ {
+ ScrollAreaNeedChange = true;
+- }else{
++ }
++ else
++ {
+ ScrollAreaNeedChange = false;
+ }
+- if(panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT){
++ if(panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
+ ScrollbarUnderTheResolution = true;
+- }else{
++ }
++ else
++ {
+ ScrollbarUnderTheResolution = false;
+ }
+ qDebug() << "Primary screen height changed to:" << panelSize;
+ }
+-void LunarCalendarWidget::onPrimaryScreenChanged(const QRect &newGeometry) {
+- qDebug()<<"分辨率变化";
++void LunarCalendarWidget::onPrimaryScreenChanged(const QRect &newGeometry)
++{
++ qDebug() << "分辨率变化";
+ screen = qobject_cast<QScreen *>(sender());
+ // 当主屏幕变化时，更新主屏幕和高度
+- qDebug() << "Screen geometry changed:" << screen->name() << newGeometry;
+-// screen = newScreen;
++ qDebug() << "Screen geometry changed:" << screen->name() << newGeometry;
++ // screen = newScreen;
+ primaryScreenHeight = qApp->screenAt(QCursor::pos())->size().height() + qApp->screenAt(QCursor::pos())->geometry().y();
+
+ updatePrimaryScreenHeight();
+@@ -2812,49 +3234,56 @@ void LunarCalendarWidget::onPrimaryScreenChanged(const QRect &newGeometry) {
+ }
+ void LunarCalendarWidget::onGSettingsChanged(const QString &key)
+ {
+- qDebug()<<"onGSettingsChanged";
+- if(key == PANEL_POSITION_KEY){
++ qDebug() << "onGSettingsChanged";
++ if(key == PANEL_POSITION_KEY)
++ {
+ int calendar_height = LESSTWOSHCEDULE_CALENDAR_HEIGHT;
+- if(panelHeight < this->height() || panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT || isExceedScreenHeight){
+- calendar_height = panelHeight-SCROLLA;
++ if(panelHeight < this->height() || panelHeight < LESSTWOSHCEDULE_CALENDAR_HEIGHT || isExceedScreenHeight)
++ {
++ calendar_height = panelHeight - SCROLLA;
+ }
+ int width = screen->size().width();
+ int height = primaryScreenHeight;
+ int m_panelPoistion = m_panelGsettings->get(PANEL_POSITION_KEY).toInt();
+- qDebug()<<"-----------------m_panelPoistion"<<m_panelPoistion;
++ qDebug() << "-----------------m_panelPoistion" << m_panelPoistion;
+ position = m_panelPoistion;
+ int m_panelSize = m_panelGsettings->get(PANEL_SIZE_KEY).toInt();
+ //3右 0下 2左 1上
+- switch (m_panelPoistion) {
++ switch (m_panelPoistion)
++ {
+ case 0:
+- this->move(width - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,panelHeight-calendar_height-WIDGET_GAP);
+- if(yijistate){
+- this->move(width - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,panelHeight-calendar_height -YIJI_HEIGHT -WIDGET_GAP);
++ this->move(width - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, panelHeight - calendar_height - WIDGET_GAP);
++ if(yijistate)
++ {
++ this->move(width - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, panelHeight - calendar_height - YIJI_HEIGHT - WIDGET_GAP);
+ }
+ break;
+ case 1:
+- this->move(width-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,m_panelSize+WIDGET_GAP);
++ this->move(width - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, m_panelSize + WIDGET_GAP);
+ break;
+ case 2:
+- this->move(qApp->screenAt(QCursor::pos())->geometry().x()+m_panelSize+WIDGET_GAP,height-calendar_height-WIDGET_GAP);
+- if(yijistate){
+- this->move(qApp->screenAt(QCursor::pos())->geometry().x()+m_panelSize+WIDGET_GAP,height-calendar_height-YIJI_HEIGHT -WIDGET_GAP);
++ this->move(qApp->screenAt(QCursor::pos())->geometry().x() + m_panelSize + WIDGET_GAP, height - calendar_height - WIDGET_GAP);
++ if(yijistate)
++ {
++ this->move(qApp->screenAt(QCursor::pos())->geometry().x() + m_panelSize + WIDGET_GAP, height - calendar_height - YIJI_HEIGHT - WIDGET_GAP);
+ }
+ break;
+ case 3:
+- this->move(width-m_panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,height-calendar_height-WIDGET_GAP);
+- if(yijistate){
+- this->move(width-m_panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,height-calendar_height - YIJI_HEIGHT-WIDGET_GAP);
++ this->move(width - m_panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, height - calendar_height - WIDGET_GAP);
++ if(yijistate)
++ {
++ this->move(width - m_panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, height - calendar_height - YIJI_HEIGHT - WIDGET_GAP);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+- if(key == PANEL_SIZE_KEY){
++ if(key == PANEL_SIZE_KEY)
++ {
+ panelSize = m_panelGsettings->get(PANEL_SIZE_KEY).toInt();
+ screenHeight = qApp->screenAt(QCursor::pos())->size().height() + qApp->screenAt(QCursor::pos())->geometry().y();
+- panelHeight = primaryScreenHeight-panelSize;//这个值就是屏幕到任务栏的高度
++ panelHeight = primaryScreenHeight - panelSize; //这个值就是屏幕到任务栏的高度
+
+ }
+ }
+@@ -2862,13 +3291,13 @@ void LunarCalendarWidget::ThreeMoreSchedule()
+ {
+ int num = m_markInfoList.count();
+ QPoint currentPos = this->pos();
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);//900是三个以上日程的默认高度
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT); //900是三个以上日程的默认高度
+ m_scheduleWidget = new QWidget(this);
+- m_scheduleWidget->setContentsMargins(0,0,0,23);
++ m_scheduleWidget->setContentsMargins(0, 0, 0, 23);
+ m_scheduleWidget->setStyleSheet("background-color: transparent;");
+- m_scheduleWidget->setFixedHeight(79*num);
+- labWidget->setContentsMargins(16,0,16,0);
+- yijiWidget->setContentsMargins(16,0,16,0);
++ m_scheduleWidget->setFixedHeight(79 * num);
++ labWidget->setContentsMargins(16, 0, 16, 0);
++ yijiWidget->setContentsMargins(16, 0, 16, 0);
+ scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+
+ //scrollArea->setFixedSize(ORIGIN_CALENDAR_WIDTH-20, 140);
+@@ -2876,145 +3305,176 @@ void LunarCalendarWidget::ThreeMoreSchedule()
+ scrollArea->verticalScrollBar()->setStyleSheet(ScrollAreaStyleSheet);
+ scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ //把前两个日程先显示出来 这部分不用修改
+- foreach(info, m_markInfoList){
+- scheduleWidget = new schedule_item(this,true);
++ foreach(info, m_markInfoList)
++ {
++ scheduleWidget = new schedule_item(this, true);
+ QString time1;
+ QString time2;
+- if(timemodel == "12"){
++ if(timemodel == "12")
++ {
+ scheduleWidget->timemode = "12";
+- if(info.hour <= 12){
++ if(info.hour <= 12)
++ {
+ time1 = tr("morning");
+- }else{
++ }
++ else
++ {
+ time1 = tr("afternoon");
+- info.hour = info.hour-12;
++ info.hour = info.hour - 12;
+ }
+- if(info.end_hour < 12){
++ if(info.end_hour < 12)
++ {
+ time2 = tr("morning");
+- }else{
++ }
++ else
++ {
+ time2 = tr("afternoon");
+- info.end_hour = info.end_hour-12;
++ info.end_hour = info.end_hour - 12;
+ }
+- }else if(timemodel == "24"){
++ }
++ else if(timemodel == "24")
++ {
+ time1 = "";
+ time2 = "";
+ }
+- QString starttimeString = QString::number(info.hour)+":"+QString::number(info.minute);// 确保这是有效的格式
++ QString starttimeString = QString::number(info.hour) + ":" + QString::number(info.minute); // 确保这是有效的格式
+ QTime m_startTime = QTime::fromString(starttimeString, "h:m");
+ QString start = m_startTime.toString("hh:mm");
+- QString timeString = QString::number(info.end_hour)+":"+QString::number(info.end_minute);// 确保这是有效的格式
++ QString timeString = QString::number(info.end_hour) + ":" + QString::number(info.end_minute); // 确保这是有效的格式
+ QTime m_endTime = QTime::fromString(timeString, "h:m");
+ QString end = m_endTime.toString("hh:mm");
+ QString lineOne = QString(" %1%2-%3%4 ").arg(time1).arg(start).arg(time2).arg(end)
+- +info.timeLong;
+- if(info.m_isAllDay){
++ + info.timeLong;
++ if(info.m_isAllDay)
++ {
+ lineOne = tr(" allday");
+ }
+ scheduleWidget->setStartTime(lineOne);
+ scheduleWidget->adjustDate(this->date);
+- scheduleWidget->setEndTime(info.end_hour,info.end_minute,this->date,time2);
++ scheduleWidget->setEndTime(info.end_hour, info.end_minute, this->date, time2);
+ scheduleWidget->setDescription(info.m_descript);
+ scheduleWidget->setId(info.m_markId);
+- connect(scheduleWidget,&schedule_item::ScheduleClick,this,&LunarCalendarWidget::slotEditSchedule);
+- connect(scheduleWidget,&schedule_item::EditSchedule,this,&LunarCalendarWidget::slotEditSchedule);
+- connect(scheduleWidget,&schedule_item::updateWindow,this,&LunarCalendarWidget::updateFromItem);
++ connect(scheduleWidget, &schedule_item::ScheduleClick, this, &LunarCalendarWidget::slotEditSchedule);
++ connect(scheduleWidget, &schedule_item::EditSchedule, this, &LunarCalendarWidget::slotEditSchedule);
++ connect(scheduleWidget, &schedule_item::updateWindow, this, &LunarCalendarWidget::updateFromItem);
+ item_layout->addWidget(scheduleWidget);
+ }
+ m_scheduleWidget->setLayout(item_layout);
+ scrollArea->setWidget(m_scheduleWidget);
+ m_horLayoutWidgetTop = new QHBoxLayout(this);
+- m_horLayoutWidgetTop->setContentsMargins(26,0,24,0);
++ m_horLayoutWidgetTop->setContentsMargins(26, 0, 24, 0);
+ m_verLayoutCalendar->setMargin(0);
+ m_verLayoutCalendar->setSpacing(0);
+ m_horLayoutWidgetTop->addWidget(widgetTime);
+ m_horLayoutWidgetTop->addWidget(m_createScheduleButton);
+ m_verLayoutCalendar->addLayout(m_horLayoutWidgetTop);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(lineUp);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(m_widgetTop);
+ m_verLayoutCalendar->addSpacing(18);
+ m_verLayoutCalendar->addWidget(widgetWeek);
+ m_verLayoutCalendar->addWidget(m_widgetDayBody, 1);
+ m_verLayoutCalendar->addWidget(widgetYearBody, 1);
+ m_verLayoutCalendar->addWidget(widgetmonthBody, 1);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(lineDown);
+ controlDownLine();
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(labWidget);
+ m_verLayoutCalendar->addWidget(yijiWidget);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ lineSchedule->setFixedHeight(1);
+ m_verLayoutCalendar->addWidget(lineSchedule);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(scrollArea);
+- if(ScrollAreaNeedChange){
+- qDebug()<<"ScrollAreaNeedChange";
++ if(ScrollAreaNeedChange)
++ {
++ qDebug() << "ScrollAreaNeedChange";
+
+- if(yijistate){
+- scrollArea->setFixedSize(420,80);
++ if(yijistate)
++ {
++ scrollArea->setFixedSize(420, 80);
+ }
+- else{
+- scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
++ else
++ {
++ scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+ }
+-// scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
++ // scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+ }
+ else
+ {
+- if(yijistate){
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);//无日程的时候，日历高度固定600,不会根据分辨率变化大小
++ if(yijistate)
++ {
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT); //无日程的时候，日历高度固定600,不会根据分辨率变化大小
+ }
+ QRect rect;
+ int totalHeight = qApp->screenAt(QCursor::pos())->size().height() + qApp->screenAt(QCursor::pos())->geometry().y();//屏幕高度
+ int totalWidth = qApp->screenAt(QCursor::pos())->size().width() + qApp->screenAt(QCursor::pos())->geometry().x();
+- switch(position) {
++ switch(position)
++ {
+ case 0:
+- if(yijistate){
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,totalHeight-panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-YIJI_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,totalHeight-panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- if(isRTLLanguage()){
+- qDebug()<<"QLocale::system().language();"<<QLocale::system().language();
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - YIJI_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(isRTLLanguage())
++ {
++ qDebug() << "QLocale::system().language();" << QLocale::system().language();
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 1:
+- if(yijistate){
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 2:
+- if(yijistate){
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+panelSize+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+panelSize+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + panelSize + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + panelSize + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ case 3:
+- if(yijistate){
+- rect.setRect(totalWidth-panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }else{
+- rect.setRect(totalWidth-panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(yijistate)
++ {
++ rect.setRect(totalWidth - panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ else
++ {
++ rect.setRect(totalWidth - panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- kdk::WindowManager::setGeometry(this->windowHandle(),rect);
++ kdk::WindowManager::setGeometry(this->windowHandle(), rect);
+ break;
+ default:
+ break;
+@@ -3023,7 +3483,7 @@ void LunarCalendarWidget::ThreeMoreSchedule()
+ }
+ void LunarCalendarWidget::PrimaryScreenHeight(int height)
+ {
+- qDebug()<<"点击了不同屏幕"<<height;
++ qDebug() << "点击了不同屏幕" << height;
+ primaryScreenHeight = height;
+
+ updatePrimaryScreenHeight();
+@@ -3031,12 +3491,14 @@ void LunarCalendarWidget::PrimaryScreenHeight(int height)
+ void LunarCalendarWidget::initGsettings()
+ {
+ const QByteArray id(PANEL_SETTINGS);
+- if (QGSettings::isSchemaInstalled(id)) {
++ if (QGSettings::isSchemaInstalled(id))
++ {
+ m_panelGsettings = new QGSettings(id);
+- if (m_panelGsettings != nullptr) {
++ if (m_panelGsettings != nullptr)
++ {
+ panelSize = m_panelGsettings->get(PANEL_SIZE_KEY).toInt();
+ screenHeight = qApp->screenAt(QCursor::pos())->size().height() + qApp->screenAt(QCursor::pos())->geometry().y();
+- panelHeight = primaryScreenHeight-panelSize;//这个值就是屏幕到任务栏的高度
++ panelHeight = primaryScreenHeight - panelSize; //这个值就是屏幕到任务栏的高度
+ position = m_panelGsettings->get(PANEL_POSITION_KEY).toInt();
+ connect(m_panelGsettings, &QGSettings::changed, this, &LunarCalendarWidget::onGSettingsChanged);
+ }
+@@ -3045,21 +3507,28 @@ void LunarCalendarWidget::initGsettings()
+ widgetTime->setObjectName("widgetTime");
+
+ const QByteArray calendar_id(PANEL_CONTROL_IN_CALENDAR);
+- if(QGSettings::isSchemaInstalled(calendar_id)){
++ if(QGSettings::isSchemaInstalled(calendar_id))
++ {
+ calendar_gsettings = new QGSettings(calendar_id);
+ }
+ initWidget();
+- if(calendar_gsettings!=nullptr){
++ if(calendar_gsettings != nullptr)
++ {
+ //农历切换监听与日期显示格式
+- connect(calendar_gsettings, &QGSettings::changed, this, [=] (const QString &key){
+- if(key == LUNAR_KEY){
++ connect(calendar_gsettings, &QGSettings::changed, this, [ = ] (const QString &key)
++ {
++ if(key == LUNAR_KEY)
++ {
+ m_showLunar = getShowLunar();
+ setShowLunar(m_showLunar);
+ controlDownLine();
+ _timeUpdate();
+ }
+- else if(key == "date") {
+- } else if (key == FIRST_DAY_KEY) {
++ else if(key == "date")
++ {
++ }
++ else if (key == FIRST_DAY_KEY)
++ {
+ setWeekNameFormat(calendar_gsettings->get(FIRST_DAY_KEY).toString() == "sunday");
+ }
+ });
+@@ -3067,13 +3536,16 @@ void LunarCalendarWidget::initGsettings()
+ setShowLunar(m_showLunar);
+ setWeekNameFormat(calendar_gsettings->get(FIRST_DAY_KEY).toString() == "sunday");
+ //监听12/24小时制
+- connect(calendar_gsettings, &QGSettings::changed, this, [=] (const QString &keys){
++ connect(calendar_gsettings, &QGSettings::changed, this, [ = ] (const QString &keys)
++ {
+ timemodel = calendar_gsettings->get("hoursystem").toString();
+ _timeUpdate();
+ });
+ timemodel = calendar_gsettings->get("hoursystem").toString();
+
+- } else {
++ }
++ else
++ {
+ //无设置默认公历
+ lunarstate = true;
+ }
+@@ -3084,23 +3556,27 @@ void LunarCalendarWidget::initGsettings()
+ KYSDK_DATEINTERFACE,
+ "ShortDateSignal",
+ this,
+- SLOT([](QString){
+- updateYearMonthString(QDateTime::currentDateTime().date().year(),QDateTime::currentDateTime().date().month());
+- }
+- )
+- );
++ SLOT([](QString)
++ {
++ updateYearMonthString(QDateTime::currentDateTime().date().year(), QDateTime::currentDateTime().date().month());
++ }
++ )
++ );
+
+ //判断图形字体是否存在,不存在则加入
+ QFontDatabase fontDb;
+- if (!fontDb.families().contains("FontAwesome")) {
++ if (!fontDb.families().contains("FontAwesome"))
++ {
+ int fontId = fontDb.addApplicationFont(":/image/fontawesome-webfont.ttf");
+ QStringList fontName = fontDb.applicationFontFamilies(fontId);
+- if (fontName.count() == 0) {
++ if (fontName.count() == 0)
++ {
+ qDebug() << "load fontawesome-webfont.ttf error";
+ }
+ }
+
+- if (fontDb.families().contains("FontAwesome")) {
++ if (fontDb.families().contains("FontAwesome"))
++ {
+ iconFont = QFont("FontAwesome");
+ #if (QT_VERSION >= QT_VERSION_CHECK(4,8,0))
+ iconFont.setHintingPreference(QFont::PreferNoHinting);
+@@ -3109,33 +3585,42 @@ void LunarCalendarWidget::initGsettings()
+ //切换主题
+ const QByteArray style_id(ORG_UKUI_STYLE);
+ QStringList stylelist;
+- stylelist<<STYLE_NAME_KEY_DARK<<STYLE_NAME_KEY_BLACK;
+- if(QGSettings::isSchemaInstalled(style_id)) {
++ stylelist << STYLE_NAME_KEY_DARK << STYLE_NAME_KEY_BLACK;
++ if(QGSettings::isSchemaInstalled(style_id))
++ {
+ style_settings = new QGSettings(style_id);
+- if (style_settings != nullptr) {
+- dark_style=stylelist.contains(style_settings->get(STYLE_NAME).toString());
++ if (style_settings != nullptr)
++ {
++ dark_style = stylelist.contains(style_settings->get(STYLE_NAME).toString());
+ setColor(dark_style);
+ m_fontName = style_settings->get(SYSTEM_FONT).toString();
+ m_font.setFamily(m_fontName);
+ }
+ }
+ cboxYearandMonthLabel->setFont(m_font);
+- if (style_settings != nullptr) {
+- connect(style_settings, &QGSettings::changed, this, [=] (const QString &key){
+- if(key==STYLE_NAME){
+- dark_style=stylelist.contains(style_settings->get(STYLE_NAME).toString());
++ if (style_settings != nullptr)
++ {
++ connect(style_settings, &QGSettings::changed, this, [ = ] (const QString &key)
++ {
++ if(key == STYLE_NAME)
++ {
++ dark_style = stylelist.contains(style_settings->get(STYLE_NAME).toString());
+ _timeUpdate();
+ setColor(dark_style);
+- }else if(key == SYSTEM_FONT){
++ }
++ else if(key == SYSTEM_FONT)
++ {
+ m_fontName = style_settings->get(SYSTEM_FONT).toString();
+ m_font.setFamily(m_fontName);
+- }else{
+- qDebug()<<"key!=STYLE_NAME";
++ }
++ else
++ {
++ qDebug() << "key!=STYLE_NAME";
+ }
+ });
+ }
+ timer = new QTimer();
+- connect(timer,SIGNAL(timeout()),this,SLOT(timerUpdate()));
++ connect(timer, SIGNAL(timeout()), this, SLOT(timerUpdate()));
+ timer->start(1000);
+
+ locale = QLocale::system().name();
+@@ -3143,56 +3628,62 @@ void LunarCalendarWidget::initGsettings()
+ setLocaleCalendar();//设置某区域下日历的显示
+ initTransparency();
+ setWindowOpacity(1);
+- setAttribute(Qt::WA_TranslucentBackground,true);//设置窗口背景透明
++ setAttribute(Qt::WA_TranslucentBackground, true); //设置窗口背景透明
+ setProperty("useSystemStyleBlur", true); //设置毛玻璃效果
+- setProperty("useStyleWindowManager",false);
++ setProperty("useStyleWindowManager", false);
+
+- KWindowEffects::enableBlurBehind(winId(),true);
+- KWindowSystem::setState(winId(),NET::SkipPager|NET::SkipTaskbar|NET::SkipSwitcher);
++ KWindowEffects::enableBlurBehind(winId(), true);
++ KWindowSystem::setState(winId(), NET::SkipPager | NET::SkipTaskbar | NET::SkipSwitcher);
+ kdk::UkuiStyleHelper::self()->removeHeader(this);
+- updateYearMonthString(QDateTime::currentDateTime().date().year(),QDateTime::currentDateTime().date().month());
++ updateYearMonthString(QDateTime::currentDateTime().date().year(), QDateTime::currentDateTime().date().month());
+ _timeUpdate();
+
+ //加载繁中宜忌字典
+- if (locale != "zh_HK") {
++ if (locale != "zh_HK")
++ {
+ return;
+ }
+ QFile dict("/usr/share/ukui-panel/plugin-calendar/html/zh_HK.html");
+- if (!dict.open(QIODevice::ReadOnly | QIODevice::Text)) {
+- qDebug()<<"open field : /usr/share/ukui-panel/plugin-calendar/html/zh_HK.html";
++ if (!dict.open(QIODevice::ReadOnly | QIODevice::Text))
++ {
++ qDebug() << "open field : /usr/share/ukui-panel/plugin-calendar/html/zh_HK.html";
+ return;
+ }
+ QString orig = dict.readLine();
+ QString trans = dict.readLine();
+ orig.remove("\n");
+- for (int i=0;i< orig.length();i++) {
+- if (i >= trans.length()) {
++ for (int i = 0; i < orig.length(); i++)
++ {
++ if (i >= trans.length())
++ {
+ break;
+ }
+- m_zh_HK_dict.insert(orig.at(i),trans.at(i));
++ m_zh_HK_dict.insert(orig.at(i), trans.at(i));
+ }
+ }
+ void LunarCalendarWidget::DisplayAtResolution()
+ {
+- this->setFixedSize(ORIGIN_CALENDAR_WIDTH,panelHeight-SCROLLA);
++ this->setFixedSize(ORIGIN_CALENDAR_WIDTH, panelHeight - SCROLLA);
+ int num = m_markInfoList.count();
+- if(num == 0){
++ if(num == 0)
++ {
+ scrollArea->verticalScrollBar()->setStyleSheet(ScrollAreaStyleSheet);
+ m_scheduleWidget = new QWidget(this);
+- m_scheduleWidget->setContentsMargins(0,0,0,23);
++ m_scheduleWidget->setContentsMargins(0, 0, 0, 23);
+ m_scheduleWidget->setStyleSheet("background-color: transparent;");
+- m_scheduleWidget->setFixedSize(ORIGIN_CALENDAR_WIDTH,220);
++ m_scheduleWidget->setFixedSize(ORIGIN_CALENDAR_WIDTH, 220);
+ //scrollArea->setFixedSize(420, 140);
+ scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+- scheduleWidget = new schedule_item(this,false);
++ scheduleWidget = new schedule_item(this, false);
+ scheduleWidget->setStartTime("");
+ scheduleWidget->setDescription("");
+ scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+- labWidget->setContentsMargins(16,0,16,0);
+- yijiWidget->setContentsMargins(16,0,16,0);
+- if(yijistate){
+- labWidget->setContentsMargins(5,0,10,0);
+- yijiWidget->setContentsMargins(5,0,0,0);
++ labWidget->setContentsMargins(16, 0, 16, 0);
++ yijiWidget->setContentsMargins(16, 0, 16, 0);
++ if(yijistate)
++ {
++ labWidget->setContentsMargins(5, 0, 10, 0);
++ yijiWidget->setContentsMargins(5, 0, 0, 0);
+ }
+ // item_layout->addItem(new QSpacerItem(6,6));
+ item_layout->addWidget(labWidget);
+@@ -3204,47 +3695,49 @@ void LunarCalendarWidget::DisplayAtResolution()
+ m_scheduleWidget->setLayout(item_layout);
+ scrollArea->setWidget(m_scheduleWidget);
+ m_horLayoutWidgetTop = new QHBoxLayout(this);
+- m_horLayoutWidgetTop->setContentsMargins(26,0,24,0);
++ m_horLayoutWidgetTop->setContentsMargins(26, 0, 24, 0);
+ m_verLayoutCalendar->setMargin(0);
+ m_verLayoutCalendar->setSpacing(0);
+
+ m_horLayoutWidgetTop->addWidget(widgetTime);
+ m_horLayoutWidgetTop->addWidget(m_createScheduleButton);
+ m_verLayoutCalendar->addLayout(m_horLayoutWidgetTop);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ // verLayoutCalendar->addWidget(lineUp);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(m_widgetTop);
+ m_verLayoutCalendar->addSpacing(18);
+ m_verLayoutCalendar->addWidget(widgetWeek);
+ m_verLayoutCalendar->addWidget(m_widgetDayBody, 1);
+ m_verLayoutCalendar->addWidget(widgetYearBody, 1);
+ m_verLayoutCalendar->addWidget(widgetmonthBody, 1);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(lineDown);
+ controlDownLine();
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ lineSchedule->setFixedHeight(0.1);
+ m_verLayoutCalendar->addWidget(lineSchedule);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(scrollArea);
+ }
+- else{
++ else
++ {
+ scrollArea->verticalScrollBar()->setStyleSheet(ScrollAreaStyleSheet);
+ m_scheduleWidget = new QWidget(this);
+- m_scheduleWidget->setContentsMargins(0,0,0,23);
++ m_scheduleWidget->setContentsMargins(0, 0, 0, 23);
+ m_scheduleWidget->setStyleSheet("background-color: transparent;");
+- m_scheduleWidget->setFixedSize(ORIGIN_CALENDAR_WIDTH,140+70*num);//确保日程越多，可滑动区域越大
++ m_scheduleWidget->setFixedSize(ORIGIN_CALENDAR_WIDTH, 140 + 70 * num); //确保日程越多，可滑动区域越大
+ //scrollArea->setFixedSize(420,140);
+ scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+ scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+ // item_layout->addItem(new QSpacerItem(6,6));
+ //item_layout->addWidget(lineSchedule);
+- labWidget->setContentsMargins(16,0,16,0);
+- yijiWidget->setContentsMargins(16,0,16,0);
+- if(yijistate){
+- labWidget->setContentsMargins(5,0,10,0);
+- yijiWidget->setContentsMargins(5,0,0,0);
++ labWidget->setContentsMargins(16, 0, 16, 0);
++ yijiWidget->setContentsMargins(16, 0, 16, 0);
++ if(yijistate)
++ {
++ labWidget->setContentsMargins(5, 0, 10, 0);
++ yijiWidget->setContentsMargins(5, 0, 0, 0);
+ }
+
+ item_layout->addWidget(labWidget);
+@@ -3252,101 +3745,115 @@ void LunarCalendarWidget::DisplayAtResolution()
+ item_layout->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+ item_layout->addWidget(yijiWidget);
+ item_layout->addWidget(scheduleWidget);
+- foreach(info,m_markInfoList){
+- scheduleWidget = new schedule_item(this,true);
++ foreach(info, m_markInfoList)
++ {
++ scheduleWidget = new schedule_item(this, true);
+ QString time1;
+ QString time2;
+- if(timemodel == "12"){
++ if(timemodel == "12")
++ {
+ scheduleWidget->timemode = "12";
+- if(info.hour <= 12){
++ if(info.hour <= 12)
++ {
+ time1 = tr("morning");
+- }else{
++ }
++ else
++ {
+ time1 = tr("afternoon");
+- info.hour = info.hour-12;
++ info.hour = info.hour - 12;
+ // info.end_hour = info.end_hour-12;
+ }
+- if(info.end_hour < 12){
++ if(info.end_hour < 12)
++ {
+ time2 = tr("morning");
+- }else{
++ }
++ else
++ {
+ time2 = tr("afternoon");
+ // info.hour = info.hour-12;
+- info.end_hour = info.end_hour-12;
++ info.end_hour = info.end_hour - 12;
+ }
+
+- }else if(timemodel == "24"){
++ }
++ else if(timemodel == "24")
++ {
+ time1 = "";
+ time2 = "";
+ }
+
+- QString starttimeString = QString::number(info.hour)+":"+QString::number(info.minute);// 确保这是有效的格式
++ QString starttimeString = QString::number(info.hour) + ":" + QString::number(info.minute); // 确保这是有效的格式
+ QTime m_startTime = QTime::fromString(starttimeString, "h:m");
+ QString start = m_startTime.toString("hh:mm");
+- QString timeString = QString::number(info.end_hour)+":"+QString::number(info.end_minute);// 确保这是有效的格式
++ QString timeString = QString::number(info.end_hour) + ":" + QString::number(info.end_minute); // 确保这是有效的格式
+ QTime m_endTime = QTime::fromString(timeString, "h:m");
+ QString end = m_endTime.toString("hh:mm");
+
+ QString lineOne = QString(" %1%2-%3%4 ").arg(time1).arg(start).arg(time2).arg(end)
+- +info.timeLong;
+- if(info.m_isAllDay){
++ + info.timeLong;
++ if(info.m_isAllDay)
++ {
+ lineOne = tr(" allday");
+ }
+
+ scheduleWidget->setStartTime(lineOne);
+ scheduleWidget->adjustDate(this->date);
+- scheduleWidget->setEndTime(info.end_hour,info.end_minute,this->date,time2);
++ scheduleWidget->setEndTime(info.end_hour, info.end_minute, this->date, time2);
+ scheduleWidget->setDescription(info.m_descript);
+
+ scheduleWidget->setId(info.m_markId);
+- connect(scheduleWidget,&schedule_item::ScheduleClick,this,&LunarCalendarWidget::slotEditSchedule);
+- connect(scheduleWidget,&schedule_item::EditSchedule,this,&LunarCalendarWidget::slotEditSchedule);
++ connect(scheduleWidget, &schedule_item::ScheduleClick, this, &LunarCalendarWidget::slotEditSchedule);
++ connect(scheduleWidget, &schedule_item::EditSchedule, this, &LunarCalendarWidget::slotEditSchedule);
+ // connect(scheduleWidget,&schedule_item::updateSchedule1,this,&LunarCalendarWidget::updateFromItem);
+- connect(scheduleWidget,&schedule_item::updateWindow,this,&LunarCalendarWidget::updateFromItem);
++ connect(scheduleWidget, &schedule_item::updateWindow, this, &LunarCalendarWidget::updateFromItem);
+ item_layout->addWidget(scheduleWidget);
+ item_layout->addSpacing(2);
+ }
+ m_scheduleWidget->setLayout(item_layout);
+ scrollArea->setWidget(m_scheduleWidget);
+ m_horLayoutWidgetTop = new QHBoxLayout(this);
+- m_horLayoutWidgetTop->setContentsMargins(26,0,24,0);
++ m_horLayoutWidgetTop->setContentsMargins(26, 0, 24, 0);
+ m_verLayoutCalendar->setMargin(0);
+ m_verLayoutCalendar->setSpacing(0);
+
+ m_horLayoutWidgetTop->addWidget(widgetTime);
+ m_horLayoutWidgetTop->addWidget(m_createScheduleButton);
+ m_verLayoutCalendar->addLayout(m_horLayoutWidgetTop);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(m_widgetTop);
+ m_verLayoutCalendar->addSpacing(18);
+ m_verLayoutCalendar->addWidget(widgetWeek);
+ m_verLayoutCalendar->addWidget(m_widgetDayBody, 1);
+ m_verLayoutCalendar->addWidget(widgetYearBody, 1);
+ m_verLayoutCalendar->addWidget(widgetmonthBody, 1);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(lineDown);
+ controlDownLine();
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ lineSchedule->setFixedHeight(0.1);
+ m_verLayoutCalendar->addWidget(lineSchedule);
+- m_verLayoutCalendar->addItem(new QSpacerItem(6,6));
++ m_verLayoutCalendar->addItem(new QSpacerItem(6, 6));
+ m_verLayoutCalendar->addWidget(scrollArea);
+ }
+
+ }
+-bool LunarCalendarWidget::isRTLLanguage() {
++bool LunarCalendarWidget::isRTLLanguage()
++{
+ // 获取当前系统的语言代码
+ QLocale locale = QLocale::system();
+ QString languageCode = locale.name();
+ QString languageName;
+ int separatorIndex = languageCode.indexOf('_');
+- if (separatorIndex == -1) {
+- separatorIndex = languageCode.indexOf('-');
+- }
+- // 如果找到了分隔符，就剥离出语言代码部分
+- if (separatorIndex != -1) {
+- languageName = languageCode.left(separatorIndex);
+- }
+- QStringList rtlLanguages = {"ar", "fa", "he", "ps", "ur","kk","ky","ug"};
++ if (separatorIndex == -1)
++ {
++ separatorIndex = languageCode.indexOf('-');
++ }
++ // 如果找到了分隔符，就剥离出语言代码部分
++ if (separatorIndex != -1)
++ {
++ languageName = languageCode.left(separatorIndex);
++ }
++ QStringList rtlLanguages = {"ar", "fa", "he", "ps", "ur", "kk", "ky", "ug"};
+ // 检查当前语言代码是否在RTL语言列表中
+ return rtlLanguages.contains(languageName);
+ }
diff -Nru kylin-calendar-4.10.0.0/debian/patches/0040-Translated-using-Weblate-Uyghur.patch kylin-calendar-4.10.0.0/debian/patches/0040-Translated-using-Weblate-Uyghur.patch
--- kylin-calendar-4.10.0.0/debian/patches/0040-Translated-using-Weblate-Uyghur.patch 1970-01-01 08:00:00.000000000 +0800
+++ kylin-calendar-4.10.0.0/debian/patches/0040-Translated-using-Weblate-Uyghur.patch 2024-12-16 10:12:04.000000000 +0800
@@ -0,0 +1,278 @@
+From: KevinDuan <duankaiwen@kylinos.cn>
+Date: Tue, 24 Sep 2024 07:08:37 +0000
+Subject: Translated using Weblate (Uyghur)
+
+Currently translated at 100.0% (118 of 118 strings)
+
+Translation: openkylin-nile-new/kylin-calendar
+Translate-URL: http://weblate.openkylin.top/projects/openkylin-nile-new/kylin-calendar/ug/
+---
+ translation/calendar_kk.ts | 20 ++++++++++----------
+ translation/calendar_ky.ts | 18 +++++++++---------
+ translation/calendar_ug.ts | 18 +++++++++---------
+ 3 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/translation/calendar_kk.ts b/translation/calendar_kk.ts
+index dff0530..7d22799 100644
+--- a/translation/calendar_kk.ts
++++ b/translation/calendar_kk.ts
+@@ -30,7 +30,7 @@
+ <location filename="../lunarcalendarwidget/schedulewidget.cpp" line="217"/>
+ <location filename="../lunarcalendarwidget/schedulewidget.cpp" line="249"/>
+ <source>Schedule Begin</source>
+- <translation>كۇنتارتىبى جۇز بەرگەن ۋاقت</translation>
++ <translation>كۇنتارتىبى جۇز بەرگەن ۋاقىت</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/schedulewidget.cpp" line="218"/>
+@@ -197,7 +197,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/schedulewidget.cpp" line="1016"/>
+ <source>不重复</source>
+- <translation>تەكرارلانمىسۇن</translation>
++ <translation>قايتالانبايدى</translation>
+ </message>
+ </context>
+ <context>
+@@ -220,7 +220,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="59"/>
+ <source>Schedule</source>
+- <translation>كالەندىر</translation>
++ <translation>كالەندٸر</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="66"/>
+@@ -230,7 +230,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="85"/>
+ <source>Are you sure you want to delete this event?</source>
+- <translation>ٴسىز نۇ ۋاقىيعانىڭ ٶشٸرۋشٸنٸ جەزىملەشتۈرەلەمٴسىز؟</translation>
++ <translation>ٴسىز نۇ ۋاقىيعانىڭ ٶشٸرۋشٸنٸ جەزملەشتۈرەلەمٴسىز؟</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="90"/>
+@@ -255,7 +255,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="121"/>
+ <source>No</source>
+- <translation>كۇشىنەن قالتۇرۇش</translation>
++ <translation>كۇشىنەن قالدىرۋ</translation>
+ </message>
+ </context>
+ <context>
+@@ -301,7 +301,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="197"/>
+ <source>April</source>
+- <translation>اپٸرەل</translation>
++ <translation>اپرەل</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="200"/>
+@@ -336,7 +336,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="218"/>
+ <source>November</source>
+- <translation>نويابېر</translation>
++ <translation>نويابىر</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="221"/>
+@@ -349,7 +349,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarwidget.cpp" line="344"/>
+ <source>Are you sure you want to delete this event?</source>
+- <translation>ٴسىز نۇ ۋاقىيعانىڭ ٶشٸرۋشٸنٸ جەزىملەشتۈرەلەمٴسىز؟</translation>
++ <translation>ٴسىز نۇ ۋاقىيعانىڭ ٶشٸرۋشٸنٸ جەزملەشتۈرەلەمٴسىز؟</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarwidget.cpp" line="502"/>
+@@ -479,7 +479,7 @@
+ </message>
+ <message>
+ <source>Friday</source>
+- <translation>اپتانىڭ بەسى</translation>
++ <translation>جۇما</translation>
+ </message>
+ <message>
+ <source>Saturday</source>
+@@ -506,7 +506,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/notificationsadaptor.cpp" line="103"/>
+ <source>Schedule Begin</source>
+- <translation>كۇنتارتىبى جۇز بەرگەن ۋاقت</translation>
++ <translation>كۇنتارتىبى جۇز بەرگەن ۋاقىت</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/notificationsadaptor.cpp" line="113"/>
+diff --git a/translation/calendar_ky.ts b/translation/calendar_ky.ts
+index 9023106..4f19c05 100644
+--- a/translation/calendar_ky.ts
++++ b/translation/calendar_ky.ts
+@@ -193,7 +193,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/schedulewidget.cpp" line="1016"/>
+ <source>不重复</source>
+- <translation>تەكرارلانمىسۇن</translation>
++ <translation>قايتىلانمايدۇ</translation>
+ </message>
+ </context>
+ <context>
+@@ -216,7 +216,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="59"/>
+ <source>Schedule</source>
+- <translation>كالىندار</translation>
++ <translation>كالەندار</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="66"/>
+@@ -226,7 +226,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="85"/>
+ <source>Are you sure you want to delete this event?</source>
+- <translation>سىز بۇل وقۇيانى ۅچۉرۉۉنۉ تۇراقتاندىرا الاسىزبى؟</translation>
++ <translation>سىز بۇل وقۇيانى ۅچۉرۉۉنۉ جەزملەشتۈرەلەمسىز؟</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="90"/>
+@@ -251,7 +251,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="121"/>
+ <source>No</source>
+- <translation>ارعادان قالتۇرۇش</translation>
++ <translation>ارعادان قالتىرىش</translation>
+ </message>
+ </context>
+ <context>
+@@ -297,7 +297,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="197"/>
+ <source>April</source>
+- <translation>ئاپرىل</translation>
++ <translation>اپرىل</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="200"/>
+@@ -322,7 +322,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="212"/>
+ <source>September</source>
+- <translation>سىنتابىر</translation>
++ <translation>سەنتابىر</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="215"/>
+@@ -332,7 +332,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="218"/>
+ <source>November</source>
+- <translation>نويابېر</translation>
++ <translation>نويابىر</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="221"/>
+@@ -345,7 +345,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarwidget.cpp" line="344"/>
+ <source>Are you sure you want to delete this event?</source>
+- <translation>سىز بۇل وقۇيانى ۅچۉرۉۉنۉ تۇراقتاندىرا الاسىزبى؟</translation>
++ <translation>سىز بۇل وقۇيانى ۅچۉرۉۉنۉ جەزملەشتۈرەلەمسىز؟</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarwidget.cpp" line="502"/>
+@@ -467,7 +467,7 @@
+ </message>
+ <message>
+ <source>Friday</source>
+- <translation>اپتانىن بەشى</translation>
++ <translation>جۇما</translation>
+ </message>
+ <message>
+ <source>Saturday</source>
+diff --git a/translation/calendar_ug.ts b/translation/calendar_ug.ts
+index 9051dc9..3b41038 100644
+--- a/translation/calendar_ug.ts
++++ b/translation/calendar_ug.ts
+@@ -30,7 +30,7 @@
+ <location filename="../lunarcalendarwidget/schedulewidget.cpp" line="217"/>
+ <location filename="../lunarcalendarwidget/schedulewidget.cpp" line="249"/>
+ <source>Schedule Begin</source>
+- <translation>كۈنتەرتىپ يۈز بەرگەن ۋاقت</translation>
++ <translation>كۈنتەرتىپ يۈز بەرگەن ۋاقىت</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/schedulewidget.cpp" line="218"/>
+@@ -216,7 +216,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="59"/>
+ <source>Schedule</source>
+- <translation>كالىندار</translation>
++ <translation>كالېندار</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="66"/>
+@@ -226,7 +226,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="85"/>
+ <source>Are you sure you want to delete this event?</source>
+- <translation>سىز بۇ ۋەقەنى ئۆچۈرۈشنى جەزىملەشتۈرەلەمسىز؟</translation>
++ <translation>سىز بۇ ۋەقەنى ئۆچۈرۈشنى جەزملەشتۈرەلەمسىز؟</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="90"/>
+@@ -251,7 +251,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/custommessagebox.cpp" line="121"/>
+ <source>No</source>
+- <translation>ئەمەلدىن قالتۇرۇش</translation>
++ <translation>ئەمەلدىن قالدۇرۇش</translation>
+ </message>
+ </context>
+ <context>
+@@ -297,7 +297,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="197"/>
+ <source>April</source>
+- <translation>ئاپرىل</translation>
++ <translation>ئاپرېل</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="200"/>
+@@ -322,7 +322,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="212"/>
+ <source>September</source>
+- <translation>سىنتەبىر</translation>
++ <translation>سېنتەبىر</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="215"/>
+@@ -332,7 +332,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="218"/>
+ <source>November</source>
+- <translation>نويابېر</translation>
++ <translation>نويابىر</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarmonthitem.cpp" line="221"/>
+@@ -345,7 +345,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarwidget.cpp" line="344"/>
+ <source>Are you sure you want to delete this event?</source>
+- <translation>سىز بۇ ۋەقەنى ئۆچۈرۈشنى جەزىملەشتۈرەلەمسىز؟</translation>
++ <translation>سىز بۇ ۋەقەنى ئۆچۈرۈشنى جەزملەشتۈرەلەمسىز؟</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/lunarcalendarwidget.cpp" line="502"/>
+@@ -494,7 +494,7 @@
+ <message>
+ <location filename="../lunarcalendarwidget/notificationsadaptor.cpp" line="103"/>
+ <source>Schedule Begin</source>
+- <translation>كۈنتەرتىپ يۈز بەرگەن ۋاقت</translation>
++ <translation>كۈنتەرتىپ يۈز بەرگەن ۋاقىت</translation>
+ </message>
+ <message>
+ <location filename="../lunarcalendarwidget/notificationsadaptor.cpp" line="113"/>
diff -Nru kylin-calendar-4.10.0.0/debian/patches/0041-42-fix-tesk-369491.patch kylin-calendar-4.10.0.0/debian/patches/0041-42-fix-tesk-369491.patch
--- kylin-calendar-4.10.0.0/debian/patches/0041-42-fix-tesk-369491.patch 1970-01-01 08:00:00.000000000 +0800
+++ kylin-calendar-4.10.0.0/debian/patches/0041-42-fix-tesk-369491.patch 2024-12-16 10:12:04.000000000 +0800
@@ -0,0 +1,983 @@
+From: =?utf-8?b?6LS+5aiB?= <jiawei@kylinos.cn>
+Date: Wed, 23 Oct 2024 02:27:03 +0000
+Subject: =?utf-8?q?!42_fix_tesk_369491_Merge_pull_request_!42_from_?=
+ =?utf-8?q?=E8=B4=BE=E5=A8=81/openkylin/nile?=
+
+---
+ lunarcalendarwidget/frmlunarcalendarwidget.cpp | 628 +++++++++++++++----------
+ lunarcalendarwidget/lunarcalendarwidget.cpp | 4 +
+ 2 files changed, 376 insertions(+), 256 deletions(-)
+
+diff --git a/lunarcalendarwidget/frmlunarcalendarwidget.cpp b/lunarcalendarwidget/frmlunarcalendarwidget.cpp
+index d1dc3b3..46400ca 100644
+--- a/lunarcalendarwidget/frmlunarcalendarwidget.cpp
++++ b/lunarcalendarwidget/frmlunarcalendarwidget.cpp
+@@ -62,59 +62,72 @@ frmLunarCalendarWidget::frmLunarCalendarWidget(QWidget *parent) : QWidget(parent
+ installEventFilter(this);
+ //加载翻译
+ translator();
+-// ui->setupUi(this);
++ // ui->setupUi(this);
+ QDBusConnection connection = QDBusConnection::sessionBus();
+ connection.interface()->registerService(
+- NotificationsDBusService,
+- QDBusConnectionInterface::ReplaceExistingService,
+- QDBusConnectionInterface::AllowReplacement);
++ NotificationsDBusService,
++ QDBusConnectionInterface::ReplaceExistingService,
++ QDBusConnectionInterface::AllowReplacement);
+ connection.registerObject(NotificationsDBusPath, this);
+- NotificationsAdaptor *s = new NotificationsAdaptor(this);
++ NotificationsAdaptor *s = new NotificationsAdaptor(this);
+ m_widget = new LunarCalendarWidget();
+- connect(s,&NotificationsAdaptor::dayWantToChange,this,&frmLunarCalendarWidget::slotdayWantToChange);
+- connect(m_widget,&LunarCalendarWidget::NeedToHide,this,[=](){
++ connect(s, &NotificationsAdaptor::dayWantToChange, this, &frmLunarCalendarWidget::slotdayWantToChange);
++ connect(m_widget, &LunarCalendarWidget::NeedToHide, this, [ = ]()
++ {
+ isWidgetVisible = false;
+ });
+- KWindowSystem::setState(m_widget->winId(),NET::SkipPager|NET::SkipTaskbar|NET::SkipSwitcher);
+- connect(ui->lunarCalendarWidget,&LunarCalendarWidget::almanacChanged,this,&frmLunarCalendarWidget::showAlmanac);
+- connect(this, &frmLunarCalendarWidget::onShowToday,ui->lunarCalendarWidget,&LunarCalendarWidget::showToday);
++ KWindowSystem::setState(m_widget->winId(), NET::SkipPager | NET::SkipTaskbar | NET::SkipSwitcher);
++ connect(ui->lunarCalendarWidget, &LunarCalendarWidget::almanacChanged, this, &frmLunarCalendarWidget::showAlmanac);
++ connect(this, &frmLunarCalendarWidget::onShowToday, ui->lunarCalendarWidget, &LunarCalendarWidget::showToday);
+
+ this->initForm();
+- if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland") {
++ if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland")
++ {
+ // qputenv("QT_QPA_PLATFORM", "wayland"); //openKylin
+ isWayland = true;
+- } else {
++ }
++ else
++ {
+ isWayland = false;
+ }
+ const QByteArray transparency_id(TRANSPARENCY_SETTINGS);
+- if(QGSettings::isSchemaInstalled(transparency_id)){
++ if(QGSettings::isSchemaInstalled(transparency_id))
++ {
+ transparency_gsettings = new QGSettings(transparency_id);
+ }
+ const QByteArray calendar_id(PANEL_CONTROL_IN_CALENDAR);
+- if(QGSettings::isSchemaInstalled(calendar_id)){
++ if(QGSettings::isSchemaInstalled(calendar_id))
++ {
+ calendar_gsettings = new QGSettings(calendar_id);
+ //公历/农历切换
+- connect(calendar_gsettings, &QGSettings::changed, this, [=] (const QString &key){
+- if(key == LUNAR_KEY){
++ connect(calendar_gsettings, &QGSettings::changed, this, [ = ] (const QString &key)
++ {
++ if(key == LUNAR_KEY)
++ {
+ ckShowLunar_stateChanged(calendar_gsettings->get(LUNAR_KEY).toString() == "lunar");
+ }
+- if (key == FIRST_DAY_KEY) {
++ if (key == FIRST_DAY_KEY)
++ {
+ cboxWeekNameFormat_currentIndexChanged(calendar_gsettings->get(FIRST_DAY_KEY).toString() == "sunday");
+ }
+ });
+- } else {
++ }
++ else
++ {
+ ckShowLunar_stateChanged(false);
+ cboxWeekNameFormat_currentIndexChanged(false);
+ }
+- setProperty("useStyleWindowManager",false);
++ setProperty("useStyleWindowManager", false);
+ initPanelGSettings();
+
+ QDBusConnection sessionBus = QDBusConnection::sessionBus();
+- if (sessionBus.registerService("org.ukui.kylin_calendar")) {
++ if (sessionBus.registerService("org.ukui.kylin_calendar"))
++ {
+ sessionBus.registerObject("/org/ukui/kylin_calendar", this, QDBusConnection::ExportAllContents);
+
+ qDebug() << "初始化DBUS成功";
+- }else
++ }
++ else
+ qDebug() << "初始化DBUS失败";
+
+ QDBusConnection::sessionBus().connect(
+@@ -126,15 +139,20 @@ frmLunarCalendarWidget::frmLunarCalendarWidget(QWidget *parent) : QWidget(parent
+ SLOT(onActivateRequest()) // 槽函数
+ );
+
+- if (!m_argName.isEmpty()) {
++ if (!m_argName.isEmpty())
++ {
+ qDebug() << "单例参数argName = " << m_argName;
+ int num = m_argName.size();
+- switch (num) {
++ switch (num)
++ {
+ case 1:
+- if(QFileInfo::exists(m_argName[0])){
++ if(QFileInfo::exists(m_argName[0]))
++ {
+ QMessageBox::warning(this, tr("Alert"), tr("Recorder does not support selecting the opening method to open files!"));
+ break;
+- }else{
++ }
++ else
++ {
+ command_Control(m_argName[0]);
+ break;
+ }
+@@ -153,22 +171,30 @@ frmLunarCalendarWidget::~frmLunarCalendarWidget()
+ void frmLunarCalendarWidget::initPanelGSettings()
+ {
+ const QByteArray id(PANEL_SETTINGS);
+- if (QGSettings::isSchemaInstalled(id)) {
+- if (m_panelGSettings == nullptr) {
++ if (QGSettings::isSchemaInstalled(id))
++ {
++ if (m_panelGSettings == nullptr)
++ {
+ m_panelGSettings = new QGSettings(id);
+ }
+- if (m_panelGSettings->keys().contains(PANEL_POSITION_KEY)) {
++ if (m_panelGSettings->keys().contains(PANEL_POSITION_KEY))
++ {
+ m_panelPosition = m_panelGSettings->get(PANEL_POSITION_KEY).toInt();
+ }
+- if (m_panelGSettings->keys().contains(PANEL_SIZE_KEY)) {
++ if (m_panelGSettings->keys().contains(PANEL_SIZE_KEY))
++ {
+ m_panelSize = m_panelGSettings->get(PANEL_SIZE_KEY).toInt();
+ }
+- connect(m_panelGSettings, &QGSettings::changed, this, [&] (const QString &key) {
+- if (key == PANEL_SIZE_KEY) {
++ connect(m_panelGSettings, &QGSettings::changed, this, [&] (const QString &key)
++ {
++ if (key == PANEL_SIZE_KEY)
++ {
+ m_panelSize = m_panelGSettings->get(PANEL_SIZE_KEY).toInt();
+
+-// m_widget->onGSettingsChanged(key);
+- }else if(key == PANEL_POSITION_KEY){
++ // m_widget->onGSettingsChanged(key);
++ }
++ else if(key == PANEL_POSITION_KEY)
++ {
+ m_panelPosition = m_panelGSettings->get(PANEL_POSITION_KEY).toInt();
+ }
+ });
+@@ -177,13 +203,16 @@ void frmLunarCalendarWidget::initPanelGSettings()
+
+ void frmLunarCalendarWidget::onActivateRequest()
+ {
+- qDebug()<<"onActivateRequest";
+- if(m_widget->isVisible()){
++ qDebug() << "onActivateRequest";
++ if(m_widget->isVisible())
++ {
+ hide();
+- }else{
++ }
++ else
++ {
+ show();
+- kdk::WindowManager::setSkipSwitcher(this->windowHandle(),true);
+- kdk::WindowManager::setSkipTaskBar(this->windowHandle(),true);
++ kdk::WindowManager::setSkipSwitcher(this->windowHandle(), true);
++ kdk::WindowManager::setSkipTaskBar(this->windowHandle(), true);
+ raise();
+ activateWindow();
+ }
+@@ -193,7 +222,8 @@ void frmLunarCalendarWidget::onActivateRequest()
+ void frmLunarCalendarWidget::checkSingle(QStringList path) //检查单例模式
+ {
+ QString str;
+- if (path.size() > 1) {
++ if (path.size() > 1)
++ {
+ str = path[1];
+ }
+
+@@ -201,12 +231,14 @@ void frmLunarCalendarWidget::checkSingle(QStringList path) //检查单例模式
+ //兼容VNC的单例模式
+ QString lockPath = homePath.at(0) + "/.config/kylin-calendar-lock";
+ int fd = open(lockPath.toUtf8().data(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+- if (fd < 0) {
++ if (fd < 0)
++ {
+ exit(1);
+ }
+- if (lockf(fd, F_TLOCK, 0)) {
++ if (lockf(fd, F_TLOCK, 0))
++ {
+ QDBusInterface interface("org.ukui.kylin_calendar", "/org/ukui/kylin_calendar", "org.ukui.kylin_calendar",
+- QDBusConnection::sessionBus());
++ QDBusConnection::sessionBus());
+ if (path.size() == 1)
+ interface.call("command_Control", str);
+ if (path.size() == 2)
+@@ -221,9 +253,11 @@ void frmLunarCalendarWidget::checkSingle(QStringList path) //检查单例模式
+
+ void frmLunarCalendarWidget::changeEvent(QEvent *event)
+ {
+- if (event->type() == QEvent::WindowStateChange) {
++ if (event->type() == QEvent::WindowStateChange)
++ {
+ auto windowState = window()->windowState();
+- if (windowState & Qt::WindowMinimized) {
++ if (windowState & Qt::WindowMinimized)
++ {
+ // 隐藏窗口至托盘
+ showMinimized();
+ }
+@@ -234,63 +268,69 @@ void frmLunarCalendarWidget::changeEvent(QEvent *event)
+ int frmLunarCalendarWidget::command_Control(QString cmd1)
+ {
+ qDebug() << "命令:" << cmd1;
+- /* if (cmd1 == "") //无参数，单例触发
++ /* if (cmd1 == "") //无参数，单例触发
++ {
++ if (!m_widget->isVisible()) {
++ qDebug()<<"1";
++ changeWidowposFromClickButton(true);
++ m_widget->show();
++ kdk::WindowManager::setSkipSwitcher(m_widget->windowHandle(),true);
++ kdk::WindowManager::setSkipTaskBar(m_widget->windowHandle(),true);
++ // kwin接口唤醒
++ KWindowSystem::forceActiveWindow(m_widget->winId());
++ qDebug() << "窗口置顶";
++ }
++ else if(m_widget->isVisible())
++ {
++ qDebug()<<"2";
++ m_widget->showMinimized();
++ // m_widget->hide();
++ qDebug() << "窗口隐藏";
++ }
++ return 0;
++
++ }*/
++ if (cmd1 == "") // 无参数，切换显示/隐藏状态
+ {
+- if (!m_widget->isVisible()) {
+- qDebug()<<"1";
+- changeWidowposFromClickButton(true);
+- m_widget->show();
+- kdk::WindowManager::setSkipSwitcher(m_widget->windowHandle(),true);
+- kdk::WindowManager::setSkipTaskBar(m_widget->windowHandle(),true);
+- // kwin接口唤醒
+- KWindowSystem::forceActiveWindow(m_widget->winId());
+- qDebug() << "窗口置顶";
+- }
+- else if(m_widget->isVisible())
++ qDebug() << "是空";
++ if (isWidgetVisible)
+ {
+- qDebug()<<"2";
+- m_widget->showMinimized();
+-// m_widget->hide();
++ // 如果当前是显示的，则隐藏
++ m_widget->hide();
+ qDebug() << "窗口隐藏";
++ isWidgetVisible = false; // 更新状态
++ }
++ else
++ {
++ // 如果当前是隐藏的，则显示
++ changeWidowposFromClickButton(true); // 假设这个函数是为了某种布局或位置调整
++ m_widget->show();
++ m_widget->activateWindow();
++ m_widget->raise();
++ kdk::WindowManager::setSkipSwitcher(m_widget->windowHandle(), true);
++ kdk::WindowManager::setSkipTaskBar(m_widget->windowHandle(), true);
++ // 可能还有其他的窗口激活或置顶操作
++ KWindowSystem::setState(m_widget->winId(), NET::SkipPager | NET::SkipTaskbar | NET::SkipSwitcher);
++ qDebug() << "窗口置顶并显示";
++ isWidgetVisible = true; // 更新状态
+ }
+ return 0;
+-
+- }*/
+- if (cmd1 == "") { // 无参数，切换显示/隐藏状态
+- qDebug()<<"是空";
+- if (isWidgetVisible) {
+- // 如果当前是显示的，则隐藏
+- m_widget->hide();
+- qDebug() << "窗口隐藏";
+- isWidgetVisible = false; // 更新状态
+- } else {
+- // 如果当前是隐藏的，则显示
+- changeWidowposFromClickButton(true); // 假设这个函数是为了某种布局或位置调整
+- m_widget->show();
+- m_widget->activateWindow();
+- m_widget->raise();
+- kdk::WindowManager::setSkipSwitcher(m_widget->windowHandle(), true);
+- kdk::WindowManager::setSkipTaskBar(m_widget->windowHandle(), true);
+- // 可能还有其他的窗口激活或置顶操作
+- qDebug() << "窗口置顶并显示";
+- isWidgetVisible = true; // 更新状态
+- }
+- return 0;
+- }
+- else
+- if (cmd1 == "-s" || cmd1 == "-show") //打开日历
++ }
++ else if (cmd1 == "-s" || cmd1 == "-show") //打开日历
+ {
+ show();
+- kdk::WindowManager::setSkipSwitcher(this->windowHandle(),true);
+- kdk::WindowManager::setSkipTaskBar(this->windowHandle(),true);
++ kdk::WindowManager::setSkipSwitcher(this->windowHandle(), true);
++ kdk::WindowManager::setSkipTaskBar(this->windowHandle(), true);
+ return 0;
+- }else
+- if (cmd1 == "-h" || cmd1 == "-hide") //隐藏
++ }
++ else if (cmd1 == "-h" || cmd1 == "-hide") //隐藏
+ {
+- qDebug()<<"---h";
++ qDebug() << "---h";
+ showMinimized();
+ return 0;
+- }else{
++ }
++ else
++ {
+ QMessageBox::warning(this, tr("Alert"), tr("Calendar does not support opening file in open mode."));
+ }
+ return 0; //重要:int类型的函数一定要加返回值
+@@ -322,34 +362,39 @@ QRect frmLunarCalendarWidget::changepos()
+ y = availableGeo.y() + availableGeo.height() - this->height() - margin;
+ break;
+ }
+- return QRect(x, y,440, 400);
++ return QRect(x, y, 440, 400);
+ }
+
+ void frmLunarCalendarWidget::showAlmanac(bool big)
+ {
+- qDebug() << __FILE__ <<__LINE__<<__FUNCTION__<<big;
+- if(big){
+- setFixedHeight(CALENDAR_HEIGHT+CALENDAR_LUNAR_HEIGHT+CALENDAR_LUNAR_HEIGHT_PLUSE);
+- }else{
++ qDebug() << __FILE__ << __LINE__ << __FUNCTION__ << big;
++ if(big)
++ {
++ setFixedHeight(CALENDAR_HEIGHT + CALENDAR_LUNAR_HEIGHT + CALENDAR_LUNAR_HEIGHT_PLUSE);
++ }
++ else
++ {
+ setFixedHeight(CALENDAR_HEIGHT);
+ }
+ }
+ void frmLunarCalendarWidget::changeUpSize(int num)
+ {
+- qDebug()<<"----------changeUpsieze";
++ qDebug() << "----------changeUpsieze";
+ yijiIsUp = true;
+ this->setFixedSize(CALENDAR_WIDTH, 1050);
+- qDebug()<<"changeUpSize里面的宽高"<<CALENDAR_WIDTH<<CALENDAR_HEIGHT+CALENDAR_LUNAR_HEIGHT+CALENDAR_LUNAR_HEIGHT_PLUSE+2*40;
++ qDebug() << "changeUpSize里面的宽高" << CALENDAR_WIDTH << CALENDAR_HEIGHT + CALENDAR_LUNAR_HEIGHT + CALENDAR_LUNAR_HEIGHT_PLUSE + 2 * 40;
+ Q_EMIT yijiFChangeUp();
+ }
+
+ void frmLunarCalendarWidget::changeUp(int n)
+ {
+- if(yijiIsUp){
+- this->setFixedSize(CALENDAR_WIDTH, CALENDAR_HEIGHT+CALENDAR_LUNAR_HEIGHT+CALENDAR_LUNAR_HEIGHT_PLUSE+40*n);
++ if(yijiIsUp)
++ {
++ this->setFixedSize(CALENDAR_WIDTH, CALENDAR_HEIGHT + CALENDAR_LUNAR_HEIGHT + CALENDAR_LUNAR_HEIGHT_PLUSE + 40 * n);
+ }
+- else{
+- this->setFixedSize(CALENDAR_WIDTH, CALENDAR_HEIGHT+CALENDAR_LUNAR_HEIGHT+40*n);
++ else
++ {
++ this->setFixedSize(CALENDAR_WIDTH, CALENDAR_HEIGHT + CALENDAR_LUNAR_HEIGHT + 40 * n);
+ }
+ Q_EMIT Up(n);
+
+@@ -359,7 +404,7 @@ void frmLunarCalendarWidget::changeDownSize(int num)
+ {
+ yijiIsUp = false;
+ this->setFixedSize(CALENDAR_WIDTH, 925);
+- qDebug()<<"changeDownSize"<<CALENDAR_WIDTH, CALENDAR_HEIGHT+CALENDAR_LUNAR_HEIGHT+2*40;
++ qDebug() << "changeDownSize" << CALENDAR_WIDTH, CALENDAR_HEIGHT + CALENDAR_LUNAR_HEIGHT + 2 * 40;
+ Q_EMIT yijiFChangeDown();
+ }
+
+@@ -370,29 +415,35 @@ void frmLunarCalendarWidget::initForm()
+
+ void frmLunarCalendarWidget::cboxCalendarStyle_currentIndexChanged(int index)
+ {
+- m_widget->setCalendarStyle((LunarCalendarWidget::CalendarStyle)index);
++ m_widget->setCalendarStyle((LunarCalendarWidget::CalendarStyle)index);
+ }
+
+ void frmLunarCalendarWidget::cboxSelectType_currentIndexChanged(int index)
+ {
+- m_widget->setSelectType((LunarCalendarWidget::SelectType)index);
++ m_widget->setSelectType((LunarCalendarWidget::SelectType)index);
+ }
+
+ void frmLunarCalendarWidget::cboxWeekNameFormat_currentIndexChanged(bool FirstDayisSun)
+ {
+- m_widget->setWeekNameFormat(FirstDayisSun);
++ m_widget->setWeekNameFormat(FirstDayisSun);
+ }
+
+ void frmLunarCalendarWidget::ckShowLunar_stateChanged(bool arg1)
+ {
+- if (arg1) {
+- if (yijiIsUp) {
+- this->setFixedSize(CALENDAR_WIDTH,CALENDAR_HEIGHT+CALENDAR_LUNAR_HEIGHT+CALENDAR_LUNAR_HEIGHT_PLUSE);
+- } else {
+- this->setFixedSize(CALENDAR_WIDTH,CALENDAR_HEIGHT+CALENDAR_LUNAR_HEIGHT);
++ if (arg1)
++ {
++ if (yijiIsUp)
++ {
++ this->setFixedSize(CALENDAR_WIDTH, CALENDAR_HEIGHT + CALENDAR_LUNAR_HEIGHT + CALENDAR_LUNAR_HEIGHT_PLUSE);
++ }
++ else
++ {
++ this->setFixedSize(CALENDAR_WIDTH, CALENDAR_HEIGHT + CALENDAR_LUNAR_HEIGHT);
+ }
+- } else {
+- this->setFixedSize(CALENDAR_WIDTH,CALENDAR_HEIGHT);
++ }
++ else
++ {
++ this->setFixedSize(CALENDAR_WIDTH, CALENDAR_HEIGHT);
+ }
+ }
+
+@@ -402,10 +453,11 @@ void frmLunarCalendarWidget::paintEvent(QPaintEvent *)
+ opt.init(this);
+ QRect rect = this->rect();
+ QPainter p(this);
+- double tran =1;
++ double tran = 1;
+ const QByteArray transparency_id(TRANSPARENCY_SETTINGS);
+- if(transparency_gsettings!=nullptr){
+- tran=transparency_gsettings->get(TRANSPARENCY_KEY).toDouble()*255;
++ if(transparency_gsettings != nullptr)
++ {
++ tran = transparency_gsettings->get(TRANSPARENCY_KEY).toDouble() * 255;
+ }
+
+ QColor color = palette().color(QPalette::Base);
+@@ -426,19 +478,19 @@ bool frmLunarCalendarWidget::eventFilter(QObject *obj, QEvent *event)
+ if (obj == this)
+ {
+ if (event->type() == QEvent::MouseButtonPress)
+- {
+- QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
+- if (mouseEvent->button() == Qt::LeftButton)
+- {
+-// this->hide();
+-// status=ST_HIDE;
+- return true;
+- }
+- else if(mouseEvent->button() == Qt::RightButton)
+- {
+- return true;
+- }
+- }
++ {
++ QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
++ if (mouseEvent->button() == Qt::LeftButton)
++ {
++ // this->hide();
++ // status=ST_HIDE;
++ return true;
++ }
++ else if(mouseEvent->button() == Qt::RightButton)
++ {
++ return true;
++ }
++ }
+ else if(event->type() == QEvent::ContextMenu)
+ {
+ return false;
+@@ -446,10 +498,12 @@ bool frmLunarCalendarWidget::eventFilter(QObject *obj, QEvent *event)
+ else if (event->type() == QEvent::WindowDeactivate)
+ {
+ //qDebug()<<"激活外部窗口";
+-// this->hide();
++ // this->hide();
+ isWidgetVisible = false;
+ return true;
+- } else if (event->type() == QEvent::StyleChange) {
++ }
++ else if (event->type() == QEvent::StyleChange)
++ {
+ }
+ }
+
+@@ -457,7 +511,7 @@ bool frmLunarCalendarWidget::eventFilter(QObject *obj, QEvent *event)
+ }
+ void frmLunarCalendarWidget::changeWidowposFromClickButton(bool restore)
+ {
+- qDebug()<<"changeWidowposFromClickButton";
++ qDebug() << "changeWidowposFromClickButton";
+ CalendarDataBase::getInstance().searchDataSlot(QDate::currentDate());
+ m_num = CalendarDataBase::getInstance().getInfoList().count();
+ int totalHeight = qApp->screenAt(QCursor::pos())->size().height() + qApp->screenAt(QCursor::pos())->geometry().y();//屏幕高度
+@@ -466,195 +520,251 @@ void frmLunarCalendarWidget::changeWidowposFromClickButton(bool restore)
+ QRect rect;
+ m_isshow = false;
+ ll = false;
+- if(m_panelPosition == 0){
+- if(!isWayland){
+- if(!m_widget->yijistate){
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,totalHeight-m_panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- if(isRTLLanguage()){
+- setRect(rect,qApp->screenAt(QCursor::pos())->geometry().x()+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(m_panelPosition == 0)
++ {
++ if(!isWayland)
++ {
++ if(!m_widget->yijistate)
++ {
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - m_panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(isRTLLanguage())
++ {
++ setRect(rect, qApp->screenAt(QCursor::pos())->geometry().x() + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- if(totalHeight-m_panelSize< LESSTWOSHCEDULE_CALENDAR_HEIGHT){
++ if(totalHeight - m_panelSize < LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
+ m_widget->ScrollbarUnderTheResolution = true;
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,SCROLLA-WIDGET_GAP,ORIGIN_CALENDAR_WIDTH,totalHeight-m_panelSize-SCROLLA);
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, SCROLLA - WIDGET_GAP, ORIGIN_CALENDAR_WIDTH, totalHeight - m_panelSize - SCROLLA);
+
+ }
+- else if(LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT > totalHeight-m_panelSize && totalHeight-m_panelSize > LESSTWOSHCEDULE_CALENDAR_HEIGHT){
++ else if(LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT > totalHeight - m_panelSize && totalHeight - m_panelSize > LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
+ //点击yiji后超出屏幕的时候，这个时候就固定是LESSTWOSHCEDULE_CALENDAR_HEIGHT，只不过滑动区域少了
+ m_widget->ScrollAreaNeedChange = false;
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,
+- totalHeight-m_panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,
++ totalHeight - m_panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
+ ORIGIN_CALENDAR_WIDTH,
+ LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- if(m_num >= 2){
++ if(m_num >= 2)
++ {
+ m_widget->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+ }
+ }
+ }
+- else{
+- if(totalHeight-m_panelSize< LESSTWOSHCEDULE_CALENDAR_HEIGHT){
++ else
++ {
++ if(totalHeight - m_panelSize < LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
+ m_widget->ScrollbarUnderTheResolution = true;
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,SCROLLA-WIDGET_GAP,ORIGIN_CALENDAR_WIDTH,totalHeight-m_panelSize-SCROLLA);
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, SCROLLA - WIDGET_GAP, ORIGIN_CALENDAR_WIDTH, totalHeight - m_panelSize - SCROLLA);
+
+ }
+- else if(LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT > totalHeight-m_panelSize && totalHeight-m_panelSize > LESSTWOSHCEDULE_CALENDAR_HEIGHT){
++ else if(LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT > totalHeight - m_panelSize && totalHeight - m_panelSize > LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
+ //点击yiji后超出屏幕的时候，这个时候就固定是LESSTWOSHCEDULE_CALENDAR_HEIGHT，只不过滑动区域少了
+ m_widget->ScrollAreaNeedChange = true;
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,
+- totalHeight-m_panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,
++ totalHeight - m_panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
+ ORIGIN_CALENDAR_WIDTH,
+ LESSTWOSHCEDULE_CALENDAR_HEIGHT);//设计稿1080下
+ //m_widget->scrollArea->setFixedSize(420,100);
+ m_widget->scrollArea->setFixedWidth(ORIGIN_CALENDAR_WIDTH);
+- if(m_num >= 2){
++ if(m_num >= 2)
++ {
+ m_widget->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+ }
+
+ }
+- else{
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,totalHeight-m_panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-YIJI_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
++ else
++ {
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - m_panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - YIJI_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
+
+ }
+ }
+ }
+ if(isWayland)
+ {
+- if(!m_widget->yijistate){
+- if(totalHeight-m_panelSize - 14< LESSTWOSHCEDULE_CALENDAR_HEIGHT){
+-
++ if(!m_widget->yijistate)
++ {
++ if(totalHeight - m_panelSize - 14 < LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
++
+ m_widget->ScrollbarUnderTheResolution = true;
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,SCROLLA-WIDGET_GAP,ORIGIN_CALENDAR_WIDTH,totalHeight-m_panelSize-SCROLLA);
+- m_widget->scrollArea->setFixedSize(420,100);
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, SCROLLA - WIDGET_GAP, ORIGIN_CALENDAR_WIDTH, totalHeight - m_panelSize - SCROLLA);
++ m_widget->scrollArea->setFixedSize(420, 100);
+ m_widget->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+
+ }
+- else if(LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT > totalHeight-m_panelSize-14 && totalHeight-m_panelSize-14 > LESSTWOSHCEDULE_CALENDAR_HEIGHT){
++ else if(LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT > totalHeight - m_panelSize - 14 && totalHeight - m_panelSize - 14 > LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
+ //点击yiji后超出屏幕的时候，这个时候就固定是LESSTWOSHCEDULE_CALENDAR_HEIGHT，只不过滑动区域少了
+ m_widget->ScrollAreaNeedChange = true;
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,
+- totalHeight-m_panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,
++ totalHeight - m_panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
+ ORIGIN_CALENDAR_WIDTH,
+ LESSTWOSHCEDULE_CALENDAR_HEIGHT);//设计稿1080下
+- if(m_num >= 2){
++ if(m_num >= 2)
++ {
+ m_widget->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+ }
+ }
+ else
+ {
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,totalHeight-m_panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- if(isRTLLanguage()){
+- setRect(rect,qApp->screenAt(QCursor::pos())->geometry().x()+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - m_panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ if(isRTLLanguage())
++ {
++ setRect(rect, qApp->screenAt(QCursor::pos())->geometry().x() + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ }
+ }
+- }
+ }
+
+- else{
+- if(totalHeight-m_panelSize - 14< LESSTWOSHCEDULE_CALENDAR_HEIGHT){
++ else
++ {
++ if(totalHeight - m_panelSize - 14 < LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
+ m_widget->ScrollbarUnderTheResolution = true;
+- m_widget->scrollArea->setFixedSize(420,100);
++ m_widget->scrollArea->setFixedSize(420, 100);
+ m_widget->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,SCROLLA-WIDGET_GAP,ORIGIN_CALENDAR_WIDTH,totalHeight-m_panelSize-SCROLLA);
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, SCROLLA - WIDGET_GAP, ORIGIN_CALENDAR_WIDTH, totalHeight - m_panelSize - SCROLLA);
+ }
+- else if(LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT > totalHeight-m_panelSize -14 && totalHeight-m_panelSize -14 > LESSTWOSHCEDULE_CALENDAR_HEIGHT){
++ else if(LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT > totalHeight - m_panelSize - 14 && totalHeight - m_panelSize - 14 > LESSTWOSHCEDULE_CALENDAR_HEIGHT)
++ {
+ //点击yiji后超出屏幕的时候，这个时候就固定是LESSTWOSHCEDULE_CALENDAR_HEIGHT，只不过滑动区域少了
+ m_widget->ScrollAreaNeedChange = true;
+- rect.setRect(totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,
+- totalHeight-m_panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
++ rect.setRect(totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,
++ totalHeight - m_panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
+ ORIGIN_CALENDAR_WIDTH,
+ LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- m_widget->scrollArea->setFixedSize(420,100);
+- if(m_num >= 2){
++ m_widget->scrollArea->setFixedSize(420, 100);
++ if(m_num >= 2)
++ {
+ m_widget->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+ }
+
+ }
+- else{
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH - WIDGET_GAP,totalHeight-m_panelSize-LESSTWOSHCEDULE_CALENDAR_HEIGHT-YIJI_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
+- }
++ else
++ {
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - m_panelSize - LESSTWOSHCEDULE_CALENDAR_HEIGHT - YIJI_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
+ }
+ }
+-
++ // KWindowEffects::slideWindow(winId(), KWindowEffects::BottomEdge, height());
++ KWindowEffects::slideWindow(m_widget, KWindowEffects::BottomEdge);
+ }
+- else if(m_panelPosition ==1){
+- if(isWayland){
+- if(!m_widget->yijistate){
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+m_panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ else if(m_panelPosition == 1)
++ {
++ if(isWayland)
++ {
++ if(!m_widget->yijistate)
++ {
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + m_panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+
+ }
+- else{
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+m_panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
++ else
++ {
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + m_panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ }
++ else
++ {
++ if(!m_widget->yijistate)
++ {
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + m_panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- }else{
+- if(!m_widget->yijistate){
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+m_panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- }else{
+- setRect(rect,totalWidth-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,qApp->screenAt(QCursor::pos())->geometry().y()+m_panelSize+WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
++ else
++ {
++ setRect(rect, totalWidth - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, qApp->screenAt(QCursor::pos())->geometry().y() + m_panelSize + WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
+ }
+ }
++ KWindowEffects::slideWindow(m_widget, KWindowEffects::TopEdge);
+
+ }
+- else if(m_panelPosition ==2){
+- if(isWayland){
+- if(!m_widget->yijistate){
+- setRect(rect,qApp->screenAt(QCursor::pos())->geometry().x()+m_panelSize+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ else if(m_panelPosition == 2)
++ {
++ if(isWayland)
++ {
++ if(!m_widget->yijistate)
++ {
++ setRect(rect, qApp->screenAt(QCursor::pos())->geometry().x() + m_panelSize + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ }
++ else
++ {
++ setRect(rect, qApp->screenAt(QCursor::pos())->geometry().x() + m_panelSize + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
+ }
+- else{
+- setRect(rect,qApp->screenAt(QCursor::pos())->geometry().x()+m_panelSize+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
++ }
++ else
++ {
++ if(!m_widget->yijistate)
++ {
++ rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x() + m_panelSize + WIDGET_GAP,
++ totalHeight - m_widget->height() - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH,
++ LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- }else{
+- if(!m_widget->yijistate){
+- rect.setRect(qApp->screenAt(QCursor::pos())->geometry().x()+m_panelSize+WIDGET_GAP,
+- totalHeight-m_widget->height()-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,
+- LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- }else{
+- setRect(rect,qApp->screenAt(QCursor::pos())->geometry().x()+m_panelSize+WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
++ else
++ {
++ setRect(rect, qApp->screenAt(QCursor::pos())->geometry().x() + m_panelSize + WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
+ }
+ }
+
++ KWindowEffects::slideWindow(m_widget, KWindowEffects::LeftEdge);
+ }
+- else{
+- if(isWayland){
+- if(!m_widget->yijistate){
+- setRect(rect,totalWidth-m_panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
++ else
++ {
++ if(isWayland)
++ {
++ if(!m_widget->yijistate)
++ {
++ setRect(rect, totalWidth - m_panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- else{
+- setRect(rect,totalWidth-m_panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
++ else
++ {
++ setRect(rect, totalWidth - m_panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
++ }
++ }
++ else
++ {
++ if(!m_widget->yijistate)
++ {
++ setRect(rect, totalWidth - m_panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+ }
+- }else{
+- if(!m_widget->yijistate){
+- setRect(rect,totalWidth-m_panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT);
+- }else{
+- setRect(rect,totalWidth-m_panelSize-ORIGIN_CALENDAR_WIDTH-WIDGET_GAP,totalHeight-LESSTWOSHCEDULE_CALENDAR_HEIGHT-WIDGET_GAP-YIJI_HEIGHT,
+- ORIGIN_CALENDAR_WIDTH,LESSTWOSHCEDULE_CALENDAR_HEIGHT+YIJI_HEIGHT);
++ else
++ {
++ setRect(rect, totalWidth - m_panelSize - ORIGIN_CALENDAR_WIDTH - WIDGET_GAP, totalHeight - LESSTWOSHCEDULE_CALENDAR_HEIGHT - WIDGET_GAP - YIJI_HEIGHT,
++ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
+ }
+ }
++ KWindowEffects::slideWindow(m_widget, KWindowEffects::RightEdge);
+ }
+
+
+- if(restore) {
+- m_widget->showCalendar(true);
+- KWindowSystem::setState(m_widget->winId(),NET::SkipPager|NET::SkipTaskbar|NET::SkipSwitcher);
+- } else {
++ if(restore)
++ {
++ m_widget->showCalendar(true);
++ KWindowSystem::setState(m_widget->winId(), NET::SkipPager | NET::SkipTaskbar | NET::SkipSwitcher);
++ }
++ else
++ {
+ m_widget->showCalendar(false);
+ }
+- kdk::WindowManager::setGeometry(m_widget->windowHandle(),rect);
+- KWindowSystem::setState(m_widget->winId(),NET::SkipPager|NET::SkipTaskbar|NET::SkipSwitcher);
++ kdk::WindowManager::setGeometry(m_widget->windowHandle(), rect);
++ KWindowSystem::setState(m_widget->winId(), NET::SkipPager | NET::SkipTaskbar | NET::SkipSwitcher);
+ }
+ void frmLunarCalendarWidget::translator()
+ {
+@@ -662,19 +772,22 @@ void frmLunarCalendarWidget::translator()
+ translator->load(QLocale(), "calendar", "_", CALENDAR_TRANSLATION_DIR);
+ QCoreApplication::installTranslator(translator);
+ }
+-void frmLunarCalendarWidget::slotdayWantToChange(int day,int month,int year)
++void frmLunarCalendarWidget::slotdayWantToChange(int day, int month, int year)
+ {
+- QDate date(year,month,day);
+- if (isWidgetVisible) {
++ QDate date(year, month, day);
++ if (isWidgetVisible)
++ {
+ // 如果当前是显示的，则隐藏
+ m_widget->hide();
+ qDebug() << "窗口隐藏";
+ isWidgetVisible = false; // 更新状态
+- } else {
++ }
++ else
++ {
+ // 如果当前是隐藏的，则显示
+- qDebug()<<"date:"<<date;
++ qDebug() << "date:" << date;
+ changeWidowposFromClickButton(false);
+- m_widget->date=m_widget->s_clickDate= date;
++ m_widget->date = m_widget->s_clickDate = date;
+
+ m_widget->updateAllSchedule();
+ m_widget->updateLayout();
+@@ -682,8 +795,8 @@ void frmLunarCalendarWidget::slotdayWantToChange(int day,int month,int year)
+ m_widget->show();
+ m_widget->activateWindow();
+ m_widget->raise();
+- m_widget->dateChanged(year,month,day);
+- m_widget->dayChanged(date,date);
++ m_widget->dateChanged(year, month, day);
++ m_widget->dayChanged(date, date);
+
+ kdk::WindowManager::setSkipSwitcher(m_widget->windowHandle(), true);
+ kdk::WindowManager::setSkipTaskBar(m_widget->windowHandle(), true);
+@@ -694,23 +807,26 @@ void frmLunarCalendarWidget::slotdayWantToChange(int day,int month,int year)
+ }
+ void frmLunarCalendarWidget::setRect(QRect &rect, int x, int y, int width, int height)
+ {
+- rect.setRect(x,y,width,height);
++ rect.setRect(x, y, width, height);
+ }
+-bool frmLunarCalendarWidget::isRTLLanguage() {
++bool frmLunarCalendarWidget::isRTLLanguage()
++{
+ // 获取当前系统的语言代码
+ QLocale locale = QLocale::system();
+ QString languageCode = locale.name();
+ QString languageName;
+- qDebug()<<"languageCode"<<languageCode;
++ qDebug() << "languageCode" << languageCode;
+ int separatorIndex = languageCode.indexOf('_');
+- if (separatorIndex == -1) {
+- separatorIndex = languageCode.indexOf('-');
+- }
+- // 如果找到了分隔符，就剥离出语言代码部分
+- if (separatorIndex != -1) {
+- languageName = languageCode.left(separatorIndex);
+- }
+- QStringList rtlLanguages = {"ar", "fa", "he", "ps", "ur","kk","ky","ug"};
++ if (separatorIndex == -1)
++ {
++ separatorIndex = languageCode.indexOf('-');
++ }
++ // 如果找到了分隔符，就剥离出语言代码部分
++ if (separatorIndex != -1)
++ {
++ languageName = languageCode.left(separatorIndex);
++ }
++ QStringList rtlLanguages = {"ar", "fa", "he", "ps", "ur", "kk", "ky", "ug"};
+ // 检查当前语言代码是否在RTL语言列表中
+ return rtlLanguages.contains(languageName);
+ }
+diff --git a/lunarcalendarwidget/lunarcalendarwidget.cpp b/lunarcalendarwidget/lunarcalendarwidget.cpp
+index fc99e7a..1c02391 100644
+--- a/lunarcalendarwidget/lunarcalendarwidget.cpp
++++ b/lunarcalendarwidget/lunarcalendarwidget.cpp
+@@ -3016,8 +3016,12 @@ bool LunarCalendarWidget::eventFilter(QObject *watched, QEvent *event)
+ }
+ void LunarCalendarWidget::showCalendar(bool needShowToday)
+ {
++ KWindowSystem::setState(winId(), NET::SkipPager | NET::SkipTaskbar | NET::SkipSwitcher);
++
+ show();
+ KWindowSystem::setState(winId(), NET::SkipPager | NET::SkipTaskbar | NET::SkipSwitcher);
++ // KWindowEffects::slideWindow(winId(), KWindowEffects::BottomEdge, height());
++
+
+ if(needShowToday)
+ {
diff -Nru kylin-calendar-4.10.0.0/debian/patches/0042-43-wlcom.patch kylin-calendar-4.10.0.0/debian/patches/0042-43-wlcom.patch
--- kylin-calendar-4.10.0.0/debian/patches/0042-43-wlcom.patch 1970-01-01 08:00:00.000000000 +0800
+++ kylin-calendar-4.10.0.0/debian/patches/0042-43-wlcom.patch 2024-12-16 10:12:04.000000000 +0800
@@ -0,0 +1,71 @@
+From: =?utf-8?b?6LS+5aiB?= <jiawei@kylinos.cn>
+Date: Wed, 23 Oct 2024 02:49:00 +0000
+Subject: =?utf-8?b?ITQzIOihpeWFheS/ruaUuXdsY29t5LiL55qE5Yqo5pWIIE1lcmdlIHB1?=
+ =?utf-8?b?bGwgcmVxdWVzdCAhNDMgZnJvbSDotL7lqIEvb3Blbmt5bGluL25pbGU=?=
+
+---
+ lunarcalendarwidget/frmlunarcalendarwidget.cpp | 24 ++++++++++++++++++++----
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/lunarcalendarwidget/frmlunarcalendarwidget.cpp b/lunarcalendarwidget/frmlunarcalendarwidget.cpp
+index 46400ca..89a2bb6 100644
+--- a/lunarcalendarwidget/frmlunarcalendarwidget.cpp
++++ b/lunarcalendarwidget/frmlunarcalendarwidget.cpp
+@@ -655,7 +655,7 @@ void frmLunarCalendarWidget::changeWidowposFromClickButton(bool restore)
+ }
+ }
+ // KWindowEffects::slideWindow(winId(), KWindowEffects::BottomEdge, height());
+- KWindowEffects::slideWindow(m_widget, KWindowEffects::BottomEdge);
++ // KWindowEffects::slideWindow(m_widget, KWindowEffects::BottomEdge);
+ }
+ else if(m_panelPosition == 1)
+ {
+@@ -686,7 +686,7 @@ void frmLunarCalendarWidget::changeWidowposFromClickButton(bool restore)
+ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
+ }
+ }
+- KWindowEffects::slideWindow(m_widget, KWindowEffects::TopEdge);
++ // KWindowEffects::slideWindow(m_widget, KWindowEffects::TopEdge);
+
+ }
+ else if(m_panelPosition == 2)
+@@ -720,7 +720,7 @@ void frmLunarCalendarWidget::changeWidowposFromClickButton(bool restore)
+ }
+ }
+
+- KWindowEffects::slideWindow(m_widget, KWindowEffects::LeftEdge);
++ // KWindowEffects::slideWindow(m_widget, KWindowEffects::LeftEdge);
+ }
+ else
+ {
+@@ -750,13 +750,29 @@ void frmLunarCalendarWidget::changeWidowposFromClickButton(bool restore)
+ ORIGIN_CALENDAR_WIDTH, LESSTWOSHCEDULE_CALENDAR_HEIGHT + YIJI_HEIGHT);
+ }
+ }
+- KWindowEffects::slideWindow(m_widget, KWindowEffects::RightEdge);
++ // KWindowEffects::slideWindow(m_widget, KWindowEffects::RightEdge);
+ }
+
+
+ if(restore)
+ {
+ m_widget->showCalendar(true);
++ if(m_panelPosition == 0)
++ {
++ KWindowEffects::slideWindow(m_widget, KWindowEffects::BottomEdge);
++ }
++ else if (m_panelPosition == 1)
++ {
++ KWindowEffects::slideWindow(m_widget, KWindowEffects::TopEdge);
++ }
++ else if(m_panelPosition == 2)
++ {
++ KWindowEffects::slideWindow(m_widget, KWindowEffects::LeftEdge);
++ }
++ else
++ {
++ KWindowEffects::slideWindow(m_widget, KWindowEffects::RightEdge);
++ }
+ KWindowSystem::setState(m_widget->winId(), NET::SkipPager | NET::SkipTaskbar | NET::SkipSwitcher);
+ }
+ else
diff -Nru kylin-calendar-4.10.0.0/debian/patches/0043-50-2025.patch kylin-calendar-4.10.0.0/debian/patches/0043-50-2025.patch
--- kylin-calendar-4.10.0.0/debian/patches/0043-50-2025.patch 1970-01-01 08:00:00.000000000 +0800
+++ kylin-calendar-4.10.0.0/debian/patches/0043-50-2025.patch 2024-12-16 10:12:04.000000000 +0800
@@ -0,0 +1,55 @@
+From: =?utf-8?b?6LS+5aiB?= <jiawei@kylinos.cn>
+Date: Mon, 16 Dec 2024 02:17:44 +0000
+Subject: =?utf-8?b?ITUwIOabtOaWsDIwMjXlubToioLlgYfml6UgTWVyZ2UgcHVsbCByZXF1?=
+ =?utf-8?b?ZXN0ICE1MCBmcm9tIOi0vuWogS9vcGVua3lsaW4vbmlsZQ==?=
+
+---
+ html/jiejiari.json | 37 ++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 36 insertions(+), 1 deletion(-)
+
+diff --git a/html/jiejiari.json b/html/jiejiari.json
+index fe97252..b72bf3f 100644
+--- a/html/jiejiari.json
++++ b/html/jiejiari.json
+@@ -516,5 +516,40 @@
+ "d1006": "2",
+ "d1007": "2",
+ "d1012": "1"
+- }
++ },
++ "worktime.y2025":{
++ "d0101": "2",
++ "d0126": "1",
++ "d0128": "2",
++ "d0129": "2",
++ "d0130": "2",
++ "d0131": "2",
++ "d0201": "2",
++ "d0202": "2",
++ "d0203": "2",
++ "d0204": "2",
++ "d0208": "1",
++ "d0404": "2",
++ "d0405": "2",
++ "d0406": "2",
++ "d0427": "1",
++ "d0501": "2",
++ "d0502": "2",
++ "d0503": "2",
++ "d0504": "2",
++ "d0505": "2",
++ "d0531": "2",
++ "d0601": "2",
++ "d0602": "2",
++ "d0928": "1",
++ "d1001": "2",
++ "d1002": "2",
++ "d1003": "2",
++ "d1004": "2",
++ "d1005": "2",
++ "d1006": "2",
++ "d1007": "2",
++ "d1008": "2",
++ "d1011": "1"
++ }
+ }
diff -Nru kylin-calendar-4.10.0.0/debian/patches/series kylin-calendar-4.10.0.0/debian/patches/series
--- kylin-calendar-4.10.0.0/debian/patches/series 2024-08-23 14:14:28.000000000 +0800
+++ kylin-calendar-4.10.0.0/debian/patches/series 2024-12-16 10:12:04.000000000 +0800
@@ -35,3 +35,9 @@
0035-38-update-translation.patch
0036-Translated-using-Weblate-Uyghur.patch
0037-39-fix-I9STQ3.patch
+0038-40-Dbus.patch
+0039-41.patch
+0040-Translated-using-Weblate-Uyghur.patch
+0041-42-fix-tesk-369491.patch
+0042-43-wlcom.patch
+0043-50-2025.patch