Compare commits

...

52 Commits

Author SHA1 Message Date
5562e2b5d1 fix:不正确地跳过unhold 2022-10-21 13:59:43 +08:00
a09425f361 符号错误修正 2022-10-21 13:46:23 +08:00
18db530c0d zenity依赖加入 2022-10-21 13:30:21 +08:00
03263edf8c 更新系统zenity,适配apt-mark hold 2022-10-21 13:28:34 +08:00
cd13a1ce08 !132 merge and start develop zenity
Merge pull request !132 from shenmo/dev
2022-10-21 03:03:18 +00:00
1c5f31da6f fix: 左侧菜单字体大小变化 2022-10-20 21:13:59 +08:00
828f1a0f05 update src/main.cpp.
版本号

Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-19 15:14:38 +00:00
c54c13d822 modified: debian/changelog 2022-10-17 18:33:49 +08:00
fdc9550100 tag相关文案修改 2022-10-17 18:31:46 +08:00
458cc49302 update debian/changelog.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-15 14:26:04 +00:00
e11afad89b !129 反向同步进度
Merge pull request !129 from shenmo/master
2022-10-15 14:25:37 +00:00
43ae031131 !128 增加dbus
Merge pull request !128 from depend/dev
2022-10-15 12:03:18 +00:00
dd6780d636 增加dbus文件,再次启动的时候会唤起第一个进程
并且处理spark打开
2022-10-15 19:55:19 +08:00
42368a0245 !127 转扁平化为正常合入,添加依赖libssl-dev
Merge pull request !127 from shenmo/dev
2022-10-13 16:04:52 +00:00
8ca0035107 根据 https://www.deepinos.org/d/1076-ubuntu2204/3 修改
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-13 16:03:40 +00:00
10332c59e0 !126 324t3发版
* 3.2.4~test3
* 	修改:     debian/changelog
* !125 fix: 对oss进行URL转译
* Merge remote-tracking branch 'upstream/dev' into dev
* fix: 对oss进行URL转译
* !124 fix: 安装时可能出现的超时错误
* update debian/changelog.
* update src/widget.cpp.
* Merge remote-tracking branch 'upstream/dev' into dev
* update debian/changelog.
* Merge remote-tracking branch 'upstream/dev' into dev
* fix: 超时错误
* update README.zh.md.
* update README.md.
* update README.zh.md.
* update debian/changelog.
* !123 feat: 投稿器
* feat: 投稿器
* !122 fix:gpu 参数
* fix: chrome GPU 参数
* Merge remote-tracking branch 'upstream/dev' into dev
* 修复错误的配置文件
* 改为读取/etc
* update debian/changelog.
* UOS 走普通的aptss,aptss支持UOS源
* 更新时不再清除免密码安装设置
* !121 反向同步
* fix
* Merge remote-tracking branch 'upstream/dev' into dev
* fix: high CPU usage because futex is still waiting for queue after illegal exit
* Merge remote-tracking branch 'upstream/master' into dev
* Merge remote-tracking branch 'upstream/dev' into dev
* feat: enable GPU
* Merge remote-tracking branch 'upstream/dev' into dev
* Merge branch 'dev' of gitee.com:uniartisan2018/spark-store into dev
* feat: 清除网页缓存
* 文案修改
* update src/widget.ui.
* feat: 星火应用商店检测更新
2022-10-12 14:08:21 +00:00
09a1c9f710 3.2.4~test3 2022-10-12 22:08:08 +08:00
ba29c4171c 修改: debian/changelog
修改:     translations/spark-store_en.ts
	修改:     translations/spark-store_fr.ts
	修改:     translations/spark-store_zh_CN.ts
2022-10-12 22:06:30 +08:00
3b9dde23e7 !125 fix: 对oss进行URL转译
Merge pull request !125 from Pluto/dev
2022-10-12 10:59:23 +00:00
746e9bd3d6 Merge remote-tracking branch 'upstream/dev' into dev 2022-10-12 09:31:38 +08:00
d7f0ee983b fix: 对oss进行URL转译 2022-10-12 09:31:23 +08:00
3feec88f7b !124 fix: 安装时可能出现的超时错误
Merge pull request !124 from Pluto/dev
2022-10-09 11:11:25 +00:00
c0ffb64a86 update debian/changelog.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-09 11:01:55 +00:00
8c08b7e995 update src/widget.cpp.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-09 10:41:48 +00:00
4d7e766d75 Merge remote-tracking branch 'upstream/dev' into dev 2022-10-09 18:37:01 +08:00
09115c3961 update debian/changelog.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-09 10:36:31 +00:00
63998bbce4 Merge remote-tracking branch 'upstream/dev' into dev 2022-10-09 18:36:31 +08:00
967f62f825 fix: 超时错误 2022-10-09 18:36:22 +08:00
e8ae0325e0 update README.zh.md.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-08 16:13:33 +00:00
66a4563b51 update README.md.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-08 16:12:59 +00:00
330ae3eeb8 update README.zh.md.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-08 16:12:00 +00:00
0534c39ee5 update debian/changelog.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-08 15:45:37 +00:00
04047c1e44 !123 feat: 投稿器
* feat: 投稿器
2022-10-08 15:38:55 +00:00
5e501b9d17 feat: 投稿器 2022-10-08 23:27:35 +08:00
5a434a9b7d !122 fix:gpu 参数
Merge pull request !122 from Pluto/dev
2022-10-08 14:41:43 +00:00
e554aec98d fix: chrome GPU 参数 2022-10-08 22:24:16 +08:00
ab0f5e6613 Merge remote-tracking branch 'upstream/dev' into dev 2022-10-08 22:20:46 +08:00
59607f6b34 修复错误的配置文件
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-08 14:08:30 +00:00
a13f0ddcb7 改为读取/etc
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-08 13:47:00 +00:00
fec604b481 update debian/changelog.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-08 03:22:12 +00:00
0ad4b6c82c fix 2022-09-26 23:53:28 +08:00
189a0b4939 Merge remote-tracking branch 'upstream/dev' into dev 2022-09-26 23:46:34 +08:00
c65d7b86df fix: high CPU usage because futex is still waiting for queue after illegal exit 2022-09-26 23:46:25 +08:00
19dff7fb56 Merge remote-tracking branch 'upstream/master' into dev 2022-09-20 11:55:54 +08:00
67b314d0d2 Merge remote-tracking branch 'upstream/dev' into dev 2022-09-20 11:55:40 +08:00
63b28adaf8 feat: enable GPU 2022-09-20 11:55:36 +08:00
829a08d40a Merge remote-tracking branch 'upstream/dev' into dev 2022-09-02 19:28:05 +08:00
411bbe5935 Merge branch 'dev' of gitee.com:uniartisan2018/spark-store into dev 2022-09-02 19:25:27 +08:00
5d5fbfbad4 feat: 清除网页缓存 2022-09-02 19:24:45 +08:00
c93c221cf1 文案修改 2022-09-01 01:47:38 +08:00
afee0966c8 update src/widget.ui.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-08-31 17:44:46 +00:00
2df5363c2c feat: 星火应用商店检测更新 2022-09-01 01:39:09 +08:00
22 changed files with 385 additions and 165 deletions

