!293 431

Merge pull request !293 from shenmo/dev

debian/changelog

@@ -1,19 +1,3 @@
-spark-store (4.3.2.0) UNRELEASED; urgency=medium
-
-  * 后续更新请从4.3.2.0版本号开始，4.3.2版本仅用于GXDE测试
-  * 支持dummyapps 安装包安装
-  * 支持紧凑模式
-  * 修复部分情况下升级安装失败的问题
-
- -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
-
-spark-store (4.3.2) UNRELEASED; urgency=medium
-
-  * ssinstall支持安装conflict包
-  * 支持紧凑模式
-
- -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
-
 spark-store (4.3.1) UNRELEASED; urgency=medium
 
   * 修复自提权更新问题

src/mainwindow-dtk.cpp

@@ -22,6 +22,9 @@
 #define AppPageSearchlist 1
 #define AppPageAppdetail 2
 #define AppPageSettings 3
+#define WaylandSearchCenter 1
+#define OtherSearchCenter 2
+#define RightSearchSpace 1
 #define UploadServerUrl "https://upload.deepinos.org.cn/"
 
 MainWindow::MainWindow(QWidget *parent)
@@ -123,16 +126,6 @@ void MainWindow::closeEvent(QCloseEvent *event)
     BaseWidgetOpacity::closeEvent(event);
 }
 
-void MainWindow::changeEvent(QEvent *event)
-{
-    if (event->type() != QEvent::StyleChange) {
-        return BaseWidgetOpacity::changeEvent(event);
-    }
-
-    BaseWidgetOpacity::changeEvent(event);
-    downloadButton->setFixedSize(searchEdit->sizeHint().height(), searchEdit->sizeHint().height());
-}
-
 void MainWindow::initUI()
 {
     QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
@@ -166,9 +159,8 @@ void MainWindow::initTitleBar()
     ui->titlebar->setBackgroundTransparent(true);
 
     // 初始化标题栏控件
-    DLabel *titleLabel = new DLabel(ui->titlebar);
-    titleLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-    titleLabel->setText(tr("Spark Store"));
+    DLabel *title = new DLabel(ui->titlebar);
+    title->setText(tr("Spark Store"));
 
     backButton = new DPushButton(ui->titlebar);
 
@@ -178,37 +170,34 @@ void MainWindow::initTitleBar()
     searchEdit->lineEdit()->setFixedWidth(350);
 
     downloadButton = new ProgressButton(ui->titlebar);
-    downloadButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
     downloadButton->setDownloadListWidget(downloadlistwidget);
     downloadButton->setFocusPolicy(Qt::FocusPolicy::ClickFocus);
-    downloadButton->setFixedSize(searchEdit->sizeHint().height(), searchEdit->sizeHint().height());
     downloadlistwidget->setFocusProxy(downloadButton);
 
-    QWidget *customWidget = new QWidget(ui->titlebar);
-    customWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-    ui->titlebar->setCustomWidget(customWidget);
-
-    QHBoxLayout *customWidgetLayout = new QHBoxLayout(customWidget);
-    customWidgetLayout->setContentsMargins(8, 0, 0, 0);
-    customWidgetLayout->setSpacing(0);
-    customWidgetLayout->addWidget(titleLabel, 0, Qt::AlignLeft);
-    customWidgetLayout->addSpacing(8);
-    customWidgetLayout->addWidget(backButton, 0, Qt::AlignLeft);
-    QWidget *centralWidget = new QWidget(customWidget);
-    centralWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-    customWidgetLayout->addWidget(centralWidget, 1, Qt::AlignHCenter);
-
-    QHBoxLayout *centralLayout = new QHBoxLayout(centralWidget);
-    centralLayout->setContentsMargins(20, 0, 10, 0);
-    centralLayout->setSpacing(0);
-
-    centralLayout->addWidget(searchEdit, 0, Qt::AlignHCenter);
-    centralLayout->addSpacing(10);
-    centralLayout->addWidget(downloadButton, 0, Qt::AlignHCenter);
+    QWidget *w_titlebar = new QWidget(ui->titlebar);
+    QHBoxLayout *ly_titlebar = new QHBoxLayout(w_titlebar);
+    ly_titlebar->addWidget(title);
+    ly_titlebar->addWidget(backButton);
+    // Check wayland configs
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    if (!config.value("runtime/isDDE").toBool() && config.value("runtime/useWayland").toBool())
+    {
+        // Wayland 搜索栏居中
+        ly_titlebar->addStretch(WaylandSearchCenter);
+    }
+    else
+    {
+        // dwayland dxcb 搜索栏顶部右侧居中
+        ly_titlebar->addStretch(OtherSearchCenter);
+    }
+    ly_titlebar->addWidget(searchEdit);
+    ly_titlebar->addWidget(downloadButton);
+    ly_titlebar->addStretch(RightSearchSpace);
+    ui->titlebar->setCustomWidget(w_titlebar);
 
     initTitleBarMenu();
 
-    backButton->setDisabled(true);
+    backButton->hide();
     downloadlistwidget->hide();
 }
 
