dev/null |binary ios/iosremote/.DS_Store |binary ios/iosremote/fr.lproj/iPad_autosize_old.storyboard | 4 ++-- ios/iosremote/iosremote.xcodeproj/project.pbxproj | 12 ++++++++---- ios/iosremote/iosremote/WTcontrol~ipad.png |binary ios/iosremote/iosremote/WTcontrol~iphone.png |binary ios/iosremote/iosremote/WalkThroughPageViewController.m | 5 ++++- ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard | 4 ++-- 8 files changed, 16 insertions(+), 9 deletions(-)
New commits: commit 756b6040ca24702cca2482086e358080e20eb6d2 Author: Siqi LIU <[email protected]> Date: Fri Aug 30 16:16:51 2013 +0200 remove old WalkthroughControl image Change-Id: Id5680fde392a731da15889d3869e234fbf072068 diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store index a75cbd5..85b6552 100644 Binary files a/ios/iosremote/.DS_Store and b/ios/iosremote/.DS_Store differ diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index d5cf0ab..c5770a0 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -105,6 +105,8 @@ 8CAD659C17A3EFE700CFB661 /* arrow_right.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659817A3EFE700CFB661 /* arrow_right.png */; }; 8CAD659D17A3EFE700CFB661 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659917A3EFE700CFB661 /* [email protected] */; }; 8CAD65A017A3F76300CFB661 /* slideShowSwipeInList_ipad.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */; }; + 8CAF3DDF17D0DFFD00F931E5 /* WTcontrol~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png */; }; + 8CAF3DE017D0DFFD00F931E5 /* WTcontrol~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAF3DDE17D0DFFD00F931E5 /* WTcontrol~iphone.png */; }; 8CD6EC6817CBBAF40071827A /* WalkThroughPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */; }; 8CD6EC6917CBBAF40071827A /* WalkThroughPageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6717CBBAF40071827A /* WalkThroughPageViewController.xib */; }; 8CD6EC7017CC3FA00071827A /* WalkThroughContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */; }; @@ -117,7 +119,6 @@ 8CD6EC8217CF40200071827A /* WTconnecting.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC8117CF40200071827A /* WTconnecting.png */; }; 8CD6EC8417CF46930071827A /* WTPairing.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC8317CF46930071827A /* WTPairing.png */; }; 8CD6EC8817CF4ABA0071827A /* WalkThroughPageViewMainImageController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC8717CF4ABA0071827A /* WalkThroughPageViewMainImageController.xib */; }; - 8CD6EC8A17CF67300071827A /* WTcontrol.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC8917CF67300071827A /* WTcontrol.png */; }; BE9EBD071765BF0800283FD2 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE9EBD061765BF0800283FD2 /* CoreImage.framework */; }; /* End PBXBuildFile section */ @@ -272,6 +273,8 @@ 8CAD659917A3EFE700CFB661 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "iosremote/[email protected]"; sourceTree = "<group>"; }; 8CAD659E17A3F76300CFB661 /* slideShowSwipeInList_ipad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slideShowSwipeInList_ipad.h; path = iosremote/slideShowSwipeInList_ipad.h; sourceTree = "<group>"; }; 8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = slideShowSwipeInList_ipad.m; path = iosremote/slideShowSwipeInList_ipad.m; sourceTree = "<group>"; }; + 8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "WTcontrol~ipad.png"; path = "iosremote/WTcontrol~ipad.png"; sourceTree = "<group>"; }; + 8CAF3DDE17D0DFFD00F931E5 /* WTcontrol~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "WTcontrol~iphone.png"; path = "iosremote/WTcontrol~iphone.png"; sourceTree = "<group>"; }; 8CD6EC6517CBBAF40071827A /* WalkThroughPageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WalkThroughPageViewController.h; path = iosremote/WalkThroughPageViewController.h; sourceTree = "<group>"; }; 8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WalkThroughPageViewController.m; path = iosremote/WalkThroughPageViewController.m; sourceTree = "<group>"; }; 8CD6EC6717CBBAF40071827A /* WalkThroughPageViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = WalkThroughPageViewController.xib; path = iosremote/WalkThroughPageViewController.xib; sourceTree = "<group>"; }; @@ -286,7 +289,6 @@ 8CD6EC8117CF40200071827A /* WTconnecting.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = WTconnecting.png; path = iosremote/WTconnecting.png; sourceTree = "<group>"; }; 8CD6EC8317CF46930071827A /* WTPairing.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = WTPairing.png; path = iosremote/WTPairing.png; sourceTree = "<group>"; }; 8CD6EC8717CF4ABA0071827A /* WalkThroughPageViewMainImageController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = WalkThroughPageViewMainImageController.xib; path = iosremote/WalkThroughPageViewMainImageController.xib; sourceTree = "<group>"; }; - 8CD6EC8917CF67300071827A /* WTcontrol.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = WTcontrol.png; path = iosremote/WTcontrol.png; sourceTree = "<group>"; }; BE9EBD061765BF0800283FD2 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -413,8 +415,9 @@ 8C06B31917B7EC62002F5CF8 /* assets */ = { isa = PBXGroup; children = ( + 8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png */, + 8CAF3DDE17D0DFFD00F931E5 /* WTcontrol~iphone.png */, 8C94E69517CF7BF000B4848D /* WTPairingScreenshot.png */, - 8CD6EC8917CF67300071827A /* WTcontrol.png */, 8CD6EC8317CF46930071827A /* WTPairing.png */, 8CD6EC8117CF40200071827A /* WTconnecting.png */, 8CD6EC7F17CF35A70071827A /* WTConnectionHotspot.png */, @@ -782,8 +785,9 @@ 8CD6EC8217CF40200071827A /* WTconnecting.png in Resources */, 8CD6EC8417CF46930071827A /* WTPairing.png in Resources */, 8CD6EC8817CF4ABA0071827A /* WalkThroughPageViewMainImageController.xib in Resources */, - 8CD6EC8A17CF67300071827A /* WTcontrol.png in Resources */, 8C94E69617CF7BF000B4848D /* WTPairingScreenshot.png in Resources */, + 8CAF3DDF17D0DFFD00F931E5 /* WTcontrol~ipad.png in Resources */, + 8CAF3DE017D0DFFD00F931E5 /* WTcontrol~iphone.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/iosremote/iosremote/WTcontrol.png b/ios/iosremote/iosremote/WTcontrol.png deleted file mode 100644 index 07cfec1..0000000 Binary files a/ios/iosremote/iosremote/WTcontrol.png and /dev/null differ commit 8cce70a5fa5afb0edd72acc398812226531c558f Author: Siqi LIU <[email protected]> Date: Fri Aug 30 16:15:42 2013 +0200 control guide image for ipad Change-Id: I987e427bbc98b1e4f838bd95ae13c53e604aed65 diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard index 0ff6f47..1a26813 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 0000000..76de002 Binary files /dev/null and b/ios/iosremote/iosremote/WTcontrol~ipad.png differ diff --git a/ios/iosremote/iosremote/WTcontrol~iphone.png b/ios/iosremote/iosremote/WTcontrol~iphone.png new file mode 100644 index 0000000..0aa3dcf Binary files /dev/null and b/ios/iosremote/iosremote/WTcontrol~iphone.png differ diff --git a/ios/iosremote/iosremote/WalkThroughPageViewController.m b/ios/iosremote/iosremote/WalkThroughPageViewController.m index e209ff0..4b91e25 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 1371cfb..2b4c9a6 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> commit 53ee8666e0adf1c9a78977ffb38e13bd44b21538 Author: Siqi LIU <[email protected]> Date: Fri Aug 30 16:06:11 2013 +0200 iPad control how-to page updated Change-Id: I422b864f0c2d78e9328faf401fe862fb57e0cd6a diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store index 4b3efd8..a75cbd5 100644 Binary files a/ios/iosremote/.DS_Store and b/ios/iosremote/.DS_Store differ
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
