!142 333t3

Merge pull request !142 from shenmo/dev

assets/icons.qrc

@@ -32,6 +32,8 @@
         <file>icons/category_active.svg</file>
         <file>icons/refresh-page-dark.svg</file>
         <file>icons/refresh-page.svg</file>
+        <file>icons/upgrades-symbolic_dark.svg</file>
+        <file>icons/upgrades-symbolic.svg</file>
     </qresource>
     <qresource prefix="/">
         <file>tags/a2d.png</file>

assets/icons/upgrades-symbolic.svg

@@ -0,0 +1,7 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" stroke="null" style="vector-effect: non-scaling-stroke;">
+
+ <g stroke="null">
+  <title stroke="null">Layer 1</title>
+  <path transform="rotate(-180 8 8)" stroke="null" id="svg_1" d="m8,1c3.86599,0 7,3.13401 7,7c0,3.86599 -3.13401,7 -7,7c-3.86599,0 -7,-3.13401 -7,-7c0,-3.86599 3.13401,-7 7,-7zm1.5,7l-3,0c-0.27614,0 -0.5,0.22386 -0.5,0.5c0,0.27614 -0.22386,0.5 -0.5,0.5l0,0l-0.5,0c-0.10986,0 -0.21521,0.04364 -0.29289,0.12132c-0.16176,0.16176 -0.16176,0.42403 0,0.58579l0,0l2.93934,2.93934c0.19526,0.19526 0.51184,0.19526 0.7071,0l0,0l2.93934,-2.93934c0.07768,-0.07768 0.12132,-0.18304 0.12132,-0.2929c0,-0.22876 -0.18545,-0.41421 -0.41421,-0.41421l0,0l-0.5,0c-0.27614,0 -0.5,-0.22386 -0.5,-0.5c0,-0.27614 -0.22386,-0.5 -0.5,-0.5l0,0zm0,-2l-3,0c-0.27614,0 -0.5,0.22386 -0.5,0.5c0,0.27614 0.22386,0.5 0.5,0.5l0,0l3,0c0.27614,0 0.5,-0.22386 0.5,-0.5c0,-0.27614 -0.22386,-0.5 -0.5,-0.5l0,0zm0,-2l-3,0c-0.27614,0 -0.5,0.22386 -0.5,0.5c0,0.27614 0.22386,0.5 0.5,0.5l0,0l3,0c0.27614,0 0.5,-0.22386 0.5,-0.5c0,-0.27614 -0.22386,-0.5 -0.5,-0.5l0,0z" fill-rule="evenodd"/>
+ </g>
+</svg>

assets/icons/upgrades-symbolic_dark.svg

@@ -0,0 +1,58 @@
+<?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="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="downloads-symbolic_dark.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata10">
+    <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>
+  <defs
+     id="defs8" />
+  <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="982"
+     id="namedview6"
+     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="svg4" />
+  <path
+     transform="rotate(-180 8 8)"
+     fill="#FFF"
+     fill-opacity=".8"
+     fill-rule="evenodd"
+     d="M8,1 C11.8659932,1 15,4.13400675 15,8 C15,11.8659932 11.8659932,15 8,15 C4.13400675,15 1,11.8659932 1,8 C1,4.13400675 4.13400675,1 8,1 Z M9.5,8 L6.5,8 C6.22385763,8 6,8.22385763 6,8.5 C6,8.77614237 5.77614237,9 5.5,9 L5.5,9 L5,9 C4.89014373,9 4.78478689,9.04364023 4.70710678,9.12132034 C4.54534632,9.2830808 4.54534632,9.54534632 4.70710678,9.70710678 L4.70710678,9.70710678 L7.64644661,12.6464466 C7.84170876,12.8417088 8.15829124,12.8417088 8.35355339,12.6464466 L8.35355339,12.6464466 L11.2928932,9.70710678 C11.3705733,9.62942667 11.4142136,9.52406983 11.4142136,9.41421356 C11.4142136,9.18544973 11.2287638,9 11,9 L11,9 L10.5,9 C10.2238576,9 10,8.77614237 10,8.5 C10,8.22385763 9.77614237,8 9.5,8 L9.5,8 Z M9.5,6 L6.5,6 C6.22385763,6 6,6.22385763 6,6.5 C6,6.77614237 6.22385763,7 6.5,7 L6.5,7 L9.5,7 C9.77614237,7 10,6.77614237 10,6.5 C10,6.22385763 9.77614237,6 9.5,6 L9.5,6 Z M9.5,4 L6.5,4 C6.22385763,4 6,4.22385763 6,4.5 C6,4.77614237 6.22385763,5 6.5,5 L6.5,5 L9.5,5 C9.77614237,5 10,4.77614237 10,4.5 C10,4.22385763 9.77614237,4 9.5,4 L9.5,4 Z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:0.60000002" />
+</svg>

