diff --git a/.gitignore b/.gitignore index 9022b07..22a8ef8 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,5 @@ obj-*linux-gnu/ /.idea/modules.xml /.idea/QtSettings.xml /.idea/vcs.xml + +/.cache/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fc2120..90ae1f6 100644 --- 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 index a7ffad0..adcbb4e 100644 --- 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 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 index 7323181..3877ebd 100644 --- 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 index ba929ab..e81151d 100644 --- 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 index 183eaa5..8bc88b1 100644 --- 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 index e356da9..b572b66 100644 --- 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 index f9b7e1f..3a91712 100644 --- a/translations/ar_AA.ts +++ b/translations/ar_AA.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -720,7 +720,7 @@ إضافة مستخدم - + → @@ -1257,12 +1257,6 @@ الفأرة - - System Update - - - - System & Update diff --git a/translations/az_AZ.ts b/translations/az_AZ.ts index d791997..ca32630 100644 --- a/translations/az_AZ.ts +++ b/translations/az_AZ.ts @@ -622,7 +622,7 @@ - + → @@ -1059,12 +1059,12 @@ - + System Update - + Open Source Software Statement @@ -1288,18 +1288,12 @@ Power - - - System Update - - About - System & Update diff --git a/translations/be_BY.ts b/translations/be_BY.ts index 7a41f4c..15a44ff 100644 --- a/translations/be_BY.ts +++ b/translations/be_BY.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Дадаць карыстальніка - + → @@ -1324,18 +1324,12 @@ Power Сілкаванне - - - System Update - - About Аб сістэме - System & Update diff --git a/translations/be_Latn.ts b/translations/be_Latn.ts index be17b45..cd3a31b 100644 --- a/translations/be_Latn.ts +++ b/translations/be_Latn.ts @@ -587,7 +587,7 @@ - + → @@ -1024,12 +1024,12 @@ - + System Update - + Open Source Software Statement @@ -1253,18 +1253,12 @@ Power - - - System Update - - About - System & Update diff --git a/translations/bg_BG.ts b/translations/bg_BG.ts index 80455c0..925e8b6 100644 --- a/translations/bg_BG.ts +++ b/translations/bg_BG.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -720,7 +720,7 @@ Добавяне на потребител - + → @@ -1257,12 +1257,6 @@ Мишка - - System Update - - - - System & Update diff --git a/translations/bs_BA.ts b/translations/bs_BA.ts index cb7d46c..eac31f4 100644 --- a/translations/bs_BA.ts +++ b/translations/bs_BA.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Dodaj korisnika - + → @@ -1324,18 +1324,12 @@ Power Snaga - - - System Update - - About O sistemu - System & Update diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index 4916f48..e3ba3ab 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Přidat uživatele - + → @@ -1324,18 +1324,12 @@ Power Napájení - - - System Update - - About Informace - System & Update diff --git a/translations/da_DK.ts b/translations/da_DK.ts index fd4492b..68ab3e1 100644 --- a/translations/da_DK.ts +++ b/translations/da_DK.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Tilføj bruger - + → @@ -1324,18 +1324,12 @@ Power Strøm - - - System Update - - About Om - System & Update diff --git a/translations/de_DE.ts b/translations/de_DE.ts index ca691c9..b7af24a 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Benutzer hinzufügen - + → @@ -1324,18 +1324,12 @@ Power Energieversorgung - - - System Update - - About Über - System & Update diff --git a/translations/en_US.ts b/translations/en_US.ts index 8ce782a..25bb7ae 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -196,12 +196,12 @@ - + System Update - + Open Source Software Statement @@ -677,7 +677,7 @@ - + → @@ -1273,18 +1273,12 @@ Power - - - System Update - - About About - System & Update diff --git a/translations/eo_XX.ts b/translations/eo_XX.ts index ac130b7..0ee3f6c 100644 --- a/translations/eo_XX.ts +++ b/translations/eo_XX.ts @@ -587,7 +587,7 @@ - + → @@ -1024,12 +1024,12 @@ - + System Update - + Open Source Software Statement @@ -1253,18 +1253,12 @@ Power - - - System Update - - About - System & Update diff --git a/translations/es_ES.ts b/translations/es_ES.ts index eaf5493..ddffd3d 100644 --- a/translations/es_ES.ts +++ b/translations/es_ES.ts @@ -238,7 +238,7 @@ Versión de la interfaz de usuario de Lingmo - + Open Source Software Statement Declaración sobre software de código abierto @@ -742,7 +742,7 @@ Agregar usuario - + → @@ -1108,7 +1108,7 @@ Aceleración del puntero - + System Update Actualización del sistema @@ -1348,9 +1348,8 @@ Energía - System Update - Actualización del sistema + Actualización del sistema @@ -1358,7 +1357,6 @@ Acerca de - System & Update Sistema y actualización diff --git a/translations/es_MX.ts b/translations/es_MX.ts index f78dd4e..9a57740 100644 --- a/translations/es_MX.ts +++ b/translations/es_MX.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -720,7 +720,7 @@ Añadir usuario - + → @@ -1316,18 +1316,12 @@ Power Energía - - - System Update - - About Acerca de - System & Update diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts index 63f79fb..cb35a90 100644 --- a/translations/fa_IR.ts +++ b/translations/fa_IR.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ اضافه کردن کاربر - + → @@ -1324,18 +1324,12 @@ Power قدرت - - - System Update - - About درباره - System & Update diff --git a/translations/fi_FI.ts b/translations/fi_FI.ts index ffd18e9..d8c65ee 100644 --- a/translations/fi_FI.ts +++ b/translations/fi_FI.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -716,7 +716,7 @@ Lisää käyttäjä - + → @@ -1312,18 +1312,12 @@ Power Virta - - - System Update - - About Tietoja - System & Update diff --git a/translations/fr_FR.ts b/translations/fr_FR.ts index 22723eb..96beb35 100644 --- a/translations/fr_FR.ts +++ b/translations/fr_FR.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Ajouter un utilisateur - + → @@ -1324,18 +1324,12 @@ Power Alimentation - - - System Update - - About À propos - System & Update diff --git a/translations/he_IL.ts b/translations/he_IL.ts index 84831cc..c4d25c9 100644 --- a/translations/he_IL.ts +++ b/translations/he_IL.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -716,7 +716,7 @@ הוסף משתמש - + → @@ -1253,12 +1253,6 @@ עכבר - - System Update - - - - System & Update diff --git a/translations/hi_IN.ts b/translations/hi_IN.ts index 997318b..9b7eca0 100644 --- a/translations/hi_IN.ts +++ b/translations/hi_IN.ts @@ -587,7 +587,7 @@ - + → @@ -1024,12 +1024,12 @@ - + System Update - + Open Source Software Statement @@ -1253,18 +1253,12 @@ Power - - - System Update - - About - System & Update diff --git a/translations/hu_HU.ts b/translations/hu_HU.ts index 3b9a0fb..201bc8d 100644 --- a/translations/hu_HU.ts +++ b/translations/hu_HU.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Felhasználó hozzáadása - + → @@ -1324,18 +1324,12 @@ Power Energiagazdálkodás - - - System Update - - About Bővebben - System & Update diff --git a/translations/id_ID.ts b/translations/id_ID.ts index 7791458..4ccf614 100644 --- a/translations/id_ID.ts +++ b/translations/id_ID.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Tambah pengguna - + → @@ -1324,18 +1324,12 @@ Power Daya - - - System Update - - About Tentang - System & Update diff --git a/translations/ie.ts b/translations/ie.ts index 2744bb5..1fc0dda 100644 --- a/translations/ie.ts +++ b/translations/ie.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -708,7 +708,7 @@ - + → @@ -1308,18 +1308,12 @@ Power Energie - - - System Update - - About Pri - System & Update diff --git a/translations/it_IT.ts b/translations/it_IT.ts index d6f5328..8e48876 100644 --- a/translations/it_IT.ts +++ b/translations/it_IT.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Aggiungi un utente - + → @@ -1324,18 +1324,12 @@ Power Energia - - - System Update - - About Informazioni - System & Update diff --git a/translations/ja_JP.ts b/translations/ja_JP.ts index 23c7fe4..78d32d5 100644 --- a/translations/ja_JP.ts +++ b/translations/ja_JP.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -712,7 +712,7 @@ ユーザーの追加 - + → @@ -1249,12 +1249,6 @@ マウス - - System Update - - - - System & Update diff --git a/translations/lt_LT.ts b/translations/lt_LT.ts index f91789a..59eafa7 100644 --- a/translations/lt_LT.ts +++ b/translations/lt_LT.ts @@ -236,12 +236,12 @@ - + System Update - + Open Source Software Statement @@ -712,7 +712,7 @@ Pridėti naudotoją - + → @@ -1254,12 +1254,6 @@ Pelė - - System Update - - - - System & Update diff --git a/translations/lv_LV.ts b/translations/lv_LV.ts index 098a75a..12a8139 100644 --- a/translations/lv_LV.ts +++ b/translations/lv_LV.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -716,7 +716,7 @@ Pievienot lietotāju - + → @@ -1253,12 +1253,6 @@ Pele - - System Update - - - - System & Update diff --git a/translations/mg.ts b/translations/mg.ts index 4eb79bb..6b7a8da 100644 --- a/translations/mg.ts +++ b/translations/mg.ts @@ -196,12 +196,12 @@ - + System Update - + Open Source Software Statement @@ -677,7 +677,7 @@ - + → @@ -1273,18 +1273,12 @@ Power - - - System Update - - About Mahakasika - System & Update diff --git a/translations/ml_IN.ts b/translations/ml_IN.ts index 3b67d82..4e7d4f2 100644 --- a/translations/ml_IN.ts +++ b/translations/ml_IN.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -712,7 +712,7 @@ - + → @@ -1308,18 +1308,12 @@ Power - - - System Update - - About എബൗട് - System & Update diff --git a/translations/nb_NO.ts b/translations/nb_NO.ts index 48e26c9..2c4986a 100644 --- a/translations/nb_NO.ts +++ b/translations/nb_NO.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Legg til bruker - + → @@ -1324,18 +1324,12 @@ Power Strømstyring - - - System Update - - About Om - System & Update diff --git a/translations/ne_NP.ts b/translations/ne_NP.ts index f0ba511..b4cbeba 100644 --- a/translations/ne_NP.ts +++ b/translations/ne_NP.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ प्रयोगकर्ता थप्ने - + → @@ -1324,18 +1324,12 @@ Power पावर - - - System Update - - About बारेमा - System & Update diff --git a/translations/pl_PL.ts b/translations/pl_PL.ts index 2e08f43..ad5dafb 100644 --- a/translations/pl_PL.ts +++ b/translations/pl_PL.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Dodaj użytkownika - + → @@ -1324,18 +1324,12 @@ Power Zasilanie - - - System Update - - About O systemie - System & Update diff --git a/translations/pt_BR.ts b/translations/pt_BR.ts index 1c89271..5dadcf1 100644 --- a/translations/pt_BR.ts +++ b/translations/pt_BR.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Adicionar usuário - + → @@ -1324,18 +1324,12 @@ Power Energia - - - System Update - - About Sobre - System & Update diff --git a/translations/pt_PT.ts b/translations/pt_PT.ts index ae786f5..a40d9b1 100644 --- a/translations/pt_PT.ts +++ b/translations/pt_PT.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Adicionar utilizador - + → @@ -1324,18 +1324,12 @@ Power Energia - - - System Update - - About Sobre - System & Update diff --git a/translations/ro_RO.ts b/translations/ro_RO.ts index 2a26605..2afe697 100644 --- a/translations/ro_RO.ts +++ b/translations/ro_RO.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -712,7 +712,7 @@ - + → @@ -1308,18 +1308,12 @@ Power - - - System Update - - About Despre - System & Update diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 0f4b294..240b934 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Добавить пользователя - + → @@ -1324,18 +1324,12 @@ Power Питание - - - System Update - - About О системе - System & Update diff --git a/translations/si_LK.ts b/translations/si_LK.ts index a6b83ee..a5f272c 100644 --- a/translations/si_LK.ts +++ b/translations/si_LK.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -712,7 +712,7 @@ - + → @@ -1308,18 +1308,12 @@ Power - - - System Update - - About පිළිබඳව - System & Update diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index f3a16f4..4cd3183 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Pridať používateľa - + → @@ -1324,18 +1324,12 @@ Power Napájanie - - - System Update - - About Podrobnosti - System & Update diff --git a/translations/so.ts b/translations/so.ts index 619a6da..0a85866 100644 --- a/translations/so.ts +++ b/translations/so.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Kudar Adeegsade - + → @@ -1324,18 +1324,12 @@ Power Dabka - - - System Update - - About Ku saabsan - System & Update diff --git a/translations/sr_RS.ts b/translations/sr_RS.ts index d52c88f..4259b53 100644 --- a/translations/sr_RS.ts +++ b/translations/sr_RS.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -716,7 +716,7 @@ Dodaj korisnika - + → @@ -1253,12 +1253,6 @@ Miš - - System Update - - - - System & Update diff --git a/translations/sv_SE.ts b/translations/sv_SE.ts index bbae9a5..4b7b188 100644 --- a/translations/sv_SE.ts +++ b/translations/sv_SE.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Lägg till användare - + → @@ -1324,18 +1324,12 @@ Power Ström - - - System Update - - About Om - System & Update diff --git a/translations/sw.ts b/translations/sw.ts index 3863a50..63873da 100644 --- a/translations/sw.ts +++ b/translations/sw.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -720,7 +720,7 @@ Ongeza mtumiaji - + → @@ -1257,12 +1257,6 @@ Panya la kompyuta - - System Update - - - - System & Update diff --git a/translations/ta_IN.ts b/translations/ta_IN.ts index 095f618..a86fb0d 100644 --- a/translations/ta_IN.ts +++ b/translations/ta_IN.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -712,7 +712,7 @@ - + → @@ -1308,18 +1308,12 @@ Power - - - System Update - - About தகவல் - System & Update diff --git a/translations/tr_TR.ts b/translations/tr_TR.ts index 8fdb712..f82998b 100644 --- a/translations/tr_TR.ts +++ b/translations/tr_TR.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Kullanıcı ekle - + → @@ -1324,18 +1324,12 @@ Power Güç - - - System Update - - About Hakkında - System & Update diff --git a/translations/uk_UA.ts b/translations/uk_UA.ts index 0e9b2b1..757f788 100644 --- a/translations/uk_UA.ts +++ b/translations/uk_UA.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Додати користувача - + → @@ -1324,18 +1324,12 @@ Power Енергопостачання - - - System Update - - About Про систему - System & Update diff --git a/translations/uz_UZ.ts b/translations/uz_UZ.ts index 6c454cc..5c513a6 100644 --- a/translations/uz_UZ.ts +++ b/translations/uz_UZ.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -724,7 +724,7 @@ Foydalanuvchi qo'shish - + → @@ -1324,18 +1324,12 @@ Power Quvvat - - - System Update - - About Haqida - System & Update diff --git a/translations/vi_VN.ts b/translations/vi_VN.ts index 2ac0420..9962d97 100644 --- a/translations/vi_VN.ts +++ b/translations/vi_VN.ts @@ -196,12 +196,12 @@ - + System Update - + Open Source Software Statement @@ -677,7 +677,7 @@ Thêm người dùng - + → @@ -1225,12 +1225,6 @@ - - System Update - - - - System & Update diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index e8f05ea..24cb21f 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -203,7 +203,7 @@ - + Open Source Software Statement @@ -763,7 +763,7 @@ 添加用户 - + → @@ -1095,7 +1095,7 @@ 勿扰模式 - + System Update 系统更新 @@ -1332,9 +1332,8 @@ 电源 - System Update - 系统更新 + 系统更新 @@ -1342,7 +1341,6 @@ 关于 - System & Update 系统&更新 diff --git a/translations/zh_HK.ts b/translations/zh_HK.ts index 1907d33..dd9ecee 100644 --- a/translations/zh_HK.ts +++ b/translations/zh_HK.ts @@ -587,7 +587,7 @@ - + → @@ -1024,12 +1024,12 @@ - + System Update - + Open Source Software Statement @@ -1253,18 +1253,12 @@ Power - - - System Update - - About - System & Update diff --git a/translations/zh_TW.ts b/translations/zh_TW.ts index 61fecaa..c52df12 100644 --- a/translations/zh_TW.ts +++ b/translations/zh_TW.ts @@ -231,12 +231,12 @@ - + System Update - + Open Source Software Statement @@ -720,7 +720,7 @@ 增加使用者 - + → @@ -1316,18 +1316,12 @@ Power 電源 - - - System Update - - About 關於 - System & Update