调整安装选项顺序

调整安装选项顺序;
更新服务器源优先级;
重新打包。
This commit is contained in:
忘记、过去 2020-12-15 00:30:26 +08:00
parent 1a18a51d3c
commit ccdcf407cc
5 changed files with 108 additions and 105 deletions

@ -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;

@ -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(

@ -1,2 +1,3 @@
#!/bin/sh
dpkg -i $1 || apt install -yf || dpkg -P $1

@ -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 FailedCheck 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 abortedyou 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>

@ -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 FailedCheck 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 abortedyou 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>