View File

@@ -12,8 +12,10 @@ All packages will be shared in our repository for users to get freely.
Distrobution supportedDeepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(May stop support in the future ; UniontechOS Home 21
You can track our Issue resoving progress here https://gitee.com/deepin-community-store/spark-store/board
I hope people who see here can also join our teamdevelopment help or submit applications are welcomed
We hope people who see here can also join our teamdevelopment help or submit applications are welcomed
If you want to submit an APP to share with othersPlease [Click here](https://upload.deepinos.org/index)

View File

@@ -10,6 +10,8 @@
希望看到这里的人也可以加入我们的队伍开发或者投递应用都很欢迎共同构建Linux应用生态
在这里追踪我们的Issue处理情况 https://gitee.com/deepin-community-store/spark-store/board
如果有想要提交的软件包,请 [在这里投稿](https://upload.deepinos.org/index)

42
debian/changelog vendored
View File

@@ -1,5 +1,47 @@
spark-store (3.3~test1) stable; urgency=medium
* zenity选择可更新应用
* 自动更新检测现在会跳过hold
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
spark-store (3.2.4) stable; urgency=medium
* 修改tag相关的文案内容wine相关环境已可自动配置了
* 准备发版
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
spark-store (3.2.4~test4) stable; urgency=medium
* 现在在商店启动后点击spk链接仍会正常启动 https://gitee.com/deepin-community-store/spark-store/commit/dd6780d636042bf12d77414e6f1552cc7d1ed24c
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
spark-store (3.2.4~test3) stable; urgency=medium
* 发版合入到master
* 翻译完毕
* 合入先前的各项改动客户端集成投稿器入口和支持修复安装依赖时间较长时错误地返回“安装完毕”结果现在客户端版本更新时不关闭免密码登录UOS安装进程合并正常aptss中
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
spark-store (3.2.4~test2) stable; urgency=medium
* 客户端集成投稿器入口和支持
* 修复:安装依赖时间较长时错误地返回“安装完毕”结果
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
spark-store (3.2.4~test1) stable; urgency=medium
* 客户端更新时不关闭免密码登录
* UOS合并正常aptss中

4
debian/control vendored
View File

@@ -35,10 +35,12 @@ Depends:${shlibs:Depends}, ${misc:Depends},
libnotify4,
curl,
openssl,
libssl-dev,
dde-qt5integration,
bubblewrap,
aria2,
gcc
gcc,
zenity
Description: Spark Store
A community powered app store, based on DTK.
Recommends: apt-fast

View File

@@ -0,0 +1,12 @@
#include "dbussparkstore.h"
#include <QDebug>
DBusSparkStoreService::DBusSparkStoreService(QObject *parent)
: QDBusAbstractAdaptor(parent)
{
}
void DBusSparkStoreService::activeWindow(const QString & arg)
{
emit sigOpenUrl(arg);
}

24
src/dbus/dbussparkstore.h Normal file
View File

@@ -0,0 +1,24 @@
#ifndef DBUSSPARKSTORE_H
#define DBUSSPARKSTORE_H
#include <QObject>
#include <QUrl>
#include <QtDBus/QtDBus>
class Wallpaper;
class DBusSparkStoreService : public QDBusAbstractAdaptor
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "com.gitee.spark.store")
public:
explicit DBusSparkStoreService(QObject *parent);
signals :
void sigOpenUrl(const QString &url);
public Q_SLOTS:
void activeWindow(const QString &arg);
};
#endif // DBUSSPARKSTORE_H

View File

@@ -151,7 +151,7 @@ void downloadlist::install(int t)
bool haveError = false;
bool notRoot = false;
installer.waitForFinished();
installer.waitForFinished(-1); // 不设置超时
out = installer.readAllStandardOutput();
QStringList everyOut = out.split("\n");
@@ -169,7 +169,7 @@ void downloadlist::install(int t)
QProcess isInstall;
isInstall.start("dpkg -s " + pkgName);
isInstall.waitForFinished();
isInstall.waitForFinished(180); // 默认超时 3 分钟
int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
if(error == 0)
{

View File

@@ -116,7 +116,7 @@ void DownloadController::startDownload(const QString &url)
else{
for (int i = 0; i < domains.size(); i++)
{
command.append(replaceDomain(url, domains.at(i)).toUtf8());
command.append(replaceDomain(url, domains.at(i)).replace("+","%2B").toUtf8()); //对+进行转译避免oss出错
}
}

View File

@@ -4,6 +4,9 @@
#include <DAboutDialog>
#include <QVector>
#include <QScreen>
//新增dbus
#include <QDBusInterface>
#include <QDBusPendingCall>
#include "widget.h"
@@ -15,7 +18,7 @@ int main(int argc, char *argv[])
// 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题
// 浏览器开启 GPU 支持
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blacklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode");
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blocklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode");
QVector<char*> fakeArgs(argc + 2);
fakeArgs[0] = argv[0];
@@ -34,7 +37,7 @@ int main(int argc, char *argv[])
DAboutDialog dialog;
a.setAboutDialog(&dialog);
dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
dialog.setVersion(DApplication::buildVersion("Version 3.2.4"));
dialog.setVersion(DApplication::buildVersion("Version 3.3~test1"));
dialog.setProductIcon(QIcon::fromTheme("spark-store")); // 设置Logo
dialog.setProductName(QLabel::tr("Spark Store"));
dialog.setDescription(
@@ -55,7 +58,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.2.4"));
a.setApplicationVersion(DApplication::buildVersion("3.3~test1"));
a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
a.setApplicationDescription(
QObject::tr(
@@ -69,6 +72,17 @@ int main(int argc, char *argv[])
// 限制单实例运行
if(!a.setSingleInstance("spark-store"))
{
qDebug() << "The application is already running!";
QDBusInterface iface("com.gitee.spark.store",
"/com/gitee/spark/store",
"com.gitee.spark.store",
QDBusConnection::sessionBus());
QString arg1 = argv[1];
iface.asyncCall("activeWindow",arg1);
return -1;
}

View File

@@ -8,6 +8,7 @@ QT += core gui network concurrent webenginewidgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
QT += dbus
TARGET = spark-store
TEMPLATE = app
@@ -41,7 +42,8 @@ SOURCES += \
main.cpp \
progressload.cpp \
widget.cpp \
workerthreads.cpp
workerthreads.cpp \
dbus/dbussparkstore.cpp
HEADERS += \
appitem.h \
@@ -52,7 +54,8 @@ HEADERS += \
image_show.h \
progressload.h \
widget.h \
workerthreads.h
workerthreads.h \
dbus/dbussparkstore.h
FORMS += \
appitem.ui \

View File

@@ -33,6 +33,7 @@
#include "HttpClient.h"
#include "downloadworker.h"
#include "./dbus/dbussparkstore.h"
DWIDGET_USE_NAMESPACE
Widget::Widget(DBlurEffectWidget *parent) :
@@ -138,6 +139,9 @@ Widget::Widget(DBlurEffectWidget *parent) :
});
notify_init(tr("Spark\\ Store").toLocal8Bit());
//初始化dbus服务
initDbus();
}
Widget::~Widget()
@@ -193,6 +197,7 @@ void Widget::initUI()
// 添加菜单项
QAction *actionSubmission = new QAction(tr("Submit App"), this);
QAction *actionSubmissionWithClient = new QAction(tr("Submit App with client(Recommanded)"), this);
QAction *setting = new QAction(tr("Settings"));
QAction *upgrade = new QAction(tr("APP Upgrade and Install Settings"));
@@ -200,6 +205,7 @@ void Widget::initUI()
menu->addAction(setting);
menu->addAction(upgrade);
menu->addAction(actionSubmission);
menu->addAction(actionSubmissionWithClient);
titlebar->setMenu(menu);
@@ -207,6 +213,23 @@ void Widget::initUI()
connect(setting, &QAction::triggered, this, &Widget::opensetting);
connect(upgrade, &QAction::triggered, this, [=]{QProcess::startDetached("x-terminal-emulator -e /opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh");});
// 投稿器
connect(actionSubmissionWithClient, &QAction::triggered, this, [=]
{
QString submitterSpk = "spk://store/tools/spark-store-submitter";
QFile actionSubmissionClientStatus("/opt/spark-store-submitter/bin/spark-store-submitter");
if (actionSubmissionClientStatus.exists())
{
qDebug() << "投稿器存在";
QProcess::startDetached("/opt/spark-store-submitter/bin/spark-store-submitter");
}
else{
qDebug() << "投稿器不存在,跳转页面";
openUrl(submitterSpk);
}
});
// 载入自定义字体
int loadedFontID = QFontDatabase::addApplicationFont(":/fonts/fonts/hksnzt.ttf");
QStringList loadedFontFamilies = QFontDatabase::applicationFontFamilies(loadedFontID);
@@ -433,6 +456,15 @@ void Widget::sendNotification(const char *message, const int msTimeout, const QS
notify_notification_show(_notify, nullptr);
}
void Widget::initDbus()
{
DBusSparkStoreService *dbusInter = new DBusSparkStoreService(this);
QDBusConnection::sessionBus().registerService("com.gitee.spark.store");
QDBusConnection::sessionBus().registerObject("/com/gitee/spark/store", "com.gitee.spark.store", this);
connect(dbusInter,&DBusSparkStoreService::sigOpenUrl,this,&Widget::onGetUrl);
}
void Widget::updateUI()
{
if(themeIsDark)
@@ -478,6 +510,9 @@ void Widget::updateUI()
* left_list[i]->setFont(temp);
*/
QFont temp;
temp.setFamily(temp.defaultFamily());
left_list[i]->setFont(temp);
left_list[i]->setFixedHeight(38);
if(themeIsDark)
{
@@ -1109,11 +1144,11 @@ void Widget::on_pushButton_uninstall_clicked()
QProcess uninstall;
uninstall.start("pkexec", QStringList() << "apt" << "purge" << "-y" << pkgName.toLower());
uninstall.waitForFinished();
uninstall.waitForFinished(-1); // 默认无限时长
QProcess check;
check.start("dpkg", QStringList() << "-s" << pkgName.toLower());
check.waitForFinished();
check.waitForFinished(180); // 默认超时 3 分钟
if (check.readAllStandardOutput().isEmpty())
{
@@ -1284,6 +1319,7 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
ui->stackedWidget->setCurrentIndex(2);
qDebug() << "程序跳转链接地址:" << arg1;
QString url = arg1.toString();
/*
load.cancel(); // 打开并发加载线程前关闭正在执行的线程
@@ -1294,7 +1330,7 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
*/
appinfoLoadThread.requestInterruption();
appinfoLoadThread.wait(100);
appinfoLoadThread.setUrl(arg1);
appinfoLoadThread.setUrl(url.replace("+","%2B")); //对+进行转译避免oss出错
appinfoLoadThread.start();
}
}
@@ -1334,3 +1370,12 @@ void Widget::on_pushButton_update_clicked()
QDesktopServices::openUrl(QUrl("https://www.deepinos.org/"));
}
void Widget::onGetUrl(const QString &url)
{
if(url.left(6)=="spk://")
{
openUrl(QUrl(url));
}
activateWindow();
}

View File

@@ -64,6 +64,7 @@ public:
static void sendNotification(const QString &message, const int msTimeout = 5000, const QString &icon = "spark-store");
static void sendNotification(const char *message, const int msTimeout = 5000, const QString &icon = "spark-store");
void initDbus();
private slots:
void httpFinished();
@@ -103,6 +104,9 @@ private slots:
void on_pushButton_refresh_clicked();
void on_pushButton_update_clicked();
//接受来自dbus的url
void onGetUrl(const QString &url);
public:
QUrl url;
QString cdnSeverUrl;

View File

@@ -345,7 +345,7 @@
<number>0</number>
</property>
<property name="currentIndex">
<number>3</number>
<number>2</number>
</property>
<widget class="QWidget" name="page">
<layout class="QVBoxLayout" name="verticalLayout_4">
@@ -365,11 +365,11 @@
<number>0</number>
</property>
<item>
<widget class="QWebEngineView" name="webEngineView">
<widget class="QWebEngineView" name="webEngineView" native="true">
<property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum>
</property>
<property name="url">
<property name="url" stdset="0">
<url>
<string>about:blank</string>
</url>
@@ -842,7 +842,7 @@
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will configure the wine environment for you so dont worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -861,7 +861,7 @@
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.Spark Store will configure the wine environment for you so dont worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

View File

@@ -92,7 +92,7 @@ void SpkAppInfoLoaderThread::run()
QProcess isInstall;
packagename = json["Pkgname"].toString();
isInstall.start("dpkg -s " + json["Pkgname"].toString());
isInstall.waitForFinished();
isInstall.waitForFinished(180); // 默认超时 3 分钟
int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
if(error == 0)
{
@@ -100,12 +100,12 @@ void SpkAppInfoLoaderThread::run()
QProcess isUpdate;
isUpdate.start("dpkg-query --showformat='${Version}' --show " + json["Pkgname"].toString());
isUpdate.waitForFinished();
isUpdate.waitForFinished(180); // 默认超时 3 分钟
QString localVersion = isUpdate.readAllStandardOutput();
localVersion.replace("'", "");
isUpdate.start("dpkg --compare-versions " + localVersion + " ge " + json["Version"].toString());
isUpdate.waitForFinished();
isUpdate.waitForFinished(180); // 默认超时 3 分钟
if(!isUpdate.exitCode())
{
isUpdated = true;

View File

@@ -21,7 +21,9 @@ _APTMGR=apt
#
if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then
AUTH_UOS_USER="uos-https://license.chinauos.com-apt"
AUTH_UOS_PASSWD="a=SHEDW8U8E8SDHP5A&aa=&ab=v1&ad=8c584d561897bb0cfaed06448d2c00db&ae=4d06bb476c4b49299bf61131adf74d9e&af=4&ag=UNKNOW:ec529f04c7dffb7bd5859f561259aebc&ah=000C292C00DB&b=v2&c=62b2b266c66f30000167448b&d=N7AADCAAYHAKM54KZJQKMPEBV&e=8aa2da8715ffe6f0b01c4a6bba1d8c91&f=7568a02ccfda9af6a3a4b73094daf161&g=AA2SAA&h=21.3.1&i=101&j=422f2415ea7d14119aae28d80aad4695&k=245f-5674-f133-2b01&l=93a6-0ba8-5d84-a21a&m=245f-5674-f133-2b01&n=,|&o=VMwareVirtualS|VMwareVirtualS&p=ec529f04c7dffb7bd5859f561259aebc&q=19e1fe0a654af0eccca498848d024e64&r=000C292C00DB&s=1&t=2&v=5.6.30&w=&x=6&y=-1&z=v3/vm"
AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf | grep home-packages.chinauos.com`"
AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }`
fi
# Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download
# packages directly.

View File

@@ -1,24 +1,26 @@
#!/bin/bash
PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)"
####如果没更新,就弹出不需要更新
if [ -z "$PKG_LIST" ];then
zenity --info --icon-name=spark-store --text "没有软件需要更新\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300
else
PKG_UPGRADE_LIST=`for PKG_NAME in $PKG_LIST;
do
#### 检测是否是hold状态
if [ "$(dpkg-query -W -f='${Status}' $PKG_NAME | grep hold)" = "" ];then
echo "true"
echo "$PKG_NAME"
else
echo "false"
echo "$PKG_NAME (无法更新:请先执行 sudo apt-mark unhold 后再更新)"
fi
done | zenity --list --text="选择你想更新的应用" --column=是否更新 --column=应用包名 --separator=" " --checklist --print-column=2 --multiple --height 350 --width 550 `
echo "以上可升级,是否升级?[y/n]"
read yes_or_no
if [ "$yes_or_no" = "y" ];then ###这是确定是否同意
#### 如果没有选择,则直接退出
echo "获取更新列表..."
PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)"
if [ "$PKG_UPGRADE_LIST" = "" ];then
zenity --info --icon-name=spark-store --text "没有选中任何软件\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300
else
sudo aptss install $PKG_UPGRADE_LIST -y
fi
for PKG_NAME in $PKG_LIST;
do
echo "$PKG_NAME 正在更新..."
if sudo aptss install "$PKG_NAME" -y >/dev/null 2>&1;
then
echo "$PKG_NAME 已更新"
else
echo "WARNING: $PKG_NAME 无法更新"
fi
done
fi ###这是确定是否同意
fi

View File

@@ -68,8 +68,7 @@ case $option in
2)
echo "执行以下操作需要授权..."
sudo aptss ssupdate
/opt/durapps/spark-store/bin/update-upgrade/ss-upgrade-list.sh
/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh
sudo /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh
echo "---请按回车返回"
read
reset

View File

@@ -66,12 +66,31 @@ isupdate=`echo ${updatetext: -5}`
if [ "$isupdate" = "date." ];then
exit 0
fi
#### 从这里开始,只有检测到了更新才会进行
update_app_number=`echo ${updatetext%package*} #从右向左截取第一个 src 后的字符串`
update_app_number=`echo ${update_app_number##*information...}`
PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)"
for PKG_NAME in $PKG_LIST;do
if [ "$(dpkg-query -W -f='${Status}' $PKG_NAME | grep hold)" != "" ];then
let update_app_number=$update_app_number-1
echo $update_app_number
echo $PKG_NAME
fi
done
if [ $update_app_number -lt 1 ];then
exit
fi
#### 如果都是hold的那就直接退出否则把剩余的给提醒了
notify-send -i spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦!请到星火商店的菜单处理"

