[Libreoffice-commits] core.git: 5 commits - ios/iosremote
Siqi LIU
me at siqi.fr
Thu Sep 12 23:11:56 PDT 2013
ios/iosremote/PopoverView.h | 12 -
ios/iosremote/PopoverView.m | 12 -
ios/iosremote/PopoverViewCompatibility.h | 14 -
ios/iosremote/PopoverView_Configuration.h | 14 -
ios/iosremote/en.lproj/iPad_autosize.storyboard | 75 ++++--
ios/iosremote/en.lproj/iPad_autosize.strings |binary
ios/iosremote/en.lproj/iPad_autosize_old.storyboard | 77 ++++--
ios/iosremote/fr.lproj/iPad_autosize.storyboard | 77 ++++--
ios/iosremote/fr.lproj/iPad_autosize_old.storyboard | 77 ++++--
ios/iosremote/iosremote.xcodeproj/project.pbxproj | 66 +++--
ios/iosremote/iosremote/AboutViewController.h | 15 +
ios/iosremote/iosremote/AboutViewController.m | 48 ++++
ios/iosremote/iosremote/AppDelegate.h | 2
ios/iosremote/iosremote/AppDelegate.m | 2
ios/iosremote/iosremote/BasePresentationViewController.m | 18 -
ios/iosremote/iosremote/Timer.m | 11
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 114 ++--------
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings |binary
ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard | 114 ++--------
ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard | 114 ++--------
ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard | 114 ++--------
ios/iosremote/iosremote/more_ipad.png |binary
ios/iosremote/iosremote/more_ipad at 2x.png |binary
ios/iosremote/iosremote/serverList_vc.h | 6
ios/iosremote/iosremote/serverList_vc.m | 24 ++
ios/iosremote/iosremote/slideShowPreviewTable_vc.m | 9
ios/iosremote/iosremote/slideShowSwipeInList_iphone.m | 2
ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard | 114 ++--------
ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard | 114 ++--------
ios/iosremote/libreoffice_logo.png |binary
ios/iosremote/licenses.html | 51 ++++
ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard | 77 ++++--
ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard | 77 ++++--
33 files changed, 782 insertions(+), 668 deletions(-)
New commits:
commit 85430e411ca4b6a1f6a2f56bfb60138446172904
Author: Siqi LIU <me at siqi.fr>
Date: Fri Sep 13 08:09:53 2013 +0200
stick menu button to right lower corner
Change-Id: I8484be77353b288b6dfaa0d86fa4b325fd1187a5
diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard
index bbb392b..e7f2114 100644
--- a/ios/iosremote/en.lproj/iPad_autosize.storyboard
+++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard
@@ -648,7 +648,9 @@
<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="outlet" name="NoteWebView" candidateClass="UIWebView"/>
<relationship kind="outlet" name="NotesView" candidateClass="UIView"/>
<relationship kind="outlet" name="clearButton" candidateClass="UIButton"/>
commit e2025037fafb8a42dd8a2b92f4d627b01a096a49
Author: Siqi LIU <me at siqi.fr>
Date: Fri Sep 13 00:09:14 2013 +0200
libreoffice_logo used in about page, identical to the one used in android
Change-Id: Ie3e2f6c9d1b8ff75b8450e8c377073821d0f1b37
diff --git a/ios/iosremote/libreoffice_logo.png b/ios/iosremote/libreoffice_logo.png
new file mode 100644
index 0000000..3fa8cf1
Binary files /dev/null and b/ios/iosremote/libreoffice_logo.png differ
commit 7bf6e4174617098f147ba6ca4d717c792d22dc21
Author: Siqi LIU <me at siqi.fr>
Date: Fri Sep 13 00:08:47 2013 +0200
licenses
Change-Id: Ib9a706a7ecb20bbee283e566f94fd22d412027e7
diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
index ff23d2e..579313d 100644
--- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/fr.lproj/iPad_autosize_old.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.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>
@@ -482,7 +481,7 @@
</scrollView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
<rect key="frame" x="731" y="22" width="64" height="53"/>
- <autoresizingMask key="autoresizingMask"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="14" maxY="0.0"/>
@@ -639,6 +638,98 @@
<image name="timer_settime_btn.png" width="60" height="60"/>
<image name="timer_start_btn_dark.png" width="60" height="60"/>
</resources>
+ <classes>
+ <class className="AboutViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/>
+ <relationships>
+ <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/>
+ </relationships>
+ </class>
+ <class className="BasePresentationViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/>
+ <relationships>
+ <relationship kind="action" name="popOverUp:"/>
+ <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="stopWatchTimerScrollView" candidateClass="UIScrollView"/>
+ <relationship kind="outlet" name="stopWatchView" candidateClass="UIView"/>
+ <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/>
+ <relationship kind="outlet" name="timerClearButton" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="timerSetTimeButton" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="timerStartButton" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="timerTimeLabel" candidateClass="UILabel"/>
+ <relationship kind="outlet" name="timerView" candidateClass="UIView"/>
+ </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="WalkThroughContainerViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.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="action" name="onClickMenuButton:"/>
+ <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/>
+ <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="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
+ <relationships>
+ <relationship kind="action" name="startPrefSettings:"/>
+ <relationship kind="action" name="startPresentationAction:"/>
+ <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="startButton" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
+ </relationships>
+ </class>
+ <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/>
+ </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/licenses.html b/ios/iosremote/licenses.html
index 430cbf2..d5a8481 100644
--- a/ios/iosremote/licenses.html
+++ b/ios/iosremote/licenses.html
@@ -33,6 +33,8 @@
<p>Copyright 2013 LibreOffice Contributors and/or their affiliates.
<br>
+ One of the LibreOffice - Google Summer of Code 2013 products
+ <br>
<a href="www.libreoffice.org">www.libreoffice.org</a>
</p>
diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
index ffa3b2c..e6dd3f1 100644
--- a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.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.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>
@@ -482,7 +481,7 @@
</scrollView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
<rect key="frame" x="731" y="22" width="64" height="53"/>
- <autoresizingMask key="autoresizingMask"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="14" maxY="0.0"/>
@@ -639,6 +638,98 @@
<image name="timer_settime_btn.png" width="60" height="60"/>
<image name="timer_start_btn_dark.png" width="60" height="60"/>
</resources>
+ <classes>
+ <class className="AboutViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/>
+ <relationships>
+ <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/>
+ </relationships>
+ </class>
+ <class className="BasePresentationViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/>
+ <relationships>
+ <relationship kind="action" name="popOverUp:"/>
+ <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="stopWatchTimerScrollView" candidateClass="UIScrollView"/>
+ <relationship kind="outlet" name="stopWatchView" candidateClass="UIView"/>
+ <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/>
+ <relationship kind="outlet" name="timerClearButton" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="timerSetTimeButton" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="timerStartButton" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="timerTimeLabel" candidateClass="UILabel"/>
+ <relationship kind="outlet" name="timerView" candidateClass="UIView"/>
+ </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="WalkThroughContainerViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.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="action" name="onClickMenuButton:"/>
+ <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/>
+ <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="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
+ <relationships>
+ <relationship kind="action" name="startPrefSettings:"/>
+ <relationship kind="action" name="startPresentationAction:"/>
+ <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="startButton" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
+ </relationships>
+ </class>
+ <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/>
+ </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"/>
commit 598615ab9ac8768b7bd323f1125c73ad0f6d62d5
Author: Siqi LIU <me at siqi.fr>
Date: Fri Sep 13 00:02:49 2013 +0200
countdown timer for iPad & license page
Change-Id: I516a4e9da4e670f0fdbbfa0f793ccfb308189534
diff --git a/ios/iosremote/PopoverView.h b/ios/iosremote/PopoverView.h
index a945e38..6766ab1 100755
--- a/ios/iosremote/PopoverView.h
+++ b/ios/iosremote/PopoverView.h
@@ -1,10 +1,16 @@
//
-// PopoverView.h
-// Embark
+// PopoverView
+// https://github.com/runway20/PopoverView
//
-// Created by Oliver Rickard on 20/08/2012.
+//(MIT Licensed)
//
+//Copyright (c) 2012 Runway 20 Inc.
//
+//Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+//The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#import <UIKit/UIKit.h>
#import "PopoverViewCompatibility.h"
diff --git a/ios/iosremote/PopoverView.m b/ios/iosremote/PopoverView.m
index ceeb73f..4f810cf 100755
--- a/ios/iosremote/PopoverView.m
+++ b/ios/iosremote/PopoverView.m
@@ -1,10 +1,16 @@
//
-// PopoverView.m
-// Embark
+// PopoverView
+// https://github.com/runway20/PopoverView
//
-// Created by Oliver Rickard on 20/08/2012.
+//(MIT Licensed)
//
+//Copyright (c) 2012 Runway 20 Inc.
//
+//Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+//The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#import "PopoverView.h"
#import "PopoverView_Configuration.h"
diff --git a/ios/iosremote/PopoverViewCompatibility.h b/ios/iosremote/PopoverViewCompatibility.h
index f5ce1bb..b53d9f9 100755
--- a/ios/iosremote/PopoverViewCompatibility.h
+++ b/ios/iosremote/PopoverViewCompatibility.h
@@ -1,10 +1,16 @@
//
-// PopoverViewCompatibility.h
-// popover
+// PopoverView
+// https://github.com/runway20/PopoverView
//
-// Created by alanduncan on 7/22/13.
-// Copyright (c) 2013 Oliver Rickard. All rights reserved.
+//(MIT Licensed)
//
+//Copyright (c) 2012 Runway 20 Inc.
+//
+//Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+//The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef popover_PopoverViewCompatibility_h
#define popover_PopoverViewCompatibility_h
diff --git a/ios/iosremote/PopoverView_Configuration.h b/ios/iosremote/PopoverView_Configuration.h
index cfe141e..7b43683 100755
--- a/ios/iosremote/PopoverView_Configuration.h
+++ b/ios/iosremote/PopoverView_Configuration.h
@@ -1,10 +1,16 @@
//
-// PopoverView_Configuration.h
-// popover
+// PopoverView
+// https://github.com/runway20/PopoverView
//
-// Created by Bas Pellis on 12/25/12.
-// Copyright (c) 2012 Oliver Rickard. All rights reserved.
+//(MIT Licensed)
//
+//Copyright (c) 2012 Runway 20 Inc.
+//
+//Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+//The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#pragma mark Constants - Configure look/feel
diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard
index 2265ebe..bbb392b 100644
--- a/ios/iosremote/en.lproj/iPad_autosize.storyboard
+++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard
@@ -1,11 +1,35 @@
<?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>
<scenes>
+ <!--About View Controller-->
+ <scene sceneID="QsO-mW-ttp">
+ <objects>
+ <viewController id="FKS-tU-MC6" customClass="AboutViewController" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="FOc-OL-5wQ">
+ <rect key="frame" x="0.0" y="64" width="540" height="556"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <webView contentMode="scaleToFill" id="07n-0U-kuj">
+ <rect key="frame" x="0.0" y="0.0" width="540" height="556"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ </webView>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ </view>
+ <navigationItem key="navigationItem" id="diX-6k-klE"/>
+ <connections>
+ <outlet property="aboutWebView" destination="07n-0U-kuj" id="nNC-oi-dgh"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="SyX-dh-Yof" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="254" y="-2200"/>
+ </scene>
<!--Server list vc ipad - Connect-->
<scene sceneID="ydU-fu-qHI">
<objects>
@@ -44,9 +68,9 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Connect" id="wYh-MF-Ao6">
- <barButtonItem key="leftBarButtonItem" title="Help" id="JjD-di-uqV">
+ <barButtonItem key="leftBarButtonItem" image="more_icon.png" id="JjD-di-uqV">
<connections>
- <segue destination="Grm-Od-s6s" kind="push" id="YbL-aj-gxv"/>
+ <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="k4j-0Z-IEW"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS">
@@ -61,6 +85,7 @@
<segue destination="m26-i1-eiL" kind="push" identifier="pinValidation" id="yUv-cB-P15"/>
<segue destination="Grm-Od-s6s" kind="push" identifier="howtoSegue" id="hRz-3h-McA"/>
<segue destination="M9Q-tM-7CQ" kind="push" identifier="SlideShowPreview" id="jsD-4W-bFm"/>
+ <segue destination="FKS-tU-MC6" kind="push" identifier="aboutSegue" id="4eY-jZ-bpg"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="KBf-aZ-Hhk" sceneMemberID="firstResponder"/>
@@ -318,21 +343,6 @@
<rect key="frame" x="0.0" y="906" width="768" height="98"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<subviews>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38">
- <rect key="frame" x="736" y="23" width="58" height="59"/>
- <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
- <state key="normal" backgroundImage="more_ipad.png">
- <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
- </state>
- <state key="highlighted">
- <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- </state>
- <connections>
- <action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="0Zm-gv-gne"/>
- </connections>
- </button>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" directionalLockEnabled="YES" bounces="NO" alwaysBounceHorizontal="YES" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" id="DUv-gH-oAo">
<rect key="frame" x="0.0" y="-1" width="698" height="102"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
@@ -469,6 +479,23 @@
</view>
</subviews>
</scrollView>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
+ <rect key="frame" x="731" y="22" width="64" height="53"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="14" maxY="0.0"/>
+ <state key="normal" image="more_ipad.png">
+ <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <connections>
+ <action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="Urz-2a-EqX"/>
+ </connections>
+ </button>
</subviews>
<color key="backgroundColor" red="0.66274509800000003" green="0.71764705880000002" blue="0.74509803919999995" alpha="1" colorSpace="calibratedRGB"/>
</view>
@@ -481,7 +508,7 @@
<outlet property="NotesView" destination="Pk1-fD-KAi" id="2ZD-si-fls"/>
<outlet property="clearButton" destination="MKb-4h-13P" id="7Xz-n6-sre"/>
<outlet property="currentSlideImageView" destination="x7C-rs-s4K" id="Qtf-99-j0C"/>
- <outlet property="gearButton" destination="jBq-0A-D38" id="ATa-gU-YT0"/>
+ <outlet property="gearButton" destination="cOI-Hc-1QU" id="rH8-CG-Jdb"/>
<outlet property="horizontalTableView" destination="Iok-mu-c0T" id="SJT-pa-4Hb"/>
<outlet property="movingPointer" destination="2SJ-3f-E3k" id="mxV-zz-hjx"/>
<outlet property="nextButton" destination="bfp-PJ-NrP" id="1Uf-1g-iQl"/>
@@ -601,6 +628,7 @@
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="buttonBackground.png" width="45" height="45"/>
+ <image name="more_icon.png" width="30" height="30"/>
<image name="more_ipad.png" width="60" height="60"/>
<image name="nextButton_normal.png" width="42" height="230"/>
<image name="nextButton_pressed.png" width="42" height="230"/>
@@ -611,12 +639,16 @@
<image name="timer_start_btn_dark.png" width="60" height="60"/>
</resources>
<classes>
+ <class className="AboutViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/>
+ <relationships>
+ <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/>
+ </relationships>
+ </class>
<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="outlet" name="NoteWebView" candidateClass="UIWebView"/>
<relationship kind="outlet" name="NotesView" candidateClass="UIView"/>
<relationship kind="outlet" name="clearButton" candidateClass="UIButton"/>
@@ -670,6 +702,8 @@
<class className="server_list_vc" superclassName="UITableViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
<relationships>
+ <relationship kind="action" name="onClickMenuButton:"/>
+ <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/>
<relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
</relationships>
</class>
@@ -702,7 +736,6 @@
<simulatedScreenMetrics key="destination"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
- <segue reference="YbL-aj-gxv"/>
<segue reference="jsD-4W-bFm"/>
</inferredMetricsTieBreakers>
</document>
\ No newline at end of file
diff --git a/ios/iosremote/en.lproj/iPad_autosize.strings b/ios/iosremote/en.lproj/iPad_autosize.strings
index ad30821..01ac002 100644
Binary files a/ios/iosremote/en.lproj/iPad_autosize.strings and b/ios/iosremote/en.lproj/iPad_autosize.strings differ
diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
index 2265ebe..bbb392b 100644
--- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
@@ -1,11 +1,35 @@
<?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>
<scenes>
+ <!--About View Controller-->
+ <scene sceneID="QsO-mW-ttp">
+ <objects>
+ <viewController id="FKS-tU-MC6" customClass="AboutViewController" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="FOc-OL-5wQ">
+ <rect key="frame" x="0.0" y="64" width="540" height="556"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <webView contentMode="scaleToFill" id="07n-0U-kuj">
+ <rect key="frame" x="0.0" y="0.0" width="540" height="556"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ </webView>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ </view>
+ <navigationItem key="navigationItem" id="diX-6k-klE"/>
+ <connections>
+ <outlet property="aboutWebView" destination="07n-0U-kuj" id="nNC-oi-dgh"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="SyX-dh-Yof" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="254" y="-2200"/>
+ </scene>
<!--Server list vc ipad - Connect-->
<scene sceneID="ydU-fu-qHI">
<objects>
@@ -44,9 +68,9 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Connect" id="wYh-MF-Ao6">
- <barButtonItem key="leftBarButtonItem" title="Help" id="JjD-di-uqV">
+ <barButtonItem key="leftBarButtonItem" image="more_icon.png" id="JjD-di-uqV">
<connections>
- <segue destination="Grm-Od-s6s" kind="push" id="YbL-aj-gxv"/>
+ <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="k4j-0Z-IEW"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS">
@@ -61,6 +85,7 @@
<segue destination="m26-i1-eiL" kind="push" identifier="pinValidation" id="yUv-cB-P15"/>
<segue destination="Grm-Od-s6s" kind="push" identifier="howtoSegue" id="hRz-3h-McA"/>
<segue destination="M9Q-tM-7CQ" kind="push" identifier="SlideShowPreview" id="jsD-4W-bFm"/>
+ <segue destination="FKS-tU-MC6" kind="push" identifier="aboutSegue" id="4eY-jZ-bpg"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="KBf-aZ-Hhk" sceneMemberID="firstResponder"/>
@@ -318,21 +343,6 @@
<rect key="frame" x="0.0" y="906" width="768" height="98"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<subviews>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38">
- <rect key="frame" x="736" y="23" width="58" height="59"/>
- <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
- <state key="normal" backgroundImage="more_ipad.png">
- <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
- </state>
- <state key="highlighted">
- <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- </state>
- <connections>
- <action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="0Zm-gv-gne"/>
- </connections>
- </button>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" directionalLockEnabled="YES" bounces="NO" alwaysBounceHorizontal="YES" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" id="DUv-gH-oAo">
<rect key="frame" x="0.0" y="-1" width="698" height="102"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
@@ -469,6 +479,23 @@
</view>
</subviews>
</scrollView>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
+ <rect key="frame" x="731" y="22" width="64" height="53"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="14" maxY="0.0"/>
+ <state key="normal" image="more_ipad.png">
+ <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <connections>
+ <action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="Urz-2a-EqX"/>
+ </connections>
+ </button>
</subviews>
<color key="backgroundColor" red="0.66274509800000003" green="0.71764705880000002" blue="0.74509803919999995" alpha="1" colorSpace="calibratedRGB"/>
</view>
@@ -481,7 +508,7 @@
<outlet property="NotesView" destination="Pk1-fD-KAi" id="2ZD-si-fls"/>
<outlet property="clearButton" destination="MKb-4h-13P" id="7Xz-n6-sre"/>
<outlet property="currentSlideImageView" destination="x7C-rs-s4K" id="Qtf-99-j0C"/>
- <outlet property="gearButton" destination="jBq-0A-D38" id="ATa-gU-YT0"/>
+ <outlet property="gearButton" destination="cOI-Hc-1QU" id="rH8-CG-Jdb"/>
<outlet property="horizontalTableView" destination="Iok-mu-c0T" id="SJT-pa-4Hb"/>
<outlet property="movingPointer" destination="2SJ-3f-E3k" id="mxV-zz-hjx"/>
<outlet property="nextButton" destination="bfp-PJ-NrP" id="1Uf-1g-iQl"/>
@@ -601,6 +628,7 @@
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="buttonBackground.png" width="45" height="45"/>
+ <image name="more_icon.png" width="30" height="30"/>
<image name="more_ipad.png" width="60" height="60"/>
<image name="nextButton_normal.png" width="42" height="230"/>
<image name="nextButton_pressed.png" width="42" height="230"/>
@@ -611,12 +639,16 @@
<image name="timer_start_btn_dark.png" width="60" height="60"/>
</resources>
<classes>
+ <class className="AboutViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/>
+ <relationships>
+ <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/>
+ </relationships>
+ </class>
<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="outlet" name="NoteWebView" candidateClass="UIWebView"/>
<relationship kind="outlet" name="NotesView" candidateClass="UIView"/>
<relationship kind="outlet" name="clearButton" candidateClass="UIButton"/>
@@ -670,6 +702,8 @@
<class className="server_list_vc" superclassName="UITableViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
<relationships>
+ <relationship kind="action" name="onClickMenuButton:"/>
+ <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/>
<relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
</relationships>
</class>
@@ -702,7 +736,6 @@
<simulatedScreenMetrics key="destination"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
- <segue reference="YbL-aj-gxv"/>
<segue reference="jsD-4W-bFm"/>
</inferredMetricsTieBreakers>
</document>
\ No newline at end of file
diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard
index 68de0c7..579313d 100644
--- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard
+++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard
@@ -1,11 +1,35 @@
<?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>
<scenes>
+ <!--About View Controller-->
+ <scene sceneID="QsO-mW-ttp">
+ <objects>
+ <viewController id="FKS-tU-MC6" customClass="AboutViewController" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="FOc-OL-5wQ">
+ <rect key="frame" x="0.0" y="64" width="540" height="556"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <webView contentMode="scaleToFill" id="07n-0U-kuj">
+ <rect key="frame" x="0.0" y="0.0" width="540" height="556"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ </webView>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ </view>
+ <navigationItem key="navigationItem" id="diX-6k-klE"/>
+ <connections>
+ <outlet property="aboutWebView" destination="07n-0U-kuj" id="nNC-oi-dgh"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="SyX-dh-Yof" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="254" y="-2200"/>
+ </scene>
<!--Server list vc ipad - Connecter-->
<scene sceneID="ydU-fu-qHI">
<objects>
@@ -44,9 +68,9 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Connecter" id="wYh-MF-Ao6">
- <barButtonItem key="leftBarButtonItem" title="Aide" id="JjD-di-uqV">
+ <barButtonItem key="leftBarButtonItem" title="Aide" image="more_icon.png" id="JjD-di-uqV">
<connections>
- <segue destination="Grm-Od-s6s" kind="push" id="YbL-aj-gxv"/>
+ <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="k4j-0Z-IEW"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS">
@@ -61,6 +85,7 @@
<segue destination="m26-i1-eiL" kind="push" identifier="pinValidation" id="yUv-cB-P15"/>
<segue destination="Grm-Od-s6s" kind="push" identifier="howtoSegue" id="hRz-3h-McA"/>
<segue destination="M9Q-tM-7CQ" kind="push" identifier="SlideShowPreview" id="jsD-4W-bFm"/>
+ <segue destination="FKS-tU-MC6" kind="push" identifier="aboutSegue" id="4eY-jZ-bpg"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="KBf-aZ-Hhk" sceneMemberID="firstResponder"/>
@@ -318,21 +343,6 @@
<rect key="frame" x="0.0" y="906" width="768" height="98"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<subviews>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38">
- <rect key="frame" x="736" y="23" width="58" height="59"/>
- <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
- <state key="normal" backgroundImage="more_ipad.png">
- <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
- </state>
- <state key="highlighted">
- <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- </state>
- <connections>
- <action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="0Zm-gv-gne"/>
- </connections>
- </button>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" directionalLockEnabled="YES" bounces="NO" alwaysBounceHorizontal="YES" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" id="DUv-gH-oAo">
<rect key="frame" x="0.0" y="-1" width="698" height="102"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
@@ -469,6 +479,23 @@
</view>
</subviews>
</scrollView>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
+ <rect key="frame" x="731" y="22" width="64" height="53"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="14" maxY="0.0"/>
+ <state key="normal" image="more_ipad.png">
+ <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <connections>
+ <action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="Urz-2a-EqX"/>
+ </connections>
+ </button>
</subviews>
<color key="backgroundColor" red="0.66274509800000003" green="0.71764705880000002" blue="0.74509803919999995" alpha="1" colorSpace="calibratedRGB"/>
</view>
@@ -481,7 +508,7 @@
<outlet property="NotesView" destination="Pk1-fD-KAi" id="2ZD-si-fls"/>
<outlet property="clearButton" destination="MKb-4h-13P" id="7Xz-n6-sre"/>
<outlet property="currentSlideImageView" destination="x7C-rs-s4K" id="Qtf-99-j0C"/>
- <outlet property="gearButton" destination="jBq-0A-D38" id="ATa-gU-YT0"/>
+ <outlet property="gearButton" destination="cOI-Hc-1QU" id="rH8-CG-Jdb"/>
<outlet property="horizontalTableView" destination="Iok-mu-c0T" id="SJT-pa-4Hb"/>
<outlet property="movingPointer" destination="2SJ-3f-E3k" id="mxV-zz-hjx"/>
<outlet property="nextButton" destination="bfp-PJ-NrP" id="1Uf-1g-iQl"/>
@@ -601,6 +628,7 @@
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="buttonBackground.png" width="45" height="45"/>
+ <image name="more_icon.png" width="30" height="30"/>
<image name="more_ipad.png" width="60" height="60"/>
<image name="nextButton_normal.png" width="42" height="230"/>
<image name="nextButton_pressed.png" width="42" height="230"/>
@@ -611,12 +639,16 @@
<image name="timer_start_btn_dark.png" width="60" height="60"/>
</resources>
<classes>
+ <class className="AboutViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/>
+ <relationships>
+ <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/>
+ </relationships>
+ </class>
<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="outlet" name="NoteWebView" candidateClass="UIWebView"/>
<relationship kind="outlet" name="NotesView" candidateClass="UIView"/>
<relationship kind="outlet" name="clearButton" candidateClass="UIButton"/>
@@ -670,6 +702,8 @@
<class className="server_list_vc" superclassName="UITableViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
<relationships>
+ <relationship kind="action" name="onClickMenuButton:"/>
+ <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/>
<relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
</relationships>
</class>
@@ -702,7 +736,6 @@
<simulatedScreenMetrics key="destination"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
- <segue reference="YbL-aj-gxv"/>
<segue reference="jsD-4W-bFm"/>
</inferredMetricsTieBreakers>
</document>
\ No newline at end of file
diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
index 68de0c7..ff23d2e 100644
--- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
@@ -6,6 +6,31 @@
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
<scenes>
+ <!--About View Controller-->
+ <scene sceneID="QsO-mW-ttp">
+ <objects>
+ <viewController id="FKS-tU-MC6" customClass="AboutViewController" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="FOc-OL-5wQ">
+ <rect key="frame" x="0.0" y="64" width="540" height="556"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <webView contentMode="scaleToFill" id="07n-0U-kuj">
+ <rect key="frame" x="0.0" y="0.0" width="540" height="556"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ </webView>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ </view>
+ <navigationItem key="navigationItem" id="diX-6k-klE"/>
+ <connections>
+ <outlet property="aboutWebView" destination="07n-0U-kuj" id="nNC-oi-dgh"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="SyX-dh-Yof" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="254" y="-2200"/>
+ </scene>
<!--Server list vc ipad - Connecter-->
<scene sceneID="ydU-fu-qHI">
<objects>
@@ -44,9 +69,9 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Connecter" id="wYh-MF-Ao6">
- <barButtonItem key="leftBarButtonItem" title="Aide" id="JjD-di-uqV">
+ <barButtonItem key="leftBarButtonItem" title="Aide" image="more_icon.png" id="JjD-di-uqV">
<connections>
- <segue destination="Grm-Od-s6s" kind="push" id="YbL-aj-gxv"/>
+ <action selector="onClickMenuButton:" destination="5QV-E7-KNT" id="k4j-0Z-IEW"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" image="add.png" id="pU6-XF-laS">
@@ -61,6 +86,7 @@
<segue destination="m26-i1-eiL" kind="push" identifier="pinValidation" id="yUv-cB-P15"/>
<segue destination="Grm-Od-s6s" kind="push" identifier="howtoSegue" id="hRz-3h-McA"/>
<segue destination="M9Q-tM-7CQ" kind="push" identifier="SlideShowPreview" id="jsD-4W-bFm"/>
+ <segue destination="FKS-tU-MC6" kind="push" identifier="aboutSegue" id="4eY-jZ-bpg"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="KBf-aZ-Hhk" sceneMemberID="firstResponder"/>
@@ -318,21 +344,6 @@
<rect key="frame" x="0.0" y="906" width="768" height="98"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<subviews>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="jBq-0A-D38">
- <rect key="frame" x="736" y="23" width="58" height="59"/>
- <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
- <state key="normal" backgroundImage="more_ipad.png">
- <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
- </state>
- <state key="highlighted">
- <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- </state>
- <connections>
- <action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="0Zm-gv-gne"/>
- </connections>
- </button>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" directionalLockEnabled="YES" bounces="NO" alwaysBounceHorizontal="YES" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" id="DUv-gH-oAo">
<rect key="frame" x="0.0" y="-1" width="698" height="102"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
@@ -469,6 +480,23 @@
</view>
</subviews>
</scrollView>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="cOI-Hc-1QU">
+ <rect key="frame" x="731" y="22" width="64" height="53"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="14" maxY="0.0"/>
+ <state key="normal" image="more_ipad.png">
+ <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <connections>
+ <action selector="popOverUp:" destination="TYh-Hw-m1Q" eventType="touchUpInside" id="Urz-2a-EqX"/>
+ </connections>
+ </button>
</subviews>
<color key="backgroundColor" red="0.66274509800000003" green="0.71764705880000002" blue="0.74509803919999995" alpha="1" colorSpace="calibratedRGB"/>
</view>
@@ -481,7 +509,7 @@
<outlet property="NotesView" destination="Pk1-fD-KAi" id="2ZD-si-fls"/>
<outlet property="clearButton" destination="MKb-4h-13P" id="7Xz-n6-sre"/>
<outlet property="currentSlideImageView" destination="x7C-rs-s4K" id="Qtf-99-j0C"/>
- <outlet property="gearButton" destination="jBq-0A-D38" id="ATa-gU-YT0"/>
+ <outlet property="gearButton" destination="cOI-Hc-1QU" id="rH8-CG-Jdb"/>
<outlet property="horizontalTableView" destination="Iok-mu-c0T" id="SJT-pa-4Hb"/>
<outlet property="movingPointer" destination="2SJ-3f-E3k" id="mxV-zz-hjx"/>
<outlet property="nextButton" destination="bfp-PJ-NrP" id="1Uf-1g-iQl"/>
@@ -601,6 +629,7 @@
<image name="WTPairingScreenshot.png" width="474" height="312"/>
<image name="add.png" width="30" height="30"/>
<image name="buttonBackground.png" width="45" height="45"/>
+ <image name="more_icon.png" width="30" height="30"/>
<image name="more_ipad.png" width="60" height="60"/>
<image name="nextButton_normal.png" width="42" height="230"/>
<image name="nextButton_pressed.png" width="42" height="230"/>
@@ -610,99 +639,12 @@
<image name="timer_settime_btn.png" width="60" height="60"/>
<image name="timer_start_btn_dark.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="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="stopWatchTimerScrollView" candidateClass="UIScrollView"/>
- <relationship kind="outlet" name="stopWatchView" candidateClass="UIView"/>
- <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/>
- <relationship kind="outlet" name="timerClearButton" candidateClass="UIButton"/>
- <relationship kind="outlet" name="timerSetTimeButton" candidateClass="UIButton"/>
- <relationship kind="outlet" name="timerStartButton" candidateClass="UIButton"/>
- <relationship kind="outlet" name="timerTimeLabel" candidateClass="UILabel"/>
- <relationship kind="outlet" name="timerView" candidateClass="UIView"/>
- </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="WalkThroughContainerViewController" superclassName="UIViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.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="UIViewController">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
- <relationships>
- <relationship kind="action" name="startPrefSettings:"/>
- <relationship kind="action" name="startPresentationAction:"/>
- <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/>
- <relationship kind="outlet" name="startButton" candidateClass="UIButton"/>
- <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
- </relationships>
- </class>
- <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/>
- </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"/>
<simulatedScreenMetrics key="destination"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
- <segue reference="YbL-aj-gxv"/>
<segue reference="jsD-4W-bFm"/>
</inferredMetricsTieBreakers>
</document>
\ No newline at end of file
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index a8781fb..3015968 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -137,6 +137,10 @@
8CBF9DFF17DDBFA70044D949 /* IASKSpecifierValuesView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8CBF9DEA17DDBFA70044D949 /* IASKSpecifierValuesView.xib */; };
8CBF9E0117DDC1A80044D949 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CBF9E0017DDC1A80044D949 /* MessageUI.framework */; };
8CBF9E0317DDD2230044D949 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8CBF9E0217DDD2230044D949 /* Settings.bundle */; };
+ 8CBF9E0517DE022F0044D949 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CBF9E0417DE022F0044D949 /* AudioToolbox.framework */; };
+ 8CBF9E0817DE79EB0044D949 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CBF9E0717DE79EB0044D949 /* AboutViewController.m */; };
+ 8CBF9E0A17E103B50044D949 /* licenses.html in Resources */ = {isa = PBXBuildFile; fileRef = 8CBF9E0917E103B40044D949 /* licenses.html */; };
+ 8CBF9E0F17E1133B0044D949 /* libreoffice_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CBF9E0E17E1133A0044D949 /* libreoffice_logo.png */; };
8CD6EC6817CBBAF40071827A /* WalkThroughPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */; };
8CD6EC6917CBBAF40071827A /* WalkThroughPageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6717CBBAF40071827A /* WalkThroughPageViewController.xib */; };
8CD6EC7017CC3FA00071827A /* WalkThroughContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */; };
@@ -271,12 +275,6 @@
8C23B46B17DB3B8600FB4DE6 /* timer_settime_btn at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "timer_settime_btn at 2x.png"; path = "iosremote/timer_settime_btn at 2x.png"; sourceTree = "<group>"; };
8C23B46E17DB419300FB4DE6 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Timer.h; path = iosremote/Timer.h; sourceTree = "<group>"; };
8C23B46F17DB419300FB4DE6 /* Timer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Timer.m; path = iosremote/Timer.m; sourceTree = "<group>"; };
- 8C26E5BE17A525FC007DA4B7 /* MGSplitCornersView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGSplitCornersView.h; sourceTree = "<group>"; };
- 8C26E5BF17A525FC007DA4B7 /* MGSplitCornersView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGSplitCornersView.m; sourceTree = "<group>"; };
- 8C26E5C017A525FC007DA4B7 /* MGSplitDividerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGSplitDividerView.h; sourceTree = "<group>"; };
- 8C26E5C117A525FC007DA4B7 /* MGSplitDividerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGSplitDividerView.m; sourceTree = "<group>"; };
- 8C26E5C217A525FC007DA4B7 /* MGSplitViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGSplitViewController.h; sourceTree = "<group>"; };
- 8C26E5C317A525FC007DA4B7 /* MGSplitViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGSplitViewController.m; sourceTree = "<group>"; };
8C26E5C517A5539D007DA4B7 /* UserDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = UserDefaults.plist; path = ../UserDefaults.plist; sourceTree = "<group>"; };
8C26E5C717A5731D007DA4B7 /* autoDismissKeyboardNavigationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = autoDismissKeyboardNavigationViewController.h; path = iosremote/autoDismissKeyboardNavigationViewController.h; sourceTree = "<group>"; };
8C26E5C817A5731D007DA4B7 /* autoDismissKeyboardNavigationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = autoDismissKeyboardNavigationViewController.m; path = iosremote/autoDismissKeyboardNavigationViewController.m; sourceTree = "<group>"; };
@@ -352,7 +350,12 @@
8CBF9DE917DDBFA70044D949 /* IASKPSToggleSwitchSpecifierViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IASKPSToggleSwitchSpecifierViewCell.xib; sourceTree = "<group>"; };
8CBF9DEA17DDBFA70044D949 /* IASKSpecifierValuesView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IASKSpecifierValuesView.xib; sourceTree = "<group>"; };
8CBF9E0017DDC1A80044D949 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
- 8CBF9E0217DDD2230044D949 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
+ 8CBF9E0217DDD2230044D949 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = ../Settings.bundle; sourceTree = "<group>"; };
+ 8CBF9E0417DE022F0044D949 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+ 8CBF9E0617DE79EB0044D949 /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AboutViewController.h; path = iosremote/AboutViewController.h; sourceTree = "<group>"; };
+ 8CBF9E0717DE79EB0044D949 /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AboutViewController.m; path = iosremote/AboutViewController.m; sourceTree = "<group>"; };
+ 8CBF9E0917E103B40044D949 /* licenses.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = licenses.html; sourceTree = "<group>"; };
+ 8CBF9E0E17E1133A0044D949 /* libreoffice_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = libreoffice_logo.png; sourceTree = "<group>"; };
8CD6EC6517CBBAF40071827A /* WalkThroughPageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WalkThroughPageViewController.h; path = iosremote/WalkThroughPageViewController.h; sourceTree = "<group>"; };
8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WalkThroughPageViewController.m; path = iosremote/WalkThroughPageViewController.m; sourceTree = "<group>"; };
8CD6EC6717CBBAF40071827A /* WalkThroughPageViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = WalkThroughPageViewController.xib; path = iosremote/WalkThroughPageViewController.xib; sourceTree = "<group>"; };
@@ -375,6 +378,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 8CBF9E0517DE022F0044D949 /* AudioToolbox.framework in Frameworks */,
8CBF9E0117DDC1A80044D949 /* MessageUI.framework in Frameworks */,
8C19F41F17B02A8A005BDB61 /* QuartzCore.framework in Frameworks */,
8C19F41D17B00899005BDB61 /* SystemConfiguration.framework in Frameworks */,
@@ -426,6 +430,8 @@
57AEEDAA1788D7B2007F4F97 /* Ressources */ = {
isa = PBXGroup;
children = (
+ 8CBF9E0E17E1133A0044D949 /* libreoffice_logo.png */,
+ 8CBF9E0917E103B40044D949 /* licenses.html */,
8C06B31A17B7EC6C002F5CF8 /* localizations */,
8C06B31917B7EC62002F5CF8 /* assets */,
);
@@ -445,10 +451,6 @@
57C6E3E6175E06E800E8BC5F = {
isa = PBXGroup;
children = (
- 8CBF9E0217DDD2230044D949 /* Settings.bundle */,
- 8CBF9E0017DDC1A80044D949 /* MessageUI.framework */,
- 8C19F41E17B02A8A005BDB61 /* QuartzCore.framework */,
- 8C19F41C17B00899005BDB61 /* SystemConfiguration.framework */,
8C1A170217A28AB900B4BB3C /* Shared */,
8C1A170917A28E6500B4BB3C /* iPhone */,
8C1A170817A28E5E00B4BB3C /* iPad */,
@@ -480,6 +482,7 @@
57C6E3F9175E06E800E8BC5F /* Supporting Files */ = {
isa = PBXGroup;
children = (
+ 8CBF9E0217DDD2230044D949 /* Settings.bundle */,
57C6E3FA175E06E800E8BC5F /* iosremote-Info.plist */,
8C26E5C517A5539D007DA4B7 /* UserDefaults.plist */,
57C6E3FB175E06E800E8BC5F /* InfoPlist.strings */,
@@ -615,6 +618,8 @@
5753DD9817834D7100DB71BB /* newServer_vc.m */,
5753DD8E1781EA0300DB71BB /* serverList_vc.h */,
5753DD8F1781EA0300DB71BB /* serverList_vc.m */,
+ 8CBF9E0617DE79EB0044D949 /* AboutViewController.h */,
+ 8CBF9E0717DE79EB0044D949 /* AboutViewController.m */,
571BFAD2178AB7BA00EF1BDB /* slideShow */,
57AEEDAB1789443D007F4F97 /* slideShowPreview */,
);
@@ -624,10 +629,14 @@
8C1A170517A28B0E00B4BB3C /* Library */ = {
isa = PBXGroup;
children = (
- 8CBF9DC117DDBFA70044D949 /* InAppSettingsKit */,
+ 8CBF9E0417DE022F0044D949 /* AudioToolbox.framework */,
+ 8CBF9E0017DDC1A80044D949 /* MessageUI.framework */,
+ 8C19F41E17B02A8A005BDB61 /* QuartzCore.framework */,
+ 8C19F41C17B00899005BDB61 /* SystemConfiguration.framework */,
BE9EBD061765BF0800283FD2 /* CoreImage.framework */,
57DC7006178D84490050FC58 /* CoreMotion.framework */,
- 8C26E5C417A52607007DA4B7 /* MGSplitViewController */,
+ 8CBF9E1017E1247D0044D949 /* WEPopoverView */,
+ 8CBF9DC117DDBFA70044D949 /* InAppSettingsKit */,
571102671794127E007D343B /* TestFlightSDK1.2.6 */,
57701736178AC83E00B99793 /* SWRevealViewController */,
);
@@ -637,10 +646,6 @@
8C1A170617A28DDF00B4BB3C /* Support */ = {
isa = PBXGroup;
children = (
- 8C19F42017B02AA9005BDB61 /* PopoverView.h */,
- 8C19F42217B02C2E005BDB61 /* PopoverView_Configuration.h */,
- 8C19F42317B02C2E005BDB61 /* PopoverViewCompatibility.h */,
- 8C19F42117B02AA9005BDB61 /* PopoverView.m */,
57B152971764703500EECC67 /* Base64.h */,
57B152981764703500EECC67 /* Base64.m */,
57CFED9717838FDC00E82E05 /* EditableTableViewCell.h */,
@@ -714,19 +719,6 @@
name = Views;
sourceTree = "<group>";
};
- 8C26E5C417A52607007DA4B7 /* MGSplitViewController */ = {
- isa = PBXGroup;
- children = (
- 8C26E5BE17A525FC007DA4B7 /* MGSplitCornersView.h */,
- 8C26E5BF17A525FC007DA4B7 /* MGSplitCornersView.m */,
- 8C26E5C017A525FC007DA4B7 /* MGSplitDividerView.h */,
- 8C26E5C117A525FC007DA4B7 /* MGSplitDividerView.m */,
- 8C26E5C217A525FC007DA4B7 /* MGSplitViewController.h */,
- 8C26E5C317A525FC007DA4B7 /* MGSplitViewController.m */,
- );
- name = MGSplitViewController;
- sourceTree = "<group>";
- };
8CAD658217A2E81F00CFB661 /* Controllers */ = {
isa = PBXGroup;
children = (
@@ -833,6 +825,17 @@
path = Xibs;
sourceTree = "<group>";
};
+ 8CBF9E1017E1247D0044D949 /* WEPopoverView */ = {
+ isa = PBXGroup;
+ children = (
+ 8C19F42017B02AA9005BDB61 /* PopoverView.h */,
+ 8C19F42217B02C2E005BDB61 /* PopoverView_Configuration.h */,
+ 8C19F42317B02C2E005BDB61 /* PopoverViewCompatibility.h */,
+ 8C19F42117B02AA9005BDB61 /* PopoverView.m */,
+ );
+ name = WEPopoverView;
+ sourceTree = "<group>";
+ };
8CD6EC6A17CBBAFF0071827A /* Views */ = {
isa = PBXGroup;
children = (
@@ -977,6 +980,8 @@
8CBF9DFE17DDBFA70044D949 /* IASKPSToggleSwitchSpecifierViewCell.xib in Resources */,
8CBF9DFF17DDBFA70044D949 /* IASKSpecifierValuesView.xib in Resources */,
8CBF9E0317DDD2230044D949 /* Settings.bundle in Resources */,
+ 8CBF9E0A17E103B50044D949 /* licenses.html in Resources */,
+ 8CBF9E0F17E1133B0044D949 /* libreoffice_logo.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1056,6 +1061,7 @@
8CBF9DF717DDBFA70044D949 /* IASKSlider.m in Sources */,
8CBF9DF817DDBFA70044D949 /* IASKSwitch.m in Sources */,
8CBF9DF917DDBFA70044D949 /* IASKTextField.m in Sources */,
+ 8CBF9E0817DE79EB0044D949 /* AboutViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/ios/iosremote/iosremote/AboutViewController.h b/ios/iosremote/iosremote/AboutViewController.h
new file mode 100644
index 0000000..dd26ff5
--- /dev/null
+++ b/ios/iosremote/iosremote/AboutViewController.h
@@ -0,0 +1,15 @@
+// -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+//
+// 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>
+
+ at interface AboutViewController : UIViewController
+
+ at property (weak, nonatomic) IBOutlet UIWebView *aboutWebView;
+
+ at end
diff --git a/ios/iosremote/iosremote/AboutViewController.m b/ios/iosremote/iosremote/AboutViewController.m
new file mode 100644
index 0000000..20bdf2c
--- /dev/null
+++ b/ios/iosremote/iosremote/AboutViewController.m
@@ -0,0 +1,48 @@
+// -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+//
+// 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 "AboutViewController.h"
+
+ at interface AboutViewController ()
+
+ at end
+
+ at implementation AboutViewController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+ self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+ if (self) {
+ // Custom initialization
+ }
+ return self;
+}
+
+- (void)viewDidLoad
+{
+ [super viewDidLoad];
+
+ UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Back", nil) style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)];
+ [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
+ self.navigationItem.leftBarButtonItem = backButton;
+
+ NSURL *url = [NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"licenses" ofType:@"html" inDirectory:nil]];
+ [self.aboutWebView loadRequest:[NSURLRequest requestWithURL:url]];
+}
+
+- (void)didReceiveMemoryWarning
+{
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (void)viewDidUnload {
+ [self setAboutWebView:nil];
+ [super viewDidUnload];
+}
+ at end
diff --git a/ios/iosremote/iosremote/BasePresentationViewController.m b/ios/iosremote/iosremote/BasePresentationViewController.m
index 8d53e09..7bc0a99 100644
--- a/ios/iosremote/iosremote/BasePresentationViewController.m
+++ b/ios/iosremote/iosremote/BasePresentationViewController.m
@@ -322,6 +322,7 @@
[self.timerView setShadowLight];
self.timer.delegate = self;
self.stopWatchTimerScrollView.contentSize = CGSizeMake(1240, 62);
+ [self.gearButton setShadowLight];
}
- (void)viewDidAppear:(BOOL)animated
@@ -497,13 +498,12 @@
static BOOL isBlank = NO;
#pragma mark - Popover toggle
- (IBAction)popOverUp:(id)sender {
- CGPoint popOverPoint = CGPointMake([self.gearButton.superview convertPoint:self.gearButton.center toView:self.view].x, [self.gearButton.superview convertPoint:self.gearButton.center toView:self.view].y - self.gearButton.frame.size.height/2);
if (!isBlank) {
- [PopoverView showPopoverAtPoint:popOverPoint inView:self.view withStringArray:
+ [PopoverView showPopoverAtPoint:self.gearButton.frame.origin inView:self.gearButton.superview withStringArray:
[NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", @"Popover option"), NSLocalizedString(@"Restart", @"Popover option"), NSLocalizedString(@"Blank Screen", @"Popover option"), nil]
delegate:self];
} else {
- [PopoverView showPopoverAtPoint:popOverPoint inView:self.view withStringArray:
+ [PopoverView showPopoverAtPoint:self.gearButton.frame.origin inView:self.gearButton.superview withStringArray:
[NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", @"Popover option"), NSLocalizedString(@"Restart", @"Popover option"), NSLocalizedString(@"Resume from blank Screen", @"Popover option"), nil]
delegate:self];
}
diff --git a/ios/iosremote/iosremote/Timer.m b/ios/iosremote/iosremote/Timer.m
index 8a1b592..3dc83e5 100644
--- a/ios/iosremote/iosremote/Timer.m
+++ b/ios/iosremote/iosremote/Timer.m
@@ -7,6 +7,7 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#import "Timer.h"
+#import <AudioToolbox/AudioServices.h>
@interface Timer ()
@@ -28,6 +29,7 @@
int hours, minutes, seconds;
int secondsLeft;
int initSecondsLeft;
+int vibrationCount;
- (Timer *) init
{
@@ -104,6 +106,13 @@ int initSecondsLeft;
disappear = NO;
self.timeLabel.text = @"00:00:00";
[self.delegate setTitle:@"00:00:00" sender:self];
+ // Vibrate the phone if supported (i.e. this works on iPhone but not iPad)
+ // On ipad this just get ignored
+ if (kCountDownTimerVibration && vibrationCount < 3){
+ vibrationCount++;
+ NSLog(@"Vibrating...");
+ AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
+ }
}
}
}
@@ -111,6 +120,8 @@ int initSecondsLeft;
- (void) start
{
+ // Reset vibration count to 0 on each start so that we vibrate 3 times maxi.
+ vibrationCount = 0;
switch (self.state) {
case TIMER_STATE_RUNNING:
self.state = TIMER_STATE_PAUSED;
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index 2348f44..4aa3253 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -59,9 +59,9 @@
</connections>
</tableView>
<navigationItem key="navigationItem" title="Impress Remote" id="yR1-m8-JWN">
- <barButtonItem key="leftBarButtonItem" title="Help" id="Ved-Cp-htB">
+ <barButtonItem key="leftBarButtonItem" image="more_icon.png" id="Ved-Cp-htB">
<connections>
- <segue destination="xbC-af-Ssw" kind="push" id="mx5-BO-ZzL"/>
+ <action selector="onClickMenuButton:" destination="2" id="UgM-Gd-2OX"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" image="add.png" style="done" id="bHy-yX-SPg">
@@ -75,12 +75,38 @@
<segue destination="UPe-3R-KdQ" kind="push" identifier="pinValidation" id="UQQ-pV-3o3"/>
<segue destination="xbC-af-Ssw" kind="push" identifier="howtoSegue" id="gc3-eP-dlL"/>
<segue destination="clb-xa-kbC" kind="push" identifier="SlideShowPreview" id="0SL-2n-fWY"/>
+ <segue destination="xtB-k7-LG4" kind="push" identifier="aboutSegue" id="6tZ-IT-lUc"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="80" y="-294"/>
</scene>
+ <!--About View Controller-->
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list