mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace more_icon for ipad

Browse Source
This commit is contained in:
Siqi LIU 2013-08-31 12:00:23 +02:00
parent ca2edc1368
commit fd8ef5e7ac
10 changed files with 119 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ios/.DS_Store vendored
View File

Binary file not shown.

22
ios/iosremote/en.lproj/iPad_autosize.storyboard
View File

@ -365,28 +365,23 @@
<action selector="stopWatchClear:" destination="VQa-vM-8pF" eventType="touchUpInside" id="aD5-Wp-WRC"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38">
<rect key="frame" x="683" y="898" width="97" height="59"/>
<rect key="frame" x="736" y="23" width="58" height="59"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" backgroundImage="gear.png">
<state key="normal" backgroundImage="more_ipad.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="gear_pressed">
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="0Zm-gv-gne"/>
</connections>
</button>
<view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE">
<rect key="frame" x="0.0" y="0.0" width="768" height="1004"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.95294117647058818" green="0.54008895985401462" blue="0.070588235294117646" alpha="1" colorSpace="calibratedRGB"/>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</subviews>
<color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
@ -405,7 +400,6 @@
<outlet property="slideNumber" destination="wWm-KR-C5L" id="Vb0-Wv-6gb"/>
<outlet property="startButton" destination="8iO-H3-CJ7" id="ym1-Hg-BPE"/>
<outlet property="timeLabel" destination="dtc-vP-agf" id="WsH-Gm-dBN"/>
<outlet property="welcome_blocking_page" destination="jX5-gj-cqE" id="5dH-dT-AG4"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -514,8 +508,7 @@
<image name="Default.png" width="320" height="480"/>
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="gear.png" width="55" height="35"/>
<image name="gear_pressed" width="16" height="16"/>
<image name="more_ipad.png" width="60" height="60"/>
<image name="nextButton_normal.png" width="42" height="230"/>
<image name="nextButton_pressed.png" width="42" height="230"/>
<image name="previousButton_normal.png" width="42" height="230"/>
@ -527,9 +520,7 @@
<class className="BasePresentationViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/>
<relationships>
<relationship kind="action" name="nextSlideAction:"/>
<relationship kind="action" name="popOverUp:"/>
<relationship kind="action" name="previousSlideAction:"/>
<relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/>
<relationship kind="outlet" name="NotesView" candidateClass="UIView"/>
<relationship kind="outlet" name="clearButton" candidateClass="UIButton"/>
@ -542,7 +533,6 @@
<relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
<relationship kind="outlet" name="startButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/>
</relationships>
</class>
<class className="EditableTableViewCell" superclassName="UITableViewCell">

22
ios/iosremote/en.lproj/iPad_autosize_old.storyboard
View File

@ -365,28 +365,23 @@
<action selector="stopWatchClear:" destination="VQa-vM-8pF" eventType="touchUpInside" id="aD5-Wp-WRC"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38">
<rect key="frame" x="683" y="898" width="97" height="59"/>
<rect key="frame" x="736" y="23" width="58" height="59"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" backgroundImage="gear.png">
<state key="normal" backgroundImage="more_ipad.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="gear_pressed">
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="0Zm-gv-gne"/>
</connections>
</button>
<view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE">
<rect key="frame" x="0.0" y="0.0" width="768" height="1004"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.95294117647058818" green="0.54008895985401462" blue="0.070588235294117646" alpha="1" colorSpace="calibratedRGB"/>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</subviews>
<color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
@ -405,7 +400,6 @@
<outlet property="slideNumber" destination="wWm-KR-C5L" id="Vb0-Wv-6gb"/>
<outlet property="startButton" destination="8iO-H3-CJ7" id="ym1-Hg-BPE"/>
<outlet property="timeLabel" destination="dtc-vP-agf" id="WsH-Gm-dBN"/>
<outlet property="welcome_blocking_page" destination="jX5-gj-cqE" id="5dH-dT-AG4"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -514,8 +508,7 @@
<image name="Default.png" width="320" height="480"/>
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="gear.png" width="55" height="35"/>
<image name="gear_pressed" width="16" height="16"/>
<image name="more_ipad.png" width="120" height="120"/>
<image name="nextButton_normal.png" width="42" height="230"/>
<image name="nextButton_pressed.png" width="42" height="230"/>
<image name="previousButton_normal.png" width="42" height="230"/>
@ -527,9 +520,7 @@
<class className="BasePresentationViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/>
<relationships>
<relationship kind="action" name="nextSlideAction:"/>
<relationship kind="action" name="popOverUp:"/>
<relationship kind="action" name="previousSlideAction:"/>
<relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/>
<relationship kind="outlet" name="NotesView" candidateClass="UIView"/>
<relationship kind="outlet" name="clearButton" candidateClass="UIButton"/>
@ -542,7 +533,6 @@
<relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
<relationship kind="outlet" name="startButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/>
</relationships>
</class>
<class className="EditableTableViewCell" superclassName="UITableViewCell">

