diff options
author | Siqi LIU <me@siqi.fr> | 2013-08-18 00:09:30 +0800 |
---|---|---|
committer | Siqi LIU <me@siqi.fr> | 2013-08-18 15:22:15 +0800 |
commit | 1dc74ae1f75b7d02953032a20e7e3c7c72c7dfd8 (patch) | |
tree | 26612cb2b232af5aa7d82ad387b08347c6931d9d | |
parent | 483d4c06c5b88949c5f0e12c9c8b3b4e88132e86 (diff) |
miscelleneuous changes in storyboard
Change-Id: Ia3ca6da7155842693446888a53c899b3766870fe
10 files changed, 40 insertions, 644 deletions
diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard index a2cc0f57ff35..e804dee360b3 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="XiK-Ye-iB8"> <dependencies> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc ipad - Connecter--> @@ -54,7 +54,7 @@ </connections> </barButtonItem> </navigationItem> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="serverTable" destination="0vt-Sx-o55" id="Szp-pH-0rk"/> <segue destination="m26-i1-eiL" kind="push" identifier="pinValidation" id="yUv-cB-P15"/> @@ -95,7 +95,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> <navigationItem key="navigationItem" id="V5z-WP-qrM"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="pinLabel" destination="Bp1-Dv-nt4" id="6xd-P5-J5U"/> <outlet property="statusLabel" destination="VVO-s2-eCV" id="Uhy-iy-HAW"/> @@ -150,7 +150,7 @@ </connections> </barButtonItem> </navigationItem> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="JK3-FB-UoN" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> @@ -223,7 +223,7 @@ </connections> </tableView> <navigationItem key="navigationItem" id="4ju-ge-QPw"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="optionsTable" destination="Pc5-8o-PrW" id="18R-Zo-CBq"/> <outlet property="titleLabel" destination="JEW-I6-sw5" id="1AH-TC-z10"/> @@ -504,7 +504,7 @@ Contrôle Distant</string> </connections> </tableView> <navigationItem key="navigationItem" id="tG3-aQ-qyu"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="EJg-kN-O5N" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> @@ -543,87 +543,6 @@ Contrôle Distant</string> <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> - <classes> - <class className="BasePresentationViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> - <relationships> - <relationship kind="action" name="nextSlideAction:"/> - <relationship kind="action" name="popOverUp:"/> - <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="action" name="startConnectionModal:"/> - <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> - <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> - <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> - <relationship kind="outlet" name="welcome_connect_button" candidateClass="UIButton"/> - <relationship kind="outlet" name="welcome_label" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_libO_icon" candidateClass="UIImageView"/> - </relationships> - </class> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="MainSplitViewController" superclassName="UISplitViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> - </class> - <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="server_list_vc_ipad" superclassName="server_list_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> - <relationships> - <relationship kind="action" name="cancelModalView:"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> - <relationships> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard index a2cc0f57ff35..e804dee360b3 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="XiK-Ye-iB8"> <dependencies> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc ipad - Connecter--> @@ -54,7 +54,7 @@ </connections> </barButtonItem> </navigationItem> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="serverTable" destination="0vt-Sx-o55" id="Szp-pH-0rk"/> <segue destination="m26-i1-eiL" kind="push" identifier="pinValidation" id="yUv-cB-P15"/> @@ -95,7 +95,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> <navigationItem key="navigationItem" id="V5z-WP-qrM"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="pinLabel" destination="Bp1-Dv-nt4" id="6xd-P5-J5U"/> <outlet property="statusLabel" destination="VVO-s2-eCV" id="Uhy-iy-HAW"/> @@ -150,7 +150,7 @@ </connections> </barButtonItem> </navigationItem> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="JK3-FB-UoN" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> @@ -223,7 +223,7 @@ </connections> </tableView> <navigationItem key="navigationItem" id="4ju-ge-QPw"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="optionsTable" destination="Pc5-8o-PrW" id="18R-Zo-CBq"/> <outlet property="titleLabel" destination="JEW-I6-sw5" id="1AH-TC-z10"/> @@ -504,7 +504,7 @@ Contrôle Distant</string> </connections> </tableView> <navigationItem key="navigationItem" id="tG3-aQ-qyu"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="EJg-kN-O5N" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> @@ -543,87 +543,6 @@ Contrôle Distant</string> <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> - <classes> - <class className="BasePresentationViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> - <relationships> - <relationship kind="action" name="nextSlideAction:"/> - <relationship kind="action" name="popOverUp:"/> - <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="action" name="startConnectionModal:"/> - <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> - <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> - <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> - <relationship kind="outlet" name="welcome_connect_button" candidateClass="UIButton"/> - <relationship kind="outlet" name="welcome_label" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_libO_icon" candidateClass="UIImageView"/> - </relationships> - </class> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="MainSplitViewController" superclassName="UISplitViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> - </class> - <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="server_list_vc_ipad" superclassName="server_list_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> - <relationships> - <relationship kind="action" name="cancelModalView:"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> - <relationships> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist index 382c35f789f2..43ca70386c57 100644 --- a/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ b/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist @@ -8,11 +8,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "iosremote/Communication/CommunicationManager.m" - timestampString = "398102600.954242" + timestampString = "398443855.270743" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "78" - endingLineNumber = "78" + startingLineNumber = "90" + endingLineNumber = "90" landmarkName = "-connectionStatusHandler:" landmarkType = "5"> </FileBreakpoint> diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard index 178f5cd0a01d..cd0c1da20c58 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="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> <dependencies> <deployment defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc - LibreOffice Impress Contrôle Distant--> @@ -516,73 +516,6 @@ Contrôle Distant</string> <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> - <classes> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="SWRevealViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> - <relationships> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowSwipeInList" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> - </class> - <class className="slideShow_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> - <relationships> - <relationship kind="action" name="accPointerAction:"/> - <relationship kind="action" name="nextSlideAction:"/> - <relationship kind="action" name="pointerAction:"/> - <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> - <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> - <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="notesView" candidateClass="UIView"/> - <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> - <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> - <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> - </relationships> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard index 178f5cd0a01d..cd0c1da20c58 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="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> <dependencies> <deployment defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc - LibreOffice Impress Contrôle Distant--> @@ -516,73 +516,6 @@ Contrôle Distant</string> <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> - <classes> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="SWRevealViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> - <relationships> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowSwipeInList" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> - </class> - <class className="slideShow_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> - <relationships> - <relationship kind="action" name="accPointerAction:"/> - <relationship kind="action" name="nextSlideAction:"/> - <relationship kind="action" name="pointerAction:"/> - <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> - <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> - <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="notesView" candidateClass="UIView"/> - <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> - <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> - <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> - </relationships> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/iosremote/newServer_vc.m b/ios/iosremote/iosremote/newServer_vc.m index 98dfe938e4ad..72641ee51c2c 100644 --- a/ios/iosremote/iosremote/newServer_vc.m +++ b/ios/iosremote/iosremote/newServer_vc.m @@ -12,7 +12,6 @@ #import "UIViewController+LibOStyling.h" #import "serverList_vc.h" #import "Server.h" -#import <SystemConfiguration/CaptiveNetwork.h> @implementation newServerViewController @@ -35,7 +34,7 @@ NSString *serverAddr = [self.addrCell.textField text]; if ([serverAddr isValidIPAddress]) { if (!serverName || [serverName isEqualToString:@""]) { - serverName = [[self fetchSSIDInfo] valueForKey:@"SSID"]; + serverName = [[CommunicationManager fetchSSIDInfo] valueForKey:@"SSID"]; } NSLog(@"New server name:%@ ip:%@", serverName, serverAddr); [self.comManager addServersWithName:serverName AtAddress:serverAddr]; @@ -63,17 +62,6 @@ #pragma mark - #pragma mark UIViewController Methods -- (id)fetchSSIDInfo { - NSArray *ifs = (__bridge_transfer id)CNCopySupportedInterfaces(); - id info = nil; - for (NSString *ifnam in ifs) { - info = (__bridge_transfer id)CNCopyCurrentNetworkInfo((__bridge CFStringRef)ifnam); - NSLog(@"%@ => %@", ifnam, info); - if (info && [info count]) { break; } - } - return info; -} - - (void) handleBack { [self.navigationController popViewControllerAnimated:YES]; diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard index fddf80d1e2e0..674d8b92f065 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="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> <dependencies> <deployment defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc - Impress Remote--> @@ -514,73 +514,6 @@ <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> - <classes> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="SWRevealViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> - <relationships> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowSwipeInList" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> - </class> - <class className="slideShow_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> - <relationships> - <relationship kind="action" name="accPointerAction:"/> - <relationship kind="action" name="nextSlideAction:"/> - <relationship kind="action" name="pointerAction:"/> - <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> - <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> - <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="notesView" candidateClass="UIView"/> - <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> - <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> - <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> - </relationships> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard index fddf80d1e2e0..674d8b92f065 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="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="qoG-TN-hN0"> <dependencies> <deployment defaultVersion="1552" identifier="iOS"/> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc - Impress Remote--> @@ -514,73 +514,6 @@ <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> - <classes> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="SWRevealViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> - <relationships> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowSwipeInList" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> - </class> - <class className="slideShow_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> - <relationships> - <relationship kind="action" name="accPointerAction:"/> - <relationship kind="action" name="nextSlideAction:"/> - <relationship kind="action" name="pointerAction:"/> - <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> - <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> - <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="notesView" candidateClass="UIView"/> - <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> - <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> - <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> - </relationships> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard index dfd96f8b5959..4f57290154bf 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="XiK-Ye-iB8"> <dependencies> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc ipad - 连接--> @@ -54,7 +54,7 @@ </connections> </barButtonItem> </navigationItem> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="serverTable" destination="0vt-Sx-o55" id="Szp-pH-0rk"/> <segue destination="m26-i1-eiL" kind="push" identifier="pinValidation" id="yUv-cB-P15"/> @@ -95,7 +95,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> <navigationItem key="navigationItem" id="V5z-WP-qrM"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="pinLabel" destination="Bp1-Dv-nt4" id="6xd-P5-J5U"/> <outlet property="statusLabel" destination="VVO-s2-eCV" id="Uhy-iy-HAW"/> @@ -150,7 +150,7 @@ </connections> </barButtonItem> </navigationItem> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="JK3-FB-UoN" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> @@ -223,7 +223,7 @@ </connections> </tableView> <navigationItem key="navigationItem" id="4ju-ge-QPw"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="optionsTable" destination="Pc5-8o-PrW" id="18R-Zo-CBq"/> <outlet property="titleLabel" destination="JEW-I6-sw5" id="1AH-TC-z10"/> @@ -502,7 +502,7 @@ </connections> </tableView> <navigationItem key="navigationItem" id="tG3-aQ-qyu"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="EJg-kN-O5N" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> @@ -541,87 +541,6 @@ <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> - <classes> - <class className="BasePresentationViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> - <relationships> - <relationship kind="action" name="nextSlideAction:"/> - <relationship kind="action" name="popOverUp:"/> - <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="action" name="startConnectionModal:"/> - <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> - <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> - <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> - <relationship kind="outlet" name="welcome_connect_button" candidateClass="UIButton"/> - <relationship kind="outlet" name="welcome_label" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_libO_icon" candidateClass="UIImageView"/> - </relationships> - </class> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="MainSplitViewController" superclassName="UISplitViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> - </class> - <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="server_list_vc_ipad" superclassName="server_list_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> - <relationships> - <relationship kind="action" name="cancelModalView:"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> - <relationships> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard index dfd96f8b5959..4f57290154bf 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" initialViewController="XiK-Ye-iB8"> <dependencies> <development version="4600" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/> </dependencies> <scenes> <!--Server list vc ipad - 连接--> @@ -54,7 +54,7 @@ </connections> </barButtonItem> </navigationItem> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="serverTable" destination="0vt-Sx-o55" id="Szp-pH-0rk"/> <segue destination="m26-i1-eiL" kind="push" identifier="pinValidation" id="yUv-cB-P15"/> @@ -95,7 +95,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> <navigationItem key="navigationItem" id="V5z-WP-qrM"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="pinLabel" destination="Bp1-Dv-nt4" id="6xd-P5-J5U"/> <outlet property="statusLabel" destination="VVO-s2-eCV" id="Uhy-iy-HAW"/> @@ -150,7 +150,7 @@ </connections> </barButtonItem> </navigationItem> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="JK3-FB-UoN" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> @@ -223,7 +223,7 @@ </connections> </tableView> <navigationItem key="navigationItem" id="4ju-ge-QPw"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> <connections> <outlet property="optionsTable" destination="Pc5-8o-PrW" id="18R-Zo-CBq"/> <outlet property="titleLabel" destination="JEW-I6-sw5" id="1AH-TC-z10"/> @@ -502,7 +502,7 @@ </connections> </tableView> <navigationItem key="navigationItem" id="tG3-aQ-qyu"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="EJg-kN-O5N" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> @@ -541,87 +541,6 @@ <image name="timer_clear_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> - <classes> - <class className="BasePresentationViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> - <relationships> - <relationship kind="action" name="nextSlideAction:"/> - <relationship kind="action" name="popOverUp:"/> - <relationship kind="action" name="previousSlideAction:"/> - <relationship kind="action" name="startConnectionModal:"/> - <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> - <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> - <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/> - <relationship kind="outlet" name="welcome_connect_button" candidateClass="UIButton"/> - <relationship kind="outlet" name="welcome_label" candidateClass="UILabel"/> - <relationship kind="outlet" name="welcome_libO_icon" candidateClass="UIImageView"/> - </relationships> - </class> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="MainSplitViewController" superclassName="UISplitViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> - </class> - <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="server_list_vc_ipad" superclassName="server_list_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> - <relationships> - <relationship kind="action" name="cancelModalView:"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> - <relationships> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> |