add manual mode which does not touch system proxy

src/GuiConfig.cpp

@@ -149,7 +149,9 @@ void GuiConfig::updateLastUsed() {
 GuiConfig::GuiConfig() {
     guiConfig.insert("strategy", "");
     guiConfig.insert("index", 3);
+    guiConfig.insert("auto", false);
     guiConfig.insert("global", false);
+    guiConfig.insert("manual", true);
     guiConfig.insert("localPort", 1080);
     guiConfig.insert("enabled", true);
     guiConfig.insert("shareOverLan", false);

src/MainWindow.cpp

@@ -68,11 +68,6 @@ MainWindow::MainWindow(QWidget *parent) :
     systemProxyModeManager = new DDEProxyModeManager(this);
     if (guiConfig->get("enabled").toBool()) {
         on_actionEnable_System_Proxy_triggered(true);
-        if (guiConfig->get("global").toBool()) {
-            switchToGlobal();
-        } else {
-            switchToPacMode();
-        }
     }
     in = 0;
     out = 0;
@@ -175,8 +170,10 @@ void MainWindow::updateTrayIcon() {
     out = 0;
     if (!GuiConfig::instance()->get("enabled").toBool()) {
         icon.append("_none");
-    } else if (GuiConfig::instance()->get("global").toBool()) {
+    } else if (GuiConfig::instance()->get("manual").toBool()) {
         icon.append("_manual");
+    } else if (GuiConfig::instance()->get("global").toBool()) {
+        icon.append("_global");
     } else {
         icon.append("_auto");
     }
@@ -277,12 +274,20 @@ void MainWindow::updateMenu() {
         ui->actionEnable_System_Proxy->setChecked(false);
         ui->menuMode->setEnabled(false);
     }
+    if (guiConfig->get("auto").toBool()) {
+        ui->actionPAC->setChecked(true);
+        ui->actionGlobal->setChecked(false);
+        ui->actionManual->setChecked(false);
+    }
     if (guiConfig->get("global").toBool()) {
+        ui->actionPAC->setChecked(false);
         ui->actionGlobal->setChecked(true);
+        ui->actionManual->setChecked(false);
+    }
+    if (guiConfig->get("manual").toBool()) {
         ui->actionPAC->setChecked(false);
-    } else {
         ui->actionGlobal->setChecked(false);
-        ui->actionPAC->setChecked(true);
+        ui->actionManual->setChecked(true);
     }
     if (guiConfig->get("useOnlinePac").toBool()) {
         ui->actionOnline_PAC->setChecked(true);
@@ -381,9 +386,12 @@ void MainWindow::on_actionEnable_System_Proxy_triggered(bool flag) {
             guiConfig->updateLastUsed();
             proxyManager->setConfig(config);
             proxyManager->start();
-            if(guiConfig->get("global").toBool()){
+            if(guiConfig->get("manual").toBool()){
+                systemProxyModeManager->switchToNone();
+                updateMenu();
+            } else if(guiConfig->get("global").toBool()){
                 switchToGlobal();
-            } else{
+            } else if(guiConfig->get("auto").toBool()){
                 switchToPacMode();
             }
         }
@@ -395,8 +403,10 @@ void MainWindow::on_actionEnable_System_Proxy_triggered(bool flag) {
 void MainWindow::on_actionPAC_triggered(bool checked) {
     qDebug() << "pac" << checked;
     auto guiConfig = GuiConfig::instance();
-    if (guiConfig->get("global").toBool() == checked) {
-        guiConfig->set("global", !checked);
+    guiConfig->set("manual", !checked);
+    guiConfig->set("global", !checked);
+    if (guiConfig->get("auto").toBool() != checked) {
+        guiConfig->set("auto", checked);
         switchToPacMode();
     }
     updateMenu();
@@ -405,13 +415,27 @@ void MainWindow::on_actionPAC_triggered(bool checked) {
 void MainWindow::on_actionGlobal_triggered(bool checked) {
     qDebug() << "global" << checked;
     auto guiConfig = GuiConfig::instance();
+    guiConfig->set("auto", !checked);
+    guiConfig->set("manual", !checked);
     if (guiConfig->get("global").toBool() != checked) {
         guiConfig->set("global", checked);
         switchToGlobal();
     }
     updateMenu();
 }
 
+void MainWindow::on_actionManual_triggered(bool checked) {
+    qDebug() << "manual" << checked;
+    auto guiConfig = GuiConfig::instance();
+    guiConfig->set("auto", !checked);
+    guiConfig->set("global", !checked);
+    if (guiConfig->get("manual").toBool() != checked) {
+        guiConfig->set("manual", checked);
+        systemProxyModeManager->switchToNone();
+    }
+    updateMenu();
+}
+
 void MainWindow::on_actionStart_on_Boot_triggered(bool checked) {
     // 如果使用flatpak，这里可能有问题
     QString url = "/usr/share/applications/shadowsocks-deepin.desktop";

src/MainWindow.h

@@ -70,6 +70,8 @@ private slots:
 
     void on_actionGlobal_triggered(bool checked);
 
+    void on_actionManual_triggered(bool checked);
+
     void updateTrayIcon();
 
     void on_actionStart_on_Boot_triggered(bool checked);
@@ -119,6 +121,8 @@ private slots:
 
     void switchToGlobal();
 
+    void switchToManual();
+
     // QWidget interface
 protected:
     void contextMenuEvent(QContextMenuEvent *event) override;

src/MainWindow.ui

@@ -23,6 +23,7 @@
     </property>
     <addaction name="actionPAC"/>
     <addaction name="actionGlobal"/>
+    <addaction name="actionManual"/>
    </widget>
    <widget class="QMenu" name="menuServers">
     <property name="title">
@@ -113,6 +114,14 @@
     <string>Global</string>
    </property>
   </action>
+  <action name="actionManual">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Manual</string>
+   </property>
+  </action>
   <action name="actionEdit_Servers">
    <property name="text">
     <string>Edit Servers...</string>