View File

@@ -1,6 +0,0 @@
#!/bin/bash
set -e
echo "---可更新的应用有:"
bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"

View File

@@ -12,9 +12,9 @@
<context>
<name>QLabel</name>
<message>
<location filename="../src/main.cpp" line="35"/>
<location filename="../src/main.cpp" line="43"/>
<location filename="../src/main.cpp" line="49"/>
<location filename="../src/main.cpp" line="42"/>
<location filename="../src/main.cpp" line="50"/>
<location filename="../src/main.cpp" line="56"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
@@ -22,22 +22,22 @@
<context>
<name>QObject</name>
<message>
<location filename="../src/main.cpp" line="32"/>
<location filename="../src/main.cpp" line="39"/>
<source>We publish this program under GPL V3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="37"/>
<location filename="../src/main.cpp" line="44"/>
<source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="45"/>
<location filename="../src/main.cpp" line="52"/>
<source>The Spark Project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="57"/>
<location filename="../src/main.cpp" line="64"/>
<source>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;Published under GPL V3</source>
<translation type="unfinished"></translation>
</message>
@@ -149,8 +149,8 @@
</message>
<message>
<location filename="../src/widget.ui" line="547"/>
<location filename="../src/widget.cpp" line="910"/>
<location filename="../src/widget.cpp" line="1119"/>
<location filename="../src/widget.cpp" line="943"/>
<location filename="../src/widget.cpp" line="1152"/>
<source>Install</source>
<translation type="unfinished"></translation>
</message>
@@ -254,7 +254,6 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="864"/>
<location filename="../src/widget.ui" line="867"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
@@ -303,6 +302,10 @@
</message>
<message>
<location filename="../src/widget.ui" line="845"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will configure the wine environment for you so dont worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="848"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
@@ -312,6 +315,11 @@
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dwine2-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="864"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.Spark Store will configure the wine environment for you so dont worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="870"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dwine5-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -368,32 +376,37 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1304"/>
<location filename="../src/widget.ui" line="1328"/>
<source>Clean</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1314"/>
<location filename="../src/widget.ui" line="1294"/>
<source>Since the dictionary is at /tmp,It would be cleaned automatically when system reboot.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1327"/>
<location filename="../src/widget.ui" line="1341"/>
<source>Size:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1341"/>
<location filename="../src/widget.ui" line="1308"/>
<source>Location/tmp/spark-store</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1362"/>
<source>About us</source>
<location filename="../src/widget.ui" line="1348"/>
<source>Clear Web Cache</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1369"/>
<source>About us</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1376"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We are &lt;span style=&quot; font-weight:600;&quot;&gt;NOT&lt;/span&gt; the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &amp;quot;Spark Store&amp;quot;! &amp;quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. &lt;/p&gt;&lt;p&gt;We don&apos;t make a profit from this, all developers and maintainers don&apos;t get paid, and we rely on the community&apos;s donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. &lt;/p&gt;&lt;p&gt;Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. &lt;/p&gt;&lt;p&gt;If any part of the store infringes your rights, please tell us &amp;lt;jifengshenmo@outlook.com&amp;gt; we will remove the infringing content as soon as possible. &lt;/p&gt;&lt;p&gt;If you&apos;d like to get involved with us too, whether you&apos;re involved in development, design, pitching or submitting work, we welcome you to join us. &lt;/p&gt;&lt;p&gt;QQ group:872690351&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -428,92 +441,97 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1334"/>
<location filename="../src/widget.ui" line="1301"/>
<source>0B</source>
<translation type="unfinished">0B</translation>
</message>
<message>
<location filename="../src/widget.cpp" line="187"/>
<location filename="../src/widget.cpp" line="192"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="188"/>
<location filename="../src/widget.cpp" line="193"/>
<source>Search or enter spk://</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="194"/>
<location filename="../src/widget.cpp" line="199"/>
<source>Submit App</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="195"/>
<location filename="../src/widget.cpp" line="200"/>
<source>Submit App with client(Recommanded)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="201"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="196"/>
<location filename="../src/widget.cpp" line="202"/>
<source>APP Upgrade and Install Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="347"/>
<location filename="../src/widget.cpp" line="371"/>
<source>Not Exist</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="139"/>
<location filename="../src/widget.cpp" line="409"/>
<location filename="../src/widget.cpp" line="414"/>
<location filename="../src/widget.cpp" line="424"/>
<location filename="../src/widget.cpp" line="429"/>
<location filename="../src/widget.cpp" line="141"/>
<location filename="../src/widget.cpp" line="433"/>
<location filename="../src/widget.cpp" line="438"/>
<location filename="../src/widget.cpp" line="448"/>
<location filename="../src/widget.cpp" line="453"/>
<source>Spark\ Store</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="659"/>
<location filename="../src/widget.cpp" line="899"/>
<location filename="../src/widget.cpp" line="692"/>
<location filename="../src/widget.cpp" line="932"/>
<source>Reinstall</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="625"/>
<location filename="../src/widget.cpp" line="658"/>
<source>Failed to get the name to the file to be downloaded.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="904"/>
<location filename="../src/widget.cpp" line="937"/>
<source>Upgrade</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1091"/>
<location filename="../src/widget.cpp" line="1124"/>
<source>Updating, please wait...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1123"/>
<location filename="../src/widget.cpp" line="1156"/>
<source>Uninstall succeeded</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="710"/>
<location filename="../src/widget.cpp" line="739"/>
<source>Relative apps Not Found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="719"/>
<location filename="../src/widget.cpp" line="747"/>
<source>Request Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1145"/>
<location filename="../src/widget.cpp" line="1178"/>
<source>Temporary cache was cleaned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1227"/>
<location filename="../src/widget.cpp" line="1270"/>
<source>The URL has been copied to the clipboard</source>
<translation type="unfinished"></translation>
</message>

