diff options
| author | Siqi LIU <me@siqi.fr> | 2013-09-06 01:02:54 +0200 |
|---|---|---|
| committer | Siqi LIU <me@siqi.fr> | 2013-09-07 22:28:36 +0200 |
| commit | ca66b513b56b5be2dc573b860146013c004630d8 (patch) | |
| tree | c9a04baeb45d09e45ee2c30fa1219da399467917 /ios | |
| parent | ea09648aee0f6924418657311983102cc9069b39 (diff) | |
customize UITableView header view
Change-Id: I1a9fe74be6530c2e41b81c8f3755aa57a9133671
Diffstat (limited to 'ios')
19 files changed, 1327 insertions, 591 deletions
diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard index f8e025da59b5..154bb4c87cec 100644 --- a/ios/iosremote/en.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" variant="6xAndEarlier" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> <deployment defaultVersion="1280" identifier="iOS"/> + <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> @@ -10,14 +11,14 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> <rect key="frame" x="0.0" y="119" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="Mwq-0R-Ezz"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> @@ -33,7 +34,8 @@ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -70,25 +72,25 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="164" y="66" width="223" height="133.5"/> + <rect key="frame" x="164" y="66" width="223" height="118"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="115" y="495" width="320" height="105"/> + <rect key="frame" x="115" y="442" width="320" height="94"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="iaB-Jl-mwG"> - <rect key="frame" x="80" y="192" width="381" height="284.5"/> + <rect key="frame" x="80" y="192" width="381" height="242"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> </imageView> </subviews> @@ -110,7 +112,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> @@ -119,18 +121,20 @@ <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="99" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="etu-oV-iGF"> - <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="143" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="xyc-BA-quE"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,7 +162,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> @@ -187,26 +191,29 @@ <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"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="ng2-pZ-qdJ"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="TXf-WL-bg3"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="gtX-nU-NRv"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +239,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,7 +297,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Lecturer's Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> @@ -302,7 +309,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +317,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="31" y="254" width="0.0" height="0.0"/> + <rect key="frame" x="1082" y="-274" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,7 +326,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> @@ -420,15 +427,15 @@ <objects> <tableViewController clearsSelectionOnViewWillAppear="NO" id="VQa-vM-8pF" customClass="slideShowSwipeInList_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="170" sectionHeaderHeight="22" sectionFooterHeight="22" id="U9c-sP-NVQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="JD6-IP-wMQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> @@ -446,7 +453,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -485,7 +493,7 @@ <objects> <viewController id="Grm-Od-s6s" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="LWc-xb-hIj"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> @@ -509,7 +517,6 @@ <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> - <color key="tintColor" red="0.95294117649999999" green="0.54008895990000005" blue="0.070588235289999995" alpha="1" colorSpace="calibratedRGB"/> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard index f8e025da59b5..154bb4c87cec 100644 --- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" variant="6xAndEarlier" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> <deployment defaultVersion="1280" identifier="iOS"/> + <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> @@ -10,14 +11,14 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> <rect key="frame" x="0.0" y="119" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="Mwq-0R-Ezz"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> @@ -33,7 +34,8 @@ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -70,25 +72,25 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="164" y="66" width="223" height="133.5"/> + <rect key="frame" x="164" y="66" width="223" height="118"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="115" y="495" width="320" height="105"/> + <rect key="frame" x="115" y="442" width="320" height="94"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="iaB-Jl-mwG"> - <rect key="frame" x="80" y="192" width="381" height="284.5"/> + <rect key="frame" x="80" y="192" width="381" height="242"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> </imageView> </subviews> @@ -110,7 +112,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> @@ -119,18 +121,20 @@ <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="99" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="etu-oV-iGF"> - <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="143" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="xyc-BA-quE"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,7 +162,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> @@ -187,26 +191,29 @@ <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"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="ng2-pZ-qdJ"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="TXf-WL-bg3"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="gtX-nU-NRv"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +239,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,7 +297,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Lecturer's Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> @@ -302,7 +309,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +317,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="31" y="254" width="0.0" height="0.0"/> + <rect key="frame" x="1082" y="-274" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,7 +326,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> @@ -420,15 +427,15 @@ <objects> <tableViewController clearsSelectionOnViewWillAppear="NO" id="VQa-vM-8pF" customClass="slideShowSwipeInList_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="170" sectionHeaderHeight="22" sectionFooterHeight="22" id="U9c-sP-NVQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="JD6-IP-wMQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> @@ -446,7 +453,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -485,7 +493,7 @@ <objects> <viewController id="Grm-Od-s6s" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="LWc-xb-hIj"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> @@ -509,7 +517,6 @@ <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> - <color key="tintColor" red="0.95294117649999999" green="0.54008895990000005" blue="0.070588235289999995" alpha="1" colorSpace="calibratedRGB"/> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard index 175bf1342ae8..b9d5a57109db 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <development version="4600" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc ipad - Connecter--> @@ -10,14 +11,14 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> <rect key="frame" x="0.0" y="119" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="Mwq-0R-Ezz"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> @@ -33,7 +34,8 @@ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -70,25 +72,25 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="164" y="66" width="223" height="134"/> + <rect key="frame" x="164" y="66" width="223" height="119"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Veuillez entrer le code ci-dessus dans le fenêtre Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="115" y="495" width="320" height="105"/> + <rect key="frame" x="115" y="442" width="320" height="94"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="iaB-Jl-mwG"> - <rect key="frame" x="80" y="192" width="381" height="285"/> + <rect key="frame" x="80" y="192" width="381" height="243"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> </imageView> </subviews> @@ -110,7 +112,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> @@ -119,18 +121,20 @@ <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="99" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="etu-oV-iGF"> - <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="143" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="xyc-BA-quE"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,7 +162,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> @@ -187,26 +191,29 @@ <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"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="ng2-pZ-qdJ"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="TXf-WL-bg3"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="gtX-nU-NRv"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +239,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,7 +297,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> @@ -302,7 +309,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +317,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="31" y="254" width="0.0" height="0.0"/> + <rect key="frame" x="-584" y="-459" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,7 +326,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> @@ -420,22 +427,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="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="JD6-IP-wMQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> <rect key="frame" x="44" y="3.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="149" width="29" height="21"/> + <rect key="frame" x="-605" y="147" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -446,7 +453,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -485,7 +493,7 @@ <objects> <viewController id="Grm-Od-s6s" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="LWc-xb-hIj"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> @@ -509,7 +517,6 @@ <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> - <color key="tintColor" red="0.95294117649999999" green="0.54008895990000005" blue="0.070588235289999995" alpha="1" colorSpace="calibratedRGB"/> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard index 175bf1342ae8..b9d5a57109db 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <development version="4600" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc ipad - Connecter--> @@ -10,14 +11,14 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> <rect key="frame" x="0.0" y="119" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="Mwq-0R-Ezz"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> @@ -33,7 +34,8 @@ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -70,25 +72,25 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="164" y="66" width="223" height="134"/> + <rect key="frame" x="164" y="66" width="223" height="119"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Veuillez entrer le code ci-dessus dans le fenêtre Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="115" y="495" width="320" height="105"/> + <rect key="frame" x="115" y="442" width="320" height="94"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="iaB-Jl-mwG"> - <rect key="frame" x="80" y="192" width="381" height="285"/> + <rect key="frame" x="80" y="192" width="381" height="243"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> </imageView> </subviews> @@ -110,7 +112,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> @@ -119,18 +121,20 @@ <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="99" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="etu-oV-iGF"> - <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="143" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="xyc-BA-quE"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,7 +162,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> @@ -187,26 +191,29 @@ <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"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="ng2-pZ-qdJ"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="TXf-WL-bg3"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="gtX-nU-NRv"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +239,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,7 +297,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> @@ -302,7 +309,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +317,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="31" y="254" width="0.0" height="0.0"/> + <rect key="frame" x="-584" y="-459" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,7 +326,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> @@ -420,22 +427,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="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="JD6-IP-wMQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> <rect key="frame" x="44" y="3.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="149" width="29" height="21"/> + <rect key="frame" x="-605" y="147" width="29" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> @@ -446,7 +453,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -485,7 +493,7 @@ <objects> <viewController id="Grm-Od-s6s" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="LWc-xb-hIj"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> @@ -509,7 +517,6 @@ <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> - <color key="tintColor" red="0.95294117649999999" green="0.54008895990000005" blue="0.070588235289999995" alpha="1" colorSpace="calibratedRGB"/> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/iosremote/AppDelegate.m b/ios/iosremote/iosremote/AppDelegate.m index 0e616379375f..7a7ab0662f20 100644 --- a/ios/iosremote/iosremote/AppDelegate.m +++ b/ios/iosremote/iosremote/AppDelegate.m @@ -50,9 +50,12 @@ blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0] [[UIBarButtonItem appearance] setTitleTextAttributes:attributes forState:UIControlStateHighlighted]; - UIPageControl *pageControl = [UIPageControl appearance]; - pageControl.pageIndicatorTintColor = UIColorFromRGB(0x2980b9); - pageControl.currentPageIndicatorTintColor = UIColorFromRGB(0x1abc9c); + if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 6.0) + { + UIPageControl *pageControl = [UIPageControl appearance]; + pageControl.pageIndicatorTintColor = UIColorFromRGB(0x2980b9); + pageControl.currentPageIndicatorTintColor = UIColorFromRGB(0x1abc9c); + } return YES; } diff --git a/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.m b/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.m index cd9b757ff845..67c48c38fa7d 100755 --- a/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.m +++ b/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.m @@ -48,6 +48,7 @@ typedef enum @implementation SWDirectionPanGestureRecognizer { BOOL _dragging; + BOOL _disabled; CGPoint _init; } @@ -56,6 +57,11 @@ typedef enum [super touchesBegan:touches withEvent:event]; UITouch *touch = [touches anyObject]; + if ([touch locationInView:self.view].x > 60.0) { + _disabled = YES; + return; + } + _disabled = NO; _init = [touch locationInView:self.view]; _dragging = NO; } @@ -63,6 +69,9 @@ typedef enum - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { + if (_disabled) { + return; + } [super touchesMoved:touches withEvent:event]; if (self.state == UIGestureRecognizerStateFailed) @@ -347,7 +356,7 @@ const int FrontViewPositionNone = 0xff; _frontViewPosition = FrontViewPositionLeft; _rearViewPosition = FrontViewPositionLeft; _rightViewPosition = FrontViewPositionLeft; - _rearViewRevealWidth = 260.0f; + _rearViewRevealWidth = 220.0f; _rearViewRevealOverdraw = 60.0f; _rightViewRevealWidth = 260.0f; _rightViewRevealOverdraw = 60.0f; diff --git a/ios/iosremote/iosremote/WalkThroughPageViewController.xib b/ios/iosremote/iosremote/WalkThroughPageViewController.xib index 7074aedc9dc7..9efaa8a39f12 100644 --- a/ios/iosremote/iosremote/WalkThroughPageViewController.xib +++ b/ios/iosremote/iosremote/WalkThroughPageViewController.xib @@ -1,90 +1,472 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none"> - <dependencies> - <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> - </dependencies> - <objects> - <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="WalkThroughPageViewController"> - <connections> - <outlet property="hintImage" destination="24" id="25"/> - <outlet property="image" destination="6" id="9"/> - <outlet property="indexLabl" destination="22" id="23"/> - <outlet property="instructionHint" destination="17" id="18"/> - <outlet property="instructionText" destination="7" id="13"/> - <outlet property="instructionTitle" destination="8" id="12"/> - <outlet property="okButton" destination="14" id="15"/> - <outlet property="view" destination="1" id="3"/> - </connections> - </placeholder> - <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="1"> - <rect key="frame" x="0.0" y="0.0" width="320" height="424.00000000000006"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" id="6" userLabel="Image"> - <rect key="frame" x="20" y="115" width="280" height="114"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - </imageView> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="none" minimumScaleFactor="0.89999997615814209" id="7" userLabel="Instructions"> - <rect key="frame" x="20" y="66" width="280" height="47"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <string key="text">Select the APPChildViewController.xib file just created. Change the background of the view to Black and reduce the vertical size of the view to 512 points to leave some free space for the dots of the page controller (which has a default </string> - <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="16"/> - <color key="textColor" red="0.25882352939999997" green="0.43529411759999997" blue="0.90980392160000001" alpha="1" colorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Connection" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8" userLabel="Title"> - <rect key="frame" x="20" y="20" width="250" height="38"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" name="STHeitiSC-Medium" family="Heiti SC" pointSize="22"/> - <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="14"> - <rect key="frame" x="194" y="373.00000000000006" width="106" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/> - <inset key="titleEdgeInsets" minX="-24" minY="0.0" maxX="0.0" maxY="0.0"/> - <inset key="imageEdgeInsets" minX="80" minY="0.0" maxX="0.0" maxY="0.0"/> - <state key="normal" title="Get started" image="forwardButton.png"> - <color key="titleColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </state> - <state key="highlighted" title="Get started!"> - <color key="titleColor" red="0.92156862750000001" green="0.43921568630000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="okButtonHandleBack:" destination="-1" eventType="touchUpInside" id="16"/> - </connections> - </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="dwdwdaijiajwodjiawjdioajwidjawiodjiawjdiajwidjwijdiawjdiajwd" lineBreakMode="tailTruncation" numberOfLines="10" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="17"> - <rect key="frame" x="20" y="237.00000000000006" width="83" height="167"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/> - <fontDescription key="fontDescription" name="Helvetica-Oblique" family="Helvetica" pointSize="15"/> - <color key="textColor" red="0.25882352939999997" green="0.43529411759999997" blue="0.90980392160000001" alpha="1" colorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="22"> - <rect key="frame" x="278" y="28" width="22" height="21"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" id="24"> - <rect key="frame" x="111" y="237.00000000000006" width="189" height="167"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> - </imageView> - </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> - <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> - </view> - </objects> - <resources> - <image name="forwardButton.png" width="11" height="26"/> - </resources> -</document>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> + <data> + <int key="IBDocument.SystemTarget">1280</int> + <string key="IBDocument.SystemVersion">12E55</string> + <string key="IBDocument.InterfaceBuilderVersion">4488.1</string> + <string key="IBDocument.AppKitVersion">1187.39</string> + <string key="IBDocument.HIToolboxVersion">626.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="NS.object.0">3715.3</string> + </object> + <array key="IBDocument.IntegratedClassDependencies"> + <string>IBProxyObject</string> + <string>IBUIButton</string> + <string>IBUIImageView</string> + <string>IBUILabel</string> + <string>IBUIView</string> + </array> + <array key="IBDocument.PluginDependencies"> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + </array> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <string key="NS.key.0">PluginDependencyRecalculationVersion</string> + <integer value="1" key="NS.object.0"/> + </object> + <array class="NSMutableArray" key="IBDocument.RootObjects" id="36157550"> + <object class="IBProxyObject" id="284074690"> + <string key="IBProxiedObjectIdentifier">IBFilesOwner</string> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + </object> + <object class="IBProxyObject" id="49636071"> + <string key="IBProxiedObjectIdentifier">IBFirstResponder</string> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + </object> + <object class="IBUIView" id="826207736"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">1330</int> + <array class="NSMutableArray" key="NSSubviews"> + <object class="IBUIImageView" id="685443561"> + <reference key="NSNextResponder" ref="826207736"/> + <int key="NSvFlags">1330</int> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{20, 115}, {280, 114}}</string> + <reference key="NSSuperview" ref="826207736"/> + <reference key="NSWindow"/> + <int key="IBUIContentMode">1</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + </object> + <object class="IBUILabel" id="941134962"> + <reference key="NSNextResponder" ref="826207736"/> + <int key="NSvFlags">1330</int> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{20, 66}, {280, 47}}</string> + <reference key="NSSuperview" ref="826207736"/> + <reference key="NSWindow"/> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + <string key="IBUIText">Select the APPChildViewController.xib file just created. Change the background of the view to Black and reduce the vertical size of the view to 512 points to leave some free space for the dots of the page controller (which has a default </string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4yNTg4MjM1Mjk0IDAuNDM1Mjk0MTE3NiAwLjkwOTgwMzkyMTYAA</bytes> + </object> + <nil key="IBUIHighlightedColor"/> + <float key="IBUIMinimumScaleFactor">0.89999997615814209</float> + <int key="IBUINumberOfLines">2</int> + <int key="IBUILineBreakMode">0</int> + <object class="IBUIFontDescription" key="IBUIFontDescription"> + <string key="name">Helvetica</string> + <string key="family">Helvetica</string> + <int key="traits">0</int> + <double key="pointSize">16</double> + </object> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">Helvetica</string> + <double key="NSSize">16</double> + <int key="NSfFlags">16</int> + </object> + <double key="preferredMaxLayoutWidth">280</double> + </object> + <object class="IBUILabel" id="337391083"> + <reference key="NSNextResponder" ref="826207736"/> + <int key="NSvFlags">1318</int> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{20, 20}, {250, 38}}</string> + <reference key="NSSuperview" ref="826207736"/> + <reference key="NSWindow"/> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + <string key="IBUIText">Connection</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4yMTE3NjQ3MDU5IDAuODE1Njg2Mjc0NSAwLjc4MDM5MjE1NjkAA</bytes> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <object class="IBUIFontDescription" key="IBUIFontDescription"> + <string key="name">STHeitiSC-Medium</string> + <string key="family">Heiti SC</string> + <int key="traits">2</int> + <double key="pointSize">22</double> + </object> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">STHeitiSC-Medium</string> + <double key="NSSize">22</double> + <int key="NSfFlags">16</int> + </object> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUIButton" id="292993655"> + <reference key="NSNextResponder" ref="826207736"/> + <int key="NSvFlags">-2147482359</int> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{194, 373.00000000000006}, {106, 44}}</string> + <reference key="NSSuperview" ref="826207736"/> + <reference key="NSWindow"/> + <bool key="IBUIOpaque">NO</bool> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + <int key="IBUIContentHorizontalAlignment">0</int> + <int key="IBUIContentVerticalAlignment">0</int> + <double key="IBUITitleEdgeInsets.top">0.0</double> + <double key="IBUITitleEdgeInsets.bottom">0.0</double> + <double key="IBUITitleEdgeInsets.left">-24</double> + <double key="IBUITitleEdgeInsets.right">0.0</double> + <double key="IBUIImageEdgeInsets.top">0.0</double> + <double key="IBUIImageEdgeInsets.bottom">0.0</double> + <double key="IBUIImageEdgeInsets.left">80</double> + <double key="IBUIImageEdgeInsets.right">0.0</double> + <object class="NSColor" key="IBUINormalTitleColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAwLjUwMTk2MDc4NDMgMAA</bytes> + </object> + <object class="NSColor" key="IBUIHighlightedTitleColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC45MjE1Njg2Mjc1IDAuNDM5MjE1Njg2MyAwAA</bytes> + </object> + <string key="IBUIHighlightedTitle">Get started!</string> + <string key="IBUINormalTitle">Get started</string> + <object class="NSColor" key="IBUIHighlightedTitleShadowColor" id="591734419"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwAA</bytes> + </object> + <reference key="IBUINormalTitleShadowColor" ref="591734419"/> + <object class="NSCustomResource" key="IBUINormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">forwardButton.png</string> + </object> + <object class="IBUIFontDescription" key="IBUIFontDescription"> + <int key="type">2</int> + <double key="pointSize">14</double> + </object> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">HelveticaNeue-Bold</string> + <double key="NSSize">14</double> + <int key="NSfFlags">16</int> + </object> + </object> + <object class="IBUILabel" id="654792355"> + <reference key="NSNextResponder" ref="826207736"/> + <int key="NSvFlags">1310</int> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{20, 237}, {83, 167.00000000000003}}</string> + <reference key="NSSuperview" ref="826207736"/> + <reference key="NSWindow"/> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + <string key="IBUIText">dwdwdaijiajwodjiawjdioajwidjawiodjiawjdiajwidjwijdiawjdiajwd</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4yNTg4MjM1Mjk0IDAuNDM1Mjk0MTE3NiAwLjkwOTgwMzkyMTYAA</bytes> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">10</int> + <object class="IBUIFontDescription" key="IBUIFontDescription"> + <string key="name">Helvetica-Oblique</string> + <string key="family">Helvetica</string> + <int key="traits">1</int> + <double key="pointSize">15</double> + </object> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">Helvetica-Oblique</string> + <double key="NSSize">15</double> + <int key="NSfFlags">16</int> + </object> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">83</double> + </object> + <object class="IBUILabel" id="452997759"> + <reference key="NSNextResponder" ref="826207736"/> + <int key="NSvFlags">1313</int> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{278, 28}, {22, 21}}</string> + <reference key="NSSuperview" ref="826207736"/> + <reference key="NSWindow"/> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAwLjUwMTk2MDc4NDMgMAA</bytes> + </object> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + <string key="IBUIText">1</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <object class="NSColorSpace" key="NSCustomColorSpace"> + <int key="NSID">1</int> + </object> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUITextAlignment">1</int> + <object class="IBUIFontDescription" key="IBUIFontDescription"> + <int key="type">1</int> + <double key="pointSize">17</double> + </object> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">HelveticaNeue</string> + <double key="NSSize">17</double> + <int key="NSfFlags">16</int> + </object> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUIImageView" id="712287771"> + <reference key="NSNextResponder" ref="826207736"/> + <int key="NSvFlags">1307</int> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{111, 237.00000000000006}, {189, 167}}</string> + <reference key="NSSuperview" ref="826207736"/> + <reference key="NSWindow"/> + <int key="IBUIContentMode">1</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + </object> + </array> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{0, 20}, {320, 424.00000000000006}}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> + <object class="IBUISimulatedSizeMetrics" key="IBUISimulatedDestinationMetrics"> + <string key="IBUISimulatedSizeMetricsClass">IBUISimulatedFreeformSizeMetricsSentinel</string> + <string key="IBUIDisplayName">Freeform</string> + </object> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + </object> + </array> + <object class="IBObjectContainer" key="IBDocument.Objects"> + <bool key="usesAutoincrementingIDs">NO</bool> + <array class="NSMutableArray" key="connectionRecords"> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">hintImage</string> + <reference key="source" ref="284074690"/> + <reference key="destination" ref="712287771"/> + </object> + <string key="id">25</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">image</string> + <reference key="source" ref="284074690"/> + <reference key="destination" ref="685443561"/> + </object> + <string key="id">9</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">indexLabl</string> + <reference key="source" ref="284074690"/> + <reference key="destination" ref="452997759"/> + </object> + <string key="id">23</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">instructionHint</string> + <reference key="source" ref="284074690"/> + <reference key="destination" ref="654792355"/> + </object> + <string key="id">18</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">instructionText</string> + <reference key="source" ref="284074690"/> + <reference key="destination" ref="941134962"/> + </object> + <string key="id">13</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">instructionTitle</string> + <reference key="source" ref="284074690"/> + <reference key="destination" ref="337391083"/> + </object> + <string key="id">12</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">okButton</string> + <reference key="source" ref="284074690"/> + <reference key="destination" ref="292993655"/> + </object> + <string key="id">15</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">view</string> + <reference key="source" ref="284074690"/> + <reference key="destination" ref="826207736"/> + </object> + <string key="id">3</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">okButtonHandleBack:</string> + <reference key="source" ref="292993655"/> + <reference key="destination" ref="284074690"/> + <int key="IBEventType">7</int> + </object> + <string key="id">16</string> + </object> + </array> + <object class="IBMutableOrderedSet" key="objectRecords"> + <array key="orderedObjects"> + <object class="IBObjectRecord"> + <string key="id">0</string> + <array key="object" id="0"/> + <reference key="children" ref="36157550"/> + <nil key="parent"/> + </object> + <object class="IBObjectRecord"> + <string key="id">-1</string> + <reference key="object" ref="284074690"/> + <reference key="parent" ref="0"/> + <string key="objectName">File's Owner</string> + </object> + <object class="IBObjectRecord"> + <string key="id">-2</string> + <reference key="object" ref="49636071"/> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <string key="id">1</string> + <reference key="object" ref="826207736"/> + <array class="NSMutableArray" key="children"> + <reference ref="685443561"/> + <reference ref="941134962"/> + <reference ref="337391083"/> + <reference ref="292993655"/> + <reference ref="654792355"/> + <reference ref="452997759"/> + <reference ref="712287771"/> + </array> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <string key="id">6</string> + <reference key="object" ref="685443561"/> + <reference key="parent" ref="826207736"/> + <string key="objectName">Image</string> + </object> + <object class="IBObjectRecord"> + <string key="id">7</string> + <reference key="object" ref="941134962"/> + <reference key="parent" ref="826207736"/> + <string key="objectName">Instructions</string> + </object> + <object class="IBObjectRecord"> + <string key="id">8</string> + <reference key="object" ref="337391083"/> + <reference key="parent" ref="826207736"/> + <string key="objectName">Title</string> + </object> + <object class="IBObjectRecord"> + <string key="id">14</string> + <reference key="object" ref="292993655"/> + <reference key="parent" ref="826207736"/> + </object> + <object class="IBObjectRecord"> + <string key="id">17</string> + <reference key="object" ref="654792355"/> + <reference key="parent" ref="826207736"/> + </object> + <object class="IBObjectRecord"> + <string key="id">22</string> + <reference key="object" ref="452997759"/> + <reference key="parent" ref="826207736"/> + </object> + <object class="IBObjectRecord"> + <string key="id">24</string> + <reference key="object" ref="712287771"/> + <reference key="parent" ref="826207736"/> + </object> + </array> + </object> + <dictionary class="NSMutableDictionary" key="flattenedProperties"> + <string key="-1.CustomClassName">WalkThroughPageViewController</string> + <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <boolean value="NO" key="-1.showNotes"/> + <string key="-2.CustomClassName">UIResponder</string> + <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <boolean value="NO" key="-2.showNotes"/> + <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="1.IBUserGuides" ref="0"/> + <boolean value="NO" key="1.showNotes"/> + <string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="14.IBUserGuides" ref="0"/> + <boolean value="NO" key="14.showNotes"/> + <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="17.IBUserGuides" ref="0"/> + <boolean value="NO" key="17.showNotes"/> + <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="22.IBUserGuides" ref="0"/> + <boolean value="NO" key="22.showNotes"/> + <string key="24.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="24.IBUserGuides" ref="0"/> + <boolean value="NO" key="24.showNotes"/> + <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="6.IBUserGuides" ref="0"/> + <boolean value="NO" key="6.showNotes"/> + <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="7.IBUserGuides" ref="0"/> + <boolean value="NO" key="7.showNotes"/> + <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="8.IBUserGuides" ref="0"/> + <boolean value="NO" key="8.showNotes"/> + </dictionary> + <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> + <nil key="activeLocalization"/> + <dictionary class="NSMutableDictionary" key="localizations"/> + <nil key="sourceID"/> + </object> + <object class="IBClassDescriber" key="IBDocument.Classes"/> + <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> + <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> + <real value="1280" key="NS.object.0"/> + </object> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string> + <integer value="4600" key="NS.object.0"/> + </object> + <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> + <int key="IBDocument.defaultPropertyAccessControl">3</int> + <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <string key="NS.key.0">forwardButton.png</string> + <string key="NS.object.0">{11, 26}</string> + </object> + <string key="IBCocoaTouchPluginVersion">3715.3</string> + </data> +</archive> diff --git a/ios/iosremote/iosremote/WalkThroughPageViewMainImageController.xib b/ios/iosremote/iosremote/WalkThroughPageViewMainImageController.xib index 5d38b7628c9d..a4716391e9ab 100644 --- a/ios/iosremote/iosremote/WalkThroughPageViewMainImageController.xib +++ b/ios/iosremote/iosremote/WalkThroughPageViewMainImageController.xib @@ -1,66 +1,407 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none"> - <dependencies> - <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> - </dependencies> - <objects> - <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="WalkThroughPageViewController"> - <connections> - <outlet property="image" destination="6" id="9"/> - <outlet property="indexLabl" destination="22" id="23"/> - <outlet property="instructionTitle" destination="8" id="12"/> - <outlet property="okButton" destination="14" id="15"/> - <outlet property="view" destination="1" id="3"/> - </connections> - </placeholder> - <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="1"> - <rect key="frame" x="0.0" y="0.0" width="320" height="480"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" id="6" userLabel="Image"> - <rect key="frame" x="0.0" y="70" width="320" height="328"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - </imageView> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Connection" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8" userLabel="Title"> - <rect key="frame" x="20" y="20" width="250" height="39.5"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" name="STHeitiSC-Medium" family="Heiti SC" pointSize="22"/> - <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="14"> - <rect key="frame" x="173" y="416" width="127" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/> - <state key="normal" title="Get started" backgroundImage="buttonBackground.png"> - <color key="titleColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </state> - <state key="highlighted" title="Get started"> - <color key="titleColor" red="0.41176470590000003" green="0.41568627450000001" blue="0.42352941179999998" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="okButtonHandleBack:" destination="-1" eventType="touchUpInside" id="16"/> - </connections> - </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="22"> - <rect key="frame" x="278" y="28" width="22" height="21"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="1" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> - <simulatedScreenMetrics key="simulatedDestinationMetrics"/> - </view> - </objects> - <resources> - <image name="buttonBackground.png" width="22.501562118530273" height="22.501562118530273"/> - </resources> -</document>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> + <data> + <int key="IBDocument.SystemTarget">1552</int> + <string key="IBDocument.SystemVersion">12E55</string> + <string key="IBDocument.InterfaceBuilderVersion">3084</string> + <string key="IBDocument.AppKitVersion">1187.39</string> + <string key="IBDocument.HIToolboxVersion">626.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="NS.object.0">2083</string> + </object> + <array key="IBDocument.IntegratedClassDependencies"> + <string>IBProxyObject</string> + <string>IBUIButton</string> + <string>IBUIImageView</string> + <string>IBUILabel</string> + <string>IBUIView</string> + </array> + <array key="IBDocument.PluginDependencies"> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + </array> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <string key="NS.key.0">PluginDependencyRecalculationVersion</string> + <integer value="1" key="NS.object.0"/> + </object> + <array class="NSMutableArray" key="IBDocument.RootObjects" id="805147820"> + <object class="IBProxyObject" id="1063073909"> + <string key="IBProxiedObjectIdentifier">IBFilesOwner</string> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + </object> + <object class="IBProxyObject" id="125952564"> + <string key="IBProxiedObjectIdentifier">IBFirstResponder</string> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + </object> + <object class="IBUIView" id="486816108"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">1330</int> + <array class="NSMutableArray" key="NSSubviews"> + <object class="IBUIImageView" id="449803563"> + <reference key="NSNextResponder" ref="486816108"/> + <int key="NSvFlags">1298</int> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{0, 70}, {320, 308}}</string> + <reference key="NSSuperview" ref="486816108"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="879400829"/> + <int key="IBUIContentMode">1</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + </object> + <object class="IBUILabel" id="373486653"> + <reference key="NSNextResponder" ref="486816108"/> + <int key="NSvFlags">1334</int> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{20, 20}, {250, 38}}</string> + <reference key="NSSuperview" ref="486816108"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="314594708"/> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + <string key="IBUIText">Connection</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4yMTE3NjQ3MDU5IDAuODE1Njg2Mjc0NSAwLjc4MDM5MjE1NjkAA</bytes> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <object class="IBUIFontDescription" key="IBUIFontDescription"> + <string key="name">STHeitiSC-Medium</string> + <string key="family">Heiti SC</string> + <int key="traits">2</int> + <double key="pointSize">22</double> + </object> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">STHeitiSC-Medium</string> + <double key="NSSize">22</double> + <int key="NSfFlags">16</int> + </object> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUIButton" id="879400829"> + <reference key="NSNextResponder" ref="486816108"/> + <int key="NSvFlags">-2147482359</int> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{173, 396}, {127, 44}}</string> + <reference key="NSSuperview" ref="486816108"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> + <bool key="IBUIOpaque">NO</bool> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + <int key="IBUIContentHorizontalAlignment">0</int> + <int key="IBUIContentVerticalAlignment">0</int> + <string key="IBUIHighlightedTitle">Get started</string> + <string key="IBUINormalTitle">Get started</string> + <object class="NSColor" key="IBUIHighlightedTitleColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC40MTE3NjQ3MDU5IDAuNDE1Njg2Mjc0NSAwLjQyMzUyOTQxMTgAA</bytes> + </object> + <object class="NSColor" key="IBUINormalTitleColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAwLjUwMTk2MDc4NDMgMAA</bytes> + </object> + <object class="NSColor" key="IBUIHighlightedTitleShadowColor" id="238497645"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwAA</bytes> + </object> + <reference key="IBUINormalTitleShadowColor" ref="238497645"/> + <object class="NSCustomResource" key="IBUINormalBackgroundImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">buttonBackground.png</string> + </object> + <object class="IBUIFontDescription" key="IBUIFontDescription"> + <int key="type">2</int> + <double key="pointSize">18</double> + </object> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">Helvetica-Bold</string> + <double key="NSSize">18</double> + <int key="NSfFlags">16</int> + </object> + </object> + <object class="IBUILabel" id="314594708"> + <reference key="NSNextResponder" ref="486816108"/> + <int key="NSvFlags">1313</int> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{278, 28}, {22, 21}}</string> + <reference key="NSSuperview" ref="486816108"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="449803563"/> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAwLjUwMTk2MDc4NDMgMAA</bytes> + </object> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + <string key="IBUIText">1</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <object class="NSColorSpace" key="NSCustomColorSpace"> + <int key="NSID">1</int> + </object> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUITextAlignment">1</int> + <object class="IBUIFontDescription" key="IBUIFontDescription"> + <int key="type">1</int> + <double key="pointSize">17</double> + </object> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">Helvetica</string> + <double key="NSSize">17</double> + <int key="NSfFlags">16</int> + </object> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + </array> + <object class="NSPSMatrix" key="NSFrameMatrix"/> + <string key="NSFrame">{{0, 20}, {320, 460}}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="373486653"/> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> + <object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics"> + <string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string> + <object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap"> + <bool key="EncodedWithXMLCoder">YES</bool> + <array key="dict.sortedKeys"> + <integer value="1"/> + <integer value="3"/> + </array> + <array key="dict.values"> + <string>{320, 480}</string> + <string>{480, 320}</string> + </array> + </object> + <string key="IBUITargetRuntime">IBCocoaTouchFramework</string> + <string key="IBUIDisplayName">Retina 3.5 Full Screen</string> + <int key="IBUIType">0</int> + </object> + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> + </object> + </array> + <object class="IBObjectContainer" key="IBDocument.Objects"> + <bool key="usesAutoincrementingIDs">NO</bool> + <array class="NSMutableArray" key="connectionRecords"> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">image</string> + <reference key="source" ref="1063073909"/> + <reference key="destination" ref="449803563"/> + </object> + <string key="id">9</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">indexLabl</string> + <reference key="source" ref="1063073909"/> + <reference key="destination" ref="314594708"/> + </object> + <string key="id">23</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">instructionTitle</string> + <reference key="source" ref="1063073909"/> + <reference key="destination" ref="373486653"/> + </object> + <string key="id">12</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">okButton</string> + <reference key="source" ref="1063073909"/> + <reference key="destination" ref="879400829"/> + </object> + <string key="id">15</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">view</string> + <reference key="source" ref="1063073909"/> + <reference key="destination" ref="486816108"/> + </object> + <string key="id">3</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">okButtonHandleBack:</string> + <reference key="source" ref="879400829"/> + <reference key="destination" ref="1063073909"/> + <int key="IBEventType">7</int> + </object> + <string key="id">16</string> + </object> + </array> + <object class="IBMutableOrderedSet" key="objectRecords"> + <array key="orderedObjects"> + <object class="IBObjectRecord"> + <string key="id">0</string> + <array key="object" id="0"/> + <reference key="children" ref="805147820"/> + <nil key="parent"/> + </object> + <object class="IBObjectRecord"> + <string key="id">-1</string> + <reference key="object" ref="1063073909"/> + <reference key="parent" ref="0"/> + <string key="objectName">File's Owner</string> + </object> + <object class="IBObjectRecord"> + <string key="id">-2</string> + <reference key="object" ref="125952564"/> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <string key="id">1</string> + <reference key="object" ref="486816108"/> + <array class="NSMutableArray" key="children"> + <reference ref="449803563"/> + <reference ref="373486653"/> + <reference ref="879400829"/> + <reference ref="314594708"/> + </array> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <string key="id">6</string> + <reference key="object" ref="449803563"/> + <reference key="parent" ref="486816108"/> + <string key="objectName">Image</string> + </object> + <object class="IBObjectRecord"> + <string key="id">8</string> + <reference key="object" ref="373486653"/> + <reference key="parent" ref="486816108"/> + <string key="objectName">Title</string> + </object> + <object class="IBObjectRecord"> + <string key="id">14</string> + <reference key="object" ref="879400829"/> + <reference key="parent" ref="486816108"/> + </object> + <object class="IBObjectRecord"> + <string key="id">22</string> + <reference key="object" ref="314594708"/> + <reference key="parent" ref="486816108"/> + </object> + </array> + </object> + <dictionary class="NSMutableDictionary" key="flattenedProperties"> + <string key="-1.CustomClassName">WalkThroughPageViewController</string> + <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <boolean value="NO" key="-1.showNotes"/> + <string key="-2.CustomClassName">UIResponder</string> + <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <boolean value="NO" key="-2.showNotes"/> + <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="1.IBUserGuides" ref="0"/> + <boolean value="NO" key="1.showNotes"/> + <string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="14.IBUserGuides" ref="0"/> + <boolean value="NO" key="14.showNotes"/> + <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="22.IBUserGuides" ref="0"/> + <boolean value="NO" key="22.showNotes"/> + <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="6.IBUserGuides" ref="0"/> + <boolean value="NO" key="6.showNotes"/> + <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <reference key="8.IBUserGuides" ref="0"/> + <boolean value="NO" key="8.showNotes"/> + </dictionary> + <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> + <nil key="activeLocalization"/> + <dictionary class="NSMutableDictionary" key="localizations"/> + <nil key="sourceID"/> + </object> + <object class="IBClassDescriber" key="IBDocument.Classes"> + <array class="NSMutableArray" key="referencedPartialClassDescriptions"> + <object class="IBPartialClassDescription"> + <string key="className">WalkThroughPageViewController</string> + <string key="superclassName">UIViewController</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">okButtonHandleBack:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">okButtonHandleBack:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">okButtonHandleBack:</string> + <string key="candidateClassName">id</string> + </object> + </object> + <dictionary class="NSMutableDictionary" key="outlets"> + <string key="hintImage">UIImageView</string> + <string key="image">UIImageView</string> + <string key="indexLabl">UILabel</string> + <string key="instructionHint">UILabel</string> + <string key="instructionText">UILabel</string> + <string key="instructionTitle">UILabel</string> + <string key="okButton">UIButton</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> + <object class="IBToOneOutletInfo" key="hintImage"> + <string key="name">hintImage</string> + <string key="candidateClassName">UIImageView</string> + </object> + <object class="IBToOneOutletInfo" key="image"> + <string key="name">image</string> + <string key="candidateClassName">UIImageView</string> + </object> + <object class="IBToOneOutletInfo" key="indexLabl"> + <string key="name">indexLabl</string> + <string key="candidateClassName">UILabel</string> + </object> + <object class="IBToOneOutletInfo" key="instructionHint"> + <string key="name">instructionHint</string> + <string key="candidateClassName">UILabel</string> + </object> + <object class="IBToOneOutletInfo" key="instructionText"> + <string key="name">instructionText</string> + <string key="candidateClassName">UILabel</string> + </object> + <object class="IBToOneOutletInfo" key="instructionTitle"> + <string key="name">instructionTitle</string> + <string key="candidateClassName">UILabel</string> + </object> + <object class="IBToOneOutletInfo" key="okButton"> + <string key="name">okButton</string> + <string key="candidateClassName">UIButton</string> + </object> + </dictionary> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/WalkThroughPageViewController.h</string> + </object> + </object> + </array> + </object> + <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string> + <integer value="4600" key="NS.object.0"/> + </object> + <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> + <int key="IBDocument.defaultPropertyAccessControl">3</int> + <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <string key="NS.key.0">buttonBackground.png</string> + <string key="NS.object.0">{45, 45}</string> + </object> + <string key="IBCocoaTouchPluginVersion">2083</string> + </data> +</archive> diff --git a/ios/iosremote/iosremote/en.lproj/Localizable.strings b/ios/iosremote/iosremote/en.lproj/Localizable.strings Binary files differindex a4dc07fc3ead..91d55d44f05c 100644 --- a/ios/iosremote/iosremote/en.lproj/Localizable.strings +++ b/ios/iosremote/iosremote/en.lproj/Localizable.strings diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index 8c8133e8c58b..2e33cf994f0b 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> - <deployment version="1552" defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <deployment version="1552" defaultVersion="1552" identifier="iOS"/> + <development version="4600" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Walk Through Container View Controller--> @@ -10,7 +11,7 @@ <objects> <viewController id="xbC-af-Ssw" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="EpC-35-Pc5"> - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> @@ -25,14 +26,14 @@ <objects> <viewController id="2" customClass="server_list_vc" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="naQ-T4-jWV"> - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> <color key="backgroundColor" red="0.93333713500000004" green="0.92603786499999996" blue="0.92826186129999999" alpha="1" colorSpace="calibratedRGB"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="Rg3-PU-OuS" detailTextLabel="9Mc-gD-acc" style="IBUITableViewCellStyleValue1" id="Pvl-Uw-Ghs"> <rect key="frame" x="0.0" y="46" width="320" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pvl-Uw-Ghs" id="3pH-XZ-v2M"> - <rect key="frame" x="0.0" y="0.0" width="320" height="45"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rg3-PU-OuS"> @@ -48,7 +49,8 @@ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -84,7 +86,7 @@ <objects> <viewController id="UPe-3R-KdQ" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="UGV-xw-Sxo"> - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> <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="f2u-bG-5ak"> @@ -95,14 +97,14 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> - <rect key="frame" x="29" y="474.5" width="271" height="73.5"/> + <rect key="frame" x="29" y="419" width="271" height="65.000000000000028"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> - <rect key="frame" x="-660" y="291" width="0.0" height="0.0"/> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="hNY-aX-xhu"> + <rect key="frame" x="15" y="144" width="291" height="215"/> <autoresizingMask key="autoresizingMask"/> </imageView> </subviews> @@ -123,7 +125,7 @@ <objects> <tableViewController id="maT-Bx-l5y" 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="VUL-K7-xsS"> - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" red="0.93333713500000004" green="0.92603786499999996" blue="0.92826186129999999" alpha="1" colorSpace="calibratedRGB"/> <sections> @@ -132,18 +134,20 @@ <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="EN9-tY-k4P" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="10" width="320" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EN9-tY-k4P" id="wiu-r6-V1l"> - <rect key="frame" x="0.0" y="0.0" width="320" height="45"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="qeE-95-2Gh" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="55" width="320" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qeE-95-2Gh" id="kDh-mM-mRw"> - <rect key="frame" x="0.0" y="0.0" width="320" height="45"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -188,29 +192,28 @@ <objects> <tableViewController id="5d0-J5-Cal" customClass="slideShowSwipeInList" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="132" sectionHeaderHeight="22" sectionFooterHeight="22" id="Ke1-ze-r00"> - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> + <rect key="frame" x="0.0" y="20" width="320" height="548"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="115" id="hig-YG-1Lg"> <rect key="frame" x="0.0" y="22" width="320" height="115"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hig-YG-1Lg" id="U7Z-gh-Ozj"> - <rect key="frame" x="0.0" y="0.0" width="320" height="115"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="114"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="10" width="220" height="51"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> + <rect key="frame" x="20" y="20" width="184" height="39"/> + <autoresizingMask key="autoresizingMask"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="65" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="58" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted"> @@ -218,8 +221,8 @@ </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="134" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="127" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> @@ -230,21 +233,22 @@ </state> </button> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="132" id="dDp-H3-HyL"> <rect key="frame" x="0.0" y="137" width="320" height="132"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dDp-H3-HyL" id="VYx-ys-waY"> - <rect key="frame" x="0.0" y="0.0" width="320" height="132"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="131"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="3.5" width="182" height="122"/> + <rect key="frame" x="20" y="5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="103" width="29" height="21"/> + <rect key="frame" x="173" y="106" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -254,7 +258,9 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> + <color key="backgroundColor" red="0.93333713500000004" green="0.92603786499999996" blue="0.92826186129999999" alpha="1" colorSpace="calibratedRGB"/> </tableViewCell> </prototypes> <connections> @@ -275,7 +281,7 @@ <objects> <viewController id="Ivv-3X-Nhr" customClass="slideShow_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="Xty-aF-WDv"> - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> + <rect key="frame" x="0.0" y="20" width="320" height="548"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <view contentMode="scaleToFill" id="YvB-Gp-Fvr" userLabel="Preview"> @@ -283,7 +289,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="bZq-z2-OKU"> - <rect key="frame" x="3.0000000000000031" y="8" width="220" height="167"/> + <rect key="frame" x="3" y="8" width="220" height="167"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </imageView> @@ -311,7 +317,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="evg-Ah-Kcw" userLabel="NotesView"> - <rect key="frame" x="-13" y="191" width="346" height="289"/> + <rect key="frame" x="-13" y="191" width="346" height="269"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" Lecturer's Notes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Y23-iV-GJx"> @@ -323,7 +329,7 @@ <nil key="highlightedColor"/> </label> <webView contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="xGi-A7-hat" userLabel="Notes"> - <rect key="frame" x="20" y="21" width="306" height="268"/> + <rect key="frame" x="20" y="21" width="306" height="248"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -331,7 +337,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view hidden="YES" opaque="NO" userInteractionEnabled="NO" alpha="0.60000000000000009" contentMode="scaleToFill" id="uSh-Ne-BdH" userLabel="blockview"> - <rect key="frame" x="0.0" y="-46" width="320" height="660"/> + <rect key="frame" x="0.0" y="-46" width="320" height="640"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <accessibility key="accessibilityConfiguration"> @@ -343,11 +349,11 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES"/> </imageView> <view hidden="YES" contentMode="scaleToFill" id="iCc-m2-vR5" userLabel="pointer"> - <rect key="frame" x="157" y="282" width="5" height="5"/> + <rect key="frame" x="157" y="272" width="5" height="5"/> <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </view> <view contentMode="scaleToFill" restorationIdentifier="" id="3od-5c-yzI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="480" width="320" height="88"/> + <rect key="frame" x="0.0" y="460" width="320" height="88"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" lineBreakMode="middleTruncation" id="vh9-Zy-DPu"> @@ -427,11 +433,11 @@ <objects> <tableViewController id="Ybo-9c-MB8" customClass="slideShowPreviewTable_vc_iphone" 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="rWA-v3-wtf"> - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" red="0.93333713503649562" green="0.9260378649635036" blue="0.92826186131386856" alpha="1" colorSpace="calibratedRGB"/> <view key="tableHeaderView" contentMode="scaleToFill" id="nOZ-aL-o5J"> - <rect key="frame" x="0.0" y="64" width="320" height="157"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="157"/> <subviews> <view contentMode="scaleToFill" id="9RB-yM-BkW"> <rect key="frame" x="0.0" y="17" width="320" height="140"/> @@ -454,28 +460,31 @@ <tableViewSection id="8wQ-rK-ve4"> <cells> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="0D7-tO-bVg"> - <rect key="frame" x="0.0" y="221" width="320" height="44"/> + <rect key="frame" x="0.0" y="167" width="320" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0D7-tO-bVg" id="haz-0h-Xx0"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="10" y="1" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="LrN-2p-yDw"> - <rect key="frame" x="0.0" y="265" width="320" height="44"/> + <rect key="frame" x="0.0" y="212" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LrN-2p-yDw" id="MIb-HW-T9D"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="Cdv-T8-mH7"> - <rect key="frame" x="0.0" y="309" width="320" height="44"/> + <rect key="frame" x="0.0" y="256" width="320" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Cdv-T8-mH7" id="ke9-1l-fgc"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -520,14 +529,14 @@ <image name="WTPairingScreenshot.png" width="474" height="312"/> <image name="add.png" width="30" height="30"/> <image name="ic_launcher.png" width="16" height="16"/> - <image name="pointer.png" width="34.321144104003906" height="35.281177520751953"/> - <image name="pointer_pushed.png" width="34.321144104003906" height="35.281177520751953"/> - <image name="pushed_next_button.png" width="75.602523803710938" height="52.801761627197266"/> - <image name="pushed_previous_button.png" width="75.602523803710938" height="52.801761627197266"/> - <image name="released_next_button.png" width="75.602523803710938" height="52.801761627197266"/> - <image name="released_previous_button.png" width="75.602523803710938" height="52.801761627197266"/> - <image name="timer_clear_btn.png" width="14.400480270385742" height="14.400480270385742"/> - <image name="timer_start_btn.png" width="14.400480270385742" height="14.400480270385742"/> + <image name="pointer.png" width="143" height="147"/> + <image name="pointer_pushed.png" width="143" height="147"/> + <image name="pushed_next_button.png" width="315" height="220"/> + <image name="pushed_previous_button.png" width="315" height="220"/> + <image name="released_next_button.png" width="315" height="220"/> + <image name="released_previous_button.png" width="315" height="220"/> + <image name="timer_clear_btn.png" width="60" height="60"/> + <image name="timer_start_btn.png" width="60" height="60"/> </resources> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> @@ -535,8 +544,8 @@ <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="mx5-BO-ZzL"/> - <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> + <segue reference="pTl-ua-9pr"/> + <segue reference="mx5-BO-ZzL"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard index 62d49ae98809..2e33cf994f0b 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> - <deployment version="1552" identifier="iOS"/> + <deployment version="1552" defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> @@ -97,14 +97,14 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> - <rect key="frame" x="29" y="419" width="271" height="65"/> + <rect key="frame" x="29" y="419" width="271" height="65.000000000000028"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> - <rect key="frame" x="6" y="138" width="309" height="196"/> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="hNY-aX-xhu"> + <rect key="frame" x="15" y="144" width="291" height="215"/> <autoresizingMask key="autoresizingMask"/> </imageView> </subviews> @@ -203,18 +203,17 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="10" width="220" height="51"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> + <rect key="frame" x="20" y="20" width="184" height="39"/> + <autoresizingMask key="autoresizingMask"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="65" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="58" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted"> @@ -222,8 +221,8 @@ </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="134" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="127" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> @@ -246,10 +245,10 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="3.5" width="182" height="122"/> + <rect key="frame" x="20" y="5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="103" width="29" height="21"/> + <rect key="frame" x="173" y="106" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -261,6 +260,7 @@ </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> + <color key="backgroundColor" red="0.93333713500000004" green="0.92603786499999996" blue="0.92826186129999999" alpha="1" colorSpace="calibratedRGB"/> </tableViewCell> </prototypes> <connections> @@ -446,7 +446,7 @@ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="24"/> + <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="19"/> <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> @@ -538,84 +538,14 @@ <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> - <classes> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="SWRevealViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> - </class> - <class className="WalkThroughContainerViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> - <relationships> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowSwipeInList" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> - </class> - <class className="slideShow_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> - <relationships> - <relationship kind="action" name="accPointerAction:"/> - <relationship kind="action" name="nextSlideAction:"/> - <relationship kind="action" name="pointerAction:"/> - <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> - <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> - <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="notesView" candidateClass="UIView"/> - <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> - <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> - <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> - </relationships> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="mx5-BO-ZzL"/> - <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> + <segue reference="pTl-ua-9pr"/> + <segue reference="mx5-BO-ZzL"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard index f49dc73c60db..d40a963dfac1 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> - <deployment version="1552" identifier="iOS"/> + <deployment version="1552" defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Walk Through Container View Controller--> @@ -105,8 +105,8 @@ Contrôle Distant</string> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> - <rect key="frame" x="6" y="138" width="309" height="196"/> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="hNY-aX-xhu"> + <rect key="frame" x="15" y="144" width="291" height="215"/> <autoresizingMask key="autoresizingMask"/> </imageView> </subviews> @@ -205,18 +205,17 @@ Contrôle Distant</string> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="10" width="220" height="51"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> + <rect key="frame" x="20" y="20" width="184" height="39"/> + <autoresizingMask key="autoresizingMask"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="65" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="58" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted"> @@ -224,8 +223,8 @@ Contrôle Distant</string> </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="134" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="127" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> @@ -248,10 +247,10 @@ Contrôle Distant</string> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="3.5" width="182" height="122"/> + <rect key="frame" x="20" y="5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="103" width="29" height="21"/> + <rect key="frame" x="173" y="106" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -263,6 +262,7 @@ Contrôle Distant</string> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> + <color key="backgroundColor" red="0.93333713500000004" green="0.92603786499999996" blue="0.92826186129999999" alpha="1" colorSpace="calibratedRGB"/> </tableViewCell> </prototypes> <connections> @@ -448,7 +448,7 @@ Contrôle Distant</string> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Titre du document" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="24"/> + <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="19"/> <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> @@ -546,8 +546,8 @@ Contrôle Distant</string> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="mx5-BO-ZzL"/> - <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> + <segue reference="pTl-ua-9pr"/> + <segue reference="mx5-BO-ZzL"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard index f49dc73c60db..d40a963dfac1 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> - <deployment version="1552" identifier="iOS"/> + <deployment version="1552" defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Walk Through Container View Controller--> @@ -105,8 +105,8 @@ Contrôle Distant</string> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> - <rect key="frame" x="6" y="138" width="309" height="196"/> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="hNY-aX-xhu"> + <rect key="frame" x="15" y="144" width="291" height="215"/> <autoresizingMask key="autoresizingMask"/> </imageView> </subviews> @@ -205,18 +205,17 @@ Contrôle Distant</string> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="10" width="220" height="51"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> + <rect key="frame" x="20" y="20" width="184" height="39"/> + <autoresizingMask key="autoresizingMask"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="65" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="58" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted"> @@ -224,8 +223,8 @@ Contrôle Distant</string> </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="134" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="127" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> @@ -248,10 +247,10 @@ Contrôle Distant</string> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="3.5" width="182" height="122"/> + <rect key="frame" x="20" y="5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="103" width="29" height="21"/> + <rect key="frame" x="173" y="106" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -263,6 +262,7 @@ Contrôle Distant</string> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> + <color key="backgroundColor" red="0.93333713500000004" green="0.92603786499999996" blue="0.92826186129999999" alpha="1" colorSpace="calibratedRGB"/> </tableViewCell> </prototypes> <connections> @@ -448,7 +448,7 @@ Contrôle Distant</string> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Titre du document" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="24"/> + <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="19"/> <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> @@ -546,8 +546,8 @@ Contrôle Distant</string> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="mx5-BO-ZzL"/> - <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> + <segue reference="pTl-ua-9pr"/> + <segue reference="mx5-BO-ZzL"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m index 6de77bc75289..624d82304c7a 100644 --- a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m +++ b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m @@ -108,18 +108,36 @@ dispatch_queue_t backgroundQueue; return [self.slideshow size]; } -- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section -{ +- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { + return 23; +} + +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + + NSString *sectionTitle; switch (section) { case 0: - return NSLocalizedString(@"Stop Watch", @"Sidebar section header"); + sectionTitle = NSLocalizedString(@"Stop Watch", @"Sidebar section header"); break; case 1: - return NSLocalizedString(@"Slides", @"Sidebar section header"); + sectionTitle = NSLocalizedString(@"Slides", @"Sidebar section header"); default: break; } - return nil; + + UILabel *label = [[UILabel alloc] init]; + label.frame = CGRectMake(10, 0, 284, 23); + label.textColor = [UIColor whiteColor]; + label.font = [UIFont fontWithName:@"Helvetica" size:14.0]; + label.text = sectionTitle; + label.backgroundColor = [UIColor clearColor]; + + // Create header view and add label as a subview + UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 320, 23)]; + view.backgroundColor = [UIColor colorWithRed:1.0 green:0.662745098 blue:0.074509804 alpha:0.9]; + [view addSubview:label]; + + return view; } - (void) tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath diff --git a/ios/iosremote/iosremote/slideShow_vc_iphone.m b/ios/iosremote/iosremote/slideShow_vc_iphone.m index c127d87656ad..ace2508a7e63 100644 --- a/ios/iosremote/iosremote/slideShow_vc_iphone.m +++ b/ios/iosremote/iosremote/slideShow_vc_iphone.m @@ -318,6 +318,8 @@ // Disable all calibration functions for acc based pointer self.count = INT_MAX; } + + [self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer]; } - (void) popOverStart:(id)sender diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard index e983cff21362..0ae81fc2c825 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> - <deployment version="1552" identifier="iOS"/> + <deployment version="1552" defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Walk Through Container View Controller--> @@ -103,8 +103,8 @@ <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> - <rect key="frame" x="6" y="138" width="309" height="196"/> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="hNY-aX-xhu"> + <rect key="frame" x="15" y="144" width="291" height="215"/> <autoresizingMask key="autoresizingMask"/> </imageView> </subviews> @@ -203,18 +203,17 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="10" width="220" height="51"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> + <rect key="frame" x="20" y="20" width="184" height="39"/> + <autoresizingMask key="autoresizingMask"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="65" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="58" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted"> @@ -222,8 +221,8 @@ </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="134" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="127" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> @@ -246,10 +245,10 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="3.5" width="182" height="122"/> + <rect key="frame" x="20" y="5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="103" width="29" height="21"/> + <rect key="frame" x="173" y="106" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -261,6 +260,7 @@ </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> + <color key="backgroundColor" red="0.93333713500000004" green="0.92603786499999996" blue="0.92826186129999999" alpha="1" colorSpace="calibratedRGB"/> </tableViewCell> </prototypes> <connections> @@ -446,7 +446,7 @@ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="演示文稿标题" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="24"/> + <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="19"/> <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> @@ -544,8 +544,8 @@ <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="mx5-BO-ZzL"/> - <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> + <segue reference="pTl-ua-9pr"/> + <segue reference="mx5-BO-ZzL"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file 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 e983cff21362..0ae81fc2c825 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> - <deployment version="1552" identifier="iOS"/> + <deployment version="1552" defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Walk Through Container View Controller--> @@ -103,8 +103,8 @@ <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="4cX-m9-dNc"> - <rect key="frame" x="6" y="138" width="309" height="196"/> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="hNY-aX-xhu"> + <rect key="frame" x="15" y="144" width="291" height="215"/> <autoresizingMask key="autoresizingMask"/> </imageView> </subviews> @@ -203,18 +203,17 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC"> - <rect key="frame" x="11" y="10" width="220" height="51"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> + <rect key="frame" x="20" y="20" width="184" height="39"/> + <autoresizingMask key="autoresizingMask"/> <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </label> <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn"> - <rect key="frame" x="65" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="58" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_start_btn.png"> - <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> </state> <state key="highlighted"> @@ -222,8 +221,8 @@ </state> </button> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> - <rect key="frame" x="134" y="60" width="44" height="44"/> - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> + <rect key="frame" x="127" y="67" width="40" height="40"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" image="timer_clear_btn.png"> <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> @@ -246,10 +245,10 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI"> - <rect key="frame" x="31" y="3.5" width="182" height="122"/> + <rect key="frame" x="20" y="5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> - <rect key="frame" x="184" y="103" width="29" height="21"/> + <rect key="frame" x="173" y="106" width="29" height="21"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/> @@ -261,6 +260,7 @@ </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> + <color key="backgroundColor" red="0.93333713500000004" green="0.92603786499999996" blue="0.92826186129999999" alpha="1" colorSpace="calibratedRGB"/> </tableViewCell> </prototypes> <connections> @@ -446,7 +446,7 @@ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="演示文稿标题" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <rect key="frame" x="20" y="20" width="280" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="24"/> + <fontDescription key="fontDescription" name="HiraKakuProN-W6" family="Hiragino Kaku Gothic ProN" pointSize="19"/> <color key="textColor" red="0.21176470589999999" green="0.81568627449999997" blue="0.78039215689999997" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> @@ -544,8 +544,8 @@ <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="mx5-BO-ZzL"/> - <segue reference="pTl-ua-9pr"/> <segue reference="eIY-4P-1sI"/> + <segue reference="pTl-ua-9pr"/> + <segue reference="mx5-BO-ZzL"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard index 644121799fd5..545e24b10bc2 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <development version="4600" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc ipad - 连接--> @@ -10,14 +11,14 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> - <rect key="frame" x="0.0" y="119" width="540" height="44"/> + <rect key="frame" x="0.0" y="54" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="Mwq-0R-Ezz"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> @@ -33,7 +34,8 @@ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -70,25 +72,25 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="164" y="66" width="223" height="134"/> + <rect key="frame" x="164" y="66" width="223" height="119"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="请将以上pin码输入到LibreOffice Impress - 幻灯片播放 - Impress远程 中" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="115" y="495" width="320" height="105"/> + <rect key="frame" x="115" y="442" width="320" height="94"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="iaB-Jl-mwG"> - <rect key="frame" x="80" y="192" width="381" height="285"/> + <rect key="frame" x="80" y="192" width="381" height="243"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> </imageView> </subviews> @@ -110,7 +112,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> @@ -119,18 +121,20 @@ <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="99" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="etu-oV-iGF"> - <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="143" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="xyc-BA-quE"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,7 +162,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> @@ -187,26 +191,29 @@ <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"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="ng2-pZ-qdJ"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="TXf-WL-bg3"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="gtX-nU-NRv"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +239,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,7 +297,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" 演讲者笔记" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> @@ -302,7 +309,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +317,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="31" y="254" width="0.0" height="0.0"/> + <rect key="frame" x="726" y="-655" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,7 +326,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> @@ -420,15 +427,15 @@ <objects> <tableViewController clearsSelectionOnViewWillAppear="NO" id="VQa-vM-8pF" customClass="slideShowSwipeInList_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="170" sectionHeaderHeight="22" sectionFooterHeight="22" id="U9c-sP-NVQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="JD6-IP-wMQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> @@ -446,7 +453,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -485,7 +493,7 @@ <objects> <viewController id="Grm-Od-s6s" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="LWc-xb-hIj"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> @@ -509,7 +517,6 @@ <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> - <color key="tintColor" red="0.95294117649999999" green="0.54008895990000005" blue="0.070588235289999995" alpha="1" colorSpace="calibratedRGB"/> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard index 644121799fd5..545e24b10bc2 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> + <development version="4600" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> </dependencies> <scenes> <!--Server list vc ipad - 连接--> @@ -10,14 +11,14 @@ <objects> <viewController id="5QV-E7-KNT" customClass="server_list_vc_ipad" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="0vt-Sx-o55"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="h0a-Zq-2vY" detailTextLabel="Fsp-wI-AAW" style="IBUITableViewCellStyleValue1" id="HZp-VJ-Pgz"> - <rect key="frame" x="0.0" y="119" width="540" height="44"/> + <rect key="frame" x="0.0" y="54" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HZp-VJ-Pgz" id="Mwq-0R-Ezz"> - <rect key="frame" x="0.0" y="0.0" width="540" height="43"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="31" y="1" width="478" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY"> @@ -33,7 +34,8 @@ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </prototypes> <connections> @@ -70,25 +72,25 @@ <objects> <viewController id="m26-i1-eiL" customClass="pinValidation_vc" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="hAq-tq-hru"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bp1-Dv-nt4"> - <rect key="frame" x="164" y="66" width="223" height="134"/> + <rect key="frame" x="164" y="66" width="223" height="119"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="100"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="请将以上pin码输入到LibreOffice Impress - 幻灯片播放 - Impress远程 中" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9zr-53-YfP"> - <rect key="frame" x="115" y="495" width="320" height="105"/> + <rect key="frame" x="115" y="442" width="320" height="94"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> <nil key="highlightedColor"/> </label> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="WTPairingScreenshot.png" id="iaB-Jl-mwG"> - <rect key="frame" x="80" y="192" width="381" height="285"/> + <rect key="frame" x="80" y="192" width="381" height="243"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> </imageView> </subviews> @@ -110,7 +112,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="qow-Yc-8dL"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> @@ -119,18 +121,20 @@ <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="b8A-jh-k26" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="99" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b8A-jh-k26" id="etu-oV-iGF"> - <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jrI-wU-4NT" customClass="EditableTableViewCell"> <rect key="frame" x="0.0" y="143" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jrI-wU-4NT" id="xyc-BA-quE"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -158,7 +162,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" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Pc5-8o-PrW"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <view key="tableHeaderView" contentMode="scaleToFill" id="YCJ-J4-RGt"> @@ -187,26 +191,29 @@ <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"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tqg-R4-Coi" id="ng2-pZ-qdJ"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="45"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" restorationIdentifier="" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="f4z-FH-mar"> <rect key="frame" x="0.0" y="336" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f4z-FH-mar" id="TXf-WL-bg3"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="optionCell" id="5jP-bD-Vcy"> <rect key="frame" x="0.0" y="380" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5jP-bD-Vcy" id="gtX-nU-NRv"> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="540" height="44"/> <autoresizingMask key="autoresizingMask"/> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> </tableViewCell> </cells> </tableViewSection> @@ -232,7 +239,7 @@ <objects> <viewController storyboardIdentifier="basePresentation" id="TYh-Hw-m1Q" customClass="BasePresentationViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="qHB-hR-vFc"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> + <rect key="frame" x="0.0" y="20" width="768" height="1004"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="KCA-UU-Lu1" userLabel="Preview"> @@ -290,7 +297,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <view clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="547" restorationIdentifier="" id="Pk1-fD-KAi" userLabel="NotesView"> - <rect key="frame" x="-13" y="595" width="794" height="323"/> + <rect key="frame" x="-13" y="595" width="794" height="303"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text=" 演讲者笔记" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5Yn-0z-Cjz"> @@ -302,7 +309,7 @@ <nil key="highlightedColor"/> </label> <webView tag="4" contentMode="scaleToFill" verticalCompressionResistancePriority="1" id="pAh-4g-JCn" userLabel="Notes"> - <rect key="frame" x="20" y="29" width="754" height="294"/> + <rect key="frame" x="20" y="29" width="754" height="274"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <rect key="contentStretch" x="0.0" y="1" width="1" height="1"/> </webView> @@ -310,7 +317,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="31" y="254" width="0.0" height="0.0"/> + <rect key="frame" x="726" y="-655" width="0.0" height="0.0"/> <autoresizingMask key="autoresizingMask"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <connections> @@ -319,7 +326,7 @@ </connections> </tableView> <view contentMode="scaleToFill" restorationIdentifier="" id="xYX-bt-wuI" userLabel="Bottom"> - <rect key="frame" x="0.0" y="926" width="768" height="98"/> + <rect key="frame" x="0.0" y="906" width="768" height="98"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dtc-vP-agf"> @@ -420,15 +427,15 @@ <objects> <tableViewController clearsSelectionOnViewWillAppear="NO" id="VQa-vM-8pF" customClass="slideShowSwipeInList_ipad" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="170" sectionHeaderHeight="22" sectionFooterHeight="22" id="U9c-sP-NVQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="852"/> + <rect key="frame" x="0.0" y="20" width="320" height="832"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="slide" rowHeight="178" id="c4j-oH-LnN"> <rect key="frame" x="0.0" y="22" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4j-oH-LnN" id="JD6-IP-wMQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="177"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="0.0" y="0.0" width="320" height="178"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde"> @@ -446,7 +453,8 @@ <nil key="highlightedColor"/> </label> </subviews> - </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </tableViewCell> </prototypes> @@ -485,7 +493,7 @@ <objects> <viewController id="Grm-Od-s6s" customClass="WalkThroughContainerViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="LWc-xb-hIj"> - <rect key="frame" x="0.0" y="0.0" width="540" height="620"/> + <rect key="frame" x="0.0" y="64" width="540" height="556"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> @@ -509,7 +517,6 @@ <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> - <color key="tintColor" red="0.95294117649999999" green="0.54008895990000005" blue="0.070588235289999995" alpha="1" colorSpace="calibratedRGB"/> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> |