Delete unused QApt dependency & Only show System Update Button when w…

…e are on Lingmo OS (#35) * Only show updator when on Lingmo OS * Fix * Add Q_INVOKABLE * Fix function name * * Only show System Update Button when we are on LingmoOS * Delete unused QApt dependency
LingmoOS · Oct 18, 2024 · 52a7f9d · 52a7f9d
1 parent 1cfb2bd
commit 52a7f9d
Show file tree

Hide file tree

Showing 55 changed files with 167 additions and 440 deletions.
diff --git a/.gitignore b/.gitignore
@@ -110,3 +110,5 @@ obj-*linux-gnu/
 /.idea/modules.xml
 /.idea/QtSettings.xml
 /.idea/vcs.xml
+
+/.cache/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,8 +28,6 @@ find_package(Libcrypt REQUIRED)
 find_package(KF5NetworkManagerQt REQUIRED)
 find_package(KF5ModemManagerQt REQUIRED)
 find_package(KF5Config)
-find_package(QApt REQUIRED)
-# find_package(QtWebEngine REQUIRED)
 
 pkg_search_module(FontConfig REQUIRED fontconfig IMPORTED_TARGET)
 pkg_search_module(ICU REQUIRED icu-i18n)
@@ -64,11 +62,8 @@ target_link_libraries(${PROJECT_NAME}
         Qt5::Xml
         Qt5::X11Extras
         Qt5::Concurrent
-        # Qt5::WebEngine
-        # ::Main
+
         Qt5::Network
-        QApt::Main
-        # LingmoUI
 
         KF5::NetworkManagerQt
         KF5::ModemManagerQt
@@ -83,8 +78,6 @@ target_link_libraries(${PROJECT_NAME}
         X11::X11
         X11::Xi
         X11::Xcursor
-
-        # 
 )
 
 file(GLOB TS_FILES translations/*.ts)

diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,12 @@
-lingmo-settings (3.0.0-rc1) unstable; urgency=high
+lingmo-settings (3.0.0~rc2) UNRELEASED; urgency=low
+
+  [Elysia]
+  * Only show System Update Button when we are on LingmoOS
+  * Delete unused QApt dependency
+
+ -- Lingmo OS Team <[email protected]>  Fri, 18 Oct 2024 19:26:23 +0800
+
+lingmo-settings (3.0.0~rc1) unstable; urgency=high
 
   [Lingmo OS Team]
   * update ui

diff --git a/debian/control b/debian/control
@@ -25,7 +25,6 @@ Build-Depends: cmake,
                qtquickcontrols2-5-dev,
                qttools5-dev,
                qttools5-dev-tools,
-               libqapt-dev,
                libpackagekitqt5-dev,
                libkf5bluezqt-dev (>= 5.50.0~)
 Standards-Version: 4.5.0

diff --git a/src/about.cpp b/src/about.cpp
@@ -65,11 +65,14 @@ About::About(QObject *parent)
 
 bool About::isLingmoOS()
 {
-    if (!QFile::exists("/etc/lingmoos"))
-        return false;
+    return About::checkForLingmoOS();
+}
 
-    QSettings settings("/etc/lingmoos", QSettings::IniFormat);
-    return settings.value("LingmoOS", false).toBool();
+bool About::checkForLingmoOS() {
+    if (QFile::exists("/etc/lingmo_version"))
+        return true;
+    else
+        return false;
 }
 
 QString About::hostName() 

diff --git a/src/about.h b/src/about.h
@@ -33,6 +33,7 @@ class About : public QObject
     explicit About(QObject *parent = nullptr);
 
     bool isLingmoOS();
+    Q_INVOKABLE bool checkForLingmoOS();
 
     QString version();
     QString hostName();

diff --git a/src/qml/About/Main.qml b/src/qml/About/Main.qml
@@ -299,6 +299,7 @@ ItemPage {
                 StandardButton {
                     text: ""
                     Layout.fillWidth: true
+                    visible: about.checkForLingmoOS()
                     onClicked: {
                         about.openUpdator()
                     }

diff --git a/translations/ar_AA.ts b/translations/ar_AA.ts
@@ -231,12 +231,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="312"/>
+        <location filename="../src/qml/About/Main.qml" line="313"/>
         <source>System Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="328"/>
+        <location filename="../src/qml/About/Main.qml" line="329"/>
         <source>Open Source Software Statement</source>
         <translation type="unfinished"></translation>
     </message>
@@ -720,7 +720,7 @@
         <translation>إضافة مستخدم</translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="320"/>
+        <location filename="../src/qml/About/Main.qml" line="321"/>
         <location filename="../src/qml/User/Main.qml" line="219"/>
         <location filename="../src/qml/WLAN/Main.qml" line="99"/>
         <source>→</source>
@@ -1257,12 +1257,6 @@
         <translation>الفأرة</translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="244"/>
-        <source>System Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qml/SideBar.qml" line="249"/>
         <location filename="../src/qml/SideBar.qml" line="258"/>
         <source>System &amp; Update</source>
         <translation type="unfinished"></translation>

diff --git a/translations/az_AZ.ts b/translations/az_AZ.ts
@@ -622,7 +622,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="320"/>
+        <location filename="../src/qml/About/Main.qml" line="321"/>
         <location filename="../src/qml/User/Main.qml" line="219"/>
         <location filename="../src/qml/WLAN/Main.qml" line="99"/>
         <source>→</source>
@@ -1059,12 +1059,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="312"/>
+        <location filename="../src/qml/About/Main.qml" line="313"/>
         <source>System Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="328"/>
+        <location filename="../src/qml/About/Main.qml" line="329"/>
         <source>Open Source Software Statement</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1288,18 +1288,12 @@
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/qml/SideBar.qml" line="244"/>
-        <source>System Update</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/qml/SideBar.qml" line="253"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="249"/>
         <location filename="../src/qml/SideBar.qml" line="258"/>
         <source>System &amp; Update</source>
         <translation type="unfinished"></translation>

diff --git a/translations/be_BY.ts b/translations/be_BY.ts
@@ -231,12 +231,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="312"/>
+        <location filename="../src/qml/About/Main.qml" line="313"/>
         <source>System Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="328"/>
+        <location filename="../src/qml/About/Main.qml" line="329"/>
         <source>Open Source Software Statement</source>
         <translation type="unfinished"></translation>
     </message>
@@ -724,7 +724,7 @@
         <translation>Дадаць карыстальніка</translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="320"/>
+        <location filename="../src/qml/About/Main.qml" line="321"/>
         <location filename="../src/qml/User/Main.qml" line="219"/>
         <location filename="../src/qml/WLAN/Main.qml" line="99"/>
         <source>→</source>
@@ -1324,18 +1324,12 @@
         <source>Power</source>
         <translation type="unfinished">Сілкаванне</translation>
     </message>
-    <message>
-        <location filename="../src/qml/SideBar.qml" line="244"/>
-        <source>System Update</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/qml/SideBar.qml" line="253"/>
         <source>About</source>
         <translation>Аб сістэме</translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="249"/>
         <location filename="../src/qml/SideBar.qml" line="258"/>
         <source>System &amp; Update</source>
         <translation type="unfinished"></translation>

diff --git a/translations/be_Latn.ts b/translations/be_Latn.ts
@@ -587,7 +587,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="320"/>
+        <location filename="../src/qml/About/Main.qml" line="321"/>
         <location filename="../src/qml/User/Main.qml" line="219"/>
         <location filename="../src/qml/WLAN/Main.qml" line="99"/>
         <source>→</source>
@@ -1024,12 +1024,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="312"/>
+        <location filename="../src/qml/About/Main.qml" line="313"/>
         <source>System Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="328"/>
+        <location filename="../src/qml/About/Main.qml" line="329"/>
         <source>Open Source Software Statement</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1253,18 +1253,12 @@
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/qml/SideBar.qml" line="244"/>
-        <source>System Update</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/qml/SideBar.qml" line="253"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="249"/>
         <location filename="../src/qml/SideBar.qml" line="258"/>
         <source>System &amp; Update</source>
         <translation type="unfinished"></translation>

diff --git a/translations/bg_BG.ts b/translations/bg_BG.ts
@@ -231,12 +231,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="312"/>
+        <location filename="../src/qml/About/Main.qml" line="313"/>
         <source>System Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="328"/>
+        <location filename="../src/qml/About/Main.qml" line="329"/>
         <source>Open Source Software Statement</source>
         <translation type="unfinished"></translation>
     </message>
@@ -720,7 +720,7 @@
         <translation>Добавяне на потребител</translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="320"/>
+        <location filename="../src/qml/About/Main.qml" line="321"/>
         <location filename="../src/qml/User/Main.qml" line="219"/>
         <location filename="../src/qml/WLAN/Main.qml" line="99"/>
         <source>→</source>
@@ -1257,12 +1257,6 @@
         <translation>Мишка</translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="244"/>
-        <source>System Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qml/SideBar.qml" line="249"/>
         <location filename="../src/qml/SideBar.qml" line="258"/>
         <source>System &amp; Update</source>
         <translation type="unfinished"></translation>

diff --git a/translations/bs_BA.ts b/translations/bs_BA.ts
@@ -231,12 +231,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="312"/>
+        <location filename="../src/qml/About/Main.qml" line="313"/>
         <source>System Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="328"/>
+        <location filename="../src/qml/About/Main.qml" line="329"/>
         <source>Open Source Software Statement</source>
         <translation type="unfinished"></translation>
     </message>
@@ -724,7 +724,7 @@
         <translation>Dodaj korisnika</translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="320"/>
+        <location filename="../src/qml/About/Main.qml" line="321"/>
         <location filename="../src/qml/User/Main.qml" line="219"/>
         <location filename="../src/qml/WLAN/Main.qml" line="99"/>
         <source>→</source>
@@ -1324,18 +1324,12 @@
         <source>Power</source>
         <translation type="unfinished">Snaga</translation>
     </message>
-    <message>
-        <location filename="../src/qml/SideBar.qml" line="244"/>
-        <source>System Update</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/qml/SideBar.qml" line="253"/>
         <source>About</source>
         <translation>O sistemu</translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="249"/>
         <location filename="../src/qml/SideBar.qml" line="258"/>
         <source>System &amp; Update</source>
         <translation type="unfinished"></translation>

diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts
@@ -231,12 +231,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="312"/>
+        <location filename="../src/qml/About/Main.qml" line="313"/>
         <source>System Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="328"/>
+        <location filename="../src/qml/About/Main.qml" line="329"/>
         <source>Open Source Software Statement</source>
         <translation type="unfinished"></translation>
     </message>
@@ -724,7 +724,7 @@
         <translation>Přidat uživatele</translation>
     </message>
     <message>
-        <location filename="../src/qml/About/Main.qml" line="320"/>
+        <location filename="../src/qml/About/Main.qml" line="321"/>
         <location filename="../src/qml/User/Main.qml" line="219"/>
         <location filename="../src/qml/WLAN/Main.qml" line="99"/>
         <source>→</source>
@@ -1324,18 +1324,12 @@
         <source>Power</source>
         <translation type="unfinished">Napájení</translation>
     </message>
-    <message>
-        <location filename="../src/qml/SideBar.qml" line="244"/>
-        <source>System Update</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/qml/SideBar.qml" line="253"/>
         <source>About</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="249"/>
         <location filename="../src/qml/SideBar.qml" line="258"/>
         <source>System &amp; Update</source>
         <translation type="unfinished"></translation>