@@ -364,9 +353,9 @@ void MainWindow::initConnections()
         ui->stackedWidget->setCurrentIndex(pageHistory.at(pageHistory.count() - 2));
         pageHistory.removeLast();
         if (pageHistory.count() > 1) {
-            backButton->setEnabled(true);
+            backButton->show();
         } else {
-            backButton->setDisabled(true);
+            backButton->hide();
         } });
 
     // 搜索事件
@@ -457,11 +446,11 @@ void MainWindow::switchPage(int now) // 临时方案，回家后修改
     qDebug() << pageHistory.count();
     if (pageHistory.count() >= 1)
     {
-        backButton->setEnabled(true);
+        backButton->show();
     }
     else
     {
-        backButton->setDisabled(true);
+        backButton->hide();
     }
     ui->stackedWidget->setCurrentIndex(now);
     ui->stackedWidget->currentWidget()->setFocus();

src/mainwindow-dtk.h

@@ -34,7 +34,6 @@ public:
 
 protected:
     void closeEvent(QCloseEvent *event) override;
-    void changeEvent(QEvent *event) override;
 
 private:
     void initUI();

src/widgets/common/progressbutton.cpp

@@ -9,6 +9,10 @@
 ProgressButton::ProgressButton(QWidget *parent)
     : QWidget{parent}
 {
+    // this->setWindowFlags(Qt::FramelessWindowHint);
+    // this->setAttribute(Qt::WA_TranslucentBackground, true);
+    setMinimumSize(36, 36);
+
     svgPath = "";
     backColor = Qt::transparent;
 
@@ -33,7 +37,7 @@ void ProgressButton::setProgress(int progress)
         buttonState = state::closeProgress;
         update();
         WaterDrop *waterDrop = new WaterDrop(parentWidget());
-        waterDrop->move(QRectF(geometry()).center());
+        waterDrop->move(geometry().center());
         waterDrop->show();
     }
     repaint();
