adjust UI
This commit is contained in:
@@ -198,8 +198,8 @@
|
||||
<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"/>
|
||||
</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">
|
||||
<rect key="frame" x="16" y="573" width="452" height="21"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="On-Screen Controls & Button " lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LGV-5y-piG">
|
||||
<rect key="frame" x="16" y="573" width="454" height="21"/>
|
||||
<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"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
@@ -852,7 +852,7 @@ ICAgICAgICAgICAgICA
|
||||
<constraint firstAttribute="height" constant="44" id="lQr-5u-g05"/>
|
||||
</constraints>
|
||||
<items>
|
||||
<navigationItem title="OSC Layout Profiles" id="Q2V-XF-4jq">
|
||||
<navigationItem title="Controller & Button Profiles" id="Q2V-XF-4jq">
|
||||
<barButtonItem key="leftBarButtonItem" title="Exit" width="90" style="plain" id="Bhn-IO-Wlt" userLabel="Delete">
|
||||
<connections>
|
||||
<action selector="exitTapped:" destination="Atv-Nj-0qv" id="pwG-sO-9he"/>
|
||||
|
||||
@@ -218,8 +218,8 @@ ICAgICAgICAgICAgIA
|
||||
<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"/>
|
||||
</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">
|
||||
<rect key="frame" x="19" y="570" width="439" height="21"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="On-Screen Controls & Buttons " lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HZT-dd-DuQ">
|
||||
<rect key="frame" x="19" y="570" width="436" height="21"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<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"/>
|
||||
@@ -832,7 +832,7 @@ ICAgICAgICAgICAgIA
|
||||
<constraint firstAttribute="height" constant="44" id="R90-2b-UrU"/>
|
||||
</constraints>
|
||||
<items>
|
||||
<navigationItem title="OSC Layout Profiles" id="5pN-Sn-SCN">
|
||||
<navigationItem title="Controller & Button Profiles" id="5pN-Sn-SCN">
|
||||
<barButtonItem key="leftBarButtonItem" title="Exit" id="D9X-7p-9oc">
|
||||
<connections>
|
||||
<action selector="exitTapped:" destination="0K8-kQ-xlN" id="Sam-Ct-kqC"/>
|
||||
|
||||
@@ -1515,25 +1515,25 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"On-Screen Controls" : {
|
||||
"On-Screen Controls & Buttons" : {
|
||||
"extractionState" : "manual",
|
||||
"localizations" : {
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "屏显虚拟手柄"
|
||||
"value" : "屏显虚拟手柄与按键"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "屏显虚拟手柄"
|
||||
"value" : "屏显虚拟手柄与按键"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "屏显虚拟手柄"
|
||||
"value" : "屏显虚拟手柄与按键"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -560,7 +560,7 @@ BOOL isCustomResolution(CGSize res) {
|
||||
//if (self.layoutOnScreenControlsVC.isBeingPresented == NO)
|
||||
}
|
||||
else{
|
||||
[self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls"]];
|
||||
[self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls & Buttons"]];
|
||||
}
|
||||
justEnteredSettingsViewDoNotOpenOscLayoutTool = false;
|
||||
}
|
||||
@@ -628,7 +628,7 @@ BOOL isCustomResolution(CGSize res) {
|
||||
}
|
||||
|
||||
- (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 oscSelectorEnabled = [self.touchModeSelector selectedSegmentIndex] == RELATIVE_TOUCH || [self.touchModeSelector selectedSegmentIndex] == REGULAR_NATIVE_TOUCH;
|
||||
bool customOscEnabled = oscEnabled && [self.onscreenControlSelector selectedSegmentIndex] == OnScreenControlsLevelCustom;
|
||||
@@ -652,7 +652,7 @@ BOOL isCustomResolution(CGSize res) {
|
||||
//if (self.layoutOnScreenControlsVC.isBeingPresented == NO)
|
||||
}
|
||||
else{
|
||||
[self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls"]];
|
||||
[self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls & Buttons"]];
|
||||
}
|
||||
[self updateTouchModeLabel];
|
||||
}
|
||||
|
||||
@@ -1256,30 +1256,30 @@
|
||||
}
|
||||
},
|
||||
"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",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "On-Screen Controls "
|
||||
"value" : "On-Screen Controls & Button "
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"state" : "needs_review",
|
||||
"value" : "屏幕虚拟手柄"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"state" : "needs_review",
|
||||
"value" : "屏幕虚拟手柄"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"state" : "needs_review",
|
||||
"value" : "屏幕虚拟手柄"
|
||||
}
|
||||
}
|
||||
@@ -1706,31 +1706,31 @@
|
||||
}
|
||||
},
|
||||
"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",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "OSC Layout Profiles"
|
||||
"value" : "Controller & Button Profiles"
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "虚拟手柄布局文件"
|
||||
"value" : "屏显手柄与按键布局"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "虚拟手柄布局文件"
|
||||
"value" : "屏显手柄与按键布局"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "虚拟手柄布局文件"
|
||||
"value" : "屏显手柄与按键布局"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -272,31 +272,31 @@
|
||||
}
|
||||
},
|
||||
"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",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "OSC Layout Profiles"
|
||||
"value" : "Controller & Button Profiles"
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "虚拟手柄布局文件"
|
||||
"value" : "屏显手柄与按键布局"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "虚拟手柄布局文件"
|
||||
"value" : "屏显手柄与按键布局"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "虚拟手柄布局文件"
|
||||
"value" : "屏显手柄与按键布局"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1130,13 +1130,13 @@
|
||||
}
|
||||
},
|
||||
"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",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "On-Screen Controls "
|
||||
"value" : "On-Screen Controls & Buttons "
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
|
||||
Reference in New Issue
Block a user