LingmoOS · kodiakhq · Jul 16, 2024 · Jun 15, 2024 · Jul 15, 2024 · Jul 16, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,6 +17,7 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
+# set(QT Core Gui Widgets Network WebEngine Quick QuickControls2 X11Extras DBus Xml Concurrent LinguistTools)
 set(QT Core Gui Widgets Network Quick QuickControls2 X11Extras DBus Xml Concurrent LinguistTools)
 find_package(Qt5 REQUIRED ${QT})
 find_package(X11 REQUIRED)
@@ -27,7 +28,8 @@ find_package(Libcrypt REQUIRED)
 find_package(KF5NetworkManagerQt REQUIRED)
 find_package(KF5ModemManagerQt REQUIRED)
 find_package(KF5Config)
-# find_package(QApt REQUIRED)
+find_package(QApt REQUIRED)
+# find_package(QtWebEngine REQUIRED)
 
 pkg_search_module(FontConfig REQUIRED fontconfig IMPORTED_TARGET)
 pkg_search_module(ICU REQUIRED icu-i18n)
@@ -62,8 +64,10 @@ target_link_libraries(${PROJECT_NAME}
         Qt5::Xml
         Qt5::X11Extras
         Qt5::Concurrent
+        # Qt5::WebEngine
         # ::Main
         Qt5::Network
+        QApt::Main
         # LingmoUI
 
         KF5::NetworkManagerQt

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,38 @@
+lingmo-settings (2.1.5-rc1) main; urgency=high
+
+  [Lingmo OS Team]
+  * update Change Device name Page
+
+ -- Lingm OS Team <[email protected]>  Tue, 46 Jul 2024 22:06:00 +0800
+
+lingmo-settings (2.1.5-rc1) main; urgency=high
+
+  [Lingmo OS Team]
+  * fix bugs
+
+ -- Lingm OS Team <[email protected]>  Sat, 13 Jul 2024 23:14:00 +0800
+
+lingmo-settings (2.1.5) main; urgency=high
+
+  [Lingmo OS Team]
+  * update GET_VERSION
+
+ -- Lingm OS Team <[email protected]>  Sat, 13 Jul 2024 23:14:00 +0800
+
+lingmo-settings (2.1.3) UNRELEASED; urgency=high
+
+  [ Elysia ]
+  * Fixed the Abort signal on existing app.
+
+ -- Elysia <[email protected]>  Wen, 5 Jun 2024 19:51:00 +0800
+
+lingmo-settings (2.1.2+fix1) UNRELEASED; urgency=high
+
+  [ Elysia ]
+  * Fixed missing network-manager dependency.
+
+ -- Elysia <[email protected]>  Mon, 27 May 2024 15:04:00 +0800
+
 lingmo-settings (2.1.2) UNRELEASED; urgency=high
 
   * Changes Some Text

diff --git a/debian/control b/debian/control
@@ -17,6 +17,9 @@ Build-Depends: cmake,
                libkf5config-dev,
                modemmanager-qt-dev,
                qtbase5-dev,
+               libqt5webengine5,
+               qtwebengine5-dev,
+               network-manager,
                libqt5x11extras5-dev,
                qtdeclarative5-dev,
                qtquickcontrols2-5-dev,
@@ -42,6 +45,7 @@ Depends: qml-module-qtquick-controls2,
          qml-module-qtquick-particles2,
          curl,
          openssl,
+         libqt5webengine5,
          aria2,
          gnupg,
          zenity,

diff --git a/src/about.cpp b/src/about.cpp
@@ -5,6 +5,7 @@
 #include <QRegularExpression>
 #include <QSettings>
 #include <QProcess>
+#include <QHostInfo>
 
 #ifdef Q_OS_LINUX
 #include <sys/sysinfo.h>
@@ -69,6 +70,11 @@ bool About::isLingmoOS()
     return settings.value("LingmoOS", false).toBool();
 }
 
+QString About::hostName() 
+{
+    return QHostInfo::localHostName();
+}
+
 QString About::version()
 {
     QSettings settings("/etc/os-release",QSettings::IniFormat);

diff --git a/src/about.h b/src/about.h
@@ -11,6 +11,7 @@ class About : public QObject
     Q_OBJECT
     Q_PROPERTY(bool isLingmoOS READ isLingmoOS CONSTANT)
     Q_PROPERTY(QString version READ version CONSTANT)
+    Q_PROPERTY(QString hostName READ hostName CONSTANT)
     Q_PROPERTY(QString systemrelease READ systemrelease CONSTANT)
     Q_PROPERTY(QString debianversion READ debianversion CONSTANT)
     Q_PROPERTY(QString desktopversion READ desktopversion CONSTANT)
@@ -34,6 +35,7 @@ class About : public QObject
     bool isLingmoOS();
 
     QString version();
+    QString hostName();
     QString systemrelease();
     QString debianversion();
     QString desktopversion();

diff --git a/src/appearance.cpp b/src/appearance.cpp
@@ -227,14 +227,14 @@ void Appearance::setFontPointSize(int fontPointSize)
     }
 }
 