@@ -73,9 +77,12 @@ void ProgressButton::mousePressEvent(QMouseEvent *event)
 
 void ProgressButton::mouseReleaseEvent(QMouseEvent *event)
 {
-    if (buttonState == state::hover
-        || buttonState == state::normal
-        || buttonState == state::closeProgress)
+    if (buttonState == state::hover || buttonState == state::normal)
+    {
+        widthChangeValue = (this->width() - 6) / 2;
+        update();
+    }
+    else if (buttonState == state::closeProgress)
     {
         update();
     }
@@ -124,15 +131,19 @@ void ProgressButton::paintEvent(QPaintEvent *event)
 {
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing, true);
-    QRectF rect = this->rect();
+    QRect rect = event->rect();
 
     if (buttonState == state::normal || buttonState == state::hover)
     {
-        qreal radius = rect.height() / 2;
+        int radius = (rect.height() - 6) / 2;
         painter.translate(rect.center());
         painter.setPen(Qt::transparent);
+        painter.setBrush(QColor(buttonState == state::normal ? color : color.darker()));
+        // painter.drawEllipse(QPoint(0, 0), radius, radius);
+
+        // radiu -= 3;
         painter.setBrush(backColor);
-        painter.drawEllipse(QPointF(0, 0), radius, radius);
+        painter.drawEllipse(QPoint(0, 0), radius, radius);
 
         QSvgRenderer m_svgRender;
         m_svgRender.load(svgPath);
@@ -140,34 +151,42 @@ void ProgressButton::paintEvent(QPaintEvent *event)
     }
     else if (buttonState == state::openProgress)
     {
-        qreal radius = rect.height() / 2 - 1;
         painter.translate(rect.center());
-        painter.setPen(QPen(backColor.darker(), 2));
+        int radius = (rect.height() - 6) / 2 - 3;
         painter.setBrush(backColor);
-        painter.drawEllipse(QPointF(0, 0), radius, radius);
+        painter.setPen(QPen(backColor, 3));
+        painter.drawEllipse(QPoint(0, 0), radius, radius);
 
-        QRectF rectF = QRectF(-radius, -radius, radius * 2, radius * 2);
-        painter.setPen(QPen(color.darker(100), 2));
-        qreal angle = progress * 360 / 100 * 1.0;
-        painter.drawArc(rectF, 90 * 16, -qIntCast(angle * 16));
+        painter.setPen(QPen(backColor, 3));
 
         QSvgRenderer m_svgRender;
         m_svgRender.load(svgPath);
         m_svgRender.render(&painter, QRectF(-radius / 2, -radius / 2, radius, radius));
+
+        QRect rect = QRect(-radius, -radius,
+                           radius * 2, radius * 2);
+
+        painter.setPen(QPen(color.darker(100), 3));
+        qreal angle = progress * 360 / 100 * 1.0;
+        painter.drawArc(rect.adjusted(-3, -3, 3, 3), 90 * 16, -qIntCast(angle * 16));
     }
     else if (buttonState == state::closeProgress)
     {
-        qreal radius = rect.height() / 2 - 1;
+        auto radius = (rect.height() - 6) / 2;
         painter.translate(rect.center());
-        painter.setPen(QPen(color.darker(100), 2));
-        painter.setBrush(backColor);
-        painter.drawEllipse(QPointF(0, 0), radius, radius);
+        painter.setPen(Qt::transparent);
+        painter.setBrush(QColor(0, 0, 0, 63));
+        painter.drawEllipse(QPoint(0, 0), radius, radius);
 
-        painter.setPen(QPen(color, 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-        painter.drawLine(QPointF(-radius / 3, 0),
-                         QPointF(-radius / 5, radius / 3));
-        painter.drawLine(QPointF(-radius / 5, radius / 3),
-                         QPointF(radius / 4, -radius / 4));
+        radius -= 3;
+        painter.setBrush(backColor);
+        painter.drawEllipse(QPoint(0, 0), radius, radius);
+
+        painter.setPen(QPen(color, 3, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+        painter.drawLine(QPoint(-radius / 3, 0),
+                         QPoint(-radius / 5, radius / 3));
+        painter.drawLine(QPoint(-radius / 5, radius / 3),
+                         QPoint(radius / 4, -radius / 4));
     }
     QWidget::paintEvent(event);
 }
@@ -176,7 +195,7 @@ void ProgressButton::operationProcessing()
 {
 }
 
-const int RADIUS = 30;
+const int RADIUS = 60;
 WaterDrop::WaterDrop(QWidget *parent)
     : QWidget(parent)
     , m_waterDropAnimation(new QVariantAnimation(this))
@@ -191,20 +210,20 @@ WaterDrop::WaterDrop(QWidget *parent)
 }
 
 // 把鼠标点击的点转换为圆心点坐标
-void WaterDrop::move(const QPointF &point)
+void WaterDrop::move(const QPoint &point)
 {
-    QPointF translatePoint = point - QRectF(rect()).center();
-    QWidget::move(qRound(translatePoint.x()), qRound(translatePoint.y()));
+    QPoint translatePoint = point - QPoint(RADIUS, RADIUS);
+    QWidget::move(translatePoint);
 }
 
 void WaterDrop::show()
 {
     m_waterDropAnimation->setStartValue(0);
-    m_waterDropAnimation->setEndValue(RADIUS - 2);
+    m_waterDropAnimation->setEndValue(RADIUS);
     m_waterDropAnimation->setDuration(350);
 
     connect(m_waterDropAnimation, &QVariantAnimation::valueChanged, this, &WaterDrop::onRadiusChanged);
-    connect(m_waterDropAnimation, &QVariantAnimation::finished, this, &WaterDrop::deleteLater);
+    connect(m_waterDropAnimation, &QVariantAnimation::finished, this, &WaterDrop::close);
     m_waterDropAnimation->start(QVariantAnimation::DeleteWhenStopped);
     QWidget::show();
 }
@@ -213,9 +232,10 @@ void WaterDrop::paintEvent(QPaintEvent *event)
 {
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing);
-    QPen pen(QBrush(QColor("#ffff80")), 4.0);
+    QPen pen(QBrush(QColor("#ffff80")), 5.0);
+    pen.setWidth(5);
     painter.setPen(pen);
-    painter.drawEllipse(QRectF(rect()).center(), m_animationRadius, m_animationRadius);
+    painter.drawEllipse(event->rect().center(), m_animationRadius, m_animationRadius);
 
     QWidget::paintEvent(event);
 }

src/widgets/common/progressbutton.h

@@ -52,6 +52,7 @@ private:
     QColor backColor;
     QColor color;
     QString svgPath;
+    int widthChangeValue{0};
     int progress{0};//处理百分比
 
     bool m_mouseMoved = false;
@@ -65,7 +66,7 @@ class WaterDrop : public QWidget
 public:
     explicit WaterDrop(QWidget *parent = nullptr);
     void show();
-    void move(const QPointF &point);
+    void move(const QPoint &point);
 
 protected:
     void paintEvent(QPaintEvent *event);

tool/ssaudit

@@ -2,7 +2,6 @@
 
 source /opt/durapps/spark-store/bin/bashimport/transhell.amber
 load_transhell_debug
-export DEBIAN_FRONTEND=noninteractive
 
 case $(arch) in
    x86_64)
@@ -123,7 +122,7 @@ DEBPATH=$(realpath "$1")
         exit "$try_run_ret"
     fi
 
-    aptss install "$DEBPATH" -yf --reinstall
+    dpkg -i "$DEBPATH" || aptss install -yf
 
     if [ "$?" = "0" ] && [ "$2" = "--delete-after-install" ]; then
         if dpkg -s "$package_name" >/dev/null 2>&1; then

tool/ssinstall

@@ -2,7 +2,6 @@
 
 source /opt/durapps/spark-store/bin/bashimport/transhell.amber
 load_transhell_debug
-export DEBIAN_FRONTEND=noninteractive
 
 trap 'unlock_file $DEBPATH' EXIT
 case $(arch) in
@@ -166,7 +165,7 @@ if [ ! -z "$IS_SHA512SUM_CHECKED" ]; then
         exit "$try_run_ret"
     fi
 
-    aptss install "$DEBPATH" -yf --reinstall
+    dpkg -i "$DEBPATH" || aptss install -yf
 
 unlock_file "$DEBPATH"
 

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 export LANGUAGE=en_US
-export DEBIAN_FRONTEND=noninteractive
+
 case $1 in 
 	ssupdate)
 if [ "$(id -u)" != "0" ] ; then