View File

@@ -23,9 +23,9 @@ Spark Store est publié sous licence GPL V3
Nous sommes nés pour le changement.</translation>
</message>
<message>
<location filename="../src/main.cpp" line="35"/>
<location filename="../src/main.cpp" line="43"/>
<location filename="../src/main.cpp" line="49"/>
<location filename="../src/main.cpp" line="42"/>
<location filename="../src/main.cpp" line="50"/>
<location filename="../src/main.cpp" line="56"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
@@ -33,22 +33,22 @@ Nous sommes nés pour le changement.</translation>
<context>
<name>QObject</name>
<message>
<location filename="../src/main.cpp" line="32"/>
<location filename="../src/main.cpp" line="39"/>
<source>We publish this program under GPL V3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="37"/>
<location filename="../src/main.cpp" line="44"/>
<source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="45"/>
<location filename="../src/main.cpp" line="52"/>
<source>The Spark Project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="57"/>
<location filename="../src/main.cpp" line="64"/>
<source>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;Published under GPL V3</source>
<translation type="unfinished"></translation>
</message>
@@ -210,8 +210,8 @@ Nous sommes nés pour le changement.</translation>
</message>
<message>
<location filename="../src/widget.ui" line="547"/>
<location filename="../src/widget.cpp" line="910"/>
<location filename="../src/widget.cpp" line="1119"/>
<location filename="../src/widget.cpp" line="943"/>
<location filename="../src/widget.cpp" line="1152"/>
<source>Install</source>
<translation type="unfinished"></translation>
</message>
@@ -297,6 +297,10 @@ Nous sommes nés pour le changement.</translation>
</message>
<message>
<location filename="../src/widget.ui" line="845"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will configure the wine environment for you so dont worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="848"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
@@ -308,6 +312,10 @@ Nous sommes nés pour le changement.</translation>
</message>
<message>
<location filename="../src/widget.ui" line="864"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.Spark Store will configure the wine environment for you so dont worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="867"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
@@ -394,32 +402,37 @@ Nous sommes nés pour le changement.</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1304"/>
<location filename="../src/widget.ui" line="1328"/>
<source>Clean</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1314"/>
<location filename="../src/widget.ui" line="1294"/>
<source>Since the dictionary is at /tmp,It would be cleaned automatically when system reboot.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1327"/>
<location filename="../src/widget.ui" line="1341"/>
<source>Size:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1341"/>
<location filename="../src/widget.ui" line="1308"/>
<source>Location/tmp/spark-store</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1362"/>
<source>About us</source>
<location filename="../src/widget.ui" line="1348"/>
<source>Clear Web Cache</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1369"/>
<source>About us</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1376"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We are &lt;span style=&quot; font-weight:600;&quot;&gt;NOT&lt;/span&gt; the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &amp;quot;Spark Store&amp;quot;! &amp;quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. &lt;/p&gt;&lt;p&gt;We don&apos;t make a profit from this, all developers and maintainers don&apos;t get paid, and we rely on the community&apos;s donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. &lt;/p&gt;&lt;p&gt;Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. &lt;/p&gt;&lt;p&gt;If any part of the store infringes your rights, please tell us &amp;lt;jifengshenmo@outlook.com&amp;gt; we will remove the infringing content as soon as possible. &lt;/p&gt;&lt;p&gt;If you&apos;d like to get involved with us too, whether you&apos;re involved in development, design, pitching or submitting work, we welcome you to join us. &lt;/p&gt;&lt;p&gt;QQ group:872690351&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -589,7 +602,7 @@ Nous sommes nés pour le changement.</translation>
<translation type="vanished">Taille: </translation>
</message>
<message>
<location filename="../src/widget.ui" line="1334"/>
<location filename="../src/widget.ui" line="1301"/>
<source>0B</source>
<translation type="unfinished">0B</translation>
</message>
@@ -606,87 +619,92 @@ Nous sommes nés pour le changement.</translation>
<translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nous ne sommes pas l&apos;équipe officielle, tout comme vous, nous ne sommes qu&apos;un des nombreux passionnés et utilisateurs de systèmes Linux / deepin, nous développons et gérons le &quot;Spark Store&quot;! &quot;, est de rassembler la communauté pour partager des logiciels utiles, ou pour participer au développement ensemble, afin que nous utilisions tous les derniers et meilleurs logiciels. &lt;/p&gt;&lt;p&gt; Nous n&apos;en tirons aucun profit, tous les développeurs et mainteneurs ne sont pas payés, et nous comptons sur les dons de la communauté pour la plupart de nos dépenses, dont nous sommes reconnaissants et qui nous permettent de ne pas dépenser trop d&apos;énergie se soucier du financement. &lt;/p&gt;&lt;p&gt;Notre service et nos logiciels sont gratuits pour tout le monde à utiliser, à communiquer et à apprendre, mais vous devez vous conformer aux lois et réglementations locales dans le processus de votre utilisation, sinon tout problème n&apos;a rien à voir avec nous. &lt;/p&gt;&lt;p&gt;Si une partie du magasin enfreint vos droits, veuillez nous en informer &amp;lt;jifengshenmo@outlook.com&amp;gt; nous retirerons le contenu en infraction dès que possible. &lt;/p&gt;&lt;p&gt;Si vous souhaitez également vous impliquer avec nous, que vous soyez impliqué dans le développement, la conception, le pitching ou la soumission de travaux, nous vous invitons à nous rejoindre. &lt;/p&gt;&lt;p&gt;QQ group:872690351&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/widget.cpp" line="139"/>
<location filename="../src/widget.cpp" line="409"/>
<location filename="../src/widget.cpp" line="414"/>
<location filename="../src/widget.cpp" line="424"/>
<location filename="../src/widget.cpp" line="429"/>
<location filename="../src/widget.cpp" line="141"/>
<location filename="../src/widget.cpp" line="433"/>
<location filename="../src/widget.cpp" line="438"/>
<location filename="../src/widget.cpp" line="448"/>
<location filename="../src/widget.cpp" line="453"/>
<source>Spark\ Store</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="187"/>
<location filename="../src/widget.cpp" line="192"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="188"/>
<location filename="../src/widget.cpp" line="193"/>
<source>Search or enter spk://</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="194"/>
<location filename="../src/widget.cpp" line="199"/>
<source>Submit App</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="195"/>
<location filename="../src/widget.cpp" line="200"/>
<source>Submit App with client(Recommanded)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="201"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="196"/>
<location filename="../src/widget.cpp" line="202"/>
<source>APP Upgrade and Install Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="347"/>
<location filename="../src/widget.cpp" line="371"/>
<source>Not Exist</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="659"/>
<location filename="../src/widget.cpp" line="899"/>
<location filename="../src/widget.cpp" line="692"/>
<location filename="../src/widget.cpp" line="932"/>
<source>Reinstall</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="625"/>
<location filename="../src/widget.cpp" line="658"/>
<source>Failed to get the name to the file to be downloaded.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="710"/>
<location filename="../src/widget.cpp" line="739"/>
<source>Relative apps Not Found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="719"/>
<location filename="../src/widget.cpp" line="747"/>
<source>Request Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="904"/>
<location filename="../src/widget.cpp" line="937"/>
<source>Upgrade</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1091"/>
<location filename="../src/widget.cpp" line="1124"/>
<source>Updating, please wait...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1123"/>
<location filename="../src/widget.cpp" line="1156"/>
<source>Uninstall succeeded</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1145"/>
<location filename="../src/widget.cpp" line="1178"/>
<source>Temporary cache was cleaned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1227"/>
<location filename="../src/widget.cpp" line="1270"/>
<source>The URL has been copied to the clipboard</source>
<translation type="unfinished"></translation>
</message>