22
ios/iosremote/fr.lproj/iPad_autosize.storyboard
View File

@ -365,28 +365,23 @@
<action selector="stopWatchClear:" destination="VQa-vM-8pF" eventType="touchUpInside" id="aD5-Wp-WRC"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38">
<rect key="frame" x="683" y="898" width="97" height="59"/>
<rect key="frame" x="736" y="23" width="58" height="59"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" backgroundImage="gear.png">
<state key="normal" backgroundImage="more_ipad.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="gear_pressed">
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="0Zm-gv-gne"/>
</connections>
</button>
<view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE">
<rect key="frame" x="0.0" y="0.0" width="768" height="1004"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.95294117647058818" green="0.54008895985401462" blue="0.070588235294117646" alpha="1" colorSpace="calibratedRGB"/>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</subviews>
<color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
@ -405,7 +400,6 @@
<outlet property="slideNumber" destination="wWm-KR-C5L" id="Vb0-Wv-6gb"/>
<outlet property="startButton" destination="8iO-H3-CJ7" id="ym1-Hg-BPE"/>
<outlet property="timeLabel" destination="dtc-vP-agf" id="WsH-Gm-dBN"/>
<outlet property="welcome_blocking_page" destination="jX5-gj-cqE" id="5dH-dT-AG4"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -514,8 +508,7 @@
<image name="Default.png" width="320" height="480"/>
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="gear.png" width="55" height="35"/>
<image name="gear_pressed" width="16" height="16"/>
<image name="more_ipad.png" width="120" height="120"/>
<image name="nextButton_normal.png" width="42" height="230"/>
<image name="nextButton_pressed.png" width="42" height="230"/>
<image name="previousButton_normal.png" width="42" height="230"/>
@ -527,9 +520,7 @@
<class className="BasePresentationViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/>
<relationships>
<relationship kind="action" name="nextSlideAction:"/>
<relationship kind="action" name="popOverUp:"/>
<relationship kind="action" name="previousSlideAction:"/>
<relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/>
<relationship kind="outlet" name="NotesView" candidateClass="UIView"/>
<relationship kind="outlet" name="clearButton" candidateClass="UIButton"/>
@ -542,7 +533,6 @@
<relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
<relationship kind="outlet" name="startButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/>
</relationships>
</class>
<class className="EditableTableViewCell" superclassName="UITableViewCell">

22
ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
View File