debian/changelog

@@ -1,3 +1,72 @@
+spark-store (3.3.3~test3) stable; urgency=medium
+
+  * Now use ss-apt-fast instead of apt-fast
+  * 修复：右上角 更新和安装设置 菜单中进入更新列表失效
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3.3~test2) stable; urgency=medium
+
+  * bug fix: 更新和检查更新出错时不报错.此更新需要一个推送
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3.3~test1) stable; urgency=medium
+
+  * 3.3.3将会是修复大部分bug后的最终版本
+  * 图形环境中所有root权限的组件剥离到cli(可用于deepin 23 daily，只保证商店本体正常运作，不处理安装依赖不满足)
+  * 文案更改：更新检查-->检查更新
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3.1~test1) stable; urgency=medium
+
+  * 安装时不再需要联网
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3.0.4) stable; urgency=medium
+
+  * 为减轻服务器压力，不再单独更新某一个应用，而是作为整体更新
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3.0.3) stable; urgency=medium
+
+  * 回滚 更新中行为到进度条而不是实时输出
+  * 更新应用时显示正在更新哪个应用
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3.0.2) stable; urgency=medium
+
+  * 修复 pkexec未执行
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3.0.1) stable; urgency=medium
+
+  * 修复 检查更新的更新进程未实际运行
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3) stable; urgency=medium
+
+  * 修复 检查更新 未刷新软件源
+  * 把检查更新单独拿出作为左列
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3~test3) stable; urgency=medium
+
+  * 把检查更新加入免密码
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.3~test2) stable; urgency=medium
 
   * 更新检测功能全部更改到zenity

debian/spark-store.postinst

@@ -30,7 +30,7 @@ case "$1" in
 
 		gcc /opt/durapps/spark-store/bin/ss-feedback/sender-d.sh.c -o /opt/durapps/spark-store/bin/ss-feedback/sender-d
 
-		# Download and install key
+		# Install key
 		mkdir -p /tmp/spark-store-install/
 		cp -f /opt/durapps/spark-store/bin/spark-store.asc  /tmp/spark-store-install/spark-store.asc
 		gpg --dearmor /tmp/spark-store-install/spark-store.asc
@@ -39,8 +39,8 @@ case "$1" in
 
 
         	# Run apt update to avoid users being fucked up by the non-exist dependency problem
-
-		aptss ssupdate
+		# Now abandoned as aptss now run ssupdate everytime
+		#aptss ssupdate
 
 
 		# Start upgrade detect service

debian/spark-store.preinst

@@ -3,7 +3,7 @@
 function network-check()
 {
     #超时时间
-    local timeout=5
+    local timeout=15
 
     #目标网站
     local target=www.baidu.com
@@ -24,4 +24,5 @@ function network-check()
 }
 
 
-network-check
+#network-check
+echo "不再检测网络"

pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade-worker.policy

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+    <vendor>Spark Store</vendor>
+    <icon_name>x-package-repository</icon_name>
+    <action id="store.spark-app.ss-do-upgrade-worker">
+        <description>运行ss-do-upgrade-worker需要权限</description>
+        <message>要使用ss-do-upgrade-worker需要权限</message>
+        <defaults>
+            <allow_any>yes</allow_any>
+            <allow_inactive>yes</allow_inactive>
+            <allow_active>yes</allow_active>
+        </defaults>
+        <annotate key="org.freedesktop.policykit.exec.path">/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh</annotate>
+        <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+    </action>
+</policyconfig>

spark-store-project.pro

@@ -36,7 +36,7 @@ desktop.path = /usr/share/applications
 service.files += pkg/usr/lib/systemd/system/spark-update-notifier.service
 service.path = /usr/lib/systemd/system/
 
-polkit-1.files +=pkg/usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+polkit-1.files +=pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade-worker.policy
 polkit-1.path = /usr/share/polkit-1/actions/
 
 
