diff --git a/assets/icons.qrc b/assets/icons.qrc index 5686063..6014540 100644 --- a/assets/icons.qrc +++ b/assets/icons.qrc @@ -32,6 +32,8 @@ icons/category_active.svg icons/refresh-page-dark.svg icons/refresh-page.svg + icons/upgrades-symbolic_dark.svg + icons/upgrades-symbolic.svg tags/a2d.png diff --git a/assets/icons/upgrades-symbolic.svg b/assets/icons/upgrades-symbolic.svg new file mode 100644 index 0000000..b25d370 --- /dev/null +++ b/assets/icons/upgrades-symbolic.svg @@ -0,0 +1,7 @@ + + + + Layer 1 + + + \ No newline at end of file diff --git a/assets/icons/upgrades-symbolic_dark.svg b/assets/icons/upgrades-symbolic_dark.svg new file mode 100644 index 0000000..01a3901 --- /dev/null +++ b/assets/icons/upgrades-symbolic_dark.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/src/widget.cpp b/src/widget.cpp index 303d0c7..381008f 100644 --- a/src/widget.cpp +++ b/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; diff --git a/src/widget.ui b/src/widget.ui index 1605673..95b9c5f 100644 --- a/src/widget.ui +++ b/src/widget.ui @@ -7,7 +7,7 @@ 0 0 1053 - 711 + 754 @@ -93,6 +93,20 @@ 5 + + + + Beautify + + + + + + + Chat + + + @@ -109,86 +123,30 @@ - - + + - Music + Network - - - - Graphics - - - - - - - Development - - - - - - - - 0 - 36 - - - - - 16777215 - 36 - - - - icon - - - - - + + - Qt::Horizontal - - - QSizePolicy::Fixed + Qt::Vertical - 3 - 20 + 20 + 40 - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + - Tools - - - - - - - Reading + Games @@ -199,6 +157,13 @@ + + + + Download + + + @@ -219,10 +184,10 @@ - - + + - Chat + Video @@ -246,44 +211,10 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + + - Beautify - - - - - - - Network - - - - - - - Games - - - - - - - Others + Tools @@ -300,17 +231,63 @@ - - + + - Download + Reading - - + + - Video + Others + + + + + + + Graphics + + + + + + + + 0 + 36 + + + + + 16777215 + 36 + + + + icon + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Development @@ -333,6 +310,36 @@ + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + Music + + + + + + + Upgrade + + + @@ -365,11 +372,11 @@ 0 - + Qt::DefaultContextMenu - + about:blank @@ -489,8 +496,8 @@ 0 0 - 889 - 849 + 903 + 848 @@ -993,8 +1000,8 @@ 0 0 - 851 - 324 + 869 + 326 @@ -1123,8 +1130,8 @@ 0 0 - 889 - 716 + 738 + 833 diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index c9da681..ab9c8d5 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -617,7 +617,7 @@ Upgrade - 升级 + 软件升级