ios/iosremote/iosremote.xcodeproj/project.pbxproj | 4 +
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 12 ++--
ios/iosremote/iosremote/newServer_vc.m | 22 ++++++--
ios/iosremote/iosremote/slideShowSwipeInList_iphone.h | 4 +
ios/iosremote/iosremote/slideShowSwipeInList_iphone.m | 1
ios/iosremote/iosremote/slideShow_vc_iphone.m | 13 ++++
ios/iosremote/iosremote/stopWatch.h | 1
ios/iosremote/iosremote/stopWatch.m | 33 +++++++-----
8 files changed, 64 insertions(+), 26 deletions(-)
New commits:
commit e289eb655fb0d750b09c74dfd9811ab27243a207
Author: Siqi LIU <m...@siqi.fr>
Date: Mon Aug 5 19:40:20 2013 +0200
minor
Change-Id: Ia80ef855dc83bb60dfe484d95e8199679bd58d44
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index f3db340..3937a05 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -597,7 +597,7 @@
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
- <segue reference="UPp-kY-X3T"/>
+ <segue reference="eIY-4P-1sI"/>
<segue reference="EWS-Nn-mQc"/>
</inferredMetricsTieBreakers>
</document>
\ No newline at end of file
commit b8e7ab20d2bb79d54c6ac431d3e8d689b4a3447a
Author: Siqi LIU <m...@siqi.fr>
Date: Mon Aug 5 19:37:07 2013 +0200
remove timer on slideshow navbar when cleared
Change-Id: I6b56880e64c4f0bcf7883817f2fb60c2dced4fe3
diff --git a/ios/iosremote/iosremote/stopWatch.m
b/ios/iosremote/iosremote/stopWatch.m
index b6d80f9..3f66c9b 100644
--- a/ios/iosremote/iosremote/stopWatch.m
+++ b/ios/iosremote/iosremote/stopWatch.m
@@ -26,14 +26,12 @@
@synthesize lastInterval = _lastInterval;
-dispatch_queue_t backgroundQueue;
- (stopWatch *) init
{
self = [super init];
self.state = TIMER_STATE_CLEARED;
self.set = NO;
- backgroundQueue = dispatch_queue_create("com.libreoffice.iosremote",
DISPATCH_QUEUE_CONCURRENT);
return self;
}
@@ -70,7 +68,6 @@ dispatch_queue_t backgroundQueue;
- (void)updateTimer
{
- dispatch_async(backgroundQueue, ^(void) {
// Create date from the elapsed time
NSDate *currentDate = [NSDate date];
NSTimeInterval timeInterval = [currentDate
timeIntervalSinceDate:self.startDate] + self.lastInterval;
@@ -83,11 +80,8 @@ dispatch_queue_t backgroundQueue;
// Format the elapsed time and set it to the label
NSString *timeString = [dateFormatter stringFromDate:timerDate];
- dispatch_async(dispatch_get_main_queue(), ^{
- self.timeLabel.text = timeString;
- self.barItem.title = timeString;
- });
- });
+ self.timeLabel.text = timeString;
+ self.barItem.title = timeString;
}
commit fd83796313aa431788066e3f33c0fff546d4f30f
Author: Siqi LIU <m...@siqi.fr>
Date: Mon Aug 5 19:34:49 2013 +0200
display timer on the main slideshow screen & runloop fix
Change-Id: I4ea660a151992c74afb321f1bae19fdd2c5ee40e
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index 02363de..f3db340 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -284,12 +284,12 @@
<autoresizingMask key="autoresizingMask"
widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO"
contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000"
id="bZq-z2-OKU">
- <rect key="frame" x="97" y="8"
width="220" height="167"/>
+ <rect key="frame" x="3" y="8"
width="220" height="167"/>
<autoresizingMask
key="autoresizingMask" flexibleMinX="YES" widthSizable="YES"
heightSizable="YES"/>
<color key="backgroundColor" white="1"
alpha="1" colorSpace="calibratedWhite"/>
</imageView>
<view contentMode="scaleToFill"
id="Y1f-iI-63a">
- <rect key="frame" x="3" y="3"
width="86" height="172"/>
+ <rect key="frame" x="231" y="3"
width="86" height="172"/>
<autoresizingMask
key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES"
heightSizable="YES"/>
<subviews>
<imageView
contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000"
id="B2g-rO-b9G">
@@ -301,7 +301,7 @@
<color key="backgroundColor"
white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<label opaque="NO" clipsSubviews="YES"
userInteractionEnabled="NO" alpha="0.80000000000000004" contentMode="left"
text="Label" textAlignment="center" lineBreakMode="tailTruncation"
baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3BV-KX-Qla">
- <rect key="frame" x="265" y="154"
width="52" height="21"/>
+ <rect key="frame" x="3" y="154"
width="52" height="21"/>
<color key="backgroundColor"
white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<rect key="contentStretch"
x="1.3877787807814457e-17" y="0.0" width="1" height="1"/>
<fontDescription key="fontDescription"
type="system" pointSize="17"/>
@@ -332,7 +332,7 @@
<color key="backgroundColor" white="0.0"
alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<view hidden="YES" opaque="NO"
userInteractionEnabled="NO" alpha="0.60000000000000009"
contentMode="scaleToFill" id="uSh-Ne-BdH" userLabel="blockview">
- <rect key="frame" x="0.0" y="0.0" width="320"
height="640"/>
+ <rect key="frame" x="0.0" y="-46" width="320"
height="640"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor"
cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
<accessibility
key="accessibilityConfiguration">
@@ -341,7 +341,7 @@
</view>
<imageView hidden="YES" alpha="0.0"
contentMode="scaleAspectFit" image="ic_launc...@2x.png" id="ExH-sw-Z1i">
<rect key="frame" x="0.0" y="148" width="320"
height="253"/>
- <autoresizingMask key="autoresizingMask"
widthSizable="YES" flexibleMaxY="YES"/>
+ <autoresizingMask key="autoresizingMask"
widthSizable="YES"/>
</imageView>
<view hidden="YES" contentMode="scaleToFill"
id="iCc-m2-vR5" userLabel="pointer">
<rect key="frame" x="157" y="272" width="5"
height="5"/>
@@ -528,13 +528,76 @@
<image name="timer_clear_btn.png" width="74" height="74"/>
<image name="timer_start_btn.png" width="74" height="74"/>
</resources>
+ <classes>
+ <class className="EditableTableViewCell"
superclassName="UITableViewCell">
+ <source key="sourceIdentifier" type="project"
relativePath="./Classes/EditableTableViewCell.h"/>
+ </class>
+ <class className="SWRevealViewController"
superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project"
relativePath="./Classes/SWRevealViewController.h"/>
+ </class>
+ <class className="newServerViewController"
superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project"
relativePath="./Classes/newServerViewController.h"/>
+ <relationships>
+ <relationship kind="action" name="save:"/>
+ </relationships>
+ </class>
+ <class className="pinValidation_vc" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project"
relativePath="./Classes/pinValidation_vc.h"/>
+ <relationships>
+ <relationship kind="outlet" name="pinLabel"
candidateClass="UILabel"/>
+ <relationship kind="outlet" name="statusLabel"
candidateClass="UILabel"/>
+ </relationships>
+ </class>
+ <class className="server_list_vc"
superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project"
relativePath="./Classes/server_list_vc.h"/>
+ <relationships>
+ <relationship kind="outlet" name="serverTable"
candidateClass="UITableView"/>
+ </relationships>
+ </class>
+ <class className="slideShowPreviewTable_vc"
superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project"
relativePath="./Classes/slideShowPreviewTable_vc.h"/>
+ <relationships>
+ <relationship kind="action" name="startPresentationAction:"/>
+ <relationship kind="outlet" name="optionsTable"
candidateClass="UITableView"/>
+ </relationships>
+ </class>
+ <class className="slideShowPreviewTable_vc_iphone"
superclassName="slideShowPreviewTable_vc">
+ <source key="sourceIdentifier" type="project"
relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/>
+ <relationships>
+ <relationship kind="outlet" name="titleLabel"
candidateClass="UILabel"/>
+ </relationships>
+ </class>
+ <class className="slideShowSwipeInList"
superclassName="UITableViewController">
+ <source key="sourceIdentifier" type="project"
relativePath="./Classes/slideShowSwipeInList.h"/>
+ </class>
+ <class className="slideShow_vc" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project"
relativePath="./Classes/slideShow_vc.h"/>
+ <relationships>
+ <relationship kind="action" name="accPointerAction:"/>
+ <relationship kind="action" name="nextSlideAction:"/>
+ <relationship kind="action" name="pointerAction:"/>
+ <relationship kind="action" name="previousSlideAction:"/>
+ <relationship kind="outlet" name="blockingView"
candidateClass="UIView"/>
+ <relationship kind="outlet" name="bottomView"
candidateClass="UIView"/>
+ <relationship kind="outlet" name="lecturer_notes"
candidateClass="UIWebView"/>
+ <relationship kind="outlet" name="movingPointer"
candidateClass="UIView"/>
+ <relationship kind="outlet" name="notesView"
candidateClass="UIView"/>
+ <relationship kind="outlet" name="pointerBtn"
candidateClass="UIButton"/>
+ <relationship kind="outlet" name="revealButtonItem"
candidateClass="UIBarButtonItem"/>
+ <relationship kind="outlet" name="secondarySlideView"
candidateClass="UIImageView"/>
+ <relationship kind="outlet" name="slideNumber"
candidateClass="UILabel"/>
+ <relationship kind="outlet" name="slideView"
candidateClass="UIImageView"/>
+ <relationship kind="outlet" name="touchPointerImage"
candidateClass="UIImageView"/>
+ </relationships>
+ </class>
+ </classes>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
- <segue reference="eIY-4P-1sI"/>
+ <segue reference="UPp-kY-X3T"/>
<segue reference="EWS-Nn-mQc"/>
</inferredMetricsTieBreakers>
</document>
\ No newline at end of file
diff --git a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.h
b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.h
index 2953e59..2ba8298 100644
--- a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.h
+++ b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.h
@@ -7,6 +7,10 @@
*/
#import <UIKit/UIKit.h>
+@class stopWatch;
+
@interface slideShowSwipeInList : UITableViewController
<UITableViewDataSource, UITableViewDelegate>
+@property (nonatomic, strong) stopWatch *stopWatch;
+
@end
diff --git a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
index 67db07a..28a00a7 100644
--- a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
+++ b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
@@ -21,7 +21,6 @@
@property (nonatomic, strong) CommunicationManager *comManager;
@property (nonatomic, strong) SlideShow *slideshow;
-@property (nonatomic, strong) stopWatch *stopWatch;
@end
diff --git a/ios/iosremote/iosremote/slideShow_vc_iphone.m
b/ios/iosremote/iosremote/slideShow_vc_iphone.m
index 0d411b7..42ed69f 100644
--- a/ios/iosremote/iosremote/slideShow_vc_iphone.m
+++ b/ios/iosremote/iosremote/slideShow_vc_iphone.m
@@ -11,8 +11,10 @@
#import "CommunicationManager.h"
#import "SWRevealViewController.h"
#import "CommandInterpreter.h"
+#import "stopWatch.h"
#import "CommandTransmitter.h"
#import "slideShowPreviewTable_vc.h"
+#import "slideShowSwipeInList_iphone.h"
#import <QuartzCore/QuartzCore.h>
#import <CoreMotion/CoreMotion.h>
@@ -317,11 +319,18 @@
[self.navigationController popViewControllerAnimated:YES];
}
+- (void) viewWillAppear:(BOOL)animated
+{
+ [super viewWillAppear:animated];
+}
+
- (void) viewDidAppear:(BOOL)animated
{
NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
+
+ [[(slideShowSwipeInList *)self.revealViewController.rearViewController
stopWatch] setBarItem:self.navigationController.navigationBar.topItem];
self.slideShowImageNoteReadyObserver =[center
addObserverForName:MSG_SLIDE_CHANGED
object:nil
diff --git a/ios/iosremote/iosremote/stopWatch.h
b/ios/iosremote/iosremote/stopWatch.h
index 7330596..9cb716b 100644
--- a/ios/iosremote/iosremote/stopWatch.h
+++ b/ios/iosremote/iosremote/stopWatch.h
@@ -18,6 +18,7 @@
@property (strong, nonatomic) NSTimer *stopWatchTimer;
@property (strong, nonatomic) NSDate *startDate;
@property BOOL set;
+@property (weak, nonatomic) UINavigationItem * barItem;
- (stopWatch *) initWithStartButton:(UIButton *)startButton
ClearButton:(UIButton *)clearButton
diff --git a/ios/iosremote/iosremote/stopWatch.m
b/ios/iosremote/iosremote/stopWatch.m
index 60c9ced..b6d80f9 100644
--- a/ios/iosremote/iosremote/stopWatch.m
+++ b/ios/iosremote/iosremote/stopWatch.m
@@ -22,14 +22,19 @@
@synthesize startButton = _startButton;
@synthesize clearButton = _clearButton;
@synthesize timeLabel = _timeLabel;
+@synthesize barItem = _barItem;
@synthesize lastInterval = _lastInterval;
+dispatch_queue_t backgroundQueue;
+
- (stopWatch *) init
{
self = [super init];
self.state = TIMER_STATE_CLEARED;
self.set = NO;
+ backgroundQueue = dispatch_queue_create("com.libreoffice.iosremote",
DISPATCH_QUEUE_CONCURRENT);
+
return self;
}
@@ -65,19 +70,24 @@
- (void)updateTimer
{
- // Create date from the elapsed time
- NSDate *currentDate = [NSDate date];
- NSTimeInterval timeInterval = [currentDate
timeIntervalSinceDate:self.startDate] + self.lastInterval;
- NSDate *timerDate = [NSDate dateWithTimeIntervalSince1970:timeInterval];
-
- // Create a date formatter
- NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
- [dateFormatter setDateFormat:@"HH:mm:ss"];
- [dateFormatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0.0]];
-
- // Format the elapsed time and set it to the label
- NSString *timeString = [dateFormatter stringFromDate:timerDate];
- self.timeLabel.text = timeString;
+ dispatch_async(backgroundQueue, ^(void) {
+ // Create date from the elapsed time
+ NSDate *currentDate = [NSDate date];
+ NSTimeInterval timeInterval = [currentDate
timeIntervalSinceDate:self.startDate] + self.lastInterval;
+ NSDate *timerDate = [NSDate
dateWithTimeIntervalSince1970:timeInterval];
+
+ // Create a date formatter
+ NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+ [dateFormatter setDateFormat:@"HH:mm:ss"];
+ [dateFormatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0.0]];
+
+ // Format the elapsed time and set it to the label
+ NSString *timeString = [dateFormatter stringFromDate:timerDate];
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.timeLabel.text = timeString;
+ self.barItem.title = timeString;
+ });
+ });
}
@@ -97,6 +107,7 @@
selector:@selector(updateTimer)
userInfo:nil
repeats:YES];
+ [[NSRunLoop currentRunLoop] addTimer:self.stopWatchTimer
forMode:NSRunLoopCommonModes];
break;
case TIMER_STATE_CLEARED:
self.state = TIMER_STATE_RUNNING;
@@ -107,6 +118,7 @@
selector:@selector(updateTimer)
userInfo:nil
repeats:YES];
+ [[NSRunLoop currentRunLoop] addTimer:self.stopWatchTimer
forMode:NSRunLoopCommonModes];
break;
default:
break;
@@ -142,6 +154,7 @@
[self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"]
forState:UIControlStateNormal];
[self updateTimer];
+ self.barItem.title = @"";
}
@end
commit b0fd4d03087989e193b2bd2ad071339a975ac4cd
Author: Siqi LIU <m...@siqi.fr>
Date: Mon Aug 5 18:27:21 2013 +0200
improve usability in new server interface
Change-Id: I471f111a654bf6498e39de79912135b7a39f3088
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index 9baef73..2d8dc71 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -62,6 +62,7 @@
8C0DC84517A4185A0099E5AE /* previousbutton_nor...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC84117A4185A0099E5AE /*
previousbutton_nor...@2x.png */; };
8C0DC84717A45B160099E5AE /* libO_icon.png in Resources */ =
{isa = PBXBuildFile; fileRef = 8C0DC84617A45B160099E5AE /* libO_icon.png */; };
8C0DC85117A512250099E5AE /* AppDelegate_ipad.m in Sources */ =
{isa = PBXBuildFile; fileRef = 8C0DC85017A512250099E5AE /* AppDelegate_ipad.m
*/; };
+ 8C19F41D17B00899005BDB61 /* SystemConfiguration.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = 8C19F41C17B00899005BDB61 /*
SystemConfiguration.framework */; };
8C1A16FB17A2853100B4BB3C /* iosremote_iphone_i...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 8C1A16FA17A2853100B4BB3C /*
iosremote_iphone_i...@2x.png */; };
8C1A16FD17A2853700B4BB3C /* iosremote_iphone_icon.png in
Resources */ = {isa = PBXBuildFile; fileRef = 8C1A16FC17A2853700B4BB3C /*
iosremote_iphone_icon.png */; };
8C1A16FF17A2853F00B4BB3C /* iosremote_ipad_icon.png in
Resources */ = {isa = PBXBuildFile; fileRef = 8C1A16FE17A2853F00B4BB3C /*
iosremote_ipad_icon.png */; };
@@ -165,6 +166,7 @@
8C0DC84617A45B160099E5AE /* libO_icon.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; path = libO_icon.png;
sourceTree = "<group>"; };
8C0DC84F17A512250099E5AE /* AppDelegate_ipad.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
AppDelegate_ipad.h; path = iosremote/AppDelegate_ipad.h; sourceTree =
"<group>"; };
8C0DC85017A512250099E5AE /* AppDelegate_ipad.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name
= AppDelegate_ipad.m; path = iosremote/AppDelegate_ipad.m; sourceTree =
"<group>"; };
+ 8C19F41C17B00899005BDB61 /* SystemConfiguration.framework */ =
{isa = PBXFileReference; lastKnownFileType = wrapper.framework; name =
SystemConfiguration.framework; path =
System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT;
};
8C1A16FA17A2853100B4BB3C /* iosremote_iphone_i...@2x.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
"iosremote_iphone_i...@2x.png"; sourceTree = "<group>"; };
8C1A16FC17A2853700B4BB3C /* iosremote_iphone_icon.png */ = {isa
= PBXFileReference; lastKnownFileType = image.png; path =
iosremote_iphone_icon.png; sourceTree = "<group>"; };
8C1A16FE17A2853F00B4BB3C /* iosremote_ipad_icon.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; path =
iosremote_ipad_icon.png; sourceTree = "<group>"; };
@@ -210,6 +212,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 8C19F41D17B00899005BDB61 /*
SystemConfiguration.framework in Frameworks */,
571102701794128E007D343B /* libz.dylib in
Frameworks */,
57DC7007178D84490050FC58 /*
CoreMotion.framework in Frameworks */,
BE9EBD071765BF0800283FD2 /* CoreImage.framework
in Frameworks */,
@@ -307,6 +310,7 @@
57C6E3E6175E06E800E8BC5F = {
isa = PBXGroup;
children = (
+ 8C19F41C17B00899005BDB61 /*
SystemConfiguration.framework */,
8C1A170217A28AB900B4BB3C /* Shared */,
8C1A170917A28E6500B4BB3C /* iPhone */,
8C1A170817A28E5E00B4BB3C /* iPad */,
diff --git a/ios/iosremote/iosremote/newServer_vc.m
b/ios/iosremote/iosremote/newServer_vc.m
index fb44d66..1ab20c1 100644
--- a/ios/iosremote/iosremote/newServer_vc.m
+++ b/ios/iosremote/iosremote/newServer_vc.m
@@ -11,6 +11,7 @@
#import "EditableTableViewCell.h"
#import "serverList_vc.h"
#import "Server.h"
+#import <SystemConfiguration/CaptiveNetwork.h>
@implementation newServerViewController
@@ -32,8 +33,9 @@
NSString *serverName = [self.nameCell.textField text];
NSString *serverAddr = [self.addrCell.textField text];
if ([serverAddr isValidIPAddress]) {
- if (!serverName)
- serverName = @"Computer";
+ if (!serverName) {
+ serverName = [[self fetchSSIDInfo] valueForKey:@"SSID"];
+ }
NSLog(@"New server name:%@ ip:%@", serverName, serverAddr);
[self.comManager addServersWithName:serverName AtAddress:serverAddr];
[self.navigationController popViewControllerAnimated:YES];
@@ -60,6 +62,18 @@
#pragma mark -
#pragma mark UIViewController Methods
+- (id)fetchSSIDInfo {
+ NSArray *ifs = (__bridge_transfer id)CNCopySupportedInterfaces();
+ id info = nil;
+ NSLog(@"Obtaining Wifi SSID");
+ for (NSString *ifnam in ifs) {
+ info = (__bridge_transfer id)CNCopyCurrentNetworkInfo((__bridge
CFStringRef)ifnam);
+ NSLog(@"%@ => %@", ifnam, info);
+ if (info && [info count]) { break; }
+ }
+ return info;
+}
+
- (void)viewDidLoad
{
self.comManager = [CommunicationManager sharedComManager];
@@ -207,11 +221,11 @@
{
case InformationSection:
{
- if ([indexPath row] == 0)
+ if ([indexPath row] == 1)
{
cell = [self nameCell];
text = [self.server serverName];
- placeholder = @"Server Name (optional)";
+ placeholder = @"Name (optional)";
keyboardType = UIKeyboardTypeDefault;
}
else
commit ac45413c2c81c081c8d065251bc4ed10e8292a11
Author: Siqi LIU <m...@siqi.fr>
Date: Mon Aug 5 18:11:47 2013 +0200
swap sideBar reveal button and stop presentation button
Change-Id: I4894e76dfbfda5fe1bc89641f774b2c96c04486b
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index 98f21d8..02363de 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -107,7 +107,7 @@
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor"
cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<sections>
- <tableViewSection footerTitle="Register a new
server and remeber it for future connection" id="46W-NE-CYW">
+ <tableViewSection footerTitle="" id="46W-NE-CYW">
<cells>
<tableViewCell contentMode="scaleToFill"
selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1"
indentationWidth="0.0" id="EN9-tY-k4P" customClass="EditableTableViewCell">
<rect key="frame" x="0.0" y="10"
width="320" height="45"/>
@@ -528,69 +528,6 @@
<image name="timer_clear_btn.png" width="74" height="74"/>
<image name="timer_start_btn.png" width="74" height="74"/>
</resources>
- <classes>
- <class className="EditableTableViewCell"
superclassName="UITableViewCell">
- <source key="sourceIdentifier" type="project"
relativePath="./Classes/EditableTableViewCell.h"/>
- </class>
- <class className="SWRevealViewController"
superclassName="UIViewController">
- <source key="sourceIdentifier" type="project"
relativePath="./Classes/SWRevealViewController.h"/>
- </class>
- <class className="newServerViewController"
superclassName="UITableViewController">
- <source key="sourceIdentifier" type="project"
relativePath="./Classes/newServerViewController.h"/>
- <relationships>
- <relationship kind="action" name="save:"/>
- </relationships>
- </class>
- <class className="pinValidation_vc" superclassName="UIViewController">
- <source key="sourceIdentifier" type="project"
relativePath="./Classes/pinValidation_vc.h"/>
- <relationships>
- <relationship kind="outlet" name="pinLabel"
candidateClass="UILabel"/>
- <relationship kind="outlet" name="statusLabel"
candidateClass="UILabel"/>
- </relationships>
- </class>
- <class className="server_list_vc"
superclassName="UITableViewController">
- <source key="sourceIdentifier" type="project"
relativePath="./Classes/server_list_vc.h"/>
- <relationships>
- <relationship kind="outlet" name="serverTable"
candidateClass="UITableView"/>
- </relationships>
- </class>
- <class className="slideShowPreviewTable_vc"
superclassName="UITableViewController">
- <source key="sourceIdentifier" type="project"
relativePath="./Classes/slideShowPreviewTable_vc.h"/>
- <relationships>
- <relationship kind="action" name="startPresentationAction:"/>
- <relationship kind="outlet" name="optionsTable"
candidateClass="UITableView"/>
- </relationships>
- </class>
- <class className="slideShowPreviewTable_vc_iphone"
superclassName="slideShowPreviewTable_vc">
- <source key="sourceIdentifier" type="project"
relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/>
- <relationships>
- <relationship kind="outlet" name="titleLabel"
candidateClass="UILabel"/>
- </relationships>
- </class>
- <class className="slideShowSwipeInList"
superclassName="UITableViewController">
- <source key="sourceIdentifier" type="project"
relativePath="./Classes/slideShowSwipeInList.h"/>
- </class>
- <class className="slideShow_vc" superclassName="UIViewController">
- <source key="sourceIdentifier" type="project"
relativePath="./Classes/slideShow_vc.h"/>
- <relationships>
- <relationship kind="action" name="accPointerAction:"/>
- <relationship kind="action" name="nextSlideAction:"/>
- <relationship kind="action" name="pointerAction:"/>
- <relationship kind="action" name="previousSlideAction:"/>
- <relationship kind="outlet" name="blockingView"
candidateClass="UIView"/>
- <relationship kind="outlet" name="bottomView"
candidateClass="UIView"/>
- <relationship kind="outlet" name="lecturer_notes"
candidateClass="UIWebView"/>
- <relationship kind="outlet" name="movingPointer"
candidateClass="UIView"/>
- <relationship kind="outlet" name="notesView"
candidateClass="UIView"/>
- <relationship kind="outlet" name="pointerBtn"
candidateClass="UIButton"/>
- <relationship kind="outlet" name="revealButtonItem"
candidateClass="UIBarButtonItem"/>
- <relationship kind="outlet" name="secondarySlideView"
candidateClass="UIImageView"/>
- <relationship kind="outlet" name="slideNumber"
candidateClass="UILabel"/>
- <relationship kind="outlet" name="slideView"
candidateClass="UIImageView"/>
- <relationship kind="outlet" name="touchPointerImage"
candidateClass="UIImageView"/>
- </relationships>
- </class>
- </classes>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
diff --git a/ios/iosremote/iosremote/slideShow_vc_iphone.m
b/ios/iosremote/iosremote/slideShow_vc_iphone.m
index 6ddde90..0d411b7 100644
--- a/ios/iosremote/iosremote/slideShow_vc_iphone.m
+++ b/ios/iosremote/iosremote/slideShow_vc_iphone.m
@@ -288,13 +288,13 @@
target:self
action:@selector(handleBack:)];
[backButton setTintColor:[UIColor redColor]];
- self.revealViewController.navigationItem.leftBarButtonItem = backButton;
+ self.revealViewController.navigationItem.rightBarButtonItem = backButton;
self.revealButtonItem = [[UIBarButtonItem alloc] initWithImage: [UIImage
imageNamed:@"more_icon.png"]
style:UIBarButtonItemStyleBordered
target:self.revealViewController
action:@selector(
revealToggle: )];
- self.revealViewController.navigationItem.rightBarButtonItem =
self.revealButtonItem;
+ self.revealViewController.navigationItem.leftBarButtonItem =
self.revealButtonItem;
[self.navigationController.navigationBar addGestureRecognizer:
self.revealViewController.panGestureRecognizer];
self.pointerCalibrationOn = NO;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
