diff --git a/Limelight/Base.lproj/iPad.storyboard b/Limelight/Base.lproj/iPad.storyboard
index 26cdb543..e7a94af8 100644
--- a/Limelight/Base.lproj/iPad.storyboard
+++ b/Limelight/Base.lproj/iPad.storyboard
@@ -59,7 +59,7 @@
-
+
-
+
+
@@ -513,11 +531,12 @@ ICAgICAgICAgICAgICA
+
+
+
+
-
-
-
diff --git a/Limelight/Base.lproj/iPhone.storyboard b/Limelight/Base.lproj/iPhone.storyboard
index d8d4878b..ea8d8dbc 100644
--- a/Limelight/Base.lproj/iPhone.storyboard
+++ b/Limelight/Base.lproj/iPhone.storyboard
@@ -219,14 +219,14 @@ ICAgICAgICAgICAgIA
-
+
@@ -238,14 +238,14 @@ ICAgICAgICAgICAgIA
-
+
@@ -279,14 +279,14 @@ ICAgICAgICAgICAgIA
-
+
@@ -296,14 +296,14 @@ ICAgICAgICAgICAgIA
-
+
@@ -313,14 +313,14 @@ ICAgICAgICAgICAgIA
-
+
@@ -330,14 +330,14 @@ ICAgICAgICAgICAgIA
-
+
@@ -349,14 +349,14 @@ ICAgICAgICAgICAgIA
-
+
@@ -366,14 +366,14 @@ ICAgICAgICAgICAgIA
-
+
@@ -383,14 +383,14 @@ ICAgICAgICAgICAgIA
-
+
@@ -400,14 +400,14 @@ ICAgICAgICAgICAgIA
-
+
@@ -416,8 +416,8 @@ ICAgICAgICAgICAgIA
-
-
+
@@ -510,6 +527,7 @@ ICAgICAgICAgICAgIA
+
@@ -530,11 +548,12 @@ ICAgICAgICAgICAgIA
+
+
+
+
-
-
-
diff --git a/Limelight/Database/DataManager.h b/Limelight/Database/DataManager.h
index 74132d3d..f164c79d 100644
--- a/Limelight/Database/DataManager.h
+++ b/Limelight/Database/DataManager.h
@@ -20,8 +20,8 @@
audioConfig:(NSInteger)audioConfig
onscreenControls:(NSInteger)onscreenControls
keyboardToggleFingers:(NSInteger)keyboardToggleFingers
- swipeExitScreenEdge:(NSInteger)swipeExitScreenEdge
- swipeToExitDistance:(CGFloat)swipeToExitDistance
+ slideToSettingsScreenEdge:(NSInteger)slideToSettingsScreenEdge
+ slideToSettingsDistance:(CGFloat)slideToSettingsDistance
pointerVelocityModeDivider:(CGFloat)pointerVelocityModeDivider
touchPointerVelocityFactor:(CGFloat)touchPointerVelocityFactor
mousePointerVelocityFactor:(CGFloat)mousePointerVelocityFactor
diff --git a/Limelight/Database/DataManager.m b/Limelight/Database/DataManager.m
index 722a4fbe..5979fcb3 100644
--- a/Limelight/Database/DataManager.m
+++ b/Limelight/Database/DataManager.m
@@ -59,8 +59,8 @@
audioConfig:(NSInteger)audioConfig
onscreenControls:(NSInteger)onscreenControls
keyboardToggleFingers:(NSInteger)keyboardToggleFingers
- swipeExitScreenEdge:(NSInteger)swipeExitScreenEdge
- swipeToExitDistance:(CGFloat)swipeToExitDistance
+ slideToSettingsScreenEdge:(NSInteger)slideToSettingsScreenEdge
+ slideToSettingsDistance:(CGFloat)slideToSettingsDistance
pointerVelocityModeDivider:(CGFloat)pointerVelocityModeDivider
touchPointerVelocityFactor:(CGFloat)touchPointerVelocityFactor
mousePointerVelocityFactor:(CGFloat)mousePointerVelocityFactor
@@ -88,8 +88,8 @@
settingsToSave.audioConfig = [NSNumber numberWithInteger:audioConfig];
settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
settingsToSave.keyboardToggleFingers = [NSNumber numberWithInteger:(uint16_t)keyboardToggleFingers];
- settingsToSave.swipeExitScreenEdge = [NSNumber numberWithInteger:(uint32_t)swipeExitScreenEdge];
- settingsToSave.swipeToExitDistance = [NSNumber numberWithFloat:swipeToExitDistance];
+ settingsToSave.slideToSettingsScreenEdge = [NSNumber numberWithInteger:(uint32_t)slideToSettingsScreenEdge];
+ settingsToSave.slideToSettingsDistance = [NSNumber numberWithFloat:slideToSettingsDistance];
settingsToSave.pointerVelocityModeDivider = [NSNumber numberWithFloat:pointerVelocityModeDivider];
settingsToSave.touchPointerVelocityFactor = [NSNumber numberWithFloat:touchPointerVelocityFactor];
settingsToSave.mousePointerVelocityFactor = [NSNumber numberWithFloat:mousePointerVelocityFactor];
diff --git a/Limelight/Database/TemporarySettings.h b/Limelight/Database/TemporarySettings.h
index 40da15d3..a83d7e72 100644
--- a/Limelight/Database/TemporarySettings.h
+++ b/Limelight/Database/TemporarySettings.h
@@ -24,8 +24,8 @@
@property (nonatomic, retain) NSNumber * audioConfig;
@property (nonatomic, retain) NSNumber * onscreenControls;
@property (nonatomic, retain) NSNumber * keyboardToggleFingers;
-@property (nonatomic, retain) NSNumber * swipeExitScreenEdge;
-@property (nonatomic, retain) NSNumber * swipeToExitDistance;
+@property (nonatomic, retain) NSNumber * slideToSettingsScreenEdge;
+@property (nonatomic, retain) NSNumber * slideToSettingsDistance;
@property (nonatomic, retain) NSNumber * touchPointerVelocityFactor;
@property (nonatomic, retain) NSNumber * mousePointerVelocityFactor;
@property (nonatomic, retain) NSNumber * pointerVelocityModeDivider;
diff --git a/Limelight/Database/TemporarySettings.m b/Limelight/Database/TemporarySettings.m
index a60580e3..2b509cb8 100644
--- a/Limelight/Database/TemporarySettings.m
+++ b/Limelight/Database/TemporarySettings.m
@@ -87,8 +87,8 @@
self.touchMode = settings.touchMode;
self.statsOverlay = settings.statsOverlay;
self.keyboardToggleFingers = settings.keyboardToggleFingers;
- self.swipeExitScreenEdge = settings.swipeExitScreenEdge;
- self.swipeToExitDistance = settings.swipeToExitDistance;
+ self.slideToSettingsScreenEdge = settings.slideToSettingsScreenEdge;
+ self.slideToSettingsDistance = settings.slideToSettingsDistance;
self.liftStreamViewForKeyboard = settings.liftStreamViewForKeyboard;
self.showKeyboardToolbar = settings.showKeyboardToolbar;
self.touchPointerVelocityFactor = settings.touchPointerVelocityFactor;
diff --git a/Limelight/Limelight.xcdatamodeld/Moonlight v1.10.xcdatamodel/contents b/Limelight/Limelight.xcdatamodeld/Moonlight v1.10.xcdatamodel/contents
index 2638bf44..d9f5f0f4 100644
--- a/Limelight/Limelight.xcdatamodeld/Moonlight v1.10.xcdatamodel/contents
+++ b/Limelight/Limelight.xcdatamodeld/Moonlight v1.10.xcdatamodel/contents
@@ -39,10 +39,10 @@
+
+
-
-
diff --git a/Limelight/Localization/Localizable.xcstrings b/Limelight/Localization/Localizable.xcstrings
index ed191897..fe96f330 100644
--- a/Limelight/Localization/Localizable.xcstrings
+++ b/Limelight/Localization/Localizable.xcstrings
@@ -2004,6 +2004,29 @@
}
}
},
+ "Slide Distance for in-Stream Menu: %.2f * screen-width" : {
+ "extractionState" : "manual",
+ "localizations" : {
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "串流中打开菜单滑动距离: %.2f x 屏幕宽度"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "串流中打开菜单滑动距离: %.2f x 屏幕宽度"
+ }
+ },
+ "zh-HK" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "串流中打开菜单滑动距离: %.2f x 屏幕宽度"
+ }
+ }
+ }
+ },
"Slow connection to PC, Reduce your bitrate" : {
"extractionState" : "manual",
"localizations" : {
@@ -2050,29 +2073,6 @@
}
}
},
- "Swipe & Exit Distance: %.2f * screen-width" : {
- "extractionState" : "manual",
- "localizations" : {
- "zh-Hans" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "退出远程桌面的滑动距离: %.2f x 屏幕宽度"
- }
- },
- "zh-Hant" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "退出远程桌面的滑动距离: %.2f x 屏幕宽度"
- }
- },
- "zh-HK" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "退出远程桌面的滑动距离: %.2f x 屏幕宽度"
- }
- }
- }
- },
"Tap 4 fingers to change on-screen controller layout in stream view" : {
"extractionState" : "manual",
"localizations" : {
diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m
index 315a751b..5cfe7342 100644
--- a/Limelight/ViewControllers/MainFrameViewController.m
+++ b/Limelight/ViewControllers/MainFrameViewController.m
@@ -44,7 +44,6 @@
@implementation MainFrameViewController {
UILabel* waterMark;
//CGFloat recordedScreenWidth;
- CustomEdgeSwipeGestureRecognizer* _exitSwipeRecognizer;
NSOperationQueue* _opQueue;
TemporaryHost* _selectedHost;
BOOL _showHiddenApps;
diff --git a/Limelight/ViewControllers/SettingsViewController.h b/Limelight/ViewControllers/SettingsViewController.h
index 56ff7981..8b30b80d 100644
--- a/Limelight/ViewControllers/SettingsViewController.h
+++ b/Limelight/ViewControllers/SettingsViewController.h
@@ -36,9 +36,11 @@
@property (strong, nonatomic) IBOutlet UISlider *keyboardToggleFingerNumSlider;
@property (strong, nonatomic) IBOutlet UISegmentedControl *liftStreamViewForKeyboardSelector;
@property (strong, nonatomic) IBOutlet UISegmentedControl *showKeyboardToolbarSelector;
-@property (strong, nonatomic) IBOutlet UISegmentedControl *swipeExitScreenEdgeSelector;
-@property (strong, nonatomic) IBOutlet UILabel *swipeToExitDistanceUILabel;
-@property (strong, nonatomic) IBOutlet UISlider *swipeToExitDistanceSlider;
+@property (strong, nonatomic) IBOutlet UISegmentedControl *slideToSettingsScreenEdgeSelector;
+@property (strong, nonatomic) IBOutlet UILabel *slideToSettingsScreenEdgeUILabel;
+@property (strong, nonatomic) IBOutlet UISegmentedControl *cmdToolScreenEdgeSelector;
+@property (strong, nonatomic) IBOutlet UILabel *slideToSettingsDistanceUILabel;
+@property (strong, nonatomic) IBOutlet UISlider *slideToMenuDistanceSlider;
@property (strong, nonatomic) IBOutlet UISlider *pointerVelocityModeDividerSlider;
@property (strong, nonatomic) IBOutlet UILabel *pointerVelocityModeDividerUILabel;
@property (strong, nonatomic) IBOutlet UISlider *touchPointerVelocityFactorSlider;
@@ -49,7 +51,6 @@
@property (strong, nonatomic) IBOutlet UIButton *goBackToStreamViewButton;
@property (strong, nonatomic) LayoutOnScreenControlsViewController *layoutOnScreenControlsVC;
@property (nonatomic, strong) MainFrameViewController *mainFrameViewController;
-@property (nonatomic, strong) CustomEdgeSwipeGestureRecognizer *exitSwipeRecognizer;
#pragma clang diagnostic push
diff --git a/Limelight/ViewControllers/SettingsViewController.m b/Limelight/ViewControllers/SettingsViewController.m
index ee854a16..8b9d4e8f 100644
--- a/Limelight/ViewControllers/SettingsViewController.m
+++ b/Limelight/ViewControllers/SettingsViewController.m
@@ -252,19 +252,6 @@ BOOL isCustomResolution(CGSize res) {
name:UIDeviceOrientationDidChangeNotification
object:nil];
- // for iphones that can not reach mainFrame, to register a gesture to simuluate setting button press & exit from setting view.
- /*
- _exitSwipeRecognizer = [[CustomEdgeSwipeGestureRecognizer alloc] initWithTarget:self action:@selector(simulateSettingsButtonPress)];
- _exitSwipeRecognizer.edges = UIRectEdgeLeft | UIRectEdgeRight;
- _exitSwipeRecognizer.normalizedThresholdDistance = 0;
- _exitSwipeRecognizer.edgeTolerancePoints = 5;
- _exitSwipeRecognizer.immediateTriggering = true;
- _exitSwipeRecognizer.delaysTouchesBegan = NO;
- _exitSwipeRecognizer.delaysTouchesEnded = NO;
- [self.view addGestureRecognizer:_exitSwipeRecognizer];
- */
- // replace by the goBackToStreamView Button.
-
// Always run settings in dark mode because we want the light fonts
if (@available(iOS 13.0, tvOS 13.0, *)) {
self.overrideUserInterfaceStyle = UIUserInterfaceStyleDark;
@@ -408,11 +395,15 @@ BOOL isCustomResolution(CGSize res) {
// showkeyboard toolbar setting
[self.showKeyboardToolbarSelector setSelectedSegmentIndex:currentSettings.showKeyboardToolbar ? 1 : 0];// Load old setting
- // swipe & exit setting
- [self.swipeExitScreenEdgeSelector setSelectedSegmentIndex:[self getSelectorIndexFromScreenEdge:(uint32_t)currentSettings.swipeExitScreenEdge.integerValue]]; // Load old setting
- [self.swipeToExitDistanceSlider setValue:currentSettings.swipeToExitDistance.floatValue];
- [self.swipeToExitDistanceSlider addTarget:self action:@selector(swipeToExitDistanceSliderMoved) forControlEvents:(UIControlEventValueChanged)]; // Update label display when slider is being moved.
- [self swipeToExitDistanceSliderMoved];
+ // slide to menu settings
+ [self.slideToSettingsScreenEdgeSelector setSelectedSegmentIndex:[self getSelectorIndexFromScreenEdge:(uint32_t)currentSettings.slideToSettingsScreenEdge.integerValue]]; // Load old setting
+ [self.cmdToolScreenEdgeSelector setEnabled:false];
+ [self.slideToSettingsScreenEdgeSelector addTarget:self action:@selector(slideToSettingsScreenEdgeChanged) forControlEvents:UIControlEventValueChanged];
+ [self slideToSettingsScreenEdgeChanged];
+
+ [self.slideToMenuDistanceSlider setValue:currentSettings.slideToSettingsDistance.floatValue];
+ [self.slideToMenuDistanceSlider addTarget:self action:@selector(slideToMenuDistanceSliderMoved) forControlEvents:(UIControlEventValueChanged)]; // Update label display when slider is being moved.
+ [self slideToMenuDistanceSliderMoved];
@@ -467,6 +458,11 @@ BOOL isCustomResolution(CGSize res) {
}
}
+- (void)slideToSettingsScreenEdgeChanged{
+ if([self.slideToSettingsScreenEdgeSelector selectedSegmentIndex] == 0) [self.cmdToolScreenEdgeSelector setSelectedSegmentIndex:1];
+ else [self.cmdToolScreenEdgeSelector setSelectedSegmentIndex:0];
+}
+
- (void)updateTouchModeLabel{
NSString* labelText;
@@ -566,7 +562,7 @@ BOOL isCustomResolution(CGSize res) {
}
- (uint32_t) getScreenEdgeFromSelector {
- switch (self.swipeExitScreenEdgeSelector.selectedSegmentIndex) {
+ switch (self.slideToSettingsScreenEdgeSelector.selectedSegmentIndex) {
case 0: return UIRectEdgeLeft;
case 1: return UIRectEdgeRight;
case 2: return UIRectEdgeLeft|UIRectEdgeRight;
@@ -813,8 +809,8 @@ BOOL isCustomResolution(CGSize res) {
else [self.keyboardToggleFingerNumLabel setText:[LocalizationHelper localizedStringForKey:@"To Toggle Local Keyboard: Tap %d Fingers", (uint16_t)self.keyboardToggleFingerNumSlider.value]]; // Initiate label display
}
-- (void) swipeToExitDistanceSliderMoved{
- [self.swipeToExitDistanceUILabel setText:[LocalizationHelper localizedStringForKey:@"Swipe & Exit Distance: %.2f * screen-width", self.swipeToExitDistanceSlider.value]];
+- (void) slideToMenuDistanceSliderMoved{
+ [self.slideToSettingsDistanceUILabel setText:[LocalizationHelper localizedStringForKey:@"Slide Distance for in-Stream Menu: %.2f * screen-width", self.slideToMenuDistanceSlider.value]];
}
- (void) bitrateSliderMoved {
@@ -891,8 +887,8 @@ BOOL isCustomResolution(CGSize res) {
NSInteger onscreenControls = [self.onscreenControlSelector selectedSegmentIndex];
NSInteger keyboardToggleFingers = (uint16_t)self.keyboardToggleFingerNumSlider.value;
// NSLog(@"saveSettings keyboardToggleFingers %d", (uint16_t)keyboardToggleFingers);
- CGFloat swipeToExitDistance = self.swipeToExitDistanceSlider.value;
- uint32_t swipeExitScreenEdge = [self getScreenEdgeFromSelector];
+ CGFloat slideToSettingsDistance = self.slideToMenuDistanceSlider.value;
+ uint32_t slideToSettingsScreenEdge = [self getScreenEdgeFromSelector];
CGFloat pointerVelocityModeDivider = (CGFloat)(uint8_t)self.pointerVelocityModeDividerSlider.value/100;
CGFloat touchPointerVelocityFactor =(CGFloat)(uint16_t)[self map_velocFactorDisplay_fromSliderValue:self.touchPointerVelocityFactorSlider.value]/100;
CGFloat mousePointerVelocityFactor =(CGFloat)(uint16_t)self.mousePointerVelocityFactorSlider.value/100;
@@ -917,8 +913,8 @@ BOOL isCustomResolution(CGSize res) {
audioConfig:2 // Stereo
onscreenControls:onscreenControls
keyboardToggleFingers:keyboardToggleFingers
- swipeExitScreenEdge:swipeExitScreenEdge
- swipeToExitDistance:swipeToExitDistance
+ slideToSettingsScreenEdge:slideToSettingsScreenEdge
+ slideToSettingsDistance:slideToSettingsDistance
pointerVelocityModeDivider:pointerVelocityModeDivider
touchPointerVelocityFactor:touchPointerVelocityFactor
mousePointerVelocityFactor:mousePointerVelocityFactor
diff --git a/Limelight/ViewControllers/StreamFrameViewController.m b/Limelight/ViewControllers/StreamFrameViewController.m
index 8b34ba54..22183d6a 100644
--- a/Limelight/ViewControllers/StreamFrameViewController.m
+++ b/Limelight/ViewControllers/StreamFrameViewController.m
@@ -53,8 +53,8 @@
BOOL _userIsInteracting;
CGSize _keyboardSize;
#if !TARGET_OS_TV
- CustomEdgeSwipeGestureRecognizer *_exitSwipeRecognizer;
- CustomEdgeSwipeGestureRecognizer *_commandManagerSwipeRecognizer;
+ CustomEdgeSwipeGestureRecognizer *_slideToSettingsRecognizer;
+ CustomEdgeSwipeGestureRecognizer *_slideToCmdToolRecognizer;
CustomTapGestureRecognizer *_oscLayoutTapRecoginizer;
LayoutOnScreenControlsViewController *_layoutOnScreenControlsVC;
#endif
@@ -94,22 +94,23 @@
}
- (void)configSwipeGestures{
- [self.view removeGestureRecognizer:_exitSwipeRecognizer];
- _exitSwipeRecognizer = [[CustomEdgeSwipeGestureRecognizer alloc] initWithTarget:self action:@selector(edgeSwiped)];
- _exitSwipeRecognizer.edges = _settings.swipeExitScreenEdge.intValue;
- _exitSwipeRecognizer.normalizedThresholdDistance = _settings.swipeToExitDistance.floatValue;
- _exitSwipeRecognizer.delaysTouchesBegan = NO;
- _exitSwipeRecognizer.delaysTouchesEnded = NO;
- [self.view addGestureRecognizer:_exitSwipeRecognizer];
+ [self.view removeGestureRecognizer:_slideToSettingsRecognizer];
+ _slideToSettingsRecognizer = [[CustomEdgeSwipeGestureRecognizer alloc] initWithTarget:self action:@selector(edgeSwiped)];
+ _slideToSettingsRecognizer.edges = _settings.slideToSettingsScreenEdge.intValue;
+ _slideToSettingsRecognizer.normalizedThresholdDistance = _settings.slideToSettingsDistance.floatValue;
+ _slideToSettingsRecognizer.delaysTouchesBegan = NO;
+ _slideToSettingsRecognizer.delaysTouchesEnded = NO;
+ [self.view addGestureRecognizer:_slideToSettingsRecognizer];
- [self.view removeGestureRecognizer:_commandManagerSwipeRecognizer];
- _commandManagerSwipeRecognizer = [[CustomEdgeSwipeGestureRecognizer alloc] initWithTarget:self action:@selector(presentCommandManagerViewController)];
- _commandManagerSwipeRecognizer.edges = UIRectEdgeRight;
- _commandManagerSwipeRecognizer.normalizedThresholdDistance = _settings.swipeToExitDistance.floatValue;
- _commandManagerSwipeRecognizer.delaysTouchesBegan = NO;
- _commandManagerSwipeRecognizer.delaysTouchesEnded = NO;
- [self.view addGestureRecognizer:_commandManagerSwipeRecognizer];
+ [self.view removeGestureRecognizer:_slideToCmdToolRecognizer];
+ _slideToCmdToolRecognizer = [[CustomEdgeSwipeGestureRecognizer alloc] initWithTarget:self action:@selector(presentCommandManagerViewController)];
+ if(_settings.slideToSettingsScreenEdge.intValue == UIRectEdgeLeft) _slideToCmdToolRecognizer.edges = UIRectEdgeRight;
+ else _slideToCmdToolRecognizer.edges = UIRectEdgeLeft; // _commandManager triggered by sliding from another side.
+ _slideToCmdToolRecognizer.normalizedThresholdDistance = _settings.slideToSettingsDistance.floatValue;
+ _slideToCmdToolRecognizer.delaysTouchesBegan = NO;
+ _slideToCmdToolRecognizer.delaysTouchesEnded = NO;
+ [self.view addGestureRecognizer:_slideToCmdToolRecognizer];
}
- (void)configZoomGesture{
diff --git a/Limelight/mul.lproj/iPad.xcstrings b/Limelight/mul.lproj/iPad.xcstrings
index a1ace791..3e1abfd9 100644
--- a/Limelight/mul.lproj/iPad.xcstrings
+++ b/Limelight/mul.lproj/iPad.xcstrings
@@ -968,31 +968,31 @@
}
},
"IvI-tw-APj.text" : {
- "comment" : "Class = \"UILabel\"; text = \"Swipe & Exit Session from: \"; ObjectID = \"IvI-tw-APj\";",
+ "comment" : "Class = \"UILabel\"; text = \"Open Settings in Stream View by Sliding from: \"; ObjectID = \"IvI-tw-APj\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
- "value" : "Swipe & Exit Session from: "
+ "value" : "Open Settings in Stream View by Sliding from: "
}
},
"zh-Hans" : {
"stringUnit" : {
- "state" : "translated",
- "value" : "从以下屏幕边缘滑动, 退出远程桌面:"
+ "state" : "needs_review",
+ "value" : "串流中从以下屏幕边缘滑动打开设置"
}
},
"zh-Hant" : {
"stringUnit" : {
- "state" : "translated",
- "value" : "从以下屏幕边缘滑动, 退出远程桌面:"
+ "state" : "needs_review",
+ "value" : "串流中从以下屏幕边缘滑动打开设置:"
}
},
"zh-HK" : {
"stringUnit" : {
- "state" : "translated",
- "value" : "从以下屏幕边缘滑动, 退出远程桌面:"
+ "state" : "needs_review",
+ "value" : "串流中从以下屏幕边缘滑动打开设置"
}
}
}
@@ -1335,7 +1335,7 @@
},
"Mm0-xf-9eh.segmentTitles[2]" : {
"comment" : "Class = \"UISegmentedControl\"; Mm0-xf-9eh.segmentTitles[2] = \"Either\"; ObjectID = \"Mm0-xf-9eh\";",
- "extractionState" : "extracted_with_value",
+ "extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {
@@ -1616,13 +1616,19 @@
}
},
"pMN-6T-aYE.text" : {
- "comment" : "Class = \"UILabel\"; text = \"Swipe & Exit Distance: 0.5 * screen-width \"; ObjectID = \"pMN-6T-aYE\";",
+ "comment" : "Class = \"UILabel\"; text = \"Slide Distance for Stream View Menu: 0.5 * screen-width \"; ObjectID = \"pMN-6T-aYE\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
- "value" : "Swipe & Exit Distance: 0.5 * screen-width "
+ "value" : "Slide Distance for Stream View Menu: 0.5 * screen-width "
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "打开串流菜单滑动距离: "
}
}
}
@@ -2125,6 +2131,96 @@
}
}
},
+ "yY7-Sf-Zes.segmentTitles[0]" : {
+ "comment" : "Class = \"UISegmentedControl\"; yY7-Sf-Zes.segmentTitles[0] = \"Left Screen Edge\"; ObjectID = \"yY7-Sf-Zes\";",
+ "extractionState" : "extracted_with_value",
+ "localizations" : {
+ "en" : {
+ "stringUnit" : {
+ "state" : "new",
+ "value" : "Left Screen Edge"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "左边缘"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "左边缘"
+ }
+ },
+ "zh-HK" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "左边缘"
+ }
+ }
+ }
+ },
+ "yY7-Sf-Zes.segmentTitles[1]" : {
+ "comment" : "Class = \"UISegmentedControl\"; yY7-Sf-Zes.segmentTitles[1] = \"Right Screen Edge\"; ObjectID = \"yY7-Sf-Zes\";",
+ "extractionState" : "extracted_with_value",
+ "localizations" : {
+ "en" : {
+ "stringUnit" : {
+ "state" : "new",
+ "value" : "Right Screen Edge"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "右边缘"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "右边缘"
+ }
+ },
+ "zh-HK" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "右边缘"
+ }
+ }
+ }
+ },
+ "Zp4-fA-IeL.text" : {
+ "comment" : "Class = \"UILabel\"; text = \"Open Command Tool in Stream View by Sliding from:\"; ObjectID = \"Zp4-fA-IeL\";",
+ "extractionState" : "extracted_with_value",
+ "localizations" : {
+ "en" : {
+ "stringUnit" : {
+ "state" : "new",
+ "value" : "Open Command Tool in Stream View by Sliding from:"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "串流中从以下屏幕边缘滑动打开命令工具"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "串流中从以下屏幕边缘滑动打开命令工具"
+ }
+ },
+ "zh-HK" : {
+ "stringUnit" : {
+ "state" : "needs_review",
+ "value" : "串流中从以下屏幕边缘滑动打开命令工具"
+ }
+ }
+ }
+ },
"ZWC-Gw-pSq.text" : {
"comment" : "Class = \"UILabel\"; text = \"Frame Pacing Preference \"; ObjectID = \"ZWC-Gw-pSq\";",
"extractionState" : "extracted_with_value",
diff --git a/Limelight/mul.lproj/iPhone.xcstrings b/Limelight/mul.lproj/iPhone.xcstrings
index 46df8d9a..7ec5ddd2 100644
--- a/Limelight/mul.lproj/iPhone.xcstrings
+++ b/Limelight/mul.lproj/iPhone.xcstrings
@@ -183,7 +183,7 @@
},
"2Lx-OY-ZPu.segmentTitles[2]" : {
"comment" : "Class = \"UISegmentedControl\"; 2Lx-OY-ZPu.segmentTitles[2] = \"Either\"; ObjectID = \"2Lx-OY-ZPu\";",
- "extractionState" : "extracted_with_value",
+ "extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {
@@ -392,31 +392,31 @@
}
},
"8kV-xZ-73k.text" : {
- "comment" : "Class = \"UILabel\"; text = \"Swipe & Exit Session from:\"; ObjectID = \"8kV-xZ-73k\";",
+ "comment" : "Class = \"UILabel\"; text = \"Open Settings in Stream View by Sliding from: \"; ObjectID = \"8kV-xZ-73k\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
- "value" : "Swipe & Exit Session from:"
+ "value" : "Open Settings in Stream View by Sliding from: "
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
- "value" : "从以下屏幕边缘滑动, 退出远程桌面:"
+ "value" : "串流中从以下屏幕边缘滑动打开设置"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
- "value" : "从以下屏幕边缘滑动, 退出远程桌面:"
+ "value" : "串流中从以下屏幕边缘滑动打开设置"
}
},
"zh-HK" : {
"stringUnit" : {
"state" : "translated",
- "value" : "从以下屏幕边缘滑动, 退出远程桌面:"
+ "value" : "串流中从以下屏幕边缘滑动打开设置"
}
}
}
@@ -878,13 +878,13 @@
}
},
"Ex1-zI-oAH.text" : {
- "comment" : "Class = \"UILabel\"; text = \"Swipe & Exit Distance: 0.5 * screen-width \"; ObjectID = \"Ex1-zI-oAH\";",
+ "comment" : "Class = \"UILabel\"; text = \"Slide Distance for Stream View Menu: 0.5 * screen-width \"; ObjectID = \"Ex1-zI-oAH\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
- "value" : "Swipe & Exit Distance: 0.5 * screen-width "
+ "value" : "Slide Distance for Stream View Menu: 0.5 * screen-width "
}
}
}
@@ -1807,6 +1807,36 @@
}
}
},
+ "stX-s7-H2W.text" : {
+ "comment" : "Class = \"UILabel\"; text = \"Open Command Tool in Stream View by Sliding from: \"; ObjectID = \"stX-s7-H2W\";",
+ "extractionState" : "extracted_with_value",
+ "localizations" : {
+ "en" : {
+ "stringUnit" : {
+ "state" : "new",
+ "value" : "Open Command Tool in Stream View by Sliding from: "
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "串流中从以下屏幕边缘滑动打开命令工具"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "串流中从以下屏幕边缘滑动打开命令工具"
+ }
+ },
+ "zh-HK" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "串流中从以下屏幕边缘滑动打开命令工具"
+ }
+ }
+ }
+ },
"T6M-nz-TW0.text" : {
"comment" : "Class = \"UILabel\"; text = \"Play Audio on PC\"; ObjectID = \"T6M-nz-TW0\";",
"extractionState" : "extracted_with_value",
@@ -2148,6 +2178,66 @@
}
}
}
+ },
+ "zDR-Ss-JPc.segmentTitles[0]" : {
+ "comment" : "Class = \"UISegmentedControl\"; zDR-Ss-JPc.segmentTitles[0] = \"Left Screen Edge\"; ObjectID = \"zDR-Ss-JPc\";",
+ "extractionState" : "extracted_with_value",
+ "localizations" : {
+ "en" : {
+ "stringUnit" : {
+ "state" : "new",
+ "value" : "Left Screen Edge"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "左边缘"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "左边缘"
+ }
+ },
+ "zh-HK" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "左边缘"
+ }
+ }
+ }
+ },
+ "zDR-Ss-JPc.segmentTitles[1]" : {
+ "comment" : "Class = \"UISegmentedControl\"; zDR-Ss-JPc.segmentTitles[1] = \"Right Screen Edge\"; ObjectID = \"zDR-Ss-JPc\";",
+ "extractionState" : "extracted_with_value",
+ "localizations" : {
+ "en" : {
+ "stringUnit" : {
+ "state" : "new",
+ "value" : "Right Screen Edge"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "右边缘"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "右边缘"
+ }
+ },
+ "zh-HK" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "右边缘"
+ }
+ }
+ }
}
},
"version" : "1.0"