优化路由设置界面

yanue · Jun 29, 2024 · c893764 · c893764
1 parent d6da588
commit c893764
Show file tree

Hide file tree

Showing 10 changed files with 761 additions and 765 deletions.
diff --git a/V2rayU/AppDelegate.swift b/V2rayU/AppDelegate.swift
@@ -112,6 +112,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             UserDefaults.set(forKey: .runMode, value: RunMode.global.rawValue)
         }
         V2rayServer.loadConfig()
+        V2rayRoutings.loadConfig()
+        V2raySubscription.loadConfig()
     }
 
     @objc func handleAppleEvent(event: NSAppleEventDescriptor, replyEvent: NSAppleEventDescriptor) {

diff --git a/V2rayU/Base.lproj/ConfigWindow.xib b/V2rayU/Base.lproj/ConfigWindow.xib
@@ -1855,7 +1855,7 @@ Gw
                                             <autoresizingMask key="autoresizingMask"/>
                                             <clipView key="contentView" id="0rS-HW-TeI">
                                                 <rect key="frame" x="1" y="1" width="375" height="480"/>
-                                                <autoresizingMask key="autoresizingMask"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textView importsGraphics="NO" richText="NO" verticallyResizable="YES" selectionGranularity="word" allowsUndo="YES" allowsNonContiguousLayout="YES" textCompletion="NO" smartInsertDelete="YES" id="dNK-7u-GUm">
                                                         <rect key="frame" x="0.0" y="0.0" width="379" height="480"/>

diff --git a/V2rayU/Base.lproj/MainMenu.xib b/V2rayU/Base.lproj/MainMenu.xib
@@ -24,7 +24,7 @@
                 <outlet property="manualMode" destination="hTu-27-5OL" id="lHt-aQ-ZNU"/>
                 <outlet property="newVersionItem" destination="SdL-DD-qZe" id="WXr-Gw-0HS"/>
                 <outlet property="pacMode" destination="NrZ-oB-7yd" id="d3C-wO-jAI"/>
-                <outlet property="routingMenu" destination="ykF-uD-Nb1" id="qTS-BH-9rV"/>
+                <outlet property="routingMenu" destination="VNg-as-9we" id="NO1-L3-jsN"/>
                 <outlet property="serverItems" destination="cio-ej-HL5" id="0Z8-41-eCi"/>
                 <outlet property="statusMenu" destination="9n3-TW-9ur" id="Hgg-sa-fM8"/>
                 <outlet property="toggleV2rayItem" destination="SML-EF-rdT" id="am7-ue-GN3"/>
@@ -88,38 +88,7 @@
                 <menuItem isSeparatorItem="YES" id="EF9-7H-2Xy"/>
                 <menuItem title="Routing" id="VNg-as-9we" userLabel="Routing">
                     <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Routing" id="ykF-uD-Nb1">
-                        <items>
-                            <menuItem title="Routing..." tag="-1" id="tKM-4Z-Gyr">
-                                <attributedString key="attributedTitle"/>
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="goRouting:" target="hcZ-V7-Dui" id="gVK-Fb-7uq"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="pSb-Qp-dXC"/>
-                            <menuItem title="Global" identifier="routingGlobal" id="qhf-Kw-wBL" userLabel="Global">
-                                <connections>
-                                    <action selector="switchRouting:" target="hcZ-V7-Dui" id="j4n-az-30A"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Bypassing the LAN Address" tag="1" identifier="routingLan" id="xcE-uG-T3N">
-                                <connections>
-                                    <action selector="switchRouting:" target="hcZ-V7-Dui" id="ssU-OD-c6I"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Bypassing mainland address" tag="2" identifier="routingCn" id="Y6v-yx-HRg">
-                                <connections>
-                                    <action selector="switchRouting:" target="hcZ-V7-Dui" id="oYE-YR-VSp"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Bypassing LAN and mainland address" tag="3" identifier="routingLanAncCn" id="YQd-ir-Ilb">
-                                <connections>
-                                    <action selector="switchRouting:" target="hcZ-V7-Dui" id="OVM-pr-94W"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
+                    <menu key="submenu" title="Routing" id="ykF-uD-Nb1"/>
                     <connections>
                         <action selector="switchRouting:" target="hcZ-V7-Dui" id="cPc-yB-1qO"/>
                     </connections>