[Libreoffice-commits] core.git: 3 commits - ios/.DS_Store ios/iosremote
Siqi LIU
me at siqi.fr
Sun Aug 11 09:48:12 PDT 2013
ios/.DS_Store |binary
ios/iosremote/.DS_Store |binary
ios/iosremote/PopoverView.m | 14
ios/iosremote/PopoverView_Configuration.h | 9
ios/iosremote/UIBarButtonItem+Theme.h | 17
ios/iosremote/UIBarButtonItem+Theme.m | 17
ios/iosremote/en.lproj/iPad_autosize.storyboard | 553 ++++++++
ios/iosremote/fr.lproj/Localizable.strings |binary
ios/iosremote/fr.lproj/iPad_autosize.storyboard | 553 ++++++++
ios/iosremote/iPad_autosize.storyboard | 644 ----------
ios/iosremote/iosremote.xcodeproj/project.pbxproj | 185 +-
ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist | 2
ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcschemes/iosremote.xcscheme | 2
ios/iosremote/iosremote/.DS_Store |binary
ios/iosremote/iosremote/AppDelegate.m | 24
ios/iosremote/iosremote/BasePresentationViewController.m | 4
ios/iosremote/iosremote/Communication/CommunicationManager.m | 25
ios/iosremote/iosremote/Communication/SlideShow.m | 4
ios/iosremote/iosremote/Communication/pinValidation_vc.m | 4
ios/iosremote/iosremote/ControlVariables.h | 11
ios/iosremote/iosremote/LibONavigationController.h | 14
ios/iosremote/iosremote/LibONavigationController.m | 14
ios/iosremote/iosremote/MainSplitViewController.m | 2
ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.h | 3
ios/iosremote/iosremote/UIViewController+LibOStyling.h | 14
ios/iosremote/iosremote/UIViewController+LibOStyling.m | 19
ios/iosremote/iosremote/add.png |binary
ios/iosremote/iosremote/add at 2x.png |binary
ios/iosremote/iosremote/backButton.png |binary
ios/iosremote/iosremote/backButton at 2x.png |binary
ios/iosremote/iosremote/en.lproj/Localizable.strings |binary
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 129 --
ios/iosremote/iosremote/fr.lproj/InfoPlist.strings | 2
ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard | 546 ++++++++
ios/iosremote/iosremote/gear_transparent_bg.png |binary
ios/iosremote/iosremote/gear_transparent_bg at 2x.png |binary
ios/iosremote/iosremote/main.m | 1
ios/iosremote/iosremote/more_icon.png |binary
ios/iosremote/iosremote/more_icon at 2x.png |binary
ios/iosremote/iosremote/newServer_vc.h | 3
ios/iosremote/iosremote/newServer_vc.m | 35
ios/iosremote/iosremote/serverList_vc.m | 26
ios/iosremote/iosremote/slideShowPreviewTable_vc.m | 8
ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m | 2
ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m | 2
ios/iosremote/iosremote/slideShowSwipeInList_ipad.m | 6
ios/iosremote/iosremote/slideShowSwipeInList_iphone.m | 6
ios/iosremote/iosremote/slideShow_vc_iphone.m | 17
ios/iosremote/iosremote/stopWatch.h | 8
ios/iosremote/iosremote/stopWatch.m | 5
ios/iosremote/iosremote/timer_clear_btn.png |binary
ios/iosremote/iosremote/timer_clear_btn at 2x.png |binary
ios/iosremote/iosremote/timer_pause_btn.png |binary
ios/iosremote/iosremote/timer_pause_btn at 2x.png |binary
ios/iosremote/iosremote/timer_resume_btn.png |binary
ios/iosremote/iosremote/timer_resume_btn at 2x.png |binary
ios/iosremote/iosremote/timer_start_btn.png |binary
ios/iosremote/iosremote/timer_start_btn at 2x.png |binary
ios/iosremote/iosremote/zh-Hans.lproj/InfoPlist.strings | 2
ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard | 546 ++++++++
ios/iosremote/zh-Hans.lproj/Localizable.strings |binary
ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard | 553 ++++++++
62 files changed, 3074 insertions(+), 957 deletions(-)
New commits:
commit 19e470370ee5e5dbdfe954f7625fad64f95e2152
Author: Siqi LIU <me at siqi.fr>
Date: Mon Aug 12 00:47:00 2013 +0800
storyboard localization for iOS5/6 with a python script
Change-Id: Ibd0f3dbbf723883afb494814a8ad3247bc1370ce
diff --git a/ios/.DS_Store b/ios/.DS_Store
index 8f456fb..3597628 100644
Binary files a/ios/.DS_Store and b/ios/.DS_Store differ
diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store
index bff21b7..440fd69 100644
Binary files a/ios/iosremote/.DS_Store and b/ios/iosremote/.DS_Store differ
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 fccf9c5..10c0f6c 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 = "397929411.401893"
+ timestampString = "397932312.890248"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "78"
- endingLineNumber = "78"
+ startingLineNumber = "77"
+ endingLineNumber = "77"
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 b061c50..5406480 100644
--- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard
@@ -213,21 +213,21 @@
</state>
</button>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3UQ-XJ-SDP">
- <rect key="frame" x="44" y="48" width="33" height="20.5"/>
+ <rect key="frame" x="44" y="48" width="33" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Minutes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TqG-sM-lAC">
- <rect key="frame" x="97" y="48" width="43" height="20.5"/>
+ <rect key="frame" x="97" y="48" width="43" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Seconds" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6jG-LW-J7Q">
- <rect key="frame" x="152" y="48" width="47" height="20.5"/>
+ <rect key="frame" x="152" y="48" width="47" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard
index b061c50..5406480 100644
--- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard
@@ -213,21 +213,21 @@
</state>
</button>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3UQ-XJ-SDP">
- <rect key="frame" x="44" y="48" width="33" height="20.5"/>
+ <rect key="frame" x="44" y="48" width="33" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Minutes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TqG-sM-lAC">
- <rect key="frame" x="97" y="48" width="43" height="20.5"/>
+ <rect key="frame" x="97" y="48" width="43" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Seconds" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6jG-LW-J7Q">
- <rect key="frame" x="152" y="48" width="47" height="20.5"/>
+ <rect key="frame" x="152" y="48" width="47" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
commit 6ac55a6c0ec2d12d3e03f66dca77d17db7657b1f
Author: Siqi LIU <me at siqi.fr>
Date: Mon Aug 12 00:38:22 2013 +0800
localization for literal strings
Change-Id: I0fcafd5e29f6f5c75118bc6eda0ecae33cc1f6e3
diff --git a/ios/.DS_Store b/ios/.DS_Store
index 6ebde5e..8f456fb 100644
Binary files a/ios/.DS_Store and b/ios/.DS_Store differ
diff --git a/ios/iosremote/UIBarButtonItem+Theme.h b/ios/iosremote/UIBarButtonItem+Theme.h
index 5fa5b74..70935f9 100644
--- a/ios/iosremote/UIBarButtonItem+Theme.h
+++ b/ios/iosremote/UIBarButtonItem+Theme.h
@@ -1,12 +1,11 @@
-//
-// UIBarButtonItem+Theme.h
-// VLC for iOS
-//
-// Created by Romain Goyet on 14/06/13.
-// Copyright (c) 2013 Applidium. All rights reserved.
-//
-// Refer to the COPYING file of the official project for license.
-//
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
#import <UIKit/UIKit.h>
diff --git a/ios/iosremote/UIBarButtonItem+Theme.m b/ios/iosremote/UIBarButtonItem+Theme.m
index 4f125fc..ccc6415 100644
--- a/ios/iosremote/UIBarButtonItem+Theme.m
+++ b/ios/iosremote/UIBarButtonItem+Theme.m
@@ -1,12 +1,11 @@
-//
-// UIBarButtonItem+Theme.m
-// VLC for iOS
-//
-// Created by Romain Goyet on 14/06/13.
-// Copyright (c) 2013 Applidium. All rights reserved.
-//
-// Refer to the COPYING file of the official project for license.
-//
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
#import "UIBarButtonItem+Theme.h"
diff --git a/ios/iosremote/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard
similarity index 88%
copy from ios/iosremote/iPad_autosize.storyboard
copy to ios/iosremote/en.lproj/iPad_autosize.storyboard
index 1c261b3..fae43a0 100644
--- a/ios/iosremote/iPad_autosize.storyboard
+++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8">
<dependencies>
+ <deployment defaultVersion="1552" identifier="iOS"/>
<development version="4600" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
@@ -17,7 +18,7 @@
<rect key="frame" x="0.0" y="54" width="540" height="46"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="1" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="46"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY">
@@ -121,7 +122,7 @@
<rect key="frame" x="0.0" y="30" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="1" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -130,7 +131,7 @@
<rect key="frame" x="0.0" y="75" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="0.0" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -168,7 +169,7 @@
<rect key="frame" x="0.0" y="0.0" width="540" height="281"/>
<subviews>
<view contentMode="scaleToFill" id="Is1-dX-SaP">
- <rect key="frame" x="36" y="52.999999999999986" width="468" height="208.00000000000003"/>
+ <rect key="frame" x="36" y="53" width="468" height="208"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5">
@@ -191,7 +192,7 @@
<rect key="frame" x="0.0" y="291" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="1" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -200,7 +201,7 @@
<rect key="frame" x="0.0" y="336" width="540" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="0.0" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -209,7 +210,7 @@
<rect key="frame" x="0.0" y="380" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="0.0" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -316,7 +317,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<tableView contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Iok-mu-c0T" customClass="HorizontalTableView">
- <rect key="frame" x="-488" y="-333" width="0.0" height="0.0"/>
+ <rect key="frame" x="-641" y="-181" width="0.0" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<connections>
@@ -477,10 +478,10 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde">
- <rect key="frame" x="44" y="6" width="233" height="163"/>
+ <rect key="frame" x="44" y="5" width="233" height="163"/>
</imageView>
<label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7">
- <rect key="frame" x="-605" y="154" width="29" height="21"/>
+ <rect key="frame" x="-605" y="152" width="29" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration">
@@ -538,90 +539,9 @@
<image name="nextButton_pressed.png" width="42" height="230"/>
<image name="previousButton_normal.png" width="42" height="230"/>
<image name="previousButton_pressed.png" width="42" height="230"/>
- <image name="timer_clear_btn.png" width="74" height="74"/>
- <image name="timer_start_btn.png" width="74" height="74"/>
+ <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/Localizable.strings b/ios/iosremote/fr.lproj/Localizable.strings
new file mode 100644
index 0000000..510012a
Binary files /dev/null and b/ios/iosremote/fr.lproj/Localizable.strings differ
diff --git a/ios/iosremote/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard
similarity index 88%
copy from ios/iosremote/iPad_autosize.storyboard
copy to ios/iosremote/fr.lproj/iPad_autosize.storyboard
index 1c261b3..fae43a0 100644
--- a/ios/iosremote/iPad_autosize.storyboard
+++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="XiK-Ye-iB8">
<dependencies>
+ <deployment defaultVersion="1552" identifier="iOS"/>
<development version="4600" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
@@ -17,7 +18,7 @@
<rect key="frame" x="0.0" y="54" width="540" height="46"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="1" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="46"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h0a-Zq-2vY">
@@ -121,7 +122,7 @@
<rect key="frame" x="0.0" y="30" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="1" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -130,7 +131,7 @@
<rect key="frame" x="0.0" y="75" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="0.0" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -168,7 +169,7 @@
<rect key="frame" x="0.0" y="0.0" width="540" height="281"/>
<subviews>
<view contentMode="scaleToFill" id="Is1-dX-SaP">
- <rect key="frame" x="36" y="52.999999999999986" width="468" height="208.00000000000003"/>
+ <rect key="frame" x="36" y="53" width="468" height="208"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5">
@@ -191,7 +192,7 @@
<rect key="frame" x="0.0" y="291" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="1" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -200,7 +201,7 @@
<rect key="frame" x="0.0" y="336" width="540" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="0.0" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -209,7 +210,7 @@
<rect key="frame" x="0.0" y="380" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="31" y="0.0" width="478" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="540" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -316,7 +317,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<tableView contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Iok-mu-c0T" customClass="HorizontalTableView">
- <rect key="frame" x="-488" y="-333" width="0.0" height="0.0"/>
+ <rect key="frame" x="-641" y="-181" width="0.0" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<connections>
@@ -477,10 +478,10 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default.png" id="dn1-99-Dde">
- <rect key="frame" x="44" y="6" width="233" height="163"/>
+ <rect key="frame" x="44" y="5" width="233" height="163"/>
</imageView>
<label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="qrH-bi-qw7">
- <rect key="frame" x="-605" y="154" width="29" height="21"/>
+ <rect key="frame" x="-605" y="152" width="29" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration">
@@ -538,90 +539,9 @@
<image name="nextButton_pressed.png" width="42" height="230"/>
<image name="previousButton_normal.png" width="42" height="230"/>
<image name="previousButton_pressed.png" width="42" height="230"/>
- <image name="timer_clear_btn.png" width="74" height="74"/>
- <image name="timer_start_btn.png" width="74" height="74"/>
+ <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 a11fc1b..4825686 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -52,6 +52,8 @@
57FE71E31785C61400B50125 /* pinValidation_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 57FE71E21785C61400B50125 /* pinValidation_vc.m */; };
57FE71E917861A9000B50125 /* slideShowPreviewTable_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 57FE71E817861A9000B50125 /* slideShowPreviewTable_vc.m */; };
8C0323AB17A943720037432E /* UIImageView+setImageAnimated.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */; };
+ 8C06B31D17B7EC83002F5CF8 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8C06B31B17B7EC83002F5CF8 /* Localizable.strings */; };
+ 8C06B31E17B7ED1E002F5CF8 /* iPad_autosize.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8C06B32017B7ED1E002F5CF8 /* iPad_autosize.storyboard */; };
8C0DC83A17A4177C0099E5AE /* nextButton_pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */; };
8C0DC83B17A4177C0099E5AE /* nextButton_pressed at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83717A4177C0099E5AE /* nextButton_pressed at 2x.png */; };
8C0DC83C17A4177C0099E5AE /* previousButton_pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */; };
@@ -102,7 +104,6 @@
8CAD659C17A3EFE700CFB661 /* arrow_right.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659817A3EFE700CFB661 /* arrow_right.png */; };
8CAD659D17A3EFE700CFB661 /* arrow_right at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659917A3EFE700CFB661 /* arrow_right at 2x.png */; };
8CAD65A017A3F76300CFB661 /* slideShowSwipeInList_ipad.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */; };
- 8CCA024917A2909B0051EA53 /* iPad_autosize.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8CCA024817A2909B0051EA53 /* iPad_autosize.storyboard */; };
BE9EBD071765BF0800283FD2 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE9EBD061765BF0800283FD2 /* CoreImage.framework */; };
/* End PBXBuildFile section */
@@ -174,6 +175,16 @@
57FE71E817861A9000B50125 /* slideShowPreviewTable_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = slideShowPreviewTable_vc.m; sourceTree = "<group>"; };
8C0323A917A943720037432E /* UIImageView+setImageAnimated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImageView+setImageAnimated.h"; path = "iosremote/UIImageView+setImageAnimated.h"; sourceTree = "<group>"; };
8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImageView+setImageAnimated.m"; path = "iosremote/UIImageView+setImageAnimated.m"; sourceTree = "<group>"; };
+ 8C06B31C17B7EC83002F5CF8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = iosremote/en.lproj/Localizable.strings; sourceTree = "<group>"; };
+ 8C06B31F17B7ED1E002F5CF8 /* en */ = {isa = PBXFileReference; lastKnownFileType = file; name = en; path = en.lproj/iPad_autosize.storyboard; sourceTree = "<group>"; };
+ 8C06B32117B7ED2A002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = fr; path = fr.lproj/iPhone_autoSize.storyboard; sourceTree = "<group>"; };
+ 8C06B32217B7ED2A002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file; name = fr; path = fr.lproj/iPad_autosize.storyboard; sourceTree = "<group>"; };
+ 8C06B32317B7ED2B002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
+ 8C06B32417B7ED2B002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ 8C06B32517B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "zh-Hans"; path = "zh-Hans.lproj/iPhone_autoSize.storyboard"; sourceTree = "<group>"; };
+ 8C06B32617B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file; name = "zh-Hans"; path = "zh-Hans.lproj/iPad_autosize.storyboard"; sourceTree = "<group>"; };
+ 8C06B32717B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
+ 8C06B32817B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nextButton_pressed.png; sourceTree = "<group>"; };
8C0DC83717A4177C0099E5AE /* nextButton_pressed at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nextButton_pressed at 2x.png"; sourceTree = "<group>"; };
8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = previousButton_pressed.png; sourceTree = "<group>"; };
@@ -195,8 +206,6 @@
8C19F42617B04E7C005BDB61 /* navBarBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = navBarBackground.png; sourceTree = "<group>"; };
8C19F42917B04EC6005BDB61 /* UINavigationController+Theme.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationController+Theme.h"; sourceTree = "<group>"; };
8C19F42A17B04EC6005BDB61 /* UINavigationController+Theme.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+Theme.m"; sourceTree = "<group>"; };
- 8C19F42B17B04EC6005BDB61 /* UIBarButtonItem+Theme.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIBarButtonItem+Theme.h"; sourceTree = "<group>"; };
- 8C19F42C17B04EC6005BDB61 /* UIBarButtonItem+Theme.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIBarButtonItem+Theme.m"; sourceTree = "<group>"; };
8C19F42D17B05089005BDB61 /* LibONavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibONavigationController.h; path = iosremote/LibONavigationController.h; sourceTree = "<group>"; };
8C19F42E17B05089005BDB61 /* LibONavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LibONavigationController.m; path = iosremote/LibONavigationController.m; sourceTree = "<group>"; };
8C19F43217B056B3005BDB61 /* navBarButtonNormal at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "navBarButtonNormal at 2x.png"; path = "iosremote/navBarButtonNormal at 2x.png"; sourceTree = "<group>"; };
@@ -248,7 +257,6 @@
8CAD659917A3EFE700CFB661 /* arrow_right at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrow_right at 2x.png"; path = "iosremote/arrow_right at 2x.png"; sourceTree = "<group>"; };
8CAD659E17A3F76300CFB661 /* slideShowSwipeInList_ipad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slideShowSwipeInList_ipad.h; path = iosremote/slideShowSwipeInList_ipad.h; sourceTree = "<group>"; };
8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = slideShowSwipeInList_ipad.m; path = iosremote/slideShowSwipeInList_ipad.m; sourceTree = "<group>"; };
- 8CCA024817A2909B0051EA53 /* iPad_autosize.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = iPad_autosize.storyboard; sourceTree = "<group>"; };
BE9EBD061765BF0800283FD2 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
@@ -307,51 +315,8 @@
57AEEDAA1788D7B2007F4F97 /* Ressources */ = {
isa = PBXGroup;
children = (
- 8C19F44C17B20426005BDB61 /* add at 2x.png */,
- 8C19F44817B1FEFD005BDB61 /* gear_transparent_bg.png */,
- 8C19F44917B1FEFE005BDB61 /* gear_transparent_bg at 2x.png */,
- 8C19F44317B1F21B005BDB61 /* gear_pressed.png */,
- 8C19F44417B1F21B005BDB61 /* gear_pressed at 2x.png */,
- 8C19F43F17B1E961005BDB61 /* gear.png */,
- 8C19F44017B1E961005BDB61 /* gear at 2x.png */,
- 8C19F43C17B1D935005BDB61 /* add.png */,
- 8C19F43717B145AD005BDB61 /* backButton.png */,
- 8C19F43817B145AD005BDB61 /* backButton at 2x.png */,
- 8C19F43217B056B3005BDB61 /* navBarButtonNormal at 2x.png */,
- 8C19F42517B04E7C005BDB61 /* navBarBackground at 2x.png */,
- 8C19F42617B04E7C005BDB61 /* navBarBackground.png */,
- 8C26E5D117A5AFE8007DA4B7 /* slideshowRail.png */,
- 8C26E5D217A5AFE8007DA4B7 /* slideshowRail at 2x.png */,
- 8C0DC84617A45B160099E5AE /* libO_icon.png */,
- 8C0DC83E17A4185A0099E5AE /* nextButton_normal.png */,
- 8C0DC83F17A4185A0099E5AE /* nextButton_normal at 2x.png */,
- 8C0DC84017A4185A0099E5AE /* previousButton_normal.png */,
- 8C0DC84117A4185A0099E5AE /* previousButton_normal at 2x.png */,
- 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */,
- 8C0DC83717A4177C0099E5AE /* nextButton_pressed at 2x.png */,
- 8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */,
- 8C0DC83917A4177C0099E5AE /* previousButton_pressed at 2x.png */,
- 8CAD659617A3EFE700CFB661 /* arrow_left.png */,
- 8CAD659717A3EFE700CFB661 /* arrow_left at 2x.png */,
- 8CAD659817A3EFE700CFB661 /* arrow_right.png */,
- 8CAD659917A3EFE700CFB661 /* arrow_right at 2x.png */,
- 8C1A170017A2854300B4BB3C /* iosremote_ipad_icon at 2x.png */,
- 8C1A16FE17A2853F00B4BB3C /* iosremote_ipad_icon.png */,
- 8C1A16FC17A2853700B4BB3C /* iosremote_iphone_icon.png */,
- 8C1A16FA17A2853100B4BB3C /* iosremote_iphone_icon at 2x.png */,
- 57CC48C4178B42A400075DE4 /* timer_pause_btn.png */,
- 57CC48C5178B42A400075DE4 /* timer_resume_btn.png */,
- 571BFAD0178AADA200EF1BDB /* more_icon.png */,
- 57AEEDB417899BB4007F4F97 /* slide_finished.png */,
- 57AEEDB017895BF5007F4F97 /* pointer_pushed.png */,
- 57AEEDAE17895B67007F4F97 /* pointer.png */,
- 57867A581787510700EBBE52 /* pushed_next_button.png */,
- 57867A591787510700EBBE52 /* released_next_button.png */,
- 57867A5C178752CD00EBBE52 /* pushed_previous_button.png */,
- 57867A5D178752CD00EBBE52 /* released_previous_button.png */,
- 57867A531787172A00EBBE52 /* impress.jpeg */,
- 571D4805178B2F080063D93B /* timer_clear_btn.png */,
- 571D4806178B2F080063D93B /* timer_start_btn.png */,
+ 8C06B31A17B7EC6C002F5CF8 /* localizations */,
+ 8C06B31917B7EC62002F5CF8 /* assets */,
);
name = Ressources;
sourceTree = "<group>";
@@ -415,6 +380,66 @@
path = iosremote;
sourceTree = "<group>";
};
+ 8C06B31917B7EC62002F5CF8 /* assets */ = {
+ isa = PBXGroup;
+ children = (
+ 8C19F44C17B20426005BDB61 /* add at 2x.png */,
+ 8C19F44817B1FEFD005BDB61 /* gear_transparent_bg.png */,
+ 8C19F44917B1FEFE005BDB61 /* gear_transparent_bg at 2x.png */,
+ 8C19F44317B1F21B005BDB61 /* gear_pressed.png */,
+ 8C19F44417B1F21B005BDB61 /* gear_pressed at 2x.png */,
+ 8C19F43F17B1E961005BDB61 /* gear.png */,
+ 8C19F44017B1E961005BDB61 /* gear at 2x.png */,
+ 8C19F43C17B1D935005BDB61 /* add.png */,
+ 8C19F43717B145AD005BDB61 /* backButton.png */,
+ 8C19F43817B145AD005BDB61 /* backButton at 2x.png */,
+ 8C19F43217B056B3005BDB61 /* navBarButtonNormal at 2x.png */,
+ 8C19F42517B04E7C005BDB61 /* navBarBackground at 2x.png */,
+ 8C19F42617B04E7C005BDB61 /* navBarBackground.png */,
+ 8C26E5D117A5AFE8007DA4B7 /* slideshowRail.png */,
+ 8C26E5D217A5AFE8007DA4B7 /* slideshowRail at 2x.png */,
+ 8C0DC84617A45B160099E5AE /* libO_icon.png */,
+ 8C0DC83E17A4185A0099E5AE /* nextButton_normal.png */,
+ 8C0DC83F17A4185A0099E5AE /* nextButton_normal at 2x.png */,
+ 8C0DC84017A4185A0099E5AE /* previousButton_normal.png */,
+ 8C0DC84117A4185A0099E5AE /* previousButton_normal at 2x.png */,
+ 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */,
+ 8C0DC83717A4177C0099E5AE /* nextButton_pressed at 2x.png */,
+ 8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */,
+ 8C0DC83917A4177C0099E5AE /* previousButton_pressed at 2x.png */,
+ 8CAD659617A3EFE700CFB661 /* arrow_left.png */,
+ 8CAD659717A3EFE700CFB661 /* arrow_left at 2x.png */,
+ 8CAD659817A3EFE700CFB661 /* arrow_right.png */,
+ 8CAD659917A3EFE700CFB661 /* arrow_right at 2x.png */,
+ 8C1A170017A2854300B4BB3C /* iosremote_ipad_icon at 2x.png */,
+ 8C1A16FE17A2853F00B4BB3C /* iosremote_ipad_icon.png */,
+ 8C1A16FC17A2853700B4BB3C /* iosremote_iphone_icon.png */,
+ 8C1A16FA17A2853100B4BB3C /* iosremote_iphone_icon at 2x.png */,
+ 57CC48C4178B42A400075DE4 /* timer_pause_btn.png */,
+ 57CC48C5178B42A400075DE4 /* timer_resume_btn.png */,
+ 571BFAD0178AADA200EF1BDB /* more_icon.png */,
+ 57AEEDB417899BB4007F4F97 /* slide_finished.png */,
+ 57AEEDB017895BF5007F4F97 /* pointer_pushed.png */,
+ 57AEEDAE17895B67007F4F97 /* pointer.png */,
+ 57867A581787510700EBBE52 /* pushed_next_button.png */,
+ 57867A591787510700EBBE52 /* released_next_button.png */,
+ 57867A5C178752CD00EBBE52 /* pushed_previous_button.png */,
+ 57867A5D178752CD00EBBE52 /* released_previous_button.png */,
+ 57867A531787172A00EBBE52 /* impress.jpeg */,
+ 571D4805178B2F080063D93B /* timer_clear_btn.png */,
+ 571D4806178B2F080063D93B /* timer_start_btn.png */,
+ );
+ name = assets;
+ sourceTree = "<group>";
+ };
+ 8C06B31A17B7EC6C002F5CF8 /* localizations */ = {
+ isa = PBXGroup;
+ children = (
+ 8C06B31B17B7EC83002F5CF8 /* Localizable.strings */,
+ );
+ name = localizations;
+ sourceTree = "<group>";
+ };
8C0DC84E17A511C60099E5AE /* Application */ = {
isa = PBXGroup;
children = (
@@ -492,8 +517,6 @@
8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */,
8C19F42917B04EC6005BDB61 /* UINavigationController+Theme.h */,
8C19F42A17B04EC6005BDB61 /* UINavigationController+Theme.m */,
- 8C19F42B17B04EC6005BDB61 /* UIBarButtonItem+Theme.h */,
- 8C19F42C17B04EC6005BDB61 /* UIBarButtonItem+Theme.m */,
8C19F42D17B05089005BDB61 /* LibONavigationController.h */,
8C19F42E17B05089005BDB61 /* LibONavigationController.m */,
8C19F43417B10D48005BDB61 /* UIViewController+LibOStyling.h */,
@@ -528,7 +551,7 @@
children = (
8C0DC84E17A511C60099E5AE /* Application */,
8CAD658217A2E81F00CFB661 /* Controllers */,
- 8CCA024817A2909B0051EA53 /* iPad_autosize.storyboard */,
+ 8C06B32017B7ED1E002F5CF8 /* iPad_autosize.storyboard */,
);
name = iPad;
sourceTree = "<group>";
@@ -595,6 +618,7 @@
57C6E3EB175E06E800E8BC5F /* Sources */,
57C6E3EC175E06E800E8BC5F /* Frameworks */,
57C6E3ED175E06E800E8BC5F /* Resources */,
+ 8C06B32917B7F1C0002F5CF8 /* ShellScript */,
);
buildRules = (
);
@@ -621,6 +645,8 @@
hasScannedForEncodings = 0;
knownRegions = (
en,
+ fr,
+ "zh-Hans",
);
mainGroup = 57C6E3E6175E06E800E8BC5F;
productRefGroup = 57C6E3F0175E06E800E8BC5F /* Products */;
@@ -660,7 +686,7 @@
8C1A16FD17A2853700B4BB3C /* iosremote_iphone_icon.png in Resources */,
8C1A16FF17A2853F00B4BB3C /* iosremote_ipad_icon.png in Resources */,
8C1A170117A2854300B4BB3C /* iosremote_ipad_icon at 2x.png in Resources */,
- 8CCA024917A2909B0051EA53 /* iPad_autosize.storyboard in Resources */,
+ 8C06B31E17B7ED1E002F5CF8 /* iPad_autosize.storyboard in Resources */,
8CAD659A17A3EFE700CFB661 /* arrow_left.png in Resources */,
8CAD659B17A3EFE700CFB661 /* arrow_left at 2x.png in Resources */,
8CAD659C17A3EFE700CFB661 /* arrow_right.png in Resources */,
@@ -691,11 +717,28 @@
8C19F44A17B1FEFE005BDB61 /* gear_transparent_bg.png in Resources */,
8C19F44B17B1FEFE005BDB61 /* gear_transparent_bg at 2x.png in Resources */,
8C19F44D17B20427005BDB61 /* add at 2x.png in Resources */,
+ 8C06B31D17B7EC83002F5CF8 /* Localizable.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
+/* Begin PBXShellScriptBuildPhase section */
+ 8C06B32917B7F1C0002F5CF8 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "python /Users/me/Documents/Coding/libreoffice/core/ios/iosremote/localize.py --mainIdiom=en --mainStoryboard=/Users/me/Documents/Coding/libreoffice/core/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard fr zh-Hans\n\npython /Users/me/Documents/Coding/libreoffice/core/ios/iosremote/localize.py --mainIdiom=en --mainStoryboard=/Users/me/Documents/Coding/libreoffice/core/ios/iosremote/en.lproj/iPad_autosize.storyboard fr zh-Hans";
+ };
+/* End PBXShellScriptBuildPhase section */
+
/* Begin PBXSourcesBuildPhase section */
57C6E3EB175E06E800E8BC5F /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -745,6 +788,8 @@
isa = PBXVariantGroup;
children = (
57C6E3FC175E06E800E8BC5F /* en */,
+ 8C06B32417B7ED2B002F5CF8 /* fr */,
+ 8C06B32817B7ED33002F5CF8 /* zh-Hans */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
@@ -753,11 +798,33 @@
isa = PBXVariantGroup;
children = (
57DF0A84178FFFAB008B2D3D /* en */,
+ 8C06B32117B7ED2A002F5CF8 /* fr */,
+ 8C06B32517B7ED33002F5CF8 /* zh-Hans */,
);
name = iPhone_autosize.storyboard;
path = iosremote;
sourceTree = "<group>";
};
+ 8C06B31B17B7EC83002F5CF8 /* Localizable.strings */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 8C06B31C17B7EC83002F5CF8 /* en */,
+ 8C06B32317B7ED2B002F5CF8 /* fr */,
+ 8C06B32717B7ED33002F5CF8 /* zh-Hans */,
+ );
+ name = Localizable.strings;
+ sourceTree = "<group>";
+ };
+ 8C06B32017B7ED1E002F5CF8 /* iPad_autosize.storyboard */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 8C06B31F17B7ED1E002F5CF8 /* en */,
+ 8C06B32217B7ED2A002F5CF8 /* fr */,
+ 8C06B32617B7ED33002F5CF8 /* zh-Hans */,
+ );
+ name = iPad_autosize.storyboard;
+ sourceTree = "<group>";
+ };
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
@@ -787,7 +854,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 5.1;
ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
@@ -814,7 +881,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 5.1;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
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 bbe3fd7..fccf9c5 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 = "397412570.155324"
+ timestampString = "397929411.401893"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "77"
- endingLineNumber = "77"
+ startingLineNumber = "78"
+ endingLineNumber = "78"
landmarkName = "-connectionStatusHandler:"
landmarkType = "5">
</FileBreakpoint>
diff --git a/ios/iosremote/iosremote/BasePresentationViewController.m b/ios/iosremote/iosremote/BasePresentationViewController.m
index 186e0e5..3227080 100644
--- a/ios/iosremote/iosremote/BasePresentationViewController.m
+++ b/ios/iosremote/iosremote/BasePresentationViewController.m
@@ -471,11 +471,11 @@ static BOOL isBlank = NO;
- (IBAction)popOverUp:(id)sender {
if (!isBlank) {
[PopoverView showPopoverAtPoint:self.gearButton.frame.origin inView:self.view withStringArray:
- [NSArray arrayWithObjects:@"Stop Presentation", @"Restart", @"Blank Screen", nil]
+ [NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", @"Popover option"), NSLocalizedString(@"Restart", @"Popover option"), NSLocalizedString(@"Blank Screen", @"Popover option"), nil]
delegate:self];
} else {
[PopoverView showPopoverAtPoint:self.gearButton.frame.origin inView:self.view withStringArray:
- [NSArray arrayWithObjects:@"Stop Presentation", @"Restart", @"Resume from blank Screen", nil]
+ [NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", @"Popover option"), NSLocalizedString(@"Restart", @"Popover option"), NSLocalizedString(@"Resume from blank Screen", @"Popover option"), nil]
delegate:self];
}
[UIView animateWithDuration:0.24 animations:^{
diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.m b/ios/iosremote/iosremote/Communication/CommunicationManager.m
index d0cbe52..cfa4a39 100644
--- a/ios/iosremote/iosremote/Communication/CommunicationManager.m
+++ b/ios/iosremote/iosremote/Communication/CommunicationManager.m
@@ -64,11 +64,11 @@
self.state = DISCONNECTED;
if ([self.delegate isKindOfClass:[server_list_vc class]]){
dispatch_async(dispatch_get_main_queue(), ^{
- UIAlertView *message = [[UIAlertView alloc] initWithTitle:@"Failed to reach server"
- message:@"Please verify your IP address and make sure that LibreOffice Impress is running with impress remote feature enabled. "
+ UIAlertView *message = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Failed to reach server", @"Connection failure title")
+ message:NSLocalizedString(@"Failed to reach server Msg", @"Connection failure message")
delegate:self
- cancelButtonTitle:@"OK"
- otherButtonTitles:@"Help", nil];
+ cancelButtonTitle:NSLocalizedString(@"OK", nil)
+ otherButtonTitles:NSLocalizedString(@"Help", nil), nil];
[message show];
});
} else {
@@ -76,10 +76,11 @@
BasePresentationViewController *bpvc = [[(MainSplitViewController *)[self.delegate presentingViewController] viewControllers] objectAtIndex:1];
[bpvc didReceiveDisconnection];
dispatch_async(dispatch_get_main_queue(), ^{
- UIAlertView *message = [[UIAlertView alloc] initWithTitle:@"Connection Lost"
- message:@"Oups, connection lost...Please try to reconnect to your computer. "
+ UIAlertView *message = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Connection Lost", @"Connection Lost Alert title")
+ message:NSLocalizedString(@"Connection Lost Msg", @"Connection Lost Alert Msg")
+ //@"Oups, connection lost...Please try to reconnect to your computer. "
delegate:nil
- cancelButtonTitle:@"OK"
+ cancelButtonTitle:NSLocalizedString(@"OK", nil)
otherButtonTitles:nil];
[message show];
});
@@ -93,14 +94,10 @@
[alertView dismissWithClickedButtonIndex:0 animated:YES];
}else if (buttonIndex == 1){
[alertView dismissWithClickedButtonIndex:0 animated:YES];
- UIAlertView *message = [[UIAlertView alloc] initWithTitle:@"Pairing instructions"
- message:@"1. Launch your LibreOffice Impress on your Computer\n\n"
- @"2. Enable Preferences - LibreOffice Impress - General - Enable remote control\n\n"
- @"3. Enable Preferences - LibreOffice Impress - Advanced - Enable Experimental Features\n\n"
- @"4. Make sure your Computer and your device are connected to the same WiFi network and Enter your Computer's IP address\n\n"
- @"5. Connect and Enjoy!\n\n"
+ UIAlertView *message = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Pairing Instructions", @"Pairing instructions Alert Title")
+ message:NSLocalizedString(@"Pairing Instructions Msg", nil)
delegate:nil
- cancelButtonTitle:@"OK"
+ cancelButtonTitle:NSLocalizedString(@"OK", nil)
otherButtonTitles:nil];
[message show];
}
diff --git a/ios/iosremote/iosremote/Communication/SlideShow.m b/ios/iosremote/iosremote/Communication/SlideShow.m
index 6cff90c..988af3a 100644
--- a/ios/iosremote/iosremote/Communication/SlideShow.m
+++ b/ios/iosremote/iosremote/Communication/SlideShow.m
@@ -159,11 +159,11 @@ NSString *sTitle;
if (index >= self.size)
{
if ([view isKindOfClass:[UIImageView class]])
- [(UIImageView* )view setImage:[UIImage imageNamed:@"slide_finished.png"]];
+ [(UIImageView* )view setImage:[UIImage imageNamed:@"slide_finished"]];
else if ([view isKindOfClass:[UITableViewCell class]])
{
UIImageView *image = (UIImageView *)[view viewWithTag:1];
- [image setImage:[UIImage imageNamed:@"slide_finished.png"]];
+ [image setImage:[UIImage imageNamed:@"slide_finished"]];
}
else if ([view isKindOfClass:[UIWebView class]])
[(UIWebView* )view loadHTMLString: @"SlideShow finished" baseURL:nil];
diff --git a/ios/iosremote/iosremote/Communication/pinValidation_vc.m b/ios/iosremote/iosremote/Communication/pinValidation_vc.m
index efbec7b..157230a 100644
--- a/ios/iosremote/iosremote/Communication/pinValidation_vc.m
+++ b/ios/iosremote/iosremote/Communication/pinValidation_vc.m
@@ -39,7 +39,7 @@
self.comManager = [CommunicationManager sharedComManager];
[self.pinLabel setText:[NSString stringWithFormat:@"%@", [self.comManager getPairingPin]]];
- UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:@"Connect" style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)];
+ UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Connect", @"Back button to the connect page on navbar") style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)];
[backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
self.navigationItem.leftBarButtonItem = backButton;
}
diff --git a/ios/iosremote/iosremote/LibONavigationController.h b/ios/iosremote/iosremote/LibONavigationController.h
index 4e940f4..499f9fc 100644
--- a/ios/iosremote/iosremote/LibONavigationController.h
+++ b/ios/iosremote/iosremote/LibONavigationController.h
@@ -1,10 +1,10 @@
-//
-// LibONavigationController.h
-// iosremote
-//
-// Created by Siqi Liu on 8/5/13.
-// Copyright (c) 2013 libreoffice. All rights reserved.
-//
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
#import <UIKit/UIKit.h>
diff --git a/ios/iosremote/iosremote/LibONavigationController.m b/ios/iosremote/iosremote/LibONavigationController.m
index efe2929..d3bda44 100644
--- a/ios/iosremote/iosremote/LibONavigationController.m
+++ b/ios/iosremote/iosremote/LibONavigationController.m
@@ -1,10 +1,10 @@
-//
-// LibONavigationController.m
-// iosremote
-//
-// Created by Siqi Liu on 8/5/13.
-// Copyright (c) 2013 libreoffice. All rights reserved.
-//
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
#import "LibONavigationController.h"
#import "UINavigationController+Theme.h"
diff --git a/ios/iosremote/iosremote/UIViewController+LibOStyling.h b/ios/iosremote/iosremote/UIViewController+LibOStyling.h
index dbd8dc1..cfd3d58 100644
--- a/ios/iosremote/iosremote/UIViewController+LibOStyling.h
+++ b/ios/iosremote/iosremote/UIViewController+LibOStyling.h
@@ -1,10 +1,10 @@
-//
-// UIViewController+LibOStyling.h
-// iosremote
-//
-// Created by Siqi Liu on 8/6/13.
-// Copyright (c) 2013 libreoffice. All rights reserved.
-//
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
#import <UIKit/UIKit.h>
diff --git a/ios/iosremote/iosremote/UIViewController+LibOStyling.m b/ios/iosremote/iosremote/UIViewController+LibOStyling.m
index 26c0e51..272f726 100644
--- a/ios/iosremote/iosremote/UIViewController+LibOStyling.m
+++ b/ios/iosremote/iosremote/UIViewController+LibOStyling.m
@@ -1,10 +1,10 @@
-//
-// UIViewController+LibOStyling.m
-// iosremote
-//
-// Created by Siqi Liu on 8/6/13.
-// Copyright (c) 2013 libreoffice. All rights reserved.
-//
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
#import "UIViewController+LibOStyling.h"
#import "ControlVariables.h"
diff --git a/ios/iosremote/iosremote/en.lproj/Localizable.strings b/ios/iosremote/iosremote/en.lproj/Localizable.strings
new file mode 100644
index 0000000..8495ebe
Binary files /dev/null and b/ios/iosremote/iosremote/en.lproj/Localizable.strings differ
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index b0ef430..b061c50 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0">
<dependencies>
- <deployment defaultVersion="1552" identifier="iOS"/>
<development version="4600" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
@@ -18,7 +17,7 @@
<rect key="frame" x="0.0" y="46" width="320" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="10" y="1" width="300" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rg3-PU-OuS">
@@ -115,7 +114,7 @@
<rect key="frame" x="0.0" y="10" width="320" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="10" y="1" width="300" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -124,7 +123,7 @@
<rect key="frame" x="0.0" y="55" width="320" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="10" y="0.0" width="300" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -183,14 +182,14 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="left" text="00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JsJ-ic-uyC">
- <rect key="frame" x="11" y="0.0" width="220" height="59.5"/>
+ <rect key="frame" x="11" y="0.0" width="220" height="59"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="39"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Fmn-lt-vBn">
- <rect key="frame" x="61" y="76" width="44" height="44"/>
+ <rect key="frame" x="61" y="75" width="44" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" image="timer_start_btn.png">
@@ -202,7 +201,7 @@
</state>
</button>
<button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4">
- <rect key="frame" x="130" y="76" width="44" height="44"/>
+ <rect key="frame" x="130" y="75" width="44" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" image="timer_clear_btn.png">
@@ -247,10 +246,10 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h.png" id="del-Hz-TZI">
- <rect key="frame" x="31" y="4.5" width="182" height="122"/>
+ <rect key="frame" x="31" y="4" width="182" height="122"/>
</imageView>
<label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF">
- <rect key="frame" x="184" y="105" width="29" height="21"/>
+ <rect key="frame" x="184" y="104" width="29" height="21"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration">
<accessibilityTraits key="traits" none="YES" selected="YES" staticText="YES"/>
@@ -290,7 +289,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="bZq-z2-OKU">
- <rect key="frame" x="3" y="8" width="220.00000000000003" height="167"/>
+ <rect key="frame" x="3" y="8" width="220" height="167"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</imageView>
@@ -461,7 +460,7 @@
<rect key="frame" x="0.0" y="167" width="320" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="10" y="1" width="300" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -470,7 +469,7 @@
<rect key="frame" x="0.0" y="212" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="10" y="0.0" width="300" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -479,7 +478,7 @@
<rect key="frame" x="0.0" y="256" width="320" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
- <rect key="frame" x="10" y="0.0" width="300" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -532,76 +531,9 @@
<image name="pushed_previous_button.png" width="315" height="220"/>
<image name="released_next_button.png" width="315" height="220"/>
<image name="released_previous_button.png" width="315" height="220"/>
- <image name="timer_clear_btn.png" width="74" height="74"/>
- <image name="timer_start_btn.png" width="74" height="74"/>
+ <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/InfoPlist.strings b/ios/iosremote/iosremote/fr.lproj/InfoPlist.strings
new file mode 100644
index 0000000..477b28f
--- /dev/null
+++ b/ios/iosremote/iosremote/fr.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard
new file mode 100644
index 0000000..b061c50
--- /dev/null
+++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard
@@ -0,0 +1,546 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="qoG-TN-hN0">
+ <dependencies>
+ <development version="4600" identifier="xcode"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
+ </dependencies>
+ <scenes>
+ <!--Server list vc - Impress Remote-->
+ <scene sceneID="5">
+ <objects>
+ <viewController id="2" customClass="server_list_vc" sceneMemberID="viewController">
+ <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="naQ-T4-jWV">
+ <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+ <color key="backgroundColor" red="0.93333713500000004" green="0.92603786499999996" blue="0.92826186129999999" alpha="1" colorSpace="calibratedRGB"/>
+ <prototypes>
+ <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="server_item_cell" editingAccessoryType="disclosureIndicator" textLabel="Rg3-PU-OuS" detailTextLabel="9Mc-gD-acc" style="IBUITableViewCellStyleValue1" id="Pvl-Uw-Ghs">
+ <rect key="frame" x="0.0" y="46" width="320" height="45"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="45"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rg3-PU-OuS">
+ <rect key="frame" x="10" y="11" width="32" height="22"/>
+ <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
+ <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ </label>
+ <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9Mc-gD-acc">
+ <rect key="frame" x="246" y="11" width="44" height="22"/>
+ <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
+ <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </view>
+ </tableViewCell>
+ </prototypes>
+ <connections>
+ <outlet property="dataSource" destination="2" id="dcg-jo-7eE"/>
+ <outlet property="delegate" destination="2" id="owZ-Ow-VEc"/>
+ </connections>
+ </tableView>
+ <navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN">
+ <barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
+ <connections>
+ <segue destination="maT-Bx-l5y" kind="push" identifier="create_new_server" id="UYr-8d-fk5"/>
+ </connections>
+ </barButtonItem>
+ </navigationItem>
+ <connections>
+ <outlet property="serverTable" destination="naQ-T4-jWV" id="hd3-Vm-fk6"/>
+ <segue destination="UPe-3R-KdQ" kind="push" identifier="pinValidation" id="UQQ-pV-3o3"/>
+ <segue destination="Ybo-9c-MB8" kind="push" identifier="SlideShowPreview" id="EWS-Nn-mQc"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="80" y="-294"/>
+ </scene>
+ <!--Pin Validation vc-->
+ <scene sceneID="aCW-l9-UDx">
+ <objects>
+ <viewController id="UPe-3R-KdQ" customClass="pinValidation_vc" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="UGV-xw-Sxo">
+ <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3128" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="f2u-bG-5ak">
+ <rect key="frame" x="79" y="93" width="163" height="81"/>
+ <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="73"/>
+ <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter the pin code above in Impress - Slide Show - Impress Remote" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upW-oF-qOa">
+ <rect key="frame" x="29" y="208" width="271" height="65"/>
+ <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/>
+ <color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Waiting for validation from Impress..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lSD-BG-kVe">
+ <rect key="frame" x="33" y="380" width="276" height="21"/>
+ <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="15"/>
+ <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ </view>
+ <navigationItem key="navigationItem" id="c3o-oA-oin"/>
+ <connections>
+ <outlet property="pinLabel" destination="f2u-bG-5ak" id="Y7S-6h-awe"/>
+ <outlet property="statusLabel" destination="lSD-BG-kVe" id="mmM-4x-ktw"/>
+ <segue destination="Ybo-9c-MB8" kind="push" identifier="pinValidated" id="pTl-ua-9pr"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="iok-RC-uS6" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="80" y="460"/>
+ </scene>
+ <!--New Server View Controller-->
+ <scene sceneID="tlJ-c5-Jp2">
+ <objects>
+ <tableViewController id="maT-Bx-l5y" customClass="newServerViewController" sceneMemberID="viewController">
+ <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="VUL-K7-xsS">
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list