translations/spark-store_en.ts

@@ -411,103 +411,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="116"/>
+        <location filename="../src/mainwindow-dtk.ui" line="166"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="153"/>
+        <location filename="../src/mainwindow-dtk.ui" line="203"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="181"/>
+        <location filename="../src/mainwindow-dtk.ui" line="231"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="209"/>
+        <location filename="../src/mainwindow-dtk.ui" line="259"/>
         <source>Music</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="237"/>
+        <location filename="../src/mainwindow-dtk.ui" line="287"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="265"/>
+        <location filename="../src/mainwindow-dtk.ui" line="315"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="293"/>
+        <location filename="../src/mainwindow-dtk.ui" line="343"/>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="321"/>
+        <location filename="../src/mainwindow-dtk.ui" line="371"/>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="349"/>
+        <location filename="../src/mainwindow-dtk.ui" line="399"/>
         <source>Reading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="377"/>
+        <location filename="../src/mainwindow-dtk.ui" line="427"/>
         <source>Development</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="405"/>
+        <location filename="../src/mainwindow-dtk.ui" line="455"/>
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="433"/>
+        <location filename="../src/mainwindow-dtk.ui" line="483"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="461"/>
+        <location filename="../src/mainwindow-dtk.ui" line="511"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="489"/>
+        <location filename="../src/mainwindow-dtk.ui" line="539"/>
         <source>APP Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="216"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="206"/>
         <source>Submit App</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="217"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="207"/>
         <source>Submit App with client(Recommanded)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="218"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="208"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="219"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="209"/>
         <source>APP Upgrade and Install Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="171"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="270"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="163"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="260"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="176"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
         <source>Search or enter spk://</source>
         <translation type="unfinished"></translation>
     </message>
@@ -517,7 +517,7 @@
     <message>
         <location filename="../src/application.cpp" line="36"/>
         <location filename="../src/application.cpp" line="37"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="149"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="142"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
