Resolves tdf#139343 and tdf#139335 - Community/Enterprise flavor

* Switch CE/EE per --disable-community-flavor
internally use HAVE_FEATURE_COMMUNITY_FLAVOR
* Version info in about dialog shows text depending
on this flavor
* Start center also shows the brand image now
* TDF builds use a brand image with TDF tagline in
the about dialog
* Brand images with just "Community" (no Edition)

Change-Id: I363dd2b39df9aad951c9d79addf9bdedfc4a3495
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108980
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 2d69acfde50cb0e06a9a057939078fd102d371a3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109274
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

2 files changed, 113 insertions, 115 deletions

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 021e9e4c8856..d4e3d80de876 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -28,6 +28,7 @@
 #include <unotools/resmgr.hxx> //Translate
 
 #include <config_buildid.h> //EXTRA_BUILDID
+#include <config_features.h>
 #include <dialmgr.hxx>      //CuiResId
 #include <i18nlangtag/languagetag.hxx>
 #include <sfx2/app.hxx> //SfxApplication::loadBrandSvg
@@ -152,6 +153,11 @@ OUString AboutDialog::GetVersionString() {
 #elif defined(_WIN32)
   sVersion += " (x86)";
 #endif
+
+#if HAVE_FEATURE_COMMUNITY_FLAVOR
+  sVersion += " / LibreOffice Community";
+#endif
+
   return sVersion;
 }
 
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index cae222379f01..284257980cf5 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkImage" id="imCopy">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="stock">gtk-copy</property>
   </object>
   <object class="GtkDialog" id="AboutDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">6</property>
     <property name="title" translatable="yes" context="aboutdialog|AboutDialog">About %PRODUCTNAME</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
+    <property name="window-position">center-on-parent</property>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="margin_top">12</property>
+            <property name="can-focus">False</property>
+            <property name="margin-top">12</property>
             <property name="hexpand">True</property>
-            <property name="layout_style">end</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="btnClose">
                 <property name="label">gtk-close</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-underline">True</property>
+                <property name="use-stock">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
                 <property name="position">3</property>
               </packing>
             </child>
@@ -46,64 +46,63 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <!-- n-columns=1 n-rows=1 -->
+          <!-- n-columns=2 n-rows=7 -->
           <object class="GtkGrid">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="row_spacing">6</property>
+            <property name="row-spacing">6</property>
             <child>
               <object class="GtkImage" id="imAbout">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="margin_left">12</property>
-                <property name="margin_right">24</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">24</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="height">6</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
+                <property name="height">7</property>
               </packing>
             </child>
             <child>
               <object class="GtkImage" id="imBrand">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="margin_left">30</property>
-                <property name="margin_top">24</property>
-                <property name="margin_bottom">24</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="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=2 n-rows=6 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">start</property>
-                <property name="margin_start">6</property>
-                <property name="column_spacing">12</property>
+                <property name="margin-start">6</property>
+                <property name="column-spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="lbVersion">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="label" translatable="yes" context="aboutdialog|lbVersion">Version:</property>
                     <property name="wrap">True</property>
@@ -113,14 +112,14 @@
                     </accessibility>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lbBuild">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="label" translatable="yes" context="aboutdialog|lbBuild">Build:</property>
                     <property name="xalign">0</property>
@@ -129,14 +128,14 @@
                     </accessibility>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lbEnvironment">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="label" translatable="yes" context="aboutdialog|lbEnvironment">Environment:</property>
                     <property name="xalign">0</property>
@@ -145,15 +144,14 @@
                     </accessibility>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lbVersionString">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xpad">6</property>
+                    <property name="can-focus">False</property>
                     <property name="label">7.0</property>
                     <property name="xalign">0</property>
                     <accessibility>
@@ -161,15 +159,14 @@
                     </accessibility>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lbEnvString">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xpad">6</property>
+                    <property name="can-focus">False</property>
                     <property name="label">8 cores</property>
                     <property name="xalign">0</property>
                     <accessibility>
@@ -177,31 +174,34 @@
                     </accessibility>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLinkButton" id="lbBuildString">
                     <property name="label">0815</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                     <property name="relief">none</property>
                     <property name="xalign">0</property>
                     <accessibility>
                       <relation type="labelled-by" target="lbBuild"/>
                     </accessibility>
