新增 安装方式选择

downloadlist.cpp

@@ -20,6 +20,12 @@ downloadlist::downloadlist(QWidget *parent) :
     ui->pushButton_3->hide();
     ui->widget_spinner->start();
     ui->widget_spinner->hide();
+    action_dpkg->setText("dpkg");
+    action_gdebi->setText("gdebi");
+    connect(action_dpkg,&QAction::triggered,[=](){downloadlist::install(1);});
+    connect(action_gdebi,&QAction::triggered,[=](){downloadlist::install(0);});
+    menu_install->addAction(action_gdebi);
+    menu_install->addAction(action_dpkg);
 }
 
 downloadlist::~downloadlist()
@@ -93,7 +99,7 @@ void downloadlist::setSpeed(QString s)
     speed=s;
 }
 
-void downloadlist::on_pushButton_install_clicked()
+void downloadlist::install(int t)
 {
     if(!isInstall){
         isInstall=true;
@@ -104,9 +110,18 @@ void downloadlist::on_pushButton_install_clicked()
         QtConcurrent::run([=](){
             QProcess installer;
             if(reinstall){
+                if(t==0){
                     installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
                 }else {
+                    installer.start("pkexec ssinstall -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
+                }
+
+            }else {
+                if(t==0){
                     installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
+                }else {
+                    installer.start("pkexec ssinstall -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
+                }
             }
 
             installer.waitForFinished();
@@ -154,6 +169,13 @@ void downloadlist::on_pushButton_install_clicked()
 
 }
 
+void downloadlist::on_pushButton_install_clicked()
+{
+    //弹出菜单
+//    menu_install->show();
+    menu_install->exec(cursor().pos());
+}
+
 void downloadlist::on_pushButton_2_clicked()
 {
     ui->label_2->setText("已取消下载");

downloadlist.h

@@ -4,6 +4,8 @@
 #include <QWidget>
 #include <DDialog>
 #include <QTextBrowser>
+#include <QMenu>
+#include <QAction>
 DWIDGET_USE_NAMESPACE
 namespace Ui {
 class downloadlist;
@@ -33,6 +35,10 @@ public:
     QTextBrowser *textbrowser=new QTextBrowser;
     bool reinstall=false;
     QString pkgName;
+    QMenu *menu_install=new QMenu;
+    QAction *action_gdebi=new QAction;
+    QAction *action_dpkg=new QAction;
+    void install(int);
 private slots:
     void on_pushButton_install_clicked();
 

main.cpp

@@ -10,7 +10,7 @@ int main(int argc, char *argv[])
     a.setAttribute(Qt::AA_UseHighDpiPixmaps);
     a.loadTranslator();
     a.setOrganizationName("spark-union");
-    a.setApplicationVersion(DApplication::buildVersion("1.0-beta5.5"));
+    a.setApplicationVersion(DApplication::buildVersion("1.0-beta5.5.1"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setProductIcon(QIcon::fromTheme("spark-store"));  //设置Logo