auto-layout for control pad

Change-Id: I0eb15009fbc48977a58f06501ef519cc0198b26b

ios/iosremote/iosremote.xcodeproj/project.pbxproj

@@ -15,6 +15,9 @@
 		57867A5B1787510700EBBE52 /* released_next_button.png in Resources */ = {isa = PBXBuildFile; fileRef = 57867A591787510700EBBE52 /* released_next_button.png */; };
 		57867A5E178752CD00EBBE52 /* pushed_previous_button.png in Resources */ = {isa = PBXBuildFile; fileRef = 57867A5C178752CD00EBBE52 /* pushed_previous_button.png */; };
 		57867A5F178752CD00EBBE52 /* released_previous_button.png in Resources */ = {isa = PBXBuildFile; fileRef = 57867A5D178752CD00EBBE52 /* released_previous_button.png */; };
+		57AEEDAD1789543D007F4F97 /* libO_toolBar_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 57AEEDAC1789543D007F4F97 /* libO_toolBar_bg.png */; };
+		57AEEDAF17895B67007F4F97 /* pointer.png in Resources */ = {isa = PBXBuildFile; fileRef = 57AEEDAE17895B67007F4F97 /* pointer.png */; };
+		57AEEDB117895BF5007F4F97 /* pointer_pushed.png in Resources */ = {isa = PBXBuildFile; fileRef = 57AEEDB017895BF5007F4F97 /* pointer_pushed.png */; };
 		57B152991764703500EECC67 /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 57B152981764703500EECC67 /* Base64.m */; };
 		57B1529F176486C300EECC67 /* CommandTransmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 57B1529E176486C300EECC67 /* CommandTransmitter.m */; };
 		57B7625D17621E42007703F6 /* SlideShow.m in Sources */ = {isa = PBXBuildFile; fileRef = 57B7625C17621E42007703F6 /* SlideShow.m */; };