@@ -537,7 +537,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="273"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="263"/>
         <source>Show MainWindow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -658,12 +658,12 @@
 <context>
     <name>TitleBarMenu</name>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="274"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="264"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="275"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="265"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>

translations/spark-store_es.ts

@@ -411,103 +411,103 @@
         <translation>Ventana principal</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="116"/>
+        <location filename="../src/mainwindow-dtk.ui" line="166"/>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="153"/>
+        <location filename="../src/mainwindow-dtk.ui" line="203"/>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="181"/>
+        <location filename="../src/mainwindow-dtk.ui" line="231"/>
         <source>Chat</source>
         <translation>Charla</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="209"/>
+        <location filename="../src/mainwindow-dtk.ui" line="259"/>
         <source>Music</source>
         <translation>Música</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="237"/>
+        <location filename="../src/mainwindow-dtk.ui" line="287"/>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="265"/>
+        <location filename="../src/mainwindow-dtk.ui" line="315"/>
         <source>Picture</source>
         <translation>Foto</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="293"/>
+        <location filename="../src/mainwindow-dtk.ui" line="343"/>
         <source>Game</source>
         <translation>Juego</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="321"/>
+        <location filename="../src/mainwindow-dtk.ui" line="371"/>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="349"/>
+        <location filename="../src/mainwindow-dtk.ui" line="399"/>
         <source>Reading</source>
         <translation>Leer</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="377"/>
+        <location filename="../src/mainwindow-dtk.ui" line="427"/>
         <source>Development</source>
         <translation>Desarrollo</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="405"/>
+        <location filename="../src/mainwindow-dtk.ui" line="455"/>
         <source>Tool</source>
         <translation>Herramientas</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="433"/>
+        <location filename="../src/mainwindow-dtk.ui" line="483"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="461"/>
+        <location filename="../src/mainwindow-dtk.ui" line="511"/>
         <source>Other</source>
         <translation>Además</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="489"/>
+        <location filename="../src/mainwindow-dtk.ui" line="539"/>
         <source>APP Upgrade</source>
         <translation>Actualización de app</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="216"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="206"/>
         <source>Submit App</source>
         <translation>Presentación de la aplicación</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="217"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="207"/>
         <source>Submit App with client(Recommanded)</source>
         <translation>Enviar la aplicación al cliente (recomendación)</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="218"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="208"/>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="219"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="209"/>
         <source>APP Upgrade and Install Settings</source>
         <translation>Actualización e instalación de app</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="171"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="270"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="163"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="260"/>
         <source>Spark Store</source>
         <translation>SPARK Store</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="176"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
         <source>Search or enter spk://</source>
         <translation>Buscar o introducir spk: /%</translation>
     </message>
@@ -517,7 +517,7 @@
     <message>
         <location filename="../src/application.cpp" line="36"/>
         <location filename="../src/application.cpp" line="37"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="149"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="142"/>
         <source>Spark Store</source>
         <translation>SPARK Store</translation>
     </message>
@@ -537,7 +537,7 @@
         <translation>Descargar lista</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="273"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="263"/>
         <source>Show MainWindow</source>
         <translation>Mostrar la ventana principal</translation>
     </message>
@@ -658,12 +658,12 @@
 <context>
     <name>TitleBarMenu</name>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="274"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="264"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="275"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="265"/>
         <source>Exit</source>
         <translation>Exportaciones</translation>
     </message>

translations/spark-store_fr.ts

@@ -411,103 +411,103 @@
         <translation>Fenêtre principale</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="116"/>
+        <location filename="../src/mainwindow-dtk.ui" line="166"/>
         <source>Home</source>
         <translation>Maison</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="153"/>
+        <location filename="../src/mainwindow-dtk.ui" line="203"/>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="181"/>
+        <location filename="../src/mainwindow-dtk.ui" line="231"/>
         <source>Chat</source>
         <translation>Bavarder</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="209"/>
+        <location filename="../src/mainwindow-dtk.ui" line="259"/>
         <source>Music</source>
         <translation>Musique</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="237"/>
+        <location filename="../src/mainwindow-dtk.ui" line="287"/>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="265"/>
+        <location filename="../src/mainwindow-dtk.ui" line="315"/>
         <source>Picture</source>
         <translation>Photos</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="293"/>
+        <location filename="../src/mainwindow-dtk.ui" line="343"/>
         <source>Game</source>
         <translation>Jeux</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="321"/>
