Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Commit 135f5b3

Browse files
CenmrevCenmrev
committed
change default routing rule to all_to_main
1 parent cef4877 commit 135f5b3

File tree

4 files changed

+18
-27
lines changed

4 files changed

+18
-27
lines changed

‎V2RayX/AdvancedWindow.xib

+13-19
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Gw
9191
<rect key="frame" x="1" y="1" width="118" height="268"/>
9292
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
9393
<subviews>
94-
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="XPi-HC-KJg">
94+
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="XPi-HC-KJg">
9595
<rect key="frame" x="0.0" y="0.0" width="118" height="268"/>
9696
<autoresizingMask key="autoresizingMask"/>
9797
<size key="intercellSpacing" width="3" height="2"/>
@@ -153,15 +153,15 @@ Gw
153153
<rect key="frame" x="145" y="17" width="332" height="290"/>
154154
<autoresizingMask key="autoresizingMask"/>
155155
<clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="nNS-kZ-Fe2">
156-
<rect key="frame" x="0.0" y="0.0" width="317" height="275"/>
156+
<rect key="frame" x="0.0" y="0.0" width="332" height="290"/>
157157
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
158158
<subviews>
159159
<textView ambiguous="YES" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="u9b-6e-BFb">
160-
<rect key="frame" x="0.0" y="0.0" width="317" height="275"/>
160+
<rect key="frame" x="0.0" y="0.0" width="332" height="290"/>
161161
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
162162
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
163163
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
164-
<size key="minSize" width="317" height="275"/>
164+
<size key="minSize" width="332" height="290"/>
165165
<size key="maxSize" width="332" height="10000000"/>
166166
<color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
167167
<connections>
@@ -171,7 +171,7 @@ Gw
171171
</subviews>
172172
</clipView>
173173
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="WPy-9F-0mh">
174-
<rect key="frame" x="317" y="0.0" width="15" height="275"/>
174+
<rect key="frame" x="316" y="0.0" width="16" height="290"/>
175175
<autoresizingMask key="autoresizingMask"/>
176176
</scroller>
177177
</scrollView>
@@ -252,15 +252,9 @@ Gw
252252
<segmentedCell key="cell" borderStyle="border" alignment="left" style="smallSquare" trackingMode="momentary" id="fnx-1v-MTC">
253253
<font key="font" metaFont="system"/>
254254
<segments>
255-
<segment image="NSAddTemplate">
256-
<nil key="label"/>
257-
</segment>
258-
<segment image="NSRemoveTemplate" tag="1">
259-
<nil key="label"/>
260-
</segment>
261-
<segment width="402" enabled="NO">
262-
<nil key="label"/>
263-
</segment>
255+
<segment image="NSAddTemplate"/>
256+
<segment image="NSRemoveTemplate" tag="1"/>
257+
<segment width="402" enabled="NO"/>
264258
</segments>
265259
</segmentedCell>
266260
<connections>
@@ -282,7 +276,7 @@ Gw
282276
<rect key="frame" x="1" y="1" width="112" height="321"/>
283277
<autoresizingMask key="autoresizingMask"/>
284278
<subviews>
285-
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="wbH-CA-T9F">
279+
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="wbH-CA-T9F">
286280
<rect key="frame" x="0.0" y="0.0" width="112" height="321"/>
287281
<autoresizingMask key="autoresizingMask"/>
288282
<size key="intercellSpacing" width="3" height="2"/>
@@ -419,7 +413,7 @@ Gw
419413
<rect key="frame" x="1" y="1" width="85" height="228"/>
420414
<autoresizingMask key="autoresizingMask"/>
421415
<subviews>
422-
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="VlQ-mV-pLn">
416+
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="VlQ-mV-pLn">
423417
<rect key="frame" x="0.0" y="0.0" width="85" height="228"/>
424418
<autoresizingMask key="autoresizingMask"/>
425419
<size key="intercellSpacing" width="3" height="2"/>
@@ -498,15 +492,15 @@ Gw
498492
<rect key="frame" x="109" y="104" width="217" height="137"/>
499493
<autoresizingMask key="autoresizingMask"/>
500494
<clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="RDn-zh-dIS">
501-
<rect key="frame" x="0.0" y="0.0" width="202" height="137"/>
495+
<rect key="frame" x="0.0" y="0.0" width="217" height="137"/>
502496
<autoresizingMask key="autoresizingMask"/>
503497
<subviews>
504498
<textView ambiguous="YES" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="1mD-il-bEM">
505-
<rect key="frame" x="0.0" y="0.0" width="202" height="137"/>
499+
<rect key="frame" x="0.0" y="0.0" width="217" height="137"/>
506500
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
507501
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
508502
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
509-
<size key="minSize" width="202" height="137"/>
503+
<size key="minSize" width="217" height="137"/>
510504
<size key="maxSize" width="240" height="10000000"/>
511505
<color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
512506
<connections>