@@ -51,8 +54,11 @@
 		57867A591787510700EBBE52 /* released_next_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = released_next_button.png; path = iosremote/released_next_button.png; sourceTree = "<group>"; };
 		57867A5C178752CD00EBBE52 /* pushed_previous_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pushed_previous_button.png; path = iosremote/pushed_previous_button.png; sourceTree = "<group>"; };
 		57867A5D178752CD00EBBE52 /* released_previous_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = released_previous_button.png; path = iosremote/released_previous_button.png; sourceTree = "<group>"; };
-		57B152971764703500EECC67 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Base64.h; path = iosremote/Base64.h; sourceTree = "<group>"; };
-		57B152981764703500EECC67 /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Base64.m; path = iosremote/Base64.m; sourceTree = "<group>"; };
+		57AEEDAC1789543D007F4F97 /* libO_toolBar_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = libO_toolBar_bg.png; path = iosremote/libO_toolBar_bg.png; sourceTree = "<group>"; };
+		57AEEDAE17895B67007F4F97 /* pointer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pointer.png; path = iosremote/pointer.png; sourceTree = "<group>"; };
+		57AEEDB017895BF5007F4F97 /* pointer_pushed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pointer_pushed.png; path = iosremote/pointer_pushed.png; sourceTree = "<group>"; };
+		57B152971764703500EECC67 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
+		57B152981764703500EECC67 /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = "<group>"; };
 		57B1529D176486C300EECC67 /* CommandTransmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandTransmitter.h; sourceTree = "<group>"; };
 		57B1529E176486C300EECC67 /* CommandTransmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommandTransmitter.m; sourceTree = "<group>"; };
 		57B7625B17621E42007703F6 /* SlideShow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlideShow.h; sourceTree = "<group>"; };
@@ -108,6 +114,9 @@
 		57AEEDAA1788D7B2007F4F97 /* Assets */ = {
 			isa = PBXGroup;
 			children = (
+				57AEEDB017895BF5007F4F97 /* pointer_pushed.png */,
+				57AEEDAE17895B67007F4F97 /* pointer.png */,
+				57AEEDAC1789543D007F4F97 /* libO_toolBar_bg.png */,
 				57867A581787510700EBBE52 /* pushed_next_button.png */,
 				57867A591787510700EBBE52 /* released_next_button.png */,
 				57867A5C178752CD00EBBE52 /* pushed_previous_button.png */,
@@ -117,13 +126,22 @@
 			name = Assets;
 			sourceTree = "<group>";
 		};
+		57AEEDAB1789443D007F4F97 /* slideShowPreview */ = {
+			isa = PBXGroup;
+			children = (
+				57FE71E41785D7FE00B50125 /* slideShowPreview_vc.h */,
+				57FE71E51785D7FE00B50125 /* slideShowPreview_vc.m */,
+				57FE71E717861A9000B50125 /* slideShowPreviewTable_vc.h */,
+				57FE71E817861A9000B50125 /* slideShowPreviewTable_vc.m */,
+			);
+			name = slideShowPreview;
+			sourceTree = "<group>";
+		};
 		57C6E3E6175E06E800E8BC5F = {
 			isa = PBXGroup;
 			children = (
 				57AEEDAA1788D7B2007F4F97 /* Assets */,
 				BE9EBD061765BF0800283FD2 /* CoreImage.framework */,
-				57B152971764703500EECC67 /* Base64.h */,
-				57B152981764703500EECC67 /* Base64.m */,
 				57C6E425175E076900E8BC5F /* Communication */,
 				57C6E3F8175E06E800E8BC5F /* iosremote */,
 				57C6E3F1175E06E800E8BC5F /* Frameworks */,
@@ -156,8 +174,7 @@
 				57C6E40A175E06E800E8BC5F /* MainStoryboard_iPhone.storyboard */,
 				57FE71E11785C61300B50125 /* pinValidation_vc.h */,
 				57FE71E21785C61400B50125 /* pinValidation_vc.m */,
-				57FE71E41785D7FE00B50125 /* slideShowPreview_vc.h */,
-				57FE71E51785D7FE00B50125 /* slideShowPreview_vc.m */,
+				57AEEDAB1789443D007F4F97 /* slideShowPreview */,
 				57C6E401175E06E800E8BC5F /* libreoffice_sdremoteAppDelegate.h */,
 				57C6E402175E06E800E8BC5F /* libreoffice_sdremoteAppDelegate.m */,
 				57867A551787385800EBBE52 /* slideShow_vc.h */,
@@ -166,10 +183,6 @@
 				5753DD9817834D7100DB71BB /* newServer_vc.m */,
 				5753DD8E1781EA0300DB71BB /* serverList_vc.h */,
 				5753DD8F1781EA0300DB71BB /* serverList_vc.m */,
-				57CFED9717838FDC00E82E05 /* EditableTableViewCell.h */,
-				57CFED9817838FDC00E82E05 /* EditableTableViewCell.m */,
-				57FE71E717861A9000B50125 /* slideShowPreviewTable_vc.h */,
-				57FE71E817861A9000B50125 /* slideShowPreviewTable_vc.m */,
 			);
 			path = iosremote;
 			sourceTree = "<group>";
@@ -177,6 +190,10 @@
 		57C6E3F9175E06E800E8BC5F /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				57B152971764703500EECC67 /* Base64.h */,
+				57B152981764703500EECC67 /* Base64.m */,
+				57CFED9717838FDC00E82E05 /* EditableTableViewCell.h */,
+				57CFED9817838FDC00E82E05 /* EditableTableViewCell.m */,
 				57C6E3FA175E06E800E8BC5F /* iosremote-Info.plist */,
 				57C6E3FB175E06E800E8BC5F /* InfoPlist.strings */,
 				57C6E3FE175E06E800E8BC5F /* main.m */,
@@ -270,6 +287,9 @@
 				57867A5B1787510700EBBE52 /* released_next_button.png in Resources */,
 				57867A5E178752CD00EBBE52 /* pushed_previous_button.png in Resources */,
 				57867A5F178752CD00EBBE52 /* released_previous_button.png in Resources */,
+				57AEEDAD1789543D007F4F97 /* libO_toolBar_bg.png in Resources */,
+				57AEEDAF17895B67007F4F97 /* pointer.png in Resources */,
+				57AEEDB117895BF5007F4F97 /* pointer_pushed.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

ios/iosremote/iosremote/slideShowPreviewTable_vc.m

@@ -9,6 +9,8 @@
 #import "slideShowPreviewTable_vc.h"
 #import "CommunicationManager.h"
 #import "CommandTransmitter.h"
+#import "CommandInterpreter.h"
+#import "SlideShow.h"
 
 @interface slideShowPreviewTable_vc ()
 
@@ -16,6 +18,7 @@
 @property (nonatomic, strong) NSArray * optionsArray;
 @property (nonatomic, strong) CommunicationManager * comManager;
 @property (nonatomic, strong) id slideShowStartObserver;
+@property BOOL slidesRunning;
 
 @end
 
@@ -25,8 +28,6 @@
 @synthesize optionsTable = _optionsTable;
 @synthesize optionsArray = _optionsArray;
 
-BOOL RUNNING = NO;
-
 - (id)initWithStyle:(UITableViewStyle)style
 {
     self = [super initWithStyle:style];
@@ -48,21 +49,22 @@ BOOL RUNNING = NO;
     self.optionsArray = [NSArray arrayWithObjects:@"Lecturer's Notes", @"Timer", @"Pointer", nil];
     self.comManager = [CommunicationManager sharedComManager];
     self.comManager.delegate = self;
+    self.slidesRunning = NO;
     NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
     self.slideShowStartObserver = [[NSNotificationCenter defaultCenter] addObserverForName:STATUS_CONNECTED_SLIDESHOW_RUNNING
                                                                                     object:nil
                                                                                      queue:mainQueue
                                                                                 usingBlock:^(NSNotification *note) {
-                                                                                    RUNNING = YES;
+                                                                                    NSLog(@"Setting to true");
+                                                                                    self.slidesRunning = YES;
                                                                                 }];
 
     }
 
 - (void) viewDidAppear:(BOOL)animated
 {
-    if (RUNNING){
-        NSLog(@"Running...");
-        RUNNING = NO;
+    if (self.slidesRunning && [self.comManager.interpreter.slideShow size] > 0){
+        self.slidesRunning = NO;
         [self.parentViewController performSegueWithIdentifier:@"slideShowSegue" sender:self];
     }
     NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
@@ -79,7 +81,7 @@ BOOL RUNNING = NO;
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self.slideShowStartObserver];
     self.slideShowStartObserver = nil;
-    RUNNING = NO;
+    self.slidesRunning = NO;
     [super viewDidDisappear:animated];
 }
 

ios/iosremote/iosremote/slideShow_vc.h

@@ -12,9 +12,11 @@
 
 - (IBAction)nextSlideAction:(id)sender;
 - (IBAction)previousSlideAction:(id)sender;
+- (IBAction)pointerAction:(id)sender;
 
 @property (weak, nonatomic) IBOutlet UIWebView *lecturer_notes;
 @property (weak, nonatomic) IBOutlet UIImageView *slideView;
+@property (weak, nonatomic) IBOutlet UIImageView *secondarySlideView;
 @property (weak, nonatomic) IBOutlet UILabel *slideNumber;
 
 @end

ios/iosremote/iosremote/slideShow_vc.m

@@ -108,6 +108,8 @@
     [self setLecturer_notes:nil];
     [self setSlideView:nil];
     [self setSlideNumber:nil];
+    [self setToolBar:nil];
+    [self setSecondarySlideView:nil];
     [super viewDidUnload];
 }
 
@@ -118,4 +120,7 @@
 - (IBAction)previousSlideAction:(id)sender {
     [[self.comManager transmitter] previousTransition];
 }
+
+- (IBAction)pointerAction:(id)sender {
+}
 @end