Revert "configure: add a --with-product-flavor switch"
This reverts commit c540483134.
Reason for revert: https://blog.documentfoundation.org/blog/2020/07/20/update-on-marketing-and-communication-plans-for-the-libreoffice-7-x-series/
Conflicts:
icon-themes/colibre/brand/shell/logo_flavor.svg
Change-Id: If435d4c4c16fb1b52635fae2d966151970729daa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99053
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
This commit is contained in:
Heiko Tietze
@@ -6,6 +6,5 @@ Optional Build ID displayed in the about dialog
|
||||
#define CONFIG_BUILDID_H
|
||||
|
||||
#undef EXTRA_BUILDID
|
||||
#undef PRODUCTFLAVOR
|
||||
|
||||
#endif
|
||||
|
||||
+1
-15
@@ -1509,11 +1509,6 @@ 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.]),
|
||||
@@ -2386,15 +2381,6 @@ 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 ===================================================================
|
||||
@@ -12921,7 +12907,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 logo_flavor.svg about.svg"
|
||||
brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg about.svg"
|
||||
|
||||
if test -z "$with_branding" -o "$with_branding" = "no"; then
|
||||
AC_MSG_RESULT([none])
|
||||
|
||||
@@ -32,8 +32,6 @@
|
||||
#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
|
||||
@@ -67,7 +65,6 @@ 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
|
||||
@@ -90,12 +87,6 @@ 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
|
||||
|
||||
@@ -40,7 +40,6 @@ 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();
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
#include <config_buildid.h>
|
||||
#include <config_features.h>
|
||||
|
||||
#include <framework/titlehelper.hxx>
|
||||
@@ -517,12 +516,6 @@ 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
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 123 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 83 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 8.4 KiB |
@@ -1 +0,0 @@
|
||||
<svg fill-rule="evenodd" height="18.69887" preserveAspectRatio="xMidYMid" stroke-linejoin="round" stroke-width="28.222" viewBox="0 0 4182.3705 494.74097" width="158.07381" xmlns="http://www.w3.org/2000/svg"><path d="m2122.41 1754.743h54.455v-185.943c11.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.993zm467.512 351.963c-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.971zm324.071-132.816h-49.142v317.43h54.455v-177.972c0-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.126zm138.128 309.462c25.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.274zm395.792-316.103c-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.526zm268.288-37.189h-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.455v-211.843c0-65.08-37.189-112.23-105.589-112.23-38.517 0-80.354 19.923-98.284 66.408zm312.781 62.424c26.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.984zm199.223 122.855v-488.1h-54.455v488.1zm492.747-406.418v-47.814h-243.054v454.232h245.71v-47.814h-191.255v-158.715h167.348v-47.814h-167.347v-152.075zm342.665-81.682h-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.589zm174.652-295.515c-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.454zm221.801-314.775v-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.502zm175.317-118.87c-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.454zm273.6-324.072c-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.526zm268.288-37.189h-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.454v-211.843c0-65.08-37.188-112.23-105.589-112.23-38.516 0-80.353 19.923-98.284 66.408z" fill="#3a3a38" stroke-width="1" transform="translate(-2122.41 -1266.643)"/></svg>
|
||||
|
Before Width: | Height: | Size: 4.3 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 8.4 KiB |
@@ -348,7 +348,6 @@
|
||||
#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: */
|
||||
|
||||
@@ -53,7 +53,6 @@
|
||||
#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;
|
||||
@@ -88,8 +87,6 @@ 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());
|
||||
@@ -184,7 +181,6 @@ void BackingWindow::dispose()
|
||||
mpDrawAllButton.clear();
|
||||
mpDBAllButton.clear();
|
||||
mpMathAllButton.clear();
|
||||
mpBrandImage.clear();
|
||||
mpHelpButton.clear();
|
||||
mpExtensionsButton.clear();
|
||||
mpAllButtonsBox.clear();
|
||||
@@ -251,14 +247,6 @@ 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 );
|
||||
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
|
||||
#include <vcl/builder.hxx>
|
||||
#include <vcl/button.hxx>
|
||||
#include <vcl/fixed.hxx>
|
||||
#include <vcl/layout.hxx>
|
||||
|
||||
#include <vcl/menubtn.hxx>
|
||||
@@ -66,7 +65,6 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer
|
||||
VclPtr<PushButton> mpDBAllButton;
|
||||
VclPtr<PushButton> mpMathAllButton;
|
||||
|
||||
VclPtr<FixedImage> mpBrandImage;
|
||||
VclPtr<PushButton> mpHelpButton;
|
||||
VclPtr<PushButton> mpExtensionsButton;
|
||||
|
||||
|
||||
@@ -397,23 +397,6 @@
|
||||
<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>
|
||||
|
||||
Reference in New Issue
Block a user