diff --git a/DOCS/code-analyze.md b/DOCS/code-analyze.md index 373653d..4bad78a 100644 --- a/DOCS/code-analyze.md +++ b/DOCS/code-analyze.md @@ -85,8 +85,6 @@ QString tags=json["Tags"].toString(); //Read the Tags ui->tag_community->show();//Tags icon shows like this if(tagList[i]=="ubuntu") ui->tag_ubuntu->show(); - if(tagList[i]=="ubuntu") - ui->tag_ubuntu->show(); if(tagList[i]=="deepin") ui->tag_deepin->show(); if(tagList[i]=="uos") diff --git a/README.zh.md b/README.zh.md index b60bd74..e777e40 100644 --- a/README.zh.md +++ b/README.zh.md @@ -45,7 +45,7 @@ sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a lib ``` -Debian 11.x/Lingmo OS/Ubuntu 22.04 系统下, 安装依赖 +Ubuntu 22.04 系统下, 安装依赖 ```shell sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev qtwayland5 qtwayland5-dev-tools libqt5svg5* diff --git a/src/assets/assets.qrc b/src/assets/assets.qrc index c617d34..ed35fdf 100644 --- a/src/assets/assets.qrc +++ b/src/assets/assets.qrc @@ -59,8 +59,6 @@ tags/logo_icon.svg tags/ubuntu-small.png tags/ubuntu.png - tags/lingmo-small.png - tags/lingmo.png tags/uos-authorize.svg tags/uos-small.png tags/uos.svg diff --git a/src/assets/tags/lingmo-small.png b/src/assets/tags/lingmo-small.png deleted file mode 100644 index 64d0cfd..0000000 Binary files a/src/assets/tags/lingmo-small.png and /dev/null differ diff --git a/src/assets/tags/lingmo.png b/src/assets/tags/lingmo.png deleted file mode 100644 index bc01b7a..0000000 Binary files a/src/assets/tags/lingmo.png and /dev/null differ diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index 5fcbcc7..96f94d9 100644 --- a/src/pages/appintopage.cpp +++ b/src/pages/appintopage.cpp @@ -196,7 +196,6 @@ void AppIntoPage::clear() ui->tag_dwine2->hide(); ui->tag_dwine5->hide(); ui->tag_ubuntu->hide(); - // ui->tag_lingmo->hide(); ui->tag_community->hide(); ui->icon->clear(); ui->title->clear(); @@ -335,7 +334,6 @@ void AppIntoPage::isDownloading(const QUrl &url) void AppIntoPage::setAppinfoTags(const QStringList &tagList) { bool ubuntuSupport = false; - bool lingmoSupport = false; bool deepinSupport = false; bool uosSupport = false; foreach (const QString &tag, tagList) @@ -349,11 +347,6 @@ void AppIntoPage::setAppinfoTags(const QStringList &tagList) ui->tag_ubuntu->show(); ubuntuSupport = true; } - // else if (tag == "lingmo") - // { - // ui->tag_lingmo->show(); - // lingmoSupport = true; - // } else if (tag == "deepin") { ui->tag_deepin->show(); @@ -382,54 +375,31 @@ void AppIntoPage::setAppinfoTags(const QStringList &tagList) ui->tag_a2d->show(); } } - notifyUserUnsupportedTags(ubuntuSupport, lingmoSupport, deepinSupport, uosSupport); + notifyUserUnsupportedTags(ubuntuSupport, deepinSupport, uosSupport); } -void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool lingmoSupport, bool deepinSupport, bool uosSupport) +void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport) { bool isDeepin = Dtk::Core::DSysInfo::productType() == Dtk::Core::DSysInfo::Deepin; bool isUOS = Dtk::Core::DSysInfo::productType() == Dtk::Core::DSysInfo::Uos; bool checkdeepin = (isDeepin && !deepinSupport); bool checkuos = (isUOS && !uosSupport); - bool isLingmo = false; - // if (!checkdeepin && !checkuos) - // { - // // 检查是否为 Lingmo OS - // QFile lsb("/etc/lsb-release"); - // //由于LingmoOS没有lsb-release，所以创建一个lsb，只供星火商店检测。 - // if (!lsb.open(QIODevice::ReadOnly)) - // { - // qDebug() << "打开 /etc/lsb-release 失败"; - // } - // else if (lsb.readAll().contains("Lingmo")) - // { - // isLingmo = true; - // lsb.close(); - // } - // } - // bool checklingmo = (isLingmo && !lingmoSupport); - bool isUbuntu = false; if (!checkdeepin && !checkuos) { - // 检查是否为 ubuntu 或LingmoOS + // 检查是否为 ubuntu 系统 QFile lsb("/etc/lsb-release"); if (!lsb.open(QIODevice::ReadOnly)) { qDebug() << "打开 /etc/lsb-release 失败"; } - else if (lsb.readAll().contains("Lingmo")) - { - isUbuntu = true; - lsb.close(); - } else if (lsb.readAll().contains("Ubuntu")) { isUbuntu = true; lsb.close(); } } - bool checkubuntu = (isUbuntu && !ubuntuSupport && !isLingmo && lingmoSupport); + bool checkubuntu = (isUbuntu && !ubuntuSupport); if (checkdeepin) { @@ -441,12 +411,8 @@ void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool lingmoSuppo } else if (checkubuntu) { - Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support Ubuntu or LingmoOS, there may be problems")); + Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support Ubuntu, there may be problems")); } - // else if (checklingmo) - // { - // Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support LingmoOS, there may be problems")); - // } else if (!isUbuntu && !isDeepin && !isUOS) { Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support current platform, there may be problems")); diff --git a/src/pages/appintopage.h b/src/pages/appintopage.h index 99cb889..5c6235b 100644 --- a/src/pages/appintopage.h +++ b/src/pages/appintopage.h @@ -29,7 +29,7 @@ private: void initConnections(); void isDownloading(const QUrl &url); void setAppinfoTags(const QStringList &tagList); - void notifyUserUnsupportedTags(bool ubuntuSupport, bool lingmoSupport, bool deepinSupport, bool uosSupport); + void notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport); signals: void clickedDownloadBtn(); diff --git a/src/pages/appintopage.ui b/src/pages/appintopage.ui index 7b4de86..c3c8024 100644 --- a/src/pages/appintopage.ui +++ b/src/pages/appintopage.ui @@ -436,25 +436,6 @@ - - - - - 30 - 16777215 - - - - <html><head/><body><p>Capable to Lingmo OS</p></body></html> - - - <html><head/><body><p>Capable to Lingmo OS</p></body></html> - - - <html><head/><body><p><img src=":/tags/lingmo-small.png"/></p></body></html> - - - diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index b832acf..90ab649 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -47,12 +47,6 @@ <html><head/><body><p><img src=":/tags/ubuntu-small.png"/></p></body></html> - - - - <html><head/><body><p>Capable to Lingmo OS</p></body></html> - - diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 850352e..9396154 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -47,12 +47,6 @@ <html><head/><body><p><img src=":/tags/ubuntu-small.png"/></p></body></html> - // - // - // - // <html><head/><body><p>Capable to Lingmo OS</p></body></html> - // <html><head/><body><p>支持 Lingmo OS</p></body></html> - // diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts index bf799e3..e96533b 100644 --- a/translations/spark-store_zh_TW.ts +++ b/translations/spark-store_zh_TW.ts @@ -47,12 +47,6 @@ <html><head/><body><p><img src=":/tags/ubuntu-small.png"/></p></body></html> - - - - <html><head/><body><p>Capable to Lingmo OS</p></body></html> - <html><head/><body><p>支持 Lingmo OS</p></body></html> -