minor ui improvement

MatsuriDayo · May 22, 2023 · f18d1c9 · f18d1c9
1 parent 68fecb7
commit f18d1c9
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 40 deletions.
diff --git a/db/ConfigBuilder.cpp b/db/ConfigBuilder.cpp
@@ -602,7 +602,7 @@ namespace NekoGui {
 
             // mux common
             auto needMux = ent->type == "vmess" || ent->type == "trojan" || ent->type == "vless" || ent->type == "shadowsocks";
-            needMux &= !dataStore->mux_protocol.isEmpty() && dataStore->mux_concurrency > 0;
+            needMux &= dataStore->mux_concurrency > 0;
 
             if (stream != nullptr) {
                 if (IS_NEKO_BOX) {

diff --git a/fmt/Bean2CoreObj_box.cpp b/fmt/Bean2CoreObj_box.cpp
@@ -63,7 +63,7 @@ namespace NekoGui_fmt {
                 tls["reality"] = QJsonObject{
                     {"enabled", true},
                     {"public_key", reality_pbk},
-                    {"short_id", reality_sid},
+                    {"short_id", reality_sid.split(",")[0]},
                 };
             }
             outbound->insert("tls", tls);

diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts
@@ -433,6 +433,14 @@ For NekoBox, this rewrites the underlying(localhost) DNS in VPN mode, normal mod
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Server support is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reality short id. Accept only one value.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogFirstSetup</name>
@@ -889,6 +897,10 @@ This needs to be run NekoBox with administrator privileges.</source>
         <source>Plugin</source>
         <translation>پلاگین</translation>
     </message>
+    <message>
+        <source>Server support is required</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditSocksHttp</name>

diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
@@ -433,6 +433,14 @@ For NekoBox, this rewrites the underlying(localhost) DNS in VPN mode, normal mod
         <source>Confirm</source>
         <translation>确认</translation>
     </message>
+    <message>
+        <source>Server support is required</source>
+        <translation>需要服务器支持</translation>
+    </message>
+    <message>
+        <source>Reality short id. Accept only one value.</source>
+        <translation>Reality short id. 只接受一个值。</translation>
+    </message>
 </context>
 <context>
     <name>DialogFirstSetup</name>
@@ -891,6 +899,10 @@ This needs to be run NekoBox with administrator privileges.</source>
         <source>Plugin</source>
         <translation>插件</translation>
     </message>
+    <message>
+        <source>Server support is required</source>
+        <translation>需要服务器支持</translation>
+    </message>
 </context>
 <context>
     <name>EditSocksHttp</name>

diff --git a/ui/dialog_basic_settings.cpp b/ui/dialog_basic_settings.cpp
@@ -62,10 +62,10 @@ DialogBasicSettings::DialogBasicSettings(QWidget *parent)
         ui->groupBox_http->hide();
         ui->inbound_socks_port_l->setText(ui->inbound_socks_port_l->text().replace("Socks", "Mixed (SOCKS+HTTP)"));
         ui->log_level->addItems(QString("trace debug info warn error fatal panic").split(" "));
-        ui->mux_protocol->addItems({"", "h2mux", "smux", "yamux"});
+        ui->mux_protocol->addItems({"h2mux", "smux", "yamux"});
     } else {
         ui->log_level->addItems({"debug", "info", "warning", "none"});
-        ui->mux_protocol->addItems({"", "mux.cool"});
+        ui->mux_protocol->hide();
     }
 
     refresh_auth();

diff --git a/ui/dialog_vpn_settings.ui b/ui/dialog_vpn_settings.ui
@@ -114,13 +114,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="hide_console">
-        <property name="text">
-         <string>Hide Console</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QCheckBox" name="single_core">
         <property name="toolTip">
@@ -132,6 +125,13 @@ This needs to be run NekoBox with administrator privileges.</string>
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="hide_console">
+        <property name="text">
+         <string>Hide Console</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -212,8 +212,8 @@ This needs to be run NekoBox with administrator privileges.</string>
   <tabstop>vpn_ipv6</tabstop>
   <tabstop>strict_route</tabstop>
   <tabstop>fake_dns</tabstop>
-  <tabstop>hide_console</tabstop>
   <tabstop>single_core</tabstop>
+  <tabstop>hide_console</tabstop>
   <tabstop>vpn_rule_cidr</tabstop>
   <tabstop>vpn_rule_process</tabstop>
   <tabstop>whitelist_mode</tabstop>

diff --git a/ui/edit/dialog_edit_profile.ui b/ui/edit/dialog_edit_profile.ui
@@ -160,29 +160,29 @@
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
-       <widget class="QPushButton" name="apply_to_group">
-        <property name="text">
-         <string>Apply settings to this group</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QDialogButtonBox" name="buttonBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="standardButtons">
-         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-        </property>
-       </widget>
-      </item>
-     </layout>
+         <widget class="QPushButton" name="apply_to_group">
+          <property name="text">
+           <string>Apply settings to this group</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QDialogButtonBox" name="buttonBox">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="standardButtons">
+           <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
@@ -327,6 +327,9 @@
            </item>
            <item row="3" column="0">
             <widget class="QLabel" name="multiplex_l">
+             <property name="toolTip">
+              <string>Server support is required</string>
+             </property>
              <property name="text">
               <string>Multiplex</string>
              </property>
@@ -572,6 +575,9 @@ security (QUIC)</string>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="reality_sid_l">
+           <property name="toolTip">
+            <string>Reality short id. Accept only one value.</string>
+           </property>
            <property name="text">
             <string notr="true">Reality Sid</string>
            </property>

diff --git a/ui/edit/edit_shadowsocks.ui b/ui/edit/edit_shadowsocks.ui
@@ -162,15 +162,13 @@
        <string notr="true">v2ray-plugin</string>
       </property>
      </item>
-     <item>
-      <property name="text">
-       <string notr="true">ssr</string>
-      </property>
-     </item>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="QCheckBox" name="uot">
+     <property name="toolTip">
+      <string>Server support is required</string>
+     </property>
      <property name="text">
       <string notr="true">UDP over TCP</string>
      </property>

diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp
@@ -97,6 +97,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
         if (NekoGui::dataStore->log_level == "warning") NekoGui::dataStore->log_level = "info";
         if (!Preset::SingBox::DomainStrategy.contains(NekoGui::dataStore->routing->domain_strategy)) NekoGui::dataStore->routing->domain_strategy = "";
         if (!Preset::SingBox::DomainStrategy.contains(NekoGui::dataStore->routing->outbound_domain_strategy)) NekoGui::dataStore->routing->outbound_domain_strategy = "";
+        if (NekoGui::dataStore->mux_protocol.isEmpty()) NekoGui::dataStore->mux_protocol = "h2mux";
         //
         if (QDir("dashboard").count() == 0) {
             QDir().mkdir("dashboard");