‎V2RayX/AdvancedWindowController.m

+1-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
#import "AdvancedWindowController.h"
88
#import "MutableDeepCopying.h"
99
#include <stdio.h>
10-
#include <unistd.h> // notice this! you need it!
11-
12-
#define RULEINFO (@"When an")
1310

1411
@interface AdvancedWindowController () {
1512
ConfigWindowController* configWindowController;
@@ -322,7 +319,7 @@ - (IBAction)addRemoveRuleSet:(id)sender {
322319
NSAlert* alert = [NSAlert alertWithMessageText:@"Do you want to reset rule sets to original three ones?" defaultButton:@"OK" alternateButton:@"Cancel" otherButton:nil informativeTextWithFormat:@""];
323320
[alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
324321
if (returnCode == NSModalResponseOK) {
325-
self->_routingRuleSets = [@[ROUTING_DIRECT, ROUTING_GLOBAL, ROUTING_BYPASSCN_PRIVATE_APPLE] mutableDeepCopy];
322+
self->_routingRuleSets = [@[ROUTING_GLOBAL, ROUTING_BYPASSCN_PRIVATE_APPLE, ROUTING_DIRECT] mutableDeepCopy];
326323
NSUInteger originalIndex = self->_ruleSetTable.selectedRow;
327324
[self->_ruleSetTable selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO]; // toggle
328325
if (originalIndex == self->_ruleSetTable.selectedRow) {

‎V2RayX/AppDelegate.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ - (void)readDefaults {
254254
}
255255
}
256256

257-
_routingRuleSets = [@[ROUTING_GLOBAL, ROUTING_DIRECT, ROUTING_BYPASSCN_PRIVATE_APPLE] mutableDeepCopy];
257+
_routingRuleSets = [@[ROUTING_GLOBAL, ROUTING_BYPASSCN_PRIVATE_APPLE, ROUTING_DIRECT] mutableDeepCopy];
258258
if ([[defaults objectForKey:@"routingRuleSets"] isKindOfClass:[NSArray class]] && [[defaults objectForKey:@"routingRuleSets"] count] > 0) {
259259
_routingRuleSets = [[defaults objectForKey:@"routingRuleSets"] mutableDeepCopy];
260260
}
@@ -285,7 +285,7 @@ - (void) writeDefaultSettings {
285285
],
286286
@"cusProfiles": @[],
287287
@"enableRestore": @NO,
288-
@"routingRuleSets": @[ROUTING_DIRECT, ROUTING_GLOBAL, ROUTING_BYPASSCN_PRIVATE_APPLE],
288+
@"routingRuleSets": @[ROUTING_GLOBAL, ROUTING_BYPASSCN_PRIVATE_APPLE, ROUTING_DIRECT],
289289
};
290290
for (NSString* key in [defaultSettings allKeys]) {
291291
[[NSUserDefaults standardUserDefaults] setObject:defaultSettings[key] forKey:key];

‎V2RayX/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.5.0</string>
20+
<string>1.5.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>1235</string>
24+
<string>1251</string>
2525
<key>LSMinimumSystemVersion</key>
2626
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2727
<key>LSUIElement</key>

0 commit comments

Comments
 (0)