From ccdcf407cc5ad15a3c4173bd7c1a117391897caa Mon Sep 17 00:00:00 2001
From: zty199 <1282441920@qq.com>
Date: Tue, 15 Dec 2020 00:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=89=E8=A3=85=E9=80=89?=
=?UTF-8?q?=E9=A1=B9=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
调整安装选项顺序；
更新服务器源优先级；
重新打包。
---
src/downloadlist.cpp | 22 ++++----
src/main.cpp | 2 +-
ssinstall | 1 +
translations/spark-store_en.ts | 94 +++++++++++++++----------------
translations/spark-store_zh_CN.ts | 94 +++++++++++++++----------------
5 files changed, 108 insertions(+), 105 deletions(-)
diff --git a/src/downloadlist.cpp b/src/downloadlist.cpp
index 496dca6..97df03f 100644
--- a/src/downloadlist.cpp
+++ b/src/downloadlist.cpp
@@ -25,21 +25,23 @@ downloadlist::downloadlist(QWidget *parent) :
action_gdebi->setText(tr("gdebi"));
action_deepin->setText(tr("deepin deb installer"));
connect(action_dpkg,&QAction::triggered,[=](){downloadlist::install(0);});
- connect(action_gdebi,&QAction::triggered,[=](){downloadlist::install(2);});
connect(action_deepin,&QAction::triggered,[=](){downloadlist::install(1);});
- menu_install->addAction(action_gdebi);
+ connect(action_gdebi,&QAction::triggered,[=](){downloadlist::install(2);});
+
//ssinstall命令存在时再加入该选项
QFile ssinstall("/bin/ssinstall");
ssinstall.open(QIODevice::ReadOnly);
if(ssinstall.isOpen()){
menu_install->addAction(action_dpkg);
}
+
QFile deepin("/bin/deepin-deb-installer");
deepin.open(QIODevice::ReadOnly);
if(deepin.isOpen()){
menu_install->addAction(action_deepin);
}
+ menu_install->addAction(action_gdebi);
}
downloadlist::~downloadlist()
@@ -128,26 +130,26 @@ void downloadlist::install(int t)
if(!reinstall){
switch (t) {
case 0:
- installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
- break;
- case 1:
installer.start("pkexec ssinstall /tmp/spark-store/"+ui->label_filename->text().toUtf8());
break;
- case 2:
+ case 1:
installer.start("deepin-deb-installer /tmp/spark-store/"+ui->label_filename->text().toUtf8());
break;
+ case 2:
+ installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
+ break;
}
}else {
switch (t) {
case 0:
- installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
- break;
- case 1:
installer.start("pkexec ssinstall /tmp/spark-store/"+ui->label_filename->text().toUtf8());
break;
- case 2:
+ case 1:
installer.start("deepin-deb-installer /tmp/spark-store/"+ui->label_filename->text().toUtf8());
break;
+ case 2:
+ installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
+ break;
}
}
bool haveError=false;
diff --git a/src/main.cpp b/src/main.cpp
index ad857f0..a46871a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -41,7 +41,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.0~alpha1"));
+ a.setApplicationVersion(DApplication::buildVersion("3.0~alpha2"));
a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
a.setApplicationDescription(
QObject::tr(
diff --git a/ssinstall b/ssinstall
index 518850f..0905db8 100755
--- a/ssinstall
+++ b/ssinstall
@@ -1,2 +1,3 @@
#!/bin/sh
+
dpkg -i $1 || apt install -yf || dpkg -P $1
diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts
index 2ecb517..24aa7bb 100644
--- a/translations/spark-store_en.ts
+++ b/translations/spark-store_en.ts
@@ -127,8 +127,8 @@
</message>
<message>
<location filename="../src/widget.ui" line="547"/>
- <location filename="../src/widget.cpp" line="595"/>
- <location filename="../src/widget.cpp" line="894"/>
+ <location filename="../src/widget.cpp" line="602"/>
+ <location filename="../src/widget.cpp" line="901"/>
<source>Install</source>
<translation type="unfinished"></translation>
</message>
@@ -411,128 +411,128 @@
<translation type="unfinished">0B</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="164"/>
+ <location filename="../src/widget.cpp" line="165"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="165"/>
+ <location filename="../src/widget.cpp" line="166"/>
<source>Search or enter spk://</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="171"/>
+ <location filename="../src/widget.cpp" line="172"/>
<source>Submit App</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="172"/>
+ <location filename="../src/widget.cpp" line="173"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="274"/>
+ <location filename="../src/widget.cpp" line="275"/>
<source>Not Exist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="120"/>
- <location filename="../src/widget.cpp" line="328"/>
- <location filename="../src/widget.cpp" line="332"/>
- <location filename="../src/widget.cpp" line="341"/>
- <location filename="../src/widget.cpp" line="345"/>
+ <location filename="../src/widget.cpp" line="121"/>
+ <location filename="../src/widget.cpp" line="329"/>
+ <location filename="../src/widget.cpp" line="333"/>
+ <location filename="../src/widget.cpp" line="342"/>
+ <location filename="../src/widget.cpp" line="346"/>
<source>Spark\ Store</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="539"/>
+ <location filename="../src/widget.cpp" line="546"/>
<source>Failed to download app info. Please check internet connection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="569"/>
+ <location filename="../src/widget.cpp" line="576"/>
<source>PkgName: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="570"/>
+ <location filename="../src/widget.cpp" line="577"/>
<source>Version: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="572"/>
+ <location filename="../src/widget.cpp" line="579"/>
<source>Author: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="576"/>
+ <location filename="../src/widget.cpp" line="583"/>
<source>Official Site: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="580"/>
+ <location filename="../src/widget.cpp" line="587"/>
<source>Contributor: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="581"/>
+ <location filename="../src/widget.cpp" line="588"/>
<source>Update Time: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="582"/>
+ <location filename="../src/widget.cpp" line="589"/>
<source>Installed Size: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="591"/>
- <location filename="../src/widget.cpp" line="702"/>
- <location filename="../src/widget.cpp" line="891"/>
+ <location filename="../src/widget.cpp" line="598"/>
+ <location filename="../src/widget.cpp" line="709"/>
+ <location filename="../src/widget.cpp" line="898"/>
<source>Reinstall</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="630"/>
+ <location filename="../src/widget.cpp" line="637"/>
<source>Failed to load application icon.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="677"/>
+ <location filename="../src/widget.cpp" line="684"/>
<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="1030"/>
+ <location filename="../src/widget.cpp" line="1047"/>
<source>Updating, please wait...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1083"/>
+ <location filename="../src/widget.cpp" line="1100"/>
<source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1089"/>
+ <location filename="../src/widget.cpp" line="1106"/>
<source>Unknown error!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1271"/>
+ <location filename="../src/widget.cpp" line="1289"/>
<source>Yes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1271"/>
+ <location filename="../src/widget.cpp" line="1289"/>
<source>No</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1272"/>
+ <location filename="../src/widget.cpp" line="1290"/>
<source>Information for Contributors</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1273"/>
+ <location filename="../src/widget.cpp" line="1291"/>
<source>Currently the translation contribution is limited to English,
and you will be redirected to our Gitee repository at which you are
supposed to be creating pull requests to contribute app info
@@ -543,27 +543,27 @@ Click yes to continue.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1109"/>
+ <location filename="../src/widget.cpp" line="1126"/>
<source>Uninstall succeeded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="742"/>
+ <location filename="../src/widget.cpp" line="749"/>
<source>Relative apps Not Found!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="750"/>
+ <location filename="../src/widget.cpp" line="757"/>
<source>Request Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1123"/>
+ <location filename="../src/widget.cpp" line="1140"/>
<source>Temporary cache was cleaned</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1190"/>
+ <location filename="../src/widget.cpp" line="1208"/>
<source>The URL has been copied to the clipboard</source>
<translation type="unfinished"></translation>
</message>
@@ -626,52 +626,52 @@ Click yes to continue.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="55"/>
+ <location filename="../src/downloadlist.cpp" line="57"/>
<source>Downloaded, waiting to install</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="80"/>
+ <location filename="../src/downloadlist.cpp" line="82"/>
<source>Failed to download %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="82"/>
+ <location filename="../src/downloadlist.cpp" line="84"/>
<source>Download Failed，Check Your Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="92"/>
+ <location filename="../src/downloadlist.cpp" line="94"/>
<source>Finished downloading %1, awaiting to install</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="125"/>
+ <location filename="../src/downloadlist.cpp" line="127"/>
<source>Installing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="172"/>
+ <location filename="../src/downloadlist.cpp" line="174"/>
<source>Finish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="176"/>
+ <location filename="../src/downloadlist.cpp" line="178"/>
<source>Retry</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="177"/>
+ <location filename="../src/downloadlist.cpp" line="179"/>
<source>Error happened in dpkg progress , you can try it again</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="181"/>
+ <location filename="../src/downloadlist.cpp" line="183"/>
<source>dpkg progress had been aborted，you can retry installation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="203"/>
+ <location filename="../src/downloadlist.cpp" line="205"/>
<source>Download canceled</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts
index 2536220..8cb86d8 100644
--- a/translations/spark-store_zh_CN.ts
+++ b/translations/spark-store_zh_CN.ts
@@ -190,8 +190,8 @@
</message>
<message>
<location filename="../src/widget.ui" line="547"/>
- <location filename="../src/widget.cpp" line="595"/>
- <location filename="../src/widget.cpp" line="894"/>
+ <location filename="../src/widget.cpp" line="602"/>
+ <location filename="../src/widget.cpp" line="901"/>
<source>Install</source>
<translation>安装</translation>
</message>
@@ -471,103 +471,103 @@
<translation></translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="164"/>
+ <location filename="../src/widget.cpp" line="165"/>
<source>Spark Store</source>
<translation>Spark 应用商店</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="165"/>
+ <location filename="../src/widget.cpp" line="166"/>
<source>Search or enter spk://</source>
<translation>搜索或打开链接</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="171"/>
+ <location filename="../src/widget.cpp" line="172"/>
<source>Submit App</source>
<translation>投递应用</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="172"/>
+ <location filename="../src/widget.cpp" line="173"/>
<source>Settings</source>
<translation>设置</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="274"/>
+ <location filename="../src/widget.cpp" line="275"/>
<source>Not Exist</source>
<translation>不存在</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="120"/>
- <location filename="../src/widget.cpp" line="328"/>
- <location filename="../src/widget.cpp" line="332"/>
- <location filename="../src/widget.cpp" line="341"/>
- <location filename="../src/widget.cpp" line="345"/>
+ <location filename="../src/widget.cpp" line="121"/>
+ <location filename="../src/widget.cpp" line="329"/>
+ <location filename="../src/widget.cpp" line="333"/>
+ <location filename="../src/widget.cpp" line="342"/>
+ <location filename="../src/widget.cpp" line="346"/>
<source>Spark\ Store</source>
<translation>星火应用商店</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="539"/>
+ <location filename="../src/widget.cpp" line="546"/>
<source>Failed to download app info. Please check internet connection.</source>
<translation>下载应用程序详细信息失败，请检查网络连接。</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="569"/>
+ <location filename="../src/widget.cpp" line="576"/>
<source>PkgName: </source>
<translation>包名： </translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="570"/>
+ <location filename="../src/widget.cpp" line="577"/>
<source>Version: </source>
<translation>版本： </translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="572"/>
+ <location filename="../src/widget.cpp" line="579"/>
<source>Author: </source>
<translation>作者： </translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="576"/>
+ <location filename="../src/widget.cpp" line="583"/>
<source>Official Site: </source>
<translation>官网： </translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="580"/>
+ <location filename="../src/widget.cpp" line="587"/>
<source>Contributor: </source>
<translation>投稿者： </translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="581"/>
+ <location filename="../src/widget.cpp" line="588"/>
<source>Update Time: </source>
<translation>更新时间： </translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="582"/>
+ <location filename="../src/widget.cpp" line="589"/>
<source>Installed Size: </source>
<translation>大小： </translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="591"/>
- <location filename="../src/widget.cpp" line="702"/>
- <location filename="../src/widget.cpp" line="891"/>
+ <location filename="../src/widget.cpp" line="598"/>
+ <location filename="../src/widget.cpp" line="709"/>
+ <location filename="../src/widget.cpp" line="898"/>
<source>Reinstall</source>
<translation>重新安装</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="630"/>
+ <location filename="../src/widget.cpp" line="637"/>
<source>Failed to load application icon.</source>
<translation>加载应用程序图标失败。</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="677"/>
+ <location filename="../src/widget.cpp" line="684"/>
<source>Failed to get the name to the file to be downloaded.</source>
<translation>获取安装包文件名失败。</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="742"/>
+ <location filename="../src/widget.cpp" line="749"/>
<source>Relative apps Not Found!</source>
<translation>相关应用未找到！</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="750"/>
+ <location filename="../src/widget.cpp" line="757"/>
<source>Request Error: %1</source>
<translation>请求错误：%1</translation>
</message>
@@ -576,37 +576,37 @@
<translation type="vanished">目前仅支持商店专用链接的打开，搜索功能正在开发，请期待以后的版本！</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1030"/>
+ <location filename="../src/widget.cpp" line="1047"/>
<source>Updating, please wait...</source>
<translation>正在更新，请稍候……</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1083"/>
+ <location filename="../src/widget.cpp" line="1100"/>
<source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
<translation>更新中发生错误，请在终端使用apt update来查看错误原因。</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1089"/>
+ <location filename="../src/widget.cpp" line="1106"/>
<source>Unknown error!</source>
<translation>未知错误！</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1271"/>
+ <location filename="../src/widget.cpp" line="1289"/>
<source>Yes</source>
<translation>是</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1271"/>
+ <location filename="../src/widget.cpp" line="1289"/>
<source>No</source>
<translation>否</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1272"/>
+ <location filename="../src/widget.cpp" line="1290"/>
<source>Information for Contributors</source>
<translation>贡献者须知</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1273"/>
+ <location filename="../src/widget.cpp" line="1291"/>
<source>Currently the translation contribution is limited to English,
and you will be redirected to our Gitee repository at which you are
supposed to be creating pull requests to contribute app info
@@ -642,17 +642,17 @@ Click yes to continue.</source>
<translation type="vanished">服务器未知错误</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1109"/>
+ <location filename="../src/widget.cpp" line="1126"/>
<source>Uninstall succeeded</source>
<translation>卸载成功</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1123"/>
+ <location filename="../src/widget.cpp" line="1140"/>
<source>Temporary cache was cleaned</source>
<translation>缓存目录已清空</translation>
</message>
<message>
- <location filename="../src/widget.cpp" line="1190"/>
+ <location filename="../src/widget.cpp" line="1208"/>
<source>The URL has been copied to the clipboard</source>
<translation>链接已复制到剪贴板</translation>
</message>
@@ -719,27 +719,27 @@ Click yes to continue.</source>
<translation>深度软件包安装器</translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="55"/>
+ <location filename="../src/downloadlist.cpp" line="57"/>
<source>Downloaded, waiting to install</source>
<translation>已完成，等待安装</translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="80"/>
+ <location filename="../src/downloadlist.cpp" line="82"/>
<source>Failed to download %1</source>
<translation>下载 %1 失败</translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="82"/>
+ <location filename="../src/downloadlist.cpp" line="84"/>
<source>Download Failed，Check Your Connection</source>
<translation>下载失败，请检查网络连接</translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="92"/>
+ <location filename="../src/downloadlist.cpp" line="94"/>
<source>Finished downloading %1, awaiting to install</source>
<translation>%1 下载完成，等待安装</translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="125"/>
+ <location filename="../src/downloadlist.cpp" line="127"/>
<source>Installing</source>
<translation>正在安装</translation>
</message>
@@ -748,27 +748,27 @@ Click yes to continue.</source>
<translation type="obsolete">正在安装</translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="172"/>
+ <location filename="../src/downloadlist.cpp" line="174"/>
<source>Finish</source>
<translation>完成</translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="176"/>
+ <location filename="../src/downloadlist.cpp" line="178"/>
<source>Retry</source>
<translation>重试</translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="177"/>
+ <location filename="../src/downloadlist.cpp" line="179"/>
<source>Error happened in dpkg progress , you can try it again</source>
<translation>dpkg出现错误，可重新安装</translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="181"/>
+ <location filename="../src/downloadlist.cpp" line="183"/>
<source>dpkg progress had been aborted，you can retry installation</source>
<translation>安装被中止，可重新安装</translation>
</message>
<message>
- <location filename="../src/downloadlist.cpp" line="203"/>
+ <location filename="../src/downloadlist.cpp" line="205"/>
<source>Download canceled</source>
<translation>下载已取消</translation>
</message>