Compare commits

..

22 Commits

Author SHA1 Message Date
zty199 ccdcf407cc 调整安装选项顺序
调整安装选项顺序;
更新服务器源优先级;
重新打包。
2020-12-15 00:30:26 +08:00
zty199 1a18a51d3c !15 修正搜索功能的几个BUG
Merge pull request !15 from 枯叶蚊/search
2020-12-12 14:48:02 +08:00
metanoia1989 ab88af006b 修正搜索列表应用重复点击进入失败的问题 2020-12-10 22:46:55 +08:00
metanoia1989 d02900cb10 Merge branch 'search' of gitee.com:deepin-community-store/spark-store into search
合并主分支的搜索图标
2020-12-10 21:32:15 +08:00
metanoia1989 3e473c091a 解决从详情页返回列表页的进度恢复问题 2020-12-10 21:31:53 +08:00
shenmo 84541d0c22 修改: translations/spark-store_zh_CN.ts 2020-12-10 16:41:25 +08:00
shenmo 51f84bed1b 修改: src/downloadlist.cpp
修改:     src/spark-store.pro
	删除:     trans/spark-store_en.qm
	删除:     trans/spark-store_fr.qm
	删除:     trans/spark-store_zh_CN.qm
	重命名:   trans/spark-store_en.ts -> translations/spark-store_en.ts
	重命名:   trans/spark-store_fr.ts -> translations/spark-store_fr.ts
	重命名:   trans/spark-store_zh_CN.ts -> translations/spark-store_zh_CN.ts
2020-12-10 16:40:42 +08:00
shenmo7192 4a0acf0575 修改: assets/icons/category_active.svg
新文件:   assets/icons/category_active.svg.bak
	修改:     assets/icons/category_active_dark.svg
	新文件:   assets/icons/category_active_dark.svg.bak
2020-12-10 12:35:14 +08:00
metanoia1989 e28d1c39ac 返回列表不重新加载 2020-12-08 23:31:40 +08:00
metanoia1989 f58201a612 合并来自主干的分支 2020-12-08 22:48:27 +08:00
zty199 405d3b6986 Try to fix bugs
尝试修复多屏幕下截图全屏预览的偏移问题。
2020-12-06 12:32:09 +08:00
metanoia1989 1d0e0cc65c 更换搜索服务器域名为星火的域名 2020-12-05 13:53:13 +08:00
metanoia1989 7a5b982dea 更新搜索服务器为线上服务器 2020-12-02 22:22:59 +08:00
metanoia1989 91fcab56df 完成搜索功能 2020-12-01 22:10:52 +08:00
metanoia1989 4315f04023 解决搜索结果图标锯齿问题 2020-11-30 22:44:25 +08:00
metanoia1989 736ede0742 更新appitem的样式 2020-11-29 22:25:20 +08:00
metanoia1989 a73a4416fc 完成应用搜索列表的滚动问题 2020-11-29 20:28:59 +08:00
metanoia1989 6f3e4398df 合并master分支 2020-11-28 20:59:22 +08:00
metanoia1989 3cca0d87fe 添加一些文件到忽略列表 2020-11-21 11:18:20 +08:00
metanoia1989 66ef37c1ca 更新项目结构 2020-11-13 22:57:37 +08:00
metanoia1989 8972425c7c 更新搜索列表UI 2020-11-08 22:35:31 +08:00
metanoia1989 2ae6e80785 添加 QtNetworkService库 2020-11-08 20:41:18 +08:00
16 changed files with 399 additions and 368 deletions
+2 -124
View File
@@ -1,125 +1,3 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
<svg <path fill="#536076" d="M10.138807,3.52000025 L10.138,12.5230002 L14.6066017,8.05523757 L15.3137085,8.76234435 L9.65685425,14.4191986 L4,8.76234435 L4.70710678,8.05523757 L9.138,12.4870002 L9.138807,3.52000025 L10.138807,3.52000025 Z" transform="rotate(90 9.657 11.518)"/>
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16px"
height="16px"
viewBox="0 0 16 16"
version="1.1"
id="svg22"
sodipodi:docname="category_active_16px_l.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
<metadata
id="metadata26">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>category_active_16px</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="987"
id="namedview24"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="-4"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg22" />
<!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
<title
id="title2">category_active_16px</title>
<desc
id="desc4">Created with Sketch.</desc>
<defs
id="defs6" />
<g
id="Page-1"
stroke="none"
stroke-width="1"
fill="none"
fill-rule="evenodd"
style="fill:#000000;fill-opacity:0.94999999">
<g
id="category_active_16px"
style="fill:#000000;fill-opacity:0.94999999">
<rect
id="Rectangle-1-Copy-44"
fill="#747568"
opacity="0"
x="0"
y="0"
width="16"
height="16"
style="fill:#000000;fill-opacity:0.94999999" />
<g
id="Group-2"
transform="translate(2.000000, 2.000000)"
fill="#FFFFFF"
style="fill:#000000;fill-opacity:0.94999999">
<rect
id="Rectangle-94"
x="0"
y="0"
width="2"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
<rect
id="Rectangle-97"
x="3"
y="0"
width="9"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
<rect
id="rect11"
x="0"
y="5"
width="2"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
<rect
id="rect13"
x="3"
y="5"
width="9"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
<rect
id="rect15"
x="0"
y="10"
width="2"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
<rect
id="rect17"
x="3"
y="10"
width="9"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
</g>
</g>
</g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 366 B