+        <location filename="../src/mainwindow-dtk.ui" line="371"/>
         <source>Office</source>
         <translation>Bureaux</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="349"/>
+        <location filename="../src/mainwindow-dtk.ui" line="399"/>
         <source>Reading</source>
         <translation>Lire</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="377"/>
+        <location filename="../src/mainwindow-dtk.ui" line="427"/>
         <source>Development</source>
         <translation>Développement</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="405"/>
+        <location filename="../src/mainwindow-dtk.ui" line="455"/>
         <source>Tool</source>
         <translation>Outils</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="433"/>
+        <location filename="../src/mainwindow-dtk.ui" line="483"/>
         <source>Theme</source>
         <translation>Thèmes</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="461"/>
+        <location filename="../src/mainwindow-dtk.ui" line="511"/>
         <source>Other</source>
         <translation>En outre</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="489"/>
+        <location filename="../src/mainwindow-dtk.ui" line="539"/>
         <source>APP Upgrade</source>
         <translation>Mise à niveau app</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="216"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="206"/>
         <source>Submit App</source>
         <translation>Soumettre une application</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="217"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="207"/>
         <source>Submit App with client(Recommanded)</source>
         <translation>Soumettre une demande au client (recommandé)</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="218"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="208"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="219"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="209"/>
         <source>APP Upgrade and Install Settings</source>
         <translation>Paramètres de mise à niveau et d&apos;installation de l&apos;app</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="171"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="270"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="163"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="260"/>
         <source>Spark Store</source>
         <translation>Le Spark store</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="176"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
         <source>Search or enter spk://</source>
         <translation>Rechercher ou entrer SPK /</translation>
     </message>
@@ -517,7 +517,7 @@
     <message>
         <location filename="../src/application.cpp" line="36"/>
         <location filename="../src/application.cpp" line="37"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="149"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="142"/>
         <source>Spark Store</source>
         <translation>Le Spark store</translation>
     </message>
@@ -537,7 +537,7 @@
         <translation>Télécharger la Liste</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="273"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="263"/>
         <source>Show MainWindow</source>
         <translation>Afficher la fenêtre principale</translation>
     </message>
@@ -658,12 +658,12 @@
 <context>
     <name>TitleBarMenu</name>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="274"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="264"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="275"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="265"/>
         <source>Exit</source>
         <translation>Exportations</translation>
     </message>

translations/spark-store_zh_CN.ts

@@ -411,103 +411,103 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="116"/>
+        <location filename="../src/mainwindow-dtk.ui" line="166"/>
         <source>Home</source>
         <translation>主页</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="153"/>
+        <location filename="../src/mainwindow-dtk.ui" line="203"/>
         <source>Network</source>
         <translation>网络</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="181"/>
+        <location filename="../src/mainwindow-dtk.ui" line="231"/>
         <source>Chat</source>
         <translation>社交</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="209"/>
+        <location filename="../src/mainwindow-dtk.ui" line="259"/>
         <source>Music</source>
         <translation>音乐</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="237"/>
+        <location filename="../src/mainwindow-dtk.ui" line="287"/>
         <source>Video</source>
         <translation>视频</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="265"/>
+        <location filename="../src/mainwindow-dtk.ui" line="315"/>
         <source>Picture</source>
         <translation>图像</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="293"/>
+        <location filename="../src/mainwindow-dtk.ui" line="343"/>
         <source>Game</source>
         <translation>游戏</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="321"/>
+        <location filename="../src/mainwindow-dtk.ui" line="371"/>
         <source>Office</source>
         <translation>办公</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="349"/>
+        <location filename="../src/mainwindow-dtk.ui" line="399"/>
         <source>Reading</source>
         <translation>阅读</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="377"/>
+        <location filename="../src/mainwindow-dtk.ui" line="427"/>
         <source>Development</source>
         <translation>开发</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="405"/>
+        <location filename="../src/mainwindow-dtk.ui" line="455"/>
         <source>Tool</source>
         <translation>工具</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="433"/>
+        <location filename="../src/mainwindow-dtk.ui" line="483"/>
         <source>Theme</source>
         <translation>主题</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="461"/>
+        <location filename="../src/mainwindow-dtk.ui" line="511"/>
         <source>Other</source>
         <translation>其他</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="489"/>