+                    <style>
+                      <class name="small-button"/>
+                    </style>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lbMisc">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="label" translatable="yes" context="aboutdialog|lbExtra">Misc:</property>
                     <property name="xalign">0</property>
@@ -211,32 +211,31 @@
                     </accessibility>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">5</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">5</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lbMiscString">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xpad">6</property>
+                    <property name="can-focus">False</property>
                     <property name="label">Calc</property>
                     <property name="wrap">True</property>
-                    <property name="max_width_chars">25</property>
+                    <property name="max-width-chars">25</property>
                     <property name="xalign">0</property>
                     <accessibility>
                       <relation type="labelled-by" target="lbMisc"/>
                     </accessibility>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">5</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">5</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lbLocale">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="label" translatable="yes" context="aboutdialog|lbLocale">Locale:</property>
                     <property name="xalign">0</property>
@@ -245,15 +244,14 @@
                     </accessibility>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">4</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">4</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lbLocaleString">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xpad">6</property>
+                    <property name="can-focus">False</property>
                     <property name="label">English</property>
                     <property name="xalign">0</property>
                     <accessibility>
@@ -261,14 +259,14 @@
                     </accessibility>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">4</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">4</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lbUI">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="aboutdialog|lbUI">User Interface:</property>
                     <property name="xalign">0</property>
                     <accessibility>
@@ -276,15 +274,14 @@
                     </accessibility>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lbUIString">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xpad">6</property>
+                    <property name="can-focus">False</property>
                     <property name="label">VCL: gtk</property>
                     <property name="xalign">0</property>
                     <accessibility>
@@ -292,67 +289,62 @@
                     </accessibility>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">5</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">6</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="lbAbout">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="valign">end</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="label" translatable="yes" context="aboutdialog|description">%PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">60</property>
                 <property name="xalign">0</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="lbCopyright">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="valign">start</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="label" context="aboutdialog|copyright">This release was supplied by The Document Foundation.
-Copyright (c) 1980-2021 LibreOffice contributors.
-LibreOffice was based on OpenOffice.org</property>
+                <property name="label" context="aboutdialog|copyright">%COPYRIGHT</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">60</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLinkButton" id="btnCredits">
                     <property name="label" translatable="yes" context="aboutdialog|credits">Credits</property>
                     <property name="name">lbCredit</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                     <property name="relief">none</property>
                     <property name="xalign">0</property>
                   </object>
@@ -366,8 +358,8 @@ LibreOffice was based on OpenOffice.org</property>
                   <object class="GtkLinkButton" id="btnWebsite">
                     <property name="label" translatable="yes" context="aboutdialog|website">Website</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                     <property name="relief">none</property>
                     <property name="xalign">0</property>
                     <property name="uri">https://www.libreoffice.org/</property>
@@ -382,8 +374,8 @@ LibreOffice was based on OpenOffice.org</property>
                   <object class="GtkLinkButton" id="btnReleaseNotes">
                     <property name="label" translatable="yes" context="aboutdialog|releasenotes">Release Notes</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                     <property name="relief">none</property>
                     <property name="xalign">0</property>
                   </object>
@@ -395,22 +387,22 @@ LibreOffice was based on OpenOffice.org</property>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">4</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="lbVersionInfo">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="aboutdialog|lbVersionInfo">Version Information</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">btnCopyVersion</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">btnCopyVersion</property>
                     <property name="xalign">0</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -425,9 +417,9 @@ LibreOffice was based on OpenOffice.org</property>
                 <child>
                   <object class="GtkButton" id="btnCopyVersion">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes" context="aboutdialog|btnCopyVersionTooltip">Copy all version information in English</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="tooltip-text" translatable="yes" context="aboutdialog|btnCopyVersionTooltip">Copy all version information in English</property>
                     <property name="image">imCopy</property>
                     <accelerator key="c" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                   </object>
@@ -439,10 +431,13 @@ LibreOffice was based on OpenOffice.org</property>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">5</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -455,8 +450,5 @@ LibreOffice was based on OpenOffice.org</property>
     <action-widgets>
       <action-widget response="-7">btnClose</action-widget>
     </action-widgets>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </object>
 </interface>