@ -365,28 +365,23 @@
<action selector="stopWatchClear:" destination="VQa-vM-8pF" eventType="touchUpInside" id="aD5-Wp-WRC"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38">
<rect key="frame" x="683" y="898" width="97" height="59"/>
<rect key="frame" x="736" y="23" width="58" height="59"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" backgroundImage="gear.png">
<state key="normal" backgroundImage="more_ipad.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="gear_pressed">
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="0Zm-gv-gne"/>
</connections>
</button>
<view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE">
<rect key="frame" x="0.0" y="0.0" width="768" height="1004"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.95294117647058818" green="0.54008895985401462" blue="0.070588235294117646" alpha="1" colorSpace="calibratedRGB"/>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</subviews>
<color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
@ -405,7 +400,6 @@
<outlet property="slideNumber" destination="wWm-KR-C5L" id="Vb0-Wv-6gb"/>
<outlet property="startButton" destination="8iO-H3-CJ7" id="ym1-Hg-BPE"/>
<outlet property="timeLabel" destination="dtc-vP-agf" id="WsH-Gm-dBN"/>
<outlet property="welcome_blocking_page" destination="jX5-gj-cqE" id="5dH-dT-AG4"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -514,8 +508,7 @@
<image name="Default.png" width="320" height="480"/>
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="gear.png" width="55" height="35"/>
<image name="gear_pressed" width="16" height="16"/>
<image name="more_ipad.png" width="60" height="60"/>
<image name="nextButton_normal.png" width="42" height="230"/>
<image name="nextButton_pressed.png" width="42" height="230"/>
<image name="previousButton_normal.png" width="42" height="230"/>
@ -527,9 +520,7 @@
<class className="BasePresentationViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/>
<relationships>
<relationship kind="action" name="nextSlideAction:"/>
<relationship kind="action" name="popOverUp:"/>
<relationship kind="action" name="previousSlideAction:"/>
<relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/>
<relationship kind="outlet" name="NotesView" candidateClass="UIView"/>
<relationship kind="outlet" name="clearButton" candidateClass="UIButton"/>
@ -542,7 +533,6 @@
<relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
<relationship kind="outlet" name="startButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/>
</relationships>
</class>
<class className="EditableTableViewCell" superclassName="UITableViewCell">

18
ios/iosremote/iosremote.xcodeproj/project.pbxproj
View File