+125
View File
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16px"
height="16px"
viewBox="0 0 16 16"
version="1.1"
id="svg22"
sodipodi:docname="category_active_16px_l.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
<metadata
id="metadata26">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>category_active_16px</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="987"
id="namedview24"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="-4"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg22" />
<!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
<title
id="title2">category_active_16px</title>
<desc
id="desc4">Created with Sketch.</desc>
<defs
id="defs6" />
<g
id="Page-1"
stroke="none"
stroke-width="1"
fill="none"
fill-rule="evenodd"
style="fill:#000000;fill-opacity:0.94999999">
<g
id="category_active_16px"
style="fill:#000000;fill-opacity:0.94999999">
<rect
id="Rectangle-1-Copy-44"
fill="#747568"
opacity="0"
x="0"
y="0"
width="16"
height="16"
style="fill:#000000;fill-opacity:0.94999999" />
<g
id="Group-2"
transform="translate(2.000000, 2.000000)"
fill="#FFFFFF"
style="fill:#000000;fill-opacity:0.94999999">
<rect
id="Rectangle-94"
x="0"
y="0"
width="2"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
<rect
id="Rectangle-97"
x="3"
y="0"
width="9"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
<rect
id="rect11"
x="0"
y="5"
width="2"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
<rect
id="rect13"
x="3"
y="5"
width="9"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
<rect
id="rect15"
x="0"
y="10"
width="2"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
<rect
id="rect17"
x="3"
y="10"
width="9"
height="2"
style="fill:#000000;fill-opacity:0.94999999" />
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.3 KiB

+2 -123
View File
@@ -1,124 +1,3 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
<svg <path fill="#536076" d="M10.138807,3.52000025 L10.138,12.5230002 L14.6066017,8.05523757 L15.3137085,8.76234435 L9.65685425,14.4191986 L4,8.76234435 L4.70710678,8.05523757 L9.138,12.4870002 L9.138807,3.52000025 L10.138807,3.52000025 Z" transform="rotate(90 9.657 11.518)"/>
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16px"
height="16px"
viewBox="0 0 16 16"
version="1.1"
id="svg22"
sodipodi:docname="category_active_16px.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
<metadata
id="metadata26">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="987"
id="namedview24"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg22" />
<!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
<title
id="title2">category_active_16px</title>
<desc
id="desc4">Created with Sketch.</desc>
<defs
id="defs6" />
<g
id="Page-1"
stroke="none"
stroke-width="1"
fill="none"
fill-rule="evenodd"
style="fill:#ffffff;fill-opacity:0.60000002">
<g
id="category_active_16px"
style="fill:#ffffff;fill-opacity:0.60000002">
<rect
id="Rectangle-1-Copy-44"
fill="#747568"
opacity="0"
x="0"
y="0"
width="16"
height="16"
style="fill:#ffffff;fill-opacity:0.60000002" />
<g
id="Group-2"
transform="translate(2.000000, 2.000000)"
fill="#FFFFFF"
style="fill:#ffffff;fill-opacity:0.60000002">
<rect
id="Rectangle-94"
x="0"
y="0"
width="2"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
<rect
id="Rectangle-97"
x="3"
y="0"
width="9"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
<rect
id="rect11"
x="0"
y="5"
width="2"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
<rect
id="rect13"
x="3"
y="5"
width="9"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
<rect
id="rect15"
x="0"
y="10"
width="2"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
<rect
id="rect17"
x="3"
y="10"
width="9"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
</g>
</g>
</g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 366 B

