39da7ee77e
Changes made are as Follows /officecfg/registry/schema/org/openoffice/Office/Impress.xcs To add the new global checkbox to Libreoffice Impress>General>Start A new xml block for EnablePresenterScreen was added <prop oor:name="EnablePresenterScreen" oor:type="xs:boolean" > /sd/source/ui/app/optsitem.cxx To add the setter/getter for the new checkbox button, namely: SetEnablePresenterScreen IsEnablePresenterScreen EnablePresenterScreen added to index number 26 of: GetPropNameArray() /sd/source/ui/dlg/tpoption.cxx SdTpOptionsMisc() editted to attach EnablePresenterScreen to CBX_ENABLE_PRESENTER_SCREEN aCbxEnablePresenterScreen ( this, SdResId( CBX_ENABLE_PRESENTER_SCREEN)) Also Added to FillItemSet() and Reset() functions /sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src enableSdRemote size changed to Size = MAP_APPFONT ( 116 , 10 ) ; Pos = MAP_APPFONT ( 12 , 171 ) ; 158 was correct but 171 was added on request To allow enableSdRemote(CBX_ENABLE_SDREMOTE) and enablePresenterScreen( CBX_ENABLE_PRESENTER_SCREEN) to be drawn adjacent. enablePresenterScreen checkbox CBX_ENABLE_PRESENTER_SCREEN added /sd/source/ui/inc/optsitem.hxx Set default value for enablePresenterScreen as 1 or TRUE sal_Bool bEnablePresenterScreen : 1; Added getter/setter named same as above for interface definition sd/source/ui/inc/tpoption.hrc Defined CBX_ENABLE_PRESENTER_SCREEN as 42nd checkbox #define CBX_ENABLE_PRESENTER_SCREEN 42 /sd/source/ui/inc/tpoption.hxx Added interface declaration of aCbxEnablePresenterScreen which was attached to CBX_ENABLE_PRESENTER_SCREEN /sdext/source/presenter/PresenterScreen.hxx Added interface declaration of bool isPresenterScreenEnabled() to PresenterScreen class to allow presenterscreen to get if the option is checked /sdext/source/presenter/PresenterScreen.cxx Added definition of isPresenterScreenEnabled(const css::uno::Reference<css::uno::XComponentContext>& rxContext) Input : Current Process Context Output : The 0/1 value of EnablePresenterScreen from presenterconfig In PresenterScreenListener::notifyEvent( ) Added if(mpPresenterScreen->isPresenterScreenEnabled(mxComponentContext) mpPresenterScreen->InitializePresenterScreen() To initialize PresenterScreen only when enabled Change-Id: If8242e607323df57d8e78d08cf2129d03c0c9e4f Reviewed-on: https://gerrit.libreoffice.org/3762 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
243 lines
9.3 KiB
C++
243 lines
9.3 KiB
C++
/* -*- 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/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#ifndef SDEXT_PRESENTER_PRESENTER_SCREEN_HXX
|
|
#define SDEXT_PRESENTER_PRESENTER_SCREEN_HXX
|
|
|
|
#include "PresenterConfigurationAccess.hxx"
|
|
#include "PresenterPaneContainer.hxx"
|
|
#include <cppuhelper/compbase1.hxx>
|
|
#include <cppuhelper/basemutex.hxx>
|
|
#include <com/sun/star/lang/XInitialization.hpp>
|
|
#include <com/sun/star/frame/XController.hpp>
|
|
#include <com/sun/star/frame/XModel2.hpp>
|
|
#include <com/sun/star/task/XJob.hpp>
|
|
#include <com/sun/star/document/XEventListener.hpp>
|
|
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
|
|
#include <com/sun/star/drawing/framework/XView.hpp>
|
|
#include <com/sun/star/presentation/XSlideShowController.hpp>
|
|
#include <com/sun/star/presentation/XPresentation2.hpp>
|
|
#include <rtl/ref.hxx>
|
|
#include <boost/noncopyable.hpp>
|
|
#include <boost/shared_ptr.hpp>
|
|
#include <boost/scoped_ptr.hpp>
|
|
|
|
namespace sdext { namespace presenter {
|
|
|
|
class PresenterController;
|
|
|
|
namespace {
|
|
typedef ::cppu::WeakComponentImplHelper1 <
|
|
css::task::XJob
|
|
> PresenterScreenJobInterfaceBase;
|
|
typedef ::cppu::WeakComponentImplHelper1 <
|
|
css::lang::XEventListener
|
|
> PresenterScreenInterfaceBase;
|
|
}
|
|
|
|
/** The PresenterScreenJob service is instantiated every time a document is
|
|
created or loaded. In its execute() method it then filters out all
|
|
non-Impress documents and creates and registers a new PresenterScreen
|
|
object.
|
|
*/
|
|
class PresenterScreenJob
|
|
: private ::boost::noncopyable,
|
|
private ::cppu::BaseMutex,
|
|
public PresenterScreenJobInterfaceBase
|
|
{
|
|
public:
|
|
static OUString getImplementationName_static (void);
|
|
static css::uno::Sequence< OUString > getSupportedServiceNames_static (void);
|
|
static css::uno::Reference<css::uno::XInterface> Create(
|
|
const css::uno::Reference<css::uno::XComponentContext>& rxContext)
|
|
SAL_THROW((css::uno::Exception));
|
|
|
|
virtual void SAL_CALL disposing (void);
|
|
|
|
// XJob
|
|
|
|
virtual css::uno::Any SAL_CALL execute(
|
|
const css::uno::Sequence<css::beans::NamedValue >& Arguments)
|
|
throw (css::lang::IllegalArgumentException,
|
|
css::uno::Exception,
|
|
css::uno::RuntimeException);
|
|
|
|
private:
|
|
PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
|
|
virtual ~PresenterScreenJob (void);
|
|
|
|
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
|
|
};
|
|
|
|
/** This is the bootstrap class of the presenter screen. It is registered
|
|
as drawing framework startup service. That means that every drawing
|
|
framework instance creates an instance of this class.
|
|
|
|
<p>A PresenterScreen object registers itself as listener for drawing
|
|
framework configuration changes. It waits for the full screen marker (a
|
|
top level resource) to appear in the current configuration. When that
|
|
happens the actual presenter screen is initialized. A new
|
|
PresenterController is created and takes over the task of controlling
|
|
the presenter screen.</p>
|
|
*/
|
|
class PresenterScreen
|
|
: private ::boost::noncopyable,
|
|
private ::cppu::BaseMutex,
|
|
public PresenterScreenInterfaceBase
|
|
{
|
|
public:
|
|
PresenterScreen (
|
|
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
|
|
const css::uno::Reference<css::frame::XModel2>& rxModel);
|
|
virtual ~PresenterScreen (void);
|
|
|
|
virtual void SAL_CALL disposing (void);
|
|
|
|
bool isPresenterScreenEnabled(
|
|
const css::uno::Reference<css::uno::XComponentContext>& rxContext);
|
|
/** Make the presenter screen visible.
|
|
*/
|
|
void InitializePresenterScreen (void);
|
|
|
|
/** Do not call ShutdownPresenterScreen() directly. Call
|
|
RequestShutdownPresenterScreen() instead. It will issue an
|
|
asynchronous call to ShutdownPresenterScreen() when that is safe.
|
|
*/
|
|
void RequestShutdownPresenterScreen (void);
|
|
|
|
/** Switch / converse monitors between presenter view and slide output
|
|
*/
|
|
void SwitchMonitors (void);
|
|
|
|
// XEventListener
|
|
|
|
virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException);
|
|
|
|
private:
|
|
css::uno::Reference<css::frame::XModel2 > mxModel;
|
|
css::uno::Reference<css::frame::XController> mxController;
|
|
css::uno::WeakReference<css::drawing::framework::XConfigurationController>
|
|
mxConfigurationControllerWeak;
|
|
css::uno::WeakReference<css::uno::XComponentContext> mxContextWeak;
|
|
css::uno::WeakReference<css::presentation::XSlideShowController> mxSlideShowControllerWeak;
|
|
::rtl::Reference<PresenterController> mpPresenterController;
|
|
css::uno::Reference<css::drawing::framework::XResourceId> mxSlideShowViewId;
|
|
css::uno::Reference<css::drawing::framework::XConfiguration> mxSavedConfiguration;
|
|
::rtl::Reference<PresenterPaneContainer> mpPaneContainer;
|
|
sal_Int32 mnComponentIndex;
|
|
css::uno::Reference<css::drawing::framework::XResourceFactory> mxPaneFactory;
|
|
css::uno::Reference<css::drawing::framework::XResourceFactory> mxViewFactory;
|
|
|
|
class ViewDescriptor
|
|
{
|
|
public:
|
|
OUString msTitle;
|
|
OUString msAccessibleTitle;
|
|
bool mbIsOpaque;
|
|
ViewDescriptor()
|
|
: mbIsOpaque(false)
|
|
{
|
|
}
|
|
};
|
|
typedef ::std::map<OUString,ViewDescriptor> ViewDescriptorContainer;
|
|
ViewDescriptorContainer maViewDescriptors;
|
|
|
|
void ShutdownPresenterScreen (void);
|
|
|
|
/** Create and initialize the factory for presenter view specific panes.
|
|
*/
|
|
void SetupPaneFactory (
|
|
const css::uno::Reference<css::uno::XComponentContext>& rxContext);
|
|
|
|
/** Create and initialize the factory for presenter view specific views.
|
|
*/
|
|
void SetupViewFactory (
|
|
const css::uno::Reference<css::uno::XComponentContext>& rxContext);
|
|
|
|
/** Read the current layout from the configuration and call
|
|
ProcessLayout to bring it on to the screen.
|
|
*/
|
|
void SetupConfiguration (
|
|
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
|
|
const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId);
|
|
|
|
/** Read one layout from the configuration and make resource activation
|
|
requests to bring it on to the screen. When one layout references a
|
|
parent layout then this method calls itself recursively.
|
|
*/
|
|
void ProcessLayout (
|
|
PresenterConfigurationAccess& rConfiguration,
|
|
const OUString& rsLayoutName,
|
|
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
|
|
const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId);
|
|
|
|
/** Called by ProcessLayout for a single entry of a Layouts
|
|
configuration list.
|
|
*/
|
|
void ProcessComponent (
|
|
const OUString& rsKey,
|
|
const ::std::vector<css::uno::Any>& rValues,
|
|
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
|
|
const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId);
|
|
|
|
/** Read the view descriptions from the configuration.
|
|
*/
|
|
void ProcessViewDescriptions (
|
|
PresenterConfigurationAccess& rConfiguration);
|
|
|
|
/** Called by ProcessViewDescriptions for a single entry.
|
|
*/
|
|
void ProcessViewDescription (
|
|
const OUString& rsKey,
|
|
const ::std::vector<css::uno::Any>& rValues);
|
|
|
|
void SetupView (
|
|
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
|
|
const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId,
|
|
const OUString& rsPaneURL,
|
|
const OUString& rsViewURL,
|
|
const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization,
|
|
const double nLeft,
|
|
const double nTop,
|
|
const double nRight,
|
|
const double nBottom);
|
|
|
|
/** Return the built-in screen number on the presentation will normally
|
|
display the presenter console.
|
|
@return
|
|
Returns -1 when the presenter screen can or shall not be
|
|
displayed.
|
|
*/
|
|
sal_Int32 GetPresenterScreenNumber (
|
|
const css::uno::Reference<css::presentation::XPresentation2>& rxPresentation) const;
|
|
|
|
sal_Int32 GetPresenterScreenFromScreen( sal_Int32 nPresentationScreen ) const;
|
|
|
|
/** Create a resource id for the full screen background pane so that it
|
|
is displayed on another screen than the full screen presentation.
|
|
*/
|
|
css::uno::Reference<css::drawing::framework::XResourceId> GetMainPaneId (
|
|
const css::uno::Reference<css::presentation::XPresentation2>& rxPresentation) const;
|
|
};
|
|
|
|
} }
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|