@ -107,6 +107,8 @@
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 */; };
8CAF3DE317D1D5D700F931E5 /* more_ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAF3DE117D1D5D600F931E5 /* more_ipad.png */; };
8CAF3DE417D1D5D700F931E5 /* more_ipad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAF3DE217D1D5D700F931E5 /* more_ipad@2x.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 */; };
@ -275,6 +277,8 @@
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>"; };
8CAF3DE117D1D5D600F931E5 /* more_ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = more_ipad.png; path = iosremote/more_ipad.png; sourceTree = "<group>"; };
8CAF3DE217D1D5D700F931E5 /* more_ipad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "more_ipad@2x.png"; path = "iosremote/more_ipad@2x.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>"; };
@ -415,6 +419,8 @@
8C06B31917B7EC62002F5CF8 /* assets */ = {
isa = PBXGroup;
children = (
8CAF3DE117D1D5D600F931E5 /* more_ipad.png */,
8CAF3DE217D1D5D700F931E5 /* more_ipad@2x.png */,
8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png */,
8CAF3DDE17D0DFFD00F931E5 /* WTcontrol~iphone.png */,
8C94E69517CF7BF000B4848D /* WTPairingScreenshot.png */,
@ -495,6 +501,7 @@
8C1A170217A28AB900B4BB3C /* Shared */ = {
isa = PBXGroup;
children = (
8CD6EC6A17CBBAFF0071827A /* Views */,
8C1A170717A28DE800B4BB3C /* Models */,
8C1A170617A28DDF00B4BB3C /* Support */,
8C1A170517A28B0E00B4BB3C /* Library */,
@ -516,6 +523,10 @@
8C1A170417A28AFD00B4BB3C /* Controllers */ = {
isa = PBXGroup;
children = (
8CD6EC6517CBBAF40071827A /* WalkThroughPageViewController.h */,
8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */,
8CD6EC6E17CC3FA00071827A /* WalkThroughContainerViewController.h */,
8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */,
57FE71E11785C61300B50125 /* pinValidation_vc.h */,
57FE71E21785C61400B50125 /* pinValidation_vc.m */,
5753DD9717834D7100DB71BB /* newServer_vc.h */,
@ -602,7 +613,6 @@
8C1A170917A28E6500B4BB3C /* iPhone */ = {
isa = PBXGroup;
children = (
8CD6EC6A17CBBAFF0071827A /* Views */,
8CAD658917A2F00500CFB661 /* Controllers */,
57DF0A83178FFFAB008B2D3D /* iPhone_autosize.storyboard */,
);
@ -648,10 +658,6 @@
57701741178B0A6900B99793 /* slideShowSwipeInList_iphone.m */,
8CAD658A17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.h */,
8CAD658B17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.m */,
8CD6EC6517CBBAF40071827A /* WalkThroughPageViewController.h */,
8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */,
8CD6EC6E17CC3FA00071827A /* WalkThroughContainerViewController.h */,
8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */,
);
name = Controllers;
sourceTree = "<group>";
@ -788,6 +794,8 @@
8C94E69617CF7BF000B4848D /* WTPairingScreenshot.png in Resources */,
8CAF3DDF17D0DFFD00F931E5 /* WTcontrol~ipad.png in Resources */,
8CAF3DE017D0DFFD00F931E5 /* WTcontrol~iphone.png in Resources */,
8CAF3DE317D1D5D700F931E5 /* more_ipad.png in Resources */,
8CAF3DE417D1D5D700F931E5 /* more_ipad@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
ios/iosremote/iosremote/BasePresentationViewController.h
View File

@ -28,7 +28,7 @@
// Welcome page
-(void)startConnectionModal:(id)sender;
- (void) setWelcomePageVisible:(BOOL)visible;
@property (weak, nonatomic) IBOutlet UIView *welcome_blocking_page;
@property (strong, nonatomic) UIView *welcome_blocking_page;
@property (weak, nonatomic) IBOutlet UITableView *horizontalTableView;
@property (weak, nonatomic) IBOutlet UIButton *startButton;

11
ios/iosremote/iosremote/BasePresentationViewController.m
View File

@ -269,6 +269,12 @@
- (void)viewDidLoad
{
[super viewDidLoad];
self.welcome_blocking_page = [[UIView alloc] initWithFrame:self.view.bounds];
self.welcome_blocking_page.backgroundColor = [UIColor orangeColor];
self.welcome_blocking_page.autoresizingMask = UIViewAutoresizingFlexibleHeight |
UIViewAutoresizingFlexibleWidth;
[self.view addSubview:self.welcome_blocking_page];
self.masterIsHiddenWhenLandscape = YES;
[self.currentSlideImageView setTag:CURRENT_SLIDE_IMAGEVIEW];
[self.NoteWebView setTag:CURRENT_SLIDE_NOTES];
@ -475,12 +481,13 @@
static BOOL isBlank = NO;
#pragma mark - Popover toggle
- (IBAction)popOverUp:(id)sender {
CGPoint popOverPoint = CGPointMake([self.gearButton.superview convertPoint:self.gearButton.center toView:self.view].x, [self.gearButton.superview convertPoint:self.gearButton.center toView:self.view].y - self.gearButton.frame.size.height/2);
if (!isBlank) {
[PopoverView showPopoverAtPoint:self.gearButton.frame.origin inView:self.view withStringArray:
[PopoverView showPopoverAtPoint:popOverPoint inView:self.view withStringArray:
[NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", @"Popover option"), NSLocalizedString(@"Restart", @"Popover option"), NSLocalizedString(@"Blank Screen", @"Popover option"), nil]
delegate:self];
} else {
[PopoverView showPopoverAtPoint:self.gearButton.frame.origin inView:self.view withStringArray:
[PopoverView showPopoverAtPoint:popOverPoint inView:self.view withStringArray:
[NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", @"Popover option"), NSLocalizedString(@"Restart", @"Popover option"), NSLocalizedString(@"Resume from blank Screen", @"Popover option"), nil]
delegate:self];
}

22
ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard
View File

@ -365,28 +365,23 @@
<action selector="stopWatchClear:" destination="VQa-vM-8pF" eventType="touchUpInside" id="aD5-Wp-WRC"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38">
<rect key="frame" x="683" y="898" width="97" height="59"/>
<rect key="frame" x="736" y="23" width="58" height="59"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" backgroundImage="gear.png">
<state key="normal" backgroundImage="more_ipad.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="gear_pressed">
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="0Zm-gv-gne"/>
</connections>
</button>
<view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE">
<rect key="frame" x="0.0" y="0.0" width="768" height="1004"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.95294117647058818" green="0.54008895985401462" blue="0.070588235294117646" alpha="1" colorSpace="calibratedRGB"/>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</subviews>
<color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
@ -405,7 +400,6 @@
<outlet property="slideNumber" destination="wWm-KR-C5L" id="Vb0-Wv-6gb"/>
<outlet property="startButton" destination="8iO-H3-CJ7" id="ym1-Hg-BPE"/>
<outlet property="timeLabel" destination="dtc-vP-agf" id="WsH-Gm-dBN"/>
<outlet property="welcome_blocking_page" destination="jX5-gj-cqE" id="5dH-dT-AG4"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -514,8 +508,7 @@
<image name="Default.png" width="320" height="480"/>
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="gear.png" width="55" height="35"/>
<image name="gear_pressed" width="16" height="16"/>
<image name="more_ipad.png" width="120" height="120"/>
<image name="nextButton_normal.png" width="42" height="230"/>
<image name="nextButton_pressed.png" width="42" height="230"/>
<image name="previousButton_normal.png" width="42" height="230"/>
@ -527,9 +520,7 @@
<class className="BasePresentationViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/>
<relationships>
<relationship kind="action" name="nextSlideAction:"/>
<relationship kind="action" name="popOverUp:"/>
<relationship kind="action" name="previousSlideAction:"/>
<relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/>
<relationship kind="outlet" name="NotesView" candidateClass="UIView"/>
<relationship kind="outlet" name="clearButton" candidateClass="UIButton"/>
@ -542,7 +533,6 @@
<relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
<relationship kind="outlet" name="startButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/>
</relationships>
</class>
<class className="EditableTableViewCell" superclassName="UITableViewCell">

22
ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
View File

@ -365,28 +365,23 @@
<action selector="stopWatchClear:" destination="VQa-vM-8pF" eventType="touchUpInside" id="aD5-Wp-WRC"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38">
<rect key="frame" x="683" y="898" width="97" height="59"/>
<rect key="frame" x="736" y="23" width="58" height="59"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" backgroundImage="gear.png">
<state key="normal" backgroundImage="more_ipad.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="gear_pressed">
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="0Zm-gv-gne"/>
</connections>
</button>
<view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE">
<rect key="frame" x="0.0" y="0.0" width="768" height="1004"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.95294117647058818" green="0.54008895985401462" blue="0.070588235294117646" alpha="1" colorSpace="calibratedRGB"/>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</subviews>
<color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
@ -405,7 +400,6 @@
<outlet property="slideNumber" destination="wWm-KR-C5L" id="Vb0-Wv-6gb"/>
<outlet property="startButton" destination="8iO-H3-CJ7" id="ym1-Hg-BPE"/>
<outlet property="timeLabel" destination="dtc-vP-agf" id="WsH-Gm-dBN"/>
<outlet property="welcome_blocking_page" destination="jX5-gj-cqE" id="5dH-dT-AG4"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -514,8 +508,7 @@
<image name="Default.png" width="320" height="480"/>
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="gear.png" width="55" height="35"/>
<image name="gear_pressed" width="16" height="16"/>
<image name="more_ipad.png" width="60" height="60"/>
<image name="nextButton_normal.png" width="42" height="230"/>
<image name="nextButton_pressed.png" width="42" height="230"/>
<image name="previousButton_normal.png" width="42" height="230"/>
@ -527,9 +520,7 @@
<class className="BasePresentationViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/>
<relationships>
<relationship kind="action" name="nextSlideAction:"/>
<relationship kind="action" name="popOverUp:"/>
<relationship kind="action" name="previousSlideAction:"/>
<relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/>
<relationship kind="outlet" name="NotesView" candidateClass="UIView"/>
<relationship kind="outlet" name="clearButton" candidateClass="UIButton"/>
@ -542,7 +533,6 @@
<relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
<relationship kind="outlet" name="startButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/>
</relationships>
</class>
<class className="EditableTableViewCell" superclassName="UITableViewCell">