-void Appearance::setAccentColor(int accentColor)
+void Appearance::setAccentColor(int defaultColor)
 {
     QDBusInterface iface("com.lingmo.Settings",
                          "/Theme",
                          "com.lingmo.Theme",
                          QDBusConnection::sessionBus(), this);
     if (iface.isValid()) {
-        iface.call("setAccentColor", accentColor);
+        iface.call("setAccentColor", defaultColor);
     }
 }
 

diff --git a/src/appearance.h b/src/appearance.h
@@ -68,7 +68,7 @@ class Appearance : public QObject
     int fontPointSize() const;
     Q_INVOKABLE void setFontPointSize(int fontPointSize);
 
-    Q_INVOKABLE void setAccentColor(int accentColor);
+    Q_INVOKABLE void setAccentColor(int defaultColor);
 
     int DesktopSettings() const;
     Q_INVOKABLE void setDesktopIcons(int DesktopSettings);

diff --git a/src/application.cpp b/src/application.cpp
@@ -9,6 +9,7 @@
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QTranslator>
+// #include <QtWebEngine>
 
 #include "about.h"
 #include "accessibility.h"
@@ -32,6 +33,8 @@
 #include "settingsuiadaptor.h"
 #include "touchpad.h"
 #include "update/updatemanager.h"
+// #include "updatorhelper.h"
+// #include "upgradeablemodel.h"
 
 const QString ModuleDirectory = "/usr/lib/lingmo-settings/modules";
 
@@ -91,7 +94,13 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) {
   qmlRegisterType<DefaultApplications>(uri, 1, 0, "DefaultApplications");
   qmlRegisterType<Accessibility>(uri, 1, 0, "Accessibility");
   qmlRegisterSingletonType<Password>(uri, 1, 0, "Password", passwordSingleton);
-  qmlRegisterType<UpdateManager>(uri, 1, 0, "UpdateManager");
+  // qmlRegisterType<UpdateManager>(uri, 1, 0, "UpdateManager");
+  // qmlRegisterType<UpdatorHelper>(uri, 1, 0, "Updator");
+  // qmlRegisterType<UpgradeableModel>(uri, 1, 0, "UpgradeableModel");    
+
+  // if (!QDBusConnection::sessionBus().registerService("com.lingmo.UpdatorGui")) {
+  //       return 0;
+  // }
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
   qmlRegisterType<QAbstractItemModel>();
 #else
@@ -117,6 +126,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) {
   m_engine.addImportPath(QStringLiteral("qrc:/"));
   m_engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml")));
 
+  // m_engine.rootContext()->setContextProperty("upgradeableModel", UpgradeableModel::self());
+
   if (!module.isEmpty()) {
     switchToPage(module);
   }

diff --git a/src/battery.cpp b/src/battery.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2021 LingmoOS Team.
  *
- * Author:     Reion Wong <[email protected]>
+ * Author:     Lingmo OS Team <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/battery.h b/src/battery.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2021 LingmoOS Team.
  *
- * Author:     Reion Wong <[email protected]>
+ * Author:     Lingmo OS Team <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/batteryhistorymodel.cpp b/src/batteryhistorymodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2021 Reion Wong <[email protected]>                   *
+ *   Copyright (C) 2021 Lingmo OS Team <[email protected]>                   *
  *   Copyright (C) 2015 Kai Uwe Broulik <[email protected]>            *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *

diff --git a/src/batteryhistorymodel.h b/src/batteryhistorymodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2021 Reion Wong <[email protected]>                   *
+ *   Copyright (C) 2021 Lingmo OS Team <[email protected]>                   *
  *   Copyright (C) 2015 Kai Uwe Broulik <[email protected]>            *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *

diff --git a/src/cicontheme.cpp b/src/cicontheme.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2021 LingmoOS Team.
  *
- * Author:     Reion Wong <[email protected]>
+ * Author:     Lingmo OS Team <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/cicontheme.h b/src/cicontheme.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2021 LingmoOS Team.
  *
- * Author:     Reion Wong <[email protected]>
+ * Author:     Lingmo OS Team <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/images/MundoDark.jpeg b/src/images/MundoDark.jpeg
diff --git a/src/images/MundoLight.jpeg b/src/images/MundoLight.jpeg
diff --git a/src/images/check_failed.svg b/src/images/check_failed.svg
diff --git a/src/images/dark/edit.svg b/src/images/dark/edit.svg
diff --git a/src/images/done.svg b/src/images/done.svg
diff --git a/src/images/laptop.png b/src/images/laptop.png
diff --git a/src/images/light/edit.svg b/src/images/light/edit.svg