+        <location filename="../src/mainwindow-dtk.ui" line="539"/>
         <source>APP Upgrade</source>
         <translation>更新</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="216"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="206"/>
         <source>Submit App</source>
         <translation>投递应用</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="217"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="207"/>
         <source>Submit App with client(Recommanded)</source>
         <translation>使用本地投稿器投递应用（推荐）</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="218"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="208"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="219"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="209"/>
         <source>APP Upgrade and Install Settings</source>
         <translation>应用更新和安装设置</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="171"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="270"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="163"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="260"/>
         <source>Spark Store</source>
         <translation>星火应用商店</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="176"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
         <source>Search or enter spk://</source>
         <translation>搜索或打开链接</translation>
     </message>
@@ -517,7 +517,7 @@
     <message>
         <location filename="../src/application.cpp" line="36"/>
         <location filename="../src/application.cpp" line="37"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="149"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="142"/>
         <source>Spark Store</source>
         <translation>星火应用商店</translation>
     </message>
@@ -537,7 +537,7 @@
         <translation>下载列表</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="273"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="263"/>
         <source>Show MainWindow</source>
         <translation>显示主窗口</translation>
     </message>
@@ -658,12 +658,12 @@
 <context>
     <name>TitleBarMenu</name>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="274"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="264"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="275"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="265"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>

translations/spark-store_zh_TW.ts

@@ -411,103 +411,103 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="116"/>
+        <location filename="../src/mainwindow-dtk.ui" line="166"/>
         <source>Home</source>
         <translation>首頁</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="153"/>
+        <location filename="../src/mainwindow-dtk.ui" line="203"/>
         <source>Network</source>
         <translation>網路</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="181"/>
+        <location filename="../src/mainwindow-dtk.ui" line="231"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="209"/>
+        <location filename="../src/mainwindow-dtk.ui" line="259"/>
         <source>Music</source>
         <translation>音樂</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="237"/>
+        <location filename="../src/mainwindow-dtk.ui" line="287"/>
         <source>Video</source>
         <translation>播放</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="265"/>
+        <location filename="../src/mainwindow-dtk.ui" line="315"/>
         <source>Picture</source>
         <translation>圖片</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="293"/>
+        <location filename="../src/mainwindow-dtk.ui" line="343"/>
         <source>Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="321"/>
+        <location filename="../src/mainwindow-dtk.ui" line="371"/>
         <source>Office</source>
         <translation>辦公</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="349"/>
+        <location filename="../src/mainwindow-dtk.ui" line="399"/>
         <source>Reading</source>
         <translation>閱讀</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="377"/>
+        <location filename="../src/mainwindow-dtk.ui" line="427"/>
         <source>Development</source>
         <translation>開發</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="405"/>
+        <location filename="../src/mainwindow-dtk.ui" line="455"/>
         <source>Tool</source>
         <translation>工具</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="433"/>
+        <location filename="../src/mainwindow-dtk.ui" line="483"/>
         <source>Theme</source>
         <translation>主題</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="461"/>
+        <location filename="../src/mainwindow-dtk.ui" line="511"/>
         <source>Other</source>
         <translation>其他</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="489"/>
+        <location filename="../src/mainwindow-dtk.ui" line="539"/>
         <source>APP Upgrade</source>
         <translation>軟體更新</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="216"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="206"/>
         <source>Submit App</source>
         <translation>上傳軟體</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="217"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="207"/>
         <source>Submit App with client(Recommanded)</source>
         <translation>從客戶端上傳軟體(推薦的)</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="218"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="208"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="219"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="209"/>
         <source>APP Upgrade and Install Settings</source>
         <translation>軟體升級 和 安裝設定</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="171"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="270"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="163"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="260"/>
         <source>Spark Store</source>
         <translation>星火应用商店</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="176"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
         <source>Search or enter spk://</source>
         <translation>搜索或打开链接</translation>
     </message>
@@ -517,7 +517,7 @@
     <message>
         <location filename="../src/application.cpp" line="36"/>
         <location filename="../src/application.cpp" line="37"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="149"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="142"/>
         <source>Spark Store</source>
         <translation>星火应用商店</translation>
     </message>
@@ -537,7 +537,7 @@
         <translation>下载列表</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="273"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="263"/>
         <source>Show MainWindow</source>
         <translation>显示主窗口</translation>
     </message>
@@ -658,12 +658,12 @@
 <context>
     <name>TitleBarMenu</name>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="274"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="264"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="275"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="265"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>