From ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 21 Nov 2012 17:19:28 +0100 Subject: Turn presenter screen from bundled extension to plain code The immediate trigger was 5e5c11c664f67ff9fd1120905b09a32bea3b2f6c "fdo#42070 Fix RTL support in presenter console" causing build failures on Mac OS X when linking the extension against vcl, but there should be more benefits of going from a bundled-anyway extension to plain code. (Not the least to get rid of the com.sun.star.drawing.XPresenterHelper hack.) To avoid unnecessary confusion between the newly plain code and any instance of the old extension still installed (per-user or shared), I renamed all relevant identifiers as follows: * UNO implementation com.sun.star.comp.Draw.framework.PresenterScreenJob -> org.libreoffice.comp.PresenterScreenJob * UNO implementation com.sun.star.sdext.presenter.PresenterProtocolHandler -> org.libreoffice.comp.PresenterScreenProtocolHandler * protocol handler schema vnd.com.sun.star.comp.PresenterScreen -> vnd.org.libreoffice.presenterscreen * configuration schema /org.openoffice.Office.extension.PresenterScreen -> /org.openoffice.Office.PresenterScreen (it appears this contains little to no user-changeable data anyway, so not migrating it to a new user profile due to the schema name change should not be problematic) * job ID onDocumentOpenedJob -> org.libreoffice.PresenterScreen Even with these precautions, having the presenter screen installed both as plain code and as a (per-user or shared) extension still leads to a crash when activating presentation mode (likely due to how both codes want to take control of the screen). To mitigate this, existing installations of the extension are explicitly not migrated to new user profiles. The sdext/source/presenter/bitmaps/*.png files were moved to icon-themes/galaxy/sd/res/presenterscreen-*.png and are now accessed via SdResId (adding the relevant data to sd/source/ui/inc/res_bmp.hrc and sd/source/ui/app/res_bmp.src; not sure whether these locations are already ideal). The code itself has been left mostly unchanged in sdext/source/presenter/, and it still clumsily communicates with sd core code via XPresenterHelper. There is a lot of room for improvement here. The help data is left untouched at sdext/source/presenter/help/ and needs to be incorporated properly into helpcontent2 in a follow-up commit. The --disable-ext-presenter-console configure switch is gone. Change-Id: I71adb7ae6dcdbd1802151fce6e3871d8a2026332 --- Repository.mk | 2 +- config_host.mk.in | 1 - configure.ac | 22 - .../galaxy/sd/res/presenterscreen-Background.png | Bin 0 -> 3474 bytes .../sd/res/presenterscreen-BorderActiveBottom.png | Bin 0 -> 214 bytes .../presenterscreen-BorderActiveBottomCallout.png | Bin 0 -> 1425 bytes .../res/presenterscreen-BorderActiveBottomLeft.png | Bin 0 -> 598 bytes .../presenterscreen-BorderActiveBottomRight.png | Bin 0 -> 626 bytes .../sd/res/presenterscreen-BorderActiveLeft.png | Bin 0 -> 145 bytes .../sd/res/presenterscreen-BorderActiveRight.png | Bin 0 -> 141 bytes .../sd/res/presenterscreen-BorderActiveTop.png | Bin 0 -> 148 bytes .../sd/res/presenterscreen-BorderActiveTopLeft.png | Bin 0 -> 442 bytes .../res/presenterscreen-BorderActiveTopRight.png | Bin 0 -> 438 bytes .../galaxy/sd/res/presenterscreen-BorderBottom.png | Bin 0 -> 164 bytes .../sd/res/presenterscreen-BorderBottomLeft.png | Bin 0 -> 576 bytes .../sd/res/presenterscreen-BorderBottomRight.png | Bin 0 -> 587 bytes .../presenterscreen-BorderCurrentSlideBottom.png | Bin 0 -> 140 bytes ...resenterscreen-BorderCurrentSlideBottomLeft.png | Bin 0 -> 161 bytes ...esenterscreen-BorderCurrentSlideBottomRight.png | Bin 0 -> 159 bytes .../res/presenterscreen-BorderCurrentSlideLeft.png | Bin 0 -> 140 bytes .../presenterscreen-BorderCurrentSlideRight.png | Bin 0 -> 140 bytes .../res/presenterscreen-BorderCurrentSlideTop.png | Bin 0 -> 140 bytes .../presenterscreen-BorderCurrentSlideTopLeft.png | Bin 0 -> 164 bytes .../presenterscreen-BorderCurrentSlideTopRight.png | Bin 0 -> 164 bytes .../galaxy/sd/res/presenterscreen-BorderLeft.png | Bin 0 -> 147 bytes .../galaxy/sd/res/presenterscreen-BorderRight.png | Bin 0 -> 177 bytes .../sd/res/presenterscreen-BorderToolbarBottom.png | Bin 0 -> 112 bytes .../sd/res/presenterscreen-BorderToolbarLeft.png | Bin 0 -> 119 bytes .../sd/res/presenterscreen-BorderToolbarRight.png | Bin 0 -> 121 bytes .../sd/res/presenterscreen-BorderToolbarTop.png | Bin 0 -> 120 bytes .../res/presenterscreen-BorderToolbarTopLeft.png | Bin 0 -> 268 bytes .../res/presenterscreen-BorderToolbarTopRight.png | Bin 0 -> 244 bytes .../galaxy/sd/res/presenterscreen-BorderTop.png | Bin 0 -> 174 bytes .../sd/res/presenterscreen-BorderTopLeft.png | Bin 0 -> 426 bytes .../sd/res/presenterscreen-BorderTopRight.png | Bin 0 -> 414 bytes .../presenterscreen-ButtonEffectNextDisabled.png | Bin 0 -> 258 bytes .../presenterscreen-ButtonEffectNextMouseOver.png | Bin 0 -> 259 bytes .../res/presenterscreen-ButtonEffectNextNormal.png | Bin 0 -> 262 bytes .../presenterscreen-ButtonEffectNextSelected.png | Bin 0 -> 257 bytes .../presenterscreen-ButtonFrameCenterMouseOver.png | Bin 0 -> 131 bytes .../presenterscreen-ButtonFrameCenterNormal.png | Bin 0 -> 138 bytes .../presenterscreen-ButtonFrameLeftMouseOver.png | Bin 0 -> 166 bytes .../res/presenterscreen-ButtonFrameLeftNormal.png | Bin 0 -> 166 bytes .../presenterscreen-ButtonFrameRightMouseOver.png | Bin 0 -> 163 bytes .../res/presenterscreen-ButtonFrameRightNormal.png | Bin 0 -> 163 bytes .../sd/res/presenterscreen-ButtonHelpDisabled.png | Bin 0 -> 543 bytes .../sd/res/presenterscreen-ButtonHelpMouseOver.png | Bin 0 -> 538 bytes .../sd/res/presenterscreen-ButtonHelpNormal.png | Bin 0 -> 550 bytes .../sd/res/presenterscreen-ButtonHelpSelected.png | Bin 0 -> 623 bytes .../sd/res/presenterscreen-ButtonMinusDisabled.png | Bin 0 -> 243 bytes .../res/presenterscreen-ButtonMinusMouseOver.png | Bin 0 -> 239 bytes .../sd/res/presenterscreen-ButtonMinusNormal.png | Bin 0 -> 244 bytes .../sd/res/presenterscreen-ButtonMinusSelected.png | Bin 0 -> 245 bytes .../sd/res/presenterscreen-ButtonNotesDisabled.png | Bin 0 -> 321 bytes .../res/presenterscreen-ButtonNotesMouseOver.png | Bin 0 -> 314 bytes .../sd/res/presenterscreen-ButtonNotesNormal.png | Bin 0 -> 324 bytes .../sd/res/presenterscreen-ButtonNotesSelected.png | Bin 0 -> 318 bytes .../sd/res/presenterscreen-ButtonPlusDisabled.png | Bin 0 -> 277 bytes .../sd/res/presenterscreen-ButtonPlusMouseOver.png | Bin 0 -> 275 bytes .../sd/res/presenterscreen-ButtonPlusNormal.png | Bin 0 -> 279 bytes .../sd/res/presenterscreen-ButtonPlusSelected.png | Bin 0 -> 280 bytes .../presenterscreen-ButtonSlideNextDisabled.png | Bin 0 -> 246 bytes .../presenterscreen-ButtonSlideNextMouseOver.png | Bin 0 -> 250 bytes .../res/presenterscreen-ButtonSlideNextNormal.png | Bin 0 -> 250 bytes ...presenterscreen-ButtonSlidePreviousDisabled.png | Bin 0 -> 270 bytes ...resenterscreen-ButtonSlidePreviousMouseOver.png | Bin 0 -> 263 bytes .../presenterscreen-ButtonSlidePreviousNormal.png | Bin 0 -> 271 bytes ...presenterscreen-ButtonSlidePreviousSelected.png | Bin 0 -> 270 bytes .../presenterscreen-ButtonSlideSorterDisabled.png | Bin 0 -> 342 bytes .../presenterscreen-ButtonSlideSorterMouseOver.png | Bin 0 -> 338 bytes .../presenterscreen-ButtonSlideSorterNormal.png | Bin 0 -> 347 bytes .../presenterscreen-ButtonSlideSorterSelected.png | Bin 0 -> 338 bytes ...resenterscreen-ButtonSwitchMonitorMouseOver.png | Bin 0 -> 484 bytes .../presenterscreen-ButtonSwitchMonitorNormal.png | Bin 0 -> 649 bytes .../res/presenterscreen-LabelMouseOverCenter.png | Bin 0 -> 208 bytes .../sd/res/presenterscreen-LabelMouseOverLeft.png | Bin 0 -> 157 bytes .../sd/res/presenterscreen-LabelMouseOverRight.png | Bin 0 -> 154 bytes .../presenterscreen-ScrollbarArrowDownDisabled.png | Bin 0 -> 324 bytes ...presenterscreen-ScrollbarArrowDownMouseOver.png | Bin 0 -> 324 bytes .../presenterscreen-ScrollbarArrowDownNormal.png | Bin 0 -> 331 bytes .../presenterscreen-ScrollbarArrowDownSelected.png | Bin 0 -> 369 bytes .../presenterscreen-ScrollbarArrowUpDisabled.png | Bin 0 -> 319 bytes .../presenterscreen-ScrollbarArrowUpMouseOver.png | Bin 0 -> 323 bytes .../res/presenterscreen-ScrollbarArrowUpNormal.png | Bin 0 -> 329 bytes .../presenterscreen-ScrollbarArrowUpSelected.png | Bin 0 -> 365 bytes ...esenterscreen-ScrollbarPagerMiddleMouseOver.png | Bin 0 -> 125 bytes .../presenterscreen-ScrollbarPagerMiddleNormal.png | Bin 0 -> 119 bytes ...esenterscreen-ScrollbarThumbBottomMouseOver.png | Bin 0 -> 120 bytes .../presenterscreen-ScrollbarThumbBottomNormal.png | Bin 0 -> 120 bytes ...esenterscreen-ScrollbarThumbMiddleMouseOver.png | Bin 0 -> 118 bytes .../presenterscreen-ScrollbarThumbMiddleNormal.png | Bin 0 -> 118 bytes .../presenterscreen-ScrollbarThumbTopMouseOver.png | Bin 0 -> 120 bytes .../presenterscreen-ScrollbarThumbTopNormal.png | Bin 0 -> 120 bytes .../sd/res/presenterscreen-ViewBackground.png | Bin 0 -> 177 bytes offapi/com/sun/star/drawing/XPresenterHelper.idl | 20 +- officecfg/Configuration_officecfg.mk | 3 + .../registry/data/org/openoffice/Office/Jobs.xcu | 18 +- .../data/org/openoffice/Office/PresenterScreen.xcu | 1253 ++++++++++++++++++++ .../data/org/openoffice/Office/ProtocolHandler.xcu | 11 +- officecfg/registry/data/org/openoffice/Setup.xcu | 5 + officecfg/registry/files.mk | 1 + .../org/openoffice/Office/PresenterScreen.xcs | 460 +++++++ postprocess/packcomponents/makefile.mk | 1 + postprocess/packregistry/makefile.mk | 4 + scp2/source/extensions/directory_extensions.scp | 11 - scp2/source/extensions/file_extensions.scp | 13 - scp2/source/extensions/module_extensions.scp | 15 - scp2/source/extensions/module_extensions.ulf | 6 - scp2/source/impress/file_impress.scp | 11 + sd/source/ui/app/res_bmp.src | 457 +++++++ sd/source/ui/inc/res_bmp.hrc | 93 ++ sd/source/ui/presenter/PresenterHelper.cxx | 225 +++- sd/source/ui/presenter/PresenterHelper.hxx | 3 - sdext/Configuration_presenter.mk | 43 - sdext/CustomTarget_presenter.mk | 39 - sdext/Extension_presenter.mk | 146 --- sdext/Library_presenter.mk | 4 - sdext/Module_sdext.mk | 14 +- sdext/Rdb_presenter.mk | 34 - sdext/source/presenter/META-INF/manifest.xml | 33 - sdext/source/presenter/PresenterAccessibility.cxx | 6 +- .../source/presenter/PresenterBitmapContainer.cxx | 21 +- .../source/presenter/PresenterBitmapContainer.hxx | 5 - sdext/source/presenter/PresenterComponent.cxx | 39 - sdext/source/presenter/PresenterComponent.hxx | 48 - .../presenter/PresenterConfigurationAccess.cxx | 2 +- .../presenter/PresenterExtensionIdentifier.hxx | 29 - sdext/source/presenter/PresenterHelpView.cxx | 2 +- .../source/presenter/PresenterProtocolHandler.cxx | 8 +- sdext/source/presenter/PresenterScreen.cxx | 10 +- sdext/source/presenter/PresenterScrollBar.cxx | 4 +- sdext/source/presenter/PresenterSlideSorter.cxx | 6 +- sdext/source/presenter/PresenterTheme.cxx | 40 +- sdext/source/presenter/PresenterToolBar.cxx | 8 +- sdext/source/presenter/PresenterWindowManager.cxx | 4 +- sdext/source/presenter/bitmaps/Background.png | Bin 3474 -> 0 bytes .../presenter/bitmaps/BorderActiveBottom.png | Bin 214 -> 0 bytes .../bitmaps/BorderActiveBottomCallout.png | Bin 1425 -> 0 bytes .../presenter/bitmaps/BorderActiveBottomLeft.png | Bin 598 -> 0 bytes .../presenter/bitmaps/BorderActiveBottomRight.png | Bin 626 -> 0 bytes .../source/presenter/bitmaps/BorderActiveLeft.png | Bin 145 -> 0 bytes .../source/presenter/bitmaps/BorderActiveRight.png | Bin 141 -> 0 bytes sdext/source/presenter/bitmaps/BorderActiveTop.png | Bin 148 -> 0 bytes .../presenter/bitmaps/BorderActiveTopLeft.png | Bin 442 -> 0 bytes .../presenter/bitmaps/BorderActiveTopRight.png | Bin 438 -> 0 bytes sdext/source/presenter/bitmaps/BorderBottom.png | Bin 164 -> 0 bytes .../source/presenter/bitmaps/BorderBottomLeft.png | Bin 576 -> 0 bytes .../source/presenter/bitmaps/BorderBottomRight.png | Bin 587 -> 0 bytes .../presenter/bitmaps/BorderCurrentSlideBottom.png | Bin 140 -> 0 bytes .../bitmaps/BorderCurrentSlideBottomLeft.png | Bin 161 -> 0 bytes .../bitmaps/BorderCurrentSlideBottomRight.png | Bin 159 -> 0 bytes .../presenter/bitmaps/BorderCurrentSlideLeft.png | Bin 140 -> 0 bytes .../presenter/bitmaps/BorderCurrentSlideRight.png | Bin 140 -> 0 bytes .../presenter/bitmaps/BorderCurrentSlideTop.png | Bin 140 -> 0 bytes .../bitmaps/BorderCurrentSlideTopLeft.png | Bin 164 -> 0 bytes .../bitmaps/BorderCurrentSlideTopRight.png | Bin 164 -> 0 bytes sdext/source/presenter/bitmaps/BorderLeft.png | Bin 147 -> 0 bytes sdext/source/presenter/bitmaps/BorderRight.png | Bin 177 -> 0 bytes .../presenter/bitmaps/BorderToolbarBottom.png | Bin 112 -> 0 bytes .../source/presenter/bitmaps/BorderToolbarLeft.png | Bin 119 -> 0 bytes .../presenter/bitmaps/BorderToolbarRight.png | Bin 121 -> 0 bytes .../source/presenter/bitmaps/BorderToolbarTop.png | Bin 120 -> 0 bytes .../presenter/bitmaps/BorderToolbarTopLeft.png | Bin 268 -> 0 bytes .../presenter/bitmaps/BorderToolbarTopRight.png | Bin 244 -> 0 bytes sdext/source/presenter/bitmaps/BorderTop.png | Bin 174 -> 0 bytes sdext/source/presenter/bitmaps/BorderTopLeft.png | Bin 426 -> 0 bytes sdext/source/presenter/bitmaps/BorderTopRight.png | Bin 414 -> 0 bytes .../presenter/bitmaps/ButtonEffectNextDisabled.png | Bin 258 -> 0 bytes .../bitmaps/ButtonEffectNextMouseOver.png | Bin 259 -> 0 bytes .../presenter/bitmaps/ButtonEffectNextNormal.png | Bin 262 -> 0 bytes .../presenter/bitmaps/ButtonEffectNextSelected.png | Bin 257 -> 0 bytes .../bitmaps/ButtonFrameCenterMouseOver.png | Bin 131 -> 0 bytes .../presenter/bitmaps/ButtonFrameCenterNormal.png | Bin 138 -> 0 bytes .../presenter/bitmaps/ButtonFrameLeftMouseOver.png | Bin 166 -> 0 bytes .../presenter/bitmaps/ButtonFrameLeftNormal.png | Bin 166 -> 0 bytes .../bitmaps/ButtonFrameRightMouseOver.png | Bin 163 -> 0 bytes .../presenter/bitmaps/ButtonFrameRightNormal.png | Bin 163 -> 0 bytes .../presenter/bitmaps/ButtonHelpDisabled.png | Bin 543 -> 0 bytes .../presenter/bitmaps/ButtonHelpMouseOver.png | Bin 538 -> 0 bytes .../source/presenter/bitmaps/ButtonHelpNormal.png | Bin 550 -> 0 bytes .../presenter/bitmaps/ButtonHelpSelected.png | Bin 623 -> 0 bytes .../presenter/bitmaps/ButtonMinusDisabled.png | Bin 243 -> 0 bytes .../presenter/bitmaps/ButtonMinusMouseOver.png | Bin 239 -> 0 bytes .../source/presenter/bitmaps/ButtonMinusNormal.png | Bin 244 -> 0 bytes .../presenter/bitmaps/ButtonMinusSelected.png | Bin 245 -> 0 bytes .../presenter/bitmaps/ButtonNotesDisabled.png | Bin 321 -> 0 bytes .../presenter/bitmaps/ButtonNotesMouseOver.png | Bin 314 -> 0 bytes .../source/presenter/bitmaps/ButtonNotesNormal.png | Bin 324 -> 0 bytes .../presenter/bitmaps/ButtonNotesSelected.png | Bin 318 -> 0 bytes .../presenter/bitmaps/ButtonPlusDisabled.png | Bin 277 -> 0 bytes .../presenter/bitmaps/ButtonPlusMouseOver.png | Bin 275 -> 0 bytes .../source/presenter/bitmaps/ButtonPlusNormal.png | Bin 279 -> 0 bytes .../presenter/bitmaps/ButtonPlusSelected.png | Bin 280 -> 0 bytes .../presenter/bitmaps/ButtonSlideNextDisabled.png | Bin 246 -> 0 bytes .../presenter/bitmaps/ButtonSlideNextMouseOver.png | Bin 250 -> 0 bytes .../presenter/bitmaps/ButtonSlideNextNormal.png | Bin 250 -> 0 bytes .../bitmaps/ButtonSlidePreviousDisabled.png | Bin 270 -> 0 bytes .../bitmaps/ButtonSlidePreviousMouseOver.png | Bin 263 -> 0 bytes .../bitmaps/ButtonSlidePreviousNormal.png | Bin 271 -> 0 bytes .../bitmaps/ButtonSlidePreviousSelected.png | Bin 270 -> 0 bytes .../bitmaps/ButtonSlideSorterDisabled.png | Bin 342 -> 0 bytes .../bitmaps/ButtonSlideSorterMouseOver.png | Bin 338 -> 0 bytes .../presenter/bitmaps/ButtonSlideSorterNormal.png | Bin 347 -> 0 bytes .../bitmaps/ButtonSlideSorterSelected.png | Bin 338 -> 0 bytes .../bitmaps/ButtonSwitchMonitorMouseOver.png | Bin 484 -> 0 bytes .../bitmaps/ButtonSwitchMonitorNormal.png | Bin 649 -> 0 bytes .../presenter/bitmaps/LabelMouseOverCenter.png | Bin 208 -> 0 bytes .../presenter/bitmaps/LabelMouseOverLeft.png | Bin 157 -> 0 bytes .../presenter/bitmaps/LabelMouseOverRight.png | Bin 154 -> 0 bytes .../bitmaps/ScrollbarArrowDownDisabled.png | Bin 324 -> 0 bytes .../bitmaps/ScrollbarArrowDownMouseOver.png | Bin 324 -> 0 bytes .../presenter/bitmaps/ScrollbarArrowDownNormal.png | Bin 331 -> 0 bytes .../bitmaps/ScrollbarArrowDownSelected.png | Bin 369 -> 0 bytes .../presenter/bitmaps/ScrollbarArrowUpDisabled.png | Bin 319 -> 0 bytes .../bitmaps/ScrollbarArrowUpMouseOver.png | Bin 323 -> 0 bytes .../presenter/bitmaps/ScrollbarArrowUpNormal.png | Bin 329 -> 0 bytes .../presenter/bitmaps/ScrollbarArrowUpSelected.png | Bin 365 -> 0 bytes .../bitmaps/ScrollbarPagerMiddleMouseOver.png | Bin 125 -> 0 bytes .../bitmaps/ScrollbarPagerMiddleNormal.png | Bin 119 -> 0 bytes .../bitmaps/ScrollbarThumbBottomMouseOver.png | Bin 120 -> 0 bytes .../bitmaps/ScrollbarThumbBottomNormal.png | Bin 120 -> 0 bytes .../bitmaps/ScrollbarThumbMiddleMouseOver.png | Bin 118 -> 0 bytes .../bitmaps/ScrollbarThumbMiddleNormal.png | Bin 118 -> 0 bytes .../bitmaps/ScrollbarThumbTopMouseOver.png | Bin 120 -> 0 bytes .../presenter/bitmaps/ScrollbarThumbTopNormal.png | Bin 120 -> 0 bytes sdext/source/presenter/bitmaps/ViewBackground.png | Bin 177 -> 0 bytes sdext/source/presenter/description-en-US.txt | 2 - sdext/source/presenter/description.xml | 51 - sdext/source/presenter/presenter.component | 9 +- .../registry/data/org/openoffice/Office/Jobs.xcu | 37 - .../data/org/openoffice/Office/ProtocolHandler.xcu | 27 - .../Office/extension/PresenterScreen.xcu | 1253 -------------------- .../Office/extension/PresenterScreen.xcs | 465 -------- 233 files changed, 2566 insertions(+), 2458 deletions(-) create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-Background.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottom.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomCallout.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTop.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderBottom.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderBottomLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderBottomRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottom.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTop.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarBottom.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTop.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderTop.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderTopLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-BorderTopRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextDisabled.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextSelected.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpDisabled.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpSelected.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusDisabled.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusSelected.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesDisabled.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesSelected.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusDisabled.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusSelected.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextDisabled.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousDisabled.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousSelected.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterDisabled.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterSelected.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverCenter.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverLeft.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverRight.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownDisabled.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownSelected.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpDisabled.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpSelected.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopNormal.png create mode 100644 icon-themes/galaxy/sd/res/presenterscreen-ViewBackground.png create mode 100644 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu create mode 100644 officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs delete mode 100644 sdext/Configuration_presenter.mk delete mode 100644 sdext/CustomTarget_presenter.mk delete mode 100644 sdext/Extension_presenter.mk delete mode 100644 sdext/Rdb_presenter.mk delete mode 100644 sdext/source/presenter/META-INF/manifest.xml delete mode 100644 sdext/source/presenter/PresenterComponent.hxx delete mode 100644 sdext/source/presenter/PresenterExtensionIdentifier.hxx delete mode 100644 sdext/source/presenter/bitmaps/Background.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveBottom.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveBottomRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveTop.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveTopLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderActiveTopRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderBottom.png delete mode 100644 sdext/source/presenter/bitmaps/BorderBottomLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderBottomRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarBottom.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarTop.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderToolbarTopRight.png delete mode 100644 sdext/source/presenter/bitmaps/BorderTop.png delete mode 100644 sdext/source/presenter/bitmaps/BorderTopLeft.png delete mode 100644 sdext/source/presenter/bitmaps/BorderTopRight.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonHelpDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonHelpNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonHelpSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonMinusDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonMinusNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonMinusSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonNotesDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonNotesNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonNotesSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonPlusDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonPlusNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonPlusSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png delete mode 100644 sdext/source/presenter/bitmaps/LabelMouseOverCenter.png delete mode 100644 sdext/source/presenter/bitmaps/LabelMouseOverLeft.png delete mode 100644 sdext/source/presenter/bitmaps/LabelMouseOverRight.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png delete mode 100644 sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png delete mode 100644 sdext/source/presenter/bitmaps/ViewBackground.png delete mode 100644 sdext/source/presenter/description-en-US.txt delete mode 100644 sdext/source/presenter/description.xml delete mode 100644 sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu delete mode 100644 sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu delete mode 100644 sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu delete mode 100644 sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs diff --git a/Repository.mk b/Repository.mk index dd5a93c65067..7592b50d4e17 100755 --- a/Repository.mk +++ b/Repository.mk @@ -535,6 +535,7 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ + PresenterScreen \ basprov \ cairocanvas \ canvasfactory \ @@ -637,7 +638,6 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ pdfimport \ - PresenterScreen \ SunPresentationMinimizer \ )) diff --git a/config_host.mk.in b/config_host.mk.in index a68918222ec0..0e5faf5e0334 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -164,7 +164,6 @@ export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@ export ENABLE_OPENGL=@ENABLE_OPENGL@ export ENABLE_OXYGENOFFICE=@ENABLE_OXYGENOFFICE@ export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@ -export ENABLE_PRESENTER_SCREEN=@ENABLE_PRESENTER_SCREEN@ export ENABLE_QUICKSTART_LIBPNG=@ENABLE_QUICKSTART_LIBPNG@ export ENABLE_RANDR=@ENABLE_RANDR@ export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@ diff --git a/configure.ac b/configure.ac index 024a2b397810..b9ac3018b23f 100644 --- a/configure.ac +++ b/configure.ac @@ -626,11 +626,6 @@ AC_ARG_ENABLE(ext-pdfimport, [Disable the PDF Import extension.]) ) -AC_ARG_ENABLE(ext-presenter-console, - AS_HELP_STRING([--disable-ext-presenter-console], - [Disable the Presenter Console extension.]) -) - AC_ARG_ENABLE(ext-presenter-minimizer, AS_HELP_STRING([--disable-ext-presenter-minimizer], [Disable the Presentation Minimizer extension.]) @@ -9748,18 +9743,6 @@ else fi AC_SUBST(ENABLE_MINIMIZER) -# presenter console extension? -AC_MSG_CHECKING([whether to build the Presenter Console extension]) -if test "x$enable_ext_presenter_console" != "xno" -a "x$enable_extension_integration" != "xno"; then - AC_MSG_RESULT([yes]) - ENABLE_PRESENTER_SCREEN=YES -else - AC_MSG_RESULT([no]) - ENABLE_PRESENTER_SCREEN=NO - SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PRESENTER_SCREEN" -fi -AC_SUBST(ENABLE_PRESENTER_SCREEN) - # pdf import extension? AC_MSG_CHECKING([whether to build the PDF Import extension]) if test "x$enable_ext_pdfimport" != "xno" -a "x$enable_extension_integration" != "xno"; then @@ -9801,11 +9784,6 @@ AC_SUBST(POPPLER_CFLAGS) AC_SUBST(POPPLER_LIBS) AC_SUBST(XPDF_TARBALL) - -if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then - BUILD_TYPE="$BUILD_TYPE SDEXT" -fi - AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then AC_MSG_RESULT([yes]) diff --git a/icon-themes/galaxy/sd/res/presenterscreen-Background.png b/icon-themes/galaxy/sd/res/presenterscreen-Background.png new file mode 100644 index 000000000000..7b32e4ab974b Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-Background.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottom.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottom.png new file mode 100644 index 000000000000..8314c9efd092 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottom.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomCallout.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomCallout.png new file mode 100644 index 000000000000..b7c33223a33c Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomCallout.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomLeft.png new file mode 100644 index 000000000000..8d573e864942 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomRight.png new file mode 100644 index 000000000000..35ef8e9213db Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveLeft.png new file mode 100644 index 000000000000..57d4a3dbbcd3 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveRight.png new file mode 100644 index 000000000000..9a9857190b9d Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTop.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTop.png new file mode 100644 index 000000000000..e0bea9d55448 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTop.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopLeft.png new file mode 100644 index 000000000000..62d63271fe21 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopRight.png new file mode 100644 index 000000000000..450c8e0cc5e7 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderBottom.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderBottom.png new file mode 100644 index 000000000000..7ad2fd6c2a03 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderBottom.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderBottomLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderBottomLeft.png new file mode 100644 index 000000000000..019de149b3af Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderBottomLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderBottomRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderBottomRight.png new file mode 100644 index 000000000000..82de5791c1cd Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderBottomRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottom.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottom.png new file mode 100644 index 000000000000..7000bc22f6c4 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottom.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png new file mode 100644 index 000000000000..7571c8d94b1f Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomRight.png new file mode 100644 index 000000000000..c0af63ff58b8 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideLeft.png new file mode 100644 index 000000000000..7000bc22f6c4 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideRight.png new file mode 100644 index 000000000000..7000bc22f6c4 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTop.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTop.png new file mode 100644 index 000000000000..7000bc22f6c4 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTop.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopLeft.png new file mode 100644 index 000000000000..fdfabd42ae9f Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopRight.png new file mode 100644 index 000000000000..5b4b642e9f34 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderLeft.png new file mode 100644 index 000000000000..cbdb267b8789 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderRight.png new file mode 100644 index 000000000000..333073328ddd Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarBottom.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarBottom.png new file mode 100644 index 000000000000..23a3bc3595aa Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarBottom.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarLeft.png new file mode 100644 index 000000000000..839ab5091a8e Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarRight.png new file mode 100644 index 000000000000..e5c4b9d25a16 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTop.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTop.png new file mode 100644 index 000000000000..c45b97c434cd Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTop.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopLeft.png new file mode 100644 index 000000000000..978e98a9bbc4 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopRight.png new file mode 100644 index 000000000000..7dc3d98860ea Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderTop.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderTop.png new file mode 100644 index 000000000000..dee68e828147 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderTop.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderTopLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderTopLeft.png new file mode 100644 index 000000000000..bbec4e42be42 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderTopLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-BorderTopRight.png b/icon-themes/galaxy/sd/res/presenterscreen-BorderTopRight.png new file mode 100644 index 000000000000..3416b16c9e91 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-BorderTopRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextDisabled.png new file mode 100644 index 000000000000..5417cf72c928 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextDisabled.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextMouseOver.png new file mode 100644 index 000000000000..96805e392176 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextNormal.png new file mode 100644 index 000000000000..6dbd732e0977 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextSelected.png new file mode 100644 index 000000000000..eb6e6d45bb23 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextSelected.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterMouseOver.png new file mode 100644 index 000000000000..b97799f1f314 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterNormal.png new file mode 100644 index 000000000000..4cf7218f3b52 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftMouseOver.png new file mode 100644 index 000000000000..1f2ab6a00cab Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftNormal.png new file mode 100644 index 000000000000..0e92cb37d7d8 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightMouseOver.png new file mode 100644 index 000000000000..0f49ad4f7e61 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightNormal.png new file mode 100644 index 000000000000..4ca69670e513 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpDisabled.png new file mode 100644 index 000000000000..12f4903b6cf8 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpDisabled.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpMouseOver.png new file mode 100644 index 000000000000..7bddef561f11 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpNormal.png new file mode 100644 index 000000000000..99c693215ba9 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpSelected.png new file mode 100644 index 000000000000..f162db27650e Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpSelected.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusDisabled.png new file mode 100644 index 000000000000..ff61106eb7ec Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusDisabled.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusMouseOver.png new file mode 100644 index 000000000000..787249912b9c Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusNormal.png new file mode 100644 index 000000000000..e2d993384fef Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusSelected.png new file mode 100644 index 000000000000..5d15de3b916f Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusSelected.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesDisabled.png new file mode 100644 index 000000000000..09e31d26c649 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesDisabled.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesMouseOver.png new file mode 100644 index 000000000000..099d6bf0f2b1 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesNormal.png new file mode 100644 index 000000000000..551392622506 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesSelected.png new file mode 100644 index 000000000000..f5494fb1c678 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesSelected.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusDisabled.png new file mode 100644 index 000000000000..e6ba3f3e78a7 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusDisabled.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusMouseOver.png new file mode 100644 index 000000000000..9d21dc40a6eb Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusNormal.png new file mode 100644 index 000000000000..2e075c2a3a87 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusSelected.png new file mode 100644 index 000000000000..b9d6fe1ed929 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusSelected.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextDisabled.png new file mode 100644 index 000000000000..7f3bce058f4c Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextDisabled.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextMouseOver.png new file mode 100644 index 000000000000..4dc13655965b Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextNormal.png new file mode 100644 index 000000000000..711b8ca8caf6 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousDisabled.png new file mode 100644 index 000000000000..383780eab2cf Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousDisabled.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png new file mode 100644 index 000000000000..dc35c62deaf2 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousNormal.png new file mode 100644 index 000000000000..26262b4568d7 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousSelected.png new file mode 100644 index 000000000000..7274263a43f5 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousSelected.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterDisabled.png new file mode 100644 index 000000000000..ce7d4ad51514 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterDisabled.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterMouseOver.png new file mode 100644 index 000000000000..2e7f518ac9e3 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterNormal.png new file mode 100644 index 000000000000..7aa914f41c01 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterSelected.png new file mode 100644 index 000000000000..143f995a004c Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterSelected.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png new file mode 100644 index 000000000000..bc1055a97689 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorNormal.png new file mode 100644 index 000000000000..8cfe81dd1d5a Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverCenter.png b/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverCenter.png new file mode 100644 index 000000000000..6eb75d386f46 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverCenter.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverLeft.png b/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverLeft.png new file mode 100644 index 000000000000..9455246332cf Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverLeft.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverRight.png b/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverRight.png new file mode 100644 index 000000000000..1f972d0cebea Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverRight.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownDisabled.png new file mode 100644 index 000000000000..4dd16272fad7 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownDisabled.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png new file mode 100644 index 000000000000..d1980a2a1a05 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownNormal.png new file mode 100644 index 000000000000..166f10057c11 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownSelected.png new file mode 100644 index 000000000000..21d42945ce98 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownSelected.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpDisabled.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpDisabled.png new file mode 100644 index 000000000000..44f60683bc59 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpDisabled.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png new file mode 100644 index 000000000000..9795885632dc Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpNormal.png new file mode 100644 index 000000000000..804ced846065 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpSelected.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpSelected.png new file mode 100644 index 000000000000..d7be4f324f86 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpSelected.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png new file mode 100644 index 000000000000..84b781af9fb8 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png new file mode 100644 index 000000000000..a06ba667f118 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png new file mode 100644 index 000000000000..482f13638755 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomNormal.png new file mode 100644 index 000000000000..ec46e172c134 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png new file mode 100644 index 000000000000..62066c24b687 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png new file mode 100644 index 000000000000..c25e4edcf595 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png new file mode 100644 index 000000000000..714481df996d Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopNormal.png b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopNormal.png new file mode 100644 index 000000000000..7e0922c74966 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopNormal.png differ diff --git a/icon-themes/galaxy/sd/res/presenterscreen-ViewBackground.png b/icon-themes/galaxy/sd/res/presenterscreen-ViewBackground.png new file mode 100644 index 000000000000..ca52d8262a88 Binary files /dev/null and b/icon-themes/galaxy/sd/res/presenterscreen-ViewBackground.png differ diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl index 003b6c1b5e75..6d40c6af3c9b 100644 --- a/offapi/com/sun/star/drawing/XPresenterHelper.idl +++ b/offapi/com/sun/star/drawing/XPresenterHelper.idl @@ -28,13 +28,13 @@ module com { module sun { module star { module drawing { -/** This interface is a collection of functions that are necessary to +/** This interface is a collection of functions that were necessary to implement larger parts of the presenter screen as extension. The - methods of this interface give access to services that can, at the - moment, only implemented in the Office core, not in an extension. + methods of this interface give access to services that could only be + implemented in the Office core, not in an extension. -

With time some, maybe all, methods can moved to other, better suited, - interfaces.

+

As the presenter screen is no extension any more, this hack can go again; + it just needs clean-up.

*/ interface XPresenterHelper { @@ -114,17 +114,15 @@ interface XPresenterHelper void toTop ( [in] ::com::sun::star::awt::XWindow xWindow); - /** Load a bitmap from a file or other accessible resource that can be - located via a URL. - @param sURL - The URL of the bitmap. For a file URL the bitmap is loaded from - the specified file. + /** Load a bitmap with a given ID. + @param id + The ID of the bitmap. @param xCanvas The bitmap is created to be compatible, and possibly optimized, for this canvas. */ ::com::sun::star::rendering::XBitmap loadBitmap ( - [in] string sURL, + [in] string id, [in] ::com::sun::star::rendering::XCanvas xCanvas); /** Capture the mouse so that no other window will receive mouse events. diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 7b03616a48b5..df9b30aa97a4 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -82,7 +82,9 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Common-macosx.xcu \ org/openoffice/Office/Common-wnt.xcu \ org/openoffice/Office/Common-UseOOoFileDialogs.xcu \ + org/openoffice/Office/Jobs-impress.xcu \ org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \ + org/openoffice/Office/ProtocolHandler-impress.xcu \ org/openoffice/Office/Scripting-python.xcu \ org/openoffice/Office/Common-cjk.xcu \ org/openoffice/Office/Common-ctl.xcu \ @@ -124,6 +126,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/Common.xcu \ org/openoffice/Office/SFX.xcu \ org/openoffice/Office/DataAccess.xcu \ + org/openoffice/Office/PresenterScreen.xcu \ org/openoffice/Office/TableWizard.xcu \ org/openoffice/Office/UI.xcu \ org/openoffice/Office/Embedding.xcu \ diff --git a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu index 7dea57841d32..dffb3f84f5e4 100644 --- a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu @@ -17,9 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + + + + org.libreoffice.comp.PresenterScreenJob + + + com.sun.star.presentation.PresentationDocument + + + + + + + diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu new file mode 100644 index 000000000000..fe2c78c46dce --- /dev/null +++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu @@ -0,0 +1,1253 @@ + + + + + + + + + + PreviousSlide + Button + + Previous + + bitmaps/ButtonSlidePreviousNormal.png + + vnd.org.libreoffice.presenterscreen:PrevSlide + + 12 + Bold + B3B7BC + Center + + + + + bitmaps/ButtonSlidePreviousMouseOver.png + + + FFFFFF + + + + + bitmaps/ButtonSlidePreviousDisabled.png + + + + + NextEffect + Button + + Next + + bitmaps/ButtonEffectNextNormal.png + + vnd.org.libreoffice.presenterscreen:NextEffect + + 12 + Bold + B3B7BC + Center + + + + + bitmaps/ButtonEffectNextMouseOver.png + + + FFFFFF + + + + + bitmaps/ButtonEffectNextDisabled.png + + + + + Notes + Button + + Notes + + bitmaps/ButtonNotesNormal.png + + vnd.org.libreoffice.presenterscreen:ShowNotes + + 12 + Bold + B3B7BC + Center + + + + + bitmaps/ButtonNotesMouseOver.png + + + FFFFFF + + + + + bitmaps/ButtonNotesSelected.png + + + FFFFFF + + vnd.org.libreoffice.presenterscreen:CloseNotes + + + + bitmaps/ButtonNotesDisabled.png + + + + + SlideSorter + Button + + Slides + + bitmaps/ButtonSlideSorterNormal.png + + vnd.org.libreoffice.presenterscreen:ShowSlideSorter + + 12 + Bold + B3B7BC + Center + + + + + bitmaps/ButtonSlideSorterMouseOver.png + + + FFFFFF + + + + + bitmaps/ButtonSlideSorterSelected.png + + + FFFFFF + + vnd.org.libreoffice.presenterscreen:CloseSlideSorter + + + + bitmaps/ButtonSlideSorterDisabled.png + + + + + VerticalSeparator + + + 76797C + + + + + ChangeOrientation + + + CurrentTimeLabel + + + 18 + Bold + ffffff + Center + + + + + HorizontalSeparator + + + 71767a + + + + + PresentationTimeLabel + + + 26 + Bold + ffe969 + Center + + + + + ChangeOrientation + + + VerticalSeparator + + + 76797C + + + + + SwitchMonitor + Button + + Exchange + + bitmaps/ButtonSwitchMonitorNormal.png + + vnd.org.libreoffice.presenterscreen:SwitchMonitor + + 12 + Bold + B3B7BC + Center + + + + + bitmaps/ButtonSwitchMonitorMouseOver.png + + + FFFFFF + + + + + bitmaps/ButtonSwitchMonitorDisabled.png + + + + + VerticalSeparator + + + 76797C + + + + + Help + Button + + Help + + bitmaps/ButtonHelpNormal.png + + vnd.org.libreoffice.presenterscreen:ShowHelp + + 12 + Bold + B3B7BC + Center + + + + + bitmaps/ButtonHelpMouseOver.png + + + FFFFFF + + + + + bitmaps/ButtonHelpSelected.png + + + FFFFFF + + vnd.org.libreoffice.presenterscreen:CloseHelp + + + + bitmaps/ButtonHelpDisabled.png + + + + + + + + + Zoom + Label + + Zoom + + 14 + Bold + B3B7BC + + + + + Grow + Button + + + bitmaps/ButtonPlusNormal.png + + vnd.org.libreoffice.presenterscreen:GrowNotesFont + + + + bitmaps/ButtonPlusMouseOver.png + + + + + bitmaps/ButtonPlusDisabled.png + + + + + Shrink + Button + + + bitmaps/ButtonMinusNormal.png + + vnd.org.libreoffice.presenterscreen:ShrinkNotesFont + + + + bitmaps/ButtonMinusMouseOver.png + + + + + bitmaps/ButtonMinusDisabled.png + + + + + + + + + SlideSorterCloser + + Close + + vnd.org.libreoffice.presenterscreen:CloseSlideSorter + + + NotesViewCloser + + Close + + vnd.org.libreoffice.presenterscreen:CloseNotes + + + HelpViewCloser + + Close + + vnd.org.libreoffice.presenterscreen:CloseHelp + + + + + + Up + bitmaps/ScrollbarArrowUpNormal.png + bitmaps/ScrollbarArrowUpMouseOver.png + bitmaps/ScrollbarArrowUpDisabled.png + + + Down + bitmaps/ScrollbarArrowDownNormal.png + bitmaps/ScrollbarArrowDownMouseOver.png + bitmaps/ScrollbarArrowDownDisabled.png + + + PagerVertical + bitmaps/ScrollbarPagerMiddleNormal.png + bitmaps/ScrollbarPagerMiddleMouseOver.png + + + ThumbTop + bitmaps/ScrollbarThumbTopNormal.png + bitmaps/ScrollbarThumbTopMouseOver.png + + + ThumbBottom + bitmaps/ScrollbarThumbBottomNormal.png + bitmaps/ScrollbarThumbBottomMouseOver.png + + + ThumbVertical + bitmaps/ScrollbarThumbMiddleNormal.png + bitmaps/ScrollbarThumbMiddleMouseOver.png + + + + + + 9 + 9 + 9 + 9 + + + + bitmaps/BorderCurrentSlideTopLeft.png + + + bitmaps/BorderCurrentSlideTop.png + + + bitmaps/BorderCurrentSlideTopRight.png + + + bitmaps/BorderCurrentSlideLeft.png + + + bitmaps/BorderCurrentSlideRight.png + + + bitmaps/BorderCurrentSlideBottomLeft.png + + + bitmaps/BorderCurrentSlideBottom.png + + + bitmaps/BorderCurrentSlideBottomRight.png + + + + + + + + Left click, right or down arrow, spacebar, page down, enter, return, 'N' + + + Next slide, or next effect + + + + + Right click, left or up arrow, page up, backspace, 'P' + + + Previous slide, or previous effect + + + + + + + + + + + + + Home + + + First slide + + + + + End + + + Last slide + + + + + + + + + + + + + Alt-Page Up + + + Previous slide without effects + + + + + Alt-Page Down + + + Next slide without effects + + + + + + + + + + + + + 'B', '.' + + + Blacks/Unblacks the screen + + + + + 'W', ',' + + + Whites/Unwhites the screen + + + + + + + + + + + + + Esc, '-' + + + End slide show + + + + + + + + + + + + + Number followed by Enter + + + Go to that slide + + + + + + + + + + + + + 'G', 'S' + + + Grow/Shrink size of notes font + + + + + 'A', 'Z' + + + Scroll notes up/down + + + + + 'H', 'L' + + + Move caret in notes view backward/forward + + + + + + + + + + + + + Ctrl-'1' + + + Shows the Presenter Console + + + + + Ctrl-'2' + + + Shows the Presentation Notes + + + + + Ctrl-'3' + + + Shows the Slides Overview + + + + + + + + + + DefaultTheme + + + + + DefaultPaneStyle + + + + Bold + 14 + B3B7BC + Center + -7 + + + 6 + 6 + 6 + 6 + + + 20 + 28 + 20 + 29 + + + + bitmaps/BorderTop.png + 6 + + + bitmaps/BorderTopLeft.png + 6 + 6 + + + bitmaps/BorderTopRight.png + -6 + 6 + + + bitmaps/BorderLeft.png + 6 + + + bitmaps/BorderRight.png + -6 + + + bitmaps/BorderBottomLeft.png + 6 + -6 + + + bitmaps/BorderBottomRight.png + -6 + -6 + + + bitmaps/BorderBottom.png + -6 + + + + + + ActivePaneStyle + + + DefaultPaneStyle + + + + Bold + 14 + FFFFFF + Center + -10 + + + + bitmaps/BorderActiveTop.png + 6 + + + bitmaps/BorderActiveTopLeft.png + 6 + 6 + + + bitmaps/BorderActiveTopRight.png + -6 + 6 + + + bitmaps/BorderActiveLeft.png + 6 + + + bitmaps/BorderActiveRight.png + -6 + + + bitmaps/BorderActiveBottomLeft.png + 6 + -6 + + + bitmaps/BorderActiveBottomRight.png + -6 + -6 + + + bitmaps/BorderActiveBottom.png + -6 + + + + + + ToolbarPaneStyle + + + 4 + 4 + 4 + 4 + + + 8 + 8 + 8 + 0 + + + + bitmaps/BorderToolbarTop.png + 4 + + + bitmaps/BorderToolbarTopLeft.png + 4 + 4 + + + bitmaps/BorderToolbarTopRight.png + -4 + 4 + + + bitmaps/BorderToolbarLeft.png + 4 + + + bitmaps/BorderToolbarRight.png + -4 + + + bitmaps/BorderToolbarLeft.png + 4 + + + bitmaps/BorderToolbarRight.png + -4 + + + bitmaps/BorderToolbarBottom.png + -4 + + + + + + ActiveBottomCalloutPaneStyle + + + ActivePaneStyle + + + 52 + + + + bitmaps/BorderActiveBottomCallout.png + -6 + 49 + 41 + + + + + + + DefaultViewStyle + + + 20 + FFFFFF + + + + bitmaps/ViewBackground.png + Repeat + Repeat + 33000000 + + + + NotesViewStyle + DefaultViewStyle + + + Bold + 26 + d1d6dc + + + + SlideSorterViewStyle + DefaultViewStyle + + + HelpViewStyle + DefaultViewStyle + + + Bold + 20 + ffffff + + + + + bitmaps/Background.png + E4EFF9 + Repeat + Stretch + + + + ButtonFrameLeft + bitmaps/ButtonFrameLeftNormal.png + bitmaps/ButtonFrameLeftMouseOver.png + 2 + + + ButtonFrameCenter + bitmaps/ButtonFrameCenterNormal.png + bitmaps/ButtonFrameCenterMouseOver.png + 2 + + + ButtonFrameRight + bitmaps/ButtonFrameRightNormal.png + bitmaps/ButtonFrameRightMouseOver.png + 2 + + + bitmaps/LabelMouseOverLeft.png + + + bitmaps/LabelMouseOverCenter.png + + + bitmaps/LabelMouseOverRight.png + + + bitmaps/ButtonSlideNextNormal.png + + + + + + Bold + 18 + b3b7bc + + + + Bold + 18 + ffffff + + + + Bold + 20 + ffffff + + + + Bold + 24 + e02050 + + + + + + private:resource/pane/Presenter/Pane1 + + + ActivePaneStyle + + + + + private:resource/view/Presenter/CurrentSlidePreview + + + DefaultViewStyle + + + + + private:resource/pane/Presenter/Pane2 + + + DefaultPaneStyle + + + + + private:resource/view/Presenter/NextSlidePreview + + + DefaultViewStyle + + + + + private:resource/pane/Presenter/Pane4 + + + ToolbarPaneStyle + + + + + private:resource/view/Presenter/ToolBar + + + DefaultViewStyle + + + + + private:resource/pane/Presenter/Pane3 + + + ActivePaneStyle + + + + + private:resource/view/Presenter/Notes + + + NotesViewStyle + + + + + private:resource/view/Presenter/SlideSorter + + + SlideSorterViewStyle + + + + + private:resource/pane/Presenter/Overlay + + + ActivePaneStyle + + + + + private:resource/view/Presenter/Help + + + HelpViewStyle + + + + + private:resource/pane/Presenter/Pane6 + + + ActivePaneStyle + + + + + + + + + private:resource/view/Presenter/CurrentSlidePreview + + + Current Slide (%CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%) + + + Current Slide, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT% + + true + + + + Click to exit presentation... + + + + + Current Slide (end) + + + + + + + private:resource/view/Presenter/NextSlidePreview + + + Next Slide + + false + + + + private:resource/view/Presenter/ToolBar + + false + + + + private:resource/view/Presenter/Notes + + + Notes + + false + + + + private:resource/view/Presenter/SlideSorter + + false + + + + + Slide Overview, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT% + + + + + private:resource/view/Presenter/Help + + + Help + + false + + + + + + DefaultLayout + + + + + private:resource/pane/Presenter/Pane1 + + + private:resource/view/Presenter/CurrentSlidePreview + + + 0.05 + + + 0.05 + + + 0.50 + + + 0.50 + + + + + private:resource/pane/Presenter/Pane2 + + + private:resource/view/Presenter/NextSlidePreview + + + 0.60 + + + 0.05 + + + 0.35 + + + 0.35 + + + + + private:resource/pane/Presenter/Pane4 + + + private:resource/view/Presenter/ToolBar + + + 0.60 + + + 0.45 + + + 0.25 + + + 0.1 + + + + + private:resource/pane/Presenter/Pane3 + + + private:resource/view/Presenter/Notes + + + 0.05 + + + 0.60 + + + 0.9 + + + 0.35 + + + + + private:resource/pane/Presenter/Overlay + + + private:resource/view/Presenter/SlideSorter + + + 0.05 + + + 0.05 + + + 0.95 + + + 0.8 + + + + + private:resource/pane/Presenter/Pane6 + + + private:resource/view/Presenter/Help + + + 0.05 + + + 0.05 + + + 0.95 + + + 0.8 + + + + + + + + + Presenter Console + + + + + Current Slide Info + + + + + Presenter Notes + + + + + diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu index 36ec36bf924a..33d81468c4b2 100644 --- a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu +++ b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu @@ -17,7 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -59,5 +62,11 @@ vnd.sun.star.findbar:* + + + vnd.org.libreoffice.presenterscreen:* + + diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 3d8512aedd23..0fadef2d828b 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -791,6 +791,11 @@ com.sun.star.migration.Extensions + + + com.sun.PresenterScreen-* + + diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk index 2280f1cd1023..1f6fbfa4d1ac 100644 --- a/officecfg/registry/files.mk +++ b/officecfg/registry/files.mk @@ -40,6 +40,7 @@ officecfg_XCSFILES := \ Office/OOoImprovement/Settings \ Office/OptionsDialog \ Office/Paths \ + Office/PresenterScreen \ Office/ProtocolHandler \ Office/Recovery \ Office/SFX \ diff --git a/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs new file mode 100644 index 000000000000..eb4e6ae79fd8 --- /dev/null +++ b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs @@ -0,0 +1,460 @@ + + + + + AF + Configuration of the Presenter Screen extension. + + + + + Describes one bitmap that can be used as button icon or to paint + a pane border. + + Name of the bitmap. Used to look-up the bitmap in a container. + + + Text that is displayed together with the icon. + + + Relative file name to the bitmap for the normal icon. + + + Relative file name to the bitmap for the mouse over icon. + + + Relative file name to the bitmap for the button down icon. + + + Relative file name to the bitmap for the icon in disabled state. + + + Relative file name to the bitmap for the icon in disabled state. + + + The file name of the mask bitmap. Use red for pixel outside of + the border and blue for inside pixels. + + + + Horizontal offset to move the bitmap just outside the + window border. + 0 + + + Vertical offset to move the bitmap just outside the + window border. + 0 + + + Horizontal position of a hot spot. + + + Vertical position of a hot spot. + + + Color that is used as replacement for the bitmap when the later + can for some reason not be used. + + + Horizontal texturing mode. + + + Show texture only once + + + Repeat the texture + + + Stretch the texture to cover the paint area + + + + + Vertical texturing mode. + + + Show texture only once + + + Repeat the texture + + + Stretch the texture to cover the paint area + + + Once + + + + Four values describing the sizes of a border around a + rectangular area. + + Left border size. + + + Top border size. + + + Right border size. + + + Bottom border size. + + + + Font description. + + The name of the font family. + + + Font size. + + + Something like "Bold" or "Italic" or "Bold Italic". + + + Font color. + + + Orientation of text. Can be left, right, or centered. + + + Flush left + + + Flush right + + + Centered + + + + + Horizontal offset in relation to the anchor point. + + + Vertical offset in relation to the anchor point. + + + + Description of a tool bar entry state. + + Font used for displaying the text. + + + The icon to display. + + + The text to display. + + + Action to execute when a button is triggered. + + + + Definition of a tool bar entry. + + Name of the entry. May be used to have mode dependant entries. + + + Type of the entry. Examples are "Label" and "Button". + + + Description of a tool bar entry in normal mode (not selected, not mouse over) + + + Description of a tool bar entry when the mouse is over it. + + + Description of a tool bar entry when it is selected. + + + Description of a tool bar entry when it is disabled. + + + + Definition of one tool bar. + + Entries of the tool bars. + + + + Description of a button. + + Name of the button that is used to look up the button. + + + Font used for displaying the text. + + + The icon to display. + + + The text to display. + + + Action to execute when a button is triggered. + + + + Description of a help entry. + + Typically a list of keyboard key names. + + + Typically a description of the action triggered by pressing the keys on the left. + + + + Visual properties of a pane style: + the border of a pane and its title font. + + Name of the style. Used for referencing the style. + Has to be unique among pane styles and view styles + in one theme. + + + Name of the parent style. Values not supplied in this style + are taken from the parent style. Empty string or missing + mean no parent. + + + + Font used for displaying the pane title. + + + Size of the inner part of the border. + + + Size of the outer part of the border. + + + Bitmaps that are used to paint the borders of + a pane. + + + + Visual properties of a view style: + font and backround color. + + Name of the style. Used for referencing the style. + Has to be unique among pane styles and view styles + in one theme. + + + Name of the parent style. Values not supplied in this style + are taken from the parent style. Empty string or missing + mean no parent. + + + + Font used for text display inside a view. + + + Color (or bitmap) that is used to paint the + background of a view. + + + + Association of a drawing framework resource to a + style of the presenter theme. + + URL of a drawing framework resource. + + + Name of a pane style or a view style. + + + + Presenter string, whatever that might mean. + + Just a string. + + + + Association of a drawing framework resource to a + style of the presenter theme. + + URL of a drawing framework view. + + + Name of a view style. + + + Title displayed for the component. An empty or missing + title means that no title is displayed. + + + + Title displayed for the component when accessibility support is active. + An empty or missing title means that no title is displayed. + + + + When the value is false then the background is painted before the + view is painted. + false + + + List of localizable strings used by the view. + + + + Visual properties of the presenter view. The values in a theme + are hints and can be ignored. + + Name of the theme. Used for referencing the theme. + Has to be unique among all themes. The name of the + default theme is 'DefaultTheme' + + + Name of the parent theme. Values not supplied in this theme + are taken from the parent theme. Empty string or missing + mean default theme. + + + + Color or bitmap that is used to paint the + background. + + + List of pane styles. + + + List of view styles. + + + List of style associations. + + + List of additional bitmaps for example for buttons. + + + List of additional fonts. + + + + Layout of a component of the presenter screen. + + URL of a pane resource. + + + URL of a view resource that is to be displayed in + the pane. + + + Relative x position in the range of [0,1]. + + + Relative y position in the range of [0,1]. + + + Relative width in the range of [0,1]. + + + Relative height in the range of [0,1]. + + + + Layout of all components of the presenter screen. + + Name of the layout. Used for referencing the layout. + Has to be unique among all presenter layouts. + + + Name of the parent layout. Values not supplied in this layout + are taken from the parent layout. Missing or empty string + mean no parent layout. + + + + List of component layouts. + + + + + + Settings regarding controls that are only used by the Presenter + Screen. + + Set of tool bars. + + + Set of buttons. + + + Settings of scroll bars. + + Bitmaps of icons used for displaying the scroll bar. + + + + Settings of the slide sorter of the presenter screen. + + Size of the border around the current slide. + + + Bitmaps that are used to paint the border around the current + slide. + + + + Settings of help view. + + List of entries displayed in the help view. + + + + + General properties of the presenter view. + + When true then presenter screen is displayed on single screen systems + or when fullscreen presentation spans all screens. + false + + + List of available themes. + + + Name of the current theme. An empty name or the string "DefaultTheme" + specify the default theme. + DefaultTheme + + + Description of the views. + + + List of visible presenter components. + + + Name of the current layout. An empty name or the + string "DefaultLayout" specify the default layout. + DefaultLayout + + + Strings that are used make the presenter console accessible. + + + The view mode on start up of the extension. Valid values are 0 for the Preview-only mode, 1 for the notes view, 2 for the slide overview. + 0 + + + + diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 25c55e4a0c4f..51c5359e0e8f 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -80,6 +80,7 @@ my_components = \ component/sd/util/sd \ component/sd/util/sdd \ component/sd/util/sdfilt \ + component/sdext/source/presenter/presenter \ component/sfx2/util/sfx \ component/slideshow/util/slideshow \ component/sot/util/sot \ diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 019b1dce756a..d4952faa7383 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -99,14 +99,18 @@ MY_FILES_graphicfilter = \ MY_DEPS_impress = main MY_FILES_impress = \ + $(MY_XCS)/Office/PresenterScreen.xcs \ $(MY_XCS)/Office/UI/Effects.xcs \ $(MY_XCS)/Office/UI/ImpressWindowState.xcs \ + $(MY_XCU)/Office/PresenterScreen.xcu \ $(MY_XCU)/Office/UI/Effects.xcu \ $(MY_XCU)/Office/UI/ImpressWindowState.xcu \ $(MY_MOD)/fcfg_impress_filters.xcu \ $(MY_MOD)/fcfg_impress_types.xcu \ $(MY_MOD)/org/openoffice/Office/Common-impress.xcu \ $(MY_MOD)/org/openoffice/Office/Embedding-impress.xcu \ + $(MY_MOD)/org/openoffice/Office/Jobs-impress.xcu \ + $(MY_MOD)/org/openoffice/Office/ProtocolHandler-impress.xcu \ $(MY_MOD)/org/openoffice/Setup-impress.xcu MY_DEPS_korea = main diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index ca2d2c1c6d79..62d3b942ce07 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -66,17 +66,6 @@ End #endif -/* ** Presenter Screen ** */ - -#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN - -Directory gid_Brand_Dir_Share_Extensions_Presenter_Screen - ParentID = gid_Brand_Dir_Share_Extensions; - DosName = "presenter-screen"; -End - -#endif - /* ** PDF Import ** */ #ifndef WITHOUT_EXTENSION_PDFIMPORT diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 90e99875d32e..f268379905f2 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -72,19 +72,6 @@ End #endif -/* ** Presenter Screen ** */ - -#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN - -File gid_File_Oxt_Presenter_Screen - TXT_FILE_BODY; - Styles = (PACKED, ARCHIVE); - Dir = gid_Brand_Dir_Share_Extensions_Presenter_Screen; - Name = "presenter-screen.oxt"; -End - -#endif - /* ** PDF Import ** */ #ifndef WITHOUT_EXTENSION_PDFIMPORT diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 91853ea629e1..48b5f7d31975 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -87,21 +87,6 @@ Module gid_Module_Optional_Extensions_MEDIAWIKI End #endif -/* ** Presenter Screen ** */ - -#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN -Module gid_Module_Optional_Extensions_PRESENTER_SCREEN - PackageInfo = "packinfo_extensions.txt"; - MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN); - ParentID = gid_Module_Optional_Extensions; - Files = ( - gid_File_Oxt_Presenter_Screen ); - Minimal = NO; - Default = YES; - Styles = ( ); -End -#endif - /* ** PDF Import ** */ #ifndef WITHOUT_EXTENSION_PDFIMPORT diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf index 40d0a0aa176c..1d9e2476e629 100644 --- a/scp2/source/extensions/module_extensions.ulf +++ b/scp2/source/extensions/module_extensions.ulf @@ -51,12 +51,6 @@ en-US = "MediaWiki Publisher" [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI] en-US = "MediaWiki Publisher" -[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN] -en-US = "Presenter Screen" - -[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN] -en-US = "Presenter Screen" - [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT] en-US = "PDF Import" diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index bbac0236b705..21deb8e486d8 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -37,6 +37,17 @@ File gid_File_Lib_Animcore PACKED_LIB_FILE_BODY; End +File gid_File_Lib_PresenterScreen + LIB_FILE_BODY; + Dir = SCP2_OOO_BIN_DIR; +#if defined UNX + Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX)); +#else + Name = "PresenterScreen.uno.dll"; +#endif + Styles = (PACKED); +End + File gid_File_Share_Registry_Impress_Xcd TXT_FILE_BODY; Styles = (PACKED); diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index cfdd2a4c7a1a..c209e1097686 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -348,3 +348,460 @@ Bitmap BMP_COMMENTS_INDICATOR { File = "comments_indicator.bmp"; }; + +// Presenter Screen bitmaps: + +Bitmap BMP_PRESENTERSCREEN_BORDER_LEFT +{ + File = "presenterscreen-BorderLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED +{ + File = "presenterscreen-ButtonSlideNextDisabled.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED +{ + File = "presenterscreen-ButtonSlidePreviousSelected.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP +{ + File = "presenterscreen-BorderCurrentSlideTop.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED +{ + File = "presenterscreen-ButtonNotesSelected.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED +{ + File = "presenterscreen-ScrollbarArrowDownSelected.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BACKGROUND +{ + File = "presenterscreen-Background.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_RIGHT +{ + File = "presenterscreen-BorderRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP +{ + File = "presenterscreen-BorderActiveTop.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED +{ + File = "presenterscreen-ButtonHelpDisabled.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT +{ + File = "presenterscreen-BorderActiveRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL +{ + File = "presenterscreen-ButtonFrameCenterNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER +{ + File = "presenterscreen-ScrollbarThumbMiddleMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT +{ + File = "presenterscreen-BorderCurrentSlideBottomRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_TOP_LEFT +{ + File = "presenterscreen-BorderTopLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM +{ + File = "presenterscreen-BorderActiveBottom.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT +{ + File = "presenterscreen-BorderBottomLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP +{ + File = "presenterscreen-BorderToolbarTop.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT +{ + File = "presenterscreen-BorderActiveLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL +{ + File = "presenterscreen-ButtonHelpNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT +{ + File = "presenterscreen-BorderActiveBottomCallout.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT +{ + File = "presenterscreen-BorderToolbarLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL +{ + File = "presenterscreen-ButtonSlideSorterNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL +{ + File = "presenterscreen-ScrollbarPagerMiddleNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL +{ + File = "presenterscreen-ButtonFrameRightNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER +{ + File = "presenterscreen-ButtonEffectNextMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER +{ + File = "presenterscreen-ScrollbarThumbTopMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED +{ + File = "presenterscreen-ButtonEffectNextDisabled.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER +{ + File = "presenterscreen-ButtonFrameCenterMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT +{ + File = "presenterscreen-BorderCurrentSlideLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER +{ + File = "presenterscreen-ButtonFrameLeftMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED +{ + File = "presenterscreen-ButtonHelpSelected.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_VIEW_BACKGROUND +{ + File = "presenterscreen-ViewBackground.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER +{ + File = "presenterscreen-ButtonNotesMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER +{ + File = "presenterscreen-ButtonPlusMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED +{ + File = "presenterscreen-ButtonSlideSorterSelected.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT +{ + File = "presenterscreen-LabelMouseOverRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL +{ + File = "presenterscreen-ButtonSwitchMonitorNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT +{ + File = "presenterscreen-BorderToolbarRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL +{ + File = "presenterscreen-ScrollbarThumbMiddleNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED +{ + File = "presenterscreen-ButtonEffectNextSelected.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL +{ + File = "presenterscreen-ScrollbarArrowDownNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT +{ + File = "presenterscreen-BorderCurrentSlideTopRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL +{ + File = "presenterscreen-ButtonPlusNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT +{ + File = "presenterscreen-BorderToolbarTopRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED +{ + File = "presenterscreen-ButtonMinusDisabled.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED +{ + File = "presenterscreen-ScrollbarArrowDownDisabled.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER +{ + File = "presenterscreen-ButtonFrameRightMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER +{ + File = "presenterscreen-ButtonSwitchMonitorMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED +{ + File = "presenterscreen-ButtonSlidePreviousDisabled.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED +{ + File = "presenterscreen-ButtonMinusSelected.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER +{ + File = "presenterscreen-LabelMouseOverCenter.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER +{ + File = "presenterscreen-ButtonSlideNextMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL +{ + File = "presenterscreen-ButtonSlideNextNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER +{ + File = "presenterscreen-ButtonSlidePreviousMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_TOP +{ + File = "presenterscreen-BorderTop.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL +{ + File = "presenterscreen-ButtonFrameLeftNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER +{ + File = "presenterscreen-ScrollbarArrowUpMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL +{ + File = "presenterscreen-ButtonNotesNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED +{ + File = "presenterscreen-ButtonSlideSorterDisabled.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL +{ + File = "presenterscreen-ButtonEffectNextNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT +{ + File = "presenterscreen-BorderToolbarTopLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT +{ + File = "presenterscreen-BorderActiveBottomRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_BOTTOM +{ + File = "presenterscreen-BorderBottom.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT +{ + File = "presenterscreen-BorderActiveBottomLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER +{ + File = "presenterscreen-ScrollbarArrowDownMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED +{ + File = "presenterscreen-ButtonPlusSelected.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT +{ + File = "presenterscreen-BorderActiveTopRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL +{ + File = "presenterscreen-ButtonSlidePreviousNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER +{ + File = "presenterscreen-ButtonSlideSorterMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER +{ + File = "presenterscreen-ButtonMinusMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED +{ + File = "presenterscreen-ButtonNotesDisabled.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT +{ + File = "presenterscreen-BorderCurrentSlideBottomLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT +{ + File = "presenterscreen-BorderTopRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER +{ + File = "presenterscreen-ButtonHelpMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL +{ + File = "presenterscreen-ScrollbarThumbTopNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED +{ + File = "presenterscreen-ScrollbarArrowUpSelected.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED +{ + File = "presenterscreen-ScrollbarArrowUpDisabled.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL +{ + File = "presenterscreen-ScrollbarArrowUpNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM +{ + File = "presenterscreen-BorderToolbarBottom.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT +{ + File = "presenterscreen-BorderCurrentSlideTopLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL +{ + File = "presenterscreen-ButtonMinusNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER +{ + File = "presenterscreen-ScrollbarThumbBottomMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT +{ + File = "presenterscreen-BorderActiveTopLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM +{ + File = "presenterscreen-BorderCurrentSlideBottom.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER +{ + File = "presenterscreen-ScrollbarPagerMiddleMouseOver.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT +{ + File = "presenterscreen-LabelMouseOverLeft.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT +{ + File = "presenterscreen-BorderCurrentSlideRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT +{ + File = "presenterscreen-BorderBottomRight.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL +{ + File = "presenterscreen-ScrollbarThumbBottomNormal.png"; +}; + +Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED +{ + File = "presenterscreen-ButtonPlusDisabled.png"; +}; diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index ce85b79d408f..47dee23b838b 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -107,6 +107,99 @@ #define BMP_PLACEHOLDER_MOVIE_LARGE_HOVER (RID_SD_START+417) #define BMP_PLACEHOLDER_LARGE_END (RID_SD_START+418) // until here! +// Presenter Screen bitmaps: +#define BMP_PRESENTERSCREEN_BACKGROUND (RID_SD_START+500) +#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM (RID_SD_START+501) +#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT (RID_SD_START+502) +#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT (RID_SD_START+503) +#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT (RID_SD_START+504) +#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT (RID_SD_START+505) +#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT (RID_SD_START+506) +#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP (RID_SD_START+507) +#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT (RID_SD_START+508) +#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT (RID_SD_START+509) +#define BMP_PRESENTERSCREEN_BORDER_BOTTOM (RID_SD_START+510) +#define BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT (RID_SD_START+511) +#define BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT (RID_SD_START+512) +#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM (RID_SD_START+513) +#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT (RID_SD_START+514) +#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT (RID_SD_START+515) +#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT (RID_SD_START+516) +#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT (RID_SD_START+517) +#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP (RID_SD_START+518) +#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT (RID_SD_START+519) +#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT (RID_SD_START+520) +#define BMP_PRESENTERSCREEN_BORDER_LEFT (RID_SD_START+521) +#define BMP_PRESENTERSCREEN_BORDER_RIGHT (RID_SD_START+522) +#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM (RID_SD_START+523) +#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT (RID_SD_START+524) +#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT (RID_SD_START+525) +#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP (RID_SD_START+526) +#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT (RID_SD_START+527) +#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT (RID_SD_START+528) +#define BMP_PRESENTERSCREEN_BORDER_TOP (RID_SD_START+529) +#define BMP_PRESENTERSCREEN_BORDER_TOP_LEFT (RID_SD_START+530) +#define BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT (RID_SD_START+531) +#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED (RID_SD_START+532) +#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER (RID_SD_START+533) +#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL (RID_SD_START+534) +#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED (RID_SD_START+535) +#define BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER (RID_SD_START+536) +#define BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL (RID_SD_START+537) +#define BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER (RID_SD_START+538) +#define BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL (RID_SD_START+539) +#define BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER (RID_SD_START+540) +#define BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL (RID_SD_START+541) +#define BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED (RID_SD_START+542) +#define BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER (RID_SD_START+543) +#define BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL (RID_SD_START+544) +#define BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED (RID_SD_START+545) +#define BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED (RID_SD_START+546) +#define BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER (RID_SD_START+547) +#define BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL (RID_SD_START+548) +#define BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED (RID_SD_START+549) +#define BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED (RID_SD_START+550) +#define BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER (RID_SD_START+551) +#define BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL (RID_SD_START+552) +#define BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED (RID_SD_START+553) +#define BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED (RID_SD_START+554) +#define BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER (RID_SD_START+555) +#define BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL (RID_SD_START+556) +#define BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED (RID_SD_START+557) +#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED (RID_SD_START+558) +#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER (RID_SD_START+559) +#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL (RID_SD_START+560) +#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED (RID_SD_START+561) +#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER (RID_SD_START+562) +#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL (RID_SD_START+563) +#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED (RID_SD_START+564) +#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED (RID_SD_START+565) +#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER (RID_SD_START+566) +#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL (RID_SD_START+567) +#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED (RID_SD_START+568) +#define BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER (RID_SD_START+569) +#define BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL (RID_SD_START+570) +#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER (RID_SD_START+571) +#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT (RID_SD_START+572) +#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT (RID_SD_START+573) +#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED (RID_SD_START+574) +#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER (RID_SD_START+575) +#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL (RID_SD_START+576) +#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED (RID_SD_START+577) +#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED (RID_SD_START+578) +#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER (RID_SD_START+579) +#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL (RID_SD_START+580) +#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED (RID_SD_START+581) +#define BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER (RID_SD_START+582) +#define BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL (RID_SD_START+583) +#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER (RID_SD_START+584) +#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL (RID_SD_START+585) +#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER (RID_SD_START+586) +#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL (RID_SD_START+587) +#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER (RID_SD_START+588) +#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL (RID_SD_START+589) +#define BMP_PRESENTERSCREEN_VIEW_BACKGROUND (RID_SD_START+590) + // ----------------------------------------------------------------------------- /* diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 157eb949a863..8ad42092ced9 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" + +#include #include "PresenterHelper.hxx" #include "CanvasUpdateRequester.hxx" @@ -34,12 +37,14 @@ #include #include #include -#include #include #include #include #include +#include "res_bmp.hrc" +#include "sdresid.hxx" + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; @@ -245,39 +250,221 @@ void SAL_CALL PresenterHelper::toTop ( +namespace { + +struct IdMapEntry { + char const * sid; + sal_uInt32 nid; +}; + +} Reference SAL_CALL PresenterHelper::loadBitmap ( - const OUString& rsURL, + const OUString& id, const Reference& rxCanvas) throw (RuntimeException) { if ( ! rxCanvas.is()) return NULL; - ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); + static IdMapEntry const map[] = { + { "bitmaps/Background.png", BMP_PRESENTERSCREEN_BACKGROUND }, + { "bitmaps/BorderActiveBottom.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM }, + { "bitmaps/BorderActiveBottomCallout.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT }, + { "bitmaps/BorderActiveBottomLeft.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT }, + { "bitmaps/BorderActiveBottomRight.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT }, + { "bitmaps/BorderActiveLeft.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT }, + { "bitmaps/BorderActiveRight.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT }, + { "bitmaps/BorderActiveTop.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP }, + { "bitmaps/BorderActiveTopLeft.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT }, + { "bitmaps/BorderActiveTopRight.png", + BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT }, + { "bitmaps/BorderBottom.png", BMP_PRESENTERSCREEN_BORDER_BOTTOM }, + { "bitmaps/BorderBottomLeft.png", + BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT }, + { "bitmaps/BorderBottomRight.png", + BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT }, + { "bitmaps/BorderCurrentSlideBottom.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM }, + { "bitmaps/BorderCurrentSlideBottomLeft.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT }, + { "bitmaps/BorderCurrentSlideBottomRight.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT }, + { "bitmaps/BorderCurrentSlideLeft.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT }, + { "bitmaps/BorderCurrentSlideRight.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT }, + { "bitmaps/BorderCurrentSlideTop.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP }, + { "bitmaps/BorderCurrentSlideTopLeft.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT }, + { "bitmaps/BorderCurrentSlideTopRight.png", + BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT }, + { "bitmaps/BorderLeft.png", BMP_PRESENTERSCREEN_BORDER_LEFT }, + { "bitmaps/BorderRight.png", BMP_PRESENTERSCREEN_BORDER_RIGHT }, + { "bitmaps/BorderToolbarBottom.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM }, + { "bitmaps/BorderToolbarLeft.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT }, + { "bitmaps/BorderToolbarRight.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT }, + { "bitmaps/BorderToolbarTop.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP }, + { "bitmaps/BorderToolbarTopLeft.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT }, + { "bitmaps/BorderToolbarTopRight.png", + BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT }, + { "bitmaps/BorderTop.png", BMP_PRESENTERSCREEN_BORDER_TOP }, + { "bitmaps/BorderTopLeft.png", BMP_PRESENTERSCREEN_BORDER_TOP_LEFT }, + { "bitmaps/BorderTopRight.png", BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT }, + { "bitmaps/ButtonEffectNextDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED }, + { "bitmaps/ButtonEffectNextMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER }, + { "bitmaps/ButtonEffectNextNormal.png", + BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL }, + { "bitmaps/ButtonEffectNextSelected.png", + BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED }, + { "bitmaps/ButtonFrameCenterMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER }, + { "bitmaps/ButtonFrameCenterNormal.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL }, + { "bitmaps/ButtonFrameLeftMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER }, + { "bitmaps/ButtonFrameLeftNormal.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL }, + { "bitmaps/ButtonFrameRightMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER }, + { "bitmaps/ButtonFrameRightNormal.png", + BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL }, + { "bitmaps/ButtonHelpDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED }, + { "bitmaps/ButtonHelpMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER }, + { "bitmaps/ButtonHelpNormal.png", + BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL }, + { "bitmaps/ButtonHelpSelected.png", + BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED }, + { "bitmaps/ButtonMinusDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED }, + { "bitmaps/ButtonMinusMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER }, + { "bitmaps/ButtonMinusNormal.png", + BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL }, + { "bitmaps/ButtonMinusSelected.png", + BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED }, + { "bitmaps/ButtonNotesDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED }, + { "bitmaps/ButtonNotesMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER }, + { "bitmaps/ButtonNotesNormal.png", + BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL }, + { "bitmaps/ButtonNotesSelected.png", + BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED }, + { "bitmaps/ButtonPlusDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED }, + { "bitmaps/ButtonPlusMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER }, + { "bitmaps/ButtonPlusNormal.png", + BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL }, + { "bitmaps/ButtonPlusSelected.png", + BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED }, + { "bitmaps/ButtonSlideNextDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED }, + { "bitmaps/ButtonSlideNextMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER }, + { "bitmaps/ButtonSlideNextNormal.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL }, + { "bitmaps/ButtonSlidePreviousDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED }, + { "bitmaps/ButtonSlidePreviousMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER }, + { "bitmaps/ButtonSlidePreviousNormal.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL }, + { "bitmaps/ButtonSlidePreviousSelected.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED }, + { "bitmaps/ButtonSlideSorterDisabled.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED }, + { "bitmaps/ButtonSlideSorterMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER }, + { "bitmaps/ButtonSlideSorterNormal.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL }, + { "bitmaps/ButtonSlideSorterSelected.png", + BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED }, + { "bitmaps/ButtonSwitchMonitorMouseOver.png", + BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER }, + { "bitmaps/ButtonSwitchMonitorNormal.png", + BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL }, + { "bitmaps/LabelMouseOverCenter.png", + BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER }, + { "bitmaps/LabelMouseOverLeft.png", + BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT }, + { "bitmaps/LabelMouseOverRight.png", + BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT }, + { "bitmaps/ScrollbarArrowDownDisabled.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED }, + { "bitmaps/ScrollbarArrowDownMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER }, + { "bitmaps/ScrollbarArrowDownNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL }, + { "bitmaps/ScrollbarArrowDownSelected.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED }, + { "bitmaps/ScrollbarArrowUpDisabled.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED }, + { "bitmaps/ScrollbarArrowUpMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER }, + { "bitmaps/ScrollbarArrowUpNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL }, + { "bitmaps/ScrollbarArrowUpSelected.png", + BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED }, + { "bitmaps/ScrollbarPagerMiddleMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER }, + { "bitmaps/ScrollbarPagerMiddleNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL }, + { "bitmaps/ScrollbarThumbBottomMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER }, + { "bitmaps/ScrollbarThumbBottomNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL }, + { "bitmaps/ScrollbarThumbMiddleMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER }, + { "bitmaps/ScrollbarThumbMiddleNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL }, + { "bitmaps/ScrollbarThumbTopMouseOver.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER }, + { "bitmaps/ScrollbarThumbTopNormal.png", + BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL }, + { "bitmaps/ViewBackground.png", BMP_PRESENTERSCREEN_VIEW_BACKGROUND } + }; + sal_uInt32 nid = 0; + for (std::size_t i = 0; i != SAL_N_ELEMENTS(map); ++i) { + if (id.equalsAscii(map[i].sid)) { + nid = map[i].nid; + break; + } + } + if (nid == 0) { + return 0; + } - if (mpGraphicFilter.get() == NULL) - mpGraphicFilter.reset(new GraphicFilter(sal_False)); + ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); const cppcanvas::CanvasSharedPtr pCanvas ( cppcanvas::VCLFactory::getInstance().createCanvas( Reference(rxCanvas,UNO_QUERY))); - if (pCanvas.get()!=NULL && !rsURL.isEmpty() && mpGraphicFilter.get()!=NULL) + if (pCanvas.get()!=NULL) { - Graphic aGraphic; - OUString sFileName; - if (osl::FileBase::getSystemPathFromFileURL(rsURL, sFileName) - == osl::FileBase::E_None) - { - if (mpGraphicFilter->ImportGraphic(aGraphic, rsURL) == GRFILTER_OK) - { - BitmapEx aBitmapEx (aGraphic.GetBitmapEx()); - return cppcanvas::VCLFactory::getInstance().createBitmap( - pCanvas, - aBitmapEx)->getUNOBitmap(); - } - } + BitmapEx aBitmapEx = SdResId(nid); + return cppcanvas::VCLFactory::getInstance().createBitmap( + pCanvas, aBitmapEx)->getUNOBitmap(); } return NULL; diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index 4ad837f74242..dbe3e80857ed 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -25,9 +25,7 @@ #include #include #include -#include #include -#include namespace css = ::com::sun::star; @@ -104,7 +102,6 @@ public: private: css::uno::Reference mxComponentContext; - ::boost::scoped_ptr mpGraphicFilter; }; } } // end of namespace ::sd::presenter diff --git a/sdext/Configuration_presenter.mk b/sdext/Configuration_presenter.mk deleted file mode 100644 index 456a17294049..000000000000 --- a/sdext/Configuration_presenter.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Configuration_Configuration,presenter-screen,nodeliver)) - -$(eval $(call gb_Configuration_add_schemas,presenter-screen,sdext/source/presenter/registry/schema,\ - org/openoffice/Office/extension/PresenterScreen.xcs \ -)) - -$(eval $(call gb_Configuration_add_datas,presenter-screen,sdext/source/presenter/registry/data,\ - org/openoffice/Office/Jobs.xcu \ - org/openoffice/Office/ProtocolHandler.xcu \ -)) - -$(eval $(call gb_Configuration_add_localized_datas,presenter-screen,sdext/source/presenter/registry/data,\ - org/openoffice/Office/extension/PresenterScreen.xcu \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk deleted file mode 100644 index e559bde7167c..000000000000 --- a/sdext/CustomTarget_presenter.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)) - -$(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \ - $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp - -$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \ - $(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \ - | $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) - sed "s/PLATFORMID/$(PLATFORMID)/" < $< > $@ - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk deleted file mode 100644 index 93c18a8740ef..000000000000 --- a/sdext/Extension_presenter.mk +++ /dev/null @@ -1,146 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter)) - -$(eval $(call gb_Extension_add_libraries,presenter-screen,\ - PresenterScreen \ -)) - -$(eval $(call gb_Extension_add_file,presenter-screen,components.rdb,$(call gb_Rdb_get_target,presenter))) - -$(eval $(call gb_Extension_add_files,presenter-screen,bitmaps,\ - $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/Background.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottom.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveTop.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveTopRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderBottom.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderBottomLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderBottomRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarBottom.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarTop.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderTop.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderTopLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/BorderTopRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/LabelMouseOverRight.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png \ - $(SRCDIR)/sdext/source/presenter/bitmaps/ViewBackground.png \ -)) - -$(eval $(call gb_Extension_add_file,presenter-screen,registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs,$(call gb_XcsTarget_get_target,sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs))) - -$(eval $(call gb_Extension_add_file,presenter-screen,registry/data/org/openoffice/Office/extension/PresenterScreen.xcu,$(call gb_XcuFile_for_extension,sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu))) - -$(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffice/Office,\ - $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu) \ - $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \ -)) - -$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) - -$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(PLATFORMID))) - - - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk index 8153e0d9a845..87418159ef36 100644 --- a/sdext/Library_presenter.mk +++ b/sdext/Library_presenter.mk @@ -31,10 +31,6 @@ $(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presente $(eval $(call gb_Library_use_sdk_api,PresenterScreen)) -$(eval $(call gb_Library_add_defs,PresenterScreen,\ - -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(PLATFORMID)\" \ -)) - $(eval $(call gb_Library_use_libraries,PresenterScreen,\ cppu \ cppuhelper \ diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk index 7bba9d936232..779b3bf6b6d7 100644 --- a/sdext/Module_sdext.mk +++ b/sdext/Module_sdext.mk @@ -27,6 +27,10 @@ $(eval $(call gb_Module_Module,sdext)) +$(eval $(call gb_Module_add_targets,sdext,\ + Library_presenter \ +)) + ifeq ($(ENABLE_MINIMIZER),YES) $(eval $(call gb_Module_add_targets,sdext,\ Configuration_minimizer \ @@ -53,14 +57,4 @@ $(eval $(call gb_Module_add_check_targets,sdext,\ )) endif -ifeq ($(ENABLE_PRESENTER_SCREEN),YES) -$(eval $(call gb_Module_add_targets,sdext,\ - Configuration_presenter \ - CustomTarget_presenter \ - Extension_presenter \ - Library_presenter \ - Rdb_presenter \ -)) -endif - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sdext/Rdb_presenter.mk b/sdext/Rdb_presenter.mk deleted file mode 100644 index c1d4125202b7..000000000000 --- a/sdext/Rdb_presenter.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Rdb_Rdb,presenter)) - -$(eval $(call gb_Rdb_add_components,presenter,\ - sdext/source/presenter/presenter \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sdext/source/presenter/META-INF/manifest.xml b/sdext/source/presenter/META-INF/manifest.xml deleted file mode 100644 index a25f22fdf81a..000000000000 --- a/sdext/source/presenter/META-INF/manifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index b19bac9a6867..b3f8048b05e5 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -435,7 +435,7 @@ public: OUString sName (A2S("Presenter Console")); PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Console/String")) >>= sName; @@ -465,7 +465,7 @@ public: { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String")) >>= sName; @@ -1886,7 +1886,7 @@ rtl::Reference AccessibleNotes::Create ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Notes/String")) >>= sName; diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 88c4d6d16928..30e4eaf25ff9 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -18,7 +18,6 @@ */ #include "PresenterBitmapContainer.hxx" -#include "PresenterComponent.hxx" #include "PresenterConfigurationAccess.hxx" #include @@ -45,11 +44,9 @@ PresenterBitmapContainer::PresenterBitmapContainer ( const ::boost::shared_ptr& rpParentContainer, const css::uno::Reference& rxComponentContext, const css::uno::Reference& rxCanvas, - const OUString& rsBasePath, const css::uno::Reference& rxPresenterHelper) : mpParentContainer(rpParentContainer), maIconContainer(), - msBasePath(rsBasePath), mxCanvas(rxCanvas), mxPresenterHelper(rxPresenterHelper) { @@ -58,7 +55,7 @@ PresenterBitmapContainer::PresenterBitmapContainer ( // Get access to the configuration. PresenterConfigurationAccess aConfiguration ( rxComponentContext, - A2S("org.openoffice.Office.extension.PresenterScreen"), + A2S("org.openoffice.Office.PresenterScreen"), PresenterConfigurationAccess::READ_ONLY); Reference xBitmapList ( aConfiguration.GetConfigurationNode(rsConfigurationBase), @@ -72,11 +69,9 @@ PresenterBitmapContainer::PresenterBitmapContainer ( const ::boost::shared_ptr& rpParentContainer, const css::uno::Reference& rxComponentContext, const css::uno::Reference& rxCanvas, - const OUString& rsBasePath, const css::uno::Reference& rxPresenterHelper) : mpParentContainer(rpParentContainer), maIconContainer(), - msBasePath(rsBasePath), mxCanvas(rxCanvas), mxPresenterHelper(rxPresenterHelper) { @@ -150,7 +145,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( const css::uno::Reference& rxNode, const ::rtl::OUString& rsPath, const css::uno::Reference& rxPresenterHelper, - const OUString& rsBasePath, const css::uno::Reference& rxCanvas, const SharedBitmapDescriptor& rpDefault) { @@ -167,7 +161,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( pBitmap = LoadBitmap( xBitmapProperties, rxPresenterHelper, - rsBasePath, rxCanvas, rpDefault); } @@ -191,7 +184,6 @@ void PresenterBitmapContainer::ProcessBitmap ( maIconContainer[sName] = LoadBitmap( rxProperties, mxPresenterHelper, - msBasePath, mxCanvas, SharedBitmapDescriptor()); } @@ -199,7 +191,6 @@ void PresenterBitmapContainer::ProcessBitmap ( SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( const Reference& rxProperties, const css::uno::Reference& rxPresenterHelper, - const OUString& rsBasePath, const css::uno::Reference& rxCanvas, const SharedBitmapDescriptor& rpDefault) { @@ -219,7 +210,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::Normal, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -228,7 +219,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::MouseOver, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -237,7 +228,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::ButtonDown, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -246,7 +237,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::Disabled, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} @@ -255,7 +246,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( { pBitmap->SetBitmap( BitmapDescriptor::Mask, - rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas)); + rxPresenterHelper->loadBitmap(sFileName, rxCanvas)); } catch (Exception&) {} diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index 1a44c7f3fc27..c06f6cf58bd5 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -98,14 +98,12 @@ public: const ::boost::shared_ptr& rpParentContainer, const css::uno::Reference& rxComponentContext, const css::uno::Reference& rxCanvas, - const ::rtl::OUString& rsBasePath, const css::uno::Reference& rxPresenterHelper = NULL); PresenterBitmapContainer ( const css::uno::Reference& rsRootNode, const ::boost::shared_ptr& rpParentContainer, const css::uno::Reference& rxComponentContext, const css::uno::Reference& rxCanvas, - const ::rtl::OUString& rsBasePath, const css::uno::Reference& rxPresenterHelper = NULL); ~PresenterBitmapContainer (void); @@ -120,7 +118,6 @@ public: const css::uno::Reference& rxNode, const ::rtl::OUString& rsPathToBitmapNode, const css::uno::Reference& rxPresenterHelper, - const ::rtl::OUString& rsBitmapBasePath, const css::uno::Reference& rxCanvas, const ::boost::shared_ptr& rpDefaultBitmap); @@ -128,7 +125,6 @@ private: ::boost::shared_ptr mpParentContainer; typedef ::std::map > BitmapContainer; BitmapContainer maIconContainer; - ::rtl::OUString msBasePath; css::uno::Reference mxCanvas; css::uno::Reference mxPresenterHelper; @@ -140,7 +136,6 @@ private: static ::boost::shared_ptr LoadBitmap ( const css::uno::Reference& rxProperties, const css::uno::Reference& rxPresenterHelper, - const ::rtl::OUString& rsBasePath, const css::uno::Reference& rxCanvas, const ::boost::shared_ptr& rpDefault); static BitmapDescriptor::TexturingMode diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index cb4d049e6216..de18f450ea0e 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -17,13 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "PresenterComponent.hxx" #include "cppuhelper/factory.hxx" #include "cppuhelper/implementationentry.hxx" -#include -#include -#include "PresenterExtensionIdentifier.hxx" #include "PresenterProtocolHandler.hxx" #include "PresenterScreen.hxx" @@ -35,41 +31,6 @@ using ::rtl::OUString; namespace sdext { namespace presenter { -::rtl::OUString PresenterComponent::GetBasePath ( - const Reference& rxComponentContext) -{ - return GetBasePath(rxComponentContext, gsExtensionIdentifier); -} - -::rtl::OUString PresenterComponent::GetBasePath ( - const Reference& rxComponentContext, - const OUString& rsExtensionIdentifier) -{ - static ::rtl::OUString sBasePath; - if (sBasePath.isEmpty()) - { - // Determine the base path of the bitmaps. - Reference xInformationProvider ( - rxComponentContext->getValueByName( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "/singletons/com.sun.star.deployment.PackageInformationProvider"))), - UNO_QUERY); - if (xInformationProvider.is()) - { - try - { - sBasePath = xInformationProvider->getPackageLocation(rsExtensionIdentifier) - + OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - } - catch (const deployment::DeploymentException&) - { - } - } - } - - return sBasePath; -} - rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; static struct ImplementationEntry gServiceEntries[] = diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx deleted file mode 100644 index b9a428a4c58f..000000000000 --- a/sdext/source/presenter/PresenterComponent.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- 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_COMPONENT_HXX -#define SDEXT_PRESENTER_COMPONENT_HXX - -#include - -namespace css = ::com::sun::star; - -namespace sdext { namespace presenter { - -/** This string is replaced automatically by the makefile during the - building of this extension. -*/ -class PresenterComponent -{ -public: - const static ::rtl::OUString gsExtensionIdentifier; - - static ::rtl::OUString GetBasePath ( - const css::uno::Reference& rxComponentContext); - static ::rtl::OUString GetBasePath ( - const css::uno::Reference& rxComponentContext, - const ::rtl::OUString& rsExtensionIdentifier); -}; - -} } - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index 2ae90dc1085a..5fdb8bc5d026 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -34,7 +34,7 @@ using ::rtl::OUString; namespace sdext { namespace presenter { const ::rtl::OUString PresenterConfigurationAccess::msPresenterScreenRootName = - A2S("/org.openoffice.Office.extension.PresenterScreen/"); + A2S("/org.openoffice.Office.PresenterScreen/"); PresenterConfigurationAccess::PresenterConfigurationAccess ( const Reference& rxContext, diff --git a/sdext/source/presenter/PresenterExtensionIdentifier.hxx b/sdext/source/presenter/PresenterExtensionIdentifier.hxx deleted file mode 100644 index 089f8e377da8..000000000000 --- a/sdext/source/presenter/PresenterExtensionIdentifier.hxx +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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_EXTENSION_IDENTIFIER_HXX -#define SDEXT_PRESENTER_EXTENSION_IDENTIFIER_HXX - -namespace sdext { namespace presenter { - -const ::rtl::OUString PresenterComponent::gsExtensionIdentifier( - RTL_CONSTASCII_USTRINGPARAM(PRESENTER_IMPL_IDENTIFIER)); - -} } - -#endif diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index e2c2f3d0aca7..ee6729ffa692 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -346,7 +346,7 @@ void PresenterHelpView::ReadHelpStrings (void) mpTextContainer.reset(new TextContainer()); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference xStrings ( aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")), diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 45b671827acf..34da2bd17fb2 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -47,8 +47,6 @@ using ::rtl::OUString; namespace sdext { namespace presenter { namespace { - const static OUString gsProtocol (A2S("vnd.com.sun.star.comp.PresenterScreen:")); - class Command { public: @@ -240,7 +238,7 @@ private: OUString PresenterProtocolHandler::getImplementationName_static (void) { - return A2S("vnd.sun.star.sdext.presenter.PresenterProtocolHandler"); + return OUString("org.libreoffice.comp.PresenterScreenProtocolHandler"); } Sequence PresenterProtocolHandler::getSupportedServiceNames_static (void) @@ -309,7 +307,7 @@ Reference SAL_CALL PresenterProtocolHandler::queryDispatch ( Reference xDispatch; - if (rURL.Protocol == gsProtocol) + if (rURL.Protocol == "vnd.org.libreoffice.presenterscreen:") { xDispatch.set(Dispatch::Create(rURL.Path, mpPresenterController)); } @@ -432,7 +430,7 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::dispatch( (void)rArguments; ThrowIfDisposed(); - if (rURL.Protocol == gsProtocol + if (rURL.Protocol == "vnd.org.libreoffice.presenterscreen:" && rURL.Path == msURLPath) { if (mpCommand.get() != NULL) diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index bfa2ae2a43d8..d4fadf6e9597 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -95,14 +95,12 @@ namespace { OUString PresenterScreenJob::getImplementationName_static (void) { - return A2S("com.sun.star.comp.Draw.framework.PresenterScreenJob"); + return OUString("org.libreoffice.comp.PresenterScreenJob"); } Sequence PresenterScreenJob::getSupportedServiceNames_static (void) { - static const ::rtl::OUString sServiceName( - A2S("com.sun.star.drawing.framework.PresenterScreenJob")); - return Sequence(&sServiceName, 1); + return Sequence(); } Reference PresenterScreenJob::Create (const Reference& rxContext) @@ -505,7 +503,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber ( Reference xContext (mxContextWeak); PresenterConfigurationAccess aConfiguration ( xContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); bool bStartAlways (false); if (aConfiguration.GetConfigurationNode( @@ -654,7 +652,7 @@ void PresenterScreen::SetupConfiguration ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("org.openoffice.Office.extension.PresenterScreen"), + OUString("org.openoffice.Office.PresenterScreen"), PresenterConfigurationAccess::READ_ONLY); maViewDescriptors.clear(); ProcessViewDescriptions(aConfiguration); diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 576458bd0256..cb87d61f4166 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -20,7 +20,6 @@ #include "PresenterScrollBar.hxx" #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" #include "PresenterTimer.hxx" @@ -272,8 +271,7 @@ void PresenterScrollBar::SetCanvas (const Reference& rx OUString("PresenterScreenSettings/ScrollBar/Bitmaps"), ::boost::shared_ptr(), mxComponentContext, - mxCanvas, - PresenterComponent::GetBasePath(mxComponentContext))); + mxCanvas)); mpSharedBitmaps = mpBitmaps; } catch(Exception&) diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 6c5d75da837a..eb0ce723c163 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -22,7 +22,6 @@ #include "PresenterSlideSorter.hxx" #include "PresenterButton.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterHelper.hxx" #include "PresenterPaintManager.hxx" @@ -1725,7 +1724,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference xBitmaps ( aConfiguration.GetConfigurationNode( @@ -1738,8 +1737,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( A2S("PresenterScreenSettings/SlideSorter/CurrentSlideBorderBitmaps"), ::boost::shared_ptr(), rxContext, - rxCanvas, - PresenterComponent::GetBasePath(rxContext)); + rxCanvas); mpTopLeft = aContainer.GetBitmap(A2S("TopLeft")); mpTop = aContainer.GetBitmap(A2S("Top")); diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index e64f1073c4f7..1fc2f85475af 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -20,7 +20,6 @@ #include "PresenterTheme.hxx" #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterConfigurationAccess.hxx" #include "PresenterHelper.hxx" #include @@ -93,7 +92,6 @@ public: Reference mxComponentContext; Reference mxCanvas; Reference mxPresenterHelper; - OUString msBasePath; ReadContext ( const Reference& rxContext, @@ -119,8 +117,6 @@ public: BorderSize ReadBorderSize (const Reference& rxNode); - void SetBitmapSourceExtension (const OUString& rsExtensionName); - private: Any GetByName ( const Reference& rxNode, @@ -293,7 +289,7 @@ PresenterTheme::~PresenterTheme (void) PresenterConfigurationAccess aConfiguration ( mxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); return aReadContext.ReadTheme(aConfiguration, msThemeName); @@ -381,7 +377,7 @@ bool PresenterTheme::ConvertToColor ( ::boost::shared_ptr pConfiguration ( new PresenterConfigurationAccess( mxContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE)); // Get configuration node for the view style container of the current @@ -625,26 +621,11 @@ void PresenterTheme::Theme::Read ( mpParentTheme = rReadContext.ReadTheme(rConfiguration, sParentThemeName); } - // Read the extension that contains the bitmaps referenced in this - // theme. - OUString sBitmapSourceExtension; - if ((PresenterConfigurationAccess::GetConfigurationNode( - mxThemeRoot, A2S("BitmapSourceExtension")) >>= sBitmapSourceExtension) - && !sBitmapSourceExtension.isEmpty()) - { - rReadContext.SetBitmapSourceExtension(sBitmapSourceExtension); - } - else - { - rReadContext.SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier); - } - // Background. mpBackground = PresenterBitmapContainer::LoadBitmap( mxThemeRoot, A2S("Background"), rReadContext.mxPresenterHelper, - rReadContext.msBasePath, rReadContext.mxCanvas, SharedBitmapDescriptor()); @@ -667,8 +648,7 @@ void PresenterTheme::Theme::Read ( ? mpParentTheme->mpIconContainer : ::boost::shared_ptr(), rReadContext.mxComponentContext, - rReadContext.mxCanvas, - rReadContext.msBasePath)); + rReadContext.mxCanvas)); // Read fonts. Reference xFontNode( @@ -720,8 +700,7 @@ ReadContext::ReadContext ( const Reference& rxCanvas) : mxComponentContext(rxContext), mxCanvas(rxCanvas), - mxPresenterHelper(), - msBasePath() + mxPresenterHelper() { Reference xFactory (rxContext->getServiceManager()); if (xFactory.is()) @@ -732,9 +711,6 @@ ReadContext::ReadContext ( rxContext), UNO_QUERY_THROW); } - - // Get base path to bitmaps. - SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier); } ReadContext::~ReadContext (void) @@ -866,12 +842,6 @@ BorderSize ReadContext::ReadBorderSize (const Reference& return aBorderSize; } -void ReadContext::SetBitmapSourceExtension (const OUString& rsExtensionIdentifier) -{ - // Get base path to bitmaps. - msBasePath = PresenterComponent::GetBasePath(mxComponentContext, rsExtensionIdentifier); -} - //===== PaneStyleContainer ==================================================== void PaneStyleContainer::Read ( @@ -953,7 +923,6 @@ void PaneStyleContainer::ProcessPaneStyle( : ::boost::shared_ptr(), rReadContext.mxComponentContext, rReadContext.mxCanvas, - rReadContext.msBasePath, rReadContext.mxPresenterHelper)); } @@ -1088,7 +1057,6 @@ void ViewStyleContainer::ProcessViewStyle( xBackgroundNode, OUString(), rReadContext.mxPresenterHelper, - rReadContext.msBasePath, rReadContext.mxCanvas, SharedBitmapDescriptor())); if (pBackground.get() != NULL && pBackground->GetNormalBitmap().is()) diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 60e44faaed9f..ac69c76720a8 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -22,7 +22,6 @@ #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" #include "PresenterPaneBase.hxx" @@ -120,7 +119,6 @@ class PresenterToolBar::Context : private ::boost::noncopyable { public: - ::rtl::OUString msBasePath; Reference mxPresenterHelper; css::uno::Reference mxCanvas; }; @@ -633,11 +631,9 @@ void PresenterToolBar::CreateControls ( // Expand the macro in the bitmap file names. PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); - const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext)); - mpCurrentContainerPart.reset(new ElementContainerPart()); maElementContainer.clear(); maElementContainer.push_back(mpCurrentContainerPart); @@ -651,7 +647,6 @@ void PresenterToolBar::CreateControls ( PresenterConfigurationAccess::GetConfigurationNode(xToolBarNode, A2S("Entries")), UNO_QUERY); Context aContext; - aContext.msBasePath = sBasePath; aContext.mxPresenterHelper = mpPresenterController->GetPresenterHelper(); aContext.mxCanvas = mxCanvas; if (xEntries.is() @@ -1468,7 +1463,6 @@ void ElementMode::ReadElementMode ( xIconNode, A2S(""), rContext.mxPresenterHelper, - rContext.msBasePath, rContext.mxCanvas, rpDefaultMode.get()!=NULL ? rpDefaultMode->mpIcon : SharedBitmapDescriptor()); } diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 7d38f1a7ee7f..7c8124d17d13 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -534,7 +534,7 @@ void PresenterWindowManager::RestoreViewMode (void) sal_Int32 nMode (0); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode; switch (nMode) @@ -560,7 +560,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode) { PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString("/org.openoffice.Office.extension.PresenterScreen/"), + OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE); aConfiguration.GoToChild(A2S("Presenter")); Any aValue; diff --git a/sdext/source/presenter/bitmaps/Background.png b/sdext/source/presenter/bitmaps/Background.png deleted file mode 100644 index 7b32e4ab974b..000000000000 Binary files a/sdext/source/presenter/bitmaps/Background.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottom.png b/sdext/source/presenter/bitmaps/BorderActiveBottom.png deleted file mode 100644 index 8314c9efd092..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveBottom.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png b/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png deleted file mode 100644 index b7c33223a33c..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png b/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png deleted file mode 100644 index 8d573e864942..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png b/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png deleted file mode 100644 index 35ef8e9213db..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveLeft.png b/sdext/source/presenter/bitmaps/BorderActiveLeft.png deleted file mode 100644 index 57d4a3dbbcd3..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveRight.png b/sdext/source/presenter/bitmaps/BorderActiveRight.png deleted file mode 100644 index 9a9857190b9d..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveTop.png b/sdext/source/presenter/bitmaps/BorderActiveTop.png deleted file mode 100644 index e0bea9d55448..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveTop.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png b/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png deleted file mode 100644 index 62d63271fe21..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderActiveTopRight.png b/sdext/source/presenter/bitmaps/BorderActiveTopRight.png deleted file mode 100644 index 450c8e0cc5e7..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderActiveTopRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderBottom.png b/sdext/source/presenter/bitmaps/BorderBottom.png deleted file mode 100644 index 7ad2fd6c2a03..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderBottom.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderBottomLeft.png b/sdext/source/presenter/bitmaps/BorderBottomLeft.png deleted file mode 100644 index 019de149b3af..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderBottomLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderBottomRight.png b/sdext/source/presenter/bitmaps/BorderBottomRight.png deleted file mode 100644 index 82de5791c1cd..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderBottomRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png deleted file mode 100644 index 7000bc22f6c4..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png deleted file mode 100644 index 7571c8d94b1f..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png deleted file mode 100644 index c0af63ff58b8..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png deleted file mode 100644 index 7000bc22f6c4..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png deleted file mode 100644 index 7000bc22f6c4..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png deleted file mode 100644 index 7000bc22f6c4..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png deleted file mode 100644 index fdfabd42ae9f..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png deleted file mode 100644 index 5b4b642e9f34..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderLeft.png b/sdext/source/presenter/bitmaps/BorderLeft.png deleted file mode 100644 index cbdb267b8789..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderRight.png b/sdext/source/presenter/bitmaps/BorderRight.png deleted file mode 100644 index 333073328ddd..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarBottom.png b/sdext/source/presenter/bitmaps/BorderToolbarBottom.png deleted file mode 100644 index 23a3bc3595aa..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarBottom.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarLeft.png b/sdext/source/presenter/bitmaps/BorderToolbarLeft.png deleted file mode 100644 index 839ab5091a8e..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarRight.png b/sdext/source/presenter/bitmaps/BorderToolbarRight.png deleted file mode 100644 index e5c4b9d25a16..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTop.png b/sdext/source/presenter/bitmaps/BorderToolbarTop.png deleted file mode 100644 index c45b97c434cd..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarTop.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png b/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png deleted file mode 100644 index 978e98a9bbc4..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png b/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png deleted file mode 100644 index 7dc3d98860ea..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderTop.png b/sdext/source/presenter/bitmaps/BorderTop.png deleted file mode 100644 index dee68e828147..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderTop.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderTopLeft.png b/sdext/source/presenter/bitmaps/BorderTopLeft.png deleted file mode 100644 index bbec4e42be42..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderTopLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/BorderTopRight.png b/sdext/source/presenter/bitmaps/BorderTopRight.png deleted file mode 100644 index 3416b16c9e91..000000000000 Binary files a/sdext/source/presenter/bitmaps/BorderTopRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png b/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png deleted file mode 100644 index 5417cf72c928..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png b/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png deleted file mode 100644 index 96805e392176..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png b/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png deleted file mode 100644 index 6dbd732e0977..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png b/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png deleted file mode 100644 index eb6e6d45bb23..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png b/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png deleted file mode 100644 index b97799f1f314..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png b/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png deleted file mode 100644 index 4cf7218f3b52..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png b/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png deleted file mode 100644 index 1f2ab6a00cab..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png b/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png deleted file mode 100644 index 0e92cb37d7d8..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png b/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png deleted file mode 100644 index 0f49ad4f7e61..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png b/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png deleted file mode 100644 index 4ca69670e513..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png b/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png deleted file mode 100644 index 12f4903b6cf8..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png b/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png deleted file mode 100644 index 7bddef561f11..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonHelpNormal.png b/sdext/source/presenter/bitmaps/ButtonHelpNormal.png deleted file mode 100644 index 99c693215ba9..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonHelpNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonHelpSelected.png b/sdext/source/presenter/bitmaps/ButtonHelpSelected.png deleted file mode 100644 index f162db27650e..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonHelpSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png b/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png deleted file mode 100644 index ff61106eb7ec..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png b/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png deleted file mode 100644 index 787249912b9c..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonMinusNormal.png b/sdext/source/presenter/bitmaps/ButtonMinusNormal.png deleted file mode 100644 index e2d993384fef..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonMinusNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonMinusSelected.png b/sdext/source/presenter/bitmaps/ButtonMinusSelected.png deleted file mode 100644 index 5d15de3b916f..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonMinusSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png b/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png deleted file mode 100644 index 09e31d26c649..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png b/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png deleted file mode 100644 index 099d6bf0f2b1..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonNotesNormal.png b/sdext/source/presenter/bitmaps/ButtonNotesNormal.png deleted file mode 100644 index 551392622506..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonNotesNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonNotesSelected.png b/sdext/source/presenter/bitmaps/ButtonNotesSelected.png deleted file mode 100644 index f5494fb1c678..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonNotesSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png b/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png deleted file mode 100644 index e6ba3f3e78a7..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png b/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png deleted file mode 100644 index 9d21dc40a6eb..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonPlusNormal.png b/sdext/source/presenter/bitmaps/ButtonPlusNormal.png deleted file mode 100644 index 2e075c2a3a87..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonPlusNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonPlusSelected.png b/sdext/source/presenter/bitmaps/ButtonPlusSelected.png deleted file mode 100644 index b9d6fe1ed929..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonPlusSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png b/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png deleted file mode 100644 index 7f3bce058f4c..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png deleted file mode 100644 index 4dc13655965b..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png b/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png deleted file mode 100644 index 711b8ca8caf6..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png deleted file mode 100644 index 383780eab2cf..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png deleted file mode 100644 index dc35c62deaf2..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png deleted file mode 100644 index 26262b4568d7..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png deleted file mode 100644 index 7274263a43f5..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png deleted file mode 100644 index ce7d4ad51514..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png deleted file mode 100644 index 2e7f518ac9e3..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png deleted file mode 100644 index 7aa914f41c01..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png deleted file mode 100644 index 143f995a004c..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png deleted file mode 100644 index bc1055a97689..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png deleted file mode 100644 index 8cfe81dd1d5a..000000000000 Binary files a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png b/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png deleted file mode 100644 index 6eb75d386f46..000000000000 Binary files a/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png b/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png deleted file mode 100644 index 9455246332cf..000000000000 Binary files a/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverRight.png b/sdext/source/presenter/bitmaps/LabelMouseOverRight.png deleted file mode 100644 index 1f972d0cebea..000000000000 Binary files a/sdext/source/presenter/bitmaps/LabelMouseOverRight.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png deleted file mode 100644 index 4dd16272fad7..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png deleted file mode 100644 index d1980a2a1a05..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png deleted file mode 100644 index 166f10057c11..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png deleted file mode 100644 index 21d42945ce98..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png deleted file mode 100644 index 44f60683bc59..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png deleted file mode 100644 index 9795885632dc..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png deleted file mode 100644 index 804ced846065..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png deleted file mode 100644 index d7be4f324f86..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png deleted file mode 100644 index 84b781af9fb8..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png b/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png deleted file mode 100644 index a06ba667f118..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png deleted file mode 100644 index 482f13638755..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png b/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png deleted file mode 100644 index ec46e172c134..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png deleted file mode 100644 index 62066c24b687..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png b/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png deleted file mode 100644 index c25e4edcf595..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png deleted file mode 100644 index 714481df996d..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png b/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png deleted file mode 100644 index 7e0922c74966..000000000000 Binary files a/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png and /dev/null differ diff --git a/sdext/source/presenter/bitmaps/ViewBackground.png b/sdext/source/presenter/bitmaps/ViewBackground.png deleted file mode 100644 index ca52d8262a88..000000000000 Binary files a/sdext/source/presenter/bitmaps/ViewBackground.png and /dev/null differ diff --git a/sdext/source/presenter/description-en-US.txt b/sdext/source/presenter/description-en-US.txt deleted file mode 100644 index 26a10c622fe9..000000000000 --- a/sdext/source/presenter/description-en-US.txt +++ /dev/null @@ -1,2 +0,0 @@ -The Presenter Console Extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide. -To avoid confusions by displaying a large number of presentation elements, the Presenter Console displays the elements on three different easily changeable views. diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml deleted file mode 100644 index e8c52f047c03..000000000000 --- a/sdext/source/presenter/description.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - The Document Foundation - - - - Presenter Console - - - - - - - - - - - diff --git a/sdext/source/presenter/presenter.component b/sdext/source/presenter/presenter.component index 698180404f5e..ee7d1d63c9f1 100644 --- a/sdext/source/presenter/presenter.component +++ b/sdext/source/presenter/presenter.component @@ -8,12 +8,9 @@ * --> - - - - + loader="com.sun.star.loader.SharedLibrary" prefix="presenter"> + + diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu deleted file mode 100644 index a7991b8cad21..000000000000 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - com.sun.star.comp.Draw.framework.PresenterScreenJob - - - com.sun.star.presentation.PresentationDocument - - - - - - - - - - - diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu deleted file mode 100644 index b1ecdb0d47fa..000000000000 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - vnd.com.sun.star.comp.PresenterScreen:* - - - - diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu deleted file mode 100644 index 837805794dc3..000000000000 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu +++ /dev/null @@ -1,1253 +0,0 @@ - - - - - - - - - - PreviousSlide - Button - - Previous - - bitmaps/ButtonSlidePreviousNormal.png - - vnd.com.sun.star.comp.PresenterScreen:PrevSlide - - 12 - Bold - B3B7BC - Center - - - - - bitmaps/ButtonSlidePreviousMouseOver.png - - - FFFFFF - - - - - bitmaps/ButtonSlidePreviousDisabled.png - - - - - NextEffect - Button - - Next - - bitmaps/ButtonEffectNextNormal.png - - vnd.com.sun.star.comp.PresenterScreen:NextEffect - - 12 - Bold - B3B7BC - Center - - - - - bitmaps/ButtonEffectNextMouseOver.png - - - FFFFFF - - - - - bitmaps/ButtonEffectNextDisabled.png - - - - - Notes - Button - - Notes - - bitmaps/ButtonNotesNormal.png - - vnd.com.sun.star.comp.PresenterScreen:ShowNotes - - 12 - Bold - B3B7BC - Center - - - - - bitmaps/ButtonNotesMouseOver.png - - - FFFFFF - - - - - bitmaps/ButtonNotesSelected.png - - - FFFFFF - - vnd.com.sun.star.comp.PresenterScreen:CloseNotes - - - - bitmaps/ButtonNotesDisabled.png - - - - - SlideSorter - Button - - Slides - - bitmaps/ButtonSlideSorterNormal.png - - vnd.com.sun.star.comp.PresenterScreen:ShowSlideSorter - - 12 - Bold - B3B7BC - Center - - - - - bitmaps/ButtonSlideSorterMouseOver.png - - - FFFFFF - - - - - bitmaps/ButtonSlideSorterSelected.png - - - FFFFFF - - vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter - - - - bitmaps/ButtonSlideSorterDisabled.png - - - - - VerticalSeparator - - - 76797C - - - - - ChangeOrientation - - - CurrentTimeLabel - - - 18 - Bold - ffffff - Center - - - - - HorizontalSeparator - - - 71767a - - - - - PresentationTimeLabel - - - 26 - Bold - ffe969 - Center - - - - - ChangeOrientation - - - VerticalSeparator - - - 76797C - - - - - SwitchMonitor - Button - - Exchange - - bitmaps/ButtonSwitchMonitorNormal.png - - vnd.com.sun.star.comp.PresenterScreen:SwitchMonitor - - 12 - Bold - B3B7BC - Center - - - - - bitmaps/ButtonSwitchMonitorMouseOver.png - - - FFFFFF - - - - - bitmaps/ButtonSwitchMonitorDisabled.png - - - - - VerticalSeparator - - - 76797C - - - - - Help - Button - - Help - - bitmaps/ButtonHelpNormal.png - - vnd.com.sun.star.comp.PresenterScreen:ShowHelp - - 12 - Bold - B3B7BC - Center - - - - - bitmaps/ButtonHelpMouseOver.png - - - FFFFFF - - - - - bitmaps/ButtonHelpSelected.png - - - FFFFFF - - vnd.com.sun.star.comp.PresenterScreen:CloseHelp - - - - bitmaps/ButtonHelpDisabled.png - - - - - - - - - Zoom - Label - - Zoom - - 14 - Bold - B3B7BC - - - - - Grow - Button - - - bitmaps/ButtonPlusNormal.png - - vnd.com.sun.star.comp.PresenterScreen:GrowNotesFont - - - - bitmaps/ButtonPlusMouseOver.png - - - - - bitmaps/ButtonPlusDisabled.png - - - - - Shrink - Button - - - bitmaps/ButtonMinusNormal.png - - vnd.com.sun.star.comp.PresenterScreen:ShrinkNotesFont - - - - bitmaps/ButtonMinusMouseOver.png - - - - - bitmaps/ButtonMinusDisabled.png - - - - - - - - - SlideSorterCloser - - Close - - vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter - - - NotesViewCloser - - Close - - vnd.com.sun.star.comp.PresenterScreen:CloseNotes - - - HelpViewCloser - - Close - - vnd.com.sun.star.comp.PresenterScreen:CloseHelp - - - - - - Up - bitmaps/ScrollbarArrowUpNormal.png - bitmaps/ScrollbarArrowUpMouseOver.png - bitmaps/ScrollbarArrowUpDisabled.png - - - Down - bitmaps/ScrollbarArrowDownNormal.png - bitmaps/ScrollbarArrowDownMouseOver.png - bitmaps/ScrollbarArrowDownDisabled.png - - - PagerVertical - bitmaps/ScrollbarPagerMiddleNormal.png - bitmaps/ScrollbarPagerMiddleMouseOver.png - - - ThumbTop - bitmaps/ScrollbarThumbTopNormal.png - bitmaps/ScrollbarThumbTopMouseOver.png - - - ThumbBottom - bitmaps/ScrollbarThumbBottomNormal.png - bitmaps/ScrollbarThumbBottomMouseOver.png - - - ThumbVertical - bitmaps/ScrollbarThumbMiddleNormal.png - bitmaps/ScrollbarThumbMiddleMouseOver.png - - - - - - 9 - 9 - 9 - 9 - - - - bitmaps/BorderCurrentSlideTopLeft.png - - - bitmaps/BorderCurrentSlideTop.png - - - bitmaps/BorderCurrentSlideTopRight.png - - - bitmaps/BorderCurrentSlideLeft.png - - - bitmaps/BorderCurrentSlideRight.png - - - bitmaps/BorderCurrentSlideBottomLeft.png - - - bitmaps/BorderCurrentSlideBottom.png - - - bitmaps/BorderCurrentSlideBottomRight.png - - - - - - - - Left click, right or down arrow, spacebar, page down, enter, return, 'N' - - - Next slide, or next effect - - - - - Right click, left or up arrow, page up, backspace, 'P' - - - Previous slide, or previous effect - - - - - - - - - - - - - Home - - - First slide - - - - - End - - - Last slide - - - - - - - - - - - - - Alt-Page Up - - - Previous slide without effects - - - - - Alt-Page Down - - - Next slide without effects - - - - - - - - - - - - - 'B', '.' - - - Blacks/Unblacks the screen - - - - - 'W', ',' - - - Whites/Unwhites the screen - - - - - - - - - - - - - Esc, '-' - - - End slide show - - - - - - - - - - - - - Number followed by Enter - - - Go to that slide - - - - - - - - - - - - - 'G', 'S' - - - Grow/Shrink size of notes font - - - - - 'A', 'Z' - - - Scroll notes up/down - - - - - 'H', 'L' - - - Move caret in notes view backward/forward - - - - - - - - - - - - - Ctrl-'1' - - - Shows the Presenter Console - - - - - Ctrl-'2' - - - Shows the Presentation Notes - - - - - Ctrl-'3' - - - Shows the Slides Overview - - - - - - - - - - DefaultTheme - - - - - DefaultPaneStyle - - - - Bold - 14 - B3B7BC - Center - -7 - - - 6 - 6 - 6 - 6 - - - 20 - 28 - 20 - 29 - - - - bitmaps/BorderTop.png - 6 - - - bitmaps/BorderTopLeft.png - 6 - 6 - - - bitmaps/BorderTopRight.png - -6 - 6 - - - bitmaps/BorderLeft.png - 6 - - - bitmaps/BorderRight.png - -6 - - - bitmaps/BorderBottomLeft.png - 6 - -6 - - - bitmaps/BorderBottomRight.png - -6 - -6 - - - bitmaps/BorderBottom.png - -6 - - - - - - ActivePaneStyle - - - DefaultPaneStyle - - - - Bold - 14 - FFFFFF - Center - -10 - - - - bitmaps/BorderActiveTop.png - 6 - - - bitmaps/BorderActiveTopLeft.png - 6 - 6 - - - bitmaps/BorderActiveTopRight.png - -6 - 6 - - - bitmaps/BorderActiveLeft.png - 6 - - - bitmaps/BorderActiveRight.png - -6 - - - bitmaps/BorderActiveBottomLeft.png - 6 - -6 - - - bitmaps/BorderActiveBottomRight.png - -6 - -6 - - - bitmaps/BorderActiveBottom.png - -6 - - - - - - ToolbarPaneStyle - - - 4 - 4 - 4 - 4 - - - 8 - 8 - 8 - 0 - - - - bitmaps/BorderToolbarTop.png - 4 - - - bitmaps/BorderToolbarTopLeft.png - 4 - 4 - - - bitmaps/BorderToolbarTopRight.png - -4 - 4 - - - bitmaps/BorderToolbarLeft.png - 4 - - - bitmaps/BorderToolbarRight.png - -4 - - - bitmaps/BorderToolbarLeft.png - 4 - - - bitmaps/BorderToolbarRight.png - -4 - - - bitmaps/BorderToolbarBottom.png - -4 - - - - - - ActiveBottomCalloutPaneStyle - - - ActivePaneStyle - - - 52 - - - - bitmaps/BorderActiveBottomCallout.png - -6 - 49 - 41 - - - - - - - DefaultViewStyle - - - 20 - FFFFFF - - - - bitmaps/ViewBackground.png - Repeat - Repeat - 33000000 - - - - NotesViewStyle - DefaultViewStyle - - - Bold - 26 - d1d6dc - - - - SlideSorterViewStyle - DefaultViewStyle - - - HelpViewStyle - DefaultViewStyle - - - Bold - 20 - ffffff - - - - - bitmaps/Background.png - E4EFF9 - Repeat - Stretch - - - - ButtonFrameLeft - bitmaps/ButtonFrameLeftNormal.png - bitmaps/ButtonFrameLeftMouseOver.png - 2 - - - ButtonFrameCenter - bitmaps/ButtonFrameCenterNormal.png - bitmaps/ButtonFrameCenterMouseOver.png - 2 - - - ButtonFrameRight - bitmaps/ButtonFrameRightNormal.png - bitmaps/ButtonFrameRightMouseOver.png - 2 - - - bitmaps/LabelMouseOverLeft.png - - - bitmaps/LabelMouseOverCenter.png - - - bitmaps/LabelMouseOverRight.png - - - bitmaps/ButtonSlideNextNormal.png - - - - - - Bold - 18 - b3b7bc - - - - Bold - 18 - ffffff - - - - Bold - 20 - ffffff - - - - Bold - 24 - e02050 - - - - - - private:resource/pane/Presenter/Pane1 - - - ActivePaneStyle - - - - - private:resource/view/Presenter/CurrentSlidePreview - - - DefaultViewStyle - - - - - private:resource/pane/Presenter/Pane2 - - - DefaultPaneStyle - - - - - private:resource/view/Presenter/NextSlidePreview - - - DefaultViewStyle - - - - - private:resource/pane/Presenter/Pane4 - - - ToolbarPaneStyle - - - - - private:resource/view/Presenter/ToolBar - - - DefaultViewStyle - - - - - private:resource/pane/Presenter/Pane3 - - - ActivePaneStyle - - - - - private:resource/view/Presenter/Notes - - - NotesViewStyle - - - - - private:resource/view/Presenter/SlideSorter - - - SlideSorterViewStyle - - - - - private:resource/pane/Presenter/Overlay - - - ActivePaneStyle - - - - - private:resource/view/Presenter/Help - - - HelpViewStyle - - - - - private:resource/pane/Presenter/Pane6 - - - ActivePaneStyle - - - - - - - - - private:resource/view/Presenter/CurrentSlidePreview - - - Current Slide (%CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%) - - - Current Slide, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT% - - true - - - - Click to exit presentation... - - - - - Current Slide (end) - - - - - - - private:resource/view/Presenter/NextSlidePreview - - - Next Slide - - false - - - - private:resource/view/Presenter/ToolBar - - false - - - - private:resource/view/Presenter/Notes - - - Notes - - false - - - - private:resource/view/Presenter/SlideSorter - - false - - - - - Slide Overview, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT% - - - - - private:resource/view/Presenter/Help - - - Help - - false - - - - - - DefaultLayout - - - - - private:resource/pane/Presenter/Pane1 - - - private:resource/view/Presenter/CurrentSlidePreview - - - 0.05 - - - 0.05 - - - 0.50 - - - 0.50 - - - - - private:resource/pane/Presenter/Pane2 - - - private:resource/view/Presenter/NextSlidePreview - - - 0.60 - - - 0.05 - - - 0.35 - - - 0.35 - - - - - private:resource/pane/Presenter/Pane4 - - - private:resource/view/Presenter/ToolBar - - - 0.60 - - - 0.45 - - - 0.25 - - - 0.1 - - - - - private:resource/pane/Presenter/Pane3 - - - private:resource/view/Presenter/Notes - - - 0.05 - - - 0.60 - - - 0.9 - - - 0.35 - - - - - private:resource/pane/Presenter/Overlay - - - private:resource/view/Presenter/SlideSorter - - - 0.05 - - - 0.05 - - - 0.95 - - - 0.8 - - - - - private:resource/pane/Presenter/Pane6 - - - private:resource/view/Presenter/Help - - - 0.05 - - - 0.05 - - - 0.95 - - - 0.8 - - - - - - - - - Presenter Console - - - - - Current Slide Info - - - - - Presenter Notes - - - - - diff --git a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs deleted file mode 100644 index 74900896c96a..000000000000 --- a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs +++ /dev/null @@ -1,465 +0,0 @@ - - - - - AF - Configuration of the Presenter Screen extension. - - - - - Describes one bitmap that can be used as button icon or to paint - a pane border. - - Name of the bitmap. Used to look-up the bitmap in a container. - - - Text that is displayed together with the icon. - - - Relative file name to the bitmap for the normal icon. - - - Relative file name to the bitmap for the mouse over icon. - - - Relative file name to the bitmap for the button down icon. - - - Relative file name to the bitmap for the icon in disabled state. - - - Relative file name to the bitmap for the icon in disabled state. - - - The file name of the mask bitmap. Use red for pixel outside of - the border and blue for inside pixels. - - - - Horizontal offset to move the bitmap just outside the - window border. - 0 - - - Vertical offset to move the bitmap just outside the - window border. - 0 - - - Horizontal position of a hot spot. - - - Vertical position of a hot spot. - - - Color that is used as replacement for the bitmap when the later - can for some reason not be used. - - - Horizontal texturing mode. - - - Show texture only once - - - Repeat the texture - - - Stretch the texture to cover the paint area - - - - - Vertical texturing mode. - - - Show texture only once - - - Repeat the texture - - - Stretch the texture to cover the paint area - - - Once - - - - Four values describing the sizes of a border around a - rectangular area. - - Left border size. - - - Top border size. - - - Right border size. - - - Bottom border size. - - - - Font description. - - The name of the font family. - - - Font size. - - - Something like "Bold" or "Italic" or "Bold Italic". - - - Font color. - - - Orientation of text. Can be left, right, or centered. - - - Flush left - - - Flush right - - - Centered - - - - - Horizontal offset in relation to the anchor point. - - - Vertical offset in relation to the anchor point. - - - - Description of a tool bar entry state. - - Font used for displaying the text. - - - The icon to display. - - - The text to display. - - - Action to execute when a button is triggered. - - - - Definition of a tool bar entry. - - Name of the entry. May be used to have mode dependant entries. - - - Type of the entry. Examples are "Label" and "Button". - - - Description of a tool bar entry in normal mode (not selected, not mouse over) - - - Description of a tool bar entry when the mouse is over it. - - - Description of a tool bar entry when it is selected. - - - Description of a tool bar entry when it is disabled. - - - - Definition of one tool bar. - - Entries of the tool bars. - - - - Description of a button. - - Name of the button that is used to look up the button. - - - Font used for displaying the text. - - - The icon to display. - - - The text to display. - - - Action to execute when a button is triggered. - - - - Description of a help entry. - - Typically a list of keyboard key names. - - - Typically a description of the action triggered by pressing the keys on the left. - - - - Visual properties of a pane style: - the border of a pane and its title font. - - Name of the style. Used for referencing the style. - Has to be unique among pane styles and view styles - in one theme. - - - Name of the parent style. Values not supplied in this style - are taken from the parent style. Empty string or missing - mean no parent. - - - - Font used for displaying the pane title. - - - Size of the inner part of the border. - - - Size of the outer part of the border. - - - Bitmaps that are used to paint the borders of - a pane. - - - - Visual properties of a view style: - font and backround color. - - Name of the style. Used for referencing the style. - Has to be unique among pane styles and view styles - in one theme. - - - Name of the parent style. Values not supplied in this style - are taken from the parent style. Empty string or missing - mean no parent. - - - - Font used for text display inside a view. - - - Color (or bitmap) that is used to paint the - background of a view. - - - - Association of a drawing framework resource to a - style of the presenter theme. - - URL of a drawing framework resource. - - - Name of a pane style or a view style. - - - - Presenter string, whatever that might mean. - - Just a string. - - - - Association of a drawing framework resource to a - style of the presenter theme. - - URL of a drawing framework view. - - - Name of a view style. - - - Title displayed for the component. An empty or missing - title means that no title is displayed. - - - - Title displayed for the component when accessibility support is active. - An empty or missing title means that no title is displayed. - - - - When the value is false then the background is painted before the - view is painted. - false - - - List of localizable strings used by the view. - - - - Visual properties of the presenter view. The values in a theme - are hints and can be ignored. - - Name of the theme. Used for referencing the theme. - Has to be unique among all themes. The name of the - default theme is 'DefaultTheme' - - - Name of the parent theme. Values not supplied in this theme - are taken from the parent theme. Empty string or missing - mean default theme. - - - - Name of the extension which contains the bitmaps - referenced by this theme. - - - - Color or bitmap that is used to paint the - background. - - - List of pane styles. - - - List of view styles. - - - List of style associations. - - - List of additional bitmaps for example for buttons. - - - List of additional fonts. - - - - Layout of a component of the presenter screen. - - URL of a pane resource. - - - URL of a view resource that is to be displayed in - the pane. - - - Relative x position in the range of [0,1]. - - - Relative y position in the range of [0,1]. - - - Relative width in the range of [0,1]. - - - Relative height in the range of [0,1]. - - - - Layout of all components of the presenter screen. - - Name of the layout. Used for referencing the layout. - Has to be unique among all presenter layouts. - - - Name of the parent layout. Values not supplied in this layout - are taken from the parent layout. Missing or empty string - mean no parent layout. - - - - List of component layouts. - - - - - - Settings regarding controls that are only used by the Presenter - Screen. - - Set of tool bars. - - - Set of buttons. - - - Settings of scroll bars. - - Bitmaps of icons used for displaying the scroll bar. - - - - Settings of the slide sorter of the presenter screen. - - Size of the border around the current slide. - - - Bitmaps that are used to paint the border around the current - slide. - - - - Settings of help view. - - List of entries displayed in the help view. - - - - - General properties of the presenter view. - - When true then presenter screen is displayed on single screen systems - or when fullscreen presentation spans all screens. - false - - - List of available themes. - - - Name of the current theme. An empty name or the string "DefaultTheme" - specify the default theme. - DefaultTheme - - - Description of the views. - - - List of visible presenter components. - - - Name of the current layout. An empty name or the - string "DefaultLayout" specify the default layout. - DefaultLayout - - - Strings that are used make the presenter console accessible. - - - The view mode on start up of the extension. Valid values are 0 for the Preview-only mode, 1 for the notes view, 2 for the slide overview. - 0 - - - - -- cgit