diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-06-29 16:54:31 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-07-01 16:35:13 +0200 |
| commit | c540483134482d437ea6e02390ff429f4300cbb0 (patch) | |
| tree | f0dedf9d6f042b4823a8e53aee328d755426586b /sfx2 | |
| parent | b551604a81d6cd5ab9b85d56c57a97f4abc457fd (diff) | |
configure: add a --with-product-flavor switch
Defaults to Personal to point out this is supported by volunteers.
This affects the splash screen, the window title, the about dialog and
the start center.
Change-Id: I216a7f547618377ed268454ebfd2801c4c3901b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97427
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 12 | ||||
| -rw-r--r-- | sfx2/source/dialog/backingwindow.hxx | 2 | ||||
| -rw-r--r-- | sfx2/uiconfig/ui/startcenter.ui | 17 |
3 files changed, 31 insertions, 0 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 3b85a2e374e4..d571b2131f3c 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -53,6 +53,7 @@ #include <com/sun/star/task/InteractionHandler.hpp> #include <officecfg/Office/Common.hxx> +#include <sfx2/app.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -87,6 +88,8 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) : get(mpDBAllButton, "database_all"); get(mpMathAllButton, "math_all"); + get(mpBrandImage, "imBrand"); + get(mpHelpButton, "help"); //set an alternative help label that doesn't hotkey the H of the Help menu mpHelpButton->SetText(get<Window>("althelplabel")->GetText()); @@ -181,6 +184,7 @@ void BackingWindow::dispose() mpDrawAllButton.clear(); mpDBAllButton.clear(); mpMathAllButton.clear(); + mpBrandImage.clear(); mpHelpButton.clear(); mpExtensionsButton.clear(); mpAllButtonsBox.clear(); @@ -247,6 +251,14 @@ void BackingWindow::initControls() setupButton( mpDrawAllButton ); setupButton( mpCalcAllButton ); setupButton( mpDBAllButton ); + + BitmapEx aBitmap; + long nWidth = mpWriterAllButton->get_preferred_size().getWidth(); + if (SfxApplication::loadBrandSvg("shell/logo_flavor", aBitmap, nWidth)) + { + mpBrandImage->SetImage(Image(aBitmap)); + } + setupButton( mpImpressAllButton ); setupButton( mpMathAllButton ); diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 15ab2fe0728f..dc1a5be84146 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -24,6 +24,7 @@ #include <vcl/builder.hxx> #include <vcl/button.hxx> +#include <vcl/fixed.hxx> #include <vcl/layout.hxx> #include <vcl/menubtn.hxx> @@ -65,6 +66,7 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer VclPtr<PushButton> mpDBAllButton; VclPtr<PushButton> mpMathAllButton; + VclPtr<FixedImage> mpBrandImage; VclPtr<PushButton> mpHelpButton; VclPtr<PushButton> mpExtensionsButton; diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 9bfdac820e73..9e309f397b94 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -397,6 +397,23 @@ <property name="position">14</property> </packing> </child> + <child> + <object class="GtkImage" id="imBrand"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">end</property> + <property name="margin_top">24</property> + <property name="margin_bottom">24</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">15</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> |