diff --git a/src/main.cpp b/src/main.cpp index 0a37a21..2742b01 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,6 +4,8 @@ #include <DAboutDialog> #include <QVector> #include <QScreen> +#include <QDir> +#include <QSettings> //新增dbus #include <QDBusInterface> #include <QDBusPendingCall> @@ -32,12 +34,18 @@ int main(int argc, char *argv[]) a.setAttribute(Qt::AA_UseHighDpiPixmaps); a.loadTranslator(); // 载入翻译 + QSettings *setConfig = new QSettings(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat); + setConfig->setValue("build/version", "Version 3.3.3~test4"); + setConfig->deleteLater(); + QSettings readConfig(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat); + + //Customized DAboutDialog DAboutDialog dialog; a.setAboutDialog(&dialog); dialog.setLicense(QObject::tr("We publish this program under GPL V3")); - dialog.setVersion(DApplication::buildVersion("Version 3.3.3~test4")); + dialog.setVersion(DApplication::buildVersion(readConfig.value("build/version").toString())); dialog.setProductIcon(QIcon::fromTheme("spark-store")); // 设置Logo dialog.setProductName(QLabel::tr("Spark Store")); dialog.setDescription( @@ -58,7 +66,7 @@ int main(int argc, char *argv[]) a.setOrganizationName("spark-union"); a.setOrganizationDomain("https://www.deepinos.org/"); a.setApplicationName("Spark Store"); //不需要翻译,否则 ~/.local/share/ 下文件夹名称也被翻译为中文 - a.setApplicationVersion(DApplication::buildVersion("3.3.3~test4")); + a.setApplicationVersion(DApplication::buildVersion(readConfig.value("build/version").toString())); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationDescription( QObject::tr( diff --git a/src/widget.cpp b/src/widget.cpp index 7acee43..bf67d28 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -805,6 +805,7 @@ void Widget::displaySearchApp(QJsonArray array) { QJsonObject appInfo = array.at(i).toObject(); AppItem *appItem = new AppItem(this); + appItem->setAttribute(Qt::WA_DeleteOnClose); QString url = QString("spk://store/%1/%2") .arg(appInfo["category_slug"].toString()) .arg(appInfo["pkgname"].toString()); @@ -1090,6 +1091,7 @@ void Widget::on_comboBox_server_currentIndexChanged(const QString &arg1) QSettings *setConfig = new QSettings(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat); setConfig->setValue("server/choose", arg1); setConfig->setValue("server/updated", updatedInfo); + setConfig->deleteLater(); } }