From d164aec86d353babce8378a1eddaee1d5448b56c Mon Sep 17 00:00:00 2001
From: zty199 <46324746+zty199@users.noreply.github.com>
Date: Sat, 17 Apr 2021 00:53:26 +0800
Subject: [PATCH] Improve Features

Fix a bug that annotations in server list can be chosen in combobox;
Fix a bug that index page don't follow system theme;
Disable qDebug/qWarning output in Release version;
Update default server list.
---
 spark-store-project.pro |  2 +-
 src/spark-store.pro     |  3 +++
 src/widget.cpp          | 19 +++++++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/spark-store-project.pro b/spark-store-project.pro
index 329b096..254ea6c 100644
--- a/spark-store-project.pro
+++ b/spark-store-project.pro
@@ -4,4 +4,4 @@ CONFIG += ordered
 SUBDIRS = third-party/QtNetworkService \
     src/spark-store.pro
     
-spark-store.depends = third-party/QtNetworkService
\ No newline at end of file
+spark-store.depends = third-party/QtNetworkService
diff --git a/src/spark-store.pro b/src/spark-store.pro
index 14407ec..fcf5be5 100644
--- a/src/spark-store.pro
+++ b/src/spark-store.pro
@@ -25,6 +25,9 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
+# 禁止输出 qWarning / qDebug 信息
+CONFIG(release, debug|release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT
+
 SOURCES += main.cpp\
     appitem.cpp \
     downloadworker.cpp \
diff --git a/src/widget.cpp b/src/widget.cpp
index 059468d..b67cc18 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -236,6 +236,13 @@ void Widget::initConfig()
         while (getline(serverList,lineTmp)) {
             ui->comboBox_server->addItem(QString::fromStdString(lineTmp));
         }
+        for(int i = 0; i < ui->comboBox_server->count(); i++)
+        {
+            if(ui->comboBox_server->itemText(i) == "开发者模式 Dev only")
+            {
+                ui->comboBox_server->model()->setData(ui->comboBox_server->model()->index(i, 0), QVariant(0), Qt::UserRole - 1);
+            }
+        }
     }else {
         ui->comboBox_server->addItem("https://d.store.deepinos.org.cn/");
     }
@@ -271,8 +278,8 @@ void Widget::initConfig()
     ui->webfoot->hide();
 
     //初始化首页
-    ui->webEngineView->setUrl(menuUrl[0]);
-    //    ui->webEngineView->setUrl(menuUrl[1]);
+    chooseLeftMenu(0);
+    // ui->webEngineView->setUrl(menuUrl[0]);
 
     //给下载列表赋值到数组，方便调用
     for (int i =0; i<LIST_MAX;i++){
@@ -894,6 +901,14 @@ void Widget::on_pushButton_updateServer_clicked()
         }
         ui->pushButton_updateServer->setEnabled(true);
         ui->comboBox_server->setCurrentIndex(0);
+
+        for(int i = 0; i < ui->comboBox_server->count(); i++)
+        {
+            if(ui->comboBox_server->itemText(i) == "开发者模式 Dev only")
+            {
+                ui->comboBox_server->model()->setData(ui->comboBox_server->model()->index(i, 0), QVariant(0), Qt::UserRole - 1);
+            }
+        }
     });
 }