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

Commit 0b82ea1

Browse files
CenmrevCenmrev
committed
show core version; fix #189 
1 parent 33e930b commit 0b82ea1

4 files changed

+56
-26
lines changed

‎V2RayX/ConfigWindow.xib

+34-24
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<outlet property="networkButton" destination="tMD-b4-w2E" id="MLa-PK-H4t"/>
2020
<outlet property="portField" destination="vAX-58-HRK" id="l6R-dx-TNq"/>
2121
<outlet property="profileTable" destination="fje-9q-W5F" id="qQT-rE-cPV"/>
22+
<outlet property="versionField" destination="yx5-HK-GpF" id="Dpi-oq-T9A"/>
2223
<outlet property="vmessSecurityButton" destination="Dbo-ml-2p8" id="sSo-w3-Yom"/>
2324
<outlet property="window" destination="QvC-M9-y7g" id="DXu-va-1Ry"/>
2425
</connections>
@@ -28,14 +29,14 @@
2829
<window title="V2RayX" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" animationBehavior="default" id="QvC-M9-y7g">
2930
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
3031
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
31-
<rect key="contentRect" x="196" y="240" width="551" height="479"/>
32+
<rect key="contentRect" x="196" y="240" width="551" height="474"/>
3233
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
3334
<view key="contentView" id="EiT-Mj-1SZ">
34-
<rect key="frame" x="0.0" y="0.0" width="551" height="479"/>
35+
<rect key="frame" x="0.0" y="0.0" width="551" height="474"/>
3536
<autoresizingMask key="autoresizingMask"/>
3637
<subviews>
3738
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HKJ-PD-NRo">
38-
<rect key="frame" x="18" y="439" width="117" height="17"/>
39+
<rect key="frame" x="18" y="434" width="117" height="17"/>
3940
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
4041
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Local Socks5 Port:" id="FRd-8H-tqe">
4142
<font key="font" metaFont="system"/>
@@ -44,7 +45,7 @@
4445
</textFieldCell>
4546
</textField>
4647
<textField verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2do-qQ-ANK">
47-
<rect key="frame" x="141" y="436" width="74" height="22"/>
48+
<rect key="frame" x="141" y="431" width="74" height="22"/>
4849
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
4950
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="jN0-7e-Eex">
5051
<numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="mKI-i3-kT1"/>
@@ -62,7 +63,7 @@
6263
</connections>
6364
</textField>
6465
<textField verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aVm-xn-0cZ">
65-
<rect key="frame" x="141" y="410" width="74" height="22"/>
66+
<rect key="frame" x="141" y="405" width="74" height="22"/>
6667
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
6768
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="El5-ad-Gfy">
6869
<numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="0tK-Bn-uaM"/>
@@ -80,7 +81,7 @@
8081
</connections>
8182
</textField>
8283
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZkQ-S8-swW">
83-
<rect key="frame" x="239" y="438" width="102" height="18"/>
84+
<rect key="frame" x="239" y="433" width="102" height="18"/>
8485
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
8586
<buttonCell key="cell" type="check" title="Support UDP" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="pEW-Gw-3ph">
8687
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -91,7 +92,7 @@
9192
</connections>
9293
</button>
9394
<textField horizontalHuggingPriority="251" verticalHuggingPriority="749" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="reb-n0-jKg">
94-
<rect key="frame" x="18" y="384" width="382" height="17"/>
95+
<rect key="frame" x="18" y="379" width="382" height="17"/>
9596
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
9697
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="If the local port is changed, the pac file also needs manual modification." id="nRL-kf-uam">
9798
<font key="font" metaFont="smallSystem"/>
@@ -100,7 +101,7 @@
100101
</textFieldCell>
101102
</textField>
102103
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lgk-bl-Vga">
103-
<rect key="frame" x="18" y="359" width="35" height="17"/>
104+
<rect key="frame" x="18" y="354" width="35" height="17"/>
104105
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
105106
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="DNS:" id="sKs-KL-14B">
106107
<font key="font" metaFont="system"/>
@@ -109,7 +110,7 @@
109110
</textFieldCell>
110111
</textField>
111112
<textField verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mXE-pr-Ddc">
112-
<rect key="frame" x="59" y="357" width="401" height="22"/>
113+
<rect key="frame" x="59" y="352" width="401" height="22"/>
113114
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
114115
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="jCM-1U-byE">
115116
<font key="font" metaFont="system"/>
@@ -121,7 +122,7 @@
121122
</connections>
122123
</textField>
123124
<textField horizontalHuggingPriority="251" verticalHuggingPriority="749" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ecy-ho-llN">
124-
<rect key="frame" x="18" y="334" width="382" height="17"/>
125+
<rect key="frame" x="18" y="329" width="382" height="17"/>
125126
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
126127
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="seperated by comma(,)" id="5N8-C0-QJV">
127128
<font key="font" metaFont="smallSystem"/>
@@ -130,7 +131,7 @@
130131
</textFieldCell>
131132
</textField>
132133
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tIh-r8-4RU">
133-
<rect key="frame" x="18" y="309" width="93" height="17"/>
134+
<rect key="frame" x="18" y="304" width="93" height="17"/>
134135
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
135136
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="V2Ray Servers" id="UpZ-NV-drp">
136137
<font key="font" metaFont="system"/>
@@ -139,7 +140,7 @@
139140
</textFieldCell>
140141
</textField>
141142
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="18l-QB-TVo">
142-
<rect key="frame" x="20" y="118" width="140" height="183"/>
143+
<rect key="frame" x="20" y="113" width="140" height="183"/>
143144
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
144145
<clipView key="contentView" ambiguous="YES" id="0kH-bt-ahk">
145146
<rect key="frame" x="1" y="1" width="138" height="181"/>
@@ -183,7 +184,7 @@
183184
</scroller>
184185
</scrollView>
185186
<box fixedFrame="YES" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="2Sy-sC-XkW">
186-
<rect key="frame" x="169" y="95" width="365" height="208"/>
187+
<rect key="frame" x="169" y="90" width="365" height="208"/>
187188
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
188189
<view key="contentView" ambiguous="YES" id="de9-ID-Jky">
189190
<rect key="frame" x="3" y="3" width="359" height="202"/>
@@ -440,7 +441,7 @@
440441
</view>
441442
</box>
442443
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HGo-i2-l4d">
443-
<rect key="frame" x="371" y="438" width="119" height="18"/>
444+
<rect key="frame" x="371" y="433" width="119" height="18"/>
444445
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
445446
<buttonCell key="cell" type="check" title="Share Over LAN" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="TXX-VD-4P4">
446447
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -451,7 +452,7 @@
451452
</connections>
452453
</button>
453454
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jbe-gs-AvT">
454-
<rect key="frame" x="18" y="413" width="100" height="17"/>
455+
<rect key="frame" x="18" y="408" width="100" height="17"/>
455456
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
456457
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Local Http Port:" id="eGi-xf-mFk">
457458
<font key="font" metaFont="system"/>
@@ -460,7 +461,7 @@
460461
</textFieldCell>
461462
</textField>
462463
<popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WBJ-AN-z5m">
463-
<rect key="frame" x="87" y="14" width="85" height="26"/>
464+
<rect key="frame" x="84" y="49" width="85" height="26"/>
464465
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
465466
<popUpButtonCell key="cell" type="push" title="none" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="foI-bt-EyF" id="7bE-Sh-fzE">
466467
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -484,7 +485,7 @@
484485
</connections>
485486
</popUpButton>
486487
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FaF-dM-uPs">
487-
<rect key="frame" x="18" y="20" width="62" height="17"/>
488+
<rect key="frame" x="18" y="54" width="62" height="17"/>
488489
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
489490
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Log level:" id="Vo6-Qu-ybt">
490491
<font key="font" metaFont="system"/>
@@ -493,7 +494,7 @@
493494
</textFieldCell>
494495
</textField>
495496
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Uv6-cA-e87">
496-
<rect key="frame" x="178" y="18" width="62" height="17"/>
497+
<rect key="frame" x="181" y="53" width="62" height="17"/>
497498
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
498499
<buttonCell key="cell" type="inline" title="show log" bezelStyle="inline" alignment="center" borderStyle="border" inset="2" id="gkD-dq-Peq">
499500
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -504,9 +505,9 @@
504505
</connections>
505506
</button>
506507
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3p9-Ay-GbW">
507-
<rect key="frame" x="14" y="51" width="235" height="32"/>
508+
<rect key="frame" x="330" y="46" width="207" height="32"/>
508509
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
509-
<buttonCell key="cell" type="push" title="Import customized config files..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="MOG-35-OP1">
510+
<buttonCell key="cell" type="push" title="Import customized config..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="MOG-35-OP1">
510511
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
511512
<font key="font" metaFont="system"/>
512513
</buttonCell>
@@ -515,7 +516,7 @@
515516
</connections>
516517
</button>
517518
<button toolTip="Restart V2Ray and connected to the selected server above" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fnz-Bw-lGu">
518-
<rect key="frame" x="455" y="11" width="82" height="32"/>
519+
<rect key="frame" x="455" y="13" width="82" height="32"/>
519520
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
520521
<buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="OfO-BZ-76k">
521522
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -529,7 +530,7 @@ DQ
529530
</connections>
530531
</button>
531532
<button toolTip="Discard all the changes" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sO7-Gh-BBo">
532-
<rect key="frame" x="373" y="11" width="82" height="32"/>
533+
<rect key="frame" x="373" y="13" width="82" height="32"/>
533534
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
534535
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mkg-dU-bRq">
535536
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -543,7 +544,7 @@ Gw
543544
</connections>
544545
</button>
545546
<segmentedControl verticalHuggingPriority="750" fixedFrame="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Pgq-bB-pvc">
546-
<rect key="frame" x="20" y="98" width="140" height="23"/>
547+
<rect key="frame" x="20" y="93" width="140" height="23"/>
547548
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
548549
<segmentedCell key="cell" borderStyle="border" alignment="left" style="smallSquare" trackingMode="momentary" id="TAd-3w-qoq">
549550
<font key="font" metaFont="system"/>
@@ -562,9 +563,18 @@ Gw
562563
<action selector="addRemoveServer:" target="-2" id="o8X-ua-ltZ"/>
563564
</connections>
564565
</segmentedControl>
566+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yx5-HK-GpF">
567+
<rect key="frame" x="18" y="24" width="355" height="14"/>
568+
<autoresizingMask key="autoresizingMask"/>
569+
<textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Eo2-Yu-0N0">
570+
<font key="font" metaFont="smallSystem"/>
571+
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
572+
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
573+
</textFieldCell>
574+
</textField>
565575
</subviews>
566576
</view>
567-
<point key="canvasLocation" x="174.5" y="181.5"/>
577+
<point key="canvasLocation" x="150.5" y="234"/>
568578
</window>
569579
<userDefaultsController representsSharedInstance="YES" id="I7n-bF-Cph"/>
570580
<menuItem title="Item" id="tLs-gB-gFx">

‎V2RayX/ConfigWindowController.h

+1
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,6 @@
9191
@property (nonatomic) NSMutableArray *profiles;
9292
@property (nonatomic) NSMutableArray *cusProfiles;
9393

94+
@property (weak) IBOutlet NSTextField *versionField;
9495

9596
@end

0 commit comments

Comments
 (0)