Merge branch 'meta-dev' into meta
This commit is contained in:
mrFq1
commit
7c8eab8046
|
|
@ -5,8 +5,8 @@
|
|||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/Alamofire/Alamofire",
|
||||
"state" : {
|
||||
"revision" : "bc268c28fb170f494de9e9927c371b8342979ece",
|
||||
"version" : "5.7.1"
|
||||
"revision" : "b2fa556e4e48cbf06cf8c63def138c98f4b811fa",
|
||||
"version" : "5.8.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
"location" : "https://github.com/mrFq1/ClashX-Dashboard",
|
||||
"state" : {
|
||||
"branch" : "dev",
|
||||
"revision" : "b6b8515f488d2fefcf7a29d0726db51de131eea1"
|
||||
"revision" : "4aff8f8d1d05b4dbd58e46ca7322b7662bebf624"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -23,17 +23,8 @@
|
|||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/CocoaLumberjack/CocoaLumberjack",
|
||||
"state" : {
|
||||
"revision" : "0188d31089b5881a269e01777be74c7316924346",
|
||||
"version" : "3.8.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "differencekit",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/ra1028/DifferenceKit.git",
|
||||
"state" : {
|
||||
"revision" : "073b9671ce2b9b5b96398611427a1f929927e428",
|
||||
"version" : "1.3.0"
|
||||
"revision" : "67ec5818a757aba4d7c534e21a905d878d128dbf",
|
||||
"version" : "3.8.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -68,8 +59,8 @@
|
|||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/sindresorhus/KeyboardShortcuts",
|
||||
"state" : {
|
||||
"revision" : "8b1a9ce78c2f35c8a55dcc95897573abd2cc4f6e",
|
||||
"version" : "1.13.0"
|
||||
"revision" : "ac302e21da5883f4bd0490cbd0cb710b08740500",
|
||||
"version" : "1.15.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -140,8 +131,8 @@
|
|||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/siteline/swiftui-introspect",
|
||||
"state" : {
|
||||
"revision" : "ccb973cfff703cba53fb88197413485c060eb26b",
|
||||
"version" : "0.10.0"
|
||||
"revision" : "121c146fe591b1320238d054ae35c81ffa45f45a",
|
||||
"version" : "0.12.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1067,8 +1067,8 @@
|
|||
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="AppIcon" id="Vx1-G4-Xby"/>
|
||||
</imageView>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="prU-ck-7Na">
|
||||
<rect key="frame" x="199" y="165" width="53" height="17"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="ClashX" id="MzG-sW-3g7">
|
||||
<rect key="frame" x="180" y="165" width="91" height="17"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="ClashX Meta" id="MzG-sW-3g7">
|
||||
<font key="font" metaFont="systemBold" size="14"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
|
|
@ -1089,14 +1089,14 @@
|
|||
</attributedString>
|
||||
</textField>
|
||||
<stackView distribution="fill" orientation="horizontal" alignment="top" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gM7-9K-QZN">
|
||||
<rect key="frame" x="48" y="31" width="355" height="40"/>
|
||||
<rect key="frame" x="16" y="31" width="419" height="40"/>
|
||||
<subviews>
|
||||
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Eta-0y-44x">
|
||||
<rect key="frame" x="0.0" y="0.0" width="113" height="40"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="147" height="40"/>
|
||||
<subviews>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8pQ-pI-ToK">
|
||||
<rect key="frame" x="-2" y="24" width="109" height="16"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="GitHub for Clash:" allowsEditingTextAttributes="YES" id="lsq-AW-K0M">
|
||||
<rect key="frame" x="-2" y="24" width="142" height="16"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="GitHub for Clash Meta:" allowsEditingTextAttributes="YES" id="lsq-AW-K0M">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
|
|
@ -1106,8 +1106,8 @@
|
|||
</attributedString>
|
||||
</textField>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kch-A0-ga2">
|
||||
<rect key="frame" x="-2" y="0.0" width="117" height="16"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="GitHub for ClashX:" id="89f-5u-Eo0">
|
||||
<rect key="frame" x="-2" y="0.0" width="151" height="16"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="GitHub for ClashX Meta:" id="89f-5u-Eo0">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
|
|
@ -1127,11 +1127,11 @@
|
|||
</customSpacing>
|
||||
</stackView>
|
||||
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BaZ-rB-g4s">
|
||||
<rect key="frame" x="118" y="0.0" width="237" height="40"/>
|
||||
<rect key="frame" x="152" y="0.0" width="267" height="40"/>
|
||||
<subviews>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="q4m-SB-uHV" customClass="HyperlinkTextField" customModule="ClashX_Meta" customModuleProvider="target">
|
||||
<rect key="frame" x="-2" y="24" width="221" height="16"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="https://github.com/Dreamacro/clash" id="Bej-j7-KKV">
|
||||
<rect key="frame" x="-2" y="24" width="262" height="16"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="https://github.com/MetaCubeX/Clash.Meta" id="Bej-j7-KKV">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
|
|
@ -1140,12 +1140,12 @@
|
|||
<fragment content="#bc-ignore!"/>
|
||||
</attributedString>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="href" value="https://github.com/Dreamacro/clash"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="href" value="https://github.com/MetaCubeX/Clash.Meta"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</textField>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bSi-kz-Dkf" customClass="HyperlinkTextField" customModule="ClashX_Meta" customModuleProvider="target">
|
||||
<rect key="frame" x="-2" y="0.0" width="241" height="16"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="https://github.com/yichengchen/clashX" id="9ox-Fc-Wk3">
|
||||
<rect key="frame" x="-2" y="0.0" width="271" height="16"/>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="https://github.com/MetaCubeX/ClashX.Meta" id="9ox-Fc-Wk3">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
|
|
@ -1154,7 +1154,7 @@
|
|||
<fragment content="#bc-ignore!"/>
|
||||
</attributedString>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="href" value="https://github.com/yichengchen/clashX"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="href" value="https://github.com/MetaCubeX/ClashX.Meta"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</textField>
|
||||
</subviews>
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ enum ClashProxyType: String, Codable, CaseIterable {
|
|||
case hysteria = "Hysteria"
|
||||
case wireguard = "Wireguard"
|
||||
case tuic = "Tuic"
|
||||
case hysteria2 = "Hysteria2"
|
||||
|
||||
case pass = "Pass"
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class AboutViewController: NSViewController {
|
|||
let build = AppVersionUtil.currentBuild
|
||||
let isBeta = AppVersionUtil.isBeta ? " Beta" : ""
|
||||
|
||||
versionLabel.stringValue = "Version: \(version) (\(build))\(isBeta)"
|
||||
versionLabel.stringValue = "Version: \(version) (\(build))"
|
||||
coreVersionLabel.stringValue = "Meta Core: \(clashCoreVersion)"
|
||||
buildTimeLabel.stringValue = "\(commit)-\(branch) \(buildTime)"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue