Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

feat: Unable to set timer reminder in Linglong environment #184

Merged
merged 2 commits into from
Aug 14, 2024
Merged

feat: Unable to set timer reminder in Linglong environment #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f63bf7
feat: Unable to set timer reminder in Linglong environment
myml Aug 8, 2024
3bfeda0
chore: Release 1.5.4
myml Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion calendar-service/src/csystemdtimercontrol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include "commondef.h"
#include "units.h"
#include <qloggingcategory.h>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include <qloggingcategory.h>
#include <QLoggingCategory>

以及位置和下面的挪到一起？


#include <QDir>
#include <QStandardPaths>
Expand Down Expand Up @@ -231,8 +232,14 @@ void CSystemdTimerControl::stopUploadTask()
void CSystemdTimerControl::createPath()
{
m_systemdPath = getHomeConfigPath().append("/systemd/user/");
// 如果位于玲珑环境, 更改systemd path路径
QString linglongAppID = qgetenv("LINGLONG_APPID");
if (!linglongAppID.isEmpty()) {
m_systemdPath = "/run/host/rootfs" + m_systemdPath;
qCInfo(ServiceLogger) << "In Linglong environment, change the systemd path to " << m_systemdPath;
}
QDir dir;
//如果该路径不存在，则创建该文件夹
// 如果该路径不存在，则创建该文件夹
if (!dir.exists(m_systemdPath)) {
dir.mkpath(m_systemdPath);
}
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
dde-calendar (5.14.4) unstable; urgency=medium

* feat: Unable to set timer reminder in Linglong environment

-- myml <[email protected]> Thu, 08 Aug 2024 11:29:59 +0800

dde-calendar (5.14.3) unstable; urgency=medium

* fix: dialog window display position error(Issue: https://github.com/linuxdeepin/developer-center/issues/10141)
Expand Down
Loading