+124
View File
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16px"
height="16px"
viewBox="0 0 16 16"
version="1.1"
id="svg22"
sodipodi:docname="category_active_16px.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
<metadata
id="metadata26">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="987"
id="namedview24"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg22" />
<!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
<title
id="title2">category_active_16px</title>
<desc
id="desc4">Created with Sketch.</desc>
<defs
id="defs6" />
<g
id="Page-1"
stroke="none"
stroke-width="1"
fill="none"
fill-rule="evenodd"
style="fill:#ffffff;fill-opacity:0.60000002">
<g
id="category_active_16px"
style="fill:#ffffff;fill-opacity:0.60000002">
<rect
id="Rectangle-1-Copy-44"
fill="#747568"
opacity="0"
x="0"
y="0"
width="16"
height="16"
style="fill:#ffffff;fill-opacity:0.60000002" />
<g
id="Group-2"
transform="translate(2.000000, 2.000000)"
fill="#FFFFFF"
style="fill:#ffffff;fill-opacity:0.60000002">
<rect
id="Rectangle-94"
x="0"
y="0"
width="2"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
<rect
id="Rectangle-97"
x="3"
y="0"
width="9"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
<rect
id="rect11"
x="0"
y="5"
width="2"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
<rect
id="rect13"
x="3"
y="5"
width="9"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
<rect
id="rect15"
x="0"
y="10"
width="2"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
<rect
id="rect17"
x="3"
y="10"
width="9"
height="2"
style="fill:#ffffff;fill-opacity:0.60000002" />
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.3 KiB

