summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-06-29 16:54:31 +0200
committerMiklos Vajna <vmiklos@collabora.com>2020-07-01 19:38:59 +0200
commitfd94276fbbd3632b2241133900b995d75f9b14fc (patch)
tree741acb4a8bb45bd0facc0d41281b0cda932eded4 /cui
parent3bd01dc22c18acbca14b52bb982e7effd5a2b8a8 (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. (cherry picked from commit c540483134482d437ea6e02390ff429f4300cbb0) Change-Id: I216a7f547618377ed268454ebfd2801c4c3901b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97638 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/about.cxx9
-rw-r--r--cui/source/inc/about.hxx1
2 files changed, 10 insertions, 0 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 53f05d52b2e1..c4e88e37dd73 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -32,6 +32,8 @@
#include <dialmgr.hxx> //CuiResId
#include <i18nlangtag/languagetag.hxx>
#include <sfx2/app.hxx> //SfxApplication::loadBrandSvg
+#include <sfx2/sfxresid.hxx>
+#include <sfx2/strings.hrc>
#include <strings.hrc>
#include <svtools/langhelp.hxx>
#include <unotools/bootstrap.hxx> //utl::Bootstrap::getBuildVersion
@@ -65,6 +67,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pUILabel(m_xBuilder->weld_label("lbUIString")),
m_pLocaleLabel(m_xBuilder->weld_label("lbLocaleString")),
m_pMiscLabel(m_xBuilder->weld_label("lbMiscString")),
+ m_pAboutLabel(m_xBuilder->weld_label("lbAbout")),
m_pCopyrightLabel(m_xBuilder->weld_label("lbCopyright")) {
// Labels
@@ -87,6 +90,12 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pUILabel->set_label(Application::GetHWOSConfInfo(2));
m_pLocaleLabel->set_label(GetLocaleString());
m_pMiscLabel->set_label(GetMiscString());
+
+ if (std::string_view(PRODUCTFLAVOR) == "Personal")
+ {
+ m_pAboutLabel->set_label(SfxResId(STR_PERSONALDESC));
+ }
+
m_pCopyrightLabel->set_label(GetCopyrightString());
// Images
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 2262da38de96..37d1710a7f93 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -40,6 +40,7 @@ private:
std::unique_ptr<weld::Label> m_pUILabel;
std::unique_ptr<weld::Label> m_pLocaleLabel;
std::unique_ptr<weld::Label> m_pMiscLabel;
+ std::unique_ptr<weld::Label> m_pAboutLabel;
std::unique_ptr<weld::Label> m_pCopyrightLabel;
static OUString GetVersionString();