diff options
| author | Siqi LIU <me@siqi.fr> | 2013-08-29 16:52:32 +0200 |
|---|---|---|
| committer | Siqi LIU <me@siqi.fr> | 2013-08-29 16:52:32 +0200 |
| commit | 743dd31c4cf45a6a807024f2366312e51f0bc07d (patch) | |
| tree | a1db4ff7292b44072a9388cf7ef6f2a3ee87845d /ios | |
| parent | 2410b3c3ddc6fea02dadd56b39bb1181312c383a (diff) | |
add walkthrough guide for iPhone
Diffstat (limited to 'ios')
44 files changed, 875 insertions, 496 deletions
diff --git a/ios/.DS_Store b/ios/.DS_Store Binary files differindex 2939bd132ba0..3776bea3d936 100644 --- a/ios/.DS_Store +++ b/ios/.DS_Store diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store Binary files differindex 0c7ddbc5616b..22b37bbe6ec8 100644 --- a/ios/iosremote/.DS_Store +++ b/ios/iosremote/.DS_Store diff --git a/ios/iosremote/UserDefaults.plist b/ios/iosremote/UserDefaults.plist index d7714cf2f31d..a1048659f22e 100644 --- a/ios/iosremote/UserDefaults.plist +++ b/ios/iosremote/UserDefaults.plist @@ -2,6 +2,8 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> + <key>HOWTO_GUIDE_SEEN</key> + <false/> <key>TOUCH_POINTER_ENABLED</key> <true/> <key>TIMER_AUTOSTART_ENABLED</key> diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard index 6424745862de..5cecd2b3f424 100644 --- a/ios/iosremote/en.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard @@ -43,11 +43,6 @@ </connections> </tableView> <navigationItem key="navigationItem" title="Connect" id="wYh-MF-Ao6"> - <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="yai-U0-WT9"> - <connections> - <action selector="cancelModalView:" destination="5QV-E7-KNT" id="rSl-Rp-xQb"/> - </connections> - </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS"> <connections> <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/> @@ -299,7 +294,7 @@ <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Lecturer's Notes " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Lecturer's Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> <rect key="frame" x="20" y="0.0" width="754" height="31"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509800000003" blue="0.074509803920000006" alpha="1" colorSpace="calibratedRGB"/> @@ -386,36 +381,6 @@ <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"/> - <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> - <rect key="frame" x="264" y="95" width="240" height="248"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES"/> - </imageView> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="1Yr-C2-huW"> - <rect key="frame" x="294" y="610" width="180" height="77"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> - <state key="normal" title="Connect" backgroundImage="navBarButtonNormal.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="highlighted"> - <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="startConnectionModal:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="8aS-7k-5Ga"/> - </connections> - </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LibreOffice Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="101" y="471" width="566" height="131"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> - <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <nil key="highlightedColor"/> - <color key="shadowColor" cocoaTouchSystemColor="tableCellGroupedBackgroundColor"/> - <size key="shadowOffset" width="0.0" height="0.0"/> - </label> - </subviews> <color key="backgroundColor" red="0.89411764709999997" green="0.43529411759999997" blue="0.1215686275" alpha="1" colorSpace="calibratedRGB"/> </view> </subviews> @@ -436,9 +401,6 @@ <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"/> - <outlet property="welcome_connect_button" destination="1Yr-C2-huW" id="fm5-IB-oyc"/> - <outlet property="welcome_label" destination="yiP-rQ-s7i" id="rGp-xL-dH2"/> - <outlet property="welcome_libO_icon" destination="Qe8-38-thk" id="w3C-h1-OL0"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/> @@ -473,14 +435,14 @@ <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> - <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="4.5" width="233" height="163"/> + <rect key="frame" x="44" y="4" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="151" width="29" height="21"/> + <rect key="frame" x="-605" y="150" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -532,8 +494,6 @@ <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="libO_icon.png" width="598" height="598"/> - <image name="navBarButtonNormal.png" width="30" height="20"/> <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"/> @@ -548,7 +508,6 @@ <relationship kind="action" name="nextSlideAction:"/> <relationship kind="action" name="popOverUp:"/> <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="action" name="startConnectionModal:"/> <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> @@ -562,9 +521,6 @@ <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> - <relationship kind="outlet" name="welcome_connect_button" candidateClass="UIButton"/> - <relationship kind="outlet" name="welcome_label" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_libO_icon" candidateClass="UIImageView"/> </relationships> </class> <class className="EditableTableViewCell" superclassName="UITableViewCell"> diff --git a/ios/iosremote/en.lproj/iPad_autosize.strings b/ios/iosremote/en.lproj/iPad_autosize.strings Binary files differindex 2f5d771d33b8..45a89d456490 100644 --- a/ios/iosremote/en.lproj/iPad_autosize.strings +++ b/ios/iosremote/en.lproj/iPad_autosize.strings diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard index 6424745862de..5cecd2b3f424 100644 --- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard @@ -43,11 +43,6 @@ </connections> </tableView> <navigationItem key="navigationItem" title="Connect" id="wYh-MF-Ao6"> - <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="yai-U0-WT9"> - <connections> - <action selector="cancelModalView:" destination="5QV-E7-KNT" id="rSl-Rp-xQb"/> - </connections> - </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS"> <connections> <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/> @@ -299,7 +294,7 @@ <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Lecturer's Notes " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Lecturer's Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> <rect key="frame" x="20" y="0.0" width="754" height="31"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509800000003" blue="0.074509803920000006" alpha="1" colorSpace="calibratedRGB"/> @@ -386,36 +381,6 @@ <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"/> - <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> - <rect key="frame" x="264" y="95" width="240" height="248"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES"/> - </imageView> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="1Yr-C2-huW"> - <rect key="frame" x="294" y="610" width="180" height="77"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> - <state key="normal" title="Connect" backgroundImage="navBarButtonNormal.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="highlighted"> - <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="startConnectionModal:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="8aS-7k-5Ga"/> - </connections> - </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LibreOffice Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="101" y="471" width="566" height="131"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> - <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <nil key="highlightedColor"/> - <color key="shadowColor" cocoaTouchSystemColor="tableCellGroupedBackgroundColor"/> - <size key="shadowOffset" width="0.0" height="0.0"/> - </label> - </subviews> <color key="backgroundColor" red="0.89411764709999997" green="0.43529411759999997" blue="0.1215686275" alpha="1" colorSpace="calibratedRGB"/> </view> </subviews> @@ -436,9 +401,6 @@ <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"/> - <outlet property="welcome_connect_button" destination="1Yr-C2-huW" id="fm5-IB-oyc"/> - <outlet property="welcome_label" destination="yiP-rQ-s7i" id="rGp-xL-dH2"/> - <outlet property="welcome_libO_icon" destination="Qe8-38-thk" id="w3C-h1-OL0"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/> @@ -473,14 +435,14 @@ <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> - <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="4.5" width="233" height="163"/> + <rect key="frame" x="44" y="4" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="151" width="29" height="21"/> + <rect key="frame" x="-605" y="150" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -532,8 +494,6 @@ <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="libO_icon.png" width="598" height="598"/> - <image name="navBarButtonNormal.png" width="30" height="20"/> <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"/> @@ -548,7 +508,6 @@ <relationship kind="action" name="nextSlideAction:"/> <relationship kind="action" name="popOverUp:"/> <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="action" name="startConnectionModal:"/> <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> @@ -562,9 +521,6 @@ <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> - <relationship kind="outlet" name="welcome_connect_button" candidateClass="UIButton"/> - <relationship kind="outlet" name="welcome_label" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_libO_icon" candidateClass="UIImageView"/> </relationships> </class> <class className="EditableTableViewCell" superclassName="UITableViewCell"> diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard index a2cc0f57ff35..1c90a18280a9 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard @@ -43,11 +43,6 @@ </connections> </tableView> <navigationItem key="navigationItem" title="Connecter" id="wYh-MF-Ao6"> - <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="yai-U0-WT9"> - <connections> - <action selector="cancelModalView:" destination="5QV-E7-KNT" id="rSl-Rp-xQb"/> - </connections> - </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS"> <connections> <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/> @@ -299,7 +294,7 @@ <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Notes " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> <rect key="frame" x="20" y="0.0" width="754" height="31"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509800000003" blue="0.074509803920000006" alpha="1" colorSpace="calibratedRGB"/> @@ -386,38 +381,6 @@ <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"/> - <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> - <rect key="frame" x="264" y="95" width="240" height="248"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES"/> - </imageView> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="1Yr-C2-huW"> - <rect key="frame" x="294" y="610" width="180" height="77"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> - <state key="normal" title="Connecter" backgroundImage="navBarButtonNormal.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="highlighted"> - <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="startConnectionModal:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="8aS-7k-5Ga"/> - </connections> - </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="101" y="471" width="566" height="131"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <string key="text">LibreOffice Impress -Contrôle Distant</string> - <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> - <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <nil key="highlightedColor"/> - <color key="shadowColor" cocoaTouchSystemColor="tableCellGroupedBackgroundColor"/> - <size key="shadowOffset" width="0.0" height="0.0"/> - </label> - </subviews> <color key="backgroundColor" red="0.89411764709999997" green="0.43529411759999997" blue="0.1215686275" alpha="1" colorSpace="calibratedRGB"/> </view> </subviews> @@ -438,9 +401,6 @@ Contrôle Distant</string> <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"/> - <outlet property="welcome_connect_button" destination="1Yr-C2-huW" id="fm5-IB-oyc"/> - <outlet property="welcome_label" destination="yiP-rQ-s7i" id="rGp-xL-dH2"/> - <outlet property="welcome_libO_icon" destination="Qe8-38-thk" id="w3C-h1-OL0"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/> @@ -475,14 +435,14 @@ Contrôle Distant</string> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> - <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="4.5" width="233" height="163"/> + <rect key="frame" x="44" y="4" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="151" width="29" height="21"/> + <rect key="frame" x="-605" y="150" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -534,8 +494,6 @@ Contrôle Distant</string> <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="libO_icon.png" width="598" height="598"/> - <image name="navBarButtonNormal.png" width="30" height="20"/> <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"/> @@ -550,7 +508,6 @@ Contrôle Distant</string> <relationship kind="action" name="nextSlideAction:"/> <relationship kind="action" name="popOverUp:"/> <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="action" name="startConnectionModal:"/> <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> @@ -564,9 +521,6 @@ Contrôle Distant</string> <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> - <relationship kind="outlet" name="welcome_connect_button" candidateClass="UIButton"/> - <relationship kind="outlet" name="welcome_label" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_libO_icon" candidateClass="UIImageView"/> </relationships> </class> <class className="EditableTableViewCell" superclassName="UITableViewCell"> diff --git a/ios/iosremote/fr.lproj/iPad_autosize.strings b/ios/iosremote/fr.lproj/iPad_autosize.strings Binary files differindex 6598a3411ef7..e4398b49e47f 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize.strings +++ b/ios/iosremote/fr.lproj/iPad_autosize.strings diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard index a2cc0f57ff35..1c90a18280a9 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard @@ -43,11 +43,6 @@ </connections> </tableView> <navigationItem key="navigationItem" title="Connecter" id="wYh-MF-Ao6"> - <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="yai-U0-WT9"> - <connections> - <action selector="cancelModalView:" destination="5QV-E7-KNT" id="rSl-Rp-xQb"/> - </connections> - </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS"> <connections> <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/> @@ -299,7 +294,7 @@ <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Notes " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> <rect key="frame" x="20" y="0.0" width="754" height="31"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509800000003" blue="0.074509803920000006" alpha="1" colorSpace="calibratedRGB"/> @@ -386,38 +381,6 @@ <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"/> - <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> - <rect key="frame" x="264" y="95" width="240" height="248"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES"/> - </imageView> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="1Yr-C2-huW"> - <rect key="frame" x="294" y="610" width="180" height="77"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> - <state key="normal" title="Connecter" backgroundImage="navBarButtonNormal.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="highlighted"> - <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="startConnectionModal:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="8aS-7k-5Ga"/> - </connections> - </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="101" y="471" width="566" height="131"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <string key="text">LibreOffice Impress -Contrôle Distant</string> - <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> - <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <nil key="highlightedColor"/> - <color key="shadowColor" cocoaTouchSystemColor="tableCellGroupedBackgroundColor"/> - <size key="shadowOffset" width="0.0" height="0.0"/> - </label> - </subviews> <color key="backgroundColor" red="0.89411764709999997" green="0.43529411759999997" blue="0.1215686275" alpha="1" colorSpace="calibratedRGB"/> </view> </subviews> @@ -438,9 +401,6 @@ Contrôle Distant</string> <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"/> - <outlet property="welcome_connect_button" destination="1Yr-C2-huW" id="fm5-IB-oyc"/> - <outlet property="welcome_label" destination="yiP-rQ-s7i" id="rGp-xL-dH2"/> - <outlet property="welcome_libO_icon" destination="Qe8-38-thk" id="w3C-h1-OL0"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/> @@ -475,14 +435,14 @@ Contrôle Distant</string> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> - <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="4.5" width="233" height="163"/> + <rect key="frame" x="44" y="4" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="151" width="29" height="21"/> + <rect key="frame" x="-605" y="150" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -534,8 +494,6 @@ Contrôle Distant</string> <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="libO_icon.png" width="598" height="598"/> - <image name="navBarButtonNormal.png" width="30" height="20"/> <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"/> @@ -550,7 +508,6 @@ Contrôle Distant</string> <relationship kind="action" name="nextSlideAction:"/> <relationship kind="action" name="popOverUp:"/> <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="action" name="startConnectionModal:"/> <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> @@ -564,9 +521,6 @@ Contrôle Distant</string> <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> - <relationship kind="outlet" name="welcome_connect_button" candidateClass="UIButton"/> - <relationship kind="outlet" name="welcome_label" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_libO_icon" candidateClass="UIImageView"/> </relationships> </class> <class className="EditableTableViewCell" superclassName="UITableViewCell"> diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index fa36f51f8e3b..d5cf0ab560eb 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -94,6 +94,7 @@ 8C26E5D317A5AFE8007DA4B7 /* slideshowRail.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C26E5D117A5AFE8007DA4B7 /* slideshowRail.png */; }; 8C26E5D417A5AFE8007DA4B7 /* slideshowRail@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C26E5D217A5AFE8007DA4B7 /* slideshowRail@2x.png */; }; 8C26E5D717A68154007DA4B7 /* stopWatch.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C26E5D617A68154007DA4B7 /* stopWatch.m */; }; + 8C94E69617CF7BF000B4848D /* WTPairingScreenshot.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C94E69517CF7BF000B4848D /* WTPairingScreenshot.png */; }; 8CAD658517A2E84A00CFB661 /* MainSplitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD658417A2E84A00CFB661 /* MainSplitViewController.m */; }; 8CAD658817A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD658717A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.m */; }; 8CAD658C17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD658B17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.m */; }; @@ -104,6 +105,19 @@ 8CAD659C17A3EFE700CFB661 /* arrow_right.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659817A3EFE700CFB661 /* arrow_right.png */; }; 8CAD659D17A3EFE700CFB661 /* arrow_right@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659917A3EFE700CFB661 /* arrow_right@2x.png */; }; 8CAD65A017A3F76300CFB661 /* slideShowSwipeInList_ipad.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */; }; + 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 */; }; + 8CD6EC7717CE31560071827A /* forwardButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC7517CE31550071827A /* forwardButton.png */; }; + 8CD6EC7817CE31560071827A /* forwardButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC7617CE31550071827A /* forwardButton@2x.png */; }; + 8CD6EC7B17CE358B0071827A /* buttonBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC7917CE358B0071827A /* buttonBackground.png */; }; + 8CD6EC7C17CE358B0071827A /* buttonBackground@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC7A17CE358B0071827A /* buttonBackground@2x.png */; }; + 8CD6EC7E17CF2CE70071827A /* WTconnection.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC7D17CF2CE70071827A /* WTconnection.png */; }; + 8CD6EC8017CF35A70071827A /* WTConnectionHotspot.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC7F17CF35A70071827A /* WTConnectionHotspot.png */; }; + 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 */ @@ -241,6 +255,7 @@ 8C26E5D217A5AFE8007DA4B7 /* slideshowRail@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "slideshowRail@2x.png"; sourceTree = "<group>"; }; 8C26E5D517A68154007DA4B7 /* stopWatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stopWatch.h; path = iosremote/stopWatch.h; sourceTree = "<group>"; }; 8C26E5D617A68154007DA4B7 /* stopWatch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = stopWatch.m; path = iosremote/stopWatch.m; sourceTree = "<group>"; }; + 8C94E69517CF7BF000B4848D /* WTPairingScreenshot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = WTPairingScreenshot.png; path = iosremote/WTPairingScreenshot.png; sourceTree = "<group>"; }; 8CAD658317A2E84A00CFB661 /* MainSplitViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainSplitViewController.h; path = iosremote/MainSplitViewController.h; sourceTree = "<group>"; }; 8CAD658417A2E84A00CFB661 /* MainSplitViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MainSplitViewController.m; path = iosremote/MainSplitViewController.m; sourceTree = "<group>"; }; 8CAD658617A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slideShowPreviewTable_vc_ipad.h; path = iosremote/slideShowPreviewTable_vc_ipad.h; sourceTree = "<group>"; }; @@ -257,6 +272,21 @@ 8CAD659917A3EFE700CFB661 /* arrow_right@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrow_right@2x.png"; path = "iosremote/arrow_right@2x.png"; 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>"; }; + 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>"; }; + 8CD6EC6E17CC3FA00071827A /* WalkThroughContainerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WalkThroughContainerViewController.h; sourceTree = "<group>"; }; + 8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WalkThroughContainerViewController.m; sourceTree = "<group>"; }; + 8CD6EC7517CE31550071827A /* forwardButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = forwardButton.png; path = iosremote/forwardButton.png; sourceTree = "<group>"; }; + 8CD6EC7617CE31550071827A /* forwardButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "forwardButton@2x.png"; path = "iosremote/forwardButton@2x.png"; sourceTree = "<group>"; }; + 8CD6EC7917CE358B0071827A /* buttonBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = buttonBackground.png; path = iosremote/buttonBackground.png; sourceTree = "<group>"; }; + 8CD6EC7A17CE358B0071827A /* buttonBackground@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "buttonBackground@2x.png"; path = "iosremote/buttonBackground@2x.png"; sourceTree = "<group>"; }; + 8CD6EC7D17CF2CE70071827A /* WTconnection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = WTconnection.png; path = iosremote/WTconnection.png; sourceTree = "<group>"; }; + 8CD6EC7F17CF35A70071827A /* WTConnectionHotspot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = WTConnectionHotspot.png; path = iosremote/WTConnectionHotspot.png; sourceTree = "<group>"; }; + 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 */ @@ -383,6 +413,16 @@ 8C06B31917B7EC62002F5CF8 /* assets */ = { isa = PBXGroup; children = ( + 8C94E69517CF7BF000B4848D /* WTPairingScreenshot.png */, + 8CD6EC8917CF67300071827A /* WTcontrol.png */, + 8CD6EC8317CF46930071827A /* WTPairing.png */, + 8CD6EC8117CF40200071827A /* WTconnecting.png */, + 8CD6EC7F17CF35A70071827A /* WTConnectionHotspot.png */, + 8CD6EC7D17CF2CE70071827A /* WTconnection.png */, + 8CD6EC7917CE358B0071827A /* buttonBackground.png */, + 8CD6EC7A17CE358B0071827A /* buttonBackground@2x.png */, + 8CD6EC7517CE31550071827A /* forwardButton.png */, + 8CD6EC7617CE31550071827A /* forwardButton@2x.png */, 8C19F44C17B20426005BDB61 /* add@2x.png */, 8C19F44817B1FEFD005BDB61 /* gear_transparent_bg.png */, 8C19F44917B1FEFE005BDB61 /* gear_transparent_bg@2x.png */, @@ -559,6 +599,7 @@ 8C1A170917A28E6500B4BB3C /* iPhone */ = { isa = PBXGroup; children = ( + 8CD6EC6A17CBBAFF0071827A /* Views */, 8CAD658917A2F00500CFB661 /* Controllers */, 57DF0A83178FFFAB008B2D3D /* iPhone_autosize.storyboard */, ); @@ -604,10 +645,23 @@ 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>"; }; + 8CD6EC6A17CBBAFF0071827A /* Views */ = { + isa = PBXGroup; + children = ( + 8CD6EC8717CF4ABA0071827A /* WalkThroughPageViewMainImageController.xib */, + 8CD6EC6717CBBAF40071827A /* WalkThroughPageViewController.xib */, + ); + name = Views; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -718,6 +772,18 @@ 8C19F44B17B1FEFE005BDB61 /* gear_transparent_bg@2x.png in Resources */, 8C19F44D17B20427005BDB61 /* add@2x.png in Resources */, 8C06B31D17B7EC83002F5CF8 /* Localizable.strings in Resources */, + 8CD6EC6917CBBAF40071827A /* WalkThroughPageViewController.xib in Resources */, + 8CD6EC7717CE31560071827A /* forwardButton.png in Resources */, + 8CD6EC7817CE31560071827A /* forwardButton@2x.png in Resources */, + 8CD6EC7B17CE358B0071827A /* buttonBackground.png in Resources */, + 8CD6EC7C17CE358B0071827A /* buttonBackground@2x.png in Resources */, + 8CD6EC7E17CF2CE70071827A /* WTconnection.png in Resources */, + 8CD6EC8017CF35A70071827A /* WTConnectionHotspot.png in Resources */, + 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 */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -778,6 +844,8 @@ 8C0323AB17A943720037432E /* UIImageView+setImageAnimated.m in Sources */, 8C19F42F17B05089005BDB61 /* LibONavigationController.m in Sources */, 8C19F43617B10D49005BDB61 /* UIViewController+LibOStyling.m in Sources */, + 8CD6EC6817CBBAF40071827A /* WalkThroughPageViewController.m in Sources */, + 8CD6EC7017CC3FA00071827A /* WalkThroughContainerViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist index 43ca70386c57..7900cb0b1f4e 100644 --- a/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ b/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist @@ -8,7 +8,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "iosremote/Communication/CommunicationManager.m" - timestampString = "398443855.270743" + timestampString = "399020934.030192" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "90" diff --git a/ios/iosremote/iosremote/.DS_Store b/ios/iosremote/iosremote/.DS_Store Binary files differindex b692f12911d6..b7fa8dd7ad4f 100644 --- a/ios/iosremote/iosremote/.DS_Store +++ b/ios/iosremote/iosremote/.DS_Store diff --git a/ios/iosremote/iosremote/BasePresentationViewController.h b/ios/iosremote/iosremote/BasePresentationViewController.h index 673de5f70b90..3aa28bcac3b3 100644 --- a/ios/iosremote/iosremote/BasePresentationViewController.h +++ b/ios/iosremote/iosremote/BasePresentationViewController.h @@ -26,12 +26,9 @@ @property BOOL masterIsHiddenWhenLandscape; // Welcome page --(IBAction)startConnectionModal:(id)sender; +-(void)startConnectionModal:(id)sender; - (void) setWelcomePageVisible:(BOOL)visible; @property (weak, nonatomic) IBOutlet UIView *welcome_blocking_page; -@property (weak, nonatomic) IBOutlet UIImageView *welcome_libO_icon; -@property (weak, nonatomic) IBOutlet UIButton *welcome_connect_button; -@property (weak, nonatomic) IBOutlet UILabel *welcome_label; @property (weak, nonatomic) IBOutlet UITableView *horizontalTableView; @property (weak, nonatomic) IBOutlet UIButton *startButton; diff --git a/ios/iosremote/iosremote/BasePresentationViewController.m b/ios/iosremote/iosremote/BasePresentationViewController.m index 72567bef039b..37691ffac055 100644 --- a/ios/iosremote/iosremote/BasePresentationViewController.m +++ b/ios/iosremote/iosremote/BasePresentationViewController.m @@ -201,7 +201,7 @@ # pragma mark - welcome page --(IBAction)startConnectionModal:(id)sender +-(void)startConnectionModal:(id)sender { UIStoryboard *mainStoryboard = [UIStoryboard storyboardWithName:@"iPad_autosize" bundle: nil]; @@ -375,6 +375,7 @@ [self presentViewController:sspt animated:YES completion:^{}]; } }]; + [self startConnectionModal:nil]; } - (void) setWelcomePageVisible:(BOOL)visible @@ -429,7 +430,6 @@ [self setNextButton:nil]; [self setSlideNumber:nil]; [self setSlideNumber:nil]; - [self setWelcome_connect_button:nil]; [[NSNotificationCenter defaultCenter] removeObserver:self.slideShowFinishedObserver]; [[NSNotificationCenter defaultCenter] removeObserver:self.slideShowImageNoteReadyObserver]; @@ -437,7 +437,6 @@ [self setStartButton:nil]; [self setClearButton:nil]; [self setTimeLabel:nil]; - [self setWelcome_label:nil]; [self setGearButton:nil]; [super viewDidUnload]; } @@ -523,7 +522,9 @@ static BOOL isBlank = NO; #pragma mark - Reconnection - (void) didReceiveDisconnection { - [self dismissViewControllerAnimated:YES completion:nil]; + [self dismissViewControllerAnimated:YES completion:^{ + [self startConnectionModal:nil]; + }]; if (self.welcome_blocking_page.isHidden == YES) { [self setWelcomePageVisible:YES]; diff --git a/ios/iosremote/iosremote/ControlVariables.h b/ios/iosremote/iosremote/ControlVariables.h index 5df82217aa8b..83a87cd3c3b5 100644 --- a/ios/iosremote/iosremote/ControlVariables.h +++ b/ios/iosremote/iosremote/ControlVariables.h @@ -37,7 +37,9 @@ #define kHorizontalTableCellHighlightedBackgroundColor [UIColor colorWithRed:0 green:0.4745098 blue:0.29019808 alpha:0.9] -#define kTintColor [UIColor colorWithRed:0 green:0.462745098 blue:1 alpha:1.0] +#define kTintColor [UIColor orangeColor] + +#define kTextTintColor [UIColor colorWithRed:0 green:0.462745098 blue:1 alpha:1.0] #define kAppTitleFont [UIFont fontWithName:@"HelveticaNeue-Medium" size:20.0f] diff --git a/ios/iosremote/iosremote/add.png b/ios/iosremote/iosremote/add.png Binary files differindex 1847ffea3d65..c8045fb1be91 100644 --- a/ios/iosremote/iosremote/add.png +++ b/ios/iosremote/iosremote/add.png diff --git a/ios/iosremote/iosremote/add@2x.png b/ios/iosremote/iosremote/add@2x.png Binary files differindex 685d204017ab..04054f908f62 100644 --- a/ios/iosremote/iosremote/add@2x.png +++ b/ios/iosremote/iosremote/add@2x.png diff --git a/ios/iosremote/iosremote/backButton.png b/ios/iosremote/iosremote/backButton.png Binary files differindex f6a3193cbad3..84b8d662cfc6 100644 --- a/ios/iosremote/iosremote/backButton.png +++ b/ios/iosremote/iosremote/backButton.png diff --git a/ios/iosremote/iosremote/backButton@2x.png b/ios/iosremote/iosremote/backButton@2x.png Binary files differindex 9c8b1327e91b..27e6632ac2d6 100644 --- a/ios/iosremote/iosremote/backButton@2x.png +++ b/ios/iosremote/iosremote/backButton@2x.png diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index 21db2eb32933..a8e95be5cc11 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -1,10 +1,26 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> + <deployment version="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> + <!--Walk Through Container View Controller--> + <scene sceneID="zBS-q0-LyD"> + <objects> + <viewController id="xbC-af-Ssw" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> + <view key="view" contentMode="scaleToFill" id="EpC-35-Pc5"> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + </view> + <navigationItem key="navigationItem" id="ZQV-e8-dtc"/> + </viewController> + <placeholder placeholderIdentifier="IBFirstResponder" id="WjV-ox-pc7" userLabel="First Responder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="80" y="-992"/> + </scene> <!--Server list vc - Impress Remote--> <scene sceneID="5"> <objects> @@ -43,6 +59,11 @@ </connections> </tableView> <navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN"> + <barButtonItem key="leftBarButtonItem" title="Help" id="Ved-Cp-htB"> + <connections> + <segue destination="xbC-af-Ssw" kind="push" id="mx5-BO-ZzL"/> + </connections> + </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg"> <connections> <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/> @@ -53,6 +74,7 @@ <outlet property="serverTable" destination="naQ-T4-jWV" id="hd3-Vm-fk6"/> <segue destination="UPe-3R-KdQ" kind="push" identifier="pinValidation" id="UQQ-pV-3o3"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="SlideShowPreview" id="EWS-Nn-mQc"/> + <segue destination="xbC-af-Ssw" kind="push" identifier="howtoSegue" id="gc3-eP-dlL"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/> @@ -79,19 +101,16 @@ <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Waiting for validation from Impress..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lSD-BG-kVe"> - <rect key="frame" x="33" y="380" width="276" height="21"/> - <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <nil key="highlightedColor"/> - </label> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> + <rect key="frame" x="6" y="345" width="309" height="134"/> + <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + </imageView> </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> <navigationItem key="navigationItem" id="c3o-oA-oin"/> <connections> <outlet property="pinLabel" destination="f2u-bG-5ak" id="Y7S-6h-awe"/> - <outlet property="statusLabel" destination="lSD-BG-kVe" id="mmM-4x-ktw"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="pinValidated" id="pTl-ua-9pr"/> </connections> </viewController> @@ -299,7 +318,7 @@ <rect key="frame" x="-13" y="191" width="346" height="269"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Lecturer's Notes " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Lecturer's Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> <rect key="frame" x="20" y="0.0" width="306" height="21"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509803921566" blue="0.074509803921568626" alpha="1" colorSpace="calibratedRGB"/> @@ -335,44 +354,47 @@ <rect key="frame" x="0.0" y="460" width="320" height="88"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> - <rect key="frame" x="20" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_previous_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> + <rect key="frame" x="20" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Previous" backgroundImage="released_previous_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_previous_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="previousSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="DAf-Qp-7KW"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> - <rect key="frame" x="207" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_next_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> + <rect key="frame" x="207" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Next" backgroundImage="released_next_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_next_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="nextSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="qTl-Ib-3Z8"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="kMb-xm-ope"> - <rect key="frame" x="132" y="14" width="59" height="60"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="kMb-xm-ope"> + <rect key="frame" x="132" y="14" width="59" height="67"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" title="Button" image="pointer.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Pointer" backgroundImage="pointer.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> - <state key="highlighted" image="pointer_pushed.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <state key="highlighted" backgroundImage="pointer_pushed.png"> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="35J-B2-GIE"/> @@ -422,8 +444,8 @@ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="24"/> + <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> </subviews> @@ -502,6 +524,7 @@ </scenes> <resources> <image name="Default-568h.png" width="640" height="1136"/> + <image name="WTPairingScreenshot.png" width="481" height="199"/> <image name="add.png" width="30" height="30"/> <image name="ic_launcher.png" width="16" height="16"/> <image name="pointer.png" width="143" height="147"/> @@ -513,13 +536,84 @@ <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="accPointerAction:"/> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="EWS-Nn-mQc"/> + <segue reference="mx5-BO-ZzL"/> + <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> </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 Binary files differindex 4b4da9ff1d22..35bb01a86844 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard index 21db2eb32933..a8e95be5cc11 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard @@ -1,10 +1,26 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> + <deployment version="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> + <!--Walk Through Container View Controller--> + <scene sceneID="zBS-q0-LyD"> + <objects> + <viewController id="xbC-af-Ssw" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> + <view key="view" contentMode="scaleToFill" id="EpC-35-Pc5"> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + </view> + <navigationItem key="navigationItem" id="ZQV-e8-dtc"/> + </viewController> + <placeholder placeholderIdentifier="IBFirstResponder" id="WjV-ox-pc7" userLabel="First Responder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="80" y="-992"/> + </scene> <!--Server list vc - Impress Remote--> <scene sceneID="5"> <objects> @@ -43,6 +59,11 @@ </connections> </tableView> <navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN"> + <barButtonItem key="leftBarButtonItem" title="Help" id="Ved-Cp-htB"> + <connections> + <segue destination="xbC-af-Ssw" kind="push" id="mx5-BO-ZzL"/> + </connections> + </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg"> <connections> <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/> @@ -53,6 +74,7 @@ <outlet property="serverTable" destination="naQ-T4-jWV" id="hd3-Vm-fk6"/> <segue destination="UPe-3R-KdQ" kind="push" identifier="pinValidation" id="UQQ-pV-3o3"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="SlideShowPreview" id="EWS-Nn-mQc"/> + <segue destination="xbC-af-Ssw" kind="push" identifier="howtoSegue" id="gc3-eP-dlL"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/> @@ -79,19 +101,16 @@ <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Waiting for validation from Impress..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lSD-BG-kVe"> - <rect key="frame" x="33" y="380" width="276" height="21"/> - <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <nil key="highlightedColor"/> - </label> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> + <rect key="frame" x="6" y="345" width="309" height="134"/> + <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + </imageView> </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> <navigationItem key="navigationItem" id="c3o-oA-oin"/> <connections> <outlet property="pinLabel" destination="f2u-bG-5ak" id="Y7S-6h-awe"/> - <outlet property="statusLabel" destination="lSD-BG-kVe" id="mmM-4x-ktw"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="pinValidated" id="pTl-ua-9pr"/> </connections> </viewController> @@ -299,7 +318,7 @@ <rect key="frame" x="-13" y="191" width="346" height="269"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Lecturer's Notes " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Lecturer's Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> <rect key="frame" x="20" y="0.0" width="306" height="21"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509803921566" blue="0.074509803921568626" alpha="1" colorSpace="calibratedRGB"/> @@ -335,44 +354,47 @@ <rect key="frame" x="0.0" y="460" width="320" height="88"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> - <rect key="frame" x="20" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_previous_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> + <rect key="frame" x="20" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Previous" backgroundImage="released_previous_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_previous_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="previousSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="DAf-Qp-7KW"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> - <rect key="frame" x="207" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_next_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> + <rect key="frame" x="207" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Next" backgroundImage="released_next_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_next_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="nextSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="qTl-Ib-3Z8"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="kMb-xm-ope"> - <rect key="frame" x="132" y="14" width="59" height="60"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="kMb-xm-ope"> + <rect key="frame" x="132" y="14" width="59" height="67"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" title="Button" image="pointer.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Pointer" backgroundImage="pointer.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> - <state key="highlighted" image="pointer_pushed.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <state key="highlighted" backgroundImage="pointer_pushed.png"> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="35J-B2-GIE"/> @@ -422,8 +444,8 @@ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="24"/> + <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> </subviews> @@ -502,6 +524,7 @@ </scenes> <resources> <image name="Default-568h.png" width="640" height="1136"/> + <image name="WTPairingScreenshot.png" width="481" height="199"/> <image name="add.png" width="30" height="30"/> <image name="ic_launcher.png" width="16" height="16"/> <image name="pointer.png" width="143" height="147"/> @@ -513,13 +536,84 @@ <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="accPointerAction:"/> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="EWS-Nn-mQc"/> + <segue reference="mx5-BO-ZzL"/> + <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> </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 72e6795427bd..f7a701d5e3db 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard @@ -1,10 +1,26 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> + <deployment version="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> + <!--Walk Through Container View Controller--> + <scene sceneID="zBS-q0-LyD"> + <objects> + <viewController id="xbC-af-Ssw" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> + <view key="view" contentMode="scaleToFill" id="EpC-35-Pc5"> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + </view> + <navigationItem key="navigationItem" id="ZQV-e8-dtc"/> + </viewController> + <placeholder placeholderIdentifier="IBFirstResponder" id="WjV-ox-pc7" userLabel="First Responder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="80" y="-992"/> + </scene> <!--Server list vc - LibreOffice Impress Contrôle Distant--> <scene sceneID="5"> <objects> @@ -45,6 +61,11 @@ <navigationItem key="navigationItem" id="yR1-m8-JWN"> <string key="title">LibreOffice Impress Contrôle Distant</string> + <barButtonItem key="leftBarButtonItem" title="Help" id="Ved-Cp-htB"> + <connections> + <segue destination="xbC-af-Ssw" kind="push" id="mx5-BO-ZzL"/> + </connections> + </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg"> <connections> <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/> @@ -55,6 +76,7 @@ Contrôle Distant</string> <outlet property="serverTable" destination="naQ-T4-jWV" id="hd3-Vm-fk6"/> <segue destination="UPe-3R-KdQ" kind="push" identifier="pinValidation" id="UQQ-pV-3o3"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="SlideShowPreview" id="EWS-Nn-mQc"/> + <segue destination="xbC-af-Ssw" kind="push" identifier="howtoSegue" id="gc3-eP-dlL"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/> @@ -81,19 +103,16 @@ Contrôle Distant</string> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Attente de la validation de LibreOffice Impress..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lSD-BG-kVe"> - <rect key="frame" x="33" y="380" width="276" height="21"/> - <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <nil key="highlightedColor"/> - </label> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> + <rect key="frame" x="6" y="345" width="309" height="134"/> + <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + </imageView> </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> <navigationItem key="navigationItem" id="c3o-oA-oin"/> <connections> <outlet property="pinLabel" destination="f2u-bG-5ak" id="Y7S-6h-awe"/> - <outlet property="statusLabel" destination="lSD-BG-kVe" id="mmM-4x-ktw"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="pinValidated" id="pTl-ua-9pr"/> </connections> </viewController> @@ -301,7 +320,7 @@ Contrôle Distant</string> <rect key="frame" x="-13" y="191" width="346" height="269"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Notes " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> <rect key="frame" x="20" y="0.0" width="306" height="21"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509803921566" blue="0.074509803921568626" alpha="1" colorSpace="calibratedRGB"/> @@ -337,44 +356,47 @@ Contrôle Distant</string> <rect key="frame" x="0.0" y="460" width="320" height="88"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> - <rect key="frame" x="20" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_previous_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> + <rect key="frame" x="20" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Previous" backgroundImage="released_previous_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_previous_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="previousSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="DAf-Qp-7KW"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> - <rect key="frame" x="207" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_next_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> + <rect key="frame" x="207" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Next" backgroundImage="released_next_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_next_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="nextSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="qTl-Ib-3Z8"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="kMb-xm-ope"> - <rect key="frame" x="132" y="14" width="59" height="60"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="kMb-xm-ope"> + <rect key="frame" x="132" y="14" width="59" height="67"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" title="Button" image="pointer.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Button" backgroundImage="pointer.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> - <state key="highlighted" image="pointer_pushed.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <state key="highlighted" backgroundImage="pointer_pushed.png"> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="35J-B2-GIE"/> @@ -424,8 +446,8 @@ Contrôle Distant</string> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Titre du document" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="24"/> + <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> </subviews> @@ -504,6 +526,7 @@ Contrôle Distant</string> </scenes> <resources> <image name="Default-568h.png" width="640" height="1136"/> + <image name="WTPairingScreenshot.png" width="481" height="199"/> <image name="add.png" width="30" height="30"/> <image name="ic_launcher.png" width="16" height="16"/> <image name="pointer.png" width="143" height="147"/> @@ -515,13 +538,84 @@ Contrôle Distant</string> <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="accPointerAction:"/> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="EWS-Nn-mQc"/> + <segue reference="mx5-BO-ZzL"/> + <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.strings b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.strings Binary files differindex 44b4403ca0ea..a3d897943a10 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.strings +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.strings diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard index 72e6795427bd..f7a701d5e3db 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard @@ -1,10 +1,26 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> + <deployment version="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> + <!--Walk Through Container View Controller--> + <scene sceneID="zBS-q0-LyD"> + <objects> + <viewController id="xbC-af-Ssw" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> + <view key="view" contentMode="scaleToFill" id="EpC-35-Pc5"> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + </view> + <navigationItem key="navigationItem" id="ZQV-e8-dtc"/> + </viewController> + <placeholder placeholderIdentifier="IBFirstResponder" id="WjV-ox-pc7" userLabel="First Responder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="80" y="-992"/> + </scene> <!--Server list vc - LibreOffice Impress Contrôle Distant--> <scene sceneID="5"> <objects> @@ -45,6 +61,11 @@ <navigationItem key="navigationItem" id="yR1-m8-JWN"> <string key="title">LibreOffice Impress Contrôle Distant</string> + <barButtonItem key="leftBarButtonItem" title="Help" id="Ved-Cp-htB"> + <connections> + <segue destination="xbC-af-Ssw" kind="push" id="mx5-BO-ZzL"/> + </connections> + </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg"> <connections> <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/> @@ -55,6 +76,7 @@ Contrôle Distant</string> <outlet property="serverTable" destination="naQ-T4-jWV" id="hd3-Vm-fk6"/> <segue destination="UPe-3R-KdQ" kind="push" identifier="pinValidation" id="UQQ-pV-3o3"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="SlideShowPreview" id="EWS-Nn-mQc"/> + <segue destination="xbC-af-Ssw" kind="push" identifier="howtoSegue" id="gc3-eP-dlL"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/> @@ -81,19 +103,16 @@ Contrôle Distant</string> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Attente de la validation de LibreOffice Impress..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lSD-BG-kVe"> - <rect key="frame" x="33" y="380" width="276" height="21"/> - <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <nil key="highlightedColor"/> - </label> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> + <rect key="frame" x="6" y="345" width="309" height="134"/> + <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + </imageView> </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> <navigationItem key="navigationItem" id="c3o-oA-oin"/> <connections> <outlet property="pinLabel" destination="f2u-bG-5ak" id="Y7S-6h-awe"/> - <outlet property="statusLabel" destination="lSD-BG-kVe" id="mmM-4x-ktw"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="pinValidated" id="pTl-ua-9pr"/> </connections> </viewController> @@ -301,7 +320,7 @@ Contrôle Distant</string> <rect key="frame" x="-13" y="191" width="346" height="269"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Notes " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> <rect key="frame" x="20" y="0.0" width="306" height="21"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509803921566" blue="0.074509803921568626" alpha="1" colorSpace="calibratedRGB"/> @@ -337,44 +356,47 @@ Contrôle Distant</string> <rect key="frame" x="0.0" y="460" width="320" height="88"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> - <rect key="frame" x="20" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_previous_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> + <rect key="frame" x="20" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Previous" backgroundImage="released_previous_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_previous_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="previousSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="DAf-Qp-7KW"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> - <rect key="frame" x="207" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_next_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> + <rect key="frame" x="207" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Next" backgroundImage="released_next_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_next_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="nextSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="qTl-Ib-3Z8"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="kMb-xm-ope"> - <rect key="frame" x="132" y="14" width="59" height="60"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="kMb-xm-ope"> + <rect key="frame" x="132" y="14" width="59" height="67"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" title="Button" image="pointer.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Button" backgroundImage="pointer.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> - <state key="highlighted" image="pointer_pushed.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <state key="highlighted" backgroundImage="pointer_pushed.png"> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="35J-B2-GIE"/> @@ -424,8 +446,8 @@ Contrôle Distant</string> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Titre du document" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="24"/> + <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> </subviews> @@ -504,6 +526,7 @@ Contrôle Distant</string> </scenes> <resources> <image name="Default-568h.png" width="640" height="1136"/> + <image name="WTPairingScreenshot.png" width="481" height="199"/> <image name="add.png" width="30" height="30"/> <image name="ic_launcher.png" width="16" height="16"/> <image name="pointer.png" width="143" height="147"/> @@ -515,13 +538,84 @@ Contrôle Distant</string> <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="accPointerAction:"/> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="EWS-Nn-mQc"/> + <segue reference="mx5-BO-ZzL"/> + <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/gear_transparent_bg.png b/ios/iosremote/iosremote/gear_transparent_bg.png Binary files differindex 3305afa1fa77..6aef9d0d455d 100644 --- a/ios/iosremote/iosremote/gear_transparent_bg.png +++ b/ios/iosremote/iosremote/gear_transparent_bg.png diff --git a/ios/iosremote/iosremote/gear_transparent_bg@2x.png b/ios/iosremote/iosremote/gear_transparent_bg@2x.png Binary files differindex e80cdd97944c..0457b5f79d52 100644 --- a/ios/iosremote/iosremote/gear_transparent_bg@2x.png +++ b/ios/iosremote/iosremote/gear_transparent_bg@2x.png diff --git a/ios/iosremote/iosremote/more_icon.png b/ios/iosremote/iosremote/more_icon.png Binary files differindex f71327ca32b5..ac826b35a7c9 100644 --- a/ios/iosremote/iosremote/more_icon.png +++ b/ios/iosremote/iosremote/more_icon.png diff --git a/ios/iosremote/iosremote/more_icon@2x.png b/ios/iosremote/iosremote/more_icon@2x.png Binary files differindex d687668db07b..8ba3cf86d476 100644 --- a/ios/iosremote/iosremote/more_icon@2x.png +++ b/ios/iosremote/iosremote/more_icon@2x.png diff --git a/ios/iosremote/iosremote/pointer.png b/ios/iosremote/iosremote/pointer.png Binary files differindex 8f7dabbe7d08..8e92445d18ba 100644 --- a/ios/iosremote/iosremote/pointer.png +++ b/ios/iosremote/iosremote/pointer.png diff --git a/ios/iosremote/iosremote/pointer_pushed.png b/ios/iosremote/iosremote/pointer_pushed.png Binary files differindex c8d5c201dbd5..c8f73d41cb1b 100644 --- a/ios/iosremote/iosremote/pointer_pushed.png +++ b/ios/iosremote/iosremote/pointer_pushed.png diff --git a/ios/iosremote/iosremote/pushed_next_button.png b/ios/iosremote/iosremote/pushed_next_button.png Binary files differindex 5f1583abdb19..0ad839d0e0a2 100644 --- a/ios/iosremote/iosremote/pushed_next_button.png +++ b/ios/iosremote/iosremote/pushed_next_button.png diff --git a/ios/iosremote/iosremote/pushed_previous_button.png b/ios/iosremote/iosremote/pushed_previous_button.png Binary files differindex 184930a42e78..cb5ef4aa2e41 100644 --- a/ios/iosremote/iosremote/pushed_previous_button.png +++ b/ios/iosremote/iosremote/pushed_previous_button.png diff --git a/ios/iosremote/iosremote/released_next_button.png b/ios/iosremote/iosremote/released_next_button.png Binary files differindex b4ca931f8922..b80f2104789f 100644 --- a/ios/iosremote/iosremote/released_next_button.png +++ b/ios/iosremote/iosremote/released_next_button.png diff --git a/ios/iosremote/iosremote/released_previous_button.png b/ios/iosremote/iosremote/released_previous_button.png Binary files differindex 2e28e3b6eee0..abb188ff8bb7 100644 --- a/ios/iosremote/iosremote/released_previous_button.png +++ b/ios/iosremote/iosremote/released_previous_button.png diff --git a/ios/iosremote/iosremote/serverList_vc.m b/ios/iosremote/iosremote/serverList_vc.m index 875eba252479..d6aacae24dc3 100644 --- a/ios/iosremote/iosremote/serverList_vc.m +++ b/ios/iosremote/iosremote/serverList_vc.m @@ -230,7 +230,6 @@ _style = UITableViewCellSelectionStyleNone; [self setTitle:NSLocalizedString(@"Impress Remote", @"App name displayed on navbar")]; - } - (void) viewDidAppear:(BOOL)animated @@ -262,15 +261,26 @@ [self.serviceBrowser setDelegate:self]; [self startSearching]; - if (![[CommunicationManager fetchSSIDInfo] valueForKey:@"SSID"]) { - [self revealHelpInfo:[self.tableView cellForRowAtIndexPath:[NSIndexPath - indexPathForRow:0 - inSection:0]].accessoryView]; + if (![[NSUserDefaults standardUserDefaults] boolForKey:@"HOWTO_GUIDE_SEEN"]) + { + UIAlertView * av = [[UIAlertView alloc] initWithTitle:@"How-To guide" message:NSLocalizedString(@"Take a tour of iOS Impress Remote?", nil) delegate:self cancelButtonTitle:NSLocalizedString(@"No, thanks", nil) otherButtonTitles:NSLocalizedString(@"Yes", nil), nil]; + + [av show]; + [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"HOWTO_GUIDE_SEEN"]; } [super viewDidAppear:animated]; } +- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{ + if (buttonIndex == 0){ + [alertView dismissWithClickedButtonIndex:0 animated:YES]; + }else if (buttonIndex == 1){ + [alertView dismissWithClickedButtonIndex:0 animated:YES]; + [self performSegueWithIdentifier:@"howtoSegue" sender:self]; + } +} + - (void) viewWillDisappear:(BOOL)animated { [self disableSpinner]; @@ -394,7 +404,7 @@ [sectionFooter setNumberOfLines:5]; sectionFooter.backgroundColor = [UIColor clearColor]; sectionFooter.font = kAppSmallTextFont; - sectionFooter.textColor = kTintColor; + sectionFooter.textColor = kTextTintColor; sectionFooter.text = NSLocalizedString(@"Customize server config instruction", @"Displayed when no customized server is available"); UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.bounds.size.width, [self tableView:tableView heightForFooterInSection:section])]; @@ -436,15 +446,15 @@ { if (sender) { if ([[CommunicationManager fetchSSIDInfo] valueForKey:@"SSID"]) - [PopoverView showPopoverAtPoint:CGPointMake(sender.frame.origin.x, - sender.frame.origin.y + sender.frame.size.height/2) + [PopoverView showPopoverAtPoint:CGPointMake(sender.frame.origin.x - sender.frame.size.width, + sender.frame.origin.y + sender.frame.size.height/3) inView:sender withText:[NSString stringWithFormat:NSLocalizedString(@"* Launch Impress on your computer\n* Connect both devices to the same WiFi network\n* P.S. Your iOS device is connected to \"%@\" now", nil), [[CommunicationManager fetchSSIDInfo] valueForKey:@"SSID"]] delegate:nil]; else { - [PopoverView showPopoverAtPoint:CGPointMake(sender.frame.origin.x, - sender.frame.origin.y + sender.frame.size.height/2) + [PopoverView showPopoverAtPoint:CGPointMake(sender.frame.origin.x - sender.frame.size.width, + sender.frame.origin.y + sender.frame.size.height/3) inView:sender withText:[NSString stringWithFormat:NSLocalizedString(@"* You don't have a WiFi connection now.\n* Connect your iOS device and your computer to the same network\n* Refresh\n* hint: you may create a personal hotspot on your computer/iPhone", nil), [[CommunicationManager fetchSSIDInfo] valueForKey:@"SSID"]] diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m index f181b313f4aa..1f6a147ab163 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m @@ -109,16 +109,21 @@ _startButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_startButton setBackgroundImage:[UIImage imageNamed:@"navBarButtonNormal"] forState:UIControlStateNormal]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { - _startButton.frame = CGRectMake(10.0, 30.0, 300.0, 50.0); + _startButton.frame = CGRectMake(145.0, 30.0, 160.0, 40.0); } else { self.modalViewController.view.backgroundColor = [UIColor clearColor]; - _startButton.frame = CGRectMake(30.0, 50.0, 470.0, 50.0); + _startButton.frame = CGRectMake(30.0, 50.0, 470.0, 40.0); } [_startButton setTitle:NSLocalizedString(@"Start Presentation", nil) forState:UIControlStateNormal]; [_startButton setTitleColor:kTintColor forState:UIControlStateNormal]; [_startButton setTitleColor:[UIColor lightGrayColor] forState:UIControlStateHighlighted]; [_startButton addTarget:self action:@selector(startPresentationAction:) forControlEvents:UIControlEventTouchUpInside]; + UIImage *backgroundImage = [UIImage imageNamed:@"buttonBackground"]; + UIEdgeInsets insets = UIEdgeInsetsMake(20, 7, 20, 7); + UIImage *stretchableBackgroundImage = [backgroundImage resizableImageWithCapInsets:insets]; + + [_startButton setBackgroundImage:stretchableBackgroundImage forState:UIControlStateNormal]; _startButton.tag = 1; } return _startButton; diff --git a/ios/iosremote/iosremote/slideShow_vc_iphone.m b/ios/iosremote/iosremote/slideShow_vc_iphone.m index 47a1cfe652c4..c127d87656ad 100644 --- a/ios/iosremote/iosremote/slideShow_vc_iphone.m +++ b/ios/iosremote/iosremote/slideShow_vc_iphone.m @@ -325,13 +325,11 @@ if (!isBlank) { [PopoverView showPopoverAtPoint: CGPointMake(self.navigationController.view.frame.size.width - 20, 0) inView:self.view - withTitle:NSLocalizedString(@"More", @"Popover title") withStringArray:[NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", nil), NSLocalizedString(@"Restart", nil), NSLocalizedString(@"Blank Screen", nil), nil] delegate:self]; } else { [PopoverView showPopoverAtPoint: CGPointMake(self.navigationController.view.frame.size.width - 20, 0) inView:self.view - withTitle:@"More" withStringArray:[NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", nil), NSLocalizedString(@"Restart", nil), NSLocalizedString(@"Resume from blank screen", nil), nil] delegate:self]; } diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard index 98b4af70a6c2..19c015f732eb 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard @@ -1,10 +1,26 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> + <deployment version="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> + <!--Walk Through Container View Controller--> + <scene sceneID="zBS-q0-LyD"> + <objects> + <viewController id="xbC-af-Ssw" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> + <view key="view" contentMode="scaleToFill" id="EpC-35-Pc5"> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + </view> + <navigationItem key="navigationItem" id="ZQV-e8-dtc"/> + </viewController> + <placeholder placeholderIdentifier="IBFirstResponder" id="WjV-ox-pc7" userLabel="First Responder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="80" y="-992"/> + </scene> <!--Server list vc - Impress Remote--> <scene sceneID="5"> <objects> @@ -43,6 +59,11 @@ </connections> </tableView> <navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN"> + <barButtonItem key="leftBarButtonItem" title="Help" id="Ved-Cp-htB"> + <connections> + <segue destination="xbC-af-Ssw" kind="push" id="mx5-BO-ZzL"/> + </connections> + </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg"> <connections> <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/> @@ -53,6 +74,7 @@ <outlet property="serverTable" destination="naQ-T4-jWV" id="hd3-Vm-fk6"/> <segue destination="UPe-3R-KdQ" kind="push" identifier="pinValidation" id="UQQ-pV-3o3"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="SlideShowPreview" id="EWS-Nn-mQc"/> + <segue destination="xbC-af-Ssw" kind="push" identifier="howtoSegue" id="gc3-eP-dlL"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/> @@ -79,19 +101,16 @@ <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="等待LibreOffice Impress的配对..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lSD-BG-kVe"> - <rect key="frame" x="33" y="380" width="276" height="21"/> - <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <nil key="highlightedColor"/> - </label> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> + <rect key="frame" x="6" y="345" width="309" height="134"/> + <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + </imageView> </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> <navigationItem key="navigationItem" id="c3o-oA-oin"/> <connections> <outlet property="pinLabel" destination="f2u-bG-5ak" id="Y7S-6h-awe"/> - <outlet property="statusLabel" destination="lSD-BG-kVe" id="mmM-4x-ktw"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="pinValidated" id="pTl-ua-9pr"/> </connections> </viewController> @@ -299,7 +318,7 @@ <rect key="frame" x="-13" y="191" width="346" height="269"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="演讲者笔记 " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" 演讲者笔记" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> <rect key="frame" x="20" y="0.0" width="306" height="21"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509803921566" blue="0.074509803921568626" alpha="1" colorSpace="calibratedRGB"/> @@ -335,44 +354,47 @@ <rect key="frame" x="0.0" y="460" width="320" height="88"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> - <rect key="frame" x="20" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_previous_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> + <rect key="frame" x="20" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Previous" backgroundImage="released_previous_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_previous_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="previousSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="DAf-Qp-7KW"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> - <rect key="frame" x="207" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_next_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> + <rect key="frame" x="207" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Next" backgroundImage="released_next_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_next_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="nextSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="qTl-Ib-3Z8"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="kMb-xm-ope"> - <rect key="frame" x="132" y="14" width="59" height="60"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="kMb-xm-ope"> + <rect key="frame" x="132" y="14" width="59" height="67"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" title="Button" image="pointer.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Button" backgroundImage="pointer.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> - <state key="highlighted" image="pointer_pushed.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <state key="highlighted" backgroundImage="pointer_pushed.png"> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="35J-B2-GIE"/> @@ -422,8 +444,8 @@ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="演示文稿标题" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="24"/> + <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> </subviews> @@ -502,6 +524,7 @@ </scenes> <resources> <image name="Default-568h.png" width="640" height="1136"/> + <image name="WTPairingScreenshot.png" width="481" height="199"/> <image name="add.png" width="30" height="30"/> <image name="ic_launcher.png" width="16" height="16"/> <image name="pointer.png" width="143" height="147"/> @@ -513,13 +536,84 @@ <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="accPointerAction:"/> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="EWS-Nn-mQc"/> + <segue reference="mx5-BO-ZzL"/> + <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.strings b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.strings Binary files differindex 00dc5d837147..f062848166d1 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.strings +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.strings 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 98b4af70a6c2..19c015f732eb 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard @@ -1,10 +1,26 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> + <deployment version="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> + <!--Walk Through Container View Controller--> + <scene sceneID="zBS-q0-LyD"> + <objects> + <viewController id="xbC-af-Ssw" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> + <view key="view" contentMode="scaleToFill" id="EpC-35-Pc5"> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + </view> + <navigationItem key="navigationItem" id="ZQV-e8-dtc"/> + </viewController> + <placeholder placeholderIdentifier="IBFirstResponder" id="WjV-ox-pc7" userLabel="First Responder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="80" y="-992"/> + </scene> <!--Server list vc - Impress Remote--> <scene sceneID="5"> <objects> @@ -43,6 +59,11 @@ </connections> </tableView> <navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN"> + <barButtonItem key="leftBarButtonItem" title="Help" id="Ved-Cp-htB"> + <connections> + <segue destination="xbC-af-Ssw" kind="push" id="mx5-BO-ZzL"/> + </connections> + </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg"> <connections> <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/> @@ -53,6 +74,7 @@ <outlet property="serverTable" destination="naQ-T4-jWV" id="hd3-Vm-fk6"/> <segue destination="UPe-3R-KdQ" kind="push" identifier="pinValidation" id="UQQ-pV-3o3"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="SlideShowPreview" id="EWS-Nn-mQc"/> + <segue destination="xbC-af-Ssw" kind="push" identifier="howtoSegue" id="gc3-eP-dlL"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/> @@ -79,19 +101,16 @@ <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="等待LibreOffice Impress的配对..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lSD-BG-kVe"> - <rect key="frame" x="33" y="380" width="276" height="21"/> - <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <nil key="highlightedColor"/> - </label> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> + <rect key="frame" x="6" y="345" width="309" height="134"/> + <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + </imageView> </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> <navigationItem key="navigationItem" id="c3o-oA-oin"/> <connections> <outlet property="pinLabel" destination="f2u-bG-5ak" id="Y7S-6h-awe"/> - <outlet property="statusLabel" destination="lSD-BG-kVe" id="mmM-4x-ktw"/> <segue destination="Ybo-9c-MB8" kind="push" identifier="pinValidated" id="pTl-ua-9pr"/> </connections> </viewController> @@ -299,7 +318,7 @@ <rect key="frame" x="-13" y="191" width="346" height="269"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="演讲者笔记 " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" 演讲者笔记" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> <rect key="frame" x="20" y="0.0" width="306" height="21"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509803921566" blue="0.074509803921568626" alpha="1" colorSpace="calibratedRGB"/> @@ -335,44 +354,47 @@ <rect key="frame" x="0.0" y="460" width="320" height="88"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> - <rect key="frame" x="20" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_previous_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> + <rect key="frame" x="20" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Previous" backgroundImage="released_previous_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_previous_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="previousSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="DAf-Qp-7KW"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> - <rect key="frame" x="207" y="14" width="93" height="60"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" backgroundImage="released_next_button.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="XDZ-bs-OUM"> + <rect key="frame" x="207" y="14" width="93" height="67"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Next" backgroundImage="released_next_button.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted" backgroundImage="pushed_next_button.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="nextSlideAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="qTl-Ib-3Z8"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="kMb-xm-ope"> - <rect key="frame" x="132" y="14" width="59" height="60"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="kMb-xm-ope"> + <rect key="frame" x="132" y="14" width="59" height="67"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" title="Button" image="pointer.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="11"/> + <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-2"/> + <state key="normal" title="Button" backgroundImage="pointer.png"> + <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> - <state key="highlighted" image="pointer_pushed.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <state key="highlighted" backgroundImage="pointer_pushed.png"> + <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="35J-B2-GIE"/> @@ -422,8 +444,8 @@ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="演示文稿标题" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="24"/> + <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> </subviews> @@ -502,6 +524,7 @@ </scenes> <resources> <image name="Default-568h.png" width="640" height="1136"/> + <image name="WTPairingScreenshot.png" width="481" height="199"/> <image name="add.png" width="30" height="30"/> <image name="ic_launcher.png" width="16" height="16"/> <image name="pointer.png" width="143" height="147"/> @@ -513,13 +536,84 @@ <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="accPointerAction:"/> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="EWS-Nn-mQc"/> + <segue reference="mx5-BO-ZzL"/> + <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> </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 dfd96f8b5959..01d0a283096d 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard @@ -43,11 +43,6 @@ </connections> </tableView> <navigationItem key="navigationItem" title="连接" id="wYh-MF-Ao6"> - <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="yai-U0-WT9"> - <connections> - <action selector="cancelModalView:" destination="5QV-E7-KNT" id="rSl-Rp-xQb"/> - </connections> - </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS"> <connections> <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/> @@ -299,7 +294,7 @@ <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="演讲者笔记 " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" 演讲者笔记" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> <rect key="frame" x="20" y="0.0" width="754" height="31"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509800000003" blue="0.074509803920000006" alpha="1" colorSpace="calibratedRGB"/> @@ -386,36 +381,6 @@ <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"/> - <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> - <rect key="frame" x="264" y="95" width="240" height="248"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES"/> - </imageView> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="1Yr-C2-huW"> - <rect key="frame" x="294" y="610" width="180" height="77"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> - <state key="normal" title="连接" backgroundImage="navBarButtonNormal.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="highlighted"> - <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="startConnectionModal:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="8aS-7k-5Ga"/> - </connections> - </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LibreOffice Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="101" y="471" width="566" height="131"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> - <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <nil key="highlightedColor"/> - <color key="shadowColor" cocoaTouchSystemColor="tableCellGroupedBackgroundColor"/> - <size key="shadowOffset" width="0.0" height="0.0"/> - </label> - </subviews> <color key="backgroundColor" red="0.89411764709999997" green="0.43529411759999997" blue="0.1215686275" alpha="1" colorSpace="calibratedRGB"/> </view> </subviews> @@ -436,9 +401,6 @@ <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"/> - <outlet property="welcome_connect_button" destination="1Yr-C2-huW" id="fm5-IB-oyc"/> - <outlet property="welcome_label" destination="yiP-rQ-s7i" id="rGp-xL-dH2"/> - <outlet property="welcome_libO_icon" destination="Qe8-38-thk" id="w3C-h1-OL0"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/> @@ -473,14 +435,14 @@ <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> - <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="4.5" width="233" height="163"/> + <rect key="frame" x="44" y="4" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="151" width="29" height="21"/> + <rect key="frame" x="-605" y="150" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -532,8 +494,6 @@ <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="libO_icon.png" width="598" height="598"/> - <image name="navBarButtonNormal.png" width="30" height="20"/> <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"/> @@ -548,7 +508,6 @@ <relationship kind="action" name="nextSlideAction:"/> <relationship kind="action" name="popOverUp:"/> <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="action" name="startConnectionModal:"/> <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> @@ -562,9 +521,6 @@ <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> - <relationship kind="outlet" name="welcome_connect_button" candidateClass="UIButton"/> - <relationship kind="outlet" name="welcome_label" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_libO_icon" candidateClass="UIImageView"/> </relationships> </class> <class className="EditableTableViewCell" superclassName="UITableViewCell"> diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings b/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings Binary files differindex 40bb0cddb426..27d241dca258 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard index dfd96f8b5959..01d0a283096d 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard @@ -43,11 +43,6 @@ </connections> </tableView> <navigationItem key="navigationItem" title="连接" id="wYh-MF-Ao6"> - <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="yai-U0-WT9"> - <connections> - <action selector="cancelModalView:" destination="5QV-E7-KNT" id="rSl-Rp-xQb"/> - </connections> - </barButtonItem> <barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS"> <connections> <segue destination="65c-5D-pB7" kind="push" identifier="create_new_server" id="ORn-0W-dHd"/> @@ -299,7 +294,7 @@ <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="演讲者笔记 " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" 演讲者笔记" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> <rect key="frame" x="20" y="0.0" width="754" height="31"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="1" green="0.66274509800000003" blue="0.074509803920000006" alpha="1" colorSpace="calibratedRGB"/> @@ -386,36 +381,6 @@ <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"/> - <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> - <rect key="frame" x="264" y="95" width="240" height="248"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES"/> - </imageView> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="1Yr-C2-huW"> - <rect key="frame" x="294" y="610" width="180" height="77"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> - <state key="normal" title="连接" backgroundImage="navBarButtonNormal.png"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="highlighted"> - <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="startConnectionModal:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="8aS-7k-5Ga"/> - </connections> - </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LibreOffice Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="101" y="471" width="566" height="131"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> - <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <nil key="highlightedColor"/> - <color key="shadowColor" cocoaTouchSystemColor="tableCellGroupedBackgroundColor"/> - <size key="shadowOffset" width="0.0" height="0.0"/> - </label> - </subviews> <color key="backgroundColor" red="0.89411764709999997" green="0.43529411759999997" blue="0.1215686275" alpha="1" colorSpace="calibratedRGB"/> </view> </subviews> @@ -436,9 +401,6 @@ <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"/> - <outlet property="welcome_connect_button" destination="1Yr-C2-huW" id="fm5-IB-oyc"/> - <outlet property="welcome_label" destination="yiP-rQ-s7i" id="rGp-xL-dH2"/> - <outlet property="welcome_libO_icon" destination="Qe8-38-thk" id="w3C-h1-OL0"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="e0y-Q9-Urg" userLabel="First Responder" sceneMemberID="firstResponder"/> @@ -473,14 +435,14 @@ <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> - <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="4.5" width="233" height="163"/> + <rect key="frame" x="44" y="4" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="151" width="29" height="21"/> + <rect key="frame" x="-605" y="150" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -532,8 +494,6 @@ <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="libO_icon.png" width="598" height="598"/> - <image name="navBarButtonNormal.png" width="30" height="20"/> <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"/> @@ -548,7 +508,6 @@ <relationship kind="action" name="nextSlideAction:"/> <relationship kind="action" name="popOverUp:"/> <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="action" name="startConnectionModal:"/> <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> @@ -562,9 +521,6 @@ <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> - <relationship kind="outlet" name="welcome_connect_button" candidateClass="UIButton"/> - <relationship kind="outlet" name="welcome_label" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_libO_icon" candidateClass="UIImageView"/> </relationships> </class> <class className="EditableTableViewCell" superclassName="UITableViewCell"> |
