From 0fca44e7c0349b28849f45abb487fe06494f5141 Mon Sep 17 00:00:00 2001 From: lingmo-dream <2422586862@qq.com> Date: Fri, 17 Jan 2025 16:20:26 +0800 Subject: [PATCH 01/12] add autostart --- debian/changelog | 6 ++++++ session/processmanager.cpp | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 11b5b2d..af16221 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lingmo-core (2.0.3) helium; urgency=high + + * Update. + + -- LingmoOS OS Team Fri, 17 Jan 2025 16:30:00 +0800 + lingmo-core (2.0.2) unstable; urgency=high * Change to native package. diff --git a/session/processmanager.cpp b/session/processmanager.cpp index 756395c..fcc1ff8 100644 --- a/session/processmanager.cpp +++ b/session/processmanager.cpp @@ -106,6 +106,11 @@ void ProcessManager::startDesktopProcess() list << qMakePair(QString("lingmo-clipboard"), QStringList()); list << qMakePair(QString("lingmo-wallpaper-color-pick"), QStringList()); + if (QFile("/usr/bin/lingmo-welcome").exists() && + !QFile("/run/live/medium/live/filesystem.squashfs").exists()) { + list << qMakePair(QString("/usr/bin/lingmo-welcome"), QStringList()); + } + m_desktopAutoStartD = std::make_shared(list); // Auto start From 814957f7b71115fd18de8a347fa2935bec158547 Mon Sep 17 00:00:00 2001 From: lingmo-dream <2422586862@qq.com> Date: Sat, 18 Jan 2025 13:06:29 +0800 Subject: [PATCH 02/12] update --- debian/changelog | 6 ++++++ session/processmanager.cpp | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index af16221..ef1a4ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lingmo-core (2.0.5) helium; urgency=high + + * Update. + + -- LingmoOS OS Team Sat, 18 Jan 2025 16:30:00 +0800 + lingmo-core (2.0.3) helium; urgency=high * Update. diff --git a/session/processmanager.cpp b/session/processmanager.cpp index fcc1ff8..44fe85e 100644 --- a/session/processmanager.cpp +++ b/session/processmanager.cpp @@ -106,9 +106,10 @@ void ProcessManager::startDesktopProcess() list << qMakePair(QString("lingmo-clipboard"), QStringList()); list << qMakePair(QString("lingmo-wallpaper-color-pick"), QStringList()); - if (QFile("/usr/bin/lingmo-welcome").exists() && + if (QFile(QDir::homePath() + "/.islin_install_lock").exists() && !QFile("/run/live/medium/live/filesystem.squashfs").exists()) { list << qMakePair(QString("/usr/bin/lingmo-welcome"), QStringList()); + list << qMakePair(QString("config-installer"), QStringList()); } m_desktopAutoStartD = std::make_shared(list); From 780956e01b4a85903753193b54b654cbf8b256ed Mon Sep 17 00:00:00 2001 From: lingmo-dream <2422586862@qq.com> Date: Sat, 18 Jan 2025 13:25:21 +0800 Subject: [PATCH 03/12] update version --- debian/changelog | 2 +- session/processmanager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ef1a4ff..d951f1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -lingmo-core (2.0.5) helium; urgency=high +lingmo-core (2.0.6) helium; urgency=high * Update. diff --git a/session/processmanager.cpp b/session/processmanager.cpp index 44fe85e..c5fdd1b 100644 --- a/session/processmanager.cpp +++ b/session/processmanager.cpp @@ -109,7 +109,7 @@ void ProcessManager::startDesktopProcess() if (QFile(QDir::homePath() + "/.islin_install_lock").exists() && !QFile("/run/live/medium/live/filesystem.squashfs").exists()) { list << qMakePair(QString("/usr/bin/lingmo-welcome"), QStringList()); - list << qMakePair(QString("config-installer"), QStringList()); + // list << qMakePair(QString("config-installer"), QStringList()); } m_desktopAutoStartD = std::make_shared(list); From 5ae53160b7025c124b34d74d1cd211fe6265b280 Mon Sep 17 00:00:00 2001 From: lingmo-dream <2422586862@qq.com> Date: Fri, 31 Jan 2025 23:31:46 +0800 Subject: [PATCH 04/12] update --- debian/changelog | 6 ++++++ debian/compat | 2 +- debian/control | 6 +++--- debian/source/format | 2 +- session/processmanager.cpp | 1 + 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index d951f1e..6727445 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lingmo-core (2.1.0-1~lingmo3) helium; urgency=medium + + * Update Release. + + -- LingmoOS OS Team Fri, 31 Jan 2025 23:30:00 +0800 + lingmo-core (2.0.6) helium; urgency=high * Update. diff --git a/debian/compat b/debian/compat index f11c82a..3cacc0b 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 \ No newline at end of file +12 \ No newline at end of file diff --git a/debian/control b/debian/control index 6d0a539..a6bc370 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: lingmo-core Section: devel Priority: optional -Maintainer: LingmoOS +Maintainer: Lingmo OS Team Build-Depends: cmake, debhelper (>= 9), extra-cmake-modules, @@ -42,7 +42,7 @@ Build-Depends: cmake, qttools5-dev, qttools5-dev-tools Standards-Version: 4.5.0 -Homepage: https://github.com/LingmoOS/core +Homepage: https://github.com/LingmoOS/lingmo-core Package: lingmo-core Architecture: any @@ -62,4 +62,4 @@ Depends: accountsservice, appmenu-gtk3-module, ${misc:Depends}, ${shlibs:Depends} -Description: LingmoOS System Components +Description: Lingmo OS System Components diff --git a/debian/source/format b/debian/source/format index 89ae9db..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff --git a/session/processmanager.cpp b/session/processmanager.cpp index c5fdd1b..f7bd57c 100644 --- a/session/processmanager.cpp +++ b/session/processmanager.cpp @@ -97,6 +97,7 @@ void ProcessManager::startDesktopProcess() QList> list; // Desktop components + list << qMakePair(QString("kwin_x11"), QStringList("--replace")); list << qMakePair(QString("lingmo-notificationd"), QStringList()); list << qMakePair(QString("lingmo-statusbar"), QStringList()); list << qMakePair(QString("lingmo-dock"), QStringList()); From 70dbd3e6eb3a7dc7d1f354a0c1a69161965cc92c Mon Sep 17 00:00:00 2001 From: lingmo-dream <2422586862@qq.com> Date: Sat, 8 Feb 2025 21:28:13 +0800 Subject: [PATCH 05/12] update & release --- debian/changelog | 6 ++++++ session/processmanager.cpp | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6727445..49a5687 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lingmo-core (2.2.0-1~lingmo3) helium; urgency=medium + + * Update Release. + + -- LingmoOS OS Team Sat, 08 Feb 2025 22:00:00 +0800 + lingmo-core (2.1.0-1~lingmo3) helium; urgency=medium * Update Release. diff --git a/session/processmanager.cpp b/session/processmanager.cpp index f7bd57c..c5fdd1b 100644 --- a/session/processmanager.cpp +++ b/session/processmanager.cpp @@ -97,7 +97,6 @@ void ProcessManager::startDesktopProcess() QList> list; // Desktop components - list << qMakePair(QString("kwin_x11"), QStringList("--replace")); list << qMakePair(QString("lingmo-notificationd"), QStringList()); list << qMakePair(QString("lingmo-statusbar"), QStringList()); list << qMakePair(QString("lingmo-dock"), QStringList()); From 9cf0f58558269b1094ee51659df3302c7a5077f1 Mon Sep 17 00:00:00 2001 From: lingmo-dream <2422586862@qq.com> Date: Tue, 11 Feb 2025 17:16:08 +0800 Subject: [PATCH 06/12] update#2 --- debian/changelog | 6 ++ polkit-agent/Button.qml | 128 +++++++++++++++++++++++++++++++++++++ polkit-agent/TextField.qml | 91 ++++++++++++++++++++++++++ polkit-agent/main.qml | 1 + polkit-agent/qml.qrc | 2 + session/processmanager.cpp | 1 + 6 files changed, 229 insertions(+) create mode 100644 polkit-agent/Button.qml create mode 100644 polkit-agent/TextField.qml diff --git a/debian/changelog b/debian/changelog index 49a5687..358ba1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lingmo-core (2.2.1-1~lingmo3) helium; urgency=medium + + * Update Release. + + -- LingmoOS OS Team Tue, 11 Feb 2025 17:00:00 +0800 + lingmo-core (2.2.0-1~lingmo3) helium; urgency=medium * Update Release. diff --git a/polkit-agent/Button.qml b/polkit-agent/Button.qml new file mode 100644 index 0000000..e67f018 --- /dev/null +++ b/polkit-agent/Button.qml @@ -0,0 +1,128 @@ +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T +import QtGraphicalEffects 1.0 +import LingmoUI 1.0 as LingmoUI +import QtQuick.Controls.impl 2.12 + +T.Button { + id: control + implicitWidth: Math.max(background.implicitWidth, contentItem.implicitWidth + LingmoUI.Units.largeSpacing) + implicitHeight: background.implicitHeight + hoverEnabled: true + + icon.width: LingmoUI.Units.iconSizes.small + icon.height: LingmoUI.Units.iconSizes.small + + icon.color: control.enabled ? (control.highlighted ? control.LingmoUI.Theme.highlightColor : control.LingmoUI.Theme.textColor) : control.LingmoUI.Theme.disabledTextColor + spacing: LingmoUI.Units.smallSpacing + + // property color hoveredColor: LingmoUI.Theme.darkMode ? Qt.lighter(LingmoUI.Theme.alternateBackgroundColor, 1.2) + // : Qt.darker(LingmoUI.Theme.alternateBackgroundColor, 1.1) + + // property color pressedColor: LingmoUI.Theme.darkMode ? Qt.lighter(LingmoUI.Theme.alternateBackgroundColor, 1.1) + // : Qt.darker(LingmoUI.Theme.alternateBackgroundColor, 1.2) + + property color hoveredColor: Qt.tint(LingmoUI.Theme.textColor, Qt.rgba(LingmoUI.Theme.backgroundColor.r, + LingmoUI.Theme.backgroundColor.g, + LingmoUI.Theme.backgroundColor.b, 0.9)) + property color pressedColor: Qt.tint(LingmoUI.Theme.textColor, Qt.rgba(LingmoUI.Theme.backgroundColor.r, + LingmoUI.Theme.backgroundColor.g, + LingmoUI.Theme.backgroundColor.b, 0.8)) + + + // property color borderColor: Qt.rgba(LingmoUI.Theme.highlightColor.r, + // LingmoUI.Theme.highlightColor.g, + // LingmoUI.Theme.highlightColor.b, 0.5) + + // property color flatHoveredColor: Qt.rgba(LingmoUI.Theme.highlightColor.r, + // LingmoUI.Theme.highlightColor.g, + // LingmoUI.Theme.highlightColor.b, 0.2) + // property color flatPressedColor: Qt.rgba(LingmoUI.Theme.highlightColor.r, + // LingmoUI.Theme.highlightColor.g, + // LingmoUI.Theme.highlightColor.b, 0.25) + + property color flatHoveredColor: Qt.lighter(LingmoUI.Theme.highlightColor, 1.1) + property color flatPressedColor: Qt.darker(LingmoUI.Theme.highlightColor, 1.1) + + contentItem: IconLabel { + text: control.text + font: control.font + icon: control.icon + color: !control.enabled ? control.LingmoUI.Theme.disabledTextColor : control.flat ? LingmoUI.Theme.highlightedTextColor : LingmoUI.Theme.textColor + spacing: control.spacing + mirrored: control.mirrored + display: control.display + alignment: Qt.AlignCenter + } + + background: Item { + implicitWidth: (LingmoUI.Units.iconSizes.medium * 3) + LingmoUI.Units.largeSpacing + implicitHeight: LingmoUI.Units.iconSizes.medium + LingmoUI.Units.smallSpacing + + Rectangle { + id: _flatBackground + anchors.fill: parent + radius: LingmoUI.Theme.mediumRadius + border.width: 1 + border.color: control.enabled ? control.activeFocus ? LingmoUI.Theme.highlightColor : "transparent" + : "transparent" + visible: control.flat + + + color: { + if (!control.enabled) + return LingmoUI.Theme.alternateBackgroundColor + + if (control.pressed) + return control.flatPressedColor + + if (control.hovered) + return control.flatHoveredColor + + return Qt.rgba(LingmoUI.Theme.highlightColor.r, + LingmoUI.Theme.highlightColor.g, + LingmoUI.Theme.highlightColor.b, 0.1) + } + + gradient: Gradient { + orientation: Gradient.Vertical + GradientStop { position: 0.0; color: Qt.rgba(_flatBackground.color.r, + _flatBackground.color.g, + _flatBackground.color.b, 0.85) } + GradientStop { position: 1.0; color: Qt.rgba(_flatBackground.color.r, + _flatBackground.color.g, + _flatBackground.color.b, 1) } + } + + // Behavior on color { + // ColorAnimation { + // duration: 200 + // easing.type: Easing.Linear + // } + // } + } + + Rectangle { + id: _background + anchors.fill: parent + radius: LingmoUI.Theme.hugeRadius + border.width: 1 + visible: !control.flat + border.color: control.enabled ? control.activeFocus ? LingmoUI.Theme.highlightColor : "transparent" + : "transparent" + + color: { + if (!control.enabled) + return LingmoUI.Theme.alternateBackgroundColor + + if (control.pressed) + return control.pressedColor + + if (control.hovered) + return control.hoveredColor + + return LingmoUI.Theme.alternateBackgroundColor + } + } + } +} \ No newline at end of file diff --git a/polkit-agent/TextField.qml b/polkit-agent/TextField.qml new file mode 100644 index 0000000..51c4432 --- /dev/null +++ b/polkit-agent/TextField.qml @@ -0,0 +1,91 @@ +import QtQuick 2.6 +import QtQuick.Window 2.1 +import QtQuick.Controls 2.3 as Controls +import QtQuick.Templates 2.3 as T +import LingmoUI 1.0 as LingmoUI + +T.TextField { + id: control + + implicitWidth: Math.max(200, + placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding : 0) + || contentWidth + leftPadding + rightPadding + LingmoUI.Units.extendBorderWidth + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + placeholder.implicitHeight + topPadding + bottomPadding + LingmoUI.Units.extendBorderWidth) + + // padding: 6 + leftPadding: LingmoUI.Units.smallSpacing + LingmoUI.Units.extendBorderWidth + rightPadding: LingmoUI.Units.smallSpacing + LingmoUI.Units.extendBorderWidth + + //Text.NativeRendering is broken on non integer pixel ratios + // renderType: Window.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering + renderType: LingmoUI.Theme.renderType + + color: control.enabled ? LingmoUI.Theme.textColor : LingmoUI.Theme.disabledTextColor + selectionColor: LingmoUI.Theme.highlightColor + selectedTextColor: LingmoUI.Theme.highlightedTextColor + selectByMouse: true + + horizontalAlignment: Text.AlignLeft + verticalAlignment: TextInput.AlignVCenter + + opacity: control.enabled ? 1.0 : 0.5 + + // cursorDelegate: CursorDelegate { } + + Controls.Label { + id: placeholder + x: control.leftPadding + y: control.topPadding + width: control.width - (control.leftPadding + control.rightPadding) + height: control.height - (control.topPadding + control.bottomPadding) + + text: control.placeholderText + font: control.font + color: LingmoUI.Theme.textColor + opacity: 0.4 + horizontalAlignment: Text.AlignLeft + verticalAlignment: control.verticalAlignment + visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + elide: Text.ElideRight + wrapMode: Text.NoWrap + } + + background: Rectangle { + implicitWidth: (LingmoUI.Units.iconSizes.medium * 3) + LingmoUI.Units.smallSpacing + LingmoUI.Units.extendBorderWidth + implicitHeight: LingmoUI.Units.iconSizes.medium + LingmoUI.Units.smallSpacing + LingmoUI.Units.extendBorderWidth + // color: control.activeFocus ? Qt.lighter(LingmoUI.Theme.backgroundColor, 1.4) : LingmoUI.Theme.backgroundColor + color: LingmoUI.Theme.alternateBackgroundColor + radius: LingmoUI.Theme.smallRadius + + border.width: 1 + border.color: control.activeFocus ? LingmoUI.Theme.highlightColor : LingmoUI.Theme.alternateBackgroundColor + + // Rectangle { + // id: _border + // anchors.fill: parent + // color: "transparent" + // border.color: control.activeFocus ? Qt.rgba(LingmoUI.Theme.highlightColor.r, + // LingmoUI.Theme.highlightColor.g, + // LingmoUI.Theme.highlightColor.b, 0.2) : "transparent" + // border.width: LingmoUI.Units.extendBorderWidth + // radius: LingmoUI.Theme.smallRadius + LingmoUI.Units.extendBorderWidth + + // Behavior on border.color { + // ColorAnimation { + // duration: 50 + // } + // } + // } + + // Rectangle { + // anchors.fill: parent + // anchors.margins: LingmoUI.Units.extendBorderWidth + // radius: LingmoUI.Theme.smallRadius + // color: LingmoUI.Theme.backgroundColor + // border.color: control.activeFocus ? LingmoUI.Theme.highlightColor : Qt.tint(LingmoUI.Theme.textColor, Qt.rgba(LingmoUI.Theme.backgroundColor.r, LingmoUI.Theme.backgroundColor.g, LingmoUI.Theme.backgroundColor.b, 0.7)) + // border.width: 1 + // } + } +} \ No newline at end of file diff --git a/polkit-agent/main.qml b/polkit-agent/main.qml index 01a478d..5a8ef98 100644 --- a/polkit-agent/main.qml +++ b/polkit-agent/main.qml @@ -2,6 +2,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.5 import QtQuick.Layouts 1.3 import LingmoUI 1.0 as LingmoUI +import "./" Item { id: root diff --git a/polkit-agent/qml.qrc b/polkit-agent/qml.qrc index 04adae1..199949d 100644 --- a/polkit-agent/qml.qrc +++ b/polkit-agent/qml.qrc @@ -1,6 +1,8 @@ main.qml + Button.qml + TextField.qml svg/emblem-warning.svg diff --git a/session/processmanager.cpp b/session/processmanager.cpp index c5fdd1b..f7bd57c 100644 --- a/session/processmanager.cpp +++ b/session/processmanager.cpp @@ -97,6 +97,7 @@ void ProcessManager::startDesktopProcess() QList> list; // Desktop components + list << qMakePair(QString("kwin_x11"), QStringList("--replace")); list << qMakePair(QString("lingmo-notificationd"), QStringList()); list << qMakePair(QString("lingmo-statusbar"), QStringList()); list << qMakePair(QString("lingmo-dock"), QStringList()); From dfaa6da49fccc50ecc8309bacd2718420eaeadc4 Mon Sep 17 00:00:00 2001 From: lingmo-dream <2422586862@qq.com> Date: Wed, 12 Feb 2025 20:17:33 +0800 Subject: [PATCH 07/12] update processmanager.cpp --- debian/changelog | 6 ++++++ polkit-agent/dialog.cpp | 2 +- session/processmanager.cpp | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 358ba1d..9ba891a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lingmo-core (2.2.2-1~lingmo3) helium; urgency=medium + + * Update Release. + + -- LingmoOS OS Team Wed, 12 Feb 2025 21:00:00 +0800 + lingmo-core (2.2.1-1~lingmo3) helium; urgency=medium * Update Release. diff --git a/polkit-agent/dialog.cpp b/polkit-agent/dialog.cpp index f5d9729..d5ff686 100644 --- a/polkit-agent/dialog.cpp +++ b/polkit-agent/dialog.cpp @@ -80,4 +80,4 @@ void Dialog::show() void Dialog::authenticationFailure() { emit failure(); -} +} \ No newline at end of file diff --git a/session/processmanager.cpp b/session/processmanager.cpp index f7bd57c..9cd9bc6 100644 --- a/session/processmanager.cpp +++ b/session/processmanager.cpp @@ -97,11 +97,11 @@ void ProcessManager::startDesktopProcess() QList> list; // Desktop components + list << qMakePair(QString("lingmo-filemanager"), QStringList("--desktop")); list << qMakePair(QString("kwin_x11"), QStringList("--replace")); list << qMakePair(QString("lingmo-notificationd"), QStringList()); list << qMakePair(QString("lingmo-statusbar"), QStringList()); list << qMakePair(QString("lingmo-dock"), QStringList()); - list << qMakePair(QString("lingmo-filemanager"), QStringList("--desktop")); list << qMakePair(QString("lingmo-launcher"), QStringList()); list << qMakePair(QString("lingmo-powerman"), QStringList()); list << qMakePair(QString("lingmo-clipboard"), QStringList()); @@ -126,7 +126,7 @@ void ProcessManager::startDaemonProcess() list << qMakePair(QString("lingmo-xembedsniproxy"), QStringList()); list << qMakePair(QString("lingmo-gmenuproxy"), QStringList()); list << qMakePair(QString("lingmo-permission-surveillance"),QStringList()); -// list << qMakePair(QString("lingmo-clipboard"), QStringList()); + list << qMakePair(QString("lingmo-clipboard"), QStringList()); list << qMakePair(QString("lingmo-chotkeys"), QStringList()); m_daemonAutoStartD = std::make_shared(list); From 1c09c5788bceb1ae2ef16ff3abd5dcdea40ef651 Mon Sep 17 00:00:00 2001 From: lingmo-dream <2422586862@qq.com> Date: Wed, 12 Feb 2025 20:19:13 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20?= =?UTF-8?q?=20=20../session/CMakeLists.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- session/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/session/CMakeLists.txt b/session/CMakeLists.txt index 8917368..266e815 100644 --- a/session/CMakeLists.txt +++ b/session/CMakeLists.txt @@ -41,4 +41,4 @@ target_link_libraries(${TARGET} ) install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR}) -install(FILES lingmo-xsession.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/xsessions/) +# install(FILES lingmo-xsession.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/xsessions/) From 79babf17f63a4bc7d56324ee5b5da43cdc625454 Mon Sep 17 00:00:00 2001 From: lingmo-dream <2422586862@qq.com> Date: Sun, 16 Feb 2025 11:29:16 +0800 Subject: [PATCH 09/12] add ProcessManager::checkAndDeactivateScreenSaver() --- debian/changelog | 12 ++++++++++++ session/processmanager.cpp | 25 +++++++++++++++++++++++-- session/processmanager.h | 1 + 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ba891a..3488ed3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +lingmo-core (2.2.4-1~lingmo3) helium; urgency=medium + + * Update Release. + + -- LingmoOS OS Team Sun, 16 Feb 2025 12:00:00 +0800 + +lingmo-core (2.2.3-1~lingmo3) helium; urgency=medium + + * Update Release. + + -- LingmoOS OS Team Thu, 13 Feb 2025 14:00:00 +0800 + lingmo-core (2.2.2-1~lingmo3) helium; urgency=medium * Update Release. diff --git a/session/processmanager.cpp b/session/processmanager.cpp index 9cd9bc6..50c2328 100644 --- a/session/processmanager.cpp +++ b/session/processmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Lingmo OS Team. + * Copyright (C) 2023-2025 Lingmo OS Team. */ #include "processmanager.h" @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -50,6 +51,7 @@ void ProcessManager::start() { startWindowManager(); startDaemonProcess(); + checkAndDeactivateScreenSaver(); } void ProcessManager::logout() @@ -97,9 +99,9 @@ void ProcessManager::startDesktopProcess() QList> list; // Desktop components - list << qMakePair(QString("lingmo-filemanager"), QStringList("--desktop")); list << qMakePair(QString("kwin_x11"), QStringList("--replace")); list << qMakePair(QString("lingmo-notificationd"), QStringList()); + list << qMakePair(QString("lingmo-filemanager"), QStringList("--desktop")); list << qMakePair(QString("lingmo-statusbar"), QStringList()); list << qMakePair(QString("lingmo-dock"), QStringList()); list << qMakePair(QString("lingmo-launcher"), QStringList()); @@ -203,3 +205,22 @@ bool ProcessManager::nativeEventFilter(const QByteArray &eventType, void *messag return false; } + +void ProcessManager::checkAndDeactivateScreenSaver() +{ + QDBusInterface interface("org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver", QDBusConnection::sessionBus()); + if (interface.isValid()) { + QDBusPendingCall call = interface.asyncCall("GetActive"); + QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this); + connect(watcher, &QDBusPendingCallWatcher::finished, this, [this, watcher]() { + QDBusPendingReply reply = *watcher; + if (reply.isValid() && reply.value()) { + QDBusInterface setActiveInterface("org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver", QDBusConnection::sessionBus()); + setActiveInterface.call("SetActive", false); + } + watcher->deleteLater(); + }); + } else { + qWarning() << "Cannot find org.freedesktop.ScreenSaver interface."; + } +} diff --git a/session/processmanager.h b/session/processmanager.h index f6a5562..e99374b 100644 --- a/session/processmanager.h +++ b/session/processmanager.h @@ -45,6 +45,7 @@ class ProcessManager : public QObject, public QAbstractNativeEventFilter void startWindowManager(); void startDesktopProcess(); void startDaemonProcess(); + void checkAndDeactivateScreenSaver(); /** * @brief Start the user defined autostart process. From 6d92fda91977170468ebc8d197b4efa665e4d6b3 Mon Sep 17 00:00:00 2001 From: lingmo-dream <2422586862@qq.com> Date: Sun, 16 Feb 2025 12:05:36 +0800 Subject: [PATCH 10/12] add --- session/processmanager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/session/processmanager.cpp b/session/processmanager.cpp index 50c2328..574c3df 100644 --- a/session/processmanager.cpp +++ b/session/processmanager.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include From 131ed4179bf1ac92372005ab49307fb15c045be9 Mon Sep 17 00:00:00 2001 From: lingmo-dream <2422586862@qq.com> Date: Sat, 29 Mar 2025 23:23:43 +0800 Subject: [PATCH 11/12] Update: session --- debian/changelog | 6 ++++++ session/processmanager.cpp | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3488ed3..891dc5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lingmo-core (2.2.5-1~lingmo3) helium; urgency=medium + + * Update Release. + + -- LingmoOS OS Team Sat, 29 Mar 2025 23:30:00 +0800 + lingmo-core (2.2.4-1~lingmo3) helium; urgency=medium * Update Release. diff --git a/session/processmanager.cpp b/session/processmanager.cpp index 574c3df..834ff80 100644 --- a/session/processmanager.cpp +++ b/session/processmanager.cpp @@ -102,7 +102,8 @@ void ProcessManager::startDesktopProcess() // Desktop components list << qMakePair(QString("kwin_x11"), QStringList("--replace")); list << qMakePair(QString("lingmo-notificationd"), QStringList()); - list << qMakePair(QString("lingmo-filemanager"), QStringList("--desktop")); + list << qMakePair(QString("lingmo-desktop"), QStringList()); + list << qMakePair(QString("lingmo-filemanager"), QStringList("--runtime")); list << qMakePair(QString("lingmo-statusbar"), QStringList()); list << qMakePair(QString("lingmo-dock"), QStringList()); list << qMakePair(QString("lingmo-launcher"), QStringList()); From a9700388923614c1abbb81a9d72316e46175dc81 Mon Sep 17 00:00:00 2001 From: Canadew <110163919+chun-awa@users.noreply.github.com> Date: Sat, 12 Apr 2025 13:42:41 +0800 Subject: [PATCH 12/12] Update format --- debian/source/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native)