[Libreoffice-commits] .: config_host.mk.in configure.ac icon-themes/galaxy offapi/com officecfg/Configuration_officecfg.mk officecfg/registry postprocess/packcomponents postprocess/packregistry Repository.mk scp2/source sdext/Configuration_presenter.mk sdext/CustomTarget_presenter.mk sdext/Extension_presenter.mk sdext/Library_presenter.mk sdext/Module_sdext.mk sdext/Rdb_presenter.mk sdext/source sd/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 21 08:48:42 PST 2012


 Repository.mk                                                                              |    2 
 config_host.mk.in                                                                          |    1 
 configure.ac                                                                               |   22 
 dev/null                                                                                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-Background.png                                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottom.png                           |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomCallout.png                    |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomLeft.png                       |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveBottomRight.png                      |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveLeft.png                             |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveRight.png                            |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTop.png                              |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopLeft.png                          |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderActiveTopRight.png                         |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderBottom.png                                 |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderBottomLeft.png                             |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderBottomRight.png                            |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottom.png                     |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png                 |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideBottomRight.png                |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideLeft.png                       |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideRight.png                      |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTop.png                        |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopLeft.png                    |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderCurrentSlideTopRight.png                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderLeft.png                                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderRight.png                                  |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarBottom.png                          |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarLeft.png                            |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarRight.png                           |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTop.png                             |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopLeft.png                         |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderToolbarTopRight.png                        |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderTop.png                                    |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderTopLeft.png                                |binary
 icon-themes/galaxy/sd/res/presenterscreen-BorderTopRight.png                               |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextDisabled.png                     |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextMouseOver.png                    |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextNormal.png                       |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonEffectNextSelected.png                     |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterMouseOver.png                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameCenterNormal.png                      |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftMouseOver.png                     |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameLeftNormal.png                        |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightMouseOver.png                    |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonFrameRightNormal.png                       |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpDisabled.png                           |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpMouseOver.png                          |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpNormal.png                             |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonHelpSelected.png                           |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusDisabled.png                          |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusMouseOver.png                         |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusNormal.png                            |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonMinusSelected.png                          |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesDisabled.png                          |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesMouseOver.png                         |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesNormal.png                            |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonNotesSelected.png                          |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusDisabled.png                           |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusMouseOver.png                          |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusNormal.png                             |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonPlusSelected.png                           |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextDisabled.png                      |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextMouseOver.png                     |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideNextNormal.png                        |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousDisabled.png                  |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png                 |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousNormal.png                    |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlidePreviousSelected.png                  |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterDisabled.png                    |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterMouseOver.png                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterNormal.png                      |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSlideSorterSelected.png                    |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png                 |binary
 icon-themes/galaxy/sd/res/presenterscreen-ButtonSwitchMonitorNormal.png                    |binary
 icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverCenter.png                         |binary
 icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverLeft.png                           |binary
 icon-themes/galaxy/sd/res/presenterscreen-LabelMouseOverRight.png                          |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownDisabled.png                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png                  |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownNormal.png                     |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowDownSelected.png                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpDisabled.png                     |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png                    |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpNormal.png                       |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarArrowUpSelected.png                     |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png                |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png                |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbBottomNormal.png                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png                |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png                   |binary
 icon-themes/galaxy/sd/res/presenterscreen-ScrollbarThumbTopNormal.png                      |binary
 icon-themes/galaxy/sd/res/presenterscreen-ViewBackground.png                               |binary
 offapi/com/sun/star/drawing/XPresenterHelper.idl                                           |   20 
 officecfg/Configuration_officecfg.mk                                                       |    3 
 officecfg/registry/data/org/openoffice/Office/Jobs.xcu                                     |   18 
 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu                          | 1253 ++++++++++
 officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu                          |   11 
 officecfg/registry/data/org/openoffice/Setup.xcu                                           |    5 
 officecfg/registry/files.mk                                                                |    1 
 officecfg/registry/schema/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 
 sdext/source/presenter/PresenterBitmapContainer.cxx                                        |   21 
 sdext/source/presenter/PresenterBitmapContainer.hxx                                        |    5 
 sdext/source/presenter/PresenterComponent.cxx                                              |   39 
 sdext/source/presenter/PresenterComponent.hxx                                              |   48 
 sdext/source/presenter/PresenterConfigurationAccess.cxx                                    |    2 
 sdext/source/presenter/PresenterExtensionIdentifier.hxx                                    |   29 
 sdext/source/presenter/PresenterHelpView.cxx                                               |    2 
 sdext/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/description-en-US.txt                                               |    2 
 sdext/source/presenter/description.xml                                                     |   51 
 sdext/source/presenter/presenter.component                                                 |    9 
 sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu                        |   37 
 sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu             |   27 
 sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu   | 1253 ----------
 sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs |  465 ---
 143 files changed, 2566 insertions(+), 2458 deletions(-)

New commits:
commit ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 21 17:19:28 2012 +0100

    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

diff --git a/Repository.mk b/Repository.mk
index dd5a93c..7592b50 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 a689182..0e5faf5 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 024a2b3..b9ac301 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 0000000..7b32e4a
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 0000000..8314c9e
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 0000000..b7c3322
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 0000000..8d573e8
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 0000000..35ef8e9
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 0000000..57d4a3d
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 0000000..9a98571
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 0000000..e0bea9d
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 0000000..62d6327
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 0000000..450c8e0
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 0000000..7ad2fd6
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 0000000..019de14
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 0000000..82de579
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 0000000..7000bc2
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 0000000..7571c8d
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 0000000..c0af63f
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 0000000..7000bc2
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 0000000..7000bc2
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 0000000..7000bc2
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 0000000..fdfabd4
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 0000000..5b4b642
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 0000000..cbdb267
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 0000000..3330733
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 0000000..23a3bc3
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 0000000..839ab50
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 0000000..e5c4b9d
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 0000000..c45b97c
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 0000000..978e98a
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 0000000..7dc3d98
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 0000000..dee68e8
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 0000000..bbec4e4
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 0000000..3416b16
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 0000000..5417cf7
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 0000000..96805e3
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 0000000..6dbd732
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 0000000..eb6e6d4
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 0000000..b97799f
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 0000000..4cf7218
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 0000000..1f2ab6a
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 0000000..0e92cb3
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 0000000..0f49ad4
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 0000000..4ca6967
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 0000000..12f4903
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 0000000..7bddef5
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 0000000..99c6932
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 0000000..f162db2
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 0000000..ff61106
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 0000000..7872499
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 0000000..e2d9933
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 0000000..5d15de3
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 0000000..09e31d2
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 0000000..099d6bf
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 0000000..5513926
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 0000000..f5494fb
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 0000000..e6ba3f3
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 0000000..9d21dc4
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 0000000..2e075c2
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 0000000..b9d6fe1
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 0000000..7f3bce0
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 0000000..4dc1365
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 0000000..711b8ca
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 0000000..383780e
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 0000000..dc35c62
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 0000000..26262b4
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 0000000..7274263
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 0000000..ce7d4ad
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 0000000..2e7f518
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 0000000..7aa914f
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 0000000..143f995
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 0000000..bc1055a
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 0000000..8cfe81d
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 0000000..6eb75d3
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 0000000..9455246
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 0000000..1f972d0
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 0000000..4dd1627
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 0000000..d1980a2
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 0000000..166f100
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 0000000..21d4294
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 0000000..44f6068
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 0000000..9795885
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 0000000..804ced8
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 0000000..d7be4f3
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 0000000..84b781a
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 0000000..a06ba66
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 0000000..482f136
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 0000000..ec46e17
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 0000000..62066c2
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 0000000..c25e4ed
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 0000000..714481d
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 0000000..7e0922c
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 0000000..ca52d82
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 003b6c1..6d40c6a 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.
 
