adjust UI

This commit is contained in:
True Zhuanjia committed 2024-08-22 22:38:53 +08:00
1 parent 69f5fbef31
commit ea78b434d5
6 files changed
+30 -30

No files matched your search

+3 -3
View File
@@ -198,8 +198,8 @@
<color key="tintColor" red="0.6716768742" green="0.61711704730000005" blue="0.99902987480000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="tintColor" red="0.6716768742" green="0.61711704730000005" blue="0.99902987480000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="selectedSegmentTintColor" red="0.6716768742" green="0.61711704730000005" blue="0.99902987480000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="selectedSegmentTintColor" red="0.6716768742" green="0.61711704730000005" blue="0.99902987480000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</segmentedControl> </segmentedControl>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="On-Screen Controls " lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LGV-5y-piG"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="On-Screen Controls &amp; Button " lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LGV-5y-piG">
<rect key="frame" x="16" y="573" width="452" height="21"/> <rect key="frame" x="16" y="573" width="454" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="tintColor" red="0.81533776120000001" green="0.85979419950000002" blue="0.91372549020000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="tintColor" red="0.81533776120000001" green="0.85979419950000002" blue="0.91372549020000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -852,7 +852,7 @@ ICAgICAgICAgICAgICA
<constraint firstAttribute="height" constant="44" id="lQr-5u-g05"/> <constraint firstAttribute="height" constant="44" id="lQr-5u-g05"/>
</constraints> </constraints>
<items> <items>
<navigationItem title="OSC Layout Profiles" id="Q2V-XF-4jq"> <navigationItem title="Controller &amp; Button Profiles" id="Q2V-XF-4jq">
<barButtonItem key="leftBarButtonItem" title="Exit" width="90" style="plain" id="Bhn-IO-Wlt" userLabel="Delete"> <barButtonItem key="leftBarButtonItem" title="Exit" width="90" style="plain" id="Bhn-IO-Wlt" userLabel="Delete">
<connections> <connections>
<action selector="exitTapped:" destination="Atv-Nj-0qv" id="pwG-sO-9he"/> <action selector="exitTapped:" destination="Atv-Nj-0qv" id="pwG-sO-9he"/>
+3 -3
View File
@@ -218,8 +218,8 @@ ICAgICAgICAgICAgIA
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="tintColor" red="0.6716768742" green="0.61711704730000005" blue="0.99902987480000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="tintColor" red="0.6716768742" green="0.61711704730000005" blue="0.99902987480000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</slider> </slider>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="On-Screen Controls " lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HZT-dd-DuQ"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="On-Screen Controls &amp; Buttons " lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HZT-dd-DuQ">
<rect key="frame" x="19" y="570" width="439" height="21"/> <rect key="frame" x="19" y="570" width="436" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
<color key="textColor" red="0.9513210654258728" green="0.97490358352661133" blue="0.99987185001373291" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.9513210654258728" green="0.97490358352661133" blue="0.99987185001373291" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -832,7 +832,7 @@ ICAgICAgICAgICAgIA
<constraint firstAttribute="height" constant="44" id="R90-2b-UrU"/> <constraint firstAttribute="height" constant="44" id="R90-2b-UrU"/>
</constraints> </constraints>
<items> <items>
<navigationItem title="OSC Layout Profiles" id="5pN-Sn-SCN"> <navigationItem title="Controller &amp; Button Profiles" id="5pN-Sn-SCN">
<barButtonItem key="leftBarButtonItem" title="Exit" id="D9X-7p-9oc"> <barButtonItem key="leftBarButtonItem" title="Exit" id="D9X-7p-9oc">
<connections> <connections>
<action selector="exitTapped:" destination="0K8-kQ-xlN" id="Sam-Ct-kqC"/> <action selector="exitTapped:" destination="0K8-kQ-xlN" id="Sam-Ct-kqC"/>
+4 -4
View File
@@ -1515,25 +1515,25 @@
} }
} }
}, },
"On-Screen Controls" : { "On-Screen Controls & Buttons" : {
"extractionState" : "manual", "extractionState" : "manual",
"localizations" : { "localizations" : {
"zh-Hans" : { "zh-Hans" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "屏显虚拟手柄" "value" : "屏显虚拟手柄与按键"
} }
}, },
"zh-Hant" : { "zh-Hant" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "屏显虚拟手柄" "value" : "屏显虚拟手柄与按键"
} }
}, },
"zh-HK" : { "zh-HK" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "屏显虚拟手柄" "value" : "屏显虚拟手柄与按键"
} }
} }
} }
@@ -560,7 +560,7 @@ BOOL isCustomResolution(CGSize res) {
//if (self.layoutOnScreenControlsVC.isBeingPresented == NO) //if (self.layoutOnScreenControlsVC.isBeingPresented == NO)
} }
else{ else{
[self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls"]]; [self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls & Buttons"]];
} }
justEnteredSettingsViewDoNotOpenOscLayoutTool = false; justEnteredSettingsViewDoNotOpenOscLayoutTool = false;
} }
@@ -628,7 +628,7 @@ BOOL isCustomResolution(CGSize res) {
} }
- (void) touchModeChanged { - (void) touchModeChanged {
// Disable on-screen controls in non-relative touch mode // Disable On-Screen Controls & Buttons in non-relative touch mode
bool oscEnabled = ([self.touchModeSelector selectedSegmentIndex] == RELATIVE_TOUCH || [self.touchModeSelector selectedSegmentIndex] == REGULAR_NATIVE_TOUCH) && [self.onscreenControlSelector selectedSegmentIndex] != OnScreenControlsLevelOff; bool oscEnabled = ([self.touchModeSelector selectedSegmentIndex] == RELATIVE_TOUCH || [self.touchModeSelector selectedSegmentIndex] == REGULAR_NATIVE_TOUCH) && [self.onscreenControlSelector selectedSegmentIndex] != OnScreenControlsLevelOff;
bool oscSelectorEnabled = [self.touchModeSelector selectedSegmentIndex] == RELATIVE_TOUCH || [self.touchModeSelector selectedSegmentIndex] == REGULAR_NATIVE_TOUCH; bool oscSelectorEnabled = [self.touchModeSelector selectedSegmentIndex] == RELATIVE_TOUCH || [self.touchModeSelector selectedSegmentIndex] == REGULAR_NATIVE_TOUCH;
bool customOscEnabled = oscEnabled && [self.onscreenControlSelector selectedSegmentIndex] == OnScreenControlsLevelCustom; bool customOscEnabled = oscEnabled && [self.onscreenControlSelector selectedSegmentIndex] == OnScreenControlsLevelCustom;
@@ -652,7 +652,7 @@ BOOL isCustomResolution(CGSize res) {
//if (self.layoutOnScreenControlsVC.isBeingPresented == NO) //if (self.layoutOnScreenControlsVC.isBeingPresented == NO)
} }
else{ else{
[self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls"]]; [self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls & Buttons"]];
} }
[self updateTouchModeLabel]; [self updateTouchModeLabel];
} }
+10 -10
View File
@@ -1256,30 +1256,30 @@
} }
}, },
"LGV-5y-piG.text" : { "LGV-5y-piG.text" : {
"comment" : "Class = \"UILabel\"; text = \"On-Screen Controls \"; ObjectID = \"LGV-5y-piG\";", "comment" : "Class = \"UILabel\"; text = \"On-Screen Controls & Button \"; ObjectID = \"LGV-5y-piG\";",
"extractionState" : "extracted_with_value", "extractionState" : "extracted_with_value",
"localizations" : { "localizations" : {
"en" : { "en" : {
"stringUnit" : { "stringUnit" : {
"state" : "new", "state" : "new",
"value" : "On-Screen Controls " "value" : "On-Screen Controls & Button "
} }
}, },
"zh-Hans" : { "zh-Hans" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "needs_review",
"value" : "屏幕虚拟手柄" "value" : "屏幕虚拟手柄"
} }
}, },
"zh-Hant" : { "zh-Hant" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "needs_review",
"value" : "屏幕虚拟手柄" "value" : "屏幕虚拟手柄"
} }
}, },
"zh-HK" : { "zh-HK" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "needs_review",
"value" : "屏幕虚拟手柄" "value" : "屏幕虚拟手柄"
} }
} }
@@ -1706,31 +1706,31 @@
} }
}, },
"Q2V-XF-4jq.title" : { "Q2V-XF-4jq.title" : {
"comment" : "Class = \"UINavigationItem\"; title = \"OSC Layout Profiles\"; ObjectID = \"Q2V-XF-4jq\";", "comment" : "Class = \"UINavigationItem\"; title = \"Controller & Button Profiles\"; ObjectID = \"Q2V-XF-4jq\";",
"extractionState" : "extracted_with_value", "extractionState" : "extracted_with_value",
"localizations" : { "localizations" : {
"en" : { "en" : {
"stringUnit" : { "stringUnit" : {
"state" : "new", "state" : "new",
"value" : "OSC Layout Profiles" "value" : "Controller & Button Profiles"
} }
}, },
"zh-Hans" : { "zh-Hans" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "虚拟手柄布局文件" "value" : "屏显手柄与按键布局"
} }
}, },
"zh-Hant" : { "zh-Hant" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "虚拟手柄布局文件" "value" : "屏显手柄与按键布局"
} }
}, },
"zh-HK" : { "zh-HK" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "虚拟手柄布局文件" "value" : "屏显手柄与按键布局"
} }
} }
} }
+7 -7
View File
@@ -272,31 +272,31 @@
} }
}, },
"5pN-Sn-SCN.title" : { "5pN-Sn-SCN.title" : {
"comment" : "Class = \"UINavigationItem\"; title = \"OSC Layout Profiles\"; ObjectID = \"5pN-Sn-SCN\";", "comment" : "Class = \"UINavigationItem\"; title = \"Controller & Button Profiles\"; ObjectID = \"5pN-Sn-SCN\";",
"extractionState" : "extracted_with_value", "extractionState" : "extracted_with_value",
"localizations" : { "localizations" : {
"en" : { "en" : {
"stringUnit" : { "stringUnit" : {
"state" : "new", "state" : "new",
"value" : "OSC Layout Profiles" "value" : "Controller & Button Profiles"
} }
}, },
"zh-Hans" : { "zh-Hans" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "虚拟手柄布局文件" "value" : "屏显手柄与按键布局"
} }
}, },
"zh-Hant" : { "zh-Hant" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "虚拟手柄布局文件" "value" : "屏显手柄与按键布局"
} }
}, },
"zh-HK" : { "zh-HK" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "虚拟手柄布局文件" "value" : "屏显手柄与按键布局"
} }
} }
} }
@@ -1130,13 +1130,13 @@
} }
}, },
"HZT-dd-DuQ.text" : { "HZT-dd-DuQ.text" : {
"comment" : "Class = \"UILabel\"; text = \"On-Screen Controls \"; ObjectID = \"HZT-dd-DuQ\";", "comment" : "Class = \"UILabel\"; text = \"On-Screen Controls & Buttons \"; ObjectID = \"HZT-dd-DuQ\";",
"extractionState" : "extracted_with_value", "extractionState" : "extracted_with_value",
"localizations" : { "localizations" : {
"en" : { "en" : {
"stringUnit" : { "stringUnit" : {
"state" : "new", "state" : "new",
"value" : "On-Screen Controls " "value" : "On-Screen Controls & Buttons "
} }
}, },
"zh-Hans" : { "zh-Hans" : {