ios/iosremote/fr.lproj/iPad_autosize.storyboard | 4 ++-- ios/iosremote/fr.lproj/iPad_autosize_old.storyboard | 4 ++-- ios/iosremote/iosremote/Classes/PinValidationViewController.m | 2 ++ ios/iosremote/iosremote/Classes/ServerListViewController.m | 2 +- ios/iosremote/iosremote/Communication/CommandInterpreter.m | 8 ++++++-- ios/iosremote/iosremote/Communication/CommunicationManager.h | 2 ++ ios/iosremote/iosremote/Communication/CommunicationManager.m | 2 +- ios/iosremote/iosremote/Communication/Server.h | 5 +++-- ios/iosremote/iosremote/Communication/Server.m | 10 +++++++--- ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 10 +++++----- ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard | 10 +++++----- ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard | 10 +++++----- ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard | 10 +++++----- ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard | 10 +++++----- ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard | 10 +++++----- ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard | 4 ++-- ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard | 4 ++-- 17 files changed, 60 insertions(+), 47 deletions(-)
New commits: commit 2f3b37b6d1c1941a2a7a9937dab140dec361f488 Author: Siqi LIU <m...@siqi.fr> Date: Sun Oct 27 10:39:27 2013 +0100 client end takes care of server version Change-Id: I4d72a403971efb863a077d6ed6f1129ef0384e7b diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard index 5ea1573..df5e2e4 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/> </dependencies> <scenes> <!--About View Controller--> diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard index 5ea1573..df5e2e4 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/> </dependencies> <scenes> <!--About View Controller--> diff --git a/ios/iosremote/iosremote/Classes/PinValidationViewController.m b/ios/iosremote/iosremote/Classes/PinValidationViewController.m index 35f165e..b0383cc 100644 --- a/ios/iosremote/iosremote/Classes/PinValidationViewController.m +++ b/ios/iosremote/iosremote/Classes/PinValidationViewController.m @@ -10,6 +10,8 @@ #import "SlideShow.h" #import "CommandInterpreter.h" #import "CommunicationManager.h" +#import "Client.h" +#import "Server.h" @interface PinValidationViewController () diff --git a/ios/iosremote/iosremote/Classes/ServerListViewController.m b/ios/iosremote/iosremote/Classes/ServerListViewController.m index 76b2565..0012921 100644 --- a/ios/iosremote/iosremote/Classes/ServerListViewController.m +++ b/ios/iosremote/iosremote/Classes/ServerListViewController.m @@ -99,7 +99,7 @@ int port = socketAddress->sin_port; NSLog(@"Resolved at %@:%u", ipString, port); - [self.comManager connectToServer:[[Server alloc] initWithProtocol:NETWORK atAddress:ipString ofName:sender.name]]; + [self.comManager connectToServer:[[Server alloc] initWithProtocol:NETWORK atAddress:ipString ofName:sender.name ofVersion:@""]]; } } diff --git a/ios/iosremote/iosremote/Communication/CommandInterpreter.m b/ios/iosremote/iosremote/Communication/CommandInterpreter.m index 876790c..7dadfda 100644 --- a/ios/iosremote/iosremote/Communication/CommandInterpreter.m +++ b/ios/iosremote/iosremote/Communication/CommandInterpreter.m @@ -11,6 +11,8 @@ #import "SlideShow.h" #import "NSString+Base64.h" #import "CommunicationManager.h" +#import "Client.h" +#import "Server.h" @interface CommandInterpreter() @@ -34,8 +36,8 @@ dispatch_queue_t backgroundQueue; } // Received a set of instructions from server. +// Marker equals to the end of the one command - (void) parse:(NSArray*)command{ -// NSLog(@"Command : %@", command); uint marker = 0; if ([command count] == 0) { return; @@ -50,7 +52,9 @@ dispatch_queue_t backgroundQueue; else if ([instruction isEqualToString:STATUS_PAIRING_PAIRED]){ [[NSNotificationCenter defaultCenter] postNotificationName:STATUS_PAIRING_PAIRED object:nil]; - marker = 2; + [[[[CommunicationManager sharedComManager] client] server] setServerVersion:[command objectAtIndex:3]]; + NSLog(@"Connected to %@", [[[CommunicationManager sharedComManager] client] server].description); + marker = 4; } else if([instruction isEqualToString:@"slideshow_started"]){ uint slideLength = [[command objectAtIndex:1] integerValue]; diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.h b/ios/iosremote/iosremote/Communication/CommunicationManager.h index 5c79cd0..b880e14 100644 --- a/ios/iosremote/iosremote/Communication/CommunicationManager.h +++ b/ios/iosremote/iosremote/Communication/CommunicationManager.h @@ -50,6 +50,8 @@ */ #define STATUS_PAIRING_PAIRED @"LO_SERVER_SERVER_PAIRED" +#define STATUS_SERVER_VERSION @"LO_SERVER_INFO" + #define STATUS_CONNECTION_FAILED @"STATUS_CONNECTION_FAILED" diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.m b/ios/iosremote/iosremote/Communication/CommunicationManager.m index 6eb175d..b9a62a5 100644 --- a/ios/iosremote/iosremote/Communication/CommunicationManager.m +++ b/ios/iosremote/iosremote/Communication/CommunicationManager.m @@ -187,7 +187,7 @@ - (void) addServersWithName:(NSString*)name AtAddress:(NSString*)addr { - Server * s = [[Server alloc] initWithProtocol:NETWORK atAddress:addr ofName:name]; + Server * s = [[Server alloc] initWithProtocol:NETWORK atAddress:addr ofName:name ofVersion:@""]; [self.servers addObject:s]; [[NSUserDefaults standardUserDefaults] setObject:[NSKeyedArchiver archivedDataWithRootObject:self.servers] forKey:ExistingServersKey]; [[NSUserDefaults standardUserDefaults] synchronize]; diff --git a/ios/iosremote/iosremote/Communication/Server.h b/ios/iosremote/iosremote/Communication/Server.h index 0e499bd..6680723 100644 --- a/ios/iosremote/iosremote/Communication/Server.h +++ b/ios/iosremote/iosremote/Communication/Server.h @@ -15,11 +15,12 @@ typedef enum protocol {NETWORK} Protocol_t; @property (nonatomic) Protocol_t protocol; @property (nonatomic, strong) NSString* serverName; @property (nonatomic, strong) NSString* serverAddress; +@property (nonatomic, strong) NSString* serverVersion; - (id)initWithProtocol:(Protocol_t)protocal atAddress:(NSString*) address - ofName:(NSString*) name; - + ofName:(NSString*) name + ofVersion:(NSString*) version; @end @interface NSString (IPValidation) diff --git a/ios/iosremote/iosremote/Communication/Server.m b/ios/iosremote/iosremote/Communication/Server.m index 2e2c0a4..86afde1 100644 --- a/ios/iosremote/iosremote/Communication/Server.m +++ b/ios/iosremote/iosremote/Communication/Server.m @@ -19,12 +19,13 @@ @synthesize protocol = _protocol; @synthesize serverName = _serverName; @synthesize serverAddress = _serverAddress; - +@synthesize serverVersion = _serverVersion; - (void)encodeWithCoder:(NSCoder *)coder; { [coder encodeObject:self.serverName forKey:@"name"]; [coder encodeObject:self.serverAddress forKey:@"address"]; + [coder encodeObject:self.serverVersion forKey:@"version"]; [coder encodeInteger:self.protocol forKey:@"protocol"]; } @@ -32,7 +33,8 @@ { self = [self initWithProtocol:[coder decodeIntegerForKey:@"protocol"] atAddress:[coder decodeObjectForKey:@"address"] - ofName:[coder decodeObjectForKey:@"name"]]; + ofName:[coder decodeObjectForKey:@"name"] + ofVersion:[coder decodeObjectForKey:@"version"]]; return self; } @@ -40,16 +42,18 @@ - (id)initWithProtocol:(Protocol_t)protocal atAddress:(NSString*) address ofName:(NSString*) name + ofVersion:(NSString*) version { self = [self init]; self.protocol = protocal; self.serverAddress = address; self.serverName = name; + self.serverVersion = version; return self; } - (NSString *)description{ - return [NSString stringWithFormat:@"Server: Name:%@ Addr:%@", self.serverName, self.serverAddress]; + return [NSString stringWithFormat:@"Server: Name:%@ Addr:%@ Version:%@", self.serverName, self.serverAddress, self.serverVersion]; } @end diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index 3d42e52..848b74f 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> <deployment version="1552" defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/> </dependencies> <scenes> <!--Walk Through Container View Controller--> @@ -121,7 +121,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> - <rect key="frame" x="29" y="419" width="271" height="65"/> + <rect key="frame" x="29" y="418.99999977537431" width="271" height="65"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> @@ -445,7 +445,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="bZq-z2-OKU"> - <rect key="frame" x="3" y="8" width="220" height="167"/> + <rect key="frame" x="3.0000006666692247" y="8" width="220" height="167"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </imageView> @@ -625,7 +625,7 @@ <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="eIY-4P-1sI"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document> \ No newline at end of file diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard index 3d42e52..848b74f 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> <deployment version="1552" defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/> </dependencies> <scenes> <!--Walk Through Container View Controller--> @@ -121,7 +121,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> - <rect key="frame" x="29" y="419" width="271" height="65"/> + <rect key="frame" x="29" y="418.99999977537431" width="271" height="65"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> @@ -445,7 +445,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="bZq-z2-OKU"> - <rect key="frame" x="3" y="8" width="220" height="167"/> + <rect key="frame" x="3.0000006666692247" y="8" width="220" height="167"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </imageView> @@ -625,7 +625,7 @@ <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="eIY-4P-1sI"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document> \ No newline at end of file diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard index b2b2bd7..e849b11 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> <deployment version="1552" defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/> </dependencies> <scenes> <!--Walk Through Container View Controller--> @@ -123,7 +123,7 @@ Contrôle Distant</string> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Veuillez entrer le code ci-dessus dans le fenêtre Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> - <rect key="frame" x="29" y="419" width="271" height="65"/> + <rect key="frame" x="29" y="419.00000022462569" width="271" height="65"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> @@ -447,7 +447,7 @@ Contrôle Distant</string> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="bZq-z2-OKU"> - <rect key="frame" x="3" y="8" width="220" height="167"/> + <rect key="frame" x="2.9999993333307753" y="8" width="220" height="167"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </imageView> @@ -627,7 +627,7 @@ Contrôle Distant</string> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="eIY-4P-1sI"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document> \ No newline at end of file diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard index b2b2bd7..e849b11 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> <deployment version="1552" defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/> </dependencies> <scenes> <!--Walk Through Container View Controller--> @@ -123,7 +123,7 @@ Contrôle Distant</string> <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Veuillez entrer le code ci-dessus dans le fenêtre Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> - <rect key="frame" x="29" y="419" width="271" height="65"/> + <rect key="frame" x="29" y="419.00000022462569" width="271" height="65"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> @@ -447,7 +447,7 @@ Contrôle Distant</string> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="bZq-z2-OKU"> - <rect key="frame" x="3" y="8" width="220" height="167"/> + <rect key="frame" x="2.9999993333307753" y="8" width="220" height="167"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </imageView> @@ -627,7 +627,7 @@ Contrôle Distant</string> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="eIY-4P-1sI"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document> \ No newline at end of file diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard index 262e306..eda008f 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> <deployment version="1552" defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/> </dependencies> <scenes> <!--Walk Through Container View Controller--> @@ -121,7 +121,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="请å°ä»¥ä¸pinç è¾å ¥å°LibreOffice Impress - å¹»ç¯çææ¾ - Impressè¿ç¨ ä¸" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> - <rect key="frame" x="29" y="419" width="271" height="65"/> + <rect key="frame" x="29" y="419.00000022462569" width="271" height="65"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> @@ -445,7 +445,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="bZq-z2-OKU"> - <rect key="frame" x="3" y="8" width="220" height="167"/> + <rect key="frame" x="2.9999993333307753" y="8" width="220" height="167"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </imageView> @@ -625,7 +625,7 @@ <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="eIY-4P-1sI"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document> \ No newline at end of file diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard index 262e306..eda008f 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0"> <dependencies> <deployment version="1552" defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/> </dependencies> <scenes> <!--Walk Through Container View Controller--> @@ -121,7 +121,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="请å°ä»¥ä¸pinç è¾å ¥å°LibreOffice Impress - å¹»ç¯çææ¾ - Impressè¿ç¨ ä¸" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa"> - <rect key="frame" x="29" y="419" width="271" height="65"/> + <rect key="frame" x="29" y="419.00000022462569" width="271" height="65"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/> <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/> @@ -445,7 +445,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="bZq-z2-OKU"> - <rect key="frame" x="3" y="8" width="220" height="167"/> + <rect key="frame" x="2.9999993333307753" y="8" width="220" height="167"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </imageView> @@ -625,7 +625,7 @@ <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="eIY-4P-1sI"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document> \ No newline at end of file diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard index 85a9f92..f07462a 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/> </dependencies> <scenes> <!--About View Controller--> diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard index 85a9f92..f07462a 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8"> <dependencies> <deployment defaultVersion="1280" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/> </dependencies> <scenes> <!--About View Controller-->
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits