go back to stream view button on ipad

This commit is contained in:
True Zhuanjia committed 2024-07-11 23:32:17 +08:00
1 parent 802f8714ef
commit 36ba82dd16
6 files changed
+75 -5

No files matched your search

+17 -2
View File
@@ -439,7 +439,7 @@ ICAgICAgICAgICAgICA
<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>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yq8-Hq-UWQ"> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yq8-Hq-UWQ">
<rect key="frame" x="16" y="14" width="457" height="35"/> <rect key="frame" x="251" y="14" width="222" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="Button"/> <state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="tinted" title="Exit"> <buttonConfiguration key="configuration" style="tinted" title="Exit">
@@ -449,7 +449,21 @@ ICAgICAgICAgICAgICA
<color key="baseBackgroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="baseBackgroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</buttonConfiguration> </buttonConfiguration>
<connections> <connections>
<action selector="exitButtonTapped:" destination="BsV-3c-455" eventType="touchUpInside" id="Zj0-OS-Nuq"/> <action selector="exitButtonTapped:" destination="BsV-3c-455" eventType="touchUpInside" id="pUr-cQ-HQK"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uSS-ev-IFe">
<rect key="frame" x="16" y="14" width="222" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="tinted" title="Go Back to Stream View">
<backgroundConfiguration key="background"/>
<fontDescription key="titleFontDescription" type="system" pointSize="17"/>
<color key="baseForegroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="baseBackgroundColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</buttonConfiguration>
<connections>
<action selector="goBackToStreamViewButtonTapped:" destination="BsV-3c-455" eventType="touchUpInside" id="Xw6-oO-5Za"/>
</connections> </connections>
</button> </button>
</subviews> </subviews>
@@ -464,6 +478,7 @@ ICAgICAgICAgICAgICA
<outlet property="codecSelector" destination="aFy-0w-YPe" id="DlU-0l-gwz"/> <outlet property="codecSelector" destination="aFy-0w-YPe" id="DlU-0l-gwz"/>
<outlet property="framePacingSelector" destination="7va-uJ-IfD" id="Tbv-s2-u2k"/> <outlet property="framePacingSelector" destination="7va-uJ-IfD" id="Tbv-s2-u2k"/>
<outlet property="framerateSelector" destination="lGK-vl-pdw" id="Kc8-Zv-hdm"/> <outlet property="framerateSelector" destination="lGK-vl-pdw" id="Kc8-Zv-hdm"/>
<outlet property="goBackToStreamViewButton" destination="uSS-ev-IFe" id="2MV-Fl-nIz"/>
<outlet property="hdrSelector" destination="OA2-SA-bBO" id="uUL-mc-4We"/> <outlet property="hdrSelector" destination="OA2-SA-bBO" id="uUL-mc-4We"/>
<outlet property="keyboardToggleFingerNumLabel" destination="nh6-cn-z23" id="ong-b0-2ST"/> <outlet property="keyboardToggleFingerNumLabel" destination="nh6-cn-z23" id="ong-b0-2ST"/>
<outlet property="keyboardToggleFingerNumSlider" destination="4wJ-Gd-Dmp" id="fbp-o8-KRA"/> <outlet property="keyboardToggleFingerNumSlider" destination="4wJ-Gd-Dmp" id="fbp-o8-KRA"/>
@@ -916,6 +916,7 @@ static NSMutableSet* hostList;
[settingsViewController.hdrSelector setEnabled:!self.settingsExpandedInStreamView]; [settingsViewController.hdrSelector setEnabled:!self.settingsExpandedInStreamView];
[settingsViewController.framePacingSelector setEnabled:!self.settingsExpandedInStreamView]; [settingsViewController.framePacingSelector setEnabled:!self.settingsExpandedInStreamView];
[settingsViewController.btMouseSelector setEnabled:!self.settingsExpandedInStreamView]; [settingsViewController.btMouseSelector setEnabled:!self.settingsExpandedInStreamView];
[settingsViewController.goBackToStreamViewButton setEnabled:self.settingsExpandedInStreamView];
if (position == FrontViewPositionLeft) { if (position == FrontViewPositionLeft) {
[settingsViewController saveSettings]; [settingsViewController saveSettings];
@@ -626,10 +626,10 @@ const int FrontViewPositionNone = 0xff;
_frontViewPosition = FrontViewPositionLeft; _frontViewPosition = FrontViewPositionLeft;
_rearViewPosition = FrontViewPositionLeft; _rearViewPosition = FrontViewPositionLeft;
_rightViewPosition = FrontViewPositionLeft; _rightViewPosition = FrontViewPositionLeft;
_rearViewRevealWidth = 510.0f; _rearViewRevealWidth = 492.0f;
_rearViewRevealOverdraw = 60.0f; _rearViewRevealOverdraw = 60.0f;
_rearViewRevealDisplacement = 40.0f; _rearViewRevealDisplacement = 40.0f;
_rightViewRevealWidth = 510.0f; _rightViewRevealWidth = 492.0f;
_rightViewRevealOverdraw = 60.0f; _rightViewRevealOverdraw = 60.0f;
_rightViewRevealDisplacement = 40.0f; _rightViewRevealDisplacement = 40.0f;
_bounceBackOnOverdraw = YES; _bounceBackOnOverdraw = YES;
@@ -45,6 +45,7 @@
@property (strong, nonatomic) IBOutlet UILabel *touchPointerVelocityFactorUILabel; @property (strong, nonatomic) IBOutlet UILabel *touchPointerVelocityFactorUILabel;
@property (strong, nonatomic) IBOutlet UISlider *mousePointerVelocityFactorSlider; @property (strong, nonatomic) IBOutlet UISlider *mousePointerVelocityFactorSlider;
@property (strong, nonatomic) IBOutlet UILabel *mousePointerVelocityFactorUILabel; @property (strong, nonatomic) IBOutlet UILabel *mousePointerVelocityFactorUILabel;
@property (strong, nonatomic) IBOutlet UIButton *goBackToStreamViewButton;
@property (strong, nonatomic) LayoutOnScreenControlsViewController *layoutOnScreenControlsVC; @property (strong, nonatomic) LayoutOnScreenControlsViewController *layoutOnScreenControlsVC;
@property (nonatomic, strong) MainFrameViewController *mainFrameViewController; @property (nonatomic, strong) MainFrameViewController *mainFrameViewController;
@property (nonatomic, strong) CustomEdgeSwipeGestureRecognizer *exitSwipeRecognizer; @property (nonatomic, strong) CustomEdgeSwipeGestureRecognizer *exitSwipeRecognizer;
@@ -222,7 +222,12 @@ BOOL isCustomResolution(CGSize res) {
[[NSNotificationCenter defaultCenter] postNotificationName:@"SessionDisconnectedBySettingsViewNotification" object:self]; [[NSNotificationCenter defaultCenter] postNotificationName:@"SessionDisconnectedBySettingsViewNotification" object:self];
} }
- (IBAction)goBackToStreamViewButtonTapped:(id)sender {
[self simulateSettingsButtonPress];
}
/*
- (void)addExitButtonOnTop{ - (void)addExitButtonOnTop{
UIButton *exitButton = [UIButton buttonWithType:UIButtonTypeSystem]; UIButton *exitButton = [UIButton buttonWithType:UIButtonTypeSystem];
[exitButton setTitle:@"Exit" forState:UIControlStateNormal]; [exitButton setTitle:@"Exit" forState:UIControlStateNormal];
@@ -234,7 +239,7 @@ BOOL isCustomResolution(CGSize res) {
[exitButton addTarget:self action:@selector(exitButtonTapped) forControlEvents:UIControlEventTouchUpInside]; [exitButton addTarget:self action:@selector(exitButtonTapped) forControlEvents:UIControlEventTouchUpInside];
[self.view addSubview:exitButton]; [self.view addSubview:exitButton];
exitButton.frame = CGRectMake(0, 20, 200, 50); // Adjust Y and height as needed exitButton.frame = CGRectMake(0, 20, 200, 50); // Adjust Y and height as needed
} }*/
- (void)viewDidLoad { - (void)viewDidLoad {
+48
View File
@@ -1837,6 +1837,54 @@
} }
} }
}, },
"uSS-ev-IFe.configuration.title" : {
"comment" : "Class = \"UIButton\"; configuration.title = \"Go Back to Stream View\"; ObjectID = \"uSS-ev-IFe\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Go Back to Stream View"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "返回串流"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
"value" : "返回串流"
}
},
"zh-HK" : {
"stringUnit" : {
"state" : "translated",
"value" : "返回串流"
}
}
}
},
"uSS-ev-IFe.normalTitle" : {
"comment" : "Class = \"UIButton\"; normalTitle = \"Button\"; ObjectID = \"uSS-ev-IFe\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Button"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "返回串流"
}
}
}
},
"WDY-9o-6Hb.segmentTitles[0]" : { "WDY-9o-6Hb.segmentTitles[0]" : {
"comment" : "Class = \"UISegmentedControl\"; WDY-9o-6Hb.segmentTitles[0] = \"No\"; ObjectID = \"WDY-9o-6Hb\";", "comment" : "Class = \"UISegmentedControl\"; WDY-9o-6Hb.segmentTitles[0] = \"No\"; ObjectID = \"WDY-9o-6Hb\";",
"extractionState" : "extracted_with_value", "extractionState" : "extracted_with_value",