summaryrefslogtreecommitdiffstats
path: root/ios/iosremote
diff options
context:
space:
mode:
authorSiqi LIU <me@siqi.fr>2013-08-19 15:58:50 +0800
committerSiqi LIU <me@siqi.fr>2013-08-21 17:23:53 +0800
commitd931e5fced36a7976aff7f32dd2902afa2886c65 (patch)
tree52ae2b06142f7331bbe21b8ea148701fed0eed60 /ios/iosremote
parentdismiss spinner when found a service (diff)
downloadcore-d931e5fced36a7976aff7f32dd2902afa2886c65.tar.gz
core-d931e5fced36a7976aff7f32dd2902afa2886c65.zip
change distribution license for beta-test release
Change-Id: I86a90129640b3ae0eb92db0ccc9479c921da9b71
Diffstat (limited to 'ios/iosremote')
-rw-r--r--ios/iosremote/fr.lproj/iPad_autosize.storyboard95
-rw-r--r--ios/iosremote/fr.lproj/iPad_autosize_old.storyboard95
-rw-r--r--ios/iosremote/iosremote.xcodeproj/project.pbxproj4
-rw-r--r--ios/iosremote/iosremote/Communication/CommunicationManager.h7
-rw-r--r--ios/iosremote/iosremote/Communication/CommunicationManager.m21
-rw-r--r--ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard71
-rw-r--r--ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard71
-rw-r--r--ios/iosremote/iosremote/iosremote-Info.plist12
-rw-r--r--ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard71
-rw-r--r--ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard71
-rw-r--r--ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard95
-rw-r--r--ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard95
12 files changed, 636 insertions, 72 deletions
diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard
index e804dee360b3..a2cc0f57ff35 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="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" 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>
<development version="4600" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
<scenes>
<!--Server list vc ipad - Connecter-->
@@ -54,7 +54,7 @@
</connections>
</barButtonItem>
</navigationItem>
- <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
</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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="EJg-kN-O5N" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
@@ -543,6 +543,87 @@ 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 e804dee360b3..a2cc0f57ff35 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="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" 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>
<development version="4600" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
<scenes>
<!--Server list vc ipad - Connecter-->
@@ -54,7 +54,7 @@
</connections>
</barButtonItem>
</navigationItem>
- <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
</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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="EJg-kN-O5N" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
@@ -543,6 +543,87 @@ 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/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index 7b91b619126b..e5af589e25e3 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -914,7 +914,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Distribution";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Siqi Liu (ECNT5P5MTW)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "iosremote/iosremote-Prefix.pch";
INFOPLIST_FILE = "iosremote/iosremote-Info.plist";
@@ -926,7 +926,7 @@
);
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
- "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+ "PROVISIONING_PROFILE[sdk=iphoneos*]" = "475E6C52-939A-4B08-B811-6E62C19FE6A1";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.h b/ios/iosremote/iosremote/Communication/CommunicationManager.h
index fdd2a1448513..1e24503bd8b8 100644
--- a/ios/iosremote/iosremote/Communication/CommunicationManager.h
+++ b/ios/iosremote/iosremote/Communication/CommunicationManager.h
@@ -67,12 +67,6 @@ enum SearchState : NSInteger {
SEARCHING
};
-typedef enum {
- NotReachable = 0,
- ReachableViaWiFi,
- ReachableViaWWAN
-} NetworkStatus;
-
@interface CommunicationManager : NSObject
- (id) initWithExistingServers;
@@ -82,7 +76,6 @@ typedef enum {
AtAddress:(NSString*)addr;
- (void) removeServerAtIndex:(NSUInteger)index;
-- (NetworkStatus) currentReachabilityStatus;
+ (id)fetchSSIDInfo;
@property ConnectionState state;
diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.m b/ios/iosremote/iosremote/Communication/CommunicationManager.m
index e2b3e19f2fe2..e92df8ce3cb3 100644
--- a/ios/iosremote/iosremote/Communication/CommunicationManager.m
+++ b/ios/iosremote/iosremote/Communication/CommunicationManager.m
@@ -202,25 +202,4 @@
[[NSUserDefaults standardUserDefaults] synchronize];
}
-#pragma mark -
-//
-//- (NetworkStatus) currentReachabilityStatus
-//{
-// NSAssert(reachabilityRef != NULL, @"currentNetworkStatus called with NULL reachabilityRef");
-// NetworkStatus retVal = NotReachable;
-// SCNetworkReachabilityFlags flags;
-// if (SCNetworkReachabilityGetFlags(reachabilityRef, &flags))
-// {
-// if(localWiFiRef)
-// {
-// retVal = [self localWiFiStatusForFlags: flags];
-// }
-// else
-// {
-// retVal = [self networkStatusForFlags: flags];
-// }
-// }
-// return retVal;
-//}
-
@end
diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard
index cd0c1da20c58..178f5cd0a01d 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 defaultVersion="1552" identifier="iOS"/>
<development version="4600" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
<scenes>
<!--Server list vc - LibreOffice Impress Contrôle Distant-->
@@ -516,6 +516,73 @@ 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 cd0c1da20c58..178f5cd0a01d 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 defaultVersion="1552" identifier="iOS"/>
<development version="4600" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
<scenes>
<!--Server list vc - LibreOffice Impress Contrôle Distant-->
@@ -516,6 +516,73 @@ 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/iosremote-Info.plist b/ios/iosremote/iosremote/iosremote-Info.plist
index a44501d3ffb3..428504759d15 100644
--- a/ios/iosremote/iosremote/iosremote-Info.plist
+++ b/ios/iosremote/iosremote/iosremote-Info.plist
@@ -2,12 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>CFBundleLocalizations</key>
- <array>
- <string>fr</string>
- <string>zh_CN</string>
- <string>en</string>
- </array>
<key>CFBundleDisplayName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleExecutable</key>
@@ -34,6 +28,12 @@
<string>org.libreoffice.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
+ <key>CFBundleLocalizations</key>
+ <array>
+ <string>fr</string>
+ <string>zh_CN</string>
+ <string>en</string>
+ </array>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard
index 674d8b92f065..fddf80d1e2e0 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 defaultVersion="1552" identifier="iOS"/>
<development version="4600" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
<scenes>
<!--Server list vc - Impress Remote-->
@@ -514,6 +514,73 @@
<image name="timer_clear_btn.png" width="60" height="60"/>
<image name="timer_start_btn.png" width="60" height="60"/>
</resources>
+ <classes>
+ <class className="EditableTableViewCell" superclassName="UITableViewCell">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/>
+ </class>
+ <class className="LibONavigationController" superclassName="UINavigationController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/>
+ </class>
+ <class className="SWRevealViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/>
+ </class>
+ <class className="newServerViewController" superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/>
+ <relationships>
+ <relationship kind="action" name="save:"/>
+ <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/>
+ </relationships>
+ </class>
+ <class className="pinValidation_vc" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/>
+ <relationships>
+ <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/>
+ <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/>
+ </relationships>
+ </class>
+ <class className="server_list_vc" superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
+ <relationships>
+ <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
+ </relationships>
+ </class>
+ <class className="slideShowPreviewTable_vc" superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
+ <relationships>
+ <relationship kind="action" name="startPresentationAction:"/>
+ <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/>
+ </relationships>
+ </class>
+ <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/>
+ <relationships>
+ <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
+ </relationships>
+ </class>
+ <class className="slideShowSwipeInList" superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/>
+ </class>
+ <class className="slideShow_vc" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/>
+ <relationships>
+ <relationship kind="action" name="accPointerAction:"/>
+ <relationship kind="action" name="nextSlideAction:"/>
+ <relationship kind="action" name="pointerAction:"/>
+ <relationship kind="action" name="previousSlideAction:"/>
+ <relationship kind="outlet" name="blockingView" candidateClass="UIView"/>
+ <relationship kind="outlet" name="bottomView" candidateClass="UIView"/>
+ <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/>
+ <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/>
+ <relationship kind="outlet" name="notesView" candidateClass="UIView"/>
+ <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/>
+ <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/>
+ <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
+ <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/>
+ <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/>
+ </relationships>
+ </class>
+ </classes>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard
index 674d8b92f065..fddf80d1e2e0 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 defaultVersion="1552" identifier="iOS"/>
<development version="4600" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
<scenes>
<!--Server list vc - Impress Remote-->
@@ -514,6 +514,73 @@
<image name="timer_clear_btn.png" width="60" height="60"/>
<image name="timer_start_btn.png" width="60" height="60"/>
</resources>
+ <classes>
+ <class className="EditableTableViewCell" superclassName="UITableViewCell">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/>
+ </class>
+ <class className="LibONavigationController" superclassName="UINavigationController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/>
+ </class>
+ <class className="SWRevealViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/>
+ </class>
+ <class className="newServerViewController" superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/>
+ <relationships>
+ <relationship kind="action" name="save:"/>
+ <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/>
+ </relationships>
+ </class>
+ <class className="pinValidation_vc" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/>
+ <relationships>
+ <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/>
+ <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/>
+ </relationships>
+ </class>
+ <class className="server_list_vc" superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
+ <relationships>
+ <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
+ </relationships>
+ </class>
+ <class className="slideShowPreviewTable_vc" superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
+ <relationships>
+ <relationship kind="action" name="startPresentationAction:"/>
+ <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/>
+ </relationships>
+ </class>
+ <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/>
+ <relationships>
+ <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
+ </relationships>
+ </class>
+ <class className="slideShowSwipeInList" superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/>
+ </class>
+ <class className="slideShow_vc" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/>
+ <relationships>
+ <relationship kind="action" name="accPointerAction:"/>
+ <relationship kind="action" name="nextSlideAction:"/>
+ <relationship kind="action" name="pointerAction:"/>
+ <relationship kind="action" name="previousSlideAction:"/>
+ <relationship kind="outlet" name="blockingView" candidateClass="UIView"/>
+ <relationship kind="outlet" name="bottomView" candidateClass="UIView"/>
+ <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/>
+ <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/>
+ <relationship kind="outlet" name="notesView" candidateClass="UIView"/>
+ <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/>
+ <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/>
+ <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
+ <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/>
+ <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/>
+ </relationships>
+ </class>
+ </classes>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard
index 4f57290154bf..dfd96f8b5959 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="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" 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>
<development version="4600" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
<scenes>
<!--Server list vc ipad - 连接-->
@@ -54,7 +54,7 @@
</connections>
</barButtonItem>
</navigationItem>
- <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
</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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="EJg-kN-O5N" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
@@ -541,6 +541,87 @@
<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 4f57290154bf..dfd96f8b5959 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="4488.1" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" variant="6xAndEarlier" propertyAccessControl="none" promptedForUpgradeToXcode5="NO" 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>
<development version="4600" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3715.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
<scenes>
<!--Server list vc ipad - 连接-->
@@ -54,7 +54,7 @@
</connections>
</barButtonItem>
</navigationItem>
- <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
</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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
<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"/>
+ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="EJg-kN-O5N" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
@@ -541,6 +541,87 @@
<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"/>