summaryrefslogtreecommitdiff
path: root/ios
diff options
context:
space:
mode:
authorSiqi LIU <me@siqi.fr>2013-08-30 16:15:42 +0200
committerSiqi LIU <me@siqi.fr>2013-08-30 16:15:42 +0200
commit8cce70a5fa5afb0edd72acc398812226531c558f (patch)
tree0acc3becd8c887db76f350d876854c2deee587c9 /ios
parent53ee8666e0adf1c9a78977ffb38e13bd44b21538 (diff)
control guide image for ipad
Change-Id: I987e427bbc98b1e4f838bd95ae13c53e604aed65
Diffstat (limited to 'ios')
-rw-r--r--ios/iosremote/fr.lproj/iPad_autosize_old.storyboard4
-rw-r--r--ios/iosremote/iosremote/WTcontrol~ipad.pngbin0 -> 105364 bytes
-rw-r--r--ios/iosremote/iosremote/WTcontrol~iphone.pngbin0 -> 245786 bytes
-rw-r--r--ios/iosremote/iosremote/WalkThroughPageViewController.m5
-rw-r--r--ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard4
5 files changed, 8 insertions, 5 deletions
diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
index 0ff6f47e4af2..1a2681334a5d 100644
--- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
@@ -174,8 +174,8 @@
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Titre du document" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5">
<rect key="frame" x="20" y="20" width="500" height="168"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="27"/>
+ <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
diff --git a/ios/iosremote/iosremote/WTcontrol~ipad.png b/ios/iosremote/iosremote/WTcontrol~ipad.png
new file mode 100644
index 000000000000..76de002faf93
--- /dev/null
+++ b/ios/iosremote/iosremote/WTcontrol~ipad.png
Binary files differ
diff --git a/ios/iosremote/iosremote/WTcontrol~iphone.png b/ios/iosremote/iosremote/WTcontrol~iphone.png
new file mode 100644
index 000000000000..0aa3dcf94a7b
--- /dev/null
+++ b/ios/iosremote/iosremote/WTcontrol~iphone.png
Binary files differ
diff --git a/ios/iosremote/iosremote/WalkThroughPageViewController.m b/ios/iosremote/iosremote/WalkThroughPageViewController.m
index e209ff0f2d7f..4b91e25ae74b 100644
--- a/ios/iosremote/iosremote/WalkThroughPageViewController.m
+++ b/ios/iosremote/iosremote/WalkThroughPageViewController.m
@@ -44,7 +44,10 @@
[self.hintImage setImage:[UIImage imageNamed:@"WTPairing"]];
break;
case 2:{
- [self.image setImage:[UIImage imageNamed:@"WTcontrol"]];
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+ [self.image setImage:[UIImage imageNamed:@"WTcontrol~iphone"]];
+ else
+ [self.image setImage:[UIImage imageNamed:@"WTcontrol~ipad"]];
// self.instructionText.text = @"Control your presentation at your fingertips!";
self.instructionTitle.text = @"Control";
UIImage *backgroundImage = [UIImage imageNamed:@"buttonBackground"];
diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
index 1371cfba2073..2b4c9a62fbb8 100644
--- a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
@@ -174,8 +174,8 @@
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="演示文稿标题" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5">
<rect key="frame" x="20" y="20" width="500" height="168"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="27"/>
+ <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>