summaryrefslogtreecommitdiff
path: root/ios
diff options
context:
space:
mode:
authorSiqi LIU <me@siqi.fr>2013-10-05 12:34:19 +0200
committerSiqi LIU <me@siqi.fr>2013-10-05 12:34:38 +0200
commit93e020be90a9ff9cc9f8726a93d0b8ddd1e34f4a (patch)
treea8796fc8c0a32a6427853b0a5362ce1ee6ed7456 /ios
parentfd2fb1b3a4f9e00fedb82421b419ef60ccee43e9 (diff)
popOverView modified for better touchability
Change-Id: Ief0ca8dfef303ecf905fdf02bcea924f98de976b
Diffstat (limited to 'ios')
-rwxr-xr-xios/iosremote/PopoverView/PopoverView.m18
-rwxr-xr-xios/iosremote/PopoverView/PopoverView_Configuration.h2
-rw-r--r--ios/iosremote/en.lproj/iPad_autosize.storyboard16
-rw-r--r--ios/iosremote/en.lproj/iPad_autosize.stringsbin4254 -> 4242 bytes
-rw-r--r--ios/iosremote/en.lproj/iPad_autosize_old.storyboard16
-rw-r--r--ios/iosremote/fr.lproj/iPad_autosize.storyboard12
-rw-r--r--ios/iosremote/fr.lproj/iPad_autosize.stringsbin4526 -> 4314 bytes
-rw-r--r--ios/iosremote/fr.lproj/iPad_autosize_old.storyboard12
-rw-r--r--ios/iosremote/iosremote.xcodeproj/project.pbxproj18
-rw-r--r--ios/iosremote/iosremote/Categories/UIImage+imageWithColor.h15
-rw-r--r--ios/iosremote/iosremote/Categories/UIImage+imageWithColor.m27
-rw-r--r--ios/iosremote/iosremote/Classes/ControlVariables.h2
-rw-r--r--ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m19
-rw-r--r--ios/iosremote/iosremote/Ressources/ .pngbin0 -> 4701 bytes
-rw-r--r--ios/iosremote/iosremote/Ressources/gear_transparent_bg.pngbin3337 -> 3381 bytes
-rw-r--r--ios/iosremote/iosremote/Ressources/gear_transparent_bg@2x.pngbin3866 -> 4005 bytes
-rw-r--r--ios/iosremote/iosremote/Ressources/more_ipad.pngbin3251 -> 3634 bytes
-rw-r--r--ios/iosremote/iosremote/Ressources/more_ipad@2x.pngbin3705 -> 4701 bytes
-rw-r--r--ios/iosremote/iosremote/Views/WalkThroughPageViewController.xib24
-rw-r--r--ios/iosremote/iosremote/Views/WalkThroughPageViewControllerWithHint.xib464
-rw-r--r--ios/iosremote/iosremote/Views/WalkThroughPageViewMainImageController.xib467
-rw-r--r--ios/iosremote/iosremote/en.lproj/Localizable.stringsbin6498 -> 6498 bytes
-rw-r--r--ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard23
-rw-r--r--ios/iosremote/iosremote/en.lproj/iPhone_autoSize.stringsbin3426 -> 3414 bytes
-rw-r--r--ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard23
-rw-r--r--ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard16
-rw-r--r--ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard16
-rw-r--r--ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard16
-rw-r--r--ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard16
-rw-r--r--ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard12
-rw-r--r--ios/iosremote/zh-Hans.lproj/iPad_autosize.stringsbin4294 -> 4090 bytes
-rw-r--r--ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard12
32 files changed, 721 insertions, 525 deletions
diff --git a/ios/iosremote/PopoverView/PopoverView.m b/ios/iosremote/PopoverView/PopoverView.m
index 4f810cf72df8..678033afcfb8 100755
--- a/ios/iosremote/PopoverView/PopoverView.m
+++ b/ios/iosremote/PopoverView/PopoverView.m
@@ -14,6 +14,7 @@
#import "PopoverView.h"
#import "PopoverView_Configuration.h"
+#import "UIImage+imageWithColor.h"
#import <QuartzCore/QuartzCore.h>
#pragma mark - Implementation
@@ -361,10 +362,19 @@
UIFont *font = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? kTextFontPad : kTextFontPhone;
+ float padding = kBoxPadding;
+ float maxItemWidth = 0.0;
+
for (NSString *string in stringArray) {
CGSize textSize = [string sizeWithFont:font];
- UIButton *textButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, textSize.width, textSize.height)];
- textButton.backgroundColor = [UIColor clearColor];
+ if (textSize.width > maxItemWidth) {
+ maxItemWidth = textSize.width;
+ }
+ }
+
+ for (NSString *string in stringArray) {
+ CGSize textSize = [string sizeWithFont:font];
+ UIButton *textButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, maxItemWidth + 2 * padding, textSize.height + padding)];
textButton.titleLabel.font = font;
textButton.titleLabel.textAlignment = kTextAlignment;
textButton.titleLabel.textColor = kTextColor;
@@ -374,6 +384,10 @@
[textButton setTitleColor:kTextHighlightColor forState:UIControlStateHighlighted];
[textButton addTarget:self action:@selector(didTapButton:) forControlEvents:UIControlEventTouchUpInside];
+ [textButton setBackgroundImage:[UIImage imageWithColor:kPopoverItemHighlightBGColor
+ size:CGSizeMake(1.f, 1.f)]
+ forState:UIControlStateHighlighted];
+
[labelArray addObject:[textButton AUTORELEASE]];
}
diff --git a/ios/iosremote/PopoverView/PopoverView_Configuration.h b/ios/iosremote/PopoverView/PopoverView_Configuration.h
index 7b43683e6a42..7337ffb8432d 100755
--- a/ios/iosremote/PopoverView/PopoverView_Configuration.h
+++ b/ios/iosremote/PopoverView/PopoverView_Configuration.h
@@ -20,7 +20,7 @@
#define kArrowHeight 12.f
//padding within the box for the contentView
-#define kBoxPadding 10.f
+#define kBoxPadding 6.f
//control point offset for rounding corners of the main popover box
#define kCPOffset 1.8f
diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard
index 2382ad336b8d..0c9ad1bc675d 100644
--- a/ios/iosremote/en.lproj/iPad_autosize.storyboard
+++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard
@@ -67,14 +67,14 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Connect" id="wYh-MF-Ao6">
- <barButtonItem key="leftBarButtonItem" image="more_icon.png" id="JjD-di-uqV">
+ <barButtonItem key="leftBarButtonItem" image="add.png" id="pU6-XF-laS">
<connections>
- <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="k4j-0Z-IEW"/>
+ <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS">
+ <barButtonItem key="rightBarButtonItem" image="more_icon.png" id="AN0-81-gat">
<connections>
- <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
+ <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="MvY-cd-0md"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -107,7 +107,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP">
- <rect key="frame" x="115" y="442" width="320" height="94.000000000000028"/>
+ <rect key="frame" x="115" y="442" width="320" height="94"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/>
<color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/>
@@ -217,10 +217,10 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="02F-Tj-9xO" userLabel="slideShowPreview">
- <rect key="frame" x="201" y="438" width="138" height="44"/>
+ <rect key="frame" x="201" y="437" width="138" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
- <state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
+ <state key="normal" title="Settings" backgroundImage="buttonBackground.png">
<color key="titleColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
@@ -477,7 +477,7 @@
</subviews>
</scrollView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
- <rect key="frame" x="731" y="22" width="64" height="53"/>
+ <rect key="frame" x="722" y="23" width="64" height="53"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
diff --git a/ios/iosremote/en.lproj/iPad_autosize.strings b/ios/iosremote/en.lproj/iPad_autosize.strings
index 01ac002fc81f..8ce5efb37cda 100644
--- a/ios/iosremote/en.lproj/iPad_autosize.strings
+++ b/ios/iosremote/en.lproj/iPad_autosize.strings
Binary files differ
diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
index 2382ad336b8d..0c9ad1bc675d 100644
--- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
@@ -67,14 +67,14 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Connect" id="wYh-MF-Ao6">
- <barButtonItem key="leftBarButtonItem" image="more_icon.png" id="JjD-di-uqV">
+ <barButtonItem key="leftBarButtonItem" image="add.png" id="pU6-XF-laS">
<connections>
- <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="k4j-0Z-IEW"/>
+ <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS">
+ <barButtonItem key="rightBarButtonItem" image="more_icon.png" id="AN0-81-gat">
<connections>
- <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
+ <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="MvY-cd-0md"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -107,7 +107,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP">
- <rect key="frame" x="115" y="442" width="320" height="94.000000000000028"/>
+ <rect key="frame" x="115" y="442" width="320" height="94"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/>
<color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/>
@@ -217,10 +217,10 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="02F-Tj-9xO" userLabel="slideShowPreview">
- <rect key="frame" x="201" y="438" width="138" height="44"/>
+ <rect key="frame" x="201" y="437" width="138" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
- <state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
+ <state key="normal" title="Settings" backgroundImage="buttonBackground.png">
<color key="titleColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
@@ -477,7 +477,7 @@
</subviews>
</scrollView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
- <rect key="frame" x="731" y="22" width="64" height="53"/>
+ <rect key="frame" x="722" y="23" width="64" height="53"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard
index bb49389cbea0..5ea1573b057b 100644
--- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard
+++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard
@@ -67,14 +67,14 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Connecter" id="wYh-MF-Ao6">
- <barButtonItem key="leftBarButtonItem" title="Aide" image="more_icon.png" id="JjD-di-uqV">
+ <barButtonItem key="leftBarButtonItem" image="add.png" id="pU6-XF-laS">
<connections>
- <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="k4j-0Z-IEW"/>
+ <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS">
+ <barButtonItem key="rightBarButtonItem" image="more_icon.png" id="AN0-81-gat">
<connections>
- <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
+ <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="MvY-cd-0md"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -217,7 +217,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="02F-Tj-9xO" userLabel="slideShowPreview">
- <rect key="frame" x="201" y="438" width="138" height="44"/>
+ <rect key="frame" x="201" y="437" width="138" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
@@ -477,7 +477,7 @@
</subviews>
</scrollView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
- <rect key="frame" x="731" y="22" width="64" height="53"/>
+ <rect key="frame" x="722" y="23" width="64" height="53"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
diff --git a/ios/iosremote/fr.lproj/iPad_autosize.strings b/ios/iosremote/fr.lproj/iPad_autosize.strings
index 71f37a85b7b6..990c6135bfb5 100644
--- a/ios/iosremote/fr.lproj/iPad_autosize.strings
+++ b/ios/iosremote/fr.lproj/iPad_autosize.strings
Binary files differ
diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
index bb49389cbea0..5ea1573b057b 100644
--- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
@@ -67,14 +67,14 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Connecter" id="wYh-MF-Ao6">
- <barButtonItem key="leftBarButtonItem" title="Aide" image="more_icon.png" id="JjD-di-uqV">
+ <barButtonItem key="leftBarButtonItem" image="add.png" id="pU6-XF-laS">
<connections>
- <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="k4j-0Z-IEW"/>
+ <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS">
+ <barButtonItem key="rightBarButtonItem" image="more_icon.png" id="AN0-81-gat">
<connections>
- <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
+ <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="MvY-cd-0md"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -217,7 +217,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="02F-Tj-9xO" userLabel="slideShowPreview">
- <rect key="frame" x="201" y="438" width="138" height="44"/>
+ <rect key="frame" x="201" y="437" width="138" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
@@ -477,7 +477,7 @@
</subviews>
</scrollView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
- <rect key="frame" x="731" y="22" width="64" height="53"/>
+ <rect key="frame" x="722" y="23" width="64" height="53"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index e124e5fc72d6..90857944655b 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -52,6 +52,7 @@
8C0323AB17A943720037432E /* UIImageView+setImageAnimated.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */; };
8C06B31D17B7EC83002F5CF8 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8C06B31B17B7EC83002F5CF8 /* Localizable.strings */; };
8C06B31E17B7ED1E002F5CF8 /* iPad_autosize.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8C06B32017B7ED1E002F5CF8 /* iPad_autosize.storyboard */; };
+ 8C0C879317F4C46E003CE6B2 /* WalkThroughPageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8C0C879217F4C46E003CE6B2 /* WalkThroughPageViewController.xib */; };
8C0DC83A17A4177C0099E5AE /* nextButton_pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */; };
8C0DC83B17A4177C0099E5AE /* nextButton_pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83717A4177C0099E5AE /* nextButton_pressed@2x.png */; };
8C0DC83C17A4177C0099E5AE /* previousButton_pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */; };
@@ -99,6 +100,7 @@
8C3A648C17DCBE9E004A77D9 /* timer_settime_btn_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C3A648517DCBE9E004A77D9 /* timer_settime_btn_dark.png */; };
8C3A648D17DCBE9E004A77D9 /* timer_settime_btn_dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C3A648617DCBE9E004A77D9 /* timer_settime_btn_dark@2x.png */; };
8C3A648E17DCBE9E004A77D9 /* timer_start_btn_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C3A648717DCBE9E004A77D9 /* timer_start_btn_dark.png */; };
+ 8C408A8218001DF00095D80F /* UIImage+imageWithColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C408A8118001DF00095D80F /* UIImage+imageWithColor.m */; };
8C8C7FB017EDA9330022A6BD /* UINavigationController+Theme.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C8C7FAF17EDA9330022A6BD /* UINavigationController+Theme.m */; };
8C8C7FB317EDAFD20022A6BD /* more_ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C8C7FB117EDAFD20022A6BD /* more_ipad.png */; };
8C8C7FB417EDAFD20022A6BD /* more_ipad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C8C7FB217EDAFD20022A6BD /* more_ipad@2x.png */; };
@@ -137,7 +139,7 @@
8CBF9E0817DE79EB0044D949 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CBF9E0717DE79EB0044D949 /* AboutViewController.m */; };
8CBF9E0A17E103B50044D949 /* licenses.html in Resources */ = {isa = PBXBuildFile; fileRef = 8CBF9E0917E103B40044D949 /* licenses.html */; };
8CD6EC6817CBBAF40071827A /* WalkThroughPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */; };
- 8CD6EC6917CBBAF40071827A /* WalkThroughPageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6717CBBAF40071827A /* WalkThroughPageViewController.xib */; };
+ 8CD6EC6917CBBAF40071827A /* WalkThroughPageViewControllerWithHint.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6717CBBAF40071827A /* WalkThroughPageViewControllerWithHint.xib */; };
8CD6EC7017CC3FA00071827A /* WalkThroughContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */; };
8CD6EC7717CE31560071827A /* forwardButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC7517CE31550071827A /* forwardButton.png */; };
8CD6EC7817CE31560071827A /* forwardButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC7617CE31550071827A /* forwardButton@2x.png */; };
@@ -226,6 +228,7 @@
8C06B32617B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "zh-Hans"; path = "zh-Hans.lproj/iPad_autosize.storyboard"; sourceTree = "<group>"; };
8C06B32717B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
8C06B32817B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+ 8C0C879217F4C46E003CE6B2 /* WalkThroughPageViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = WalkThroughPageViewController.xib; path = iosremote/Views/WalkThroughPageViewController.xib; sourceTree = "<group>"; };
8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nextButton_pressed.png; sourceTree = "<group>"; };
8C0DC83717A4177C0099E5AE /* nextButton_pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nextButton_pressed@2x.png"; sourceTree = "<group>"; };
8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = previousButton_pressed.png; sourceTree = "<group>"; };
@@ -287,6 +290,8 @@
8C3A648517DCBE9E004A77D9 /* timer_settime_btn_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = timer_settime_btn_dark.png; sourceTree = "<group>"; };
8C3A648617DCBE9E004A77D9 /* timer_settime_btn_dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "timer_settime_btn_dark@2x.png"; sourceTree = "<group>"; };
8C3A648717DCBE9E004A77D9 /* timer_start_btn_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = timer_start_btn_dark.png; sourceTree = "<group>"; };
+ 8C408A8018001DF00095D80F /* UIImage+imageWithColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+imageWithColor.h"; path = "iosremote/Categories/UIImage+imageWithColor.h"; sourceTree = "<group>"; };
+ 8C408A8118001DF00095D80F /* UIImage+imageWithColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImage+imageWithColor.m"; path = "iosremote/Categories/UIImage+imageWithColor.m"; sourceTree = "<group>"; };
8C8C7FAE17EDA9330022A6BD /* UINavigationController+Theme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UINavigationController+Theme.h"; path = "iosremote/Categories/UINavigationController+Theme.h"; sourceTree = "<group>"; };
8C8C7FAF17EDA9330022A6BD /* UINavigationController+Theme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UINavigationController+Theme.m"; path = "iosremote/Categories/UINavigationController+Theme.m"; sourceTree = "<group>"; };
8C8C7FB117EDAFD20022A6BD /* more_ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = more_ipad.png; sourceTree = "<group>"; };
@@ -349,7 +354,7 @@
8CBF9E0917E103B40044D949 /* licenses.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = licenses.html; sourceTree = "<group>"; };
8CD6EC6517CBBAF40071827A /* WalkThroughPageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WalkThroughPageViewController.h; path = iosremote/Classes/WalkThroughPageViewController.h; sourceTree = "<group>"; };
8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WalkThroughPageViewController.m; path = iosremote/Classes/WalkThroughPageViewController.m; sourceTree = "<group>"; };
- 8CD6EC6717CBBAF40071827A /* WalkThroughPageViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = WalkThroughPageViewController.xib; path = iosremote/Views/WalkThroughPageViewController.xib; sourceTree = "<group>"; };
+ 8CD6EC6717CBBAF40071827A /* WalkThroughPageViewControllerWithHint.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = WalkThroughPageViewControllerWithHint.xib; path = iosremote/Views/WalkThroughPageViewControllerWithHint.xib; sourceTree = "<group>"; };
8CD6EC6E17CC3FA00071827A /* WalkThroughContainerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WalkThroughContainerViewController.h; path = iosremote/Classes/WalkThroughContainerViewController.h; sourceTree = "<group>"; };
8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WalkThroughContainerViewController.m; path = iosremote/Classes/WalkThroughContainerViewController.m; sourceTree = "<group>"; };
8CD6EC7517CE31550071827A /* forwardButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = forwardButton.png; sourceTree = "<group>"; };
@@ -635,6 +640,8 @@
8C19F42E17B05089005BDB61 /* LibONavigationController.m */,
8C19F43417B10D48005BDB61 /* UIViewController+LibOStyling.h */,
8C19F43517B10D49005BDB61 /* UIViewController+LibOStyling.m */,
+ 8C408A8018001DF00095D80F /* UIImage+imageWithColor.h */,
+ 8C408A8118001DF00095D80F /* UIImage+imageWithColor.m */,
);
name = Support;
sourceTree = "<group>";
@@ -801,8 +808,9 @@
8CD6EC6A17CBBAFF0071827A /* Views */ = {
isa = PBXGroup;
children = (
+ 8C0C879217F4C46E003CE6B2 /* WalkThroughPageViewController.xib */,
8CD6EC8717CF4ABA0071827A /* WalkThroughPageViewMainImageController.xib */,
- 8CD6EC6717CBBAF40071827A /* WalkThroughPageViewController.xib */,
+ 8CD6EC6717CBBAF40071827A /* WalkThroughPageViewControllerWithHint.xib */,
);
name = Views;
sourceTree = "<group>";
@@ -867,6 +875,7 @@
57C6E407175E06E800E8BC5F /* Default@2x.png in Resources */,
57C6E409175E06E800E8BC5F /* Default-568h@2x.png in Resources */,
57867A541787172A00EBBE52 /* impress.jpeg in Resources */,
+ 8C0C879317F4C46E003CE6B2 /* WalkThroughPageViewController.xib in Resources */,
57867A5A1787510700EBBE52 /* pushed_next_button.png in Resources */,
57867A5B1787510700EBBE52 /* released_next_button.png in Resources */,
57867A5E178752CD00EBBE52 /* pushed_previous_button.png in Resources */,
@@ -906,7 +915,7 @@
8C19F44B17B1FEFE005BDB61 /* gear_transparent_bg@2x.png in Resources */,
8C19F44D17B20427005BDB61 /* add@2x.png in Resources */,
8C06B31D17B7EC83002F5CF8 /* Localizable.strings in Resources */,
- 8CD6EC6917CBBAF40071827A /* WalkThroughPageViewController.xib in Resources */,
+ 8CD6EC6917CBBAF40071827A /* WalkThroughPageViewControllerWithHint.xib in Resources */,
8CD6EC7717CE31560071827A /* forwardButton.png in Resources */,
8CD6EC7817CE31560071827A /* forwardButton@2x.png in Resources */,
8CD6EC7B17CE358B0071827A /* buttonBackground.png in Resources */,
@@ -981,6 +990,7 @@
57CFED9917838FDC00E82E05 /* EditableTableViewCell.m in Sources */,
57FE71E31785C61400B50125 /* PinValidationViewController.m in Sources */,
57FE71E917861A9000B50125 /* SlideShowPreviewViewController.m in Sources */,
+ 8C408A8218001DF00095D80F /* UIImage+imageWithColor.m in Sources */,
8C8C7FB017EDA9330022A6BD /* UINavigationController+Theme.m in Sources */,
57867A571787385800EBBE52 /* SlideShowViewController~iphone.m in Sources */,
57701742178B0A6900B99793 /* SlideShowSwipeInList~iphone.m in Sources */,
diff --git a/ios/iosremote/iosremote/Categories/UIImage+imageWithColor.h b/ios/iosremote/iosremote/Categories/UIImage+imageWithColor.h
new file mode 100644
index 000000000000..781ef77b1d56
--- /dev/null
+++ b/ios/iosremote/iosremote/Categories/UIImage+imageWithColor.h
@@ -0,0 +1,15 @@
+//
+// UIImage+imageWithColor.h
+// iosremote
+//
+// Created by Siqi Liu on 10/5/13.
+// Copyright (c) 2013 libreoffice. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIImage (imageWithColor)
+
++ (UIImage *) imageWithColor:(UIColor *) color size:(CGSize) size;
+
+@end
diff --git a/ios/iosremote/iosremote/Categories/UIImage+imageWithColor.m b/ios/iosremote/iosremote/Categories/UIImage+imageWithColor.m
new file mode 100644
index 000000000000..e3c0c336efa0
--- /dev/null
+++ b/ios/iosremote/iosremote/Categories/UIImage+imageWithColor.m
@@ -0,0 +1,27 @@
+//
+// UIImage+imageWithColor.m
+// iosremote
+//
+// Created by Siqi Liu on 10/5/13.
+// Copyright (c) 2013 libreoffice. All rights reserved.
+//
+
+#import "UIImage+imageWithColor.h"
+
+@implementation UIImage (imageWithColor)
+
++ (UIImage *) imageWithColor:(UIColor *) color size:(CGSize) size
+{
+ UIGraphicsBeginImageContext(size);
+ CGContextRef context = UIGraphicsGetCurrentContext();
+
+ CGContextSetFillColorWithColor(context, color.CGColor);
+ CGContextFillRect(context, (CGRect){.size = size});
+
+ UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+ UIGraphicsEndImageContext();
+
+ return image;
+}
+
+@end
diff --git a/ios/iosremote/iosremote/Classes/ControlVariables.h b/ios/iosremote/iosremote/Classes/ControlVariables.h
index 97f8da9cdf72..fff7c8a887b7 100644
--- a/ios/iosremote/iosremote/Classes/ControlVariables.h
+++ b/ios/iosremote/iosremote/Classes/ControlVariables.h
@@ -49,6 +49,8 @@
#define kAppSmallTextFont [UIFont fontWithName:@"HelveticaNeue" size:14.0f]
+
+#define kPopoverItemHighlightBGColor [UIColor colorWithRed:.4 green:.4 blue:.4 alpha:0.1]
int kDefaultTimerWidget, kCountDownTimerDefaultDuration;
BOOL kStopwatchAutoStart, kCountDownTimerAutoStart, kCountDownTimerVibration;
diff --git a/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m b/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m
index ace14fcca3d9..49c7c035b8a7 100644
--- a/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m
+++ b/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m
@@ -86,11 +86,22 @@
- (WalkThroughPageViewController *)viewControllerAtIndex:(NSUInteger)index {
WalkThroughPageViewController *childViewController;
- if (index == 2) {
- childViewController = [[WalkThroughPageViewController alloc] initWithNibName:@"WalkThroughPageViewMainImageController" bundle:nil];
- } else {
- childViewController = [[WalkThroughPageViewController alloc] initWithNibName:@"WalkThroughPageViewController" bundle:nil];
+
+ switch (index) {
+ case 0:
+ childViewController = [[WalkThroughPageViewController alloc] initWithNibName:@"WalkThroughPageViewControllerWithHint" bundle:nil];
+ break;
+ case 1:
+ childViewController = [[WalkThroughPageViewController alloc] initWithNibName:@"WalkThroughPageViewController" bundle:nil];
+ break;
+ case 2:
+ childViewController = [[WalkThroughPageViewController alloc] initWithNibName:@"WalkThroughPageViewMainImageController" bundle:nil];
+ break;
+ default:
+ NSLog(@"Shouldn't happen. Switch case not met in WalkThroughContainerViewController");
+ break;
}
+
childViewController.index = index;
return childViewController;
diff --git a/ios/iosremote/iosremote/Ressources/ .png b/ios/iosremote/iosremote/Ressources/ .png
new file mode 100644
index 000000000000..cc587eb7a0d9
--- /dev/null
+++ b/ios/iosremote/iosremote/Ressources/ .png
Binary files differ
diff --git a/ios/iosremote/iosremote/Ressources/gear_transparent_bg.png b/ios/iosremote/iosremote/Ressources/gear_transparent_bg.png
index 6aef9d0d455d..206cad7419b8 100644
--- a/ios/iosremote/iosremote/Ressources/gear_transparent_bg.png
+++ b/ios/iosremote/iosremote/Ressources/gear_transparent_bg.png
Binary files differ
diff --git a/ios/iosremote/iosremote/Ressources/gear_transparent_bg@2x.png b/ios/iosremote/iosremote/Ressources/gear_transparent_bg@2x.png
index 0457b5f79d52..dc10d8e63627 100644
--- a/ios/iosremote/iosremote/Ressources/gear_transparent_bg@2x.png
+++ b/ios/iosremote/iosremote/Ressources/gear_transparent_bg@2x.png
Binary files differ
diff --git a/ios/iosremote/iosremote/Ressources/more_ipad.png b/ios/iosremote/iosremote/Ressources/more_ipad.png
index 1747c8bf59ad..584a2147f2b8 100644
--- a/ios/iosremote/iosremote/Ressources/more_ipad.png
+++ b/ios/iosremote/iosremote/Ressources/more_ipad.png
Binary files differ
diff --git a/ios/iosremote/iosremote/Ressources/more_ipad@2x.png b/ios/iosremote/iosremote/Ressources/more_ipad@2x.png
index 44a5393669e6..cc587eb7a0d9 100644
--- a/ios/iosremote/iosremote/Ressources/more_ipad@2x.png
+++ b/ios/iosremote/iosremote/Ressources/more_ipad@2x.png
Binary files differ
diff --git a/ios/iosremote/iosremote/Views/WalkThroughPageViewController.xib b/ios/iosremote/iosremote/Views/WalkThroughPageViewController.xib
index 759294476081..e8c979da6aaf 100644
--- a/ios/iosremote/iosremote/Views/WalkThroughPageViewController.xib
+++ b/ios/iosremote/iosremote/Views/WalkThroughPageViewController.xib
@@ -61,10 +61,7 @@
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">Select the APPChildViewController.xib file just created. Change the background of the view to Black and reduce the vertical size of the view to 512 points to leave some free space for the dots of the page controller (which has a default </string>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4yNTg4MjM1Mjk0IDAuNDM1Mjk0MTE3NiAwLjkwOTgwMzkyMTYAA</bytes>
- </object>
+ <nil key="IBUITextColor"/>
<nil key="IBUIHighlightedColor"/>
<float key="IBUIMinimumScaleFactor">0.89999997615814209</float>
<int key="IBUINumberOfLines">2</int>
@@ -118,7 +115,7 @@
<reference key="NSNextResponder" ref="826207736"/>
<int key="NSvFlags">-2147482359</int>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrame">{{194, 373.00000000000006}, {106, 44}}</string>
+ <string key="NSFrame">{{194, 373}, {106, 44}}</string>
<reference key="NSSuperview" ref="826207736"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -165,7 +162,7 @@
<reference key="NSNextResponder" ref="826207736"/>
<int key="NSvFlags">1310</int>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrame">{{20, 237}, {83, 167.00000000000006}}</string>
+ <string key="NSFrame">{{20, 237.00000000000003}, {83, 167}}</string>
<reference key="NSSuperview" ref="826207736"/>
<reference key="NSNextKeyView" ref="712287771"/>
<bool key="IBUIOpaque">NO</bool>
@@ -174,21 +171,18 @@
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">dwdwdaijiajwodjiawjdioajwidjawiodjiawjdiajwidjwijdiawjdiajwd</string>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4yNTg4MjM1Mjk0IDAuNDM1Mjk0MTE3NiAwLjkwOTgwMzkyMTYAA</bytes>
- </object>
+ <nil key="IBUITextColor"/>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">0</int>
<int key="IBUINumberOfLines">10</int>
<object class="IBUIFontDescription" key="IBUIFontDescription">
- <string key="name">Helvetica-Oblique</string>
+ <string key="name">Helvetica</string>
<string key="family">Helvetica</string>
- <int key="traits">1</int>
+ <int key="traits">0</int>
<double key="pointSize">15</double>
</object>
<object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Oblique</string>
+ <string key="NSName">Helvetica</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
@@ -237,7 +231,7 @@
<reference key="NSNextResponder" ref="826207736"/>
<int key="NSvFlags">1307</int>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrame">{{111, 237}, {189, 167}}</string>
+ <string key="NSFrame">{{111, 237.00000000000003}, {189, 167}}</string>
<reference key="NSSuperview" ref="826207736"/>
<reference key="NSNextKeyView" ref="292993655"/>
<int key="IBUIContentMode">1</int>
@@ -246,7 +240,7 @@
</object>
</array>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrame">{{0, 20}, {320, 424.00000000000006}}</string>
+ <string key="NSFrame">{{0, 20}, {320, 424}}</string>
<reference key="NSNextKeyView" ref="337391083"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
diff --git a/ios/iosremote/iosremote/Views/WalkThroughPageViewControllerWithHint.xib b/ios/iosremote/iosremote/Views/WalkThroughPageViewControllerWithHint.xib
new file mode 100644
index 000000000000..d3c7ff650896
--- /dev/null
+++ b/ios/iosremote/iosremote/Views/WalkThroughPageViewControllerWithHint.xib
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+ <data>
+ <int key="IBDocument.SystemTarget">1280</int>
+ <string key="IBDocument.SystemVersion">12F37</string>
+ <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+ <string key="IBDocument.AppKitVersion">1187.39</string>
+ <string key="IBDocument.HIToolboxVersion">626.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">3742</string>
+ </object>
+ <array key="IBDocument.IntegratedClassDependencies">
+ <string>IBProxyObject</string>
+ <string>IBUIButton</string>
+ <string>IBUIImageView</string>
+ <string>IBUILabel</string>
+ <string>IBUIView</string>
+ </array>
+ <array key="IBDocument.PluginDependencies">
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </array>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
+ </object>
+ <array class="NSMutableArray" key="IBDocument.RootObjects" id="36157550">
+ <object class="IBProxyObject" id="284074690">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="49636071">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="826207736">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">1330</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="IBUIImageView" id="685443561">
+ <reference key="NSNextResponder" ref="826207736"/>
+ <int key="NSvFlags">1330</int>
+ <object class="NSPSMatrix" key="NSFrameMatrix"/>
+ <string key="NSFrame">{{20, 115}, {280, 114}}</string>
+ <reference key="NSSuperview" ref="826207736"/>
+ <reference key="NSNextKeyView" ref="654792355"/>
+ <int key="IBUIContentMode">1</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUILabel" id="941134962">
+ <reference key="NSNextResponder" ref="826207736"/>
+ <int key="NSvFlags">1330</int>
+ <object class="NSPSMatrix" key="NSFrameMatrix"/>
+ <string key="NSFrame">{{20, 66}, {280, 47}}</string>
+ <reference key="NSSuperview" ref="826207736"/>
+ <reference key="NSNextKeyView" ref="685443561"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Select the APPChildViewController.xib file just created. Change the background of the view to Black and reduce the vertical size of the view to 512 points to leave some free space for the dots of the page controller (which has a default </string>
+ <nil key="IBUITextColor"/>
+ <nil key="IBUIHighlightedColor"/>
+ <float key="IBUIMinimumScaleFactor">0.89999997615814209</float>
+ <int key="IBUINumberOfLines">2</int>
+ <int key="IBUILineBreakMode">0</int>
+ <object class="IBUIFontDescription" key="IBUIFontDescription">
+ <string key="name">Helvetica</string>
+ <string key="family">Helvetica</string>
+ <int key="traits">0</int>
+ <double key="pointSize">16</double>
+ </object>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">16</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <double key="preferredMaxLayoutWidth">280</double>
+ </object>
+ <object class="IBUILabel" id="337391083">
+ <reference key="NSNextResponder" ref="826207736"/>
+ <int key="NSvFlags">1318</int>
+ <object class="NSPSMatrix" key="NSFrameMatrix"/>
+ <string key="NSFrame">{{20, 20}, {250, 38}}</string>
+ <reference key="NSSuperview" ref="826207736"/>
+ <reference key="NSNextKeyView" ref="452997759"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Connection</string>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4yMTE3NjQ3MDU5IDAuODE1Njg2Mjc0NSAwLjc4MDM5MjE1NjkAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">0</int>
+ <object class="IBUIFontDescription" key="IBUIFontDescription">
+ <string key="name">STHeitiSC-Medium</string>
+ <string key="family">Heiti SC</string>
+ <int key="traits">2</int>
+ <double key="pointSize">22</double>
+ </object>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">STHeitiSC-Medium</string>
+ <double key="NSSize">22</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <bool key="IBUIAdjustsFontSizeToFit">NO</bool>
+ </object>
+ <object class="IBUIButton" id="292993655">
+ <reference key="NSNextResponder" ref="826207736"/>
+ <int key="NSvFlags">-2147482359</int>
+ <object class="NSPSMatrix" key="NSFrameMatrix"/>
+ <string key="NSFrame">{{194, 373}, {106, 44}}</string>
+ <reference key="NSSuperview" ref="826207736"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <double key="IBUITitleEdgeInsets.top">0.0</double>
+ <double key="IBUITitleEdgeInsets.bottom">0.0</double>
+ <double key="IBUITitleEdgeInsets.left">-24</double>
+ <double key="IBUITitleEdgeInsets.right">0.0</double>
+ <double key="IBUIImageEdgeInsets.top">0.0</double>
+ <double key="IBUIImageEdgeInsets.bottom">0.0</double>
+ <double key="IBUIImageEdgeInsets.left">80</double>
+ <double key="IBUIImageEdgeInsets.right">0.0</double>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MSAwLjUwMTk2MDc4NDMgMAA</bytes>
+ </object>
+ <object class="NSColor" key="IBUIHighlightedTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC45MjE1Njg2Mjc1IDAuNDM5MjE1Njg2MyAwAA</bytes>
+ </object>
+ <string key="IBUIHighlightedTitle">Get started!</string>
+ <string key="IBUINormalTitle">Get started</string>
+ <object class="NSColor" key="IBUIHighlightedTitleShadowColor" id="591734419">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="591734419"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">forwardButton.png</string>
+ </object>
+ <object class="IBUIFontDescription" key="IBUIFontDescription">
+ <int key="type">2</int>
+ <double key="pointSize">14</double>
+ </object>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">HelveticaNeue-Bold</string>
+ <double key="NSSize">14</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ </object>
+ <object class="IBUILabel" id="654792355">
+ <reference key="NSNextResponder" ref="826207736"/>
+ <int key="NSvFlags">1310</int>
+ <object class="NSPSMatrix" key="NSFrameMatrix"/>
+ <string key="NSFrame">{{20, 236.5}, {83, 167.50000000000003}}</string>
+ <reference key="NSSuperview" ref="826207736"/>
+ <reference key="NSNextKeyView" ref="712287771"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">dwdwdaijiajwodjiawjdioajwidjawiodjiawjdiajwidjwijdiawjdiajwd</string>
+ <nil key="IBUITextColor"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">0</int>
+ <int key="IBUINumberOfLines">10</int>
+ <object class="IBUIFontDescription" key="IBUIFontDescription">
+ <string key="name">Helvetica-Oblique</string>
+ <string key="family">Helvetica</string>
+ <int key="traits">1</int>
+ <double key="pointSize">15</double>
+ </object>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Oblique</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <bool key="IBUIAdjustsFontSizeToFit">NO</bool>
+ <double key="preferredMaxLayoutWidth">83</double>
+ </object>
+ <object class="IBUILabel" id="452997759">
+ <reference key="NSNextResponder" ref="826207736"/>
+ <int key="NSvFlags">1313</int>
+ <object class="NSPSMatrix" key="NSFrameMatrix"/>
+ <string key="NSFrame">{{278, 28}, {22, 21}}</string>
+ <reference key="NSSuperview" ref="826207736"/>
+ <reference key="NSNextKeyView" ref="941134962"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MSAwLjUwMTk2MDc4NDMgMAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">1</string>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MSAxIDEAA</bytes>
+ <object class="NSColorSpace" key="NSCustomColorSpace">
+ <int key="NSID">1</int>
+ </object>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">0</int>
+ <int key="IBUITextAlignment">1</int>
+ <object class="IBUIFontDescription" key="IBUIFontDescription">
+ <int key="type">1</int>
+ <double key="pointSize">17</double>
+ </object>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">HelveticaNeue</string>
+ <double key="NSSize">17</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <bool key="IBUIAdjustsFontSizeToFit">NO</bool>
+ </object>
+ <object class="IBUIImageView" id="712287771">
+ <reference key="NSNextResponder" ref="826207736"/>
+ <int key="NSvFlags">1307</int>
+ <object class="NSPSMatrix" key="NSFrameMatrix"/>
+ <string key="NSFrame">{{111, 237.00000000000003}, {189, 167}}</string>
+ <reference key="NSSuperview" ref="826207736"/>
+ <reference key="NSNextKeyView" ref="292993655"/>
+ <int key="IBUIContentMode">1</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </array>
+ <object class="NSPSMatrix" key="NSFrameMatrix"/>
+ <string key="NSFrame">{{0, 20}, {320, 424}}</string>
+ <reference key="NSNextKeyView" ref="337391083"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+ <object class="IBUISimulatedSizeMetrics" key="IBUISimulatedDestinationMetrics">
+ <string key="IBUISimulatedSizeMetricsClass">IBUISimulatedFreeformSizeMetricsSentinel</string>
+ <string key="IBUIDisplayName">Freeform</string>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </array>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <bool key="usesAutoincrementingIDs">NO</bool>
+ <array class="NSMutableArray" key="connectionRecords">
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">hintImage</string>
+ <reference key="source" ref="284074690"/>
+ <reference key="destination" ref="712287771"/>
+ </object>
+ <string key="id">25</string>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">image</string>
+ <reference key="source" ref="284074690"/>
+ <reference key="destination" ref="685443561"/>
+ </object>
+ <string key="id">9</string>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">indexLabl</string>
+ <reference key="source" ref="284074690"/>
+ <reference key="destination" ref="452997759"/>
+ </object>
+ <string key="id">23</string>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">instructionHint</string>
+ <reference key="source" ref="284074690"/>
+ <reference key="destination" ref="654792355"/>
+ </object>
+ <string key="id">18</string>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">instructionText</string>
+ <reference key="source" ref="284074690"/>
+ <reference key="destination" ref="941134962"/>
+ </object>
+ <string key="id">13</string>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">instructionTitle</string>
+ <reference key="source" ref="284074690"/>
+ <reference key="destination" ref="337391083"/>
+ </object>
+ <string key="id">12</string>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">okButton</string>
+ <reference key="source" ref="284074690"/>
+ <reference key="destination" ref="292993655"/>
+ </object>
+ <string key="id">15</string>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="284074690"/>
+ <reference key="destination" ref="826207736"/>
+ </object>
+ <string key="id">3</string>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">okButtonHandleBack:</string>
+ <reference key="source" ref="292993655"/>
+ <reference key="destination" ref="284074690"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <string key="id">16</string>
+ </object>
+ </array>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <array key="orderedObjects">
+ <object class="IBObjectRecord">
+ <string key="id">0</string>
+ <array key="object" id="0"/>
+ <reference key="children" ref="36157550"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">-1</string>
+ <reference key="object" ref="284074690"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">-2</string>
+ <reference key="object" ref="49636071"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">1</string>
+ <reference key="object" ref="826207736"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="685443561"/>
+ <reference ref="941134962"/>
+ <reference ref="337391083"/>
+ <reference ref="292993655"/>
+ <reference ref="654792355"/>
+ <reference ref="452997759"/>
+ <reference ref="712287771"/>
+ </array>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">6</string>
+ <reference key="object" ref="685443561"/>
+ <reference key="parent" ref="826207736"/>
+ <string key="objectName">Image</string>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">7</string>
+ <reference key="object" ref="941134962"/>
+ <reference key="parent" ref="826207736"/>
+ <string key="objectName">Instructions</string>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">8</string>
+ <reference key="object" ref="337391083"/>
+ <reference key="parent" ref="826207736"/>
+ <string key="objectName">Title</string>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">14</string>
+ <reference key="object" ref="292993655"/>
+ <reference key="parent" ref="826207736"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">17</string>
+ <reference key="object" ref="654792355"/>
+ <reference key="parent" ref="826207736"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">22</string>
+ <reference key="object" ref="452997759"/>
+ <reference key="parent" ref="826207736"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">24</string>
+ <reference key="object" ref="712287771"/>
+ <reference key="parent" ref="826207736"/>
+ </object>
+ </array>
+ </object>
+ <dictionary class="NSMutableDictionary" key="flattenedProperties">
+ <string key="-1.CustomClassName">WalkThroughPageViewController</string>
+ <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <boolean value="NO" key="-1.showNotes"/>
+ <string key="-2.CustomClassName">UIResponder</string>
+ <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <boolean value="NO" key="-2.showNotes"/>
+ <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <reference key="1.IBUserGuides" ref="0"/>
+ <boolean value="NO" key="1.showNotes"/>
+ <string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <reference key="14.IBUserGuides" ref="0"/>
+ <boolean value="NO" key="14.showNotes"/>
+ <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <reference key="17.IBUserGuides" ref="0"/>
+ <boolean value="NO" key="17.showNotes"/>
+ <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <reference key="22.IBUserGuides" ref="0"/>
+ <boolean value="NO" key="22.showNotes"/>
+ <string key="24.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <reference key="24.IBUserGuides" ref="0"/>
+ <boolean value="NO" key="24.showNotes"/>
+ <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <reference key="6.IBUserGuides" ref="0"/>
+ <boolean value="NO" key="6.showNotes"/>
+ <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <reference key="7.IBUserGuides" ref="0"/>
+ <boolean value="NO" key="7.showNotes"/>
+ <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <reference key="8.IBUserGuides" ref="0"/>
+ <boolean value="NO" key="8.showNotes"/>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+ <nil key="activeLocalization"/>
+ <dictionary class="NSMutableDictionary" key="localizations"/>
+ <nil key="sourceID"/>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes"/>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <real value="1280" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="4600" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">forwardButton.png</string>
+ <string key="NS.object.0">{11, 26}</string>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">3742</string>
+ </data>
+</archive>
diff --git a/ios/iosremote/iosremote/Views/WalkThroughPageViewMainImageController.xib b/ios/iosremote/iosremote/Views/WalkThroughPageViewMainImageController.xib
index dddc15e91193..78e824dbdf9a 100644
--- a/ios/iosremote/iosremote/Views/WalkThroughPageViewMainImageController.xib
+++ b/ios/iosremote/iosremote/Views/WalkThroughPageViewMainImageController.xib
@@ -1,401 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1552</int>
- <string key="IBDocument.SystemVersion">12E55</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.39</string>
- <string key="IBDocument.HIToolboxVersion">626.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">2083</string>
- </object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>IBProxyObject</string>
- <string>IBUIButton</string>
- <string>IBUIImageView</string>
- <string>IBUILabel</string>
- <string>IBUIView</string>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="805147820">
- <object class="IBProxyObject" id="1063073909">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="125952564">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIView" id="486816108">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">1330</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="IBUIImageView" id="449803563">
- <reference key="NSNextResponder" ref="486816108"/>
- <int key="NSvFlags">1298</int>
- <object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrame">{{0, 70}, {320, 308}}</string>
- <reference key="NSSuperview" ref="486816108"/>
- <reference key="NSNextKeyView" ref="879400829"/>
- <int key="IBUIContentMode">1</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUILabel" id="373486653">
- <reference key="NSNextResponder" ref="486816108"/>
- <int key="NSvFlags">1334</int>
- <object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrame">{{20, 20}, {250, 38}}</string>
- <reference key="NSSuperview" ref="486816108"/>
- <reference key="NSNextKeyView" ref="314594708"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Connection</string>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4yMTE3NjQ3MDU5IDAuODE1Njg2Mjc0NSAwLjc4MDM5MjE1NjkAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">0</int>
- <object class="IBUIFontDescription" key="IBUIFontDescription">
- <string key="name">STHeitiSC-Medium</string>
- <string key="family">Heiti SC</string>
- <int key="traits">2</int>
- <double key="pointSize">22</double>
- </object>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">STHeitiSC-Medium</string>
- <double key="NSSize">22</double>
- <int key="NSfFlags">16</int>
- </object>
- <bool key="IBUIAdjustsFontSizeToFit">NO</bool>
- </object>
- <object class="IBUIButton" id="879400829">
- <reference key="NSNextResponder" ref="486816108"/>
- <int key="NSvFlags">-2147482359</int>
- <object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrame">{{173, 396}, {127, 44}}</string>
- <reference key="NSSuperview" ref="486816108"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <string key="IBUIHighlightedTitle">Get started</string>
- <string key="IBUINormalTitle">Get started</string>
- <object class="NSColor" key="IBUIHighlightedTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC40MTE3NjQ3MDU5IDAuNDE1Njg2Mjc0NSAwLjQyMzUyOTQxMTgAA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAwLjUwMTk2MDc4NDMgMAA</bytes>
- </object>
- <object class="NSColor" key="IBUIHighlightedTitleShadowColor" id="238497645">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwAA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="238497645"/>
- <object class="NSCustomResource" key="IBUINormalBackgroundImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">buttonBackground.png</string>
- </object>
- <object class="IBUIFontDescription" key="IBUIFontDescription">
- <int key="type">2</int>
- <double key="pointSize">18</double>
- </object>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">18</double>
- <int key="NSfFlags">16</int>
- </object>
- </object>
- <object class="IBUILabel" id="314594708">
- <reference key="NSNextResponder" ref="486816108"/>
- <int key="NSvFlags">1313</int>
- <object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrame">{{278, 28}, {22, 21}}</string>
- <reference key="NSSuperview" ref="486816108"/>
- <reference key="NSNextKeyView" ref="449803563"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAwLjUwMTk2MDc4NDMgMAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">1</string>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAxIDEAA</bytes>
- <object class="NSColorSpace" key="NSCustomColorSpace">
- <int key="NSID">1</int>
- </object>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">0</int>
- <int key="IBUITextAlignment">1</int>
- <object class="IBUIFontDescription" key="IBUIFontDescription">
- <int key="type">1</int>
- <double key="pointSize">17</double>
- </object>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica</string>
- <double key="NSSize">17</double>
- <int key="NSfFlags">16</int>
- </object>
- <bool key="IBUIAdjustsFontSizeToFit">NO</bool>
- </object>
- </array>
- <object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrame">{{0, 20}, {320, 460}}</string>
- <reference key="NSSuperview"/>
- <reference key="NSNextKeyView" ref="373486653"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
- <object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics">
- <string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string>
- <object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <array key="dict.sortedKeys">
- <integer value="1"/>
- <integer value="3"/>
- </array>
- <array key="dict.values">
- <string>{320, 480}</string>
- <string>{480, 320}</string>
- </array>
- </object>
- <string key="IBUITargetRuntime">IBCocoaTouchFramework</string>
- <string key="IBUIDisplayName">Retina 3.5 Full Screen</string>
- <int key="IBUIType">0</int>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </array>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <bool key="usesAutoincrementingIDs">NO</bool>
- <array class="NSMutableArray" key="connectionRecords">
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">image</string>
- <reference key="source" ref="1063073909"/>
- <reference key="destination" ref="449803563"/>
- </object>
- <string key="id">9</string>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">indexLabl</string>
- <reference key="source" ref="1063073909"/>
- <reference key="destination" ref="314594708"/>
- </object>
- <string key="id">23</string>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">instructionTitle</string>
- <reference key="source" ref="1063073909"/>
- <reference key="destination" ref="373486653"/>
- </object>
- <string key="id">12</string>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">okButton</string>
- <reference key="source" ref="1063073909"/>
- <reference key="destination" ref="879400829"/>
- </object>
- <string key="id">15</string>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="1063073909"/>
- <reference key="destination" ref="486816108"/>
- </object>
- <string key="id">3</string>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">okButtonHandleBack:</string>
- <reference key="source" ref="879400829"/>
- <reference key="destination" ref="1063073909"/>
- <int key="IBEventType">7</int>
- </object>
- <string key="id">16</string>
- </object>
- </array>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <array key="orderedObjects">
- <object class="IBObjectRecord">
- <string key="id">0</string>
- <array key="object" id="0"/>
- <reference key="children" ref="805147820"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <string key="id">-1</string>
- <reference key="object" ref="1063073909"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <string key="id">-2</string>
- <reference key="object" ref="125952564"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <string key="id">1</string>
- <reference key="object" ref="486816108"/>
- <array class="NSMutableArray" key="children">
- <reference ref="449803563"/>
- <reference ref="373486653"/>
- <reference ref="879400829"/>
- <reference ref="314594708"/>
- </array>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <string key="id">6</string>
- <reference key="object" ref="449803563"/>
- <reference key="parent" ref="486816108"/>
- <string key="objectName">Image</string>
- </object>
- <object class="IBObjectRecord">
- <string key="id">8</string>
- <reference key="object" ref="373486653"/>
- <reference key="parent" ref="486816108"/>
- <string key="objectName">Title</string>
- </object>
- <object class="IBObjectRecord">
- <string key="id">14</string>
- <reference key="object" ref="879400829"/>
- <reference key="parent" ref="486816108"/>
- </object>
- <object class="IBObjectRecord">
- <string key="id">22</string>
- <reference key="object" ref="314594708"/>
- <reference key="parent" ref="486816108"/>
- </object>
- </array>
- </object>
- <dictionary class="NSMutableDictionary" key="flattenedProperties">
- <string key="-1.CustomClassName">WalkThroughPageViewController</string>
- <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <boolean value="NO" key="-1.showNotes"/>
- <string key="-2.CustomClassName">UIResponder</string>
- <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <boolean value="NO" key="-2.showNotes"/>
- <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <reference key="1.IBUserGuides" ref="0"/>
- <boolean value="NO" key="1.showNotes"/>
- <string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <reference key="14.IBUserGuides" ref="0"/>
- <boolean value="NO" key="14.showNotes"/>
- <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <reference key="22.IBUserGuides" ref="0"/>
- <boolean value="NO" key="22.showNotes"/>
- <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <reference key="6.IBUserGuides" ref="0"/>
- <boolean value="NO" key="6.showNotes"/>
- <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <reference key="8.IBUserGuides" ref="0"/>
- <boolean value="NO" key="8.showNotes"/>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
- <nil key="activeLocalization"/>
- <dictionary class="NSMutableDictionary" key="localizations"/>
- <nil key="sourceID"/>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <array class="NSMutableArray" key="referencedPartialClassDescriptions">
- <object class="IBPartialClassDescription">
- <string key="className">WalkThroughPageViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">okButtonHandleBack:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">okButtonHandleBack:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">okButtonHandleBack:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="hintImage">UIImageView</string>
- <string key="image">UIImageView</string>
- <string key="indexLabl">UILabel</string>
- <string key="instructionHint">UILabel</string>
- <string key="instructionText">UILabel</string>
- <string key="instructionTitle">UILabel</string>
- <string key="okButton">UIButton</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="hintImage">
- <string key="name">hintImage</string>
- <string key="candidateClassName">UIImageView</string>
- </object>
- <object class="IBToOneOutletInfo" key="image">
- <string key="name">image</string>
- <string key="candidateClassName">UIImageView</string>
- </object>
- <object class="IBToOneOutletInfo" key="indexLabl">
- <string key="name">indexLabl</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- <object class="IBToOneOutletInfo" key="instructionHint">
- <string key="name">instructionHint</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- <object class="IBToOneOutletInfo" key="instructionText">
- <string key="name">instructionText</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- <object class="IBToOneOutletInfo" key="instructionTitle">
- <string key="name">instructionTitle</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- <object class="IBToOneOutletInfo" key="okButton">
- <string key="name">okButton</string>
- <string key="candidateClassName">UIButton</string>
- </object>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/WalkThroughPageViewController.h</string>
- </object>
- </object>
- </array>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="4600" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <string key="NS.key.0">buttonBackground.png</string>
- <string key="NS.object.0">{45, 45}</string>
- </object>
- <string key="IBCocoaTouchPluginVersion">2083</string>
- </data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+ <dependencies>
+ <deployment defaultVersion="1280" identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
+ </dependencies>
+ <objects>
+ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="WalkThroughPageViewController">
+ <connections>
+ <outlet property="image" destination="6" id="9"/>
+ <outlet property="indexLabl" destination="22" id="23"/>
+ <outlet property="instructionTitle" destination="8" id="12"/>
+ <outlet property="okButton" destination="14" id="15"/>
+ <outlet property="view" destination="1" id="3"/>
+ </connections>
+ </placeholder>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+ <view contentMode="scaleToFill" id="1">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" id="6" userLabel="Image">
+ <rect key="frame" x="0.0" y="70" width="320" height="328"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </imageView>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Connection" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8" userLabel="Title">
+ <rect key="frame" x="20" y="20" width="250" height="39.5"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" name="STHeitiSC-Medium" family="Heiti SC" pointSize="22"/>
+ <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="14">
+ <rect key="frame" x="173" y="416" width="127" height="44"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+ <state key="normal" title="Get started" backgroundImage="buttonBackground.png">
+ <color key="titleColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted" title="Get started">
+ <color key="titleColor" red="0.41176470590000003" green="0.41568627450000001" blue="0.42352941179999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </state>
+ <connections>
+ <action selector="okButtonHandleBack:" destination="-1" eventType="touchUpInside" id="16"/>
+ </connections>
+ </button>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="22">
+ <rect key="frame" x="278" y="28" width="22" height="21"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
+ <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
+ </view>
+ </objects>
+ <resources>
+ <image name="buttonBackground.png" width="45" height="45"/>
+ </resources>
+</document> \ No newline at end of file
diff --git a/ios/iosremote/iosremote/en.lproj/Localizable.strings b/ios/iosremote/iosremote/en.lproj/Localizable.strings
index 0686174dc6ca..037830d77bff 100644
--- a/ios/iosremote/iosremote/en.lproj/Localizable.strings
+++ b/ios/iosremote/iosremote/en.lproj/Localizable.strings
Binary files differ
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index 712addacfd00..3d42e5254593 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -57,14 +57,14 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN">
- <barButtonItem key="leftBarButtonItem" image="more_icon.png" id="Ved-Cp-htB">
+ <barButtonItem key="leftBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
<connections>
- <action selector="onClickMenuButton:" destination="2" id="UgM-Gd-2OX"/>
+ <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
+ <barButtonItem key="rightBarButtonItem" image="gear_transparent_bg.png" id="cmR-3g-K7w">
<connections>
- <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
+ <action selector="onClickMenuButton:" destination="2" id="lvB-fS-gSV"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -110,7 +110,7 @@
<objects>
<viewController id="UPe-3R-KdQ" customClass="PinValidationViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="UGV-xw-Sxo">
- <rect key="frame" x="0.0" y="64" width="320" height="504.00000000000006"/>
+ <rect key="frame" x="0.0" y="64" width="320" height="504"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="f2u-bG-5ak">
@@ -218,10 +218,10 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="ry2-Av-6er" userLabel="slideShowPreview">
- <rect key="frame" x="101" y="393" width="118" height="44"/>
+ <rect key="frame" x="101" y="392" width="118" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
- <state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
+ <state key="normal" title="Settings" backgroundImage="buttonBackground.png">
<color key="titleColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
@@ -445,7 +445,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="bZq-z2-OKU">
- <rect key="frame" x="3.0000000000000031" y="8" width="220" height="167"/>
+ <rect key="frame" x="3" y="8" width="220" height="167"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</imageView>
@@ -606,9 +606,8 @@
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="buttonBackground.png" width="45" height="45"/>
- <image name="buttonBackground.png" width="45" height="45"/>
+ <image name="gear_transparent_bg.png" width="30" height="30"/>
<image name="ic_launcher.png" width="16" height="16"/>
- <image name="more_icon.png" width="30" height="30"/>
<image name="pointer.png" width="143" height="147"/>
<image name="pointer_pushed.png" width="143" height="147"/>
<image name="pushed_next_button.png" width="315" height="220"/>
@@ -616,10 +615,8 @@
<image name="released_next_button.png" width="315" height="220"/>
<image name="released_previous_button.png" width="315" height="220"/>
<image name="timer_clear_btn.png" width="60" height="60"/>
- <image name="timer_clear_btn.png" width="60" height="60"/>
<image name="timer_settime_btn.png" width="60" height="60"/>
<image name="timer_start_btn.png" width="60" height="60"/>
- <image name="timer_start_btn.png" width="60" height="60"/>
</resources>
<color key="tintColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
@@ -629,6 +626,6 @@
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
<segue reference="eIY-4P-1sI"/>
- <segue reference="5gZ-R8-9y7"/>
+ <segue reference="0SL-2n-fWY"/>
</inferredMetricsTieBreakers>
</document> \ No newline at end of file
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings
index fbfb5780baaa..4544efeedf9a 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings
Binary files differ
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard
index 712addacfd00..3d42e5254593 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard
@@ -57,14 +57,14 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN">
- <barButtonItem key="leftBarButtonItem" image="more_icon.png" id="Ved-Cp-htB">
+ <barButtonItem key="leftBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
<connections>
- <action selector="onClickMenuButton:" destination="2" id="UgM-Gd-2OX"/>
+ <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
+ <barButtonItem key="rightBarButtonItem" image="gear_transparent_bg.png" id="cmR-3g-K7w">
<connections>
- <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
+ <action selector="onClickMenuButton:" destination="2" id="lvB-fS-gSV"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -110,7 +110,7 @@
<objects>
<viewController id="UPe-3R-KdQ" customClass="PinValidationViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="UGV-xw-Sxo">
- <rect key="frame" x="0.0" y="64" width="320" height="504.00000000000006"/>
+ <rect key="frame" x="0.0" y="64" width="320" height="504"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="f2u-bG-5ak">
@@ -218,10 +218,10 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="ry2-Av-6er" userLabel="slideShowPreview">
- <rect key="frame" x="101" y="393" width="118" height="44"/>
+ <rect key="frame" x="101" y="392" width="118" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
- <state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
+ <state key="normal" title="Settings" backgroundImage="buttonBackground.png">
<color key="titleColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
@@ -445,7 +445,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="bZq-z2-OKU">
- <rect key="frame" x="3.0000000000000031" y="8" width="220" height="167"/>
+ <rect key="frame" x="3" y="8" width="220" height="167"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</imageView>
@@ -606,9 +606,8 @@
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="buttonBackground.png" width="45" height="45"/>
- <image name="buttonBackground.png" width="45" height="45"/>
+ <image name="gear_transparent_bg.png" width="30" height="30"/>
<image name="ic_launcher.png" width="16" height="16"/>
- <image name="more_icon.png" width="30" height="30"/>
<image name="pointer.png" width="143" height="147"/>
<image name="pointer_pushed.png" width="143" height="147"/>
<image name="pushed_next_button.png" width="315" height="220"/>
@@ -616,10 +615,8 @@
<image name="released_next_button.png" width="315" height="220"/>
<image name="released_previous_button.png" width="315" height="220"/>
<image name="timer_clear_btn.png" width="60" height="60"/>
- <image name="timer_clear_btn.png" width="60" height="60"/>
<image name="timer_settime_btn.png" width="60" height="60"/>
<image name="timer_start_btn.png" width="60" height="60"/>
- <image name="timer_start_btn.png" width="60" height="60"/>
</resources>
<color key="tintColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
@@ -629,6 +626,6 @@
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
<segue reference="eIY-4P-1sI"/>
- <segue reference="5gZ-R8-9y7"/>
+ <segue reference="0SL-2n-fWY"/>
</inferredMetricsTieBreakers>
</document> \ No newline at end of file
diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard
index 20ab7aaa8950..b2b2bd7eb551 100644
--- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard
@@ -59,14 +59,14 @@
<navigationItem key="navigationItem" id="yR1-m8-JWN">
<string key="title">LibreOffice Impress
Contrôle Distant</string>
- <barButtonItem key="leftBarButtonItem" image="more_icon.png" id="Ved-Cp-htB">
+ <barButtonItem key="leftBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
<connections>
- <action selector="onClickMenuButton:" destination="2" id="UgM-Gd-2OX"/>
+ <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
+ <barButtonItem key="rightBarButtonItem" image="gear_transparent_bg.png" id="cmR-3g-K7w">
<connections>
- <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
+ <action selector="onClickMenuButton:" destination="2" id="lvB-fS-gSV"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -220,10 +220,10 @@ Contrôle Distant</string>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="ry2-Av-6er" userLabel="slideShowPreview">
- <rect key="frame" x="101" y="393" width="118" height="44"/>
+ <rect key="frame" x="101" y="392" width="118" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
- <state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
+ <state key="normal" title="Settings" backgroundImage="buttonBackground.png">
<color key="titleColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
@@ -608,8 +608,8 @@ Contrôle Distant</string>
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="buttonBackground.png" width="45" height="45"/>
+ <image name="gear_transparent_bg.png" width="30" height="30"/>
<image name="ic_launcher.png" width="16" height="16"/>
- <image name="more_icon.png" width="30" height="30"/>
<image name="pointer.png" width="143" height="147"/>
<image name="pointer_pushed.png" width="143" height="147"/>
<image name="pushed_next_button.png" width="315" height="220"/>
@@ -628,6 +628,6 @@ Contrôle Distant</string>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
<segue reference="eIY-4P-1sI"/>
- <segue reference="5gZ-R8-9y7"/>
+ <segue reference="0SL-2n-fWY"/>
</inferredMetricsTieBreakers>
</document> \ No newline at end of file
diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard
index 20ab7aaa8950..b2b2bd7eb551 100644
--- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard
+++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard
@@ -59,14 +59,14 @@
<navigationItem key="navigationItem" id="yR1-m8-JWN">
<string key="title">LibreOffice Impress
Contrôle Distant</string>
- <barButtonItem key="leftBarButtonItem" image="more_icon.png" id="Ved-Cp-htB">
+ <barButtonItem key="leftBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
<connections>
- <action selector="onClickMenuButton:" destination="2" id="UgM-Gd-2OX"/>
+ <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
+ <barButtonItem key="rightBarButtonItem" image="gear_transparent_bg.png" id="cmR-3g-K7w">
<connections>
- <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
+ <action selector="onClickMenuButton:" destination="2" id="lvB-fS-gSV"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -220,10 +220,10 @@ Contrôle Distant</string>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="ry2-Av-6er" userLabel="slideShowPreview">
- <rect key="frame" x="101" y="393" width="118" height="44"/>
+ <rect key="frame" x="101" y="392" width="118" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
- <state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
+ <state key="normal" title="Settings" backgroundImage="buttonBackground.png">
<color key="titleColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
@@ -608,8 +608,8 @@ Contrôle Distant</string>
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="buttonBackground.png" width="45" height="45"/>
+ <image name="gear_transparent_bg.png" width="30" height="30"/>
<image name="ic_launcher.png" width="16" height="16"/>
- <image name="more_icon.png" width="30" height="30"/>
<image name="pointer.png" width="143" height="147"/>
<image name="pointer_pushed.png" width="143" height="147"/>
<image name="pushed_next_button.png" width="315" height="220"/>
@@ -628,6 +628,6 @@ Contrôle Distant</string>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
<segue reference="eIY-4P-1sI"/>
- <segue reference="5gZ-R8-9y7"/>
+ <segue reference="0SL-2n-fWY"/>
</inferredMetricsTieBreakers>
</document> \ No newline at end of file
diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard
index 2dd03bb8d56b..262e306fdc5e 100644
--- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard
@@ -57,14 +57,14 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN">
- <barButtonItem key="leftBarButtonItem" image="more_icon.png" id="Ved-Cp-htB">
+ <barButtonItem key="leftBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
<connections>
- <action selector="onClickMenuButton:" destination="2" id="UgM-Gd-2OX"/>
+ <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
+ <barButtonItem key="rightBarButtonItem" image="gear_transparent_bg.png" id="cmR-3g-K7w">
<connections>
- <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
+ <action selector="onClickMenuButton:" destination="2" id="lvB-fS-gSV"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -218,10 +218,10 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="ry2-Av-6er" userLabel="slideShowPreview">
- <rect key="frame" x="101" y="393" width="118" height="44"/>
+ <rect key="frame" x="101" y="392" width="118" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
- <state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
+ <state key="normal" title="Settings" backgroundImage="buttonBackground.png">
<color key="titleColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
@@ -606,8 +606,8 @@
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="buttonBackground.png" width="45" height="45"/>
+ <image name="gear_transparent_bg.png" width="30" height="30"/>
<image name="ic_launcher.png" width="16" height="16"/>
- <image name="more_icon.png" width="30" height="30"/>
<image name="pointer.png" width="143" height="147"/>
<image name="pointer_pushed.png" width="143" height="147"/>
<image name="pushed_next_button.png" width="315" height="220"/>
@@ -626,6 +626,6 @@
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
<segue reference="eIY-4P-1sI"/>
- <segue reference="5gZ-R8-9y7"/>
+ <segue reference="0SL-2n-fWY"/>
</inferredMetricsTieBreakers>
</document> \ No newline at end of file
diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard
index 2dd03bb8d56b..262e306fdc5e 100644
--- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard
+++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard
@@ -57,14 +57,14 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN">
- <barButtonItem key="leftBarButtonItem" image="more_icon.png" id="Ved-Cp-htB">
+ <barButtonItem key="leftBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
<connections>
- <action selector="onClickMenuButton:" destination="2" id="UgM-Gd-2OX"/>
+ <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
+ <barButtonItem key="rightBarButtonItem" image="gear_transparent_bg.png" id="cmR-3g-K7w">
<connections>
- <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
+ <action selector="onClickMenuButton:" destination="2" id="lvB-fS-gSV"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -218,10 +218,10 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="ry2-Av-6er" userLabel="slideShowPreview">
- <rect key="frame" x="101" y="393" width="118" height="44"/>
+ <rect key="frame" x="101" y="392" width="118" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
- <state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
+ <state key="normal" title="Settings" backgroundImage="buttonBackground.png">
<color key="titleColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
@@ -606,8 +606,8 @@
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="buttonBackground.png" width="45" height="45"/>
+ <image name="gear_transparent_bg.png" width="30" height="30"/>
<image name="ic_launcher.png" width="16" height="16"/>
- <image name="more_icon.png" width="30" height="30"/>
<image name="pointer.png" width="143" height="147"/>
<image name="pointer_pushed.png" width="143" height="147"/>
<image name="pushed_next_button.png" width="315" height="220"/>
@@ -626,6 +626,6 @@
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
<segue reference="eIY-4P-1sI"/>
- <segue reference="5gZ-R8-9y7"/>
+ <segue reference="0SL-2n-fWY"/>
</inferredMetricsTieBreakers>
</document> \ No newline at end of file
diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard
index c9bfbbf3625f..85a9f9216c22 100644
--- a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard
+++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard
@@ -67,14 +67,14 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="连接" id="wYh-MF-Ao6">
- <barButtonItem key="leftBarButtonItem" title="帮助" image="more_icon.png" id="JjD-di-uqV">
+ <barButtonItem key="leftBarButtonItem" image="add.png" id="pU6-XF-laS">
<connections>
- <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="k4j-0Z-IEW"/>
+ <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS">
+ <barButtonItem key="rightBarButtonItem" image="more_icon.png" id="AN0-81-gat">
<connections>
- <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
+ <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="MvY-cd-0md"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -217,7 +217,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="02F-Tj-9xO" userLabel="slideShowPreview">
- <rect key="frame" x="201" y="438" width="138" height="44"/>
+ <rect key="frame" x="201" y="437" width="138" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
@@ -477,7 +477,7 @@
</subviews>
</scrollView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
- <rect key="frame" x="731" y="22" width="64" height="53"/>
+ <rect key="frame" x="722" y="23" width="64" height="53"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings b/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings
index 2569a2fc646d..21f72d6d9170 100644
--- a/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings
+++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings
Binary files differ
diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
index c9bfbbf3625f..85a9f9216c22 100644
--- a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
@@ -67,14 +67,14 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="连接" id="wYh-MF-Ao6">
- <barButtonItem key="leftBarButtonItem" title="帮助" image="more_icon.png" id="JjD-di-uqV">
+ <barButtonItem key="leftBarButtonItem" image="add.png" id="pU6-XF-laS">
<connections>
- <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="k4j-0Z-IEW"/>
+ <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS">
+ <barButtonItem key="rightBarButtonItem" image="more_icon.png" id="AN0-81-gat">
<connections>
- <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/>
+ <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="MvY-cd-0md"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -217,7 +217,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="02F-Tj-9xO" userLabel="slideShowPreview">
- <rect key="frame" x="201" y="438" width="138" height="44"/>
+ <rect key="frame" x="201" y="437" width="138" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<state key="normal" title="Preferences" backgroundImage="buttonBackground.png">
@@ -477,7 +477,7 @@
</subviews>
</scrollView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
- <rect key="frame" x="731" y="22" width="64" height="53"/>
+ <rect key="frame" x="722" y="23" width="64" height="53"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
generated by cgit (git 2.34.1) at 2024-07-16 05:40:31 +0000