diff options
author | Siqi LIU <me@siqi.fr> | 2013-08-12 16:54:34 +0800 |
---|---|---|
committer | Siqi LIU <me@siqi.fr> | 2013-08-13 00:11:57 +0800 |
commit | c6d6cc9b47b7d1c3ea8879439a248c1e7c99168a (patch) | |
tree | bc5fb43ecd897a24838af9141e8d6675188c2855 /ios | |
parent | e0e276ab255fb75c0412436baa0974836278b9db (diff) |
load different storyboard based on iOS localization
Change-Id: I7221ec002ac70be53acc9bd30fe4febba4e846bb
Diffstat (limited to 'ios')
17 files changed, 290 insertions, 462 deletions
diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store Binary files differindex 8804422be78e..3b495f740b27 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 71b2fc70f90f..d6a643a59c27 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="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<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"> <dependencies> - <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <deployment defaultVersion="1280" identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc ipad - Connect--> @@ -10,31 +10,30 @@ <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" separatorStyle="singleLineEtched" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="54" width="540" height="46"/> + <rect key="frame" x="0.0" y="119" width="540" 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="540" height="46"/> + <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"/> <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="10" y="11" width="32" height="22"/> + <rect key="frame" x="15" y="12" width="32" height="20"/> <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="424" y="11" width="44" height="22"/> + <rect key="frame" x="481" y="12" width="44" height="20"/> <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> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </prototypes> <connections> @@ -70,23 +69,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="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="71" width="223" height="118"/> + <rect key="frame" x="159" y="81.5" 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="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="137" y="267" width="266" height="38"/> + <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"/> <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="VVO-s2-eCV"> - <rect key="frame" x="147" y="403" width="246" height="19"/> + <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"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -111,29 +110,27 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="30" width="540" height="45"/> + <rect key="frame" x="0.0" y="99" width="540" 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="540" height="45"/> + <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"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="75" width="540" height="45"/> + <rect key="frame" x="0.0" y="143" width="540" 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="540" height="45"/> + <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"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -161,11 +158,11 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="0.0" width="540" height="281"/> + <rect key="frame" x="0.0" y="64" width="540" height="281"/> <subviews> <view contentMode="scaleToFill" id="Is1-dX-SaP"> <rect key="frame" x="36" y="53" width="468" height="208"/> @@ -188,31 +185,28 @@ <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="291" width="540" height="45"/> + <rect key="frame" x="0.0" y="345" width="540" 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="540" height="45"/> + <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"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="336" width="540" height="44"/> + <rect key="frame" x="0.0" y="389" width="540" 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="540" height="44"/> + <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"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="380" width="540" height="45"/> + <rect key="frame" x="0.0" y="433" width="540" 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="540" height="45"/> + <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"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -238,7 +232,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="20" width="768" height="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -296,7 +290,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="303"/> + <rect key="frame" x="-13" y="595" width="794" height="323"/> <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"> @@ -308,7 +302,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="274"/> + <rect key="frame" x="20" y="29" width="754" height="294"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -316,7 +310,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="-641" y="-181" width="0.0" height="0.0"/> + <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -325,7 +319,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="906" width="768" height="98"/> + <rect key="frame" x="0.0" y="926" 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"> @@ -369,7 +363,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="898" width="97" height="59"/> + <rect key="frame" x="683" y="918" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -384,7 +378,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="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> @@ -406,8 +400,8 @@ <action selector="startConnectionModal:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="8aS-7k-5Ga"/> </connections> </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LibreOffice Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="124" y="471" width="520" height="62"/> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LibreOffice Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> + <rect key="frame" x="101" y="471" width="566" height="131"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -465,22 +459,22 @@ <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="20" width="320" height="832"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> <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"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="5" width="233" height="163"/> + <rect key="frame" x="44" y="4.5" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="152" width="29" height="21"/> + <rect key="frame" x="-605" y="151" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -491,8 +485,7 @@ <nil key="highlightedColor"/> </label> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -532,14 +525,14 @@ <image name="add.png" width="30" height="30"/> <image name="gear.png" width="55" height="35"/> <image name="gear_pressed" width="16" height="16"/> - <image name="libO_icon.png" width="598" height="598"/> + <image name="libO_icon.png" width="143.52479553222656" height="143.52479553222656"/> <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="60" height="60"/> - <image name="timer_start_btn.png" width="60" height="60"/> + <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> </resources> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> @@ -547,6 +540,6 @@ <simulatedScreenMetrics key="destination"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="XCJ-4d-eG4"/> + <segue reference="gCy-Mv-VrC"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard index 71b2fc70f90f..482a4cdbb978 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="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<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"> <dependencies> - <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <deployment defaultVersion="1280" identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc ipad - Connect--> @@ -10,13 +10,13 @@ <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" separatorStyle="singleLineEtched" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="54" width="540" height="46"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="46"/> <autoresizingMask key="autoresizingMask"/> <subviews> @@ -33,8 +33,7 @@ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </prototypes> <connections> @@ -70,23 +69,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="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="71" width="223" height="118"/> + <rect key="frame" x="159" y="81.5" 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="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="137" y="267" width="266" height="38"/> + <rect key="frame" x="137" y="300" width="266" height="38"/> <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="VVO-s2-eCV"> - <rect key="frame" x="147" y="403" width="246" height="19"/> + <rect key="frame" x="147" y="451" width="246" height="19"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -111,7 +110,7 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> @@ -120,20 +119,18 @@ <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="30" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="75" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -161,7 +158,7 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> @@ -190,29 +187,26 @@ <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="291" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="44"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="380" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -238,7 +232,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="20" width="768" height="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -296,7 +290,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="303"/> + <rect key="frame" x="-13" y="595" width="794" height="323"/> <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"> @@ -308,7 +302,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="274"/> + <rect key="frame" x="20" y="29" width="754" height="294"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -316,7 +310,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="-641" y="-181" width="0.0" height="0.0"/> + <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -325,7 +319,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="906" width="768" height="98"/> + <rect key="frame" x="0.0" y="926" 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"> @@ -369,7 +363,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="898" width="97" height="59"/> + <rect key="frame" x="683" y="918" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -384,7 +378,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="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> @@ -406,8 +400,8 @@ <action selector="startConnectionModal:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="8aS-7k-5Ga"/> </connections> </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LibreOffice Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="124" y="471" width="520" height="62"/> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LibreOffice Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> + <rect key="frame" x="101" y="471" width="566" height="131"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -465,22 +459,22 @@ <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="20" width="320" height="832"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> <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"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="5" width="233" height="163"/> + <rect key="frame" x="44" y="4.5" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="152" width="29" height="21"/> + <rect key="frame" x="-605" y="151" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -491,8 +485,7 @@ <nil key="highlightedColor"/> </label> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -532,14 +525,14 @@ <image name="add.png" width="30" height="30"/> <image name="gear.png" width="55" height="35"/> <image name="gear_pressed" width="16" height="16"/> - <image name="libO_icon.png" width="598" height="598"/> + <image name="libO_icon.png" width="143.52479553222656" height="143.52479553222656"/> <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="60" height="60"/> - <image name="timer_start_btn.png" width="60" height="60"/> + <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> </resources> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> diff --git a/ios/iosremote/fr.lproj/Localizable.strings b/ios/iosremote/fr.lproj/Localizable.strings Binary files differindex b8c0b4e2449f..9c91be59a9e1 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 1f4e513e9b14..6b19e46c7f5d 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="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<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"> <dependencies> - <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <deployment defaultVersion="1280" identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc ipad - Connecter--> @@ -10,31 +10,30 @@ <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" separatorStyle="singleLineEtched" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="54" width="540" height="46"/> + <rect key="frame" x="0.0" y="119" width="540" 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="540" height="46"/> + <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"/> <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="10" y="11" width="32" height="22"/> + <rect key="frame" x="15" y="12" width="34" height="20"/> <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="424" y="11" width="44" height="22"/> + <rect key="frame" x="481" y="12" width="44" height="20"/> <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> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </prototypes> <connections> @@ -70,23 +69,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="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="71" width="223" height="118"/> + <rect key="frame" x="159" y="81.5" 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="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="137" y="267" width="266" height="38"/> + <rect key="frame" x="137" y="300" width="266" height="38"/> <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..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> - <rect key="frame" x="147" y="403" width="246" height="19"/> + <rect key="frame" x="147" y="451" width="246" height="19"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -111,29 +110,27 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="30" width="540" height="45"/> + <rect key="frame" x="0.0" y="99" width="540" 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="540" height="45"/> + <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"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="75" width="540" height="45"/> + <rect key="frame" x="0.0" y="143" width="540" 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="540" height="45"/> + <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"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -161,7 +158,7 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> @@ -190,29 +187,26 @@ <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="291" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="44"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="380" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -238,7 +232,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="20" width="768" height="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -296,7 +290,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="303"/> + <rect key="frame" x="-13" y="595" width="794" height="323"/> <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"> @@ -308,7 +302,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="274"/> + <rect key="frame" x="20" y="29" width="754" height="294"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -316,7 +310,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="-641" y="-181" width="0.0" height="0.0"/> + <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -325,7 +319,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="906" width="768" height="98"/> + <rect key="frame" x="0.0" y="926" 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"> @@ -369,7 +363,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="898" width="97" height="59"/> + <rect key="frame" x="683" y="918" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -384,7 +378,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="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> @@ -406,8 +400,8 @@ <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="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="124" y="471" width="520" height="62"/> + <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"> + <rect key="frame" x="101" y="471" width="566" height="131"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -465,22 +459,22 @@ <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="20" width="320" height="832"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> <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"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="5" width="233" height="163"/> + <rect key="frame" x="44" y="4.5" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="152" width="29" height="21"/> + <rect key="frame" x="-605" y="151" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -491,8 +485,7 @@ <nil key="highlightedColor"/> </label> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -532,14 +525,14 @@ <image name="add.png" width="30" height="30"/> <image name="gear.png" width="55" height="35"/> <image name="gear_pressed" width="16" height="16"/> - <image name="libO_icon.png" width="598" height="598"/> + <image name="libO_icon.png" width="143.52479553222656" height="143.52479553222656"/> <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="60" height="60"/> - <image name="timer_start_btn.png" width="60" height="60"/> + <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> </resources> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard index 1f4e513e9b14..6b19e46c7f5d 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="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<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"> <dependencies> - <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <deployment defaultVersion="1280" identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc ipad - Connecter--> @@ -10,31 +10,30 @@ <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" separatorStyle="singleLineEtched" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="54" width="540" height="46"/> + <rect key="frame" x="0.0" y="119" width="540" 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="540" height="46"/> + <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"/> <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="10" y="11" width="32" height="22"/> + <rect key="frame" x="15" y="12" width="34" height="20"/> <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="424" y="11" width="44" height="22"/> + <rect key="frame" x="481" y="12" width="44" height="20"/> <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> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </prototypes> <connections> @@ -70,23 +69,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="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="71" width="223" height="118"/> + <rect key="frame" x="159" y="81.5" 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="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="137" y="267" width="266" height="38"/> + <rect key="frame" x="137" y="300" width="266" height="38"/> <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..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> - <rect key="frame" x="147" y="403" width="246" height="19"/> + <rect key="frame" x="147" y="451" width="246" height="19"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -111,29 +110,27 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="30" width="540" height="45"/> + <rect key="frame" x="0.0" y="99" width="540" 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="540" height="45"/> + <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"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="75" width="540" height="45"/> + <rect key="frame" x="0.0" y="143" width="540" 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="540" height="45"/> + <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"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -161,7 +158,7 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> @@ -190,29 +187,26 @@ <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="291" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="44"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="380" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -238,7 +232,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="20" width="768" height="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -296,7 +290,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="303"/> + <rect key="frame" x="-13" y="595" width="794" height="323"/> <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"> @@ -308,7 +302,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="274"/> + <rect key="frame" x="20" y="29" width="754" height="294"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -316,7 +310,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="-641" y="-181" width="0.0" height="0.0"/> + <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -325,7 +319,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="906" width="768" height="98"/> + <rect key="frame" x="0.0" y="926" 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"> @@ -369,7 +363,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="898" width="97" height="59"/> + <rect key="frame" x="683" y="918" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -384,7 +378,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="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> @@ -406,8 +400,8 @@ <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="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="124" y="471" width="520" height="62"/> + <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"> + <rect key="frame" x="101" y="471" width="566" height="131"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -465,22 +459,22 @@ <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="20" width="320" height="832"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> <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"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="5" width="233" height="163"/> + <rect key="frame" x="44" y="4.5" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="152" width="29" height="21"/> + <rect key="frame" x="-605" y="151" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -491,8 +485,7 @@ <nil key="highlightedColor"/> </label> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -532,14 +525,14 @@ <image name="add.png" width="30" height="30"/> <image name="gear.png" width="55" height="35"/> <image name="gear_pressed" width="16" height="16"/> - <image name="libO_icon.png" width="598" height="598"/> + <image name="libO_icon.png" width="143.52479553222656" height="143.52479553222656"/> <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="60" height="60"/> - <image name="timer_start_btn.png" width="60" height="60"/> + <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> </resources> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index 482568621a8c..7b91b619126b 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -176,13 +176,13 @@ 8C0323A917A943720037432E /* UIImageView+setImageAnimated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImageView+setImageAnimated.h"; path = "iosremote/UIImageView+setImageAnimated.h"; sourceTree = "<group>"; }; 8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImageView+setImageAnimated.m"; path = "iosremote/UIImageView+setImageAnimated.m"; sourceTree = "<group>"; }; 8C06B31C17B7EC83002F5CF8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = iosremote/en.lproj/Localizable.strings; sourceTree = "<group>"; }; - 8C06B31F17B7ED1E002F5CF8 /* en */ = {isa = PBXFileReference; lastKnownFileType = file; name = en; path = en.lproj/iPad_autosize.storyboard; sourceTree = "<group>"; }; + 8C06B31F17B7ED1E002F5CF8 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/iPad_autosize.storyboard; sourceTree = "<group>"; }; 8C06B32117B7ED2A002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = fr; path = fr.lproj/iPhone_autoSize.storyboard; sourceTree = "<group>"; }; - 8C06B32217B7ED2A002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file; name = fr; path = fr.lproj/iPad_autosize.storyboard; sourceTree = "<group>"; }; + 8C06B32217B7ED2A002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = fr; path = fr.lproj/iPad_autosize.storyboard; sourceTree = "<group>"; }; 8C06B32317B7ED2B002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; }; 8C06B32417B7ED2B002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 8C06B32517B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "zh-Hans"; path = "zh-Hans.lproj/iPhone_autoSize.storyboard"; sourceTree = "<group>"; }; - 8C06B32617B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file; name = "zh-Hans"; path = "zh-Hans.lproj/iPad_autosize.storyboard"; sourceTree = "<group>"; }; + 8C06B32617B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "zh-Hans"; path = "zh-Hans.lproj/iPad_autosize.storyboard"; sourceTree = "<group>"; }; 8C06B32717B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; }; 8C06B32817B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; }; 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nextButton_pressed.png; sourceTree = "<group>"; }; @@ -854,7 +854,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; ONLY_ACTIVE_ARCH = YES; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; @@ -881,7 +881,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; diff --git a/ios/iosremote/iosremote/en.lproj/Localizable.strings b/ios/iosremote/iosremote/en.lproj/Localizable.strings Binary files differindex 8495ebef3a30..30dfc9b58e30 100644 --- a/ios/iosremote/iosremote/en.lproj/Localizable.strings +++ b/ios/iosremote/iosremote/en.lproj/Localizable.strings diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard index 59ffa34f1f5d..75214ceeb43c 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard @@ -1,8 +1,8 @@ <?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"> +<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"> <dependencies> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc - Impress Remote--> @@ -17,7 +17,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="10" y="1" width="300" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="45"/> <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"> @@ -534,73 +534,6 @@ <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_old.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard index 59ffa34f1f5d..75214ceeb43c 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_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="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<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"> <dependencies> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc - Impress Remote--> @@ -17,7 +17,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="10" y="1" width="300" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="45"/> <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"> @@ -534,73 +534,6 @@ <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/iosremote-Info.plist b/ios/iosremote/iosremote/iosremote-Info.plist index ce9e5a3f82c1..a44501d3ffb3 100644 --- a/ios/iosremote/iosremote/iosremote-Info.plist +++ b/ios/iosremote/iosremote/iosremote-Info.plist @@ -2,8 +2,12 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>CFBundleDevelopmentRegion</key> - <string>en</string> + <key>CFBundleLocalizations</key> + <array> + <string>fr</string> + <string>zh_CN</string> + <string>en</string> + </array> <key>CFBundleDisplayName</key> <string>${PRODUCT_NAME}</string> <key>CFBundleExecutable</key> diff --git a/ios/iosremote/iosremote/newServer_vc.m b/ios/iosremote/iosremote/newServer_vc.m index f6ae5008fff5..8e5f7d3a0f82 100644 --- a/ios/iosremote/iosremote/newServer_vc.m +++ b/ios/iosremote/iosremote/newServer_vc.m @@ -85,7 +85,7 @@ [self setNameCell:[self newDetailCellWithTag:ServerName]]; [self setAddrCell:[self newDetailCellWithTag:ServerAddr]]; - [self setTitle:@"New Server"]; + [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/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard index 540648049077..75214ceeb43c 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard @@ -1,8 +1,8 @@ <?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"> +<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"> <dependencies> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc - Impress Remote--> 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 540648049077..75214ceeb43c 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,8 @@ <?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"> +<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"> <dependencies> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc - Impress Remote--> diff --git a/ios/iosremote/zh-Hans.lproj/Localizable.strings b/ios/iosremote/zh-Hans.lproj/Localizable.strings Binary files differindex f4db6b5915d7..b4a351b2fcda 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 eb8feaf52b27..04087264dbe7 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="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<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"> <dependencies> - <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <deployment defaultVersion="1280" identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc ipad - 连接--> @@ -10,13 +10,13 @@ <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" separatorStyle="singleLineEtched" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="54" width="540" height="46"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="46"/> <autoresizingMask key="autoresizingMask"/> <subviews> @@ -33,8 +33,7 @@ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </prototypes> <connections> @@ -70,23 +69,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="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="71" width="223" height="118"/> + <rect key="frame" x="159" y="81.5" 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="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="137" y="267" width="266" height="38"/> + <rect key="frame" x="137" y="300" width="266" height="38"/> <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的配对" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> - <rect key="frame" x="147" y="403" width="246" height="19"/> + <rect key="frame" x="147" y="451" width="246" height="19"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -111,7 +110,7 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> @@ -120,20 +119,18 @@ <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="30" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="75" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -161,7 +158,7 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> @@ -190,29 +187,26 @@ <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="291" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="44"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="380" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -238,7 +232,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="20" width="768" height="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -296,7 +290,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="303"/> + <rect key="frame" x="-13" y="595" width="794" height="323"/> <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"> @@ -308,7 +302,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="274"/> + <rect key="frame" x="20" y="29" width="754" height="294"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -316,7 +310,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="-641" y="-181" width="0.0" height="0.0"/> + <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -325,7 +319,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="906" width="768" height="98"/> + <rect key="frame" x="0.0" y="926" 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"> @@ -369,7 +363,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="898" width="97" height="59"/> + <rect key="frame" x="683" y="918" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -384,7 +378,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="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> @@ -406,8 +400,8 @@ <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="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="124" y="471" width="520" height="62"/> + <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"> + <rect key="frame" x="101" y="471" width="566" height="131"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -465,22 +459,22 @@ <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="20" width="320" height="832"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> <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"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="5" width="233" height="163"/> + <rect key="frame" x="44" y="4.5" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="152" width="29" height="21"/> + <rect key="frame" x="-605" y="151" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -491,8 +485,7 @@ <nil key="highlightedColor"/> </label> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -532,14 +525,14 @@ <image name="add.png" width="30" height="30"/> <image name="gear.png" width="55" height="35"/> <image name="gear_pressed" width="16" height="16"/> - <image name="libO_icon.png" width="598" height="598"/> + <image name="libO_icon.png" width="143.52479553222656" height="143.52479553222656"/> <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="60" height="60"/> - <image name="timer_start_btn.png" width="60" height="60"/> + <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> </resources> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard index eb8feaf52b27..04087264dbe7 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="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<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"> <dependencies> - <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <deployment defaultVersion="1280" identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc ipad - 连接--> @@ -10,13 +10,13 @@ <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" separatorStyle="singleLineEtched" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="54" width="540" height="46"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="46"/> <autoresizingMask key="autoresizingMask"/> <subviews> @@ -33,8 +33,7 @@ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </prototypes> <connections> @@ -70,23 +69,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="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <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="71" width="223" height="118"/> + <rect key="frame" x="159" y="81.5" 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="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="137" y="267" width="266" height="38"/> + <rect key="frame" x="137" y="300" width="266" height="38"/> <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的配对" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VVO-s2-eCV"> - <rect key="frame" x="147" y="403" width="246" height="19"/> + <rect key="frame" x="147" y="451" width="246" height="19"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> @@ -111,7 +110,7 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> @@ -120,20 +119,18 @@ <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="30" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="75" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -161,7 +158,7 @@ <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" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="64" width="540" height="556"/> + <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> @@ -190,29 +187,26 @@ <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="291" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="44"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </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="380" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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="45"/> <autoresizingMask key="autoresizingMask"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> </tableViewCell> </cells> </tableViewSection> @@ -238,7 +232,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="20" width="768" height="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -296,7 +290,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="303"/> + <rect key="frame" x="-13" y="595" width="794" height="323"/> <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"> @@ -308,7 +302,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="274"/> + <rect key="frame" x="20" y="29" width="754" height="294"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -316,7 +310,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="-641" y="-181" width="0.0" height="0.0"/> + <rect key="frame" x="20" y="299" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -325,7 +319,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="906" width="768" height="98"/> + <rect key="frame" x="0.0" y="926" 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"> @@ -369,7 +363,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="898" width="97" height="59"/> + <rect key="frame" x="683" y="918" width="97" height="59"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" backgroundImage="gear.png"> @@ -384,7 +378,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="1004"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="libO_icon.png" id="Qe8-38-thk"> @@ -406,8 +400,8 @@ <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="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" id="yiP-rQ-s7i"> - <rect key="frame" x="124" y="471" width="520" height="62"/> + <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"> + <rect key="frame" x="101" y="471" width="566" height="131"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="AppleSDGothicNeo-Bold" family="Apple SD Gothic Neo" pointSize="38"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -465,22 +459,22 @@ <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="20" width="320" height="832"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> <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"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <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"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> - <rect key="frame" x="44" y="5" width="233" height="163"/> + <rect key="frame" x="44" y="4.5" width="233" height="163"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7"> - <rect key="frame" x="-605" y="152" width="29" height="21"/> + <rect key="frame" x="-605" y="151" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -491,8 +485,7 @@ <nil key="highlightedColor"/> </label> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -532,14 +525,14 @@ <image name="add.png" width="30" height="30"/> <image name="gear.png" width="55" height="35"/> <image name="gear_pressed" width="16" height="16"/> - <image name="libO_icon.png" width="598" height="598"/> + <image name="libO_icon.png" width="143.52479553222656" height="143.52479553222656"/> <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="60" height="60"/> - <image name="timer_start_btn.png" width="60" height="60"/> + <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> </resources> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> |