-    <p>With time some, maybe all, methods can moved to other, better suited,
-    interfaces.</p>
+    <p>As the presenter screen is no extension any more, this hack can go again;
+    it just needs clean-up.</p>
 */
 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 7b03616..df9b30a 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 7dea578..dffb3f8 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 .
  -->
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
-<oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office"
+    xmlns:install="http://openoffice.org/2004/installation"
+    xmlns:oor="http://openoffice.org/2001/registry">
   <node oor:name="Jobs">
+    <node oor:name="org.libreoffice.PresenterScreen" oor:op="replace"
+        install:module="impress">
+      <prop oor:name="Service">
+        <value>org.libreoffice.comp.PresenterScreenJob</value>
+      </prop>
+      <prop oor:name="Context">
+        <value>com.sun.star.presentation.PresentationDocument</value>
+      </prop>
+    </node>
   </node>
   <node oor:name="Events">
+    <node oor:name="onDocumentOpened" oor:op="fuse" install:module="impress">
+      <node oor:name="JobList">
+        <node oor:name="org.libreoffice.PresenterScreen" oor:op="replace"/>
+      </node>
+    </node>
   </node>
 </oor:component-data>
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 0000000..fe2c78c
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -0,0 +1,1253 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ * 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 .
+ -->
+<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
+<oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:package="org.openoffice.Office" oor:name="PresenterScreen">
+  <node oor:name="PresenterScreenSettings">
+    <node oor:name="ToolBars">
+      <node oor:name="ToolBar" oor:op="replace">
+        <node oor:name="Entries">
+          <node oor:name="a" oor:op="replace">
+            <prop oor:name="Name"><value>PreviousSlide</value></prop>
+            <prop oor:name="Type"><value>Button</value></prop>
+            <node oor:name="Normal">
+              <prop oor:name="Text"><value xml:lang="en-US">Previous</value></prop>
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlidePreviousNormal.png</value></prop>
+              </node>
+              <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:PrevSlide</value></prop>
+              <node oor:name="Font">
+                <prop oor:name="Size"><value>12</value></prop>
+                <prop oor:name="Style"><value>Bold</value></prop>
+                <prop oor:name="Color"><value>B3B7BC</value></prop>
+                <prop oor:name="Anchor"><value>Center</value></prop>
+              </node>
+            </node>
+            <node oor:name="MouseOver">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlidePreviousMouseOver.png</value></prop>
+              </node>
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>FFFFFF</value></prop>
+              </node>
+            </node>
+            <node oor:name="Disabled">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlidePreviousDisabled.png</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="b" oor:op="replace">
+            <prop oor:name="Name"><value>NextEffect</value></prop>
+            <prop oor:name="Type"><value>Button</value></prop>
+            <node oor:name="Normal">
+              <prop oor:name="Text"><value xml:lang="en-US">Next</value></prop>
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonEffectNextNormal.png</value></prop>
+              </node>
+              <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:NextEffect</value></prop>
+              <node oor:name="Font">
+                <prop oor:name="Size"><value>12</value></prop>
+                <prop oor:name="Style"><value>Bold</value></prop>
+                <prop oor:name="Color"><value>B3B7BC</value></prop>
+                <prop oor:name="Anchor"><value>Center</value></prop>
+              </node>
+            </node>
+            <node oor:name="MouseOver">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonEffectNextMouseOver.png</value></prop>
+              </node>
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>FFFFFF</value></prop>
+              </node>
+            </node>
+            <node oor:name="Disabled">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonEffectNextDisabled.png</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="c" oor:op="replace">
+            <prop oor:name="Name"><value>Notes</value></prop>
+            <prop oor:name="Type"><value>Button</value></prop>
+            <node oor:name="Normal">
+              <prop oor:name="Text"><value xml:lang="en-US">Notes</value></prop>
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesNormal.png</value></prop>
+              </node>
+              <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:ShowNotes</value></prop>
+              <node oor:name="Font">
+                <prop oor:name="Size"><value>12</value></prop>
+                <prop oor:name="Style"><value>Bold</value></prop>
+                <prop oor:name="Color"><value>B3B7BC</value></prop>
+                <prop oor:name="Anchor"><value>Center</value></prop>
+              </node>
+            </node>
+            <node oor:name="MouseOver">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesMouseOver.png</value></prop>
+              </node>
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>FFFFFF</value></prop>
+              </node>
+            </node>
+            <node oor:name="Selected">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesSelected.png</value></prop>
+              </node>
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>FFFFFF</value></prop>
+              </node>
+              <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:CloseNotes</value></prop>
+            </node>
+            <node oor:name="Disabled">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesDisabled.png</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="d" oor:op="replace">
+            <prop oor:name="Name"><value>SlideSorter</value></prop>
+            <prop oor:name="Type"><value>Button</value></prop>
+            <node oor:name="Normal">
+              <prop oor:name="Text"><value xml:lang="en-US">Slides</value></prop>
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterNormal.png</value></prop>
+              </node>
+              <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:ShowSlideSorter</value></prop>
+              <node oor:name="Font">
+                <prop oor:name="Size"><value>12</value></prop>
+                <prop oor:name="Style"><value>Bold</value></prop>
+                <prop oor:name="Color"><value>B3B7BC</value></prop>
+                <prop oor:name="Anchor"><value>Center</value></prop>
+              </node>
+            </node>
+            <node oor:name="MouseOver">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterMouseOver.png</value></prop>
+              </node>
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>FFFFFF</value></prop>
+              </node>
+            </node>
+            <node oor:name="Selected">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterSelected.png</value></prop>
+              </node>
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>FFFFFF</value></prop>
+              </node>
+              <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:CloseSlideSorter</value></prop>
+            </node>
+            <node oor:name="Disabled">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterDisabled.png</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="e" oor:op="replace">
+            <prop oor:name="Type"><value>VerticalSeparator</value></prop>
+            <node oor:name="Normal">
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>76797C</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="f" oor:op="replace">
+            <prop oor:name="Type"><value>ChangeOrientation</value></prop>
+          </node>
+          <node oor:name="g" oor:op="replace">
+            <prop oor:name="Type"><value>CurrentTimeLabel</value></prop>
+            <node oor:name="Normal">
+              <node oor:name="Font">
+                <prop oor:name="Size"><value>18</value></prop>
+                <prop oor:name="Style"><value>Bold</value></prop>
+                <prop oor:name="Color"><value>ffffff</value></prop>
+                <prop oor:name="Anchor"><value>Center</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="h" oor:op="replace">
+            <prop oor:name="Type"><value>HorizontalSeparator</value></prop>
+            <node oor:name="Normal">
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>71767a</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="i" oor:op="replace">
+            <prop oor:name="Type"><value>PresentationTimeLabel</value></prop>
+            <node oor:name="Normal">
+              <node oor:name="Font">
+                <prop oor:name="Size"><value>26</value></prop>
+                <prop oor:name="Style"><value>Bold</value></prop>
+                <prop oor:name="Color"><value>ffe969</value></prop>
+                <prop oor:name="Anchor"><value>Center</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="j" oor:op="replace">
+            <prop oor:name="Type"><value>ChangeOrientation</value></prop>
+          </node>
+          <node oor:name="k" oor:op="replace">
+            <prop oor:name="Type"><value>VerticalSeparator</value></prop>
+            <node oor:name="Normal">
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>76797C</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="l" oor:op="replace">
+            <prop oor:name="Name"><value>SwitchMonitor</value></prop>
+            <prop oor:name="Type"><value>Button</value></prop>
+            <node oor:name="Normal">
+              <prop oor:name="Text"><value xml:lang="en-US">Exchange</value></prop>
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSwitchMonitorNormal.png</value></prop>
+              </node>
+              <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:SwitchMonitor</value></prop>
+              <node oor:name="Font">
+                <prop oor:name="Size"><value>12</value></prop>
+                <prop oor:name="Style"><value>Bold</value></prop>
+                <prop oor:name="Color"><value>B3B7BC</value></prop>
+                <prop oor:name="Anchor"><value>Center</value></prop>
+              </node>
+            </node>
+            <node oor:name="MouseOver">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSwitchMonitorMouseOver.png</value></prop>
+              </node>
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>FFFFFF</value></prop>
+              </node>
+            </node>
+            <node oor:name="Disabled">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSwitchMonitorDisabled.png</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="m" oor:op="replace">
+            <prop oor:name="Type"><value>VerticalSeparator</value></prop>
+            <node oor:name="Normal">
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>76797C</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="n" oor:op="replace">
+            <prop oor:name="Name"><value>Help</value></prop>
+            <prop oor:name="Type"><value>Button</value></prop>
+            <node oor:name="Normal">
+              <prop oor:name="Text"><value xml:lang="en-US">Help</value></prop>
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpNormal.png</value></prop>
+              </node>
+              <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:ShowHelp</value></prop>
+              <node oor:name="Font">
+                <prop oor:name="Size"><value>12</value></prop>
+                <prop oor:name="Style"><value>Bold</value></prop>
+                <prop oor:name="Color"><value>B3B7BC</value></prop>
+                <prop oor:name="Anchor"><value>Center</value></prop>
+              </node>
+            </node>
+            <node oor:name="MouseOver">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpMouseOver.png</value></prop>
+              </node>
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>FFFFFF</value></prop>
+              </node>
+            </node>
+            <node oor:name="Selected">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpSelected.png</value></prop>
+              </node>
+              <node oor:name="Font">
+                <prop oor:name="Color"><value>FFFFFF</value></prop>
+              </node>
+              <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:CloseHelp</value></prop>
+            </node>
+            <node oor:name="Disabled">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpDisabled.png</value></prop>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node oor:name="NotesToolBar" oor:op="replace">
+        <node oor:name="Entries">
+          <node oor:name="a" oor:op="replace">
+            <prop oor:name="Name"><value>Zoom</value></prop>
+            <prop oor:name="Type"><value>Label</value></prop>
+            <node oor:name="Normal">
+              <prop oor:name="Text"><value xml:lang="en-US">Zoom</value></prop>
+              <node oor:name="Font">
+                <prop oor:name="Size"><value>14</value></prop>
+                <prop oor:name="Style"><value>Bold</value></prop>
+                <prop oor:name="Color"><value>B3B7BC</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="b" oor:op="replace">
+            <prop oor:name="Name"><value>Grow</value></prop>
+            <prop oor:name="Type"><value>Button</value></prop>
+            <node oor:name="Normal">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonPlusNormal.png</value></prop>
+              </node>
+              <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:GrowNotesFont</value></prop>
+            </node>
+            <node oor:name="MouseOver">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonPlusMouseOver.png</value></prop>
+              </node>
+            </node>
+            <node oor:name="Disabled">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonPlusDisabled.png</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="c" oor:op="replace">
+            <prop oor:name="Name"><value>Shrink</value></prop>
+            <prop oor:name="Type"><value>Button</value></prop>
+            <node oor:name="Normal">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonMinusNormal.png</value></prop>
+              </node>
+              <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:ShrinkNotesFont</value></prop>
+            </node>
+            <node oor:name="MouseOver">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonMinusMouseOver.png</value></prop>
+              </node>
+            </node>
+            <node oor:name="Disabled">
+              <node oor:name="Icon">
+                <prop oor:name="NormalFileName"><value>bitmaps/ButtonMinusDisabled.png</value></prop>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node oor:name="Buttons">
+      <node oor:name="SlideSorterCloser" oor:op="replace">
+        <prop oor:name="Name"><value>SlideSorterCloser</value></prop>
+        <prop oor:name="Text">
+          <value xml:lang="en-US">Close</value>
+        </prop>
+        <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:CloseSlideSorter</value></prop>
+      </node>
+      <node oor:name="NotesViewCloser" oor:op="replace">
+        <prop oor:name="Name"><value>NotesViewCloser</value></prop>
+        <prop oor:name="Text">
+          <value xml:lang="en-US">Close</value>
+        </prop>
+        <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:CloseNotes</value></prop>
+      </node>
+      <node oor:name="HelpViewCloser" oor:op="replace">
+        <prop oor:name="Name"><value>HelpViewCloser</value></prop>
+        <prop oor:name="Text">
+          <value xml:lang="en-US">Close</value>
+        </prop>
+        <prop oor:name="Action"><value>vnd.org.libreoffice.presenterscreen:CloseHelp</value></prop>
+      </node>
+    </node>
+    <node oor:name="ScrollBar">
+      <node oor:name="Bitmaps">
+        <node oor:name="up" oor:op="replace">
+          <prop oor:name="Name"><value>Up</value></prop>
+          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarArrowUpNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarArrowUpMouseOver.png</value></prop>
+          <prop oor:name="DisabledFileName"><value>bitmaps/ScrollbarArrowUpDisabled.png</value></prop>
+        </node>
+        <node oor:name="down" oor:op="replace">
+          <prop oor:name="Name"><value>Down</value></prop>
+          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarArrowDownNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarArrowDownMouseOver.png</value></prop>
+          <prop oor:name="DisabledFileName"><value>bitmaps/ScrollbarArrowDownDisabled.png</value></prop>
+        </node>
+        <node oor:name="pagervertical" oor:op="replace">
+          <prop oor:name="Name"><value>PagerVertical</value></prop>
+          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarPagerMiddleNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarPagerMiddleMouseOver.png</value></prop>
+        </node>
+        <node oor:name="thumbtop" oor:op="replace">
+          <prop oor:name="Name"><value>ThumbTop</value></prop>
+          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarThumbTopNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarThumbTopMouseOver.png</value></prop>
+        </node>
+        <node oor:name="thumbbottom" oor:op="replace">
+          <prop oor:name="Name"><value>ThumbBottom</value></prop>
+          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarThumbBottomNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarThumbBottomMouseOver.png</value></prop>
+        </node>
+        <node oor:name="thumbvertical" oor:op="replace">
+          <prop oor:name="Name"><value>ThumbVertical</value></prop>
+          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarThumbMiddleNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarThumbMiddleMouseOver.png</value></prop>
+        </node>
+      </node>
+    </node>
+    <node oor:name="SlideSorter">
+      <node oor:name="BorderSize">
+        <prop oor:name="Left"><value>9</value></prop>
+        <prop oor:name="Top"><value>9</value></prop>
+        <prop oor:name="Right"><value>9</value></prop>
+        <prop oor:name="Bottom"><value>9</value></prop>
+      </node>
+      <node oor:name="CurrentSlideBorderBitmaps">
+        <node oor:name="TopLeft" oor:op="replace">
+          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTopLeft.png</value></prop>
+        </node>
+        <node oor:name="Top" oor:op="replace">
+          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTop.png</value></prop>
+        </node>
+        <node oor:name="TopRight" oor:op="replace">
+          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTopRight.png</value></prop>
+        </node>
+        <node oor:name="Left" oor:op="replace">
+          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideLeft.png</value></prop>
+        </node>
+        <node oor:name="Right" oor:op="replace">
+          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideRight.png</value></prop>
+        </node>
+        <node oor:name="BottomLeft" oor:op="replace">
+          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottomLeft.png</value></prop>
+        </node>
+        <node oor:name="Bottom" oor:op="replace">
+          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottom.png</value></prop>
+        </node>
+        <node oor:name="BottomRight" oor:op="replace">
+          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottomRight.png</value></prop>
+        </node>
+      </node>
+    </node>
+    <node oor:name="HelpView">
+      <node oor:name="HelpStrings">
+        <node oor:name="a" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">Left click, right or down arrow, spacebar, page down, enter, return, 'N'</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Next slide, or next effect</value>
+          </prop>
+        </node>
+        <node oor:name="b" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">Right click, left or up arrow, page up, backspace, 'P'</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Previous slide, or previous effect</value>
+          </prop>
+        </node>
+        <node oor:name="c" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US"> </value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US"> </value>
+          </prop>
+        </node>
+        <node oor:name="d" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">Home</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">First slide</value>
+          </prop>
+        </node>
+        <node oor:name="e" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">End</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Last slide</value>
+          </prop>
+        </node>
+        <node oor:name="f" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US"> </value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US"> </value>
+          </prop>
+        </node>
+        <node oor:name="g" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">Alt-Page Up</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Previous slide without effects</value>
+          </prop>
+        </node>
+        <node oor:name="h" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">Alt-Page Down</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Next slide without effects</value>
+          </prop>
+        </node>
+        <node oor:name="i" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US"> </value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US"> </value>
+          </prop>
+        </node>
+        <node oor:name="j" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">'B', '.'</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Blacks/Unblacks the screen</value>
+          </prop>
+        </node>
+        <node oor:name="k" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">'W', ','</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Whites/Unwhites the screen</value>
+          </prop>
+        </node>
+        <node oor:name="l" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US"> </value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US"> </value>
+          </prop>
+        </node>
+        <node oor:name="m" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">Esc, '-'</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">End slide show</value>
+          </prop>
+        </node>
+        <node oor:name="n" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US"> </value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US"> </value>
+          </prop>
+        </node>
+        <node oor:name="o" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">Number followed by Enter</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Go to that slide</value>
+          </prop>
+        </node>
+        <node oor:name="p" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US"> </value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US"> </value>
+          </prop>
+        </node>
+        <node oor:name="q" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">'G', 'S'</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Grow/Shrink size of notes font</value>
+          </prop>
+        </node>
+        <node oor:name="r" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">'A', 'Z'</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Scroll notes up/down</value>
+          </prop>
+        </node>
+        <node oor:name="s" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">'H', 'L'</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Move caret in notes view backward/forward</value>
+          </prop>
+        </node>
+        <node oor:name="t" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US"> </value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US"> </value>
+          </prop>
+        </node>
+        <node oor:name="u" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">Ctrl-'1'</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Shows the Presenter Console</value>
+          </prop>
+        </node>
+        <node oor:name="v" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">Ctrl-'2'</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Shows the Presentation Notes</value>
+          </prop>
+        </node>
+        <node oor:name="w" oor:op="replace">
+          <prop oor:name="Left">
+            <value xml:lang="en-US">Ctrl-'3'</value>
+          </prop>
+          <prop oor:name="Right">
+            <value xml:lang="en-US">Shows the Slides Overview</value>
+          </prop>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node oor:name="Presenter">
+    <node oor:name="Themes">
+      <node oor:name="Theme_1" oor:op="replace">
+        <prop oor:name="ThemeName">
+          <value>DefaultTheme</value>
+        </prop>
+        <node oor:name="PaneStyles">
+          <node oor:name="PaneStyle_1" oor:op="replace">
+            <prop oor:name="StyleName">
+              <value>DefaultPaneStyle</value>
+            </prop>
+            <node oor:name="TitleFont">
+              <prop oor:name="FamilyName"><value></value></prop>
+              <prop oor:name="Style"><value>Bold</value></prop>
+              <prop oor:name="Size"><value>14</value></prop>
+              <prop oor:name="Color"><value>B3B7BC</value></prop>
+              <prop oor:name="Anchor"><value>Center</value></prop>
+              <prop oor:name="YOffset"><value>-7</value></prop>
+            </node>
+            <node oor:name="InnerBorderSize">
+              <prop oor:name="Left"><value>6</value></prop>
+              <prop oor:name="Top"><value>6</value></prop>
+              <prop oor:name="Right"><value>6</value></prop>
+              <prop oor:name="Bottom"><value>6</value></prop>
+            </node>
+            <node oor:name="OuterBorderSize">
+              <prop oor:name="Left"><value>20</value></prop>
+              <prop oor:name="Top"><value>28</value></prop>
+              <prop oor:name="Right"><value>20</value></prop>
+              <prop oor:name="Bottom"><value>29</value></prop>
+            </node>
+            <node oor:name="BorderBitmapList">
+              <node oor:name="Top" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderTop.png</value></prop>
+                <prop oor:name="YOffset"><value>6</value></prop>
+              </node>
+              <node oor:name="TopLeft" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderTopLeft.png</value></prop>
+                <prop oor:name="XOffset"><value>6</value></prop>
+                <prop oor:name="YOffset"><value>6</value></prop>
+              </node>
+              <node oor:name="TopRight" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderTopRight.png</value></prop>
+                <prop oor:name="XOffset"><value>-6</value></prop>
+                <prop oor:name="YOffset"><value>6</value></prop>
+              </node>
+              <node oor:name="Left" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderLeft.png</value></prop>
+                <prop oor:name="XOffset"><value>6</value></prop>
+              </node>
+              <node oor:name="Right" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderRight.png</value></prop>
+                <prop oor:name="XOffset"><value>-6</value></prop>
+              </node>
+              <node oor:name="BottomLeft" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderBottomLeft.png</value></prop>
+                <prop oor:name="XOffset"><value>6</value></prop>
+                <prop oor:name="YOffset"><value>-6</value></prop>
+              </node>
+              <node oor:name="BottomRight" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderBottomRight.png</value></prop>
+                <prop oor:name="XOffset"><value>-6</value></prop>
+                <prop oor:name="YOffset"><value>-6</value></prop>
+              </node>
+              <node oor:name="Bottom" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderBottom.png</value></prop>
+                <prop oor:name="YOffset"><value>-6</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="PaneStyle_2" oor:op="replace">
+            <prop oor:name="StyleName">
+              <value>ActivePaneStyle</value>
+            </prop>
+            <prop oor:name="ParentStyle">
+              <value>DefaultPaneStyle</value>
+            </prop>
+            <node oor:name="TitleFont">
+              <prop oor:name="FamilyName"><value></value></prop>
+              <prop oor:name="Style"><value>Bold</value></prop>
+              <prop oor:name="Size"><value>14</value></prop>
+              <prop oor:name="Color"><value>FFFFFF</value></prop>
+              <prop oor:name="Anchor"><value>Center</value></prop>
+              <prop oor:name="YOffset"><value>-10</value></prop>
+            </node>
+            <node oor:name="BorderBitmapList">
+              <node oor:name="Top" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveTop.png</value></prop>
+                <prop oor:name="YOffset"><value>6</value></prop>
+              </node>
+              <node oor:name="TopLeft" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveTopLeft.png</value></prop>
+                <prop oor:name="XOffset"><value>6</value></prop>
+                <prop oor:name="YOffset"><value>6</value></prop>
+              </node>
+              <node oor:name="TopRight" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveTopRight.png</value></prop>
+                <prop oor:name="XOffset"><value>-6</value></prop>
+                <prop oor:name="YOffset"><value>6</value></prop>
+              </node>
+              <node oor:name="Left" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveLeft.png</value></prop>
+                <prop oor:name="XOffset"><value>6</value></prop>
+              </node>
+              <node oor:name="Right" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveRight.png</value></prop>
+                <prop oor:name="XOffset"><value>-6</value></prop>
+              </node>
+              <node oor:name="BottomLeft" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottomLeft.png</value></prop>
+                <prop oor:name="XOffset"><value>6</value></prop>
+                <prop oor:name="YOffset"><value>-6</value></prop>
+              </node>
+              <node oor:name="BottomRight" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottomRight.png</value></prop>
+                <prop oor:name="XOffset"><value>-6</value></prop>
+                <prop oor:name="YOffset"><value>-6</value></prop>
+              </node>
+              <node oor:name="Bottom" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottom.png</value></prop>
+                <prop oor:name="YOffset"><value>-6</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="PaneStyle_3" oor:op="replace">
+            <prop oor:name="StyleName">
+              <value>ToolbarPaneStyle</value>
+            </prop>
+            <node oor:name="InnerBorderSize">
+              <prop oor:name="Left"><value>4</value></prop>
+              <prop oor:name="Top"><value>4</value></prop>
+              <prop oor:name="Right"><value>4</value></prop>
+              <prop oor:name="Bottom"><value>4</value></prop>
+            </node>
+            <node oor:name="OuterBorderSize">
+              <prop oor:name="Left"><value>8</value></prop>
+              <prop oor:name="Top"><value>8</value></prop>
+              <prop oor:name="Right"><value>8</value></prop>
+              <prop oor:name="Bottom"><value>0</value></prop>
+            </node>
+            <node oor:name="BorderBitmapList">
+              <node oor:name="Top" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarTop.png</value></prop>
+                <prop oor:name="YOffset"><value>4</value></prop>
+              </node>
+              <node oor:name="TopLeft" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarTopLeft.png</value></prop>
+                <prop oor:name="XOffset"><value>4</value></prop>
+                <prop oor:name="YOffset"><value>4</value></prop>
+              </node>
+              <node oor:name="TopRight" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarTopRight.png</value></prop>
+                <prop oor:name="XOffset"><value>-4</value></prop>
+                <prop oor:name="YOffset"><value>4</value></prop>
+              </node>
+              <node oor:name="Left" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarLeft.png</value></prop>
+                <prop oor:name="XOffset"><value>4</value></prop>
+              </node>
+              <node oor:name="Right" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarRight.png</value></prop>
+                <prop oor:name="XOffset"><value>-4</value></prop>
+              </node>
+              <node oor:name="BottomLeft" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarLeft.png</value></prop>
+                <prop oor:name="XOffset"><value>4</value></prop>
+              </node>
+              <node oor:name="BottomRight" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarRight.png</value></prop>
+                <prop oor:name="XOffset"><value>-4</value></prop>
+              </node>
+              <node oor:name="Bottom" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarBottom.png</value></prop>
+                <prop oor:name="YOffset"><value>-4</value></prop>
+              </node>
+            </node>
+          </node>
+          <node oor:name="PaneStyle_4" oor:op="replace">
+            <prop oor:name="StyleName">
+              <value>ActiveBottomCalloutPaneStyle</value>
+            </prop>
+            <prop oor:name="ParentStyle">
+              <value>ActivePaneStyle</value>
+            </prop>
+            <node oor:name="OuterBorderSize">
+              <prop oor:name="Bottom"><value>52</value></prop>
+            </node>
+            <node oor:name="BorderBitmapList">
+              <node oor:name="BottomCallout" oor:op="replace">
+                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottomCallout.png</value></prop>
+                <prop oor:name="YOffset"><value>-6</value></prop>
+                <prop oor:name="XHotSpot"><value>49</value></prop>
+                <prop oor:name="YHotSpot"><value>41</value></prop>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node oor:name="ViewStyles">
+          <node oor:name="ViewStyle_1" oor:op="replace">
+            <prop oor:name="StyleName"><value>DefaultViewStyle</value></prop>
+            <node oor:name="Font">
+              <prop oor:name="FamilyName"><value></value></prop>
+              <prop oor:name="Size"><value>20</value></prop>
+              <prop oor:name="Color"><value>FFFFFF</value>
+              </prop>
+            </node>
+            <node oor:name="Background">
+              <prop oor:name="NormalFileName"><value>bitmaps/ViewBackground.png</value></prop>
+              <prop oor:name="HorizontalTexturingMode"><value>Repeat</value></prop>
+              <prop oor:name="VerticalTexturingMode"><value>Repeat</value></prop>
+              <prop oor:name="ReplacementColor"><value>33000000</value></prop>
+            </node>
+          </node>
+          <node oor:name="ViewStyle_2" oor:op="replace">
+            <prop oor:name="StyleName"><value>NotesViewStyle</value></prop>
+            <prop oor:name="ParentStyle"><value>DefaultViewStyle</value></prop>
+            <node oor:name="Font">
+              <prop oor:name="FamilyName"><value></value></prop>
+              <prop oor:name="Style"><value>Bold</value></prop>
+              <prop oor:name="Size"><value>26</value></prop>
+              <prop oor:name="Color"><value>d1d6dc</value></prop>
+            </node>
+          </node>
+          <node oor:name="ViewStyle_3" oor:op="replace">
+            <prop oor:name="StyleName"><value>SlideSorterViewStyle</value></prop>
+            <prop oor:name="ParentStyle"><value>DefaultViewStyle</value></prop>
+          </node>
+          <node oor:name="ViewStyle_4" oor:op="replace">
+            <prop oor:name="StyleName"><value>HelpViewStyle</value></prop>
+            <prop oor:name="ParentStyle"><value>DefaultViewStyle</value></prop>
+            <node oor:name="Font">
+              <prop oor:name="FamilyName"><value></value></prop>
+              <prop oor:name="Style"><value>Bold</value></prop>
+              <prop oor:name="Size"><value>20</value></prop>
+              <prop oor:name="Color"><value>ffffff</value></prop>
+            </node>
+          </node>
+        </node>
+        <node oor:name="Background">
+          <prop oor:name="NormalFileName"><value>bitmaps/Background.png</value></prop>
+          <prop oor:name="ReplacementColor"><value>E4EFF9</value></prop>
+          <prop oor:name="HorizontalTexturingMode"><value>Repeat</value></prop>
+          <prop oor:name="VerticalTexturingMode"><value>Stretch</value></prop>
+        </node>
+        <node oor:name="Bitmaps">
+          <node oor:name="ButtonFrameLeft" oor:op="replace">
+            <prop oor:name="Name"><value>ButtonFrameLeft</value></prop>
+            <prop oor:name="NormalFileName"><value>bitmaps/ButtonFrameLeftNormal.png</value></prop>
+            <prop oor:name="MouseOverFileName"><value>bitmaps/ButtonFrameLeftMouseOver.png</value></prop>
+            <prop oor:name="YOffset"><value>2</value></prop>
+          </node>
+          <node oor:name="ButtonFrameCenter" oor:op="replace">
+            <prop oor:name="Name"><value>ButtonFrameCenter</value></prop>
+            <prop oor:name="NormalFileName"><value>bitmaps/ButtonFrameCenterNormal.png</value></prop>
+            <prop oor:name="MouseOverFileName"><value>bitmaps/ButtonFrameCenterMouseOver.png</value></prop>
+            <prop oor:name="YOffset"><value>2</value></prop>
+          </node>
+          <node oor:name="ButtonFrameRight" oor:op="replace">
+            <prop oor:name="Name"><value>ButtonFrameRight</value></prop>
+            <prop oor:name="NormalFileName"><value>bitmaps/ButtonFrameRightNormal.png</value></prop>
+            <prop oor:name="MouseOverFileName"><value>bitmaps/ButtonFrameRightMouseOver.png</value></prop>
+            <prop oor:name="YOffset"><value>2</value></prop>
+          </node>
+          <node oor:name="LabelLeft" oor:op="replace">
+            <prop oor:name="NormalFileName"><value>bitmaps/LabelMouseOverLeft.png</value></prop>
+          </node>
+          <node oor:name="LabelCenter" oor:op="replace">
+            <prop oor:name="NormalFileName"><value>bitmaps/LabelMouseOverCenter.png</value></prop>
+          </node>
+          <node oor:name="LabelRight" oor:op="replace">
+            <prop oor:name="NormalFileName"><value>bitmaps/LabelMouseOverRight.png</value></prop>
+          </node>
+          <node oor:name="MousePointerNextEffect" oor:op="replace">
+            <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideNextNormal.png</value></prop>
+          </node>
+        </node>
+        <node oor:name="Fonts">
+          <node oor:name="ButtonFont" oor:op="replace">
+            <prop oor:name="FamilyName"><value></value></prop>
+            <prop oor:name="Style"><value>Bold</value></prop>
+            <prop oor:name="Size"><value>18</value></prop>
+            <prop oor:name="Color"><value>b3b7bc</value></prop>
+          </node>
+          <node oor:name="ButtonMouseOverFont" oor:op="replace">
+            <prop oor:name="FamilyName"><value></value></prop>
+            <prop oor:name="Style"><value>Bold</value></prop>
+            <prop oor:name="Size"><value>18</value></prop>
+            <prop oor:name="Color"><value>ffffff</value></prop>
+          </node>
+          <node oor:name="SlideSorterLabelFont" oor:op="replace">
+            <prop oor:name="FamilyName"><value></value></prop>
+            <prop oor:name="Style"><value>Bold</value></prop>
+            <prop oor:name="Size"><value>20</value></prop>
+            <prop oor:name="Color"><value>ffffff</value></prop>
+          </node>
+          <node oor:name="PendingSlideNumberFont" oor:op="replace">
+            <prop oor:name="FamilyName"><value></value></prop>
+            <prop oor:name="Style"><value>Bold</value></prop>
+            <prop oor:name="Size"><value>24</value></prop>
+            <prop oor:name="Color"><value>e02050</value></prop>
+          </node>
+        </node>
+        <node oor:name="StyleAssociations">
+          <node oor:name="PreviewPane" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/pane/Presenter/Pane1</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>ActivePaneStyle</value>
+            </prop>
+          </node>
+          <node oor:name="PreviewView" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/view/Presenter/CurrentSlidePreview</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>DefaultViewStyle</value>
+            </prop>
+          </node>
+          <node oor:name="NextSlidePreviewPane" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/pane/Presenter/Pane2</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>DefaultPaneStyle</value>
+            </prop>
+          </node>
+          <node oor:name="NextSlidePreviewView" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/view/Presenter/NextSlidePreview</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>DefaultViewStyle</value>
+            </prop>
+          </node>
+          <node oor:name="ToolBarPane" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/pane/Presenter/Pane4</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>ToolbarPaneStyle</value>
+            </prop>
+          </node>
+          <node oor:name="ToolBarView" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/view/Presenter/ToolBar</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>DefaultViewStyle</value>
+            </prop>
+          </node>
+          <node oor:name="NotesPane" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/pane/Presenter/Pane3</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>ActivePaneStyle</value>
+            </prop>
+          </node>
+          <node oor:name="NotesView" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/view/Presenter/Notes</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>NotesViewStyle</value>
+            </prop>
+          </node>
+          <node oor:name="SlideSorter" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/view/Presenter/SlideSorter</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>SlideSorterViewStyle</value>
+            </prop>
+          </node>
+          <node oor:name="OverlayPane" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/pane/Presenter/Overlay</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>ActivePaneStyle</value>
+            </prop>
+          </node>
+          <node oor:name="HelpView" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/view/Presenter/Help</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>HelpViewStyle</value>
+            </prop>
+          </node>
+          <node oor:name="HelpPane" oor:op="replace">
+            <prop oor:name="ResourceURL">
+              <value>private:resource/pane/Presenter/Pane6</value>
+            </prop>
+            <prop oor:name="StyleName">
+              <value>ActivePaneStyle</value>
+            </prop>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node oor:name="Views">
+      <node oor:name="CurrentSlidePreview" oor:op="replace">
+        <prop oor:name="ViewURL">
+          <value>private:resource/view/Presenter/CurrentSlidePreview</value>
+        </prop>
+        <prop oor:name="Title">
+          <value xml:lang="en-US">Current Slide (%CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%)</value>
+        </prop>
+        <prop oor:name="AccessibleTitle">
+          <value xml:lang="en-US">Current Slide, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%</value>
+        </prop>
+        <prop oor:name="IsOpaque"><value>true</value></prop>
+        <node oor:name="Strings">
+          <node oor:name="ClickToExitPresentationText" oor:op="replace">
+            <prop oor:name="String">
+              <value xml:lang="en-US">Click to exit presentation...</value>
+            </prop>
+          </node>
+          <node oor:name="ClickToExitPresentationTitle" oor:op="replace">
+            <prop oor:name="String">
+              <value xml:lang="en-US">Current Slide (end)</value>
+            </prop>
+          </node>
+        </node>
+      </node>
+      <node oor:name="NextSlidePreview" oor:op="replace">
+        <prop oor:name="ViewURL">
+          <value>private:resource/view/Presenter/NextSlidePreview</value>
+        </prop>
+        <prop oor:name="Title">
+          <value xml:lang="en-US">Next Slide</value>
+        </prop>
+        <prop oor:name="IsOpaque"><value>false</value></prop>
+      </node>
+      <node oor:name="ToolBar" oor:op="replace">
+        <prop oor:name="ViewURL">
+          <value>private:resource/view/Presenter/ToolBar</value>
+        </prop>
+        <prop oor:name="IsOpaque"><value>false</value></prop>
+      </node>
+      <node oor:name="NotesView" oor:op="replace">
+        <prop oor:name="ViewURL">
+          <value>private:resource/view/Presenter/Notes</value>
+        </prop>
+        <prop oor:name="Title">
+          <value xml:lang="en-US">Notes</value>
+        </prop>
+        <prop oor:name="IsOpaque"><value>false</value></prop>
+      </node>
+      <node oor:name="SlideSorter" oor:op="replace">
+        <prop oor:name="ViewURL">
+          <value>private:resource/view/Presenter/SlideSorter</value>
+        </prop>
+        <prop oor:name="IsOpaque"><value>false</value></prop>
+        <prop oor:name="Title">
+          <value xml:lang="en-US"></value>
+        </prop>
+        <prop oor:name="AccessibleTitle">
+          <value xml:lang="en-US">Slide Overview, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%</value>
+        </prop>
+      </node>
+      <node oor:name="HelpView" oor:op="replace">
+        <prop oor:name="ViewURL">
+          <value>private:resource/view/Presenter/Help</value>
+        </prop>
+        <prop oor:name="Title">
+          <value xml:lang="en-US">Help</value>
+        </prop>
+        <prop oor:name="IsOpaque"><value>false</value></prop>
+      </node>
+    </node>
+    <node oor:name="Layouts">
+      <node oor:name="DefaultLayout" oor:op="replace">
+        <prop oor:name="LayoutName">
+          <value>DefaultLayout</value>
+        </prop>
+        <node oor:name="Layout">
+          <node oor:name="CurrentSlidePreview" oor:op="replace">
+            <prop oor:name="PaneURL">
+              <value>private:resource/pane/Presenter/Pane1</value>
+            </prop>
+            <prop oor:name="ViewURL">
+              <value>private:resource/view/Presenter/CurrentSlidePreview</value>
+            </prop>
+            <prop oor:name="RelativeX">
+              <value>0.05</value>
+            </prop>
+            <prop oor:name="RelativeY">
+              <value>0.05</value>
+            </prop>
+            <prop oor:name="RelativeWidth">
+              <value>0.50</value>
+            </prop>
+            <prop oor:name="RelativeHeight">
+              <value>0.50</value>
+            </prop>
+          </node>
+          <node oor:name="NextSlidePreview" oor:op="replace">
+            <prop oor:name="PaneURL">
+              <value>private:resource/pane/Presenter/Pane2</value>
+            </prop>
+            <prop oor:name="ViewURL">
+              <value>private:resource/view/Presenter/NextSlidePreview</value>
+            </prop>
+            <prop oor:name="RelativeX">
+              <value>0.60</value>
+            </prop>
+            <prop oor:name="RelativeY">
+              <value>0.05</value>
+            </prop>
+            <prop oor:name="RelativeWidth">
+              <value>0.35</value>
+            </prop>
+            <prop oor:name="RelativeHeight">
+              <value>0.35</value>
+            </prop>
+          </node>
+          <node oor:name="ToolBar" oor:op="replace">
+            <prop oor:name="PaneURL">
+              <value>private:resource/pane/Presenter/Pane4</value>
+            </prop>
+            <prop oor:name="ViewURL">
+              <value>private:resource/view/Presenter/ToolBar</value>
+            </prop>
+            <prop oor:name="RelativeX">
+              <value>0.60</value>
+            </prop>
+            <prop oor:name="RelativeY">
+              <value>0.45</value>
+            </prop>
+            <prop oor:name="RelativeWidth">
+              <value>0.25</value>
+            </prop>
+            <prop oor:name="RelativeHeight">
+              <value>0.1</value>
+            </prop>
+          </node>
+          <node oor:name="NotesView" oor:op="replace">
+            <prop oor:name="PaneURL">
+              <value>private:resource/pane/Presenter/Pane3</value>
+            </prop>
+            <prop oor:name="ViewURL">
+              <value>private:resource/view/Presenter/Notes</value>
+            </prop>
+            <prop oor:name="RelativeX">
+              <value>0.05</value>
+            </prop>
+            <prop oor:name="RelativeY">
+              <value>0.60</value>
+            </prop>
+            <prop oor:name="RelativeWidth">
+              <value>0.9</value>
+            </prop>
+            <prop oor:name="RelativeHeight">
+              <value>0.35</value>
+            </prop>
+          </node>
+          <node oor:name="SlideSorter" oor:op="replace">
+            <prop oor:name="PaneURL">
+              <value>private:resource/pane/Presenter/Overlay</value>
+            </prop>
+            <prop oor:name="ViewURL">
+              <value>private:resource/view/Presenter/SlideSorter</value>
+            </prop>
+            <prop oor:name="RelativeX">
+              <value>0.05</value>
+            </prop>
+            <prop oor:name="RelativeY">
+              <value>0.05</value>
+            </prop>
+            <prop oor:name="RelativeWidth">
+              <value>0.95</value>
+            </prop>
+            <prop oor:name="RelativeHeight">
+              <value>0.8</value>
+            </prop>
+          </node>
+          <node oor:name="HelpView" oor:op="replace">
+            <prop oor:name="PaneURL">
+              <value>private:resource/pane/Presenter/Pane6</value>
+            </prop>
+            <prop oor:name="ViewURL">
+              <value>private:resource/view/Presenter/Help</value>
+            </prop>
+            <prop oor:name="RelativeX">
+              <value>0.05</value>
+            </prop>
+            <prop oor:name="RelativeY">
+              <value>0.05</value>
+            </prop>
+            <prop oor:name="RelativeWidth">
+              <value>0.95</value>
+            </prop>
+            <prop oor:name="RelativeHeight">
+              <value>0.8</value>
+            </prop>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node oor:name="Accessibility">
+      <node oor:name="Console" oor:op="replace">
+        <prop oor:name="String">
+          <value xml:lang="en-US">Presenter Console</value>
+        </prop>
+      </node>
+      <node oor:name="Preview" oor:op="replace">
+        <prop oor:name="String">
+          <value xml:lang="en-US">Current Slide Info</value>
+        </prop>
+      </node>
+      <node oor:name="Notes" oor:op="replace">
+        <prop oor:name="String">
+          <value xml:lang="en-US">Presenter Notes</value>
+        </prop>
+      </node>
+    </node>
+  </node>
+</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
index 36ec36b..33d8146 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 .
  -->
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
-<oor:component-data oor:name="ProtocolHandler" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<oor:component-data oor:name="ProtocolHandler"
+    oor:package="org.openoffice.Office"
+    xmlns:install="http://openoffice.org/2004/installation"
+    xmlns:oor="http://openoffice.org/2001/registry">
   <node oor:name="HandlerSet">
     <node oor:name="com.sun.star.comp.sfx2.SfxMacroLoader" oor:op="replace">
       <prop oor:name="Protocols">
@@ -59,5 +62,11 @@
         <value>vnd.sun.star.findbar:*</value>
       </prop>
     </node>
+    <node oor:name="org.libreoffice.comp.PresenterScreenProtocolHandler"
+        oor:op="replace" install:module="impress">
+      <prop oor:name="Protocols">
+        <value>vnd.org.libreoffice.presenterscreen:*</value>
+      </prop>
+    </node>
   </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 3d8512a..0fadef2 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -791,6 +791,11 @@
             <prop oor:name="MigrationService">
               <value>com.sun.star.migration.Extensions</value>
             </prop>
+            <prop oor:name="ExcludedExtensions">
+              <value>
+                <it>com.sun.PresenterScreen-*</it>
+              </value>
+            </prop>
           </node>
           <node oor:name="Inet" oor:op="replace">
             <prop oor:name="IncludedNodes">
diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk
index 2280f1c..1f6fbfa 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 0000000..eb4e6ae
--- /dev/null
+++ b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
@@ -0,0 +1,460 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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 .
+ -->

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list