@@ -55,6 +55,6 @@ INSTALLS += \
     preferences \
     tmp \
     service \
-    bash_completion
-#	polkit-1 
+    bash_completion \
+    polkit-1 
 #   暂时不添加

src/main.cpp

@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
      DAboutDialog dialog;
       a.setAboutDialog(&dialog);
       dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
-      dialog.setVersion(DApplication::buildVersion("Version 3.3~test2"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.3.3~test3"));
       dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
       dialog.setProductName(QLabel::tr("Spark Store"));
       dialog.setDescription(
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     a.setOrganizationName("spark-union");
     a.setOrganizationDomain("https://www.deepinos.org/");
     a.setApplicationName("Spark Store");    //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文
-    a.setApplicationVersion(DApplication::buildVersion("3.3~test2"));
+    a.setApplicationVersion(DApplication::buildVersion("3.3.3~test3"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(

src/widget.cpp

@@ -63,7 +63,8 @@ Widget::Widget(DBlurEffectWidget *parent) :
     connect(ui->menu_system, &QPushButton::clicked, this, [=](){Widget::chooseLeftMenu(10);});
     connect(ui->menu_theme, &QPushButton::clicked, this, [=](){Widget::chooseLeftMenu(11);});
     connect(ui->menu_other, &QPushButton::clicked, this, [=](){Widget::chooseLeftMenu(12);});
-    connect(ui->menu_download, &QPushButton::clicked, this, [=](){Widget::chooseLeftMenu(13);});
+    connect(ui->menu_upgrade, &QPushButton::clicked, this, [=](){Widget::chooseLeftMenu(13);});
+    connect(ui->menu_download, &QPushButton::clicked, this, [=](){Widget::chooseLeftMenu(14);});
 
     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType)
     {
@@ -255,7 +256,8 @@ void Widget::initUI()
     left_list[10] = ui->menu_system;
     left_list[11] = ui->menu_theme;
     left_list[12] = ui->menu_other;
-    left_list[13] = ui->menu_download;
+    left_list[13] = ui->menu_upgrade;
+    left_list[14] = ui->menu_download;
 
     ui->label_show->hide();
 
@@ -482,7 +484,8 @@ void Widget::updateUI()
         left_list[10]->setIcon(QIcon(":/icons/icons/category_system_dark.svg"));
         left_list[11]->setIcon(QIcon(":/icons/icons/theme-symbolic_dark.svg"));
         left_list[12]->setIcon(QIcon(":/icons/icons/category_others_dark.svg"));
-        left_list[13]->setIcon(QIcon(":/icons/icons/downloads-symbolic_dark.svg"));
+        left_list[13]->setIcon(QIcon(":/icons/icons/upgrades-symbolic_dark.svg"));
+        left_list[14]->setIcon(QIcon(":/icons/icons/downloads-symbolic_dark.svg"));
     }
     else
     {
@@ -499,10 +502,11 @@ void Widget::updateUI()
         left_list[10]->setIcon(QIcon(":/icons/icons/category_system.svg"));
         left_list[11]->setIcon(QIcon(":/icons/icons/theme-symbolic.svg"));
         left_list[12]->setIcon(QIcon(":/icons/icons/category_others.svg"));
-        left_list[13]->setIcon(QIcon(":/icons/icons/downloads-symbolic.svg"));
+        left_list[13]->setIcon(QIcon(":/icons/icons/upgrades-symbolic.svg"));
+        left_list[14]->setIcon(QIcon(":/icons/icons/downloads-symbolic.svg"));
     }
 
-    for(int i = 0; i < 14; i++)
+    for(int i = 0; i < 15; i++)
     {
         /* 设置左侧菜单字体
          * QFont temp = font;
@@ -590,7 +594,10 @@ void Widget::updateUI()
         left_list[12]->setIcon(QIcon(":/icons/icons/category_others_dark.svg"));
         break;
     case 13:
-        left_list[13]->setIcon(QIcon(":/icons/icons/downloads-symbolic_dark.svg"));
+        left_list[13]->setIcon(QIcon(":/icons/icons/upgrades-symbolic_dark.svg"));
+        break;
+    case 14:
+        left_list[14]->setIcon(QIcon(":/icons/icons/downloads-symbolic_dark.svg"));
         break;
     }
 }
@@ -630,6 +637,16 @@ void Widget::chooseLeftMenu(int index)
 
         ui->stackedWidget->setCurrentIndex(0);
     }
+    else if (index == 13){
+        QtConcurrent::run([=]{
+            auto upgradeP = new QProcess();
+            upgradeP->startDetached("/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh");
+            upgradeP->waitForStarted();
+            upgradeP->waitForFinished(-1);
+            
+        });
+        ui->stackedWidget->setCurrentIndex(0);
+    }
     else
     {
         ui->stackedWidget->setCurrentIndex(1);
@@ -649,7 +666,7 @@ void Widget::updatefoot()
 
 void Widget::on_pushButton_download_clicked()
 {
-    chooseLeftMenu(13);
+    chooseLeftMenu(14);
 
     allDownload += 1;
 

src/widget.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1053</width>
-    <height>711</height>
+    <height>754</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -93,6 +93,20 @@
       <property name="rightMargin">
        <number>5</number>
       </property>
+      <item row="13" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_theme">
+        <property name="text">
+         <string>Beautify</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_chat">
+        <property name="text">
+         <string>Chat</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <spacer name="verticalSpacer_7">
         <property name="orientation">
@@ -109,86 +123,30 @@
         </property>
        </spacer>
       </item>
-      <item row="5" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_music">
+      <item row="3" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_network">
         <property name="text">
-         <string>Music</string>
+         <string>Network</string>
         </property>
        </widget>
       </item>
-      <item row="7" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_photo">
-        <property name="text">
-         <string>Graphics</string>
-        </property>
-       </widget>
-      </item>
-      <item row="11" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_dev">
-        <property name="text">
-         <string>Development</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="icon">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>36</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>36</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>icon</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="5">
-       <spacer name="horizontalSpacer_8">
+      <item row="18" column="0">
+       <spacer name="verticalSpacer">
         <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
+         <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>3</width>
-          <height>20</height>
+          <width>20</width>
+          <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item row="0" column="2">
-       <spacer name="horizontalSpacer_9">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="12" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_system">
+      <item row="8" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_game">
         <property name="text">
-         <string>Tools</string>
-        </property>
-       </widget>
-      </item>
-      <item row="10" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_read">
-        <property name="text">
-         <string>Reading</string>
+         <string>Games</string>
         </property>
        </widget>
       </item>
@@ -199,6 +157,13 @@
         </property>
        </widget>
       </item>
+      <item row="17" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_download">
+        <property name="text">
+         <string>Download</string>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="3">
        <widget class="QPushButton" name="pushButton_refresh">
         <property name="maximumSize">
@@ -219,10 +184,10 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_chat">
+      <item row="6" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_video">
         <property name="text">
-         <string>Chat</string>
+         <string>Video</string>
         </property>
        </widget>
       </item>
@@ -246,44 +211,10 @@
         </property>
        </widget>
       </item>
-      <item row="17" column="0">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="13" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_theme">
+      <item row="12" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_system">
         <property name="text">
-         <string>Beautify</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_network">
-        <property name="text">
-         <string>Network</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_game">
-        <property name="text">
-         <string>Games</string>
-        </property>
-       </widget>
-      </item>
-      <item row="14" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_other">
-        <property name="text">
-         <string>Others</string>
+         <string>Tools</string>
         </property>
        </widget>
       </item>
@@ -300,17 +231,63 @@
         </property>
        </widget>
       </item>
-      <item row="16" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_download">
+      <item row="10" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_read">
         <property name="text">
-         <string>Download</string>
+         <string>Reading</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="0" colspan="6">
-       <widget class="QPushButton" name="menu_video">
+      <item row="14" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_other">
         <property name="text">
-         <string>Video</string>
+         <string>Others</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_photo">
+        <property name="text">
+         <string>Graphics</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="icon">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>36</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>36</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>icon</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer_9">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="11" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_dev">
+        <property name="text">
+         <string>Development</string>
         </property>
        </widget>
       </item>
@@ -333,6 +310,36 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="5">
+       <spacer name="horizontalSpacer_8">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>3</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="5" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_music">
+        <property name="text">
+         <string>Music</string>
+        </property>
+       </widget>
+      </item>
+      <item row="16" column="0" colspan="6">
+       <widget class="QPushButton" name="menu_upgrade">
+        <property name="text">
+         <string>Upgrade</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -365,11 +372,11 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="QWebEngineView" name="webEngineView" native="true">
+        <widget class="QWebEngineView" name="webEngineView">
          <property name="contextMenuPolicy">
           <enum>Qt::DefaultContextMenu</enum>
          </property>
-         <property name="url" stdset="0">
+         <property name="url">
           <url>
            <string>about:blank</string>
           </url>
@@ -489,8 +496,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>889</width>
-            <height>849</height>
+            <width>903</width>
+            <height>848</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_17">
@@ -993,8 +1000,8 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>851</width>
-                   <height>324</height>
+                   <width>869</width>
+                   <height>326</height>
                   </rect>
                  </property>
                  <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -1123,8 +1130,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>889</width>
-            <height>716</height>
+            <width>738</width>
+            <height>833</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_23">

tool/aptss

@@ -22,8 +22,8 @@ if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] ;
 
 DEPEND=`which  apt-fast`
 if [ "$DEPEND" = "" ] ; then 
-echo "未安装依赖：apt-fast 开始安装"
-aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y 
+echo "未安装依赖：ss-apt-fast 开始安装"
+aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install ss-apt-fast -y 
 fi
 
 sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"  -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
@@ -38,8 +38,8 @@ bwrap --dev-bind / / \
 elif [ "$1" = "download" ];then
 DEPEND=`which  apt-fast`
 if [ "$DEPEND" = "" ] ; then 
-echo "未安装依赖：apt-fast 开始安装"
-aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y 
+echo "未安装依赖：ss-apt-fast 开始安装"
+aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install ss-apt-fast -y 
 fi
 
 ###执行
@@ -64,11 +64,10 @@ mkdir -p /tmp/aptss-conf/
 echo "从服务器获取配置和镜像列表..."
 echo "Getting server and mirror lists..."
 echo
-curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/apt-fast.conf"
+curl  --silent -o  /tmp/aptss-conf/apt-fast.conf "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/apt-fast.conf"
 chmod -R 755 /tmp/aptss-conf    
 
-sudo curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
-### 额外一份拿来给aptss自动补全用
+sudo curl --silent -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
 sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"  -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
 
 #只更新星火源

tool/auto-install-policy/store.spark-app.ssinstall.policy

@@ -4,7 +4,7 @@
 <policyconfig>
     <vendor>Spark Store</vendor>
     <icon_name>x-package-repository</icon_name>
-    <action id="org.maicss.dnf">
+    <action id="store.spark-app.ssinstall">
         <description>运行ssinstall需要权限</description>
         <message>要使用ssinstall需要权限</message>
         <defaults>

tool/ssinstall

@@ -47,8 +47,8 @@ if [ "$(id -u)" != "0" ];then
 
 IS_INSTALLED=`which apt-fast`
 if [ "$IS_INSTALLED" = "" ] ; then 
-echo "未安装依赖：apt-fast 开始安装"
-echo "$upass" | sudo -S aptss ssupdate && echo "$upass" | sudo -S bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y 
+echo "未安装依赖：ss-apt-fast 开始安装"
+echo "$upass" | sudo -S aptss ssupdate && echo "$upass" | sudo -S bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install ss-apt-fast -y 
 
 fi
 
@@ -68,8 +68,8 @@ else
 
 IS_INSTALLED=`which apt-fast`
 if [ "$IS_INSTALLED" = "" ] ; then 
-echo "未安装依赖：apt-fast 开始安装"
-aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y 
+echo "未安装依赖：ss-apt-fast 开始安装"
+aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install ss-apt-fast -y 
 fi
 
 

tool/update-upgrade/ss-do-upgrade-worker.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+if [ "$(id -u)" != "0" ];then
+pkexec "$0" "$@"
+exit
+fi
+
+
+case $1 in 
+	ssupdate)
+	aptss ssupdate 2>&1 | tee /tmp/spark-store-app-ssupdate-log.txt
+	IS_SSUPDATE_ERROR=`cat /tmp/spark-store-app-ssupdate-log.txt | grep "E: "`
+	echo "$IS_SSUPDATE_ERROR" > /tmp/spark-store-app-ssupdate-status.txt
+	;;
+	upgradable-list)
+	bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1
+	;;
+	upgrade-app)
+	aptss install "${@:2}" --only-upgrade 2>&1 | tee /tmp/spark-store-app-upgrade-log.txt
+	IS_UPGRADE_ERROR=`cat /tmp/spark-store-app-upgrade-log.txt | grep "Package manager quit with exit code."`
+	echo "$IS_UPGRADE_ERROR" > /tmp/spark-store-app-upgrade-status.txt
+	;;
+	
+	clean-log)
+	rm -f /tmp/spark-store-app-ssupdate-status.txt /tmp/spark-store-app-ssupdate-log.txt /tmp/spark-store-app-upgrade-log.txt /tmp/spark-store-app-upgrade-status.txt
+	;;
+esac

tool/update-upgrade/ss-do-upgrade.sh

@@ -1,26 +1,56 @@
-PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)" 
+#!/bin/bash
+
+
+pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh ssupdate | zenity --progress --auto-close --pulsate --no-cancel  --text="正在检查更新，请稍候..." --height 70 --width 400 --title="星火商店更新模块" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+
+if [ -z `cat /tmp/spark-store-app-ssupdate-status.txt` != "0" ];then
+echo "无错误"
+else
+zenity --error  --text "检查更新进程出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测模块" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+zenity --text-info --filename=/tmp/spark-store-app-ssupdate-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log
+exit 
+fi
+pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log
+
+PKG_LIST="$(pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)" 
 ####如果没更新，就弹出不需要更新
 if [ -z "$PKG_LIST" ];then
-zenity --info --icon-name=spark-store --text "没有软件需要更新\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300
+zenity --info  --text "没有软件需要更新\n但是你并没有站在世界之巅" --title "星火商店更新检测模块" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 else
 PKG_UPGRADE_LIST=`for PKG_NAME in $PKG_LIST;
 do
 #### 检测是否是hold状态
 	if [ "$(dpkg-query -W -f='${Status}' $PKG_NAME | grep hold)" = "" ];then
        echo "true"
+       echo "$PKG_NAME"
        echo "$PKG_NAME"
 	else
 	echo "false"
-	echo "$PKG_NAME (无法更新：请先执行 sudo apt-mark unhold 后再更新)"
+	echo "$PKG_NAME（无法更新：已被标记为保留）"
+	echo "$PKG_NAME"
 	fi
-done | zenity --list --text="选择你想更新的应用" --column=是否更新 --column=应用包名 --separator=" " --checklist --print-column=2 --multiple --height 350 --width 550 ` 
+done | zenity --list --text="选择你想更新的应用" --column=是否更新 --column=应用包名 --column="真的应用包名" --separator=" " --checklist --print-column=3 --multiple --height 350 --width 550 --hide-column=3 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg` 
 
 #### 如果没有选择，则直接退出
 
 if [ "$PKG_UPGRADE_LIST" = "" ];then
-zenity --info --icon-name=spark-store --text "没有选中任何软件\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300
+zenity --info  --text "没有选中任何软件\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 else
-sudo aptss install $PKG_UPGRADE_LIST -y
+
+pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE_LIST -y | zenity --progress --auto-close --no-cancel --pulsate --text=正在更新已选中的应用，请稍候... --height 70 --width 400 --title="星火商店更新模块" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+
+if [ -z "`cat /tmp/spark-store-app-upgrade-status.txt`"  ];then
+
+zenity --info  --text "已选中的软件已经更新完毕" --title "星火商店更新检测模块" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+else
+zenity --error  --text "更新出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测模块" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+zenity --text-info --filename=/tmp/spark-store-app-upgrade-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里往下拉" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 fi
 
-fi
+
+
+fi
+
+fi
+####从最开头

tool/update-upgrade/ss-update-controler.sh

@@ -40,7 +40,7 @@ case $option in
 	;;
 
 	2)
-	pkexec bash /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh
+	/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh
 	;;
 	3)
 	if [ -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy ];then 

tool/update-upgrade/ss-update-notifier.sh

@@ -19,7 +19,7 @@ function notify-send() {
 function network()
 {
     #超时时间
-    local timeout=5
+    local timeout=15
 
     #目标网站
     local target=www.baidu.com

translations/spark-store_zh_CN.ts

@@ -617,7 +617,7 @@
     <message>
         <location filename="../src/widget.cpp" line="937"/>
         <source>Upgrade</source>
-        <translation>升级</translation>
+        <translation>软件升级</translation>
     </message>
     <message>
         <location filename="../src/widget.cpp" line="1124"/>