ios/iosremote/iPad_autosize.storyboard | 94 ----------- ios/iosremote/iosremote/Communication/CommandInterpreter.m | 10 + ios/iosremote/iosremote/Communication/CommunicationManager.h | 2 ios/iosremote/iosremote/Communication/SlideShow.h | 4 ios/iosremote/iosremote/Communication/SlideShow.m | 11 + ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 29 --- ios/iosremote/iosremote/slideShowPreviewTable_vc.h | 2 ios/iosremote/iosremote/slideShowPreviewTable_vc.m | 1 ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.h | 1 ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m | 15 + ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.h | 1 ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m | 16 + sd/source/ui/remotecontrol/AvahiNetworkService.cxx | 8 sd/source/ui/remotecontrol/AvahiNetworkService.hxx | 8 sd/source/ui/remotecontrol/Communicator.cxx | 11 + sd/source/ui/remotecontrol/OSXNetworkService.hxx | 8 sd/source/ui/remotecontrol/Transmitter.cxx | 1 sd/source/ui/remotecontrol/ZeroconfService.hxx | 8 18 files changed, 114 insertions(+), 116 deletions(-)
New commits: commit b042a78d9847753d95560749dab2159d9cfbd7ae Author: Siqi LIU <m...@siqi.fr> Date: Thu Aug 1 12:55:07 2013 +0200 send out presentation title during the preview page Change-Id: I6acf7d6a690f9b29d11b4af9ea027e34170fbfdb diff --git a/ios/iosremote/iPad_autosize.storyboard b/ios/iosremote/iPad_autosize.storyboard index b06f4f8..804740f 100644 --- a/ios/iosremote/iPad_autosize.storyboard +++ b/ios/iosremote/iPad_autosize.storyboard @@ -171,33 +171,12 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <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"> - <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"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </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> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> @@ -246,6 +225,7 @@ <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/> <connections> <outlet property="optionsTable" destination="Pc5-8o-PrW" id="18R-Zo-CBq"/> + <outlet property="titleLabel" destination="JEW-I6-sw5" id="1AH-TC-z10"/> </connections> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="gg2-6d-fyF" userLabel="First Responder" sceneMemberID="firstResponder"/> @@ -554,76 +534,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="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"> <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackTranslucent"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/iosremote/Communication/CommandInterpreter.m b/ios/iosremote/iosremote/Communication/CommandInterpreter.m index 4c1b2f5..0eca4cd 100644 --- a/ios/iosremote/iosremote/Communication/CommandInterpreter.m +++ b/ios/iosremote/iosremote/Communication/CommandInterpreter.m @@ -69,9 +69,17 @@ dispatch_queue_t backgroundQueue; self.slideShow = [[SlideShow alloc] init]; [[NSNotificationCenter defaultCenter] postNotificationName:STATUS_CONNECTED_NOSLIDESHOW object:nil]; 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 { if ([instruction isEqualToString:@"slide_updated"]) { - NSLog(@"Interpreter: slide_updated"); + NSLog(@"Interpret er: slide_updated"); uint newSlideNumber = [[command objectAtIndex:1] integerValue]; [self.slideShow setCurrentSlide:newSlideNumber]; diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.h b/ios/iosremote/iosremote/Communication/CommunicationManager.h index 7941a7c..f4ca389 100644 --- a/ios/iosremote/iosremote/Communication/CommunicationManager.h +++ b/ios/iosremote/iosremote/Communication/CommunicationManager.h @@ -24,6 +24,8 @@ #define MSG_PAIRING_STARTED @"PAIRING_STARTED" #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 * is running. diff --git a/ios/iosremote/iosremote/Communication/SlideShow.h b/ios/iosremote/iosremote/Communication/SlideShow.h index bf55897..af5a561 100644 --- a/ios/iosremote/iosremote/Communication/SlideShow.h +++ b/ios/iosremote/iosremote/Communication/SlideShow.h @@ -22,6 +22,7 @@ @property uint size; @property uint currentSlide; +//@property (nonatomic, strong) NSString * title; @property (nonatomic, strong) id <AsyncLoadHorizontalTableDelegate> delegate; @property (nonatomic, strong) id secondaryDelegate; @@ -30,4 +31,7 @@ - (void) getContentAtIndex: (uint) index forView: (UIView*) view; +- (NSString *) title; +- (void) setTitle:(NSString *)title; + @end diff --git a/ios/iosremote/iosremote/Communication/SlideShow.m b/ios/iosremote/iosremote/Communication/SlideShow.m index d6f675d..6cff90c 100644 --- a/ios/iosremote/iosremote/Communication/SlideShow.m +++ b/ios/iosremote/iosremote/Communication/SlideShow.m @@ -33,6 +33,17 @@ dispatch_queue_t backgroundQueue; NSLock *dictLock; +NSString *sTitle; + +- (NSString *) title +{ + return sTitle; +} + +- (void) setTitle:(NSString *)title +{ + sTitle = title; +} - (void) setDelegate:(id<AsyncLoadHorizontalTableDelegate>)delegate { diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index a1b76f1..98f21d8 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -435,34 +435,13 @@ <rect key="frame" x="13" y="17" width="295" height="140"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <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"> - <rect key="frame" x="45" y="11" width="204" height="42"/> + <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="20" y="20" width="255" height="100"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </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> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> </view> @@ -510,6 +489,7 @@ <navigationItem key="navigationItem" id="TMc-Fg-zXV"/> <connections> <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"/> </connections> </tableViewController> @@ -583,6 +563,9 @@ </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"/> diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc.h b/ios/iosremote/iosremote/slideShowPreviewTable_vc.h index 6970601..e8f4f04c 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc.h +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc.h @@ -21,6 +21,8 @@ @property (nonatomic, strong) id slideShowStartObserver; @property (nonatomic, strong) NSArray * optionsArray; +@property (nonatomic, strong) id titleObserver; + -(IBAction)startPresentationAction:(id)sender; @end diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m index fe9be61..1747ca0 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m @@ -23,6 +23,7 @@ @synthesize startButton = _startButton; @synthesize optionsTable = _optionsTable; @synthesize optionsArray = _optionsArray; +@synthesize titleObserver = _titleObserver; - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation { diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.h b/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.h index 0359b9e..50946bc 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.h +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.h @@ -17,5 +17,6 @@ @interface slideShowPreviewTable_vc_ipad : slideShowPreviewTable_vc @property (strong, nonatomic) id <MainSplitViewControllerProtocol> delegate; +@property (weak, nonatomic) IBOutlet UILabel *titleLabel; @end diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m b/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m index 340df98..2c2c345 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m @@ -45,6 +45,17 @@ self.optionsArray = [NSArray arrayWithObjects:OPTION_TIMER, OPTION_POINTER, nil]; self.comManager = [CommunicationManager sharedComManager]; 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 @@ -70,4 +81,8 @@ } +- (void)viewDidUnload { + [self setTitleLabel:nil]; + [super viewDidUnload]; +} @end diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.h b/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.h index df100d3..ed1e551 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.h +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.h @@ -10,5 +10,6 @@ #import "slideShowPreviewTable_vc.h" @interface slideShowPreviewTable_vc_iphone : slideShowPreviewTable_vc +@property (weak, nonatomic) IBOutlet UILabel *titleLabel; @end diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m b/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m index a3ba571..fad5f54 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m @@ -18,6 +18,18 @@ self.optionsArray = [NSArray arrayWithObjects:OPTION_TIMER, OPTION_POINTER, nil]; self.comManager = [CommunicationManager sharedComManager]; 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 @@ -36,4 +48,8 @@ }]; } +- (void)viewDidUnload { + [self setTitleLabel:nil]; + [super viewDidUnload]; +} @end diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx index 5cb52de..2f44cb1 100644 --- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx +++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx @@ -1,3 +1,11 @@ +/* -*- 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 <iostream> #include <stdlib.h> diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx index 96e36db..67cb1d6 100644 --- a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx +++ b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx @@ -1,3 +1,11 @@ +/* -*- 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 #define AVAHI_NETWORK_SERVICE_H diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx index 63ace55..1d90fea 100644 --- a/sd/source/ui/remotecontrol/Communicator.cxx +++ b/sd/source/ui/remotecontrol/Communicator.cxx @@ -11,6 +11,10 @@ #include <com/sun/star/frame/Desktop.hpp> #include <comphelper/processfactory.hxx> +#include <comphelper/documentinfo.hxx> +#include <comphelper/mediadescriptor.hxx> +#include <rtl/string.hxx> +#include <rtl/strbuf.hxx> #include "Communicator.hxx" #include "Listener.hxx" @@ -70,6 +74,13 @@ void Communicator::execute() pTransmitter->addMessage( "slideshow_finished\n\n", 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 &) { diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.hxx b/sd/source/ui/remotecontrol/OSXNetworkService.hxx index bbbc0cf..e9be573 100644 --- a/sd/source/ui/remotecontrol/OSXNetworkService.hxx +++ b/sd/source/ui/remotecontrol/OSXNetworkService.hxx @@ -1,3 +1,11 @@ +/* -*- 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 #define OSX_NETWORK_SERVICE_HXX diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx b/sd/source/ui/remotecontrol/Transmitter.cxx index cc7b8ec..212299e 100644 --- a/sd/source/ui/remotecontrol/Transmitter.cxx +++ b/sd/source/ui/remotecontrol/Transmitter.cxx @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "Transmitter.hxx" +#include <iostream> using namespace std; using namespace osl; // Sockets etc. diff --git a/sd/source/ui/remotecontrol/ZeroconfService.hxx b/sd/source/ui/remotecontrol/ZeroconfService.hxx index a31776d..0418dd8 100644 --- a/sd/source/ui/remotecontrol/ZeroconfService.hxx +++ b/sd/source/ui/remotecontrol/ZeroconfService.hxx @@ -1,3 +1,11 @@ +/* -*- 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 #define ZEROCONF_SERVICE _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits