ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib | 117
++++------
ios/iosremote/InAppSettingsKit/Xibs/IASKSpecifierValuesView.xib | 92 ++-----
ios/iosremote/iosremote/Timer.m | 3
ios/iosremote/iosremote/slideShowSwipeInList_iphone.m | 2
ios/iosremote/iosremote/slideShow_vc_iphone.m | 19 -
5 files changed, 80 insertions(+), 153 deletions(-)
New commits:
commit a3abd12f1f20fed25f7719d613a8e287ec1e5e06
Author: Siqi LIU <m...@siqi.fr>
Date: Mon Sep 16 22:04:23 2013 +0200
change setting bundle background to stay consistent
Change-Id: Idf131349f91c949af57bdb79929f73b7a202ab93
diff --git a/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
b/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
index 74720fa..7ba3bea 100755
--- a/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
+++ b/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1280</int>
- <string key="IBDocument.SystemVersion">11B26</string>
- <string key="IBDocument.InterfaceBuilderVersion">1934</string>
- <string key="IBDocument.AppKitVersion">1138</string>
- <string key="IBDocument.HIToolboxVersion">566.00</string>
+ <int key="IBDocument.SystemTarget">1552</int>
+ <string key="IBDocument.SystemVersion">12E55</string>
+ <string key="IBDocument.InterfaceBuilderVersion">3084</string>
+ <string key="IBDocument.AppKitVersion">1187.39</string>
+ <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">931</string>
+ <string key="NS.object.0">2083</string>
</object>
<object class="NSArray"
key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -38,67 +38,10 @@
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview"/>
- <reference key="NSNextKeyView"/>
+ <reference key="NSWindow"/>
<object class="NSColor"
key="IBUIBackgroundColor">
- <int key="NSColorSpace">10</int>
- <object class="NSImage" key="NSImage">
- <int
key="NSImageFlags">549453824</int>
- <string key="NSSize">{512,
1}</string>
- <object class="NSMutableArray"
key="NSReps">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <integer
value="0"/>
- <object
class="NSBitmapImageRep">
- <object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
-y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
-xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
-xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
-xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
-xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
-xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
-y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
-y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
-xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
-xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
-xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
-xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
-xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
-y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
-y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
-xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
-xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
-xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
-xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
-xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
-y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
-y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
-xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
-xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
-xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
-xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
-xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
-y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
-y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
-xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
-xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
-xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
-xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
-xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA
-AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA
-AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI
-AAgACAAIAAEAAQABAAE</bytes>
-
</object>
- </object>
- </object>
- </object>
- <object class="NSColor"
key="NSColor">
- <int
key="NSColorSpace">3</int>
- <bytes
key="NSWhite">MCAwAA</bytes>
- </object>
- </object>
- <string
key="IBUIColorCocoaTouchKeyPath">groupTableViewBackgroundColor</string>
+ <int key="NSColorSpace">1</int>
+ <bytes
key="NSRGB">MC45Mjk0MTE3NjQ3IDAuOTI5NDExNzY0NyAwLjkyOTQxMTc2NDcAA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -181,7 +124,7 @@ AAgACAAIAAEAAQABAAE</bytes>
<string>-2.IBPluginDependency</string>
<string>4.IBPluginDependency</string>
</object>
- <object class="NSMutableArray"
key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>IASKAppSettingsViewController</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -204,12 +147,46 @@ AAgACAAIAAEAAQABAAE</bytes>
<nil key="sourceID"/>
<int key="maxID">10</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes"/>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray"
key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string
key="className">IASKAppSettingsViewController</string>
+ <string
key="superclassName">UITableViewController</string>
+ <object class="NSMutableDictionary"
key="actions">
+ <string
key="NS.key.0">dismiss:</string>
+ <string
key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">dismiss:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">dismiss:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary"
key="outlets">
+ <string
key="NS.key.0">delegate</string>
+ <string
key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary"
key="toOneOutletInfosByName">
+ <string
key="NS.key.0">delegate</string>
+ <object
class="IBToOneOutletInfo" key="NS.object.0">
+ <string
key="name">delegate</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">./Classes/IASKAppSettingsViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
<int key="IBDocument.localizationMode">0</int>
<string
key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDependencyDefaults">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <real value="1280" key="NS.object.0"/>
+ <real value="1552" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@@ -217,6 +194,6 @@ AAgACAAIAAEAAQABAAE</bytes>
</object>
<bool
key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">931</string>
+ <string key="IBCocoaTouchPluginVersion">2083</string>
</data>
</archive>
diff --git a/ios/iosremote/InAppSettingsKit/Xibs/IASKSpecifierValuesView.xib
b/ios/iosremote/InAppSettingsKit/Xibs/IASKSpecifierValuesView.xib
index 9c7ff86..6d1f856 100755
--- a/ios/iosremote/InAppSettingsKit/Xibs/IASKSpecifierValuesView.xib
+++ b/ios/iosremote/InAppSettingsKit/Xibs/IASKSpecifierValuesView.xib
@@ -1,31 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">768</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">1294</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <int key="IBDocument.SystemTarget">1552</int>
+ <string key="IBDocument.SystemVersion">12E55</string>
+ <string key="IBDocument.InterfaceBuilderVersion">3084</string>
+ <string key="IBDocument.AppKitVersion">1187.39</string>
+ <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">294</string>
+ <string key="NS.object.0">2083</string>
</object>
<object class="NSArray"
key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>IBProxyObject</string>
- <string>IBUIView</string>
<string>IBUITableView</string>
+ <string>IBUIView</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="dict.values" ref="0"/>
+ <string
key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects"
id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -48,38 +45,9 @@
<string key="NSFrameSize">{320,
460}</string>
<reference key="NSSuperview"
ref="191373211"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<object class="NSColor"
key="IBUIBackgroundColor">
- <int
key="NSColorSpace">10</int>
- <object class="NSImage"
key="NSImage">
- <int
key="NSImageFlags">549453824</int>
- <string
key="NSSize">{84, 1}</string>
- <object
class="NSMutableArray" key="NSReps">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <object
class="NSArray">
-
<bool key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object class="NSBitmapImageRep">
-
<object class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAVjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
-y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
-xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
-xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
-xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
-xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P8ADQEAAAMAAAABAFQAAAEB
-AAMAAAABAAEAAAECAAMAAAAEAAAB+gEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABAAEAAAEXAAQAAAABAAABUAEcAAMAAAABAAEAAAFS
-AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
-
</object>
-
</object>
-
</object>
- </object>
- <object
class="NSColor" key="NSColor">
- <int
key="NSColorSpace">3</int>
- <bytes
key="NSWhite">MCAwAA</bytes>
- </object>
- </object>
- <string
key="IBUIColorCocoaTouchKeyPath">groupTableViewBackgroundColor</string>
+ <int
key="NSColorSpace">1</int>
+ <bytes
key="NSRGB">MC45Mjk0MTE3NjQ3IDAuOTI5NDExNzY0NyAwLjkyOTQxMTc2NDcAA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<bool
key="IBUIClipsSubviews">YES</bool>
@@ -122,6 +90,14 @@
AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="IBConnectionRecord">
<object
class="IBCocoaTouchOutletConnection" key="connection">
+ <string
key="label">_tableView</string>
+ <reference key="source"
ref="372490531"/>
+ <reference key="destination"
ref="575792171"/>
+ </object>
+ <int key="connectionID">7</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object
class="IBCocoaTouchOutletConnection" key="connection">
<string
key="label">dataSource</string>
<reference key="source"
ref="575792171"/>
<reference key="destination"
ref="372490531"/>
@@ -136,21 +112,15 @@
AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">6</int>
</object>
- <object class="IBConnectionRecord">
- <object
class="IBCocoaTouchOutletConnection" key="connection">
- <string
key="label">_tableView</string>
- <reference key="source"
ref="372490531"/>
- <reference key="destination"
ref="575792171"/>
- </object>
- <int key="connectionID">7</int>
- </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <reference key="object"
ref="0"/>
+ <object class="NSArray"
key="object" id="0">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ </object>
<reference key="children"
ref="1000"/>
<nil key="parent"/>
</object>
@@ -186,16 +156,18 @@
AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSArray" key="dict.sortedKeys">
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
+ <string>-1.IBPluginDependency</string>
<string>-2.CustomClassName</string>
-
<string>1.IBEditorWindowLastContentRect</string>
+ <string>-2.IBPluginDependency</string>
<string>1.IBPluginDependency</string>
<string>4.IBPluginDependency</string>
</object>
- <object class="NSMutableArray"
key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>IASKSpecifierValuesViewController</string>
+
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UIResponder</string>
- <string>{{556, 432}, {320,
460}}</string>
+
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
@@ -221,13 +193,13 @@
AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string
key="className">IASKSpecifierValuesViewController</string>
<string
key="superclassName">UIViewController</string>
<object class="NSMutableDictionary"
key="outlets">
- <string
key="NS.key.0">_tableView</string>
+ <string
key="NS.key.0">tableView</string>
<string
key="NS.object.0">UITableView</string>
</object>
<object class="NSMutableDictionary"
key="toOneOutletInfosByName">
- <string
key="NS.key.0">_tableView</string>
+ <string
key="NS.key.0">tableView</string>
<object
class="IBToOneOutletInfo" key="NS.object.0">
- <string
key="name">_tableView</string>
+ <string
key="name">tableView</string>
<string
key="candidateClassName">UITableView</string>
</object>
</object>
@@ -242,7 +214,7 @@
AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string
key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDependencyDefaults">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="768" key="NS.object.0"/>
+ <real value="1552" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@@ -250,6 +222,6 @@
AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<bool
key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">294</string>
+ <string key="IBCocoaTouchPluginVersion">2083</string>
</data>
</archive>
commit 3cb55e0ff6cb0d86fb623ad16842a74c4af23718
Author: Siqi LIU <m...@siqi.fr>
Date: Mon Sep 16 22:03:54 2013 +0200
retain timer running state when auto-start then didAppear
Change-Id: I4b4b327643919a9a6266f51e3e0bc8791ad27fbe
diff --git a/ios/iosremote/iosremote/Timer.m b/ios/iosremote/iosremote/Timer.m
index 269ff9c..e493a96 100644
--- a/ios/iosremote/iosremote/Timer.m
+++ b/ios/iosremote/iosremote/Timer.m
@@ -55,7 +55,6 @@ int vibrationCount;
self.timeLabel = timeLabel;
[self setupActions];
- [self clear];
return self;
}
@@ -67,7 +66,7 @@ int vibrationCount;
self.timeLabel = (UILabel *)[[cell viewWithTag:9] viewWithTag:1];
[self setupActions];
- [self clear];
+// [self clear];
}
- (void) setupActions
diff --git a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
index f3d0637..deb7a83 100644
--- a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
+++ b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
@@ -79,8 +79,6 @@ dispatch_queue_t backgroundQueue;
[self.stopWatch updateStartButtonIcon];
[self.timer updateStartButtonIcon];
if ([self.comManager.interpreter.slideShow size] > 0) {
- [self.stopWatch updateStartButtonIcon];
- [self.timer updateStartButtonIcon];
NSIndexPath *indexPath = [NSIndexPath
indexPathForRow:self.slideshow.currentSlide
inSection:1];
[self.tableView selectRowAtIndexPath:indexPath animated:NO
scrollPosition:UITableViewScrollPositionNone];
diff --git a/ios/iosremote/iosremote/slideShow_vc_iphone.m
b/ios/iosremote/iosremote/slideShow_vc_iphone.m
index 9a7bddf..b97ea0c 100644
--- a/ios/iosremote/iosremote/slideShow_vc_iphone.m
+++ b/ios/iosremote/iosremote/slideShow_vc_iphone.m
@@ -34,7 +34,6 @@
@property (nonatomic, strong) id slideShowFinishedObserver;
@property (nonatomic, strong) SlideShow* slideshow;
-@property BOOL pointerCalibrationOn;
@property CGPoint refLeftUpperGravity;
@property CGPoint refRightUpperGravity;
@property CGPoint refRightLowerGravity;
@@ -53,20 +52,6 @@
#pragma mark - Pointer
-- (CMMotionManager *)motionManager
-{
- CMMotionManager *motionManager = nil;
-
- id appDelegate = [UIApplication sharedApplication].delegate;
-
- if ([appDelegate respondsToSelector:@selector(motionManager)]) {
- motionManager = [appDelegate motionManager];
- }
-
- return motionManager;
-}
-
-// Not localized for now since this is subject to fundemental changes
- (IBAction)pointerAction:(id)sender {
if ([self.touchPointerImage isHidden]){
[self.slideshow getContentAtIndex:self.slideshow.currentSlide
forView:self.touchPointerImage];
@@ -198,7 +183,6 @@
action:@selector(
revealToggle: )];
self.revealViewController.navigationItem.leftBarButtonItem =
self.revealButtonItem;
- self.pointerCalibrationOn = NO;
self.movingPointer.layer.cornerRadius = 3;
[self.view
addGestureRecognizer:self.revealViewController.panGestureRecognizer];
@@ -255,9 +239,6 @@
[self.slideView setShadow];
[self.secondarySlideView setShadow];
- // We calibrate once when presentation starts. needs a users alert to
inform users to point at the center of the screen at the beginning
- self.pointerCalibrationOn = YES;
-
[super viewDidAppear:animated];
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