View File

@@ -12,9 +12,9 @@
<context>
<name>QLabel</name>
<message>
<location filename="../src/main.cpp" line="35"/>
<location filename="../src/main.cpp" line="43"/>
<location filename="../src/main.cpp" line="49"/>
<location filename="../src/main.cpp" line="42"/>
<location filename="../src/main.cpp" line="50"/>
<location filename="../src/main.cpp" line="56"/>
<source>Spark Store</source>
<translation>Spark </translation>
</message>
@@ -22,12 +22,12 @@
<context>
<name>QObject</name>
<message>
<location filename="../src/main.cpp" line="32"/>
<location filename="../src/main.cpp" line="39"/>
<source>We publish this program under GPL V3</source>
<translation>GPL V3开源</translation>
</message>
<message>
<location filename="../src/main.cpp" line="37"/>
<location filename="../src/main.cpp" line="44"/>
<source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
<translation>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;星火计划开发者&lt;/span&gt;</translation>
</message>
@@ -40,7 +40,7 @@
<translation type="vanished">&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;deepin &lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</translation>
</message>
<message>
<location filename="../src/main.cpp" line="45"/>
<location filename="../src/main.cpp" line="52"/>
<source>The Spark Project</source>
<translation> The Spark Project</translation>
</message>
@@ -49,7 +49,7 @@
<translation type="vanished">&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt; &lt;/span&gt;&lt;br/&gt;&quot;&quot;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&quot;&quot;&lt;span style=&apos; font-size:12pt;&apos;&gt;星火开发者联盟&lt;/span&gt;&lt;br/&gt;本程序遵循 GPL V3 协议发布</translation>
</message>
<message>
<location filename="../src/main.cpp" line="57"/>
<location filename="../src/main.cpp" line="64"/>
<source>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;Published under GPL V3</source>
<translation>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt; Deepin &lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;星火商店开发组&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;遵循 GPL V3 协议发布</translation>
</message>
@@ -204,8 +204,8 @@
</message>
<message>
<location filename="../src/widget.ui" line="547"/>
<location filename="../src/widget.cpp" line="910"/>
<location filename="../src/widget.cpp" line="1119"/>
<location filename="../src/widget.cpp" line="943"/>
<location filename="../src/widget.cpp" line="1152"/>
<source>Install</source>
<translation></translation>
</message>
@@ -284,8 +284,17 @@
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dtk-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.ui" line="845"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will configure the wine environment for you so dont worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>deepin-wine2应用wine环境</translation>
</message>
<message>
<location filename="../src/widget.ui" line="864"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.Spark Store will configure the wine environment for you so dont worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>deepin-wine5应用wine环境</translation>
</message>
<message>
<location filename="../src/widget.ui" line="867"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;deepin-wine5应用使使ubuntudeepin-wine5环境&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -325,7 +334,6 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/widget.ui" line="845"/>
<location filename="../src/widget.ui" line="848"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; deepin-wine2 使使ubuntu deepin-wine2 &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -403,32 +411,37 @@
<translation></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1304"/>
<location filename="../src/widget.ui" line="1328"/>
<source>Clean</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1314"/>
<location filename="../src/widget.ui" line="1294"/>
<source>Since the dictionary is at /tmp,It would be cleaned automatically when system reboot.</source>
<translation>/tmp下使</translation>
</message>
<message>
<location filename="../src/widget.ui" line="1327"/>
<location filename="../src/widget.ui" line="1341"/>
<source>Size:</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1341"/>
<location filename="../src/widget.ui" line="1308"/>
<source>Location/tmp/spark-store</source>
<translation>/tmp/spark-store</translation>
</message>
<message>
<location filename="../src/widget.ui" line="1362"/>
<location filename="../src/widget.ui" line="1348"/>
<source>Clear Web Cache</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1369"/>
<source>About us</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1369"/>
<location filename="../src/widget.ui" line="1376"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We are &lt;span style=&quot; font-weight:600;&quot;&gt;NOT&lt;/span&gt; the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &amp;quot;Spark Store&amp;quot;! &amp;quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. &lt;/p&gt;&lt;p&gt;We don&apos;t make a profit from this, all developers and maintainers don&apos;t get paid, and we rely on the community&apos;s donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. &lt;/p&gt;&lt;p&gt;Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. &lt;/p&gt;&lt;p&gt;If any part of the store infringes your rights, please tell us &amp;lt;jifengshenmo@outlook.com&amp;gt; we will remove the infringing content as soon as possible. &lt;/p&gt;&lt;p&gt;If you&apos;d like to get involved with us too, whether you&apos;re involved in development, design, pitching or submitting work, we welcome you to join us. &lt;/p&gt;&lt;p&gt;QQ group:872690351&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;&lt;/span&gt;Linux/deepinSpark&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;使使&lt;/p&gt;&lt;p&gt; &amp;lt;jifengshenmo@outlook.com&amp;gt;&lt;/p&gt;&lt;p&gt;稿&lt;/p&gt;&lt;p&gt;QQ 872690351&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
@@ -488,37 +501,42 @@
<translation></translation>
</message>
<message>
<location filename="../src/widget.ui" line="1334"/>
<location filename="../src/widget.ui" line="1301"/>
<source>0B</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="187"/>
<location filename="../src/widget.cpp" line="192"/>
<source>Spark Store</source>
<translation>Spark </translation>
</message>
<message>
<location filename="../src/widget.cpp" line="188"/>
<location filename="../src/widget.cpp" line="193"/>
<source>Search or enter spk://</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="194"/>
<location filename="../src/widget.cpp" line="199"/>
<source>Submit App</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="195"/>
<location filename="../src/widget.cpp" line="200"/>
<source>Submit App with client(Recommanded)</source>
<translation>使稿</translation>
</message>
<message>
<location filename="../src/widget.cpp" line="201"/>
<source>Settings</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="196"/>
<location filename="../src/widget.cpp" line="202"/>
<source>APP Upgrade and Install Settings</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="347"/>
<location filename="../src/widget.cpp" line="371"/>
<source>Not Exist</source>
<translation></translation>
</message>
@@ -527,11 +545,11 @@
<translation type="obsolete"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="139"/>
<location filename="../src/widget.cpp" line="409"/>
<location filename="../src/widget.cpp" line="414"/>
<location filename="../src/widget.cpp" line="424"/>
<location filename="../src/widget.cpp" line="429"/>
<location filename="../src/widget.cpp" line="141"/>
<location filename="../src/widget.cpp" line="433"/>
<location filename="../src/widget.cpp" line="438"/>
<location filename="../src/widget.cpp" line="448"/>
<location filename="../src/widget.cpp" line="453"/>
<source>Spark\ Store</source>
<translation></translation>
</message>
@@ -568,8 +586,8 @@
<translation type="vanished"> </translation>
</message>
<message>
<location filename="../src/widget.cpp" line="659"/>
<location filename="../src/widget.cpp" line="899"/>
<location filename="../src/widget.cpp" line="692"/>
<location filename="../src/widget.cpp" line="932"/>
<source>Reinstall</source>
<translation></translation>
</message>
@@ -578,17 +596,17 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="625"/>
<location filename="../src/widget.cpp" line="658"/>
<source>Failed to get the name to the file to be downloaded.</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="710"/>
<location filename="../src/widget.cpp" line="739"/>
<source>Relative apps Not Found!</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="719"/>
<location filename="../src/widget.cpp" line="747"/>
<source>Request Error: %1</source>
<translation>%1</translation>
</message>
@@ -597,12 +615,12 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="904"/>
<location filename="../src/widget.cpp" line="937"/>
<source>Upgrade</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1091"/>
<location filename="../src/widget.cpp" line="1124"/>
<source>Updating, please wait...</source>
<translation></translation>
</message>
@@ -662,17 +680,17 @@ Click yes to continue.</source>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1123"/>
<location filename="../src/widget.cpp" line="1156"/>
<source>Uninstall succeeded</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1145"/>
<location filename="../src/widget.cpp" line="1178"/>
<source>Temporary cache was cleaned</source>
<translation></translation>
</message>
<message>
<location filename="../src/widget.cpp" line="1227"/>
<location filename="../src/widget.cpp" line="1270"/>
<source>The URL has been copied to the clipboard</source>
<translation></translation>
</message>