config_host/config_buildid.h.in | 1
configure.ac | 16 ++++
cui/source/dialogs/about.cxx | 9 ++
cui/source/inc/about.hxx | 1
framework/source/fwe/helper/titlehelper.cxx | 7 ++
icon-themes/colibre/brand/intro-highres.png |binary
icon-themes/colibre/brand/intro.png |binary
icon-themes/colibre/brand/shell/logo.svg | 2
icon-themes/colibre/brand/shell/logo_flavor.svg | 71 ++++++++++++++++++++++
icon-themes/colibre/brand/shell/logo_inverted.svg | 2
include/sfx2/strings.hrc | 1
sfx2/source/dialog/backingwindow.cxx | 12 +++
sfx2/source/dialog/backingwindow.hxx | 2
sfx2/uiconfig/ui/startcenter.ui | 17 +++++
14 files changed, 138 insertions(+), 3 deletions(-)
New commits:
commit fd94276fbbd3632b2241133900b995d75f9b14fc
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jun 29 16:54:31 2020 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Jul 1 19:38:59 2020 +0200
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 <vmik...@collabora.com>
diff --git a/config_host/config_buildid.h.in b/config_host/config_buildid.h.in
index 04f03b83543a..d9663cb3f8f0 100644
--- a/config_host/config_buildid.h.in
+++ b/config_host/config_buildid.h.in
@@ -6,5 +6,6 @@ Optional Build ID displayed in the about dialog
#define CONFIG_BUILDID_H
#undef EXTRA_BUILDID
+#undef PRODUCTFLAVOR
#endif
diff --git a/configure.ac b/configure.ac
index 4243c7242120..e5591d3eabae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1481,6 +1481,11 @@ AC_ARG_WITH(product-name,
[Define the product name. Default is AC_PACKAGE_NAME.]),
,with_product_name=$PRODUCTNAME)
+AC_ARG_WITH(product-flavor,
+ AS_HELP_STRING([--with-product-flavor='My Own Personal Flavor'],
+ [Define the product flavor. Default is Personal.]),
+,with_product_flavor=Personal)
+
AC_ARG_WITH(package-version,
AS_HELP_STRING([--with-package-version='3.1.4.5'],
[Define the package version. Default is AC_PACKAGE_VERSION. Use only
if you distribute an own build for macOS.]),
@@ -2343,6 +2348,15 @@ fi
AC_SUBST(ENABLE_RELEASE_BUILD)
AC_SUBST(GET_TASK_ALLOW_ENTITLEMENT)
+AC_MSG_CHECKING([for product flavor])
+if test "$with_product_flavor" = "no"; then
+ PRODUCTFLAVOR=""
+elif test -n "$with_product_flavor"; then
+ PRODUCTFLAVOR="$with_product_flavor"
+fi
+AC_MSG_RESULT([$PRODUCTFLAVOR])
+AC_DEFINE_UNQUOTED([PRODUCTFLAVOR], ["$PRODUCTFLAVOR"])
+
dnl ===================================================================
dnl Test whether to sign Windows Build
dnl ===================================================================
@@ -12775,7 +12789,7 @@ dnl
===================================================================
AC_MSG_CHECKING([for alternative branding images directory])
# initialize mapped arrays
BRAND_INTRO_IMAGES="intro.png intro-highres.png"
-brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg about.svg"
+brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg logo_flavor.svg
about.svg"
if test -z "$with_branding" -o "$with_branding" = "no"; then
AC_MSG_RESULT([none])
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();
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index fba89ae42bfc..d02287da16b4 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_buildid.h>
#include <config_features.h>
#include <framework/titlehelper.hxx>
@@ -516,6 +517,12 @@ void TitleHelper::impl_updateTitleForFrame (const
css::uno::Reference< css::fram
// fdo#70376: We want the window title to contain just the
// document name (from the above "component title").
impl_appendProductName (sTitle);
+
+ if (!std::string_view(PRODUCTFLAVOR).empty())
+ {
+ sTitle.append(" " PRODUCTFLAVOR);
+ }
+
impl_appendModuleName (sTitle);
impl_appendDebugVersion (sTitle);
#endif
diff --git a/icon-themes/colibre/brand/intro-highres.png
b/icon-themes/colibre/brand/intro-highres.png
index 44fcca26a248..303190c9aab6 100644
Binary files a/icon-themes/colibre/brand/intro-highres.png and
b/icon-themes/colibre/brand/intro-highres.png differ
diff --git a/icon-themes/colibre/brand/intro.png
b/icon-themes/colibre/brand/intro.png
index 9f394337441b..d341eb2b4d38 100644
Binary files a/icon-themes/colibre/brand/intro.png and
b/icon-themes/colibre/brand/intro.png differ
diff --git a/icon-themes/colibre/brand/shell/logo.svg
b/icon-themes/colibre/brand/shell/logo.svg
index e7381d3f6614..eb438b99a19c 100644
--- a/icon-themes/colibre/brand/shell/logo.svg
+++ b/icon-themes/colibre/brand/shell/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg"; stroke-linejoin="round"
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid"
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2"><g
class="SlideGroup"><path fill="#18a303" d="M2121.35
79.926v1032.38h666.052V955.784h-462.906V79.926zm795.163
1034.045h204.811V369.66h-204.81zm103.238-807.587c63.275 0 116.56-51.619
116.56-118.224 0-63.275-53.285-116.559-116.56-116.559-66.605 0-118.224
53.284-118.224 116.559 0 66.605 51.62 118.224 118.224 118.224zm454.58
149.861h-3.33V16.651h-203.146v1095.655h199.816l3.33-86.587h3.33c63.274 71.601
128.214 101.573 231.452 101.573 198.151 0 328.031-178.169 328.031-399.63
0-214.802-116.559-372.99-318.04-372.99-108.233 0-171.508 31.638-241.443
101.573zm-3.33 268.086c0-128.215 58.28-213.137 166.513-213.137 121.554 0
183.164 86.587 183.164 228.123 0 139.871-59.944 231.453-179.833 231.453-104.903
0-169.843-81.59-169.843-213.137zm1107.311-371.324c-96.577 6.66-189.824
64.94-233.118
148.197h-1.66l-4.99-133.211h-199.815v744.313h204.81V830.9c0-148.196
26.643-201.48 73.266-234.783 41.628-29.972 89.917-41.628
156.522-44.958zm745.978 343.017c0-184.83-113.23-343.017-306.384-343.017-234.783
0-384.645 161.518-384.645 406.292 0 239.778 154.857 367.993 384.645 367.993
108.232 0 183.164-16.65 254.765-49.954l-21.647-151.527c-66.605 28.308-134.875
44.96-208.141 44.96-123.22 0-201.481-56.615-209.807-173.174H5314.3c6.66-26.643
9.99-69.936 9.99-101.573zM4996.258 509.53c88.253 0 129.88 71.601 131.545
148.197h-286.401c14.987-84.922 74.93-148.197 154.856-148.197z"/><path
d="M5937.056 64.94c-271.416 0-496.207 199.815-496.207 531.176 0 331.361 224.791
531.176 496.207 531.176 274.746 0 497.874-199.815 497.874-531.176
0-331.361-223.128-531.176-497.874-531.176zm0 103.238c204.811 0 358.004 153.192
358.004 427.938 0 276.411-153.193 427.938-358.004 427.938-201.48
0-356.338-151.527-356.338-427.938 0-274.746 154.857-427.938
356.338-427.938zm691.03 159.852v46.624h-119.89v96.577h119.89v639.
41H6756.3v-639.41h188.159v-96.577h-188.16v-66.605c0-133.21 54.95-211.471
158.188-211.471 46.625 0 76.597 8.32 104.904 18.316l13.32-93.247C7004.405 9.991
6952.785 0 6912.82 0c-181.497 0-284.735 116.559-284.735 328.03z"/><path
d="M7049.363
328.03v46.624h-119.89v96.577h119.89v639.41h128.214v-639.41h188.16v-96.577h-188.16v-66.605c0-133.21
54.95-211.471 158.189-211.471 46.623 0 76.595 8.32 104.903
18.316l13.32-93.247C7427.349 9.991 7375.729 0 7334.1 0c-181.498 0-284.736
116.559-284.736 328.03zm514.157
784.276h129.88V374.654h-129.88zm64.94-845.885c44.959 0 79.927-34.968
79.927-78.261 0-44.959-34.968-79.927-79.927-79.927-44.958 0-79.925
34.968-79.925 79.927 0 43.293 34.967 78.261 79.925 78.261zm326.366
474.561c0-186.494 111.563-283.072 256.429-283.072 74.932 0 141.536 16.652
196.486
43.294l13.32-98.243c-46.622-21.647-119.888-43.293-199.815-43.293-228.123
0-399.631 138.205-399.631 397.965 0 243.11 154.857 369.66 359.668 369.66 91.583
0 156.522-9.99 231.453-43.294l-11.655-96.578c-64.941 29.9
73-133.212 43.294-196.485 43.294-148.197
0-249.77-93.248-249.77-289.733zm1182.241 31.638c3.33-26.642 4.99-49.954
4.99-73.266 0-188.16-99.908-339.686-289.732-339.686-204.811 0-354.672
171.508-354.672 397.965 0 249.77 149.86 369.66 354.672 369.66 91.582 0
159.852-13.322 231.452-43.294l-11.655-96.578c-56.615 26.642-138.206
43.294-201.481 43.294-146.531
0-243.11-89.917-244.774-258.095zm-294.728-314.71c111.563 0 173.173 91.582
173.173 214.802h-384.645c18.317-129.88 89.917-214.802
211.472-214.802zM1042.371.001c-16.652 0-33.303 9.99-39.964 26.642-6.66
14.986-3.33 33.302 8.33 44.958l366.329 366.328c11.656 13.322 29.972 16.652
46.623 9.99 14.986-6.66 26.642-21.646
26.642-38.298V41.628c0-21.647-19.982-41.628-43.293-41.628zm0 0zm-999.077
0C19.982.001 0 19.982 0 43.294v1666.794c0 21.646 19.982 41.628 43.294
43.293h1363.74c21.646 0 41.628-21.647
41.628-43.293V636.08c0-11.656-3.33-21.647-11.656-29.973L847.551 13.322C839.221
4.992 827.569.001 815.913.001zm41.628 86.586h712.675l566.143 567.809v1012
.398H84.922zm0 0z"/><g style="line-height:1.25" aria-label="Community Edition"
font-weight="400" font-size="652.639" font-family="Vegur" letter-spacing="0"
word-spacing="0" stroke-width="746.707"><path
style="-inkscape-font-specification:'Vegur,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
d="M2496.111 1682.534c-37.853 18.927-73.095 26.758-118.127 26.758-87.454
0-169.686-58.084-169.686-185.349 0-122.044 88.106-182.739 171.644-182.739
50.253 0 87.453 9.137 122.043
29.369l3.916-48.948c-27.41-16.969-70.485-27.41-122.696-27.41-116.17 0-234.95
73.095-234.95 234.296 0 143.581 95.285 227.771 222.55 227.771 48.295 0
90.717-6.526 129.875-25.452zM2694.513 1431.268c-88.76 0-144.886 65.264-144.886
162.507 0 97.244 56.127 162.507 144.886 162.507 88.759 0 144.886-65.263
144.886-162.507 0-97.243-56.127-162.507-144.886-162.507zm0 43.074c56.78 0
86.148 52.212 86.148 119.433 0 67.222-29.369 119.433-86.148 119.433-56.78 0-86
.149-52.21-86.149-119.433 0-67.221 29.37-119.433 86.149-119.433zM2958.178
1437.795h-48.295v311.961h53.516v-174.255c0-54.168 30.674-97.243 70.485-97.243
45.685 0 62 33.285 62 79.622v191.876h53.517v-174.255c0-54.168 30.674-97.243
70.485-97.243 45.685 0 62 33.285 62
79.622v191.876h53.517v-207.54c0-62.652-30.674-110.948-96.59-110.948-40.464
0-73.749 20.885-95.938 65.917-11.748-39.158-41.117-65.917-90.064-65.917-38.506
0-74.401 20.232-90.717 63.959zM3472.456
1437.795h-48.295v311.961h53.516v-174.255c0-54.168 30.674-97.243 70.485-97.243
45.685 0 62.001 33.285 62.001 79.622v191.876h53.516v-174.255c0-54.168
30.674-97.243 70.485-97.243 45.685 0 62.001 33.285 62.001
79.622v191.876h53.517v-207.54c0-62.652-30.674-110.948-96.591-110.948-40.464
0-73.748 20.885-95.938 65.917-11.747-39.158-41.116-65.917-90.064-65.917-38.506
0-74.401 20.232-90.717 63.959zM4188.4 1437.795h-53.516v174.254c0 54.17-34.59
97.243-76.36 97.243-48.947
0-69.179-34.59-69.179-78.969v-192.528h-53.516v208.191c0 63.96 36.547 110.2
96 103.77 110.296 37.852 0 78.969-19.579 96.59-65.263l3.916
58.737h48.295zM4328.064 1437.795h-48.295v311.961h53.516v-174.255c0-54.168
34.59-97.243 76.359-97.243 48.948 0 69.18 34.59 69.18
78.97v192.528h53.516v-208.192c0-63.958-36.548-110.296-103.77-110.296-37.853
0-78.969 19.58-96.59 65.264zM4647.856 1323.583c-18.274 0-33.284 15.01-33.284
33.284s15.01 33.285 33.284 33.285 33.285-15.01
33.285-33.285c0-18.274-15.01-33.284-33.285-33.284zm-26.758
426.173h53.516v-311.961h-53.516zM4839.078
1440.405v-82.232h-53.516v82.232h-48.948v41.77h48.948v181.433c0 67.874 36.548
92.675 88.759 92.675 18.274 0 37.2-3.916 48.948-9.79l-2.61-39.811c-11.096
4.568-22.843 5.874-34.59 5.874-28.064
0-46.99-16.316-46.99-52.864v-177.518h84.19v-41.769zM5233.924
1437.795h-58.085l-85.495 261.055-84.844-261.055h-61.348l116.823 317.182c-15.664
44.38-50.906 72.443-98.549 89.412l18.927 45.684c62-17.62 110.948-69.18
137.054-140.317zM5674.455
1350.341v-46.99H5435.59v446.405h241.477v-46.99h-187.96v-155.98h164.465v-46.99h-16
4.465V1350.34zM6011.216
1270.066H5957.7v216.024c-11.748-31.327-45.685-54.822-88.107-54.822-82.885
0-142.275 68.527-142.275 166.423 0 94.633 54.17 158.591 133.791 158.591 45.032
0 78.97-25.452 97.896-63.305l3.916 56.78h48.295zm-53.516 343.941c0 54.17-42.422
95.938-85.496 95.938-56.127 0-86.148-52.211-86.148-114.864 0-73.096
37.853-118.78 88.106-118.78 46.99 0 83.538 45.032 83.538 103.769zM6129.343
1323.583c-18.274 0-33.284 15.01-33.284 33.284s15.01 33.285 33.284 33.285
33.285-15.01 33.285-33.285c0-18.274-15.01-33.284-33.285-33.284zm-26.758
426.173h53.517v-311.961h-53.517zM6320.565
1440.405v-82.232h-53.516v82.232H6218.1v41.77h48.948v181.433c0 67.874 36.548
92.675 88.759 92.675 18.274 0 37.2-3.916 48.948-9.79l-2.611-39.811c-11.095
4.568-22.842 5.874-34.59 5.874-28.063
0-46.99-16.316-46.99-52.864v-177.518h84.191v-41.769zM6492.862 1323.583c-18.274
0-33.285 15.01-33.285 33.284s15.011 33.285 33.285 33.285c18.273 0 33.284-15.01
33.284-33.285 0-18.274-15.011-33.284-33.284-33.284zm-26.759 426
.173h53.517v-311.961h-53.517zM6734.989 1431.268c-88.759 0-144.886
65.264-144.886 162.507 0 97.244 56.127 162.507 144.886 162.507 88.759 0
144.886-65.263 144.886-162.507 0-97.243-56.127-162.507-144.886-162.507zm0
43.074c56.78 0 86.148 52.212 86.148 119.433 0 67.222-29.368 119.433-86.148
119.433s-86.148-52.21-86.148-119.433c0-67.221 29.368-119.433
86.148-119.433zM6998.655 1437.795h-48.296v311.961h53.517v-174.255c0-54.168
34.59-97.243 76.358-97.243 48.948 0 69.18 34.59 69.18
78.97v192.528h53.517v-208.192c0-63.958-36.548-110.296-103.77-110.296-37.853
0-78.969 19.58-96.591 65.264z"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg"; version="1.2" width="345.611"
height="71.5" viewBox="0 0 9144.293 1891.771" preserveAspectRatio="xMidYMid"
fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round"><g
class="SlideGroup"><path d="M2121.35
79.926v1032.38h666.052V955.784h-462.906V79.926zm795.163
1034.045h204.811V369.66h-204.81zm103.238-807.587c63.275 0 116.56-51.619
116.56-118.224 0-63.275-53.285-116.559-116.56-116.559-66.605 0-118.224
53.284-118.224 116.559 0 66.605 51.62 118.224 118.224 118.224zm454.58
149.861h-3.33V16.651h-203.146v1095.655h199.816l3.33-86.587h3.33c63.274 71.601
128.214 101.573 231.452 101.573 198.151 0 328.031-178.169 328.031-399.63
0-214.802-116.559-372.99-318.04-372.99-108.233 0-171.508 31.638-241.443
101.573zm-3.33 268.086c0-128.215 58.28-213.137 166.513-213.137 121.554 0
183.164 86.587 183.164 228.123 0 139.871-59.944 231.453-179.833 231.453-104.903
0-169.843-81.59-169.843-213.137zm1107.311-371.324c-96.577 6.66-189.824
64.94-233.118 148.197h-1.66l
-4.99-133.211h-199.815v744.313h204.81V830.9c0-148.196 26.643-201.48
73.266-234.783 41.628-29.972 89.917-41.628 156.522-44.958zm745.978
343.017c0-184.83-113.23-343.017-306.384-343.017-234.783 0-384.645
161.518-384.645 406.292 0 239.778 154.857 367.993 384.645 367.993 108.232 0
183.164-16.65 254.765-49.954l-21.647-151.527c-66.605 28.308-134.875
44.96-208.141 44.96-123.22 0-201.481-56.615-209.807-173.174H5314.3c6.66-26.643
9.99-69.936 9.99-101.573zM4996.258 509.53c88.253 0 129.88 71.601 131.545
148.197h-286.401c14.987-84.922 74.93-148.197 154.856-148.197z"
fill="#18a303"/><path d="M5937.056 64.94c-271.416 0-496.207 199.815-496.207
531.176 0 331.361 224.791 531.176 496.207 531.176 274.746 0 497.874-199.815
497.874-531.176 0-331.361-223.128-531.176-497.874-531.176zm0 103.238c204.811 0
358.004 153.192 358.004 427.938 0 276.411-153.193 427.938-358.004
427.938-201.48 0-356.338-151.527-356.338-427.938 0-274.746 154.857-427.938
356.338-427.938zm691.03 159.852v46.624h-119.89v96.577h119.89v639.
41H6756.3v-639.41h188.159v-96.577h-188.16v-66.605c0-133.21 54.95-211.471
158.188-211.471 46.625 0 76.597 8.32 104.904 18.316l13.32-93.247C7004.405 9.991
6952.785 0 6912.82 0c-181.497 0-284.735 116.559-284.735 328.03z"/><path
d="M7049.363
328.03v46.624h-119.89v96.577h119.89v639.41h128.214v-639.41h188.16v-96.577h-188.16v-66.605c0-133.21
54.95-211.471 158.189-211.471 46.623 0 76.595 8.32 104.903
18.316l13.32-93.247C7427.349 9.991 7375.729 0 7334.1 0c-181.498 0-284.736
116.559-284.736 328.03zm514.157
784.276h129.88V374.654h-129.88zm64.94-845.885c44.959 0 79.927-34.968
79.927-78.261 0-44.959-34.968-79.927-79.927-79.927-44.958 0-79.925
34.968-79.925 79.927 0 43.293 34.967 78.261 79.925 78.261zm326.366
474.561c0-186.494 111.563-283.072 256.429-283.072 74.932 0 141.536 16.652
196.486
43.294l13.32-98.243c-46.622-21.647-119.888-43.293-199.815-43.293-228.123
0-399.631 138.205-399.631 397.965 0 243.11 154.857 369.66 359.668 369.66 91.583
0 156.522-9.99 231.453-43.294l-11.655-96.578c-64.941 29.9
73-133.212 43.294-196.485 43.294-148.197
0-249.77-93.248-249.77-289.733zm1182.241 31.638c3.33-26.642 4.99-49.954
4.99-73.266 0-188.16-99.908-339.686-289.732-339.686-204.811 0-354.672
171.508-354.672 397.965 0 249.77 149.86 369.66 354.672 369.66 91.582 0
159.852-13.322 231.452-43.294l-11.655-96.578c-56.615 26.642-138.206
43.294-201.481 43.294-146.531
0-243.11-89.917-244.774-258.095zm-294.728-314.71c111.563 0 173.173 91.582
173.173 214.802h-384.645c18.317-129.88 89.917-214.802
211.472-214.802zM1042.371.001c-16.652 0-33.303 9.99-39.964 26.642-6.66
14.986-3.33 33.302 8.33 44.958l366.329 366.328c11.656 13.322 29.972 16.652
46.623 9.99 14.986-6.66 26.642-21.646
26.642-38.298V41.628c0-21.647-19.982-41.628-43.293-41.628zm0 0zm-999.077
0C19.982.001 0 19.982 0 43.294v1666.794c0 21.646 19.982 41.628 43.294
43.293h1363.74c21.646 0 41.628-21.647
41.628-43.293V636.08c0-11.656-3.33-21.647-11.656-29.973L847.551 13.322C839.221
4.992 827.569.001 815.913.001zm41.628 86.586h712.675l566.143 567.809v1012
.398H84.922zm0 0z"/><g aria-label="Community Edition"><g
style="line-height:1.25" aria-label="Personal Edition" font-size="664.081"
stroke-width="1" font-family="Vegur" font-weight="400" letter-spacing="0"
word-spacing="0"><path style="-inkscape-font-specification:'Vegur,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start"
d="M2122.41 1754.743h54.455V1568.8c11.29 1.328 19.259 1.992 29.884 1.992
96.956 0 181.294-47.814 181.294-146.098
0-75.04-56.447-133.48-166.02-133.48-29.22 0-61.096 2.656-99.612
9.961zm54.455-412.395c21.251-2.656 31.876-3.32 46.486-3.32 67.736 0 105.589
36.524 105.589 92.307 0 61.096-51.798 92.972-120.199 92.972-7.969
0-21.914-.665-31.876-1.993zM2644.377 1694.311c-22.579 13.946-52.462
23.243-80.354 23.243-63.752 0-96.956-31.212-100.276-102.932h198.56c1.992-10.626
2.656-17.267 2.656-27.228 0-86.33-33.868-156.723-116.214-156.723-85.666
0-142.113 67.736-142.113 173.99 0 103.596 56.
447 156.722 144.106 156.722 37.188 0 72.384-8.633
96.291-21.914zm-179.302-124.183c4.649-55.783 33.868-92.971 77.698-92.971 48.477
0 67.072 41.173 67.072 92.971zM2789.146
1437.312h-49.142v317.43h54.455V1576.77c0-61.76 25.235-96.292 64.416-96.292
11.953 0 21.25 1.328 31.211
3.985l2.657-49.142c-9.297-1.993-19.923-3.32-31.876-3.32-32.54 0-59.103
22.578-68.4 53.126zM2927.274 1746.774c25.235 9.96 49.142 14.61 77.033 14.61
67.737 0 122.855-34.533 122.855-95.628
0-47.814-26.563-74.377-86.994-93.636-26.564-8.633-46.486-21.914-46.486-53.126
0-25.235 22.579-43.165 53.127-43.165 28.555 0 53.79 6.64 70.392
16.602l3.32-46.486c-16.602-8.633-45.821-15.274-71.056-15.274-57.111 0-111.566
27.891-111.566 94.3 0 50.47 29.884 73.713 84.338 94.3 33.869 12.617 49.806
25.234 49.806 50.47 0 29.219-29.883 46.485-67.072 46.485-23.907
0-45.157-3.985-74.377-15.274zM3323.066 1430.671c-90.315 0-147.426
66.408-147.426 165.356s57.11 165.356 147.426 165.356c90.315 0 147.426-66.408
147.426-165.356s-57.111-165.356-147.
426-165.356zm0 43.83c57.775 0 87.659 53.126 87.659 121.526s-29.884
121.527-87.66 121.527c-57.774 0-87.658-53.126-87.658-121.527 0-68.4
29.884-121.526 87.659-121.526zM3591.354
1437.312h-49.142v317.43h54.454v-177.309c0-55.119 35.197-98.948 77.698-98.948
49.806 0 70.392 35.196 70.392
80.354v195.904h54.455V1542.9c0-65.08-37.189-112.23-105.589-112.23-38.517
0-80.354 19.923-98.284 66.408zM3904.135 1499.736c26.563-15.938 57.775-23.907
81.682-23.907 46.486 0 71.72 21.25 71.72
63.751v24.571c-11.953-2.656-29.219-3.984-44.493-3.984-76.37 0-138.793
36.524-138.793 108.91 0 61.759 45.158 92.306 92.972 92.306 41.837 0
72.385-19.258 90.979-53.79l5.977
47.15h47.813v-210.514c0-70.393-32.54-113.558-112.893-113.558-35.86 0-72.385
9.297-98.284 23.907zm153.403 132.152c0 52.462-35.197 86.994-73.05 86.994-30.547
0-51.797-20.586-51.797-53.126 0-38.517 34.532-65.08 85.666-65.08 13.946 0
28.555 1.328 39.18 3.984zM4256.761 1754.743v-488.1h-54.455v488.1zM4749.508
1348.325v-47.814h-243.054v454.232h245.71v-47.814
h-191.255v-158.715h167.348V1500.4H4560.91v-152.075zM5092.173
1266.643h-54.455v219.81c-11.953-31.875-46.485-55.782-89.65-55.782-84.34
0-144.77 69.729-144.77 169.34 0 96.293 55.118 161.373 136.136 161.373 45.822 0
80.354-25.9 99.612-64.416l3.985 57.775h49.142zm-54.455 349.97c0 55.12-43.165
97.62-86.994 97.62-57.111 0-87.66-53.126-87.66-116.877 0-74.378 38.517-120.863
89.652-120.863 47.814 0 85.002 45.821 85.002 105.589zM5212.37 1321.098c-18.593
0-33.867 15.274-33.867 33.868s15.274 33.868 33.868 33.868 33.868-15.274
33.868-33.868-15.274-33.868-33.868-33.868zm-27.226
433.645h54.454v-317.431h-54.454zM5406.945
1439.968v-83.674h-54.454v83.674h-49.806v42.501h49.806v184.615c0 69.064 37.188
94.3 90.315 94.3 18.594 0 37.852-3.985 49.806-9.962l-2.656-40.509c-11.29
4.649-23.243 5.977-35.197 5.977-28.555
0-47.814-16.602-47.814-53.79v-180.63h85.667v-42.502zM5582.262 1321.098c-18.594
0-33.868 15.274-33.868 33.868s15.274 33.868 33.868 33.868 33.868-15.274
33.868-33.868-15.274-33.868-33.868-33.868zm-
27.227 433.645h54.454v-317.431h-54.454zM5828.635 1430.671c-90.315 0-147.426
66.408-147.426 165.356s57.11 165.356 147.426 165.356c90.315 0 147.426-66.408
147.426-165.356s-57.111-165.356-147.426-165.356zm0 43.83c57.775 0 87.659 53.126
87.659 121.526s-29.884 121.527-87.66 121.527c-57.774
0-87.658-53.126-87.658-121.527 0-68.4 29.884-121.526 87.659-121.526zM6096.923
1437.312h-49.142v317.43h54.454v-177.309c0-55.119 35.197-98.948 77.698-98.948
49.806 0 70.393 35.196 70.393
80.354v195.904h54.454V1542.9c0-65.08-37.188-112.23-105.589-112.23-38.516
0-80.353 19.923-98.284 66.408z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre/brand/shell/logo_flavor.svg
b/icon-themes/colibre/brand/shell/logo_flavor.svg
new file mode 100644
index 000000000000..02c8263a9351
--- /dev/null
+++ b/icon-themes/colibre/brand/shell/logo_flavor.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.2"
+ width="158.07381"
+ height="18.69887"
+ viewBox="0 0 4182.3705 494.74097"
+ preserveAspectRatio="xMidYMid"
+ id="svg16"
+ sodipodi:docname="logo_flavor.svg"
+ style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"
+ inkscape:version="0.92.2 5c3e80d, 2017-08-06">
+ <metadata
+ id="metadata22">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs20" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1015"
+ id="namedview18"
+ showgrid="false"
+ inkscape:zoom="0.85356081"
+ inkscape:cx="122.46329"
+ inkscape:cy="30.821983"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg16" />
+ <g
+ id="g12"
+ aria-label="Community Edition"
+ transform="translate(-2122.41,-1266.643)">
+ <g
+ id="g10"
+ word-spacing="0"
+ letter-spacing="0"
+ font-weight="400"
+ font-size="664.081"
+ aria-label="Personal Edition"
+
style="font-weight:400;font-size:664.08099365px;line-height:1.25;font-family:Vegur;letter-spacing:0;word-spacing:0;stroke-width:1">
+ <path
+ inkscape:connector-curvature="0"
+ id="path8"
+ d="m 2122.41,1754.743 h 54.455 V 1568.8 c 11.29,1.328 19.259,1.992
29.884,1.992 96.956,0 181.294,-47.814 181.294,-146.098 0,-75.04 -56.447,-133.48
-166.02,-133.48 -29.22,0 -61.096,2.656 -99.612,9.961 z m 54.455,-412.395 c
21.251,-2.656 31.876,-3.32 46.486,-3.32 67.736,0 105.589,36.524 105.589,92.307
0,61.096 -51.798,92.972 -120.199,92.972 -7.969,0 -21.914,-0.665 -31.876,-1.993
z m 467.512,351.963 c -22.579,13.946 -52.462,23.243 -80.354,23.243 -63.752,0
-96.956,-31.212 -100.276,-102.932 h 198.56 c 1.992,-10.626 2.656,-17.267
2.656,-27.228 0,-86.33 -33.868,-156.723 -116.214,-156.723 -85.666,0
-142.113,67.736 -142.113,173.99 0,103.596 56.447,156.722 144.106,156.722
37.188,0 72.384,-8.633 96.291,-21.914 z m -179.302,-124.183 c 4.649,-55.783
33.868,-92.971 77.698,-92.971 48.477,0 67.072,41.173 67.072,92.971 z m
324.071,-132.816 h -49.142 v 317.43 h 54.455 V 1576.77 c 0,-61.76
25.235,-96.292 64.416,-96.292 11.953,0 21.25,1.328 31.211,3.985 l 2.657,-49.142
c -9.297,-1.993 -19.923,
-3.32 -31.876,-3.32 -32.54,0 -59.103,22.578 -68.4,53.126 z m 138.128,309.462 c
25.235,9.96 49.142,14.61 77.033,14.61 67.737,0 122.855,-34.533 122.855,-95.628
0,-47.814 -26.563,-74.377 -86.994,-93.636 -26.564,-8.633 -46.486,-21.914
-46.486,-53.126 0,-25.235 22.579,-43.165 53.127,-43.165 28.555,0 53.79,6.64
70.392,16.602 l 3.32,-46.486 c -16.602,-8.633 -45.821,-15.274 -71.056,-15.274
-57.111,0 -111.566,27.891 -111.566,94.3 0,50.47 29.884,73.713 84.338,94.3
33.869,12.617 49.806,25.234 49.806,50.47 0,29.219 -29.883,46.485 -67.072,46.485
-23.907,0 -45.157,-3.985 -74.377,-15.274 z m 395.792,-316.103 c -90.315,0
-147.426,66.408 -147.426,165.356 0,98.948 57.11,165.356 147.426,165.356
90.315,0 147.426,-66.408 147.426,-165.356 0,-98.948 -57.111,-165.356
-147.426,-165.356 z m 0,43.83 c 57.775,0 87.659,53.126 87.659,121.526 0,68.4
-29.884,121.527 -87.66,121.527 -57.774,0 -87.658,-53.126 -87.658,-121.527
0,-68.4 29.884,-121.526 87.659,-121.526 z m 268.288,-37.189 h -49.142 v 317.43
h 54.454 v -1
77.309 c 0,-55.119 35.197,-98.948 77.698,-98.948 49.806,0 70.392,35.196
70.392,80.354 v 195.904 h 54.455 V 1542.9 c 0,-65.08 -37.189,-112.23
-105.589,-112.23 -38.517,0 -80.354,19.923 -98.284,66.408 z m 312.781,62.424 c
26.563,-15.938 57.775,-23.907 81.682,-23.907 46.486,0 71.72,21.25 71.72,63.751
v 24.571 c -11.953,-2.656 -29.219,-3.984 -44.493,-3.984 -76.37,0
-138.793,36.524 -138.793,108.91 0,61.759 45.158,92.306 92.972,92.306 41.837,0
72.385,-19.258 90.979,-53.79 l 5.977,47.15 h 47.813 v -210.514 c 0,-70.393
-32.54,-113.558 -112.893,-113.558 -35.86,0 -72.385,9.297 -98.284,23.907 z m
153.403,132.152 c 0,52.462 -35.197,86.994 -73.05,86.994 -30.547,0
-51.797,-20.586 -51.797,-53.126 0,-38.517 34.532,-65.08 85.666,-65.08 13.946,0
28.555,1.328 39.18,3.984 z m 199.223,122.855 v -488.1 h -54.455 v 488.1 z m
492.747,-406.418 v -47.814 h -243.054 v 454.232 h 245.71 v -47.814 h -191.255 v
-158.715 h 167.348 V 1500.4 H 4560.91 v -152.075 z m 342.665,-81.682 h -54.455
v 219.81 c -11.953,-31.87
5 -46.485,-55.782 -89.65,-55.782 -84.34,0 -144.77,69.729 -144.77,169.34
0,96.293 55.118,161.373 136.136,161.373 45.822,0 80.354,-25.9 99.612,-64.416 l
3.985,57.775 h 49.142 z m -54.455,349.97 c 0,55.12 -43.165,97.62 -86.994,97.62
-57.111,0 -87.66,-53.126 -87.66,-116.877 0,-74.378 38.517,-120.863
89.652,-120.863 47.814,0 85.002,45.821 85.002,105.589 z m 174.652,-295.515 c
-18.593,0 -33.867,15.274 -33.867,33.868 0,18.594 15.274,33.868 33.868,33.868
18.594,0 33.868,-15.274 33.868,-33.868 0,-18.594 -15.274,-33.868
-33.868,-33.868 z m -27.226,433.645 h 54.454 v -317.431 h -54.454 z m
221.801,-314.775 v -83.674 h -54.454 v 83.674 h -49.806 v 42.501 h 49.806 v
184.615 c 0,69.064 37.188,94.3 90.315,94.3 18.594,0 37.852,-3.985 49.806,-9.962
l -2.656,-40.509 c -11.29,4.649 -23.243,5.977 -35.197,5.977 -28.555,0
-47.814,-16.602 -47.814,-53.79 v -180.63 h 85.667 v -42.502 z m 175.317,-118.87
c -18.594,0 -33.868,15.274 -33.868,33.868 0,18.594 15.274,33.868 33.868,33.868
18.594,0 33.868,-15.274 33
.868,-33.868 0,-18.594 -15.274,-33.868 -33.868,-33.868 z m -27.227,433.645 h
54.454 v -317.431 h -54.454 z m 273.6,-324.072 c -90.315,0 -147.426,66.408
-147.426,165.356 0,98.948 57.11,165.356 147.426,165.356 90.315,0
147.426,-66.408 147.426,-165.356 0,-98.948 -57.111,-165.356 -147.426,-165.356 z
m 0,43.83 c 57.775,0 87.659,53.126 87.659,121.526 0,68.4 -29.884,121.527
-87.66,121.527 -57.774,0 -87.658,-53.126 -87.658,-121.527 0,-68.4
29.884,-121.526 87.659,-121.526 z m 268.288,-37.189 h -49.142 v 317.43 h 54.454
v -177.309 c 0,-55.119 35.197,-98.948 77.698,-98.948 49.806,0 70.393,35.196
70.393,80.354 v 195.904 h 54.454 V 1542.9 c 0,-65.08 -37.188,-112.23
-105.589,-112.23 -38.516,0 -80.353,19.923 -98.284,66.408 z"
+ style="-inkscape-font-specification:'Vegur,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start"
/>
+ </g>
+ </g>
+</svg>
diff --git a/icon-themes/colibre/brand/shell/logo_inverted.svg
b/icon-themes/colibre/brand/shell/logo_inverted.svg
index 159a22a80d6c..23ca88048e21 100644
--- a/icon-themes/colibre/brand/shell/logo_inverted.svg
+++ b/icon-themes/colibre/brand/shell/logo_inverted.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg"; stroke-linejoin="round"
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid"
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2"><g
class="SlideGroup"><path fill="#18a303" d="M2121.35
79.926v1032.38h666.052V955.784h-462.906V79.926zm795.163
1034.045h204.811V369.66h-204.81zm103.238-807.587c63.275 0 116.56-51.619
116.56-118.224 0-63.275-53.285-116.559-116.56-116.559-66.605 0-118.224
53.284-118.224 116.559 0 66.605 51.62 118.224 118.224 118.224zm454.58
149.861h-3.33V16.651h-203.146v1095.655h199.816l3.33-86.587h3.33c63.274 71.601
128.214 101.573 231.452 101.573 198.151 0 328.031-178.169 328.031-399.63
0-214.802-116.559-372.99-318.04-372.99-108.233 0-171.508 31.638-241.443
101.573zm-3.33 268.086c0-128.215 58.28-213.137 166.513-213.137 121.554 0
183.164 86.587 183.164 228.123 0 139.871-59.944 231.453-179.833 231.453-104.903
0-169.843-81.59-169.843-213.137zm1107.311-371.324c-96.577 6.66-189.824
64.94-233.118
148.197h-1.66l-4.99-133.211h-199.815v744.313h204.81V830.9c0-148.196
26.643-201.48 73.266-234.783 41.628-29.972 89.917-41.628
156.522-44.958zm745.978 343.017c0-184.83-113.23-343.017-306.384-343.017-234.783
0-384.645 161.518-384.645 406.292 0 239.778 154.857 367.993 384.645 367.993
108.232 0 183.164-16.65 254.765-49.954l-21.647-151.527c-66.605 28.308-134.875
44.96-208.141 44.96-123.22 0-201.481-56.615-209.807-173.174H5314.3c6.66-26.643
9.99-69.936 9.99-101.573zM4996.258 509.53c88.253 0 129.88 71.601 131.545
148.197h-286.401c14.987-84.922 74.93-148.197 154.856-148.197z"/><path
fill="#fff" d="M5937.056 64.94c-271.416 0-496.207 199.815-496.207 531.176 0
331.361 224.791 531.176 496.207 531.176 274.746 0 497.874-199.815
497.874-531.176 0-331.361-223.128-531.176-497.874-531.176zm0 103.238c204.811 0
358.004 153.192 358.004 427.938 0 276.411-153.193 427.938-358.004
427.938-201.48 0-356.338-151.527-356.338-427.938 0-274.746 154.857-427.938
356.338-427.938zm691.03 159.852v46.624h-119.89v96.577
h119.89v639.41H6756.3v-639.41h188.159v-96.577h-188.16v-66.605c0-133.21
54.95-211.471 158.188-211.471 46.625 0 76.597 8.32 104.904
18.316l13.32-93.247C7004.405 9.991 6952.785 0 6912.82 0c-181.497 0-284.735
116.559-284.735 328.03z"/><path fill="#fff" d="M7049.363
328.03v46.624h-119.89v96.577h119.89v639.41h128.214v-639.41h188.16v-96.577h-188.16v-66.605c0-133.21
54.95-211.471 158.189-211.471 46.623 0 76.595 8.32 104.903
18.316l13.32-93.247C7427.349 9.991 7375.729 0 7334.1 0c-181.498 0-284.736
116.559-284.736 328.03zm514.157
784.276h129.88V374.654h-129.88zm64.94-845.885c44.959 0 79.927-34.968
79.927-78.261 0-44.959-34.968-79.927-79.927-79.927-44.958 0-79.925
34.968-79.925 79.927 0 43.293 34.967 78.261 79.925 78.261zm326.366
474.561c0-186.494 111.563-283.072 256.429-283.072 74.932 0 141.536 16.652
196.486
43.294l13.32-98.243c-46.622-21.647-119.888-43.293-199.815-43.293-228.123
0-399.631 138.205-399.631 397.965 0 243.11 154.857 369.66 359.668 369.66 91.583
0 156.522-9.99 231.453-43.294l-11
.655-96.578c-64.941 29.973-133.212 43.294-196.485 43.294-148.197
0-249.77-93.248-249.77-289.733zm1182.241 31.638c3.33-26.642 4.99-49.954
4.99-73.266 0-188.16-99.908-339.686-289.732-339.686-204.811 0-354.672
171.508-354.672 397.965 0 249.77 149.86 369.66 354.672 369.66 91.582 0
159.852-13.322 231.452-43.294l-11.655-96.578c-56.615 26.642-138.206
43.294-201.481 43.294-146.531
0-243.11-89.917-244.774-258.095zm-294.728-314.71c111.563 0 173.173 91.582
173.173 214.802h-384.645c18.317-129.88 89.917-214.802
211.472-214.802zM1042.371.001c-16.652 0-33.303 9.99-39.964 26.642-6.66
14.986-3.33 33.302 8.33 44.958l366.329 366.328c11.656 13.322 29.972 16.652
46.623 9.99 14.986-6.66 26.642-21.646
26.642-38.298V41.628c0-21.647-19.982-41.628-43.293-41.628zm0 0zm-999.077
0C19.982.001 0 19.982 0 43.294v1666.794c0 21.646 19.982 41.628 43.294
43.293h1363.74c21.646 0 41.628-21.647
41.628-43.293V636.08c0-11.656-3.33-21.647-11.656-29.973L847.551 13.322C839.221
4.992 827.569.001 815.913.001zm41.628 86.586h712.
675l566.143 567.809v1012.398H84.922zm0 0z"/><g style="line-height:1.25"
aria-label="Community Edition" font-weight="400" font-size="652.639"
font-family="Vegur" letter-spacing="0" word-spacing="0" fill="#fff"
stroke-width="746.707"><path style="-inkscape-font-specification:'Vegur,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
d="M2496.111 1682.534c-37.853 18.927-73.095 26.758-118.127 26.758-87.454
0-169.686-58.084-169.686-185.349 0-122.044 88.106-182.739 171.644-182.739
50.253 0 87.453 9.137 122.043
29.369l3.916-48.948c-27.41-16.969-70.485-27.41-122.696-27.41-116.17 0-234.95
73.095-234.95 234.296 0 143.581 95.285 227.771 222.55 227.771 48.295 0
90.717-6.526 129.875-25.452zM2694.513 1431.268c-88.76 0-144.886 65.264-144.886
162.507 0 97.244 56.127 162.507 144.886 162.507 88.759 0 144.886-65.263
144.886-162.507 0-97.243-56.127-162.507-144.886-162.507zm0 43.074c56.78 0
86.148 52.212 86.148 119.433 0 67.222-29.3
69 119.433-86.148 119.433-56.78 0-86.149-52.21-86.149-119.433 0-67.221
29.37-119.433 86.149-119.433zM2958.178
1437.795h-48.295v311.961h53.516v-174.255c0-54.168 30.674-97.243 70.485-97.243
45.685 0 62 33.285 62 79.622v191.876h53.517v-174.255c0-54.168 30.674-97.243
70.485-97.243 45.685 0 62 33.285 62
79.622v191.876h53.517v-207.54c0-62.652-30.674-110.948-96.59-110.948-40.464
0-73.749 20.885-95.938 65.917-11.748-39.158-41.117-65.917-90.064-65.917-38.506
0-74.401 20.232-90.717 63.959zM3472.456
1437.795h-48.295v311.961h53.516v-174.255c0-54.168 30.674-97.243 70.485-97.243
45.685 0 62.001 33.285 62.001 79.622v191.876h53.516v-174.255c0-54.168
30.674-97.243 70.485-97.243 45.685 0 62.001 33.285 62.001
79.622v191.876h53.517v-207.54c0-62.652-30.674-110.948-96.591-110.948-40.464
0-73.748 20.885-95.938 65.917-11.747-39.158-41.116-65.917-90.064-65.917-38.506
0-74.401 20.232-90.717 63.959zM4188.4 1437.795h-53.516v174.254c0 54.17-34.59
97.243-76.36 97.243-48.947 0-69.179-34.59-69.179-78.969v-192.528h
-53.516v208.191c0 63.96 36.547 110.296 103.77 110.296 37.852 0 78.969-19.579
96.59-65.263l3.916 58.737h48.295zM4328.064
1437.795h-48.295v311.961h53.516v-174.255c0-54.168 34.59-97.243 76.359-97.243
48.948 0 69.18 34.59 69.18
78.97v192.528h53.516v-208.192c0-63.958-36.548-110.296-103.77-110.296-37.853
0-78.969 19.58-96.59 65.264zM4647.856 1323.583c-18.274 0-33.284 15.01-33.284
33.284s15.01 33.285 33.284 33.285 33.285-15.01
33.285-33.285c0-18.274-15.01-33.284-33.285-33.284zm-26.758
426.173h53.516v-311.961h-53.516zM4839.078
1440.405v-82.232h-53.516v82.232h-48.948v41.77h48.948v181.433c0 67.874 36.548
92.675 88.759 92.675 18.274 0 37.2-3.916 48.948-9.79l-2.61-39.811c-11.096
4.568-22.843 5.874-34.59 5.874-28.064
0-46.99-16.316-46.99-52.864v-177.518h84.19v-41.769zM5233.924
1437.795h-58.085l-85.495 261.055-84.844-261.055h-61.348l116.823 317.182c-15.664
44.38-50.906 72.443-98.549 89.412l18.927 45.684c62-17.62 110.948-69.18
137.054-140.317zM5674.455 1350.341v-46.99H5435.59v446.405h241.477v-46.9
9h-187.96v-155.98h164.465v-46.99h-164.465V1350.34zM6011.216
1270.066H5957.7v216.024c-11.748-31.327-45.685-54.822-88.107-54.822-82.885
0-142.275 68.527-142.275 166.423 0 94.633 54.17 158.591 133.791 158.591 45.032
0 78.97-25.452 97.896-63.305l3.916 56.78h48.295zm-53.516 343.941c0 54.17-42.422
95.938-85.496 95.938-56.127 0-86.148-52.211-86.148-114.864 0-73.096
37.853-118.78 88.106-118.78 46.99 0 83.538 45.032 83.538 103.769zM6129.343
1323.583c-18.274 0-33.284 15.01-33.284 33.284s15.01 33.285 33.284 33.285
33.285-15.01 33.285-33.285c0-18.274-15.01-33.284-33.285-33.284zm-26.758
426.173h53.517v-311.961h-53.517zM6320.565
1440.405v-82.232h-53.516v82.232H6218.1v41.77h48.948v181.433c0 67.874 36.548
92.675 88.759 92.675 18.274 0 37.2-3.916 48.948-9.79l-2.611-39.811c-11.095
4.568-22.842 5.874-34.59 5.874-28.063
0-46.99-16.316-46.99-52.864v-177.518h84.191v-41.769zM6492.862 1323.583c-18.274
0-33.285 15.01-33.285 33.284s15.011 33.285 33.285 33.285c18.273 0 33.284-15.01
33.284-33.285 0-18.274-15.0
11-33.284-33.284-33.284zm-26.759 426.173h53.517v-311.961h-53.517zM6734.989
1431.268c-88.759 0-144.886 65.264-144.886 162.507 0 97.244 56.127 162.507
144.886 162.507 88.759 0 144.886-65.263 144.886-162.507
0-97.243-56.127-162.507-144.886-162.507zm0 43.074c56.78 0 86.148 52.212 86.148
119.433 0 67.222-29.368 119.433-86.148
119.433s-86.148-52.21-86.148-119.433c0-67.221 29.368-119.433
86.148-119.433zM6998.655 1437.795h-48.296v311.961h53.517v-174.255c0-54.168
34.59-97.243 76.358-97.243 48.948 0 69.18 34.59 69.18
78.97v192.528h53.517v-208.192c0-63.958-36.548-110.296-103.77-110.296-37.853
0-78.969 19.58-96.591 65.264z"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg"; version="1.2" width="345.611"
height="71.5" viewBox="0 0 9144.293 1891.771" preserveAspectRatio="xMidYMid"
fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round"><g
class="SlideGroup"><path d="M2121.35
79.926v1032.38h666.052V955.784h-462.906V79.926zm795.163
1034.045h204.811V369.66h-204.81zm103.238-807.587c63.275 0 116.56-51.619
116.56-118.224 0-63.275-53.285-116.559-116.56-116.559-66.605 0-118.224
53.284-118.224 116.559 0 66.605 51.62 118.224 118.224 118.224zm454.58
149.861h-3.33V16.651h-203.146v1095.655h199.816l3.33-86.587h3.33c63.274 71.601
128.214 101.573 231.452 101.573 198.151 0 328.031-178.169 328.031-399.63
0-214.802-116.559-372.99-318.04-372.99-108.233 0-171.508 31.638-241.443
101.573zm-3.33 268.086c0-128.215 58.28-213.137 166.513-213.137 121.554 0
183.164 86.587 183.164 228.123 0 139.871-59.944 231.453-179.833 231.453-104.903
0-169.843-81.59-169.843-213.137zm1107.311-371.324c-96.577 6.66-189.824
64.94-233.118 148.197h-1.66l
-4.99-133.211h-199.815v744.313h204.81V830.9c0-148.196 26.643-201.48
73.266-234.783 41.628-29.972 89.917-41.628 156.522-44.958zm745.978
343.017c0-184.83-113.23-343.017-306.384-343.017-234.783 0-384.645
161.518-384.645 406.292 0 239.778 154.857 367.993 384.645 367.993 108.232 0
183.164-16.65 254.765-49.954l-21.647-151.527c-66.605 28.308-134.875
44.96-208.141 44.96-123.22 0-201.481-56.615-209.807-173.174H5314.3c6.66-26.643
9.99-69.936 9.99-101.573zM4996.258 509.53c88.253 0 129.88 71.601 131.545
148.197h-286.401c14.987-84.922 74.93-148.197 154.856-148.197z"
fill="#18a303"/><path d="M5937.056 64.94c-271.416 0-496.207 199.815-496.207
531.176 0 331.361 224.791 531.176 496.207 531.176 274.746 0 497.874-199.815
497.874-531.176 0-331.361-223.128-531.176-497.874-531.176zm0 103.238c204.811 0
358.004 153.192 358.004 427.938 0 276.411-153.193 427.938-358.004
427.938-201.48 0-356.338-151.527-356.338-427.938 0-274.746 154.857-427.938
356.338-427.938zm691.03 159.852v46.624h-119.89v96.577h119.89v639.
41H6756.3v-639.41h188.159v-96.577h-188.16v-66.605c0-133.21 54.95-211.471
158.188-211.471 46.625 0 76.597 8.32 104.904 18.316l13.32-93.247C7004.405 9.991
6952.785 0 6912.82 0c-181.497 0-284.735 116.559-284.735 328.03z"
fill="#fff"/><path d="M7049.363
328.03v46.624h-119.89v96.577h119.89v639.41h128.214v-639.41h188.16v-96.577h-188.16v-66.605c0-133.21
54.95-211.471 158.189-211.471 46.623 0 76.595 8.32 104.903
18.316l13.32-93.247C7427.349 9.991 7375.729 0 7334.1 0c-181.498 0-284.736
116.559-284.736 328.03zm514.157
784.276h129.88V374.654h-129.88zm64.94-845.885c44.959 0 79.927-34.968
79.927-78.261 0-44.959-34.968-79.927-79.927-79.927-44.958 0-79.925
34.968-79.925 79.927 0 43.293 34.967 78.261 79.925 78.261zm326.366
474.561c0-186.494 111.563-283.072 256.429-283.072 74.932 0 141.536 16.652
196.486
43.294l13.32-98.243c-46.622-21.647-119.888-43.293-199.815-43.293-228.123
0-399.631 138.205-399.631 397.965 0 243.11 154.857 369.66 359.668 369.66 91.583
0 156.522-9.99 231.453-43.294l-11.655-96.578c
-64.941 29.973-133.212 43.294-196.485 43.294-148.197
0-249.77-93.248-249.77-289.733zm1182.241 31.638c3.33-26.642 4.99-49.954
4.99-73.266 0-188.16-99.908-339.686-289.732-339.686-204.811 0-354.672
171.508-354.672 397.965 0 249.77 149.86 369.66 354.672 369.66 91.582 0
159.852-13.322 231.452-43.294l-11.655-96.578c-56.615 26.642-138.206
43.294-201.481 43.294-146.531
0-243.11-89.917-244.774-258.095zm-294.728-314.71c111.563 0 173.173 91.582
173.173 214.802h-384.645c18.317-129.88 89.917-214.802
211.472-214.802zM1042.371.001c-16.652 0-33.303 9.99-39.964 26.642-6.66
14.986-3.33 33.302 8.33 44.958l366.329 366.328c11.656 13.322 29.972 16.652
46.623 9.99 14.986-6.66 26.642-21.646
26.642-38.298V41.628c0-21.647-19.982-41.628-43.293-41.628zm0 0zm-999.077
0C19.982.001 0 19.982 0 43.294v1666.794c0 21.646 19.982 41.628 43.294
43.293h1363.74c21.646 0 41.628-21.647
41.628-43.293V636.08c0-11.656-3.33-21.647-11.656-29.973L847.551 13.322C839.221
4.992 827.569.001 815.913.001zm41.628 86.586h712.675l566.143
567.809v1012.398H84.922zm0 0z" fill="#fff"/><g aria-label="Community
Edition"><g style="line-height:1.25" aria-label="Personal Edition"
font-size="664.08" font-family="Vegur" font-weight="400" letter-spacing="0"
word-spacing="0" fill="#fff" stroke-width="746.707"><path
style="-inkscape-font-specification:'Vegur,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start"
d="M2122.876 1753.11h54.455v-185.942c11.289 1.328 19.258 1.992 29.883 1.992
96.956 0 181.294-47.814 181.294-146.097
0-75.042-56.447-133.48-166.02-133.48-29.22 0-61.095 2.656-99.612
9.96zm54.455-412.393c21.25-2.657 31.876-3.32 46.485-3.32 67.736 0 105.589
36.524 105.589 92.306 0 61.096-51.798 92.972-120.199 92.972-7.969
0-21.914-.665-31.875-1.993zM2644.841 1692.68c-22.578 13.945-52.462
23.242-80.353 23.242-63.752 0-96.956-31.212-100.276-102.933h198.56c1.992-10.625
2.656-17.266 2.656-27.227 0-86.33-33.868-156.723-116.214-156.723-85.666 0-1
42.113 67.736-142.113 173.99 0 103.596 56.447 156.722 144.105 156.722 37.189 0
72.385-8.633 96.292-21.915zm-179.301-124.184c4.648-55.783 33.868-92.971
77.697-92.971 48.478 0 67.072 41.173 67.072 92.971zM2789.61
1435.68h-49.142v317.43h54.455v-177.973c0-61.76 25.235-96.292 64.416-96.292
11.953 0 21.25 1.328 31.212
3.985l2.656-49.142c-9.297-1.992-19.923-3.32-31.876-3.32-32.54 0-59.103
22.578-68.4 53.126zM2927.738 1745.141c25.235 9.962 49.142 14.61 77.033 14.61
67.736 0 122.855-34.532 122.855-95.627
0-47.814-26.563-74.377-86.994-93.636-26.564-8.633-46.486-21.914-46.486-53.126
0-25.235 22.579-43.165 53.126-43.165 28.556 0 53.79 6.64 70.393
16.602l3.32-46.486c-16.602-8.633-45.821-15.274-71.056-15.274-57.111 0-111.566
27.892-111.566 94.3 0 50.47 29.884 73.713 84.338 94.299 33.869 12.618 49.806
25.235 49.806 50.47 0 29.22-29.883 46.486-67.072 46.486-23.906
0-45.157-3.985-74.377-15.274zM3323.53 1429.04c-90.316 0-147.427 66.407-147.427
165.355s57.111 165.356 147.426 165.356 147.426-66.408 147
.426-165.356-57.11-165.356-147.426-165.356zm0 43.829c57.774 0 87.658 53.126
87.658 121.526s-29.884 121.527-87.659 121.527c-57.775
0-87.658-53.127-87.658-121.527s29.883-121.526 87.658-121.526zM3591.817
1435.68h-49.142v317.43h54.454v-177.309c0-55.119 35.197-98.948 77.698-98.948
49.806 0 70.392 35.196 70.392
80.354v195.903h54.455V1541.27c0-65.08-37.189-112.23-105.589-112.23-38.517
0-80.354 19.923-98.284 66.408zM3904.597 1498.104c26.564-15.938 57.775-23.907
81.682-23.907 46.486 0 71.721 21.25 71.721
63.751v24.571c-11.953-2.656-29.22-3.984-44.493-3.984-76.37 0-138.793
36.524-138.793 108.909 0 61.76 45.157 92.307 92.971 92.307 41.837 0
72.385-19.258 90.98-53.79l5.976
47.15h47.814v-210.514c0-70.393-32.54-113.558-112.894-113.558-35.86 0-72.385
9.297-98.284 23.907zM4058 1630.255c0 52.463-35.196 86.995-73.049 86.995-30.548
0-51.798-20.587-51.798-53.126 0-38.517 34.532-65.08 85.666-65.08 13.946 0
28.556 1.328 39.181 3.984zM4257.223 1753.11v-488.099h-54.454v488.1zM4749.97
1346.693v-47.813h-243.
054v454.23h245.71v-47.813H4561.37v-158.715h167.349v-47.814H4561.37v-152.075zM5092.633
1265.011h-54.454v219.811c-11.954-31.876-46.486-55.783-89.65-55.783-84.339
0-144.77 69.729-144.77 169.34 0 96.292 55.118 161.372 136.136 161.372 45.822 0
80.354-25.899 99.612-64.416l3.985 57.775h49.141zm-54.454 349.97c0 55.12-43.165
97.62-86.995 97.62-57.11 0-87.658-53.126-87.658-116.878 0-74.377 38.517-120.862
89.65-120.862 47.815 0 85.003 45.821 85.003 105.588zM5212.832 1319.466c-18.595
0-33.869 15.274-33.869 33.868s15.274 33.868 33.869 33.868c18.594 0
33.868-15.274 33.868-33.868s-15.274-33.868-33.868-33.868zm-27.228
433.644h54.455v-317.43h-54.455zM5407.406
1438.336v-83.674h-54.455v83.674h-49.806v42.501h49.806v184.615c0 69.064 37.189
94.3 90.315 94.3 18.594 0 37.853-3.985 49.806-9.962l-2.656-40.509c-11.29
4.649-23.243 5.977-35.197 5.977-28.555
0-47.813-16.602-47.813-53.79v-180.63h85.666v-42.502zM5582.722 1319.466c-18.594
0-33.868 15.274-33.868 33.868s15.274 33.868 33.868 33.868c18.595 0 33.869-15.
274 33.869-33.868s-15.274-33.868-33.869-33.868zm-27.227
433.644h54.455v-317.43h-54.455zM5829.095 1429.04c-90.315 0-147.426
66.407-147.426 165.355s57.111 165.356 147.426 165.356 147.426-66.408
147.426-165.356-57.111-165.356-147.426-165.356zm0 43.829c57.775 0 87.658 53.126
87.658 121.526s-29.883 121.527-87.658 121.527c-57.775
0-87.659-53.127-87.659-121.527s29.884-121.526 87.659-121.526zM6097.382
1435.68h-49.142v317.43h54.455v-177.309c0-55.119 35.196-98.948 77.697-98.948
49.806 0 70.393 35.196 70.393
80.354v195.903h54.454V1541.27c0-65.08-37.188-112.23-105.588-112.23-38.517
0-80.354 19.923-98.284 66.408z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 4faaf048a6e4..e2dfefdc990d 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -347,6 +347,7 @@
#define STR_CLICKHYPERLINK NC_("STR_CLICKHYPERLINK",
"Click to open hyperlink: %{link}")
#define STR_STYLEUSEDBY NC_("STR_STYLEUSEDBY", "(used
by: %STYLELIST)")
+#define STR_PERSONALDESC NC_("STR_PERSONALDESC", "The
Personal edition is supported by volunteers and intended for individual use.")
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 177443586698..271573765da0 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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
