Skip to content

C
core
Kaydet (Commit) b042a78d authored tarafından Siqi LIU's avatar Siqi LIU
Dosyalara gözat
Seçenekler

send out presentation title during the preview page 

Change-Id: I6acf7d6a690f9b29d11b4af9ea027e34170fbfdb
üst 08e0e4b3
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 116 deletions
ios/iosremote/iPad_autosize.storyboard
Dosyayı görüntüle @ b042a78d
...@@ -171,33 +171,12 @@ ...@@ -171,33 +171,12 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5"> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JEW-I6-sw5">
<rect key="frame" x="22" y="30" width="424" height="44"/> <rect key="frame" x="20" y="20" width="428" height="168"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Last modified: 3 Jul 2013" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0je-bV-nk1">
<rect key="frame" x="21" y="129" width="416" height="20"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Author: author name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vfH-4C-Sag">
<rect key="frame" x="21" y="97" width="1664" height="20"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Current slide: 5 of 22" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mRZ-fv-RAC">
<rect key="frame" x="21" y="165" width="392" height="20"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/>
<nil key="highlightedColor"/>
</label>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view> </view>
...@@ -246,6 +225,7 @@ ...@@ -246,6 +225,7 @@
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/> <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/>
<connections> <connections>
<outlet property="optionsTable" destination="Pc5-8o-PrW" id="18R-Zo-CBq"/> <outlet property="optionsTable" destination="Pc5-8o-PrW" id="18R-Zo-CBq"/>
<outlet property="titleLabel" destination="JEW-I6-sw5" id="1AH-TC-z10"/>
</connections> </connections>
</tableViewController> </tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="gg2-6d-fyF" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="gg2-6d-fyF" userLabel="First Responder" sceneMemberID="firstResponder"/>
...@@ -554,76 +534,6 @@ ...@@ -554,76 +534,6 @@
<image name="timer_clear_btn.png" width="74" height="74"/> <image name="timer_clear_btn.png" width="74" height="74"/>
<image name="timer_start_btn.png" width="74" height="74"/> <image name="timer_start_btn.png" width="74" height="74"/>
</resources> </resources>
<classes>
<class className="BasePresentationViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/>
<relationships>
<relationship kind="action" name="startConnectionModal:"/>
<relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/>
<relationship kind="outlet" name="NotesView" candidateClass="UIView"/>
<relationship kind="outlet" name="clearButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/>
<relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/>
<relationship kind="outlet" name="movingPointer" candidateClass="UIView"/>
<relationship kind="outlet" name="nextButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="previousButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
<relationship kind="outlet" name="startButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="welcome_blocking_page" candidateClass="UIView"/>
<relationship kind="outlet" name="welcome_connect_button" candidateClass="UIButton"/>
<relationship kind="outlet" name="welcome_label" candidateClass="UILabel"/>
<relationship kind="outlet" name="welcome_libO_icon" candidateClass="UIImageView"/>
</relationships>
</class>
<class className="EditableTableViewCell" superclassName="UITableViewCell">
<source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/>
</class>
<class className="MainSplitViewController" superclassName="UISplitViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/>
</class>
<class className="autoDismissKeyboardNavigationViewController" superclassName="UINavigationController">
<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:"/>
</relationships>
</class>
<class className="pinValidation_vc" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/>
<relationships>
<relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/>
</relationships>
</class>
<class className="server_list_vc" superclassName="UITableViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
<relationships>
<relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
</relationships>
</class>
<class className="server_list_vc_ipad" superclassName="server_list_vc">
<source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/>
<relationships>
<relationship kind="action" name="cancelModalView:"/>
</relationships>
</class>
<class className="slideShowPreviewTable_vc" superclassName="UITableViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
<relationships>
<relationship kind="action" name="startPresentationAction:"/>
<relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/>
</relationships>
</class>
<class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc">
<source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/>
</class>
<class className="slideShowSwipeInList_ipad" superclassName="UITableViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/>
</class>
</classes>
<simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackTranslucent"/> <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackTranslucent"/>
<simulatedOrientationMetrics key="orientation"/> <simulatedOrientationMetrics key="orientation"/>
......
ios/iosremote/iosremote/Communication/CommandInterpreter.m
Dosyayı görüntüle @ b042a78d
...@@ -69,9 +69,17 @@ dispatch_queue_t backgroundQueue; ...@@ -69,9 +69,17 @@ dispatch_queue_t backgroundQueue;
self.slideShow = [[SlideShow alloc] init]; self.slideShow = [[SlideShow alloc] init];
[[NSNotificationCenter defaultCenter] postNotificationName:STATUS_CONNECTED_NOSLIDESHOW object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:STATUS_CONNECTED_NOSLIDESHOW object:nil];
marker = 2; marker = 2;
} else if([instruction isEqualToString:@"slideshow_info"]){
NSLog(@"Interpreter: slideshow_info");
NSString * title = [command objectAtIndex:1];
NSLog(@"title: %@", title);
[self.slideShow setTitle:title];
[[NSNotificationCenter defaultCenter] postNotificationName:SLIDESHOW_INFO_RECEIVED
object:nil];
marker = 3;
} else { } else {
if ([instruction isEqualToString:@"slide_updated"]) { if ([instruction isEqualToString:@"slide_updated"]) {
NSLog(@"Interpreter: slide_updated"); NSLog(@"Interpret er: slide_updated");
uint newSlideNumber = [[command objectAtIndex:1] integerValue]; uint newSlideNumber = [[command objectAtIndex:1] integerValue];
[self.slideShow setCurrentSlide:newSlideNumber]; [self.slideShow setCurrentSlide:newSlideNumber];
......
ios/iosremote/iosremote/Communication/CommunicationManager.h
Dosyayı görüntüle @ b042a78d
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#define MSG_PAIRING_STARTED @"PAIRING_STARTED" #define MSG_PAIRING_STARTED @"PAIRING_STARTED"
#define MSG_PAIRING_SUCCESSFUL @"PAIRING_SUCCESSFUL" #define MSG_PAIRING_SUCCESSFUL @"PAIRING_SUCCESSFUL"
#define SLIDESHOW_INFO_RECEIVED @"SLIDE_INFO_RECEIVED"
/** /**
* Notify the UI that the service has connected to a server AND a slideshow * Notify the UI that the service has connected to a server AND a slideshow
* is running. * is running.
......
ios/iosremote/iosremote/Communication/SlideShow.h
Dosyayı görüntüle @ b042a78d
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
@property uint size; @property uint size;
@property uint currentSlide; @property uint currentSlide;
//@property (nonatomic, strong) NSString * title;
@property (nonatomic, strong) id <AsyncLoadHorizontalTableDelegate> delegate; @property (nonatomic, strong) id <AsyncLoadHorizontalTableDelegate> delegate;
@property (nonatomic, strong) id secondaryDelegate; @property (nonatomic, strong) id secondaryDelegate;
...@@ -30,4 +31,7 @@ ...@@ -30,4 +31,7 @@
- (void) getContentAtIndex: (uint) index forView: (UIView*) view; - (void) getContentAtIndex: (uint) index forView: (UIView*) view;
- (NSString *) title;
- (void) setTitle:(NSString *)title;
@end @end
ios/iosremote/iosremote/Communication/SlideShow.m
Dosyayı görüntüle @ b042a78d
...@@ -33,6 +33,17 @@ ...@@ -33,6 +33,17 @@
dispatch_queue_t backgroundQueue; dispatch_queue_t backgroundQueue;
NSLock *dictLock; NSLock *dictLock;
NSString *sTitle;
- (NSString *) title
{
return sTitle;
}
- (void) setTitle:(NSString *)title
{
sTitle = title;
}
- (void) setDelegate:(id<AsyncLoadHorizontalTableDelegate>)delegate - (void) setDelegate:(id<AsyncLoadHorizontalTableDelegate>)delegate
{ {
......
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
Dosyayı görüntüle @ b042a78d
...@@ -435,34 +435,13 @@ ...@@ -435,34 +435,13 @@
<rect key="frame" x="13" y="17" width="295" height="140"/> <rect key="frame" x="13" y="17" width="295" height="140"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9"> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Title of the presentation(TODO)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wJK-w7-Zs9">
<rect key="frame" x="45" y="11" width="204" height="42"/> <rect key="frame" x="20" y="20" width="255" height="100"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="18"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Last modified: 3 Jul 2013" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="NNM-r9-NZq">
<rect key="frame" x="20" y="82" width="194" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Author: author name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Igr-r3-SjN">
<rect key="frame" x="20" y="61" width="1440" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Current slide: 5 of 22" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1ex-lZ-CSj">
<rect key="frame" x="20" y="104" width="169" height="16"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/>
<nil key="highlightedColor"/>
</label>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view> </view>
...@@ -510,6 +489,7 @@ ...@@ -510,6 +489,7 @@
<navigationItem key="navigationItem" id="TMc-Fg-zXV"/> <navigationItem key="navigationItem" id="TMc-Fg-zXV"/>
<connections> <connections>
<outlet property="optionsTable" destination="rWA-v3-wtf" id="qXR-p3-aap"/> <outlet property="optionsTable" destination="rWA-v3-wtf" id="qXR-p3-aap"/>
<outlet property="titleLabel" destination="wJK-w7-Zs9" id="ZPz-9h-et8"/>
<segue destination="LZb-9n-W8N" kind="push" identifier="slideShowSegue" id="ATf-mQ-0ht"/> <segue destination="LZb-9n-W8N" kind="push" identifier="slideShowSegue" id="ATf-mQ-0ht"/>
</connections> </connections>
</tableViewController> </tableViewController>
...@@ -583,6 +563,9 @@ ...@@ -583,6 +563,9 @@
</class> </class>
<class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc">
<source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/>
<relationships>
<relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
</relationships>
</class> </class>
<class className="slideShowSwipeInList" superclassName="UITableViewController"> <class className="slideShowSwipeInList" superclassName="UITableViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/>
......
ios/iosremote/iosremote/slideShowPreviewTable_vc.h
Dosyayı görüntüle @ b042a78d
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
@property (nonatomic, strong) id slideShowStartObserver; @property (nonatomic, strong) id slideShowStartObserver;
@property (nonatomic, strong) NSArray * optionsArray; @property (nonatomic, strong) NSArray * optionsArray;
@property (nonatomic, strong) id titleObserver;
-(IBAction)startPresentationAction:(id)sender; -(IBAction)startPresentationAction:(id)sender;
@end @end
ios/iosremote/iosremote/slideShowPreviewTable_vc.m
Dosyayı görüntüle @ b042a78d
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
@synthesize startButton = _startButton; @synthesize startButton = _startButton;
@synthesize optionsTable = _optionsTable; @synthesize optionsTable = _optionsTable;
@synthesize optionsArray = _optionsArray; @synthesize optionsArray = _optionsArray;
@synthesize titleObserver = _titleObserver;
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
{ {
......
ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.h
Dosyayı görüntüle @ b042a78d
...@@ -17,5 +17,6 @@ ...@@ -17,5 +17,6 @@
@interface slideShowPreviewTable_vc_ipad : slideShowPreviewTable_vc @interface slideShowPreviewTable_vc_ipad : slideShowPreviewTable_vc
@property (strong, nonatomic) id <MainSplitViewControllerProtocol> delegate; @property (strong, nonatomic) id <MainSplitViewControllerProtocol> delegate;
@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
@end @end
ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m
Dosyayı görüntüle @ b042a78d
...@@ -45,6 +45,17 @@ ...@@ -45,6 +45,17 @@
self.optionsArray = [NSArray arrayWithObjects:OPTION_TIMER, OPTION_POINTER, nil]; self.optionsArray = [NSArray arrayWithObjects:OPTION_TIMER, OPTION_POINTER, nil];
self.comManager = [CommunicationManager sharedComManager]; self.comManager = [CommunicationManager sharedComManager];
self.comManager.delegate = self; self.comManager.delegate = self;
if (self.comManager.interpreter.slideShow)
[self.titleLabel setText:[self.comManager.interpreter.slideShow title]];
[[NSNotificationCenter defaultCenter] addObserverForName:SLIDESHOW_INFO_RECEIVED object:self.titleObserver queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
[self.titleLabel setText:self.comManager.interpreter.slideShow.title];
if (!self.titleLabel) {
NSLog(@"TitleLabel nil");
}
NSLog(@"Received: %@", self.comManager.interpreter.slideShow.title);
}];
} }
- (void) viewDidAppear:(BOOL)animated - (void) viewDidAppear:(BOOL)animated
...@@ -70,4 +81,8 @@ ...@@ -70,4 +81,8 @@
} }
- (void)viewDidUnload {
[self setTitleLabel:nil];
[super viewDidUnload];
}
@end @end
ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.h
Dosyayı görüntüle @ b042a78d
...@@ -10,5 +10,6 @@ ...@@ -10,5 +10,6 @@
#import "slideShowPreviewTable_vc.h" #import "slideShowPreviewTable_vc.h"
@interface slideShowPreviewTable_vc_iphone : slideShowPreviewTable_vc @interface slideShowPreviewTable_vc_iphone : slideShowPreviewTable_vc
@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
@end @end
ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m
Dosyayı görüntüle @ b042a78d
...@@ -18,6 +18,18 @@ ...@@ -18,6 +18,18 @@
self.optionsArray = [NSArray arrayWithObjects:OPTION_TIMER, OPTION_POINTER, nil]; self.optionsArray = [NSArray arrayWithObjects:OPTION_TIMER, OPTION_POINTER, nil];
self.comManager = [CommunicationManager sharedComManager]; self.comManager = [CommunicationManager sharedComManager];
self.comManager.delegate = self; self.comManager.delegate = self;
if (self.comManager.interpreter.slideShow)
[self.titleLabel setText:[self.comManager.interpreter.slideShow title]];
[[NSNotificationCenter defaultCenter] addObserverForName:SLIDESHOW_INFO_RECEIVED object:self.titleObserver queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
[self.titleLabel setText:self.comManager.interpreter.slideShow.title];
if (!self.titleLabel) {
NSLog(@"TitleLabel nil");
}
NSLog(@"Received: %@", self.comManager.interpreter.slideShow.title);
}];
} }
- (void) viewDidAppear:(BOOL)animated - (void) viewDidAppear:(BOOL)animated
...@@ -36,4 +48,8 @@ ...@@ -36,4 +48,8 @@
}]; }];
} }
- (void)viewDidUnload {
[self setTitleLabel:nil];
[super viewDidUnload];
}
@end @end
sd/source/ui/remotecontrol/AvahiNetworkService.cxx
Dosyayı görüntüle @ b042a78d
/* -*- Mode: C++; 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/.
*/
#include <time.h> #include <time.h>
#include <iostream> #include <iostream>
#include <stdlib.h> #include <stdlib.h>
......
sd/source/ui/remotecontrol/AvahiNetworkService.hxx
Dosyayı görüntüle @ b042a78d
/* -*- Mode: C++; 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/.
*/
#ifndef AVAHI_NETWORK_SERVICE_H #ifndef AVAHI_NETWORK_SERVICE_H
#define AVAHI_NETWORK_SERVICE_H #define AVAHI_NETWORK_SERVICE_H
......
sd/source/ui/remotecontrol/Communicator.cxx
Dosyayı görüntüle @ b042a78d
...@@ -11,6 +11,10 @@ ...@@ -11,6 +11,10 @@
#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/Desktop.hpp>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <comphelper/documentinfo.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <rtl/string.hxx>
#include <rtl/strbuf.hxx>
#include "Communicator.hxx" #include "Communicator.hxx"
#include "Listener.hxx" #include "Listener.hxx"
...@@ -70,6 +74,13 @@ void Communicator::execute() ...@@ -70,6 +74,13 @@ void Communicator::execute()
pTransmitter->addMessage( "slideshow_finished\n\n", pTransmitter->addMessage( "slideshow_finished\n\n",
Transmitter::PRIORITY_HIGH ); Transmitter::PRIORITY_HIGH );
} }
OStringBuffer aBuffer;
aBuffer.append( "slideshow_info\n" )
.append( OUStringToOString( ::comphelper::DocumentInfo::getDocumentTitle( xFrame->getController()->getModel() ), RTL_TEXTENCODING_UTF8 ) )
.append("\n\n");
pTransmitter->addMessage( aBuffer.makeStringAndClear(), Transmitter::PRIORITY_LOW );
} }
catch (uno::RuntimeException &) catch (uno::RuntimeException &)
{ {
......
sd/source/ui/remotecontrol/OSXNetworkService.hxx
Dosyayı görüntüle @ b042a78d
/* -*- Mode: C++; 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/.
*/
#ifndef OSX_NETWORK_SERVICE_HXX #ifndef OSX_NETWORK_SERVICE_HXX
#define OSX_NETWORK_SERVICE_HXX #define OSX_NETWORK_SERVICE_HXX
......
sd/source/ui/remotecontrol/Transmitter.cxx
Dosyayı görüntüle @ b042a78d
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include "Transmitter.hxx" #include "Transmitter.hxx"
#include <iostream>
using namespace std; using namespace std;
using namespace osl; // Sockets etc. using namespace osl; // Sockets etc.
......
sd/source/ui/remotecontrol/ZeroconfService.hxx
Dosyayı görüntüle @ b042a78d
/* -*- Mode: C++; 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/.
*/
#ifndef ZEROCONF_SERVICE #ifndef ZEROCONF_SERVICE
#define ZEROCONF_SERVICE #define ZEROCONF_SERVICE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment