diff options
author | Siqi LIU <me@siqi.fr> | 2013-08-13 00:11:28 +0800 |
---|---|---|
committer | Siqi LIU <me@siqi.fr> | 2013-08-13 00:11:58 +0800 |
commit | a1174cd9cb05aa9b70a77cf891c7e8a8fd665e8f (patch) | |
tree | d678a78713b4a76c821525d9102cb7dd6e3e51ec | |
parent | a87759750f9862a695313b7cc5198b62fb8609d7 (diff) |
localization support for iPhone on fr,zh-Hans,en
Change-Id: Ic27519a8873436f3683450059aecbbd04e1403ab
26 files changed, 1396 insertions, 577 deletions
diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store Binary files differindex 3b495f740b27..0c7ddbc5616b 100644 --- a/ios/iosremote/.DS_Store +++ b/ios/iosremote/.DS_Store diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard index bfecd9143579..b202db3a4fb4 100644 --- a/ios/iosremote/en.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> - <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <development version="4600" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc ipad - Connect--> @@ -10,30 +10,31 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> - <rect key="frame" x="0.0" y="119" width="540" height="44"/> + <rect key="frame" x="0.0" y="54" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="yuT-lk-tWb"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> - <rect key="frame" x="15" y="12" width="32" height="20"/> + <rect key="frame" x="10" y="11" width="32" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Fsp-wI-AAW"> - <rect key="frame" x="481" y="12" width="44" height="20"/> + <rect key="frame" x="424" y="11" width="44" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -69,23 +70,23 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="159" y="81.5" width="223" height="118"/> + <rect key="frame" x="159" y="71" width="223" height="118"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="110" y="272" width="320" height="94"/> + <rect key="frame" x="110" y="239" width="320" height="94"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <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..." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> - <rect key="frame" x="109" y="441" width="322" height="57"/> + <rect key="frame" x="109" y="391" width="322" height="57"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -110,27 +111,29 @@ <objects> <tableViewController id="65c-5D-pB7" customClass="newServerViewController" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> <tableViewSection footerTitle="" id="CVG-Eq-rLd"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="99" width="540" height="44"/> + <rect key="frame" x="0.0" y="30" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="CPF-Nb-hVB"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="143" width="540" height="44"/> + <rect key="frame" x="0.0" y="75" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="o7Y-OC-Mlo"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,18 +161,18 @@ <objects> <tableViewController storyboardIdentifier="slideShowPreview" id="B8g-8S-pgn" customClass="slideShowPreviewTable_vc_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> - <rect key="frame" x="0.0" y="64" width="540" height="281"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="281"/> <subviews> <view contentMode="scaleToFill" id="Is1-dX-SaP"> - <rect key="frame" x="36" y="53" width="468" height="208"/> + <rect key="frame" x="0.0" y="37" width="540" height="208"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5"> - <rect key="frame" x="20" y="20" width="428" height="168"/> + <rect key="frame" x="20" y="20" width="500" height="168"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> @@ -185,28 +188,31 @@ <tableViewSection id="gMl-dC-GqD"> <cells> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="tqg-R4-Coi"> - <rect key="frame" x="0.0" y="345" width="540" height="44"/> + <rect key="frame" x="0.0" y="291" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="N7I-bp-Azf"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> - <rect key="frame" x="0.0" y="389" width="540" height="44"/> + <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="mnM-cl-QAX"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> - <rect key="frame" x="0.0" y="433" width="540" height="44"/> + <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="QKt-Xa-Y3p"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +238,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,7 +296,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <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"> @@ -302,7 +308,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +316,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <tableView contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Iok-mu-c0T" customClass="HorizontalTableView"> - <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> + <rect key="frame" x="227" y="-1233" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,7 +325,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> @@ -363,7 +369,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38"> - <rect key="frame" x="683" y="918" width="97" height="59"/> + <rect key="frame" x="683" y="898" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -378,7 +384,7 @@ </connections> </button> <view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <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"> @@ -459,15 +465,15 @@ <objects> <tableViewController clearsSelectionOnViewWillAppear="NO" id="VQa-vM-8pF" customClass="slideShowSwipeInList_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="170" sectionHeaderHeight="22" sectionFooterHeight="22" id="U9c-sP-NVQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="KxF-9S-Dzt"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> @@ -485,7 +491,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -525,15 +532,96 @@ <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="143.52479553222656" height="143.52479553222656"/> + <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"/> <image name="previousButton_pressed.png" width="42" height="230"/> - <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> - <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_clear_btn.png" width="60" height="60"/> + <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="BasePresentationViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="popOverUp:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="action" name="startConnectionModal:"/> + <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> + <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> + <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> + <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"> + <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="MainSplitViewController" superclassName="UISplitViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> + </class> + <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.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="server_list_vc_ipad" superclassName="server_list_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> + <relationships> + <relationship kind="action" name="cancelModalView:"/> + </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_ipad" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard index bfecd9143579..b202db3a4fb4 100644 --- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> - <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <development version="4600" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc ipad - Connect--> @@ -10,30 +10,31 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> - <rect key="frame" x="0.0" y="119" width="540" height="44"/> + <rect key="frame" x="0.0" y="54" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="yuT-lk-tWb"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> - <rect key="frame" x="15" y="12" width="32" height="20"/> + <rect key="frame" x="10" y="11" width="32" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Fsp-wI-AAW"> - <rect key="frame" x="481" y="12" width="44" height="20"/> + <rect key="frame" x="424" y="11" width="44" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -69,23 +70,23 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="159" y="81.5" width="223" height="118"/> + <rect key="frame" x="159" y="71" width="223" height="118"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="110" y="272" width="320" height="94"/> + <rect key="frame" x="110" y="239" width="320" height="94"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <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..." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> - <rect key="frame" x="109" y="441" width="322" height="57"/> + <rect key="frame" x="109" y="391" width="322" height="57"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -110,27 +111,29 @@ <objects> <tableViewController id="65c-5D-pB7" customClass="newServerViewController" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> <tableViewSection footerTitle="" id="CVG-Eq-rLd"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="99" width="540" height="44"/> + <rect key="frame" x="0.0" y="30" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="CPF-Nb-hVB"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="143" width="540" height="44"/> + <rect key="frame" x="0.0" y="75" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="o7Y-OC-Mlo"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,18 +161,18 @@ <objects> <tableViewController storyboardIdentifier="slideShowPreview" id="B8g-8S-pgn" customClass="slideShowPreviewTable_vc_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> - <rect key="frame" x="0.0" y="64" width="540" height="281"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="281"/> <subviews> <view contentMode="scaleToFill" id="Is1-dX-SaP"> - <rect key="frame" x="36" y="53" width="468" height="208"/> + <rect key="frame" x="0.0" y="37" width="540" height="208"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5"> - <rect key="frame" x="20" y="20" width="428" height="168"/> + <rect key="frame" x="20" y="20" width="500" height="168"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> @@ -185,28 +188,31 @@ <tableViewSection id="gMl-dC-GqD"> <cells> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="tqg-R4-Coi"> - <rect key="frame" x="0.0" y="345" width="540" height="44"/> + <rect key="frame" x="0.0" y="291" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="N7I-bp-Azf"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> - <rect key="frame" x="0.0" y="389" width="540" height="44"/> + <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="mnM-cl-QAX"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> - <rect key="frame" x="0.0" y="433" width="540" height="44"/> + <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="QKt-Xa-Y3p"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +238,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,7 +296,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <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"> @@ -302,7 +308,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +316,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <tableView contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Iok-mu-c0T" customClass="HorizontalTableView"> - <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> + <rect key="frame" x="227" y="-1233" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,7 +325,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> @@ -363,7 +369,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38"> - <rect key="frame" x="683" y="918" width="97" height="59"/> + <rect key="frame" x="683" y="898" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -378,7 +384,7 @@ </connections> </button> <view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <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"> @@ -459,15 +465,15 @@ <objects> <tableViewController clearsSelectionOnViewWillAppear="NO" id="VQa-vM-8pF" customClass="slideShowSwipeInList_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="170" sectionHeaderHeight="22" sectionFooterHeight="22" id="U9c-sP-NVQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="KxF-9S-Dzt"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> @@ -485,7 +491,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -525,15 +532,96 @@ <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="143.52479553222656" height="143.52479553222656"/> + <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"/> <image name="previousButton_pressed.png" width="42" height="230"/> - <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> - <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_clear_btn.png" width="60" height="60"/> + <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="BasePresentationViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="popOverUp:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="action" name="startConnectionModal:"/> + <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> + <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> + <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> + <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"> + <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="MainSplitViewController" superclassName="UISplitViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> + </class> + <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.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="server_list_vc_ipad" superclassName="server_list_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> + <relationships> + <relationship kind="action" name="cancelModalView:"/> + </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_ipad" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/fr.lproj/Localizable.strings b/ios/iosremote/fr.lproj/Localizable.strings Binary files differindex 9c91be59a9e1..9532cc56ac3e 100644 --- a/ios/iosremote/fr.lproj/Localizable.strings +++ b/ios/iosremote/fr.lproj/Localizable.strings diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard index 752e4748b7b6..fb9c40f163de 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> - <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <development version="4600" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc ipad - Connecter--> @@ -10,30 +10,31 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> - <rect key="frame" x="0.0" y="119" width="540" height="44"/> + <rect key="frame" x="0.0" y="54" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="yuT-lk-tWb"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Titre" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> - <rect key="frame" x="15" y="12" width="32" height="20"/> + <rect key="frame" x="10" y="11" width="32" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Détail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Fsp-wI-AAW"> - <rect key="frame" x="481" y="12" width="44" height="20"/> + <rect key="frame" x="424" y="11" width="44" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -69,23 +70,23 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="159" y="81.5" width="223" height="118"/> + <rect key="frame" x="159" y="71" width="223" height="118"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Veuillez entrer le code ci-dessus dans le fenêtre Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="110" y="272" width="320" height="94"/> + <rect key="frame" x="110" y="239" width="320" height="94"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <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..." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> - <rect key="frame" x="109" y="441" width="322" height="57"/> + <rect key="frame" x="109" y="391" width="322" height="57"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -110,27 +111,29 @@ <objects> <tableViewController id="65c-5D-pB7" customClass="newServerViewController" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> <tableViewSection footerTitle="" id="CVG-Eq-rLd"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="99" width="540" height="44"/> + <rect key="frame" x="0.0" y="30" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="CPF-Nb-hVB"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="143" width="540" height="44"/> + <rect key="frame" x="0.0" y="75" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="o7Y-OC-Mlo"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,18 +161,18 @@ <objects> <tableViewController storyboardIdentifier="slideShowPreview" id="B8g-8S-pgn" customClass="slideShowPreviewTable_vc_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> - <rect key="frame" x="0.0" y="64" width="540" height="281"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="281"/> <subviews> <view contentMode="scaleToFill" id="Is1-dX-SaP"> - <rect key="frame" x="36" y="53" width="468" height="208.00000000000003"/> + <rect key="frame" x="0.0" y="37" width="540" height="208"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Titre du document" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5"> - <rect key="frame" x="20" y="20" width="428" height="168"/> + <rect key="frame" x="20" y="20" width="500" height="168"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> @@ -185,28 +188,31 @@ <tableViewSection id="gMl-dC-GqD"> <cells> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="tqg-R4-Coi"> - <rect key="frame" x="0.0" y="345" width="540" height="44"/> + <rect key="frame" x="0.0" y="291" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="N7I-bp-Azf"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> - <rect key="frame" x="0.0" y="389" width="540" height="44"/> + <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="mnM-cl-QAX"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> - <rect key="frame" x="0.0" y="433" width="540" height="44"/> + <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="QKt-Xa-Y3p"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +238,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,7 +296,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <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"> @@ -302,7 +308,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +316,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <tableView contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Iok-mu-c0T" customClass="HorizontalTableView"> - <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> + <rect key="frame" x="227" y="-1233" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,11 +325,11 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> - <rect key="frame" x="20" y="6.9999999999999964" width="382" height="91"/> + <rect key="frame" x="20" y="7" width="382" height="91"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="55"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> @@ -363,7 +369,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38"> - <rect key="frame" x="683" y="918" width="97" height="59"/> + <rect key="frame" x="683" y="898" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -378,7 +384,7 @@ </connections> </button> <view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <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"> @@ -400,9 +406,11 @@ <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 Contrôle Distant" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> + <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"/> @@ -459,15 +467,15 @@ <objects> <tableViewController clearsSelectionOnViewWillAppear="NO" id="VQa-vM-8pF" customClass="slideShowSwipeInList_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="170" sectionHeaderHeight="22" sectionFooterHeight="22" id="U9c-sP-NVQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="KxF-9S-Dzt"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> @@ -485,7 +493,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -525,15 +534,96 @@ <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="143.52479553222656" height="143.52479553222656"/> + <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"/> <image name="previousButton_pressed.png" width="42" height="230"/> - <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> - <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_clear_btn.png" width="60" height="60"/> + <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="BasePresentationViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="popOverUp:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="action" name="startConnectionModal:"/> + <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> + <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> + <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> + <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"> + <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="MainSplitViewController" superclassName="UISplitViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> + </class> + <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.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="server_list_vc_ipad" superclassName="server_list_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> + <relationships> + <relationship kind="action" name="cancelModalView:"/> + </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_ipad" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/fr.lproj/iPad_autosize.strings b/ios/iosremote/fr.lproj/iPad_autosize.strings Binary files differindex cb2fe09d4ee8..c712ac3ec0f6 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 ee61dd122d78..fb9c40f163de 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> - <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <development version="4600" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc ipad - Connecter--> @@ -10,30 +10,31 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> - <rect key="frame" x="0.0" y="119" width="540" height="44"/> + <rect key="frame" x="0.0" y="54" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="yuT-lk-tWb"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Titre" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> - <rect key="frame" x="15" y="12" width="32" height="20"/> + <rect key="frame" x="10" y="11" width="32" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Détail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Fsp-wI-AAW"> - <rect key="frame" x="481" y="12" width="44" height="20"/> + <rect key="frame" x="424" y="11" width="44" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -69,23 +70,23 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="159" y="81.5" width="223" height="118"/> + <rect key="frame" x="159" y="71" width="223" height="118"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Veuillez entrer le code ci-dessus dans le fenêtre Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="110" y="272" width="320" height="94"/> + <rect key="frame" x="110" y="239" width="320" height="94"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <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..." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> - <rect key="frame" x="109" y="441" width="322" height="57"/> + <rect key="frame" x="109" y="391" width="322" height="57"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -110,27 +111,29 @@ <objects> <tableViewController id="65c-5D-pB7" customClass="newServerViewController" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> <tableViewSection footerTitle="" id="CVG-Eq-rLd"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="99" width="540" height="44"/> + <rect key="frame" x="0.0" y="30" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="CPF-Nb-hVB"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="143" width="540" height="44"/> + <rect key="frame" x="0.0" y="75" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="o7Y-OC-Mlo"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,18 +161,18 @@ <objects> <tableViewController storyboardIdentifier="slideShowPreview" id="B8g-8S-pgn" customClass="slideShowPreviewTable_vc_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> - <rect key="frame" x="0.0" y="64" width="540" height="281"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="281"/> <subviews> <view contentMode="scaleToFill" id="Is1-dX-SaP"> - <rect key="frame" x="36" y="53" width="468" height="208"/> + <rect key="frame" x="0.0" y="37" width="540" height="208"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Titre du document" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5"> - <rect key="frame" x="20" y="20" width="428" height="168"/> + <rect key="frame" x="20" y="20" width="500" height="168"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> @@ -185,28 +188,31 @@ <tableViewSection id="gMl-dC-GqD"> <cells> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="tqg-R4-Coi"> - <rect key="frame" x="0.0" y="345" width="540" height="44"/> + <rect key="frame" x="0.0" y="291" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="N7I-bp-Azf"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> - <rect key="frame" x="0.0" y="389" width="540" height="44"/> + <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="mnM-cl-QAX"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> - <rect key="frame" x="0.0" y="433" width="540" height="44"/> + <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="QKt-Xa-Y3p"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +238,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,7 +296,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <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"> @@ -302,7 +308,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +316,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <tableView contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Iok-mu-c0T" customClass="HorizontalTableView"> - <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> + <rect key="frame" x="227" y="-1233" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,7 +325,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> @@ -363,7 +369,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38"> - <rect key="frame" x="683" y="918" width="97" height="59"/> + <rect key="frame" x="683" y="898" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -378,7 +384,7 @@ </connections> </button> <view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <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"> @@ -400,9 +406,11 @@ <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 Contrôle Distant" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> + <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"/> @@ -459,15 +467,15 @@ <objects> <tableViewController clearsSelectionOnViewWillAppear="NO" id="VQa-vM-8pF" customClass="slideShowSwipeInList_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="170" sectionHeaderHeight="22" sectionFooterHeight="22" id="U9c-sP-NVQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="KxF-9S-Dzt"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> @@ -485,7 +493,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -525,15 +534,96 @@ <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="143.52479553222656" height="143.52479553222656"/> + <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"/> <image name="previousButton_pressed.png" width="42" height="230"/> - <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> - <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_clear_btn.png" width="60" height="60"/> + <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="BasePresentationViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="popOverUp:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="action" name="startConnectionModal:"/> + <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> + <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> + <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> + <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"> + <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="MainSplitViewController" superclassName="UISplitViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> + </class> + <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.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="server_list_vc_ipad" superclassName="server_list_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> + <relationships> + <relationship kind="action" name="cancelModalView:"/> + </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_ipad" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/iosremote/.DS_Store b/ios/iosremote/iosremote/.DS_Store Binary files differindex 52b026ed5ebf..b692f12911d6 100644 --- a/ios/iosremote/iosremote/.DS_Store +++ b/ios/iosremote/iosremote/.DS_Store diff --git a/ios/iosremote/iosremote/en.lproj/Localizable.strings b/ios/iosremote/iosremote/en.lproj/Localizable.strings Binary files differindex 30dfc9b58e30..903ef6458436 100644 --- a/ios/iosremote/iosremote/en.lproj/Localizable.strings +++ b/ios/iosremote/iosremote/en.lproj/Localizable.strings diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index b061c5090799..cf5bb6334f3c 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -1,6 +1,7 @@ <?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 defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> @@ -17,7 +18,7 @@ <rect key="frame" x="0.0" y="46" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rg3-PU-OuS"> @@ -114,7 +115,7 @@ <rect key="frame" x="0.0" y="10" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -123,7 +124,7 @@ <rect key="frame" x="0.0" y="55" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -174,22 +175,22 @@ <rect key="frame" x="0.0" y="20" width="320" height="548"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <prototypes> - <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="132" id="hig-YG-1Lg"> - <rect key="frame" x="0.0" y="22" width="320" height="132"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="115" id="hig-YG-1Lg"> + <rect key="frame" x="0.0" y="22" width="320" height="115"/> <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="131"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="114"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="0.0" width="220" height="59"/> + <rect key="frame" x="11" y="10" width="220" height="51"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="61" y="75" width="44" height="44"/> + <rect key="frame" x="65" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> @@ -201,7 +202,7 @@ </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="130" y="75" width="44" height="44"/> + <rect key="frame" x="134" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> @@ -212,44 +213,23 @@ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </state> </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3UQ-XJ-SDP"> - <rect key="frame" x="44" y="48" width="33" height="20.5"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Minutes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TqG-sM-lAC"> - <rect key="frame" x="97" y="48" width="43" height="20.5"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Seconds" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6jG-LW-J7Q"> - <rect key="frame" x="152" y="48" width="47" height="20.5"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="132" id="dDp-H3-HyL"> - <rect key="frame" x="0.0" y="154" width="320" height="132"/> + <rect key="frame" x="0.0" y="137" width="320" height="132"/> <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="131"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="4" width="182" height="122"/> + <rect key="frame" x="31" y="3.5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="104" width="29" height="21"/> + <rect key="frame" x="184" y="103" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -460,7 +440,7 @@ <rect key="frame" x="0.0" y="167" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -469,7 +449,7 @@ <rect key="frame" x="0.0" y="212" width="320" height="44"/> <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="44"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -478,7 +458,7 @@ <rect key="frame" x="0.0" y="256" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -534,6 +514,73 @@ <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="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"/> diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings Binary files differindex adff8715cbf7..0f59d358cdda 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 b061c5090799..cf5bb6334f3c 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard @@ -1,6 +1,7 @@ <?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 defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> @@ -17,7 +18,7 @@ <rect key="frame" x="0.0" y="46" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rg3-PU-OuS"> @@ -114,7 +115,7 @@ <rect key="frame" x="0.0" y="10" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -123,7 +124,7 @@ <rect key="frame" x="0.0" y="55" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -174,22 +175,22 @@ <rect key="frame" x="0.0" y="20" width="320" height="548"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <prototypes> - <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="132" id="hig-YG-1Lg"> - <rect key="frame" x="0.0" y="22" width="320" height="132"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="115" id="hig-YG-1Lg"> + <rect key="frame" x="0.0" y="22" width="320" height="115"/> <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="131"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="114"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="0.0" width="220" height="59"/> + <rect key="frame" x="11" y="10" width="220" height="51"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="61" y="75" width="44" height="44"/> + <rect key="frame" x="65" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> @@ -201,7 +202,7 @@ </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="130" y="75" width="44" height="44"/> + <rect key="frame" x="134" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> @@ -212,44 +213,23 @@ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </state> </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3UQ-XJ-SDP"> - <rect key="frame" x="44" y="48" width="33" height="20.5"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Minutes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TqG-sM-lAC"> - <rect key="frame" x="97" y="48" width="43" height="20.5"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Seconds" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6jG-LW-J7Q"> - <rect key="frame" x="152" y="48" width="47" height="20.5"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="132" id="dDp-H3-HyL"> - <rect key="frame" x="0.0" y="154" width="320" height="132"/> + <rect key="frame" x="0.0" y="137" width="320" height="132"/> <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="131"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="4" width="182" height="122"/> + <rect key="frame" x="31" y="3.5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="104" width="29" height="21"/> + <rect key="frame" x="184" y="103" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -460,7 +440,7 @@ <rect key="frame" x="0.0" y="167" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -469,7 +449,7 @@ <rect key="frame" x="0.0" y="212" width="320" height="44"/> <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="44"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -478,7 +458,7 @@ <rect key="frame" x="0.0" y="256" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -534,6 +514,73 @@ <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="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"/> diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard index 75214ceeb43c..58fb37b8dc6e 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> +<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 defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> - <!--Server list vc - Impress Remote--> + <!--Server list vc - LibreOffice Impress Contrôle Distant--> <scene sceneID="5"> <objects> <viewController id="2" customClass="server_list_vc" sceneMemberID="viewController"> @@ -17,7 +18,7 @@ <rect key="frame" x="0.0" y="46" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rg3-PU-OuS"> @@ -42,7 +43,9 @@ <outlet property="delegate" destination="2" id="owZ-Ow-VEc"/> </connections> </tableView> - <navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN"> + <navigationItem key="navigationItem" id="yR1-m8-JWN"> + <string key="title">LibreOffice Impress +Contrôle Distant</string> <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"/> @@ -73,13 +76,13 @@ <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Veuillez entrer le code ci-dessus dans le fenêtre Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> <rect key="frame" x="29" y="208" width="271" height="65"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <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"> + <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"/> @@ -114,7 +117,7 @@ <rect key="frame" x="0.0" y="10" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -123,7 +126,7 @@ <rect key="frame" x="0.0" y="55" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -174,22 +177,22 @@ <rect key="frame" x="0.0" y="20" width="320" height="548"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <prototypes> - <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="132" id="hig-YG-1Lg"> - <rect key="frame" x="0.0" y="22" width="320" height="132"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="115" id="hig-YG-1Lg"> + <rect key="frame" x="0.0" y="22" width="320" height="115"/> <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="131"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="114"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="0.0" width="220" height="59"/> + <rect key="frame" x="11" y="10" width="220" height="51"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="61" y="75" width="44" height="44"/> + <rect key="frame" x="65" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> @@ -201,7 +204,7 @@ </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="130" y="75" width="44" height="44"/> + <rect key="frame" x="134" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> @@ -212,44 +215,23 @@ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </state> </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3UQ-XJ-SDP"> - <rect key="frame" x="44" y="48" width="33" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Minutes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TqG-sM-lAC"> - <rect key="frame" x="97" y="48" width="43" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Seconds" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6jG-LW-J7Q"> - <rect key="frame" x="152" y="48" width="47" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="132" id="dDp-H3-HyL"> - <rect key="frame" x="0.0" y="154" width="320" height="132"/> + <rect key="frame" x="0.0" y="137" width="320" height="132"/> <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="131"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="4" width="182" height="122"/> + <rect key="frame" x="31" y="3.5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="104" width="29" height="21"/> + <rect key="frame" x="184" y="103" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -320,7 +302,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="Notes " textAlignment="right" 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"/> @@ -440,7 +422,7 @@ <rect key="frame" x="0.0" y="17" width="320" height="140"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> - <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"> + <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"/> @@ -460,7 +442,7 @@ <rect key="frame" x="0.0" y="167" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -469,7 +451,7 @@ <rect key="frame" x="0.0" y="212" width="320" height="44"/> <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="44"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -478,7 +460,7 @@ <rect key="frame" x="0.0" y="256" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -534,6 +516,73 @@ <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="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"/> diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.strings b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.strings Binary files differindex adff8715cbf7..b5424649d534 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 75214ceeb43c..58fb37b8dc6e 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> +<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 defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> - <!--Server list vc - Impress Remote--> + <!--Server list vc - LibreOffice Impress Contrôle Distant--> <scene sceneID="5"> <objects> <viewController id="2" customClass="server_list_vc" sceneMemberID="viewController"> @@ -17,7 +18,7 @@ <rect key="frame" x="0.0" y="46" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rg3-PU-OuS"> @@ -42,7 +43,9 @@ <outlet property="delegate" destination="2" id="owZ-Ow-VEc"/> </connections> </tableView> - <navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN"> + <navigationItem key="navigationItem" id="yR1-m8-JWN"> + <string key="title">LibreOffice Impress +Contrôle Distant</string> <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"/> @@ -73,13 +76,13 @@ <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Veuillez entrer le code ci-dessus dans le fenêtre Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> <rect key="frame" x="29" y="208" width="271" height="65"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <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"> + <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"/> @@ -114,7 +117,7 @@ <rect key="frame" x="0.0" y="10" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -123,7 +126,7 @@ <rect key="frame" x="0.0" y="55" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -174,22 +177,22 @@ <rect key="frame" x="0.0" y="20" width="320" height="548"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <prototypes> - <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="132" id="hig-YG-1Lg"> - <rect key="frame" x="0.0" y="22" width="320" height="132"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="115" id="hig-YG-1Lg"> + <rect key="frame" x="0.0" y="22" width="320" height="115"/> <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="131"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="114"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="0.0" width="220" height="59"/> + <rect key="frame" x="11" y="10" width="220" height="51"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="61" y="75" width="44" height="44"/> + <rect key="frame" x="65" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> @@ -201,7 +204,7 @@ </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="130" y="75" width="44" height="44"/> + <rect key="frame" x="134" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> @@ -212,44 +215,23 @@ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </state> </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3UQ-XJ-SDP"> - <rect key="frame" x="44" y="48" width="33" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Minutes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TqG-sM-lAC"> - <rect key="frame" x="97" y="48" width="43" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Seconds" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6jG-LW-J7Q"> - <rect key="frame" x="152" y="48" width="47" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="132" id="dDp-H3-HyL"> - <rect key="frame" x="0.0" y="154" width="320" height="132"/> + <rect key="frame" x="0.0" y="137" width="320" height="132"/> <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="131"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="4" width="182" height="122"/> + <rect key="frame" x="31" y="3.5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="104" width="29" height="21"/> + <rect key="frame" x="184" y="103" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -320,7 +302,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="Notes " textAlignment="right" 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"/> @@ -440,7 +422,7 @@ <rect key="frame" x="0.0" y="17" width="320" height="140"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> - <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"> + <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"/> @@ -460,7 +442,7 @@ <rect key="frame" x="0.0" y="167" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -469,7 +451,7 @@ <rect key="frame" x="0.0" y="212" width="320" height="44"/> <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="44"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -478,7 +460,7 @@ <rect key="frame" x="0.0" y="256" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -534,6 +516,73 @@ <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="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"/> diff --git a/ios/iosremote/iosremote/newServer_vc.m b/ios/iosremote/iosremote/newServer_vc.m index 8e5f7d3a0f82..98dfe938e4ad 100644 --- a/ios/iosremote/iosremote/newServer_vc.m +++ b/ios/iosremote/iosremote/newServer_vc.m @@ -85,7 +85,8 @@ [self setNameCell:[self newDetailCellWithTag:ServerName]]; [self setAddrCell:[self newDetailCellWithTag:ServerAddr]]; - [self setTitle:NSLocalizedString(@"New Server", nil)]; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) + [self setTitle:NSLocalizedString(@"New Server", nil)]; UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Cancel", nil) style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; diff --git a/ios/iosremote/iosremote/serverList_vc.m b/ios/iosremote/iosremote/serverList_vc.m index 445e31afda9f..9714f378a141 100644 --- a/ios/iosremote/iosremote/serverList_vc.m +++ b/ios/iosremote/iosremote/serverList_vc.m @@ -281,9 +281,9 @@ } UILabel *sectionHeader; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { - sectionHeader = [[UILabel alloc] initWithFrame:CGRectMake(10, 10, 200, 40)]; + sectionHeader = [[UILabel alloc] initWithFrame:CGRectMake(10, 10, 310, 40)]; } else { - sectionHeader = [[UILabel alloc] initWithFrame:CGRectMake(25, 10, 200, 40)]; + sectionHeader = [[UILabel alloc] initWithFrame:CGRectMake(25, 10, 295, 40)]; } sectionHeader.backgroundColor = [UIColor clearColor]; sectionHeader.font = kAppTextFont; diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc.h b/ios/iosremote/iosremote/slideShowPreviewTable_vc.h index e8f4f04c14bc..ee0e3bacfb36 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc.h +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc.h @@ -9,8 +9,8 @@ #import <UIKit/UIKit.h> #import "CommunicationManager.h" -#define OPTION_TIMER @"Timer auto-start" -#define OPTION_POINTER @"Touch pointer" +#define OPTION_TIMER NSLocalizedString(@"Timer auto-start", nil) +#define OPTION_POINTER NSLocalizedString(@"Touch pointer", nil) #define KEY_TIMER @"TIMER_AUTOSTART_ENABLED" #define KEY_POINTER @"TOUCH_POINTER_ENABLED" diff --git a/ios/iosremote/iosremote/stopWatch.m b/ios/iosremote/iosremote/stopWatch.m index 9c68544286e3..2eea9f4dbcb8 100644 --- a/ios/iosremote/iosremote/stopWatch.m +++ b/ios/iosremote/iosremote/stopWatch.m @@ -127,7 +127,7 @@ [self.startButton setImage:[UIImage imageNamed:@"timer_pause_btn"] forState:UIControlStateNormal]; break; case TIMER_STATE_PAUSED: - [self.startButton setImage:[UIImage imageNamed:@"timer_resume_btn"] forState:UIControlStateNormal]; + [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; break; case TIMER_STATE_CLEARED: [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard index 75214ceeb43c..b845308e0e7c 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> +<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 defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc - Impress Remote--> @@ -17,7 +18,7 @@ <rect key="frame" x="0.0" y="46" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rg3-PU-OuS"> @@ -73,13 +74,13 @@ <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="请将以上pin码输入到LibreOffice Impress - 幻灯片播放 - Impress远程 中" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> <rect key="frame" x="29" y="208" width="271" height="65"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <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"> + <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"/> @@ -114,7 +115,7 @@ <rect key="frame" x="0.0" y="10" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -123,7 +124,7 @@ <rect key="frame" x="0.0" y="55" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -174,22 +175,22 @@ <rect key="frame" x="0.0" y="20" width="320" height="548"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <prototypes> - <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="132" id="hig-YG-1Lg"> - <rect key="frame" x="0.0" y="22" width="320" height="132"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="115" id="hig-YG-1Lg"> + <rect key="frame" x="0.0" y="22" width="320" height="115"/> <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="131"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="114"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="0.0" width="220" height="59"/> + <rect key="frame" x="11" y="10" width="220" height="51"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="61" y="75" width="44" height="44"/> + <rect key="frame" x="65" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> @@ -201,7 +202,7 @@ </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="130" y="75" width="44" height="44"/> + <rect key="frame" x="134" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> @@ -212,44 +213,23 @@ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </state> </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3UQ-XJ-SDP"> - <rect key="frame" x="44" y="48" width="33" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Minutes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TqG-sM-lAC"> - <rect key="frame" x="97" y="48" width="43" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Seconds" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6jG-LW-J7Q"> - <rect key="frame" x="152" y="48" width="47" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="132" id="dDp-H3-HyL"> - <rect key="frame" x="0.0" y="154" width="320" height="132"/> + <rect key="frame" x="0.0" y="137" width="320" height="132"/> <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="131"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="4" width="182" height="122"/> + <rect key="frame" x="31" y="3.5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="104" width="29" height="21"/> + <rect key="frame" x="184" y="103" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -320,7 +300,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="演讲者笔记 " textAlignment="right" 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"/> @@ -440,7 +420,7 @@ <rect key="frame" x="0.0" y="17" width="320" height="140"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> - <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"> + <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"/> @@ -460,7 +440,7 @@ <rect key="frame" x="0.0" y="167" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -469,7 +449,7 @@ <rect key="frame" x="0.0" y="212" width="320" height="44"/> <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="44"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -478,7 +458,7 @@ <rect key="frame" x="0.0" y="256" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -534,6 +514,73 @@ <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="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"/> 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 adff8715cbf7..2429c83aa6db 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 75214ceeb43c..b845308e0e7c 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> +<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 defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc - Impress Remote--> @@ -17,7 +18,7 @@ <rect key="frame" x="0.0" y="46" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rg3-PU-OuS"> @@ -73,13 +74,13 @@ <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="请将以上pin码输入到LibreOffice Impress - 幻灯片播放 - Impress远程 中" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> <rect key="frame" x="29" y="208" width="271" height="65"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <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"> + <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"/> @@ -114,7 +115,7 @@ <rect key="frame" x="0.0" y="10" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -123,7 +124,7 @@ <rect key="frame" x="0.0" y="55" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -174,22 +175,22 @@ <rect key="frame" x="0.0" y="20" width="320" height="548"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <prototypes> - <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="132" id="hig-YG-1Lg"> - <rect key="frame" x="0.0" y="22" width="320" height="132"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="115" id="hig-YG-1Lg"> + <rect key="frame" x="0.0" y="22" width="320" height="115"/> <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="131"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="114"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="0.0" width="220" height="59"/> + <rect key="frame" x="11" y="10" width="220" height="51"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="61" y="75" width="44" height="44"/> + <rect key="frame" x="65" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> @@ -201,7 +202,7 @@ </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="130" y="75" width="44" height="44"/> + <rect key="frame" x="134" y="60" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> @@ -212,44 +213,23 @@ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </state> </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3UQ-XJ-SDP"> - <rect key="frame" x="44" y="48" width="33" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Minutes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TqG-sM-lAC"> - <rect key="frame" x="97" y="48" width="43" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Seconds" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6jG-LW-J7Q"> - <rect key="frame" x="152" y="48" width="47" height="21"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="132" id="dDp-H3-HyL"> - <rect key="frame" x="0.0" y="154" width="320" height="132"/> + <rect key="frame" x="0.0" y="137" width="320" height="132"/> <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="131"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="4" width="182" height="122"/> + <rect key="frame" x="31" y="3.5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="104" width="29" height="21"/> + <rect key="frame" x="184" y="103" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -320,7 +300,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="演讲者笔记 " textAlignment="right" 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"/> @@ -440,7 +420,7 @@ <rect key="frame" x="0.0" y="17" width="320" height="140"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> - <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"> + <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"/> @@ -460,7 +440,7 @@ <rect key="frame" x="0.0" y="167" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -469,7 +449,7 @@ <rect key="frame" x="0.0" y="212" width="320" height="44"/> <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="44"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -478,7 +458,7 @@ <rect key="frame" x="0.0" y="256" width="320" height="45"/> <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="45"/> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> @@ -534,6 +514,73 @@ <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="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"/> diff --git a/ios/iosremote/zh-Hans.lproj/Localizable.strings b/ios/iosremote/zh-Hans.lproj/Localizable.strings Binary files differindex 1b409ae3f0b6..836ba6d097eb 100644 --- a/ios/iosremote/zh-Hans.lproj/Localizable.strings +++ b/ios/iosremote/zh-Hans.lproj/Localizable.strings diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard index 5dda6accab36..52a9e6b0f4ed 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> - <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <development version="4600" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc ipad - 连接--> @@ -10,30 +10,31 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> - <rect key="frame" x="0.0" y="119" width="540" height="44"/> + <rect key="frame" x="0.0" y="54" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="yuT-lk-tWb"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="标题" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> - <rect key="frame" x="15" y="12" width="34" height="20"/> + <rect key="frame" x="10" y="11" width="32" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="细节" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Fsp-wI-AAW"> - <rect key="frame" x="491" y="12" width="34" height="20"/> + <rect key="frame" x="424" y="11" width="44" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -69,23 +70,23 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="159" y="81.5" width="223" height="118"/> + <rect key="frame" x="159" y="71" width="223" height="118"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="请将以上pin码输入到LibreOffice Impress - 幻灯片播放 - Impress远程 中" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="110" y="272" width="320" height="94"/> + <rect key="frame" x="110" y="239" width="320" height="94"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <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的配对" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> - <rect key="frame" x="109" y="441" width="322" height="57"/> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="等待LibreOffice Impress的配对..." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> + <rect key="frame" x="109" y="391" width="322" height="57"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -110,27 +111,29 @@ <objects> <tableViewController id="65c-5D-pB7" customClass="newServerViewController" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> <tableViewSection footerTitle="" id="CVG-Eq-rLd"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="99" width="540" height="44"/> + <rect key="frame" x="0.0" y="30" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="CPF-Nb-hVB"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="143" width="540" height="44"/> + <rect key="frame" x="0.0" y="75" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="o7Y-OC-Mlo"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,18 +161,18 @@ <objects> <tableViewController storyboardIdentifier="slideShowPreview" id="B8g-8S-pgn" customClass="slideShowPreviewTable_vc_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> - <rect key="frame" x="0.0" y="64" width="540" height="281"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="281"/> <subviews> <view contentMode="scaleToFill" id="Is1-dX-SaP"> - <rect key="frame" x="36" y="53" width="468" height="208"/> + <rect key="frame" x="0.0" y="37" width="540" height="208"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="演示文稿标题" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5"> - <rect key="frame" x="20" y="20" width="428" height="168"/> + <rect key="frame" x="20" y="20" width="500" height="168"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> @@ -185,28 +188,31 @@ <tableViewSection id="gMl-dC-GqD"> <cells> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="tqg-R4-Coi"> - <rect key="frame" x="0.0" y="345" width="540" height="44"/> + <rect key="frame" x="0.0" y="291" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="N7I-bp-Azf"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> - <rect key="frame" x="0.0" y="389" width="540" height="44"/> + <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="mnM-cl-QAX"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> - <rect key="frame" x="0.0" y="433" width="540" height="44"/> + <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="QKt-Xa-Y3p"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +238,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,10 +296,10 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <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="演讲者笔记 " textAlignment="right" 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"/> @@ -302,7 +308,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +316,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <tableView contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Iok-mu-c0T" customClass="HorizontalTableView"> - <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> + <rect key="frame" x="227" y="-1233" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,7 +325,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> @@ -363,7 +369,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38"> - <rect key="frame" x="683" y="918" width="97" height="59"/> + <rect key="frame" x="683" y="898" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -378,7 +384,7 @@ </connections> </button> <view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <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"> @@ -400,7 +406,7 @@ <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 遥控器" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> + <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"/> @@ -459,15 +465,15 @@ <objects> <tableViewController clearsSelectionOnViewWillAppear="NO" id="VQa-vM-8pF" customClass="slideShowSwipeInList_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="170" sectionHeaderHeight="22" sectionFooterHeight="22" id="U9c-sP-NVQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="KxF-9S-Dzt"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> @@ -485,7 +491,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -525,15 +532,96 @@ <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="143.52479553222656" height="143.52479553222656"/> + <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"/> <image name="previousButton_pressed.png" width="42" height="230"/> - <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> - <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_clear_btn.png" width="60" height="60"/> + <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="BasePresentationViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="popOverUp:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="action" name="startConnectionModal:"/> + <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> + <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> + <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> + <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"> + <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="MainSplitViewController" superclassName="UISplitViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> + </class> + <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.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="server_list_vc_ipad" superclassName="server_list_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> + <relationships> + <relationship kind="action" name="cancelModalView:"/> + </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_ipad" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings b/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings Binary files differindex 83267427b869..205ee6680474 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 d595890294be..52a9e6b0f4ed 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> - <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <development version="4600" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc ipad - 连接--> @@ -10,30 +10,31 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> - <rect key="frame" x="0.0" y="119" width="540" height="44"/> + <rect key="frame" x="0.0" y="54" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="yuT-lk-tWb"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="标题" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> - <rect key="frame" x="15" y="12" width="34" height="20"/> + <rect key="frame" x="10" y="11" width="32" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="细节" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Fsp-wI-AAW"> - <rect key="frame" x="491" y="12" width="34" height="20"/> + <rect key="frame" x="424" y="11" width="44" height="22"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -69,23 +70,23 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="159" y="81.5" width="223" height="118"/> + <rect key="frame" x="159" y="71" width="223" height="118"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="请将以上pin码输入到LibreOffice Impress - 幻灯片播放 - Impress远程 中" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="110" y="272" width="320" height="94"/> + <rect key="frame" x="110" y="239" width="320" height="94"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <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的配对" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> - <rect key="frame" x="109" y="441" width="322" height="57"/> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="等待LibreOffice Impress的配对..." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> + <rect key="frame" x="109" y="391" width="322" height="57"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -110,27 +111,29 @@ <objects> <tableViewController id="65c-5D-pB7" customClass="newServerViewController" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> <tableViewSection footerTitle="" id="CVG-Eq-rLd"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="99" width="540" height="44"/> + <rect key="frame" x="0.0" y="30" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="CPF-Nb-hVB"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> - <rect key="frame" x="0.0" y="143" width="540" height="44"/> + <rect key="frame" x="0.0" y="75" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="o7Y-OC-Mlo"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,18 +161,18 @@ <objects> <tableViewController storyboardIdentifier="slideShowPreview" id="B8g-8S-pgn" customClass="slideShowPreviewTable_vc_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> - <rect key="frame" x="0.0" y="64" width="540" height="281"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="281"/> <subviews> <view contentMode="scaleToFill" id="Is1-dX-SaP"> - <rect key="frame" x="36" y="53" width="468" height="208.00000000000003"/> + <rect key="frame" x="0.0" y="37" width="540" height="208"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="演示文稿标题" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5"> - <rect key="frame" x="20" y="20" width="428" height="168"/> + <rect key="frame" x="20" y="20" width="500" height="168"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> @@ -185,28 +188,31 @@ <tableViewSection id="gMl-dC-GqD"> <cells> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="tqg-R4-Coi"> - <rect key="frame" x="0.0" y="345" width="540" height="44"/> + <rect key="frame" x="0.0" y="291" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="N7I-bp-Azf"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> - <rect key="frame" x="0.0" y="389" width="540" height="44"/> + <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="mnM-cl-QAX"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> - <rect key="frame" x="0.0" y="433" width="540" height="44"/> + <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="QKt-Xa-Y3p"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="0.0" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +238,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,10 +296,10 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <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="演讲者笔记 " textAlignment="right" 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"/> @@ -302,7 +308,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +316,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <tableView contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Iok-mu-c0T" customClass="HorizontalTableView"> - <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> + <rect key="frame" x="227" y="-1233" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,7 +325,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> @@ -363,7 +369,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38"> - <rect key="frame" x="683" y="918" width="97" height="59"/> + <rect key="frame" x="683" y="898" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -378,7 +384,7 @@ </connections> </button> <view alpha="0.50000000000000011" contentMode="scaleToFill" id="jX5-gj-cqE"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <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"> @@ -400,7 +406,7 @@ <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 遥控器" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> + <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"/> @@ -459,15 +465,15 @@ <objects> <tableViewController clearsSelectionOnViewWillAppear="NO" id="VQa-vM-8pF" customClass="slideShowSwipeInList_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="170" sectionHeaderHeight="22" sectionFooterHeight="22" id="U9c-sP-NVQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="KxF-9S-Dzt"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> @@ -485,7 +491,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -525,15 +532,96 @@ <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="143.52479553222656" height="143.52479553222656"/> + <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"/> <image name="previousButton_pressed.png" width="42" height="230"/> - <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> - <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_clear_btn.png" width="60" height="60"/> + <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="BasePresentationViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="popOverUp:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="action" name="startConnectionModal:"/> + <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> + <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> + <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> + <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"> + <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="MainSplitViewController" superclassName="UISplitViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> + </class> + <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.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="server_list_vc_ipad" superclassName="server_list_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> + <relationships> + <relationship kind="action" name="cancelModalView:"/> + </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_ipad" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> + <relationships> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> |