+15 -13
View File
@@ -21,25 +21,27 @@ downloadlist::downloadlist(QWidget *parent) :
ui->pushButton_3->hide(); ui->pushButton_3->hide();
ui->widget_spinner->start(); ui->widget_spinner->start();
ui->widget_spinner->hide(); ui->widget_spinner->hide();
action_dpkg->setText(tr("dpkg")); action_dpkg->setText(tr("Spark Store App Installer"));
action_gdebi->setText(tr("gdebi")); action_gdebi->setText(tr("gdebi"));
action_deepin->setText(tr("deepin deb installer")); action_deepin->setText(tr("deepin deb installer"));
connect(action_dpkg,&QAction::triggered,[=](){downloadlist::install(1);}); connect(action_dpkg,&QAction::triggered,[=](){downloadlist::install(0);});
connect(action_gdebi,&QAction::triggered,[=](){downloadlist::install(0);}); connect(action_deepin,&QAction::triggered,[=](){downloadlist::install(1);});
connect(action_deepin,&QAction::triggered,[=](){downloadlist::install(2);}); connect(action_gdebi,&QAction::triggered,[=](){downloadlist::install(2);});
menu_install->addAction(action_gdebi);
//ssinstall命令存在时再加入该选项 //ssinstall命令存在时再加入该选项
QFile ssinstall("/bin/ssinstall"); QFile ssinstall("/bin/ssinstall");
ssinstall.open(QIODevice::ReadOnly); ssinstall.open(QIODevice::ReadOnly);
if(ssinstall.isOpen()){ if(ssinstall.isOpen()){
menu_install->addAction(action_dpkg); menu_install->addAction(action_dpkg);
} }
QFile deepin("/bin/deepin-deb-installer"); QFile deepin("/bin/deepin-deb-installer");
deepin.open(QIODevice::ReadOnly); deepin.open(QIODevice::ReadOnly);
if(deepin.isOpen()){ if(deepin.isOpen()){
menu_install->addAction(action_deepin); menu_install->addAction(action_deepin);
} }
menu_install->addAction(action_gdebi);
} }
downloadlist::~downloadlist() downloadlist::~downloadlist()
@@ -128,26 +130,26 @@ void downloadlist::install(int t)
if(!reinstall){ if(!reinstall){
switch (t) { switch (t) {
case 0: 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()); installer.start("pkexec ssinstall /tmp/spark-store/"+ui->label_filename->text().toUtf8());
break; break;
case 2: case 1:
installer.start("deepin-deb-installer /tmp/spark-store/"+ui->label_filename->text().toUtf8()); installer.start("deepin-deb-installer /tmp/spark-store/"+ui->label_filename->text().toUtf8());
break; break;
case 2:
installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
break;
} }
}else { }else {
switch (t) { switch (t) {
case 0: 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()); installer.start("pkexec ssinstall /tmp/spark-store/"+ui->label_filename->text().toUtf8());
break; break;
case 2: case 1:
installer.start("deepin-deb-installer /tmp/spark-store/"+ui->label_filename->text().toUtf8()); installer.start("deepin-deb-installer /tmp/spark-store/"+ui->label_filename->text().toUtf8());
break; break;
case 2:
installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
break;
} }
} }
bool haveError=false; bool haveError=false;
+1 -1
View File
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
a.setOrganizationName("spark-union"); a.setOrganizationName("spark-union");
a.setOrganizationDomain("https://www.deepinos.org/"); a.setOrganizationDomain("https://www.deepinos.org/");
a.setApplicationName("Spark Store"); //不需要翻译,否则 ~/.local/share/ 下文件夹名称也被翻译为中文 a.setApplicationName("Spark Store"); //不需要翻译,否则 ~/.local/share/ 下文件夹名称也被翻译为中文
a.setApplicationVersion(DApplication::buildVersion("3.0~alpha0")); a.setApplicationVersion(DApplication::buildVersion("3.0~alpha2"));
a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
a.setApplicationDescription( a.setApplicationDescription(
QObject::tr( QObject::tr(
+3 -3
View File
@@ -68,9 +68,9 @@ DISTFILES += \
../assets/tags/logo_icon.svg \ ../assets/tags/logo_icon.svg \
../assets/tags/uos.svg ../assets/tags/uos.svg
TRANSLATIONS = ../trans/spark-store_en.ts \ TRANSLATIONS = ../translations/spark-store_en.ts \
../trans/spark-store_zh_CN.ts ../translations/spark-store_zh_CN.ts
../trans/spark-store_fr.ts\ ../translations/spark-store_fr.ts\
DEFINES += QT_APP_DEBUG DEFINES += QT_APP_DEBUG
include(../third-party/QtNetworkService/QtNetworkService.pri) include(../third-party/QtNetworkService/QtNetworkService.pri)
+23 -5
View File
@@ -73,7 +73,8 @@ Widget::Widget(DBlurEffectWidget *parent) :
connect(&appinfoLoadThread, &SpkAppInfoLoaderThread::finishAllLoading, this, &Widget::sltAppinfoFinish, Qt::ConnectionType::BlockingQueuedConnection); connect(&appinfoLoadThread, &SpkAppInfoLoaderThread::finishAllLoading, this, &Widget::sltAppinfoFinish, Qt::ConnectionType::BlockingQueuedConnection);
// 搜索事件 // 搜索事件
connect(searchEdit,&DSearchEdit::editingFinished,this,[=](){ connect(searchEdit,&DSearchEdit::returnPressed ,this,[=](){
qDebug() << "触发了搜索,呜啦啦啦!";
QString searchtext=searchEdit->text(); QString searchtext=searchEdit->text();
if(searchtext!=""){ if(searchtext!=""){
qDebug()<<searchEdit->text(); qDebug()<<searchEdit->text();
@@ -458,6 +459,11 @@ void Widget::chooseLeftMenu(int index)
{ {
nowMenu=index; nowMenu=index;
// 菜单切换时,清除搜索栏的内容
if (!searchEdit->text().isEmpty()) {
searchEdit->clear();
}
updateUI(); updateUI();
if(QLocale::system().name() == "zh_CN") if(QLocale::system().name() == "zh_CN")
left_list[index]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px;"); left_list[index]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px;");
@@ -484,6 +490,7 @@ void Widget::chooseLeftMenu(int index)
}else if (index==13) { }else if (index==13) {
ui->stackedWidget->setCurrentIndex(1); ui->stackedWidget->setCurrentIndex(1);
} }
} }
void Widget::setfoot(int h) void Widget::setfoot(int h)
@@ -732,7 +739,7 @@ void Widget::searchApp(QString text)
return; return;
// 关键字搜索处理 // 关键字搜索处理
httpClient->get("http://search.deepinos.org.cn/appinfo/search") httpClient->get("https://search.deepinos.org.cn/appinfo/search")
.header("content-type", "application/json") .header("content-type", "application/json")
.queryParam("keyword", text) .queryParam("keyword", text)
.onResponse([this](QByteArray result) { .onResponse([this](QByteArray result) {
@@ -792,7 +799,6 @@ void Widget::displaySearchApp(QJsonArray array)
}); });
} }
ui->applist_scrollarea->widget()->setLayout(applist_grid); ui->applist_scrollarea->widget()->setLayout(applist_grid);
qDebug() << "显示结果了吗????喵喵喵";
} }
void Widget::downloadIconsFinished(int arraysize) void Widget::downloadIconsFinished(int arraysize)
@@ -803,6 +809,7 @@ void Widget::downloadIconsFinished(int arraysize)
count = 0; count = 0;
mutex.unlock(); mutex.unlock();
} }
ui->applist_scrollarea->widget()->setLayout(applist_grid);
} }
void Widget::httpReadyRead() void Widget::httpReadyRead()
@@ -967,7 +974,17 @@ void Widget::on_pushButton_return_clicked()
// return; // return;
// } // }
appinfoLoadThread.requestInterruption(); appinfoLoadThread.requestInterruption();
chooseLeftMenu(nowMenu);
// 检测是否是从搜索页面进入到应用详情页的,根据搜索栏是否有关键词判断
if (searchEdit->text().isEmpty()) {
ui->webEngineView->back();
ui->stackedWidget->setCurrentIndex(0);
} else {
ui->stackedWidget->setCurrentIndex(4);
}
// chooseLeftMenu(nowMenu);
// if(themeIsDark){ // if(themeIsDark){
// QString darkurl=menuUrl[nowMenu].toString(); // QString darkurl=menuUrl[nowMenu].toString();
// QStringList tmp=darkurl.split("/"); // QStringList tmp=darkurl.split("/");
@@ -1172,7 +1189,8 @@ void Widget::opensetting()
void Widget::openUrl(QUrl u) void Widget::openUrl(QUrl u)
{ {
QString app=serverUrl + "store"+u.path()+"/app.json"; QString app=serverUrl + "store"+u.path()+"/app.json";
ui->webEngineView->setUrl(app); // ui->webEngineView->setUrl(app);
emit ui->webEngineView->urlChanged(app);
} }
void Widget::on_pushButton_website_clicked() void Widget::on_pushButton_website_clicked()
+2 -2
View File
@@ -365,11 +365,11 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QWebEngineView" name="webEngineView"> <widget class="QWebEngineView" name="webEngineView" native="true">
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum> <enum>Qt::DefaultContextMenu</enum>
</property> </property>
<property name="url"> <property name="url" stdset="0">
<url> <url>
<string>about:blank</string> <string>about:blank</string>
</url> </url>
+1
View File
@@ -1,2 +1,3 @@
#!/bin/sh #!/bin/sh
dpkg -i $1 || apt install -yf || dpkg -P $1 dpkg -i $1 || apt install -yf || dpkg -P $1
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -127,8 +127,8 @@
</message> </message>
<message> <message>
<location filename="../src/widget.ui" line="547"/> <location filename="../src/widget.ui" line="547"/>
<location filename="../src/widget.cpp" line="595"/> <location filename="../src/widget.cpp" line="602"/>
<location filename="../src/widget.cpp" line="894"/> <location filename="../src/widget.cpp" line="901"/>
<source>Install</source> <source>Install</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -411,128 +411,128 @@
<translation type="unfinished">0B</translation> <translation type="unfinished">0B</translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="164"/> <location filename="../src/widget.cpp" line="165"/>
<source>Spark Store</source> <source>Spark Store</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="165"/> <location filename="../src/widget.cpp" line="166"/>
<source>Search or enter spk://</source> <source>Search or enter spk://</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="171"/> <location filename="../src/widget.cpp" line="172"/>
<source>Submit App</source> <source>Submit App</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="172"/> <location filename="../src/widget.cpp" line="173"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="274"/> <location filename="../src/widget.cpp" line="275"/>
<source>Not Exist</source> <source>Not Exist</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="120"/> <location filename="../src/widget.cpp" line="121"/>
<location filename="../src/widget.cpp" line="328"/> <location filename="../src/widget.cpp" line="329"/>
<location filename="../src/widget.cpp" line="332"/> <location filename="../src/widget.cpp" line="333"/>
<location filename="../src/widget.cpp" line="341"/> <location filename="../src/widget.cpp" line="342"/>
<location filename="../src/widget.cpp" line="345"/> <location filename="../src/widget.cpp" line="346"/>
<source>Spark\ Store</source> <source>Spark\ Store</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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> <source>Failed to download app info. Please check internet connection.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="569"/> <location filename="../src/widget.cpp" line="576"/>
<source>PkgName: </source> <source>PkgName: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="570"/> <location filename="../src/widget.cpp" line="577"/>
<source>Version: </source> <source>Version: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="572"/> <location filename="../src/widget.cpp" line="579"/>
<source>Author: </source> <source>Author: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="576"/> <location filename="../src/widget.cpp" line="583"/>
<source>Official Site: </source> <source>Official Site: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="580"/> <location filename="../src/widget.cpp" line="587"/>
<source>Contributor: </source> <source>Contributor: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="581"/> <location filename="../src/widget.cpp" line="588"/>
<source>Update Time: </source> <source>Update Time: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="582"/> <location filename="../src/widget.cpp" line="589"/>
<source>Installed Size: </source> <source>Installed Size: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="591"/> <location filename="../src/widget.cpp" line="598"/>
<location filename="../src/widget.cpp" line="702"/> <location filename="../src/widget.cpp" line="709"/>
<location filename="../src/widget.cpp" line="891"/> <location filename="../src/widget.cpp" line="898"/>
<source>Reinstall</source> <source>Reinstall</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="630"/> <location filename="../src/widget.cpp" line="637"/>
<source>Failed to load application icon.</source> <source>Failed to load application icon.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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> <source>Failed to get the name to the file to be downloaded.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1030"/> <location filename="../src/widget.cpp" line="1047"/>
<source>Updating, please wait...</source> <source>Updating, please wait...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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> <source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1089"/> <location filename="../src/widget.cpp" line="1106"/>
<source>Unknown error!</source> <source>Unknown error!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1271"/> <location filename="../src/widget.cpp" line="1289"/>
<source>Yes</source> <source>Yes</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1271"/> <location filename="../src/widget.cpp" line="1289"/>
<source>No</source> <source>No</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1272"/> <location filename="../src/widget.cpp" line="1290"/>
<source>Information for Contributors</source> <source>Information for Contributors</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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, <source>Currently the translation contribution is limited to English,
and you will be redirected to our Gitee repository at which you are and you will be redirected to our Gitee repository at which you are
supposed to be creating pull requests to contribute app info supposed to be creating pull requests to contribute app info
@@ -543,27 +543,27 @@ Click yes to continue.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1109"/> <location filename="../src/widget.cpp" line="1126"/>
<source>Uninstall succeeded</source> <source>Uninstall succeeded</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="742"/> <location filename="../src/widget.cpp" line="749"/>
<source>Relative apps Not Found!</source> <source>Relative apps Not Found!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="750"/> <location filename="../src/widget.cpp" line="757"/>
<source>Request Error: %1</source> <source>Request Error: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1123"/> <location filename="../src/widget.cpp" line="1140"/>
<source>Temporary cache was cleaned</source> <source>Temporary cache was cleaned</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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> <source>The URL has been copied to the clipboard</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -612,7 +612,7 @@ Click yes to continue.</source>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="24"/> <location filename="../src/downloadlist.cpp" line="24"/>
<source>dpkg</source> <source>Spark Store App Installer</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@@ -626,52 +626,52 @@ Click yes to continue.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="55"/> <location filename="../src/downloadlist.cpp" line="57"/>
<source>Downloaded, waiting to install</source> <source>Downloaded, waiting to install</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="80"/> <location filename="../src/downloadlist.cpp" line="82"/>
<source>Failed to download %1</source> <source>Failed to download %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="82"/> <location filename="../src/downloadlist.cpp" line="84"/>
<source>Download FailedCheck Your Connection</source> <source>Download FailedCheck Your Connection</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="92"/> <location filename="../src/downloadlist.cpp" line="94"/>
<source>Finished downloading %1, awaiting to install</source> <source>Finished downloading %1, awaiting to install</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="125"/> <location filename="../src/downloadlist.cpp" line="127"/>
<source>Installing</source> <source>Installing</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="172"/> <location filename="../src/downloadlist.cpp" line="174"/>
<source>Finish</source> <source>Finish</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="176"/> <location filename="../src/downloadlist.cpp" line="178"/>
<source>Retry</source> <source>Retry</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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> <source>Error happened in dpkg progress , you can try it again</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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> <source>dpkg progress had been abortedyou can retry installation</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="203"/> <location filename="../src/downloadlist.cpp" line="205"/>
<source>Download canceled</source> <source>Download canceled</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -190,8 +190,8 @@
</message> </message>
<message> <message>
<location filename="../src/widget.ui" line="547"/> <location filename="../src/widget.ui" line="547"/>
<location filename="../src/widget.cpp" line="595"/> <location filename="../src/widget.cpp" line="602"/>
<location filename="../src/widget.cpp" line="894"/> <location filename="../src/widget.cpp" line="901"/>
<source>Install</source> <source>Install</source>
<translation></translation> <translation></translation>
</message> </message>
@@ -471,103 +471,103 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="164"/> <location filename="../src/widget.cpp" line="165"/>
<source>Spark Store</source> <source>Spark Store</source>
<translation>Spark </translation> <translation>Spark </translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="165"/> <location filename="../src/widget.cpp" line="166"/>
<source>Search or enter spk://</source> <source>Search or enter spk://</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="171"/> <location filename="../src/widget.cpp" line="172"/>
<source>Submit App</source> <source>Submit App</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="172"/> <location filename="../src/widget.cpp" line="173"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="274"/> <location filename="../src/widget.cpp" line="275"/>
<source>Not Exist</source> <source>Not Exist</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="120"/> <location filename="../src/widget.cpp" line="121"/>
<location filename="../src/widget.cpp" line="328"/> <location filename="../src/widget.cpp" line="329"/>
<location filename="../src/widget.cpp" line="332"/> <location filename="../src/widget.cpp" line="333"/>
<location filename="../src/widget.cpp" line="341"/> <location filename="../src/widget.cpp" line="342"/>
<location filename="../src/widget.cpp" line="345"/> <location filename="../src/widget.cpp" line="346"/>
<source>Spark\ Store</source> <source>Spark\ Store</source>
<translation></translation> <translation></translation>
</message> </message>
<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> <source>Failed to download app info. Please check internet connection.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="569"/> <location filename="../src/widget.cpp" line="576"/>
<source>PkgName: </source> <source>PkgName: </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="570"/> <location filename="../src/widget.cpp" line="577"/>
<source>Version: </source> <source>Version: </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="572"/> <location filename="../src/widget.cpp" line="579"/>
<source>Author: </source> <source>Author: </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="576"/> <location filename="../src/widget.cpp" line="583"/>
<source>Official Site: </source> <source>Official Site: </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="580"/> <location filename="../src/widget.cpp" line="587"/>
<source>Contributor: </source> <source>Contributor: </source>
<translation>稿 </translation> <translation>稿 </translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="581"/> <location filename="../src/widget.cpp" line="588"/>
<source>Update Time: </source> <source>Update Time: </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="582"/> <location filename="../src/widget.cpp" line="589"/>
<source>Installed Size: </source> <source>Installed Size: </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="591"/> <location filename="../src/widget.cpp" line="598"/>
<location filename="../src/widget.cpp" line="702"/> <location filename="../src/widget.cpp" line="709"/>
<location filename="../src/widget.cpp" line="891"/> <location filename="../src/widget.cpp" line="898"/>
<source>Reinstall</source> <source>Reinstall</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="630"/> <location filename="../src/widget.cpp" line="637"/>
<source>Failed to load application icon.</source> <source>Failed to load application icon.</source>
<translation></translation> <translation></translation>
</message> </message>
<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> <source>Failed to get the name to the file to be downloaded.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="742"/> <location filename="../src/widget.cpp" line="749"/>
<source>Relative apps Not Found!</source> <source>Relative apps Not Found!</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="750"/> <location filename="../src/widget.cpp" line="757"/>
<source>Request Error: %1</source> <source>Request Error: %1</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
@@ -576,37 +576,37 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1030"/> <location filename="../src/widget.cpp" line="1047"/>
<source>Updating, please wait...</source> <source>Updating, please wait...</source>
<translation></translation> <translation></translation>
</message> </message>
<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> <source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
<translation>使apt update来查看错误原因</translation> <translation>使apt update来查看错误原因</translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1089"/> <location filename="../src/widget.cpp" line="1106"/>
<source>Unknown error!</source> <source>Unknown error!</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1271"/> <location filename="../src/widget.cpp" line="1289"/>
<source>Yes</source> <source>Yes</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1271"/> <location filename="../src/widget.cpp" line="1289"/>
<source>No</source> <source>No</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1272"/> <location filename="../src/widget.cpp" line="1290"/>
<source>Information for Contributors</source> <source>Information for Contributors</source>
<translation></translation> <translation></translation>
</message> </message>
<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, <source>Currently the translation contribution is limited to English,
and you will be redirected to our Gitee repository at which you are and you will be redirected to our Gitee repository at which you are
supposed to be creating pull requests to contribute app info supposed to be creating pull requests to contribute app info
@@ -642,17 +642,17 @@ Click yes to continue.</source>
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1109"/> <location filename="../src/widget.cpp" line="1126"/>
<source>Uninstall succeeded</source> <source>Uninstall succeeded</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/widget.cpp" line="1123"/> <location filename="../src/widget.cpp" line="1140"/>
<source>Temporary cache was cleaned</source> <source>Temporary cache was cleaned</source>
<translation></translation> <translation></translation>
</message> </message>
<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> <source>The URL has been copied to the clipboard</source>
<translation></translation> <translation></translation>
</message> </message>
@@ -700,9 +700,13 @@ Click yes to continue.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="24"/>
<source>dpkg</source> <source>dpkg</source>
<translation>dpkg</translation> <translation type="vanished">dpkg</translation>
</message>
<message>
<location filename="../src/downloadlist.cpp" line="24"/>
<source>Spark Store App Installer</source>
<translation></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="25"/> <location filename="../src/downloadlist.cpp" line="25"/>
@@ -715,27 +719,27 @@ Click yes to continue.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="55"/> <location filename="../src/downloadlist.cpp" line="57"/>
<source>Downloaded, waiting to install</source> <source>Downloaded, waiting to install</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="80"/> <location filename="../src/downloadlist.cpp" line="82"/>
<source>Failed to download %1</source> <source>Failed to download %1</source>
<translation> %1 </translation> <translation> %1 </translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="82"/> <location filename="../src/downloadlist.cpp" line="84"/>
<source>Download FailedCheck Your Connection</source> <source>Download FailedCheck Your Connection</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="92"/> <location filename="../src/downloadlist.cpp" line="94"/>
<source>Finished downloading %1, awaiting to install</source> <source>Finished downloading %1, awaiting to install</source>
<translation>%1 </translation> <translation>%1 </translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="125"/> <location filename="../src/downloadlist.cpp" line="127"/>
<source>Installing</source> <source>Installing</source>
<translation></translation> <translation></translation>
</message> </message>
@@ -744,27 +748,27 @@ Click yes to continue.</source>
<translation type="obsolete"></translation> <translation type="obsolete"></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="172"/> <location filename="../src/downloadlist.cpp" line="174"/>
<source>Finish</source> <source>Finish</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="176"/> <location filename="../src/downloadlist.cpp" line="178"/>
<source>Retry</source> <source>Retry</source>
<translation></translation> <translation></translation>
</message> </message>
<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> <source>Error happened in dpkg progress , you can try it again</source>
<translation>dpkg出现错误</translation> <translation>dpkg出现错误</translation>
</message> </message>
<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> <source>dpkg progress had been abortedyou can retry installation</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/downloadlist.cpp" line="203"/> <location filename="../src/downloadlist.cpp" line="205"/>
<source>Download canceled</source> <source>Download canceled</source>
<translation></translation> <translation></translation>
</message> </message>