Related tdf#130778: New About dialog
More flexible dialog logo & about images as SVGs Change-Id: Icefa035893e241a7dee6aa28236e6b89b38477de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91908 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
This commit is contained in:
Heiko Tietze
Heiko Tietze
parent
0db34d1c5d
commit
9b1c9ac6ed
@ -47,7 +47,6 @@ widgets_toplevel = [
|
||||
'GtkOffscreenWindow',
|
||||
'GtkApplicationWindow',
|
||||
'GtkDialog',
|
||||
'GtkAboutDialog',
|
||||
'GtkFileChooserDialog',
|
||||
'GtkColorChooserDialog',
|
||||
'GtkFontChooserDialog',
|
||||
|
||||
@ -1778,10 +1778,6 @@ include/vcl/weld.hxx:2102
|
||||
class std::unique_ptr<class weld::Dialog, struct std::default_delete<class weld::Dialog> > weld::Builder::weld_dialog(const class rtl::OString &,_Bool)
|
||||
_Bool bTakeOwnership
|
||||
1
|
||||
include/vcl/weld.hxx:2103
|
||||
class std::unique_ptr<class weld::AboutDialog, struct std::default_delete<class weld::AboutDialog> > weld::Builder::weld_about_dialog(const class rtl::OString &,_Bool)
|
||||
_Bool bTakeOwnership
|
||||
1
|
||||
include/vcl/weld.hxx:2106
|
||||
class std::unique_ptr<class weld::Assistant, struct std::default_delete<class weld::Assistant> > weld::Builder::weld_assistant(const class rtl::OString &,_Bool)
|
||||
_Bool bTakeOwnership
|
||||
@ -4210,10 +4206,6 @@ vcl/qa/cppunit/BitmapTest.cxx:68
|
||||
void assertColorsAreSimilar(int,const class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > &,const class BitmapColor &,const class BitmapColor &)
|
||||
int maxDifference
|
||||
1
|
||||
vcl/source/app/salvtables.cxx:1624
|
||||
void (anonymous namespace)::SalInstanceAboutDialog::SalInstanceAboutDialog(class vcl::AboutDialog *,class SalInstanceBuilder *,_Bool)
|
||||
_Bool bTakeOwnership
|
||||
0
|
||||
vcl/source/app/salvtables.cxx:1694
|
||||
void (anonymous namespace)::SalInstanceAssistant::SalInstanceAssistant(class vcl::RoadmapWizard *,class SalInstanceBuilder *,_Bool)
|
||||
_Bool bTakeOwnership
|
||||
|
||||
@ -2186,7 +2186,7 @@ AC_ARG_WITH(branding,
|
||||
AS_HELP_STRING([--with-branding=/path/to/images],
|
||||
[Use given path to retrieve branding images set.])
|
||||
[
|
||||
Search for intro.png about.svg and flat_logo.svg.
|
||||
Search for intro.png about.svg and logo.svg.
|
||||
If any is missing, default ones will be used instead.
|
||||
|
||||
Search also progress.conf for progress
|
||||
@ -12553,8 +12553,8 @@ dnl branding
|
||||
dnl ===================================================================
|
||||
AC_MSG_CHECKING([for alternative branding images directory])
|
||||
# initialize mapped arrays
|
||||
BRAND_INTRO_IMAGES="flat_logo.svg intro.png intro-highres.png"
|
||||
brand_files="$BRAND_INTRO_IMAGES about.svg"
|
||||
BRAND_INTRO_IMAGES="intro.png intro-highres.png"
|
||||
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])
|
||||
|
||||
@ -390,9 +390,6 @@
|
||||
#define RID_SVXSTR_ABOUT_DERIVED NC_("aboutdialog|derived", "%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
|
||||
#define RID_SVXSTR_ABOUT_LOCALE NC_("aboutdialog|locale", "Locale: $LOCALE")
|
||||
#define RID_SVXSTR_ABOUT_UILOCALE NC_("aboutdialog|uilocale", "UI-Language: $LOCALE")
|
||||
#define RID_SVXSTR_ABOUT_RELEASE_NOTES NC_("aboutdialog|releasenotes", "~Release Notes")
|
||||
#define RID_SVXSTR_ABOUT_WEBSITE NC_("aboutdialog|website", "~Website")
|
||||
#define RID_SVXSTR_ABOUT_CREDITS NC_("aboutdialog|credits", "Cre~dits")
|
||||
|
||||
#define RID_SVXSTR_EDIT_PATHS NC_("optpathspage|editpaths", "Edit Paths: %1")
|
||||
|
||||
|
||||
@ -17,324 +17,228 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
#include <config_feature_opencl.h>
|
||||
#include <osl/process.h>
|
||||
#include <sal/log.hxx>
|
||||
#include <osl/diagnose.h>
|
||||
#include <rtl/character.hxx>
|
||||
#include <vcl/graphicfilter.hxx>
|
||||
#include <vcl/settings.hxx>
|
||||
#include <vcl/stdtext.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
#include <vcl/weld.hxx>
|
||||
|
||||
#include <unotools/configmgr.hxx>
|
||||
#include <unotools/bootstrap.hxx>
|
||||
#include <com/sun/star/uno/Any.h>
|
||||
#include <svtools/langhelp.hxx>
|
||||
#include <i18nlangtag/languagetag.hxx>
|
||||
|
||||
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
|
||||
#include <com/sun/star/system/SystemShellExecute.hpp>
|
||||
#include <comphelper/processfactory.hxx>
|
||||
#include <comphelper/anytostring.hxx>
|
||||
#include <cppuhelper/exc_hlp.hxx>
|
||||
#include <svtools/optionsdrawinglayer.hxx>
|
||||
|
||||
#include <about.hxx>
|
||||
#include <dialmgr.hxx>
|
||||
#include <strings.hrc>
|
||||
#include <config_buildid.h>
|
||||
#include <sfx2/app.hxx>
|
||||
|
||||
#include <osl/diagnose.h> //OSL_ENSURE
|
||||
#include <osl/process.h> //osl_getProcessLocale
|
||||
#include <rtl/character.hxx> //rtl::isAsciiHexDigit
|
||||
#include <sal/log.hxx> //SAL_WARN
|
||||
#include <vcl/settings.hxx> //GetSettings
|
||||
#include <vcl/weld.hxx>
|
||||
#include <vcl/svapp.hxx> //Application::
|
||||
#include <vcl/virdev.hxx> //VirtualDevice
|
||||
|
||||
#include <i18nlangtag/languagetag.hxx>
|
||||
#include <svtools/langhelp.hxx>
|
||||
#include <unotools/bootstrap.hxx> //utl::Bootstrap::getBuildVersion
|
||||
#include <unotools/configmgr.hxx> //ConfigManager::
|
||||
#include <config_buildid.h> //EXTRA_BUILDID
|
||||
#include <dialmgr.hxx> //CuiResId
|
||||
#include <sfx2/app.hxx> //SfxApplication::loadBrandSvg
|
||||
#include <strings.hrc>
|
||||
|
||||
#include <config_feature_opencl.h>
|
||||
#if HAVE_FEATURE_OPENCL
|
||||
#include <opencl/openclwrapper.hxx>
|
||||
#endif
|
||||
#include <officecfg/Office/Common.hxx>
|
||||
#include <officecfg/Office/Calc.hxx>
|
||||
#include <officecfg/Office/Common.hxx>
|
||||
|
||||
using namespace ::com::sun::star::uno;
|
||||
using namespace ::com::sun::star::beans;
|
||||
using namespace ::com::sun::star;
|
||||
|
||||
AboutDialog::AboutDialog(weld::Window* pParent)
|
||||
: m_xBuilder(Application::CreateBuilder(pParent, "cui/ui/aboutdialog.ui"))
|
||||
, m_xDialog(m_xBuilder->weld_about_dialog("AboutDialog"))
|
||||
, m_xContentArea(m_xDialog->weld_content_area())
|
||||
{
|
||||
m_xDialog->add_button(GetStandardText(StandardButtonType::Close), RET_CLOSE);
|
||||
m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_CREDITS), 101);
|
||||
m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_WEBSITE), 102);
|
||||
m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_RELEASE_NOTES), 103);
|
||||
AboutDialog::AboutDialog(weld::Window *pParent)
|
||||
: GenericDialogController(pParent, "cui/ui/aboutdialog.ui", "AboutDialog"),
|
||||
m_pCreditsButton(m_xBuilder->weld_link_button("btnCredits")),
|
||||
m_pWebsiteButton(m_xBuilder->weld_link_button("btnWebsite")),
|
||||
m_pReleaseNotesButton(m_xBuilder->weld_link_button("btnReleaseNotes")),
|
||||
m_pCloseButton(m_xBuilder->weld_button("btnClose")),
|
||||
m_pBrandImage(m_xBuilder->weld_image("imBrand")),
|
||||
m_pAboutImage(m_xBuilder->weld_image("imAbout")),
|
||||
m_pVersionLabel(m_xBuilder->weld_label("lbVersion")),
|
||||
m_pCopyrightLabel(m_xBuilder->weld_label("lbCopyright")) {
|
||||
m_pVersionLabel->set_label(GetVersionString());
|
||||
m_pCopyrightLabel->set_label(GetCopyrightString());
|
||||
|
||||
m_xCreditsButton.reset(m_xDialog->weld_widget_for_response(101));
|
||||
m_xCreditsButton->set_secondary(true);
|
||||
m_xWebsiteButton.reset(m_xDialog->weld_widget_for_response(102));
|
||||
m_xWebsiteButton->set_secondary(true);
|
||||
m_xReleaseNotesButton.reset(m_xDialog->weld_widget_for_response(103));
|
||||
m_xReleaseNotesButton->set_secondary(true);
|
||||
m_xCloseButton.reset(m_xDialog->weld_widget_for_response(RET_CLOSE));
|
||||
//Images
|
||||
const Size nWidth(m_pVersionLabel->get_preferred_size());
|
||||
BitmapEx aBackgroundBitmap;
|
||||
|
||||
m_buildIdLinkString = m_xDialog->get_website_label();
|
||||
if (SfxApplication::loadBrandSvg(Application::GetSettings()
|
||||
.GetStyleSettings()
|
||||
.GetDialogColor()
|
||||
.IsDark()
|
||||
? "shell/logo_inverted"
|
||||
: "shell/logo",
|
||||
aBackgroundBitmap,
|
||||
nWidth.getWidth() * 0.8)) {
|
||||
ScopedVclPtr<VirtualDevice> m_pVirDev =
|
||||
m_pBrandImage->create_virtual_device();
|
||||
m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
|
||||
m_pVirDev->DrawBitmapEx(Point(0, 0), aBackgroundBitmap);
|
||||
m_pBrandImage->set_image(m_pVirDev.get());
|
||||
m_pVirDev.disposeAndClear();
|
||||
}
|
||||
if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap,
|
||||
nWidth.getWidth())) {
|
||||
ScopedVclPtr<VirtualDevice> m_pVirDev =
|
||||
m_pAboutImage->create_virtual_device();
|
||||
m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
|
||||
m_pVirDev->DrawBitmapEx(Point(0, 0), aBackgroundBitmap);
|
||||
m_pAboutImage->set_image(m_pVirDev.get());
|
||||
m_pVirDev.disposeAndClear();
|
||||
}
|
||||
|
||||
m_xDialog->set_version(GetVersionString());
|
||||
m_xDialog->set_copyright(GetCopyrightString());
|
||||
//Links
|
||||
m_pCreditsButton->set_uri(CuiResId(RID_SVXSTR_ABOUT_CREDITS_URL));
|
||||
|
||||
SetBuildIdLink();
|
||||
OUString sURL(officecfg::Office::Common::Help::StartCenter::InfoURL::get());
|
||||
localizeWebserviceURI(sURL);
|
||||
m_pWebsiteButton->set_uri(sURL);
|
||||
|
||||
SetLogo();
|
||||
sURL = officecfg::Office::Common::Menus::ReleaseNotesURL::get() +
|
||||
"?LOvers=" + utl::ConfigManager::getProductVersion() + "&LOlocale=" +
|
||||
LanguageTag(utl::ConfigManager::getUILocale()).getLanguage();
|
||||
m_pReleaseNotesButton->set_uri(sURL);
|
||||
|
||||
m_xDialog->connect_size_allocate(LINK(this, AboutDialog, SizeAllocHdl));
|
||||
|
||||
// Connect all handlers
|
||||
m_xCreditsButton->connect_clicked( LINK( this, AboutDialog, HandleClick ) );
|
||||
m_xWebsiteButton->connect_clicked( LINK( this, AboutDialog, HandleClick ) );
|
||||
m_xReleaseNotesButton->connect_clicked( LINK( this, AboutDialog, HandleClick ) );
|
||||
m_xCloseButton->grab_focus();
|
||||
//Handler
|
||||
m_pCloseButton->grab_focus();
|
||||
}
|
||||
|
||||
AboutDialog::~AboutDialog()
|
||||
{
|
||||
}
|
||||
AboutDialog::~AboutDialog() {}
|
||||
|
||||
IMPL_LINK(AboutDialog, HandleClick, weld::Button&, rButton, void)
|
||||
{
|
||||
OUString sURL = "";
|
||||
|
||||
// Find which button was pressed and from this, get the URL to be opened
|
||||
if (&rButton == m_xCreditsButton.get())
|
||||
sURL = CuiResId(RID_SVXSTR_ABOUT_CREDITS_URL);
|
||||
else if (&rButton == m_xWebsiteButton.get())
|
||||
{
|
||||
sURL = officecfg::Office::Common::Help::StartCenter::InfoURL::get();
|
||||
localizeWebserviceURI(sURL);
|
||||
}
|
||||
else if (&rButton == m_xReleaseNotesButton.get())
|
||||
{
|
||||
sURL = officecfg::Office::Common::Menus::ReleaseNotesURL::get() +
|
||||
"?LOvers=" + utl::ConfigManager::getProductVersion() +
|
||||
"&LOlocale=" + LanguageTag(utl::ConfigManager::getUILocale()).getLanguage();
|
||||
}
|
||||
|
||||
// If the URL is empty, don't do anything
|
||||
if ( sURL.isEmpty() )
|
||||
return;
|
||||
try
|
||||
{
|
||||
Reference< css::system::XSystemShellExecute > xSystemShellExecute(
|
||||
css::system::SystemShellExecute::create(::comphelper::getProcessComponentContext() ) );
|
||||
xSystemShellExecute->execute( sURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY );
|
||||
}
|
||||
catch (const Exception&)
|
||||
{
|
||||
Any exc( ::cppu::getCaughtException() );
|
||||
OUString msg( ::comphelper::anyToString( exc ) );
|
||||
const SolarMutexGuard guard;
|
||||
std::unique_ptr<weld::MessageDialog> xErrorBox(Application::CreateMessageDialog(getDialog(),
|
||||
VclMessageType::Warning, VclButtonsType::Ok, msg));
|
||||
xErrorBox->set_title(m_xDialog->get_title());
|
||||
xErrorBox->run();
|
||||
}
|
||||
}
|
||||
|
||||
void AboutDialog::SetBuildIdLink()
|
||||
{
|
||||
const OUString buildId = GetBuildId();
|
||||
|
||||
if (IsStringValidGitHash(buildId))
|
||||
{
|
||||
if (m_buildIdLinkString.indexOf("$GITHASH") == -1)
|
||||
{
|
||||
SAL_WARN( "cui.dialogs", "translated git hash string in translations doesn't contain $GITHASH placeholder" );
|
||||
m_buildIdLinkString += " $GITHASH";
|
||||
}
|
||||
|
||||
m_xDialog->set_website_label(m_buildIdLinkString.replaceAll("$GITHASH", buildId));
|
||||
m_xDialog->set_website("https://hub.libreoffice.org/git-core/" + buildId);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_xDialog->set_website_label(OUString());
|
||||
m_xDialog->set_website(OUString());
|
||||
}
|
||||
}
|
||||
|
||||
void AboutDialog::SetLogo()
|
||||
{
|
||||
auto nWidth = m_xContentArea->get_preferred_size().Width();
|
||||
|
||||
// fdo#67401 set AntiAliasing for SVG logo
|
||||
SvtOptionsDrawinglayer aDrawOpt;
|
||||
bool bOldAntiAliasSetting = aDrawOpt.IsAntiAliasing();
|
||||
aDrawOpt.SetAntiAliasing(true);
|
||||
|
||||
// load svg logo, specify desired width, scale height isotropically
|
||||
SfxApplication::loadBrandSvg("flat_logo", aLogoBitmap, nWidth);
|
||||
|
||||
aDrawOpt.SetAntiAliasing(bOldAntiAliasSetting);
|
||||
|
||||
if (!aLogoBitmap)
|
||||
m_xDialog->set_logo(nullptr);
|
||||
else
|
||||
{
|
||||
Graphic aGraphic(aLogoBitmap);
|
||||
m_xDialog->set_logo(aGraphic.GetXGraphic());
|
||||
}
|
||||
}
|
||||
|
||||
IMPL_LINK(AboutDialog, SizeAllocHdl, const Size&, rSize, void)
|
||||
{
|
||||
if (rSize.Width() == aBackgroundBitmap.GetSizePixel().Width())
|
||||
return;
|
||||
// Load background image
|
||||
if (!(Application::GetSettings().GetStyleSettings().GetHighContrastMode()))
|
||||
{
|
||||
SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, rSize.Width());
|
||||
Graphic aGraphic(aBackgroundBitmap);
|
||||
m_xDialog->set_background(aGraphic.GetXGraphic());
|
||||
}
|
||||
}
|
||||
|
||||
OUString AboutDialog::GetBuildId()
|
||||
{
|
||||
OUString sDefault;
|
||||
OUString sBuildId(utl::Bootstrap::getBuildVersion(sDefault));
|
||||
if (!sBuildId.isEmpty())
|
||||
return sBuildId;
|
||||
|
||||
sBuildId = utl::Bootstrap::getBuildIdData(sDefault);
|
||||
|
||||
if (!sBuildId.isEmpty())
|
||||
{
|
||||
return sBuildId.getToken( 0, '-' );
|
||||
}
|
||||
|
||||
OSL_ENSURE( !sBuildId.isEmpty(), "No BUILDID in bootstrap file" );
|
||||
OUString AboutDialog::GetBuildId() {
|
||||
OUString sDefault;
|
||||
OUString sBuildId(utl::Bootstrap::getBuildVersion(sDefault));
|
||||
if (!sBuildId.isEmpty())
|
||||
return sBuildId;
|
||||
|
||||
sBuildId = utl::Bootstrap::getBuildIdData(sDefault);
|
||||
|
||||
if (!sBuildId.isEmpty()) {
|
||||
return sBuildId.getToken(0, '-');
|
||||
}
|
||||
|
||||
OSL_ENSURE(!sBuildId.isEmpty(), "No BUILDID in bootstrap file");
|
||||
return sBuildId;
|
||||
}
|
||||
|
||||
OUString AboutDialog::GetLocaleString()
|
||||
{
|
||||
OUString aLocaleStr;
|
||||
rtl_Locale * pLocale;
|
||||
OUString AboutDialog::GetLocaleString() {
|
||||
OUString aLocaleStr;
|
||||
rtl_Locale *pLocale;
|
||||
|
||||
osl_getProcessLocale( &pLocale );
|
||||
osl_getProcessLocale(&pLocale);
|
||||
|
||||
if ( pLocale && pLocale->Language )
|
||||
{
|
||||
if (pLocale->Country && rtl_uString_getLength( pLocale->Country) > 0)
|
||||
aLocaleStr = OUString::unacquired(&pLocale->Language) + "_" + OUString::unacquired(&pLocale->Country);
|
||||
else
|
||||
aLocaleStr = OUString(pLocale->Language);
|
||||
if (pLocale->Variant && rtl_uString_getLength( pLocale->Variant) > 0)
|
||||
aLocaleStr += OUString(pLocale->Variant);
|
||||
if (pLocale && pLocale->Language) {
|
||||
if (pLocale->Country && rtl_uString_getLength(pLocale->Country) > 0)
|
||||
aLocaleStr = OUString::unacquired(&pLocale->Language) + "_" +
|
||||
OUString::unacquired(&pLocale->Country);
|
||||
else
|
||||
aLocaleStr = OUString(pLocale->Language);
|
||||
if (pLocale->Variant && rtl_uString_getLength(pLocale->Variant) > 0)
|
||||
aLocaleStr += OUString(pLocale->Variant);
|
||||
}
|
||||
|
||||
return aLocaleStr;
|
||||
}
|
||||
|
||||
bool AboutDialog::IsStringValidGitHash(const OUString &hash) {
|
||||
for (int i = 0; i < hash.getLength(); i++) {
|
||||
if (!rtl::isAsciiHexDigit(hash[i])) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return aLocaleStr;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool AboutDialog::IsStringValidGitHash(const OUString& hash)
|
||||
{
|
||||
for (int i = 0; i < hash.getLength(); i++)
|
||||
{
|
||||
if (!rtl::isAsciiHexDigit(hash[i]))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
OUString AboutDialog::GetVersionString()
|
||||
{
|
||||
OUString sVersion = CuiResId(RID_SVXSTR_ABOUT_VERSION);
|
||||
OUString AboutDialog::GetVersionString() {
|
||||
OUString sVersion = CuiResId(RID_SVXSTR_ABOUT_VERSION);
|
||||
|
||||
#ifdef _WIN64
|
||||
sVersion += " (x64)";
|
||||
sVersion += " (x64)";
|
||||
#elif defined(_WIN32)
|
||||
sVersion += " (x86)";
|
||||
sVersion += " (x86)";
|
||||
#endif
|
||||
|
||||
OUString sBuildId = GetBuildId();
|
||||
OUString sBuildId = GetBuildId();
|
||||
|
||||
OUString aLocaleStr = Application::GetSettings().GetLanguageTag().getBcp47() + " (" + GetLocaleString() + ")";
|
||||
OUString aUILocaleStr = Application::GetSettings().GetUILanguageTag().getBcp47();
|
||||
OUString aLocaleStr = Application::GetSettings().GetLanguageTag().getBcp47() +
|
||||
" (" + GetLocaleString() + ")";
|
||||
OUString aUILocaleStr =
|
||||
Application::GetSettings().GetUILanguageTag().getBcp47();
|
||||
|
||||
if (!sBuildId.trim().isEmpty())
|
||||
{
|
||||
sVersion += "\n";
|
||||
OUString sBuildStr = CuiResId(RID_SVXSTR_ABOUT_BUILDID);
|
||||
if (sBuildStr.indexOf("$BUILDID") == -1)
|
||||
{
|
||||
SAL_WARN( "cui.dialogs", "translated Build Id string in translations doesn't contain $BUILDID placeholder" );
|
||||
sBuildStr += " $BUILDID";
|
||||
}
|
||||
sVersion += sBuildStr.replaceAll("$BUILDID", sBuildId);
|
||||
if (!sBuildId.trim().isEmpty()) {
|
||||
sVersion += "\n";
|
||||
OUString sBuildStr = CuiResId(RID_SVXSTR_ABOUT_BUILDID);
|
||||
if (sBuildStr.indexOf("$BUILDID") == -1) {
|
||||
SAL_WARN("cui.dialogs", "translated Build Id string in translations "
|
||||
"doesn't contain $BUILDID placeholder");
|
||||
sBuildStr += " $BUILDID";
|
||||
}
|
||||
sVersion += sBuildStr.replaceAll("$BUILDID", sBuildId);
|
||||
}
|
||||
|
||||
sVersion += "\n" + Application::GetHWOSConfInfo();
|
||||
sVersion += "\n" + Application::GetHWOSConfInfo();
|
||||
|
||||
bool const extra = EXTRA_BUILDID[0] != '\0';
|
||||
// extracted from the 'if' to avoid Clang -Wunreachable-code
|
||||
if (extra)
|
||||
{
|
||||
sVersion += "\n" EXTRA_BUILDID;
|
||||
}
|
||||
bool const extra = EXTRA_BUILDID[0] != '\0';
|
||||
// extracted from the 'if' to avoid Clang -Wunreachable-code
|
||||
if (extra) {
|
||||
sVersion += "\n" EXTRA_BUILDID;
|
||||
}
|
||||
|
||||
OUString sLocaleStr(CuiResId(RID_SVXSTR_ABOUT_LOCALE));
|
||||
if (sLocaleStr.indexOf("$LOCALE") == -1)
|
||||
{
|
||||
SAL_WARN( "cui.dialogs", "translated locale string in translations doesn't contain $LOCALE placeholder" );
|
||||
sLocaleStr += " $LOCALE";
|
||||
}
|
||||
sVersion += "\n" + sLocaleStr.replaceAll("$LOCALE", aLocaleStr);
|
||||
OUString sLocaleStr(CuiResId(RID_SVXSTR_ABOUT_LOCALE));
|
||||
if (sLocaleStr.indexOf("$LOCALE") == -1) {
|
||||
SAL_WARN("cui.dialogs", "translated locale string in translations doesn't "
|
||||
"contain $LOCALE placeholder");
|
||||
sLocaleStr += " $LOCALE";
|
||||
}
|
||||
sVersion += "\n" + sLocaleStr.replaceAll("$LOCALE", aLocaleStr);
|
||||
|
||||
OUString sUILocaleStr(CuiResId(RID_SVXSTR_ABOUT_UILOCALE));
|
||||
if (sUILocaleStr.indexOf("$LOCALE") == -1)
|
||||
{
|
||||
SAL_WARN( "cui.dialogs", "translated uilocale string in translations doesn't contain $LOCALE placeholder" );
|
||||
sUILocaleStr += " $LOCALE";
|
||||
}
|
||||
sVersion += "; " + sUILocaleStr.replaceAll("$LOCALE", aUILocaleStr);
|
||||
OUString sUILocaleStr(CuiResId(RID_SVXSTR_ABOUT_UILOCALE));
|
||||
if (sUILocaleStr.indexOf("$LOCALE") == -1) {
|
||||
SAL_WARN("cui.dialogs", "translated uilocale string in translations "
|
||||
"doesn't contain $LOCALE placeholder");
|
||||
sUILocaleStr += " $LOCALE";
|
||||
}
|
||||
sVersion += "; " + sUILocaleStr.replaceAll("$LOCALE", aUILocaleStr);
|
||||
|
||||
OUString aCalcMode = "Calc: "; // Calc calculation mode
|
||||
OUString aCalcMode = "Calc: "; // Calc calculation mode
|
||||
|
||||
#if HAVE_FEATURE_OPENCL
|
||||
bool bOpenCL = openclwrapper::GPUEnv::isOpenCLEnabled();
|
||||
if (bOpenCL)
|
||||
aCalcMode += "CL";
|
||||
bool bOpenCL = openclwrapper::GPUEnv::isOpenCLEnabled();
|
||||
if (bOpenCL)
|
||||
aCalcMode += "CL";
|
||||
#else
|
||||
const bool bOpenCL = false;
|
||||
const bool bOpenCL = false;
|
||||
#endif
|
||||
|
||||
static const bool bThreadingProhibited = std::getenv("SC_NO_THREADED_CALCULATION");
|
||||
bool bThreadedCalc = officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get();
|
||||
static const bool bThreadingProhibited =
|
||||
std::getenv("SC_NO_THREADED_CALCULATION");
|
||||
bool bThreadedCalc = officecfg::Office::Calc::Formula::Calculation::
|
||||
UseThreadedCalculationForFormulaGroups::get();
|
||||
|
||||
if (!bThreadingProhibited && !bOpenCL && bThreadedCalc)
|
||||
{
|
||||
if (!aCalcMode.endsWith(" "))
|
||||
aCalcMode += " ";
|
||||
aCalcMode += "threaded";
|
||||
}
|
||||
if (!bThreadingProhibited && !bOpenCL && bThreadedCalc) {
|
||||
if (!aCalcMode.endsWith(" "))
|
||||
aCalcMode += " ";
|
||||
aCalcMode += "threaded";
|
||||
}
|
||||
|
||||
sVersion += "\n" + aCalcMode;
|
||||
sVersion += "\n" + aCalcMode;
|
||||
|
||||
return sVersion;
|
||||
return sVersion;
|
||||
}
|
||||
|
||||
OUString AboutDialog::GetCopyrightString()
|
||||
{
|
||||
OUString sVendorTextStr(CuiResId(RID_SVXSTR_ABOUT_VENDOR));
|
||||
OUString aCopyrightString = sVendorTextStr + "\n"
|
||||
+ CuiResId(RID_SVXSTR_ABOUT_COPYRIGHT) + "\n";
|
||||
OUString AboutDialog::GetCopyrightString() {
|
||||
OUString sVendorTextStr(CuiResId(RID_SVXSTR_ABOUT_VENDOR));
|
||||
OUString aCopyrightString =
|
||||
sVendorTextStr + "\n" + CuiResId(RID_SVXSTR_ABOUT_COPYRIGHT) + "\n";
|
||||
|
||||
if (utl::ConfigManager::getProductName() == "LibreOffice")
|
||||
aCopyrightString += CuiResId(RID_SVXSTR_ABOUT_BASED_ON);
|
||||
else
|
||||
aCopyrightString += CuiResId(RID_SVXSTR_ABOUT_DERIVED);
|
||||
if (utl::ConfigManager::getProductName() == "LibreOffice")
|
||||
aCopyrightString += CuiResId(RID_SVXSTR_ABOUT_BASED_ON);
|
||||
else
|
||||
aCopyrightString += CuiResId(RID_SVXSTR_ABOUT_DERIVED);
|
||||
|
||||
return aCopyrightString;
|
||||
return aCopyrightString;
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
#include <align.hxx>
|
||||
#include "dlgfact.hxx"
|
||||
|
||||
#include <about.hxx>
|
||||
#include <sfx2/app.hxx>
|
||||
#include <sfx2/basedlgs.hxx>
|
||||
#include <sfx2/pageids.hxx>
|
||||
@ -85,7 +86,6 @@
|
||||
#include <screenshotannotationdlg.hxx>
|
||||
#include <hyphen.hxx>
|
||||
#include <thesdlg.hxx>
|
||||
#include <about.hxx>
|
||||
#include <tipofthedaydlg.hxx>
|
||||
#include <DiagramDialog.hxx>
|
||||
|
||||
@ -1022,11 +1022,6 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateVclDialog(weld::Wind
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateAboutDialog(weld::Window* pParent)
|
||||
{
|
||||
return VclPtr<CuiAbstractController_Impl>::Create(std::make_unique<AboutDialog>(pParent));
|
||||
}
|
||||
|
||||
VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateFrameDialog(weld::Window* pParent, const Reference< frame::XFrame >& rxFrame,
|
||||
sal_uInt32 nResId, const OUString& rParameter )
|
||||
{
|
||||
@ -1421,6 +1416,11 @@ short SvxMacroAssignDialog::Execute()
|
||||
return m_xDialog->run();
|
||||
}
|
||||
|
||||
short AbstractAboutDialog_Impl::Execute()
|
||||
{
|
||||
return m_xDlg->run();
|
||||
}
|
||||
|
||||
short AbstractTipOfTheDayDialog_Impl::Execute()
|
||||
{
|
||||
return m_xDlg->run();
|
||||
@ -1676,6 +1676,13 @@ VclPtr<AbstractQrCodeGenDialog> AbstractDialogFactory_Impl::CreateQrCodeGenDialo
|
||||
std::make_unique<QrCodeGenDialog>(pParent, xModel, bEditExisting));
|
||||
}
|
||||
|
||||
VclPtr<AbstractAboutDialog>
|
||||
AbstractDialogFactory_Impl::CreateAboutDialog(weld::Window* pParent)
|
||||
{
|
||||
return VclPtr<AbstractAboutDialog_Impl>::Create(
|
||||
std::make_unique<AboutDialog>(pParent));
|
||||
}
|
||||
|
||||
VclPtr<AbstractTipOfTheDayDialog>
|
||||
AbstractDialogFactory_Impl::CreateTipOfTheDayDialog(weld::Window* pParent)
|
||||
{
|
||||
|
||||
@ -26,6 +26,7 @@
|
||||
#include <tools/link.hxx>
|
||||
#include <com/sun/star/frame/XFrame.hpp>
|
||||
|
||||
#include <about.hxx>
|
||||
#include <cfgutil.hxx>
|
||||
#include <cui/cuicharmap.hxx>
|
||||
#include <cuifmsearch.hxx>
|
||||
@ -738,6 +739,20 @@ public:
|
||||
virtual short Execute() override;
|
||||
};
|
||||
|
||||
class AboutDialog;
|
||||
class AbstractAboutDialog_Impl : public AbstractAboutDialog
|
||||
{
|
||||
protected:
|
||||
std::unique_ptr<AboutDialog> m_xDlg;
|
||||
|
||||
public:
|
||||
explicit AbstractAboutDialog_Impl(std::unique_ptr<AboutDialog> p)
|
||||
: m_xDlg(std::move(p))
|
||||
{
|
||||
}
|
||||
virtual short Execute() override;
|
||||
};
|
||||
|
||||
class TipOfTheDayDialog;
|
||||
class AbstractTipOfTheDayDialog_Impl : public AbstractTipOfTheDayDialog
|
||||
{
|
||||
@ -774,8 +789,6 @@ class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory
|
||||
public:
|
||||
virtual VclPtr<VclAbstractDialog> CreateVclDialog(weld::Window* pParent, sal_uInt32 nResId) override;
|
||||
|
||||
virtual VclPtr<VclAbstractDialog> CreateAboutDialog(weld::Window* pParent) override;
|
||||
|
||||
virtual VclPtr<SfxAbstractDialog> CreateSfxDialog( weld::Window* pParent,
|
||||
const SfxItemSet& rAttr,
|
||||
const SdrView* pView,
|
||||
@ -954,6 +967,8 @@ public:
|
||||
CreateQrCodeGenDialog(weld::Window* pParent,
|
||||
const css::uno::Reference<css::frame::XModel> xModel, bool bEditExisting) override;
|
||||
|
||||
virtual VclPtr<AbstractAboutDialog> CreateAboutDialog(weld::Window* pParent) override;
|
||||
|
||||
virtual VclPtr<AbstractTipOfTheDayDialog> CreateTipOfTheDayDialog(weld::Window* pParent) override;
|
||||
|
||||
virtual VclPtr<AbstractDiagramDialog> CreateDiagramDialog(
|
||||
|
||||
@ -22,24 +22,18 @@
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/weld.hxx>
|
||||
|
||||
class AboutDialog : public weld::DialogController
|
||||
class AboutDialog : public weld::GenericDialogController
|
||||
{
|
||||
private:
|
||||
std::unique_ptr<weld::Builder> m_xBuilder;
|
||||
std::shared_ptr<weld::AboutDialog> m_xDialog;
|
||||
std::unique_ptr<weld::Container> m_xContentArea;
|
||||
std::unique_ptr<weld::Button> m_xCreditsButton;
|
||||
std::unique_ptr<weld::Button> m_xWebsiteButton;
|
||||
std::unique_ptr<weld::Button> m_xReleaseNotesButton;
|
||||
std::unique_ptr<weld::Button> m_xCloseButton;
|
||||
std::unique_ptr<weld::LinkButton> m_pCreditsButton;
|
||||
std::unique_ptr<weld::LinkButton> m_pWebsiteButton;
|
||||
std::unique_ptr<weld::LinkButton> m_pReleaseNotesButton;
|
||||
std::unique_ptr<weld::Button> m_pCloseButton;
|
||||
|
||||
BitmapEx aLogoBitmap;
|
||||
BitmapEx aBackgroundBitmap;
|
||||
|
||||
OUString m_buildIdLinkString;
|
||||
|
||||
void SetBuildIdLink();
|
||||
void SetLogo();
|
||||
std::unique_ptr<weld::Image> m_pBrandImage;
|
||||
std::unique_ptr<weld::Image> m_pAboutImage;
|
||||
std::unique_ptr<weld::Label> m_pVersionLabel;
|
||||
std::unique_ptr<weld::Label> m_pCopyrightLabel;
|
||||
|
||||
static OUString GetBuildId();
|
||||
static OUString GetVersionString();
|
||||
@ -49,11 +43,7 @@ private:
|
||||
|
||||
public:
|
||||
AboutDialog(weld::Window* pParent);
|
||||
virtual weld::Dialog* getDialog() override { return m_xDialog.get(); }
|
||||
virtual ~AboutDialog() override;
|
||||
|
||||
DECL_LINK(HandleClick, weld::Button&, void);
|
||||
DECL_LINK(SizeAllocHdl, const Size&, void);
|
||||
};
|
||||
|
||||
#endif // INCLUDED_CUI_SOURCE_INC_ABOUT_HXX
|
||||
|
||||
@ -1,36 +1,44 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Generated with glade 3.22.1 -->
|
||||
<!-- Generated with glade 3.22.2 -->
|
||||
<interface domain="cui">
|
||||
<requires lib="gtk+" version="3.18"/>
|
||||
<object class="GtkAboutDialog" id="AboutDialog">
|
||||
<requires lib="gtk+" version="3.20"/>
|
||||
<object class="GtkDialog" id="AboutDialog">
|
||||
<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="default_width">0</property>
|
||||
<property name="default_height">0</property>
|
||||
<property name="window_position">center-on-parent</property>
|
||||
<property name="type_hint">dialog</property>
|
||||
<property name="program_name">%PRODUCTNAME</property>
|
||||
<property name="comments" 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="website">https://www.libreoffice.org/</property>
|
||||
<property name="website_label" translatable="yes" context="aboutdialog|buildIdLink">See Log: $GITHASH</property>
|
||||
<property name="logo_icon_name">image-missing</property>
|
||||
<child>
|
||||
<child type="titlebar">
|
||||
<placeholder/>
|
||||
</child>
|
||||
<child internal-child="vbox">
|
||||
<object class="GtkBox" id="dialog-vbox1">
|
||||
<object class="GtkBox">
|
||||
<property name="can_focus">False</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<property name="spacing">6</property>
|
||||
<property name="spacing">12</property>
|
||||
<child internal-child="action_area">
|
||||
<object class="GtkButtonBox" id="dialog-action_area1">
|
||||
<property name="visible">True</property>
|
||||
<object class="GtkButtonBox">
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_top">12</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="layout_style">end</property>
|
||||
<child>
|
||||
<placeholder/>
|
||||
<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>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="pack_type">end</property>
|
||||
<property name="position">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
@ -40,7 +48,172 @@
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkGrid">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="vexpand">True</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="imAbout">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_right">12</property>
|
||||
<property name="hexpand">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="height">5</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkImage" id="imBrand">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_left">24</property>
|
||||
<property name="margin_top">24</property>
|
||||
<property name="margin_bottom">24</property>
|
||||
<property name="xalign">0</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="lbCopyright">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="valign">start</property>
|
||||
<property name="margin_bottom">6</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-2020 LibreOffice contributors.
|
||||
LibreOffice was based on OpenOffice.org</property>
|
||||
<property name="wrap">True</property>
|
||||
<property name="max_width_chars">50</property>
|
||||
<property name="xalign">0</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="lbAbout">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="valign">end</property>
|
||||
<property name="margin_top">12</property>
|
||||
<property name="margin_bottom">12</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="xalign">0</property>
|
||||
<attributes>
|
||||
<attribute name="weight" value="bold"/>
|
||||
</attributes>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="lbVersion">
|
||||
<property name="visible">True</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">Version: 7.0
|
||||
Build ID: 7.0
|
||||
CPU threads
|
||||
Locale:
|
||||
Calc:</property>
|
||||
<property name="wrap">True</property>
|
||||
<property name="selectable">True</property>
|
||||
<property name="ellipsize">end</property>
|
||||
<property name="max_width_chars">50</property>
|
||||
<property name="xalign">0</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="homogeneous">True</property>
|
||||
<child>
|
||||
<object class="GtkLinkButton" id="btnCredits">
|
||||
<property name="label" translatable="yes" context="aboutdialog|credits">Credits</property>
|
||||
<property name="visible">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>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<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="relief">none</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="uri">https://www.libreoffice.org/</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLinkButton" id="btnReleaseNotes">
|
||||
<property name="label" translatable="yes" context="aboutdialog|description">Release Notes</property>
|
||||
<property name="visible">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>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">4</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<action-widgets>
|
||||
<action-widget response="-7">btnClose</action-widget>
|
||||
</action-widgets>
|
||||
</object>
|
||||
</interface>
|
||||
|
||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 220 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 261 B After Width: | Height: | Size: 292 KiB |
271
icon-themes/colibre/brand/shell/logo.svg
Normal file
271
icon-themes/colibre/brand/shell/logo.svg
Normal file
@ -0,0 +1,271 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:ooo="http://xml.openoffice.org/svg/export"
|
||||
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="91.442924mm"
|
||||
height="17.53381mm"
|
||||
viewBox="0 0 9144.2926 1753.381"
|
||||
preserveAspectRatio="xMidYMid"
|
||||
xml:space="preserve"
|
||||
id="svg2"
|
||||
inkscape:version="0.92.4 5da689c313, 2019-01-14"
|
||||
sodipodi:docname="logo.svg"
|
||||
style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"><metadata
|
||||
id="metadata2770"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
|
||||
pagecolor="#000000"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="2933"
|
||||
inkscape:window-height="1131"
|
||||
id="namedview2768"
|
||||
showgrid="false"
|
||||
inkscape:zoom="2.7097031"
|
||||
inkscape:cx="342.02579"
|
||||
inkscape:cy="79.669673"
|
||||
inkscape:window-x="274"
|
||||
inkscape:window-y="77"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="g57"
|
||||
fit-margin-top="0"
|
||||
fit-margin-left="0"
|
||||
fit-margin-right="0"
|
||||
fit-margin-bottom="0"
|
||||
inkscape:pagecheckerboard="true"
|
||||
showguides="false" /><defs
|
||||
class="ClipPathGroup"
|
||||
id="defs4"><clipPath
|
||||
id="presentation_clip_path"
|
||||
clipPathUnits="userSpaceOnUse"><rect
|
||||
x="0"
|
||||
y="0"
|
||||
width="17145"
|
||||
height="2822"
|
||||
id="rect7" /></clipPath><clipPath
|
||||
id="presentation_clip_path_shrink"
|
||||
clipPathUnits="userSpaceOnUse"><rect
|
||||
x="17"
|
||||
y="2"
|
||||
width="17111"
|
||||
height="2817"
|
||||
id="rect10" /></clipPath></defs><defs
|
||||
class="TextShapeIndex"
|
||||
id="defs12"><g
|
||||
ooo:slide="id1"
|
||||
ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10 id11 id12 id13 id14 id15 id16 id17 id18 id19 id20 id21 id22 id23 id24 id25 id26 id27 id28 id29 id30 id31 id32 id33 id34 id35 id36 id37 id38 id39 id40 id41 id42 id43 id44 id45 id46 id47 id48 id49 id50 id51 id52 id53 id54 id55 id56 id57 id58 id59 id60 id61 id62 id63 id64 id65 id66 id67 id68 id69 id70 id71 id72 id73 id74 id75 id76 id77 id78 id79 id80 id81 id82 id83 id84 id85 id86 id87 id88 id89 id90 id91 id92 id93 id94 id95 id96 id97 id98 id99 id100 id101 id102 id103 id104 id105 id106 id107 id108 id109 id110 id111 id112 id113 id114 id115 id116 id117 id118 id119 id120 id121 id122 id123 id124 id125 id126 id127 id128 id129 id130 id131 id132 id133 id134 id135 id136 id137 id138 id139 id140 id141 id142 id143 id144 id145 id146 id147 id148 id149 id150 id151 id152 id153 id154 id155 id156 id157 id158 id159 id160 id161 id162 id163 id164 id165 id166 id167 id168 id169 id170 id171 id172 id173 id174 id175 id176 id177 id178 id179 id180 id181 id182 id183 id184 id185 id186 id187 id188 id189 id190 id191 id192 id193 id194 id195 id196 id197 id198 id199 id200 id201 id202 id203 id204 id205 id206 id207 id208 id209 id210 id211 id212 id213 id214 id215 id216 id217 id218 id219 id220 id221 id222 id223 id224 id225 id226 id227 id228 id229 id230 id231 id232 id233 id234 id235 id236 id237 id238 id239 id240 id241 id242 id243 id244 id245 id246 id247 id248 id249 id250 id251 id252 id253 id254 id255 id256 id257 id258 id259 id260 id261 id262 id263 id264 id265 id266 id267 id268 id269 id270 id271 id272 id273 id274 id275 id276 id277 id278 id279 id280 id281 id282 id283 id284 id285 id286 id287 id288 id289 id290 id291 id292 id293 id294 id295 id296 id297 id298 id299 id300 id301 id302 id303 id304 id305 id306 id307 id308 id309 id310 id311 id312 id313 id314 id315 id316 id317 id318 id319 id320 id321 id322 id323 id324 id325 id326 id327 id328 id329 id330 id331 id332 id333 id334 id335 id336 id337 id338 id339 id340 id341 id342 id343 id344 id345 id346 id347 id348 id349 id350 id351 id352 id353 id354 id355 id356 id357 id358 id359 id360 id361 id362 id363 id364 id365 id366 id367 id368 id369 id370 id371 id372 id373 id374 id375 id376 id377 id378 id379 id380 id381 id382 id383 id384 id385 id386 id387 id388 id389 id390 id391 id392 id393"
|
||||
id="g14" /></defs><defs
|
||||
class="EmbeddedBulletChars"
|
||||
id="defs16"><g
|
||||
id="bullet-char-template-57356"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 580,1141 1163,571 580,0 -4,571 Z"
|
||||
id="path19"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-57354"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 8,1128 H 1137 V 0 H 8 Z"
|
||||
id="path22"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-10146"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 174,0 602,739 174,1481 1456,739 Z M 1358,739 309,1346 659,739 Z"
|
||||
id="path25"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-10132"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 2015,739 1276,0 H 717 l 543,543 H 174 v 393 h 1086 l -543,545 h 557 z"
|
||||
id="path28"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-10007"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="m 0,-2 c -7,16 -16,29 -25,39 l 381,530 c -94,256 -141,385 -141,387 0,25 13,38 40,38 9,0 21,-2 34,-5 21,4 42,12 65,25 l 27,-13 111,-251 280,301 64,-25 24,25 c 21,-10 41,-24 62,-43 C 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 c 0,-27 -21,-55 -63,-84 l 16,-20 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 c -22,-34 -53,-51 -92,-51 -42,0 -63,17 -64,51 -7,9 -10,24 -10,44 0,9 1,19 2,30 z"
|
||||
id="path31"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-10004"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 c 0,78 14,145 41,201 34,71 87,106 158,106 53,0 88,-31 106,-94 l 23,-176 c 8,-64 28,-97 59,-98 l 735,706 c 11,11 33,17 66,17 42,0 63,-15 63,-46 V 965 c 0,-36 -10,-64 -30,-84 L 442,47 C 390,-6 338,-33 285,-33 Z"
|
||||
id="path34"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-9679"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 c 0,181 53,324 160,431 106,107 249,161 430,161 179,0 323,-54 432,-161 108,-107 162,-251 162,-431 0,-180 -54,-324 -162,-431 C 1136,54 992,0 813,0 Z"
|
||||
id="path37"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-8226"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="m 346,457 c -73,0 -137,26 -191,78 -54,51 -81,114 -81,188 0,73 27,136 81,188 54,52 118,78 191,78 73,0 134,-26 185,-79 51,-51 77,-114 77,-187 0,-75 -25,-137 -76,-188 -50,-52 -112,-78 -186,-78 z"
|
||||
id="path40"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-8211"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M -4,459 H 1135 V 606 H -4 Z"
|
||||
id="path43"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-61548"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="m 173,740 c 0,163 58,303 173,419 116,115 255,173 419,173 163,0 302,-58 418,-173 116,-116 174,-256 174,-419 0,-163 -58,-303 -174,-418 C 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577 173,740 Z"
|
||||
id="path46"
|
||||
inkscape:connector-curvature="0" /></g></defs><defs
|
||||
class="TextEmbeddedBitmaps"
|
||||
id="defs48" /><g
|
||||
id="g50"
|
||||
transform="translate(-3622.3661,-544.21894)"><g
|
||||
id="id2"
|
||||
class="Master_Slide"><g
|
||||
id="bg-id2"
|
||||
class="Background" /><g
|
||||
id="bo-id2"
|
||||
class="BackgroundObjects" /></g></g><g
|
||||
class="SlideGroup"
|
||||
id="g55"
|
||||
transform="translate(-3622.3661,-544.21894)"><g
|
||||
id="g57"><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2450"
|
||||
d="m 6114.4714,1853.011 h -306.384 v 43.293 h 126.55 v 392.971 h 51.619 v -392.971 h 128.215 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2464"
|
||||
d="m 6212.7134,2029.515 v -203.146 h -53.284 v 464.571 h 53.284 v -171.509 c 0,-64.94 36.633,-103.238 83.257,-103.238 49.953,0 61.609,28.308 61.609,88.252 v 186.495 h 51.619 v -203.146 c 0,-76.596 -33.302,-114.894 -98.242,-114.894 -44.959,0 -76.596,24.977 -98.243,56.615 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2478"
|
||||
d="m 6738.8944,2146.074 c 1.66,-11.656 1.66,-21.647 1.66,-29.973 0,-79.926 -39.963,-144.866 -118.224,-144.866 -83.257,0 -144.866,73.266 -144.866,168.178 0,106.568 61.609,158.187 144.866,158.187 38.298,0 66.605,-6.66 94.912,-18.316 l -4.99,-41.628 c -23.312,11.655 -54.95,18.316 -81.592,18.316 -59.944,0 -99.907,-38.298 -101.572,-109.898 z m -119.89,-133.211 c 46.624,0 69.936,38.298 69.936,91.582 h -156.522 c 8.32,-54.949 36.633,-91.582 86.586,-91.582 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2492"
|
||||
d="m 6952.0304,1858.006 v 427.938 c 29.972,5 74.931,6.66 108.234,6.66 128.2141,0 248.1041,-76.596 248.1041,-234.783 0,-139.871 -93.248,-208.141 -246.4391,-208.141 -33.303,0 -73.2659,1.66 -109.899,8.32 z m 51.6191,39.963 c 19.982,-3.33 39.9629,-4.99 63.275,-4.99 119.889,0 183.164,66.605 183.164,171.508 0,124.885 -83.2561,184.829 -183.164,184.829 -18.316,0 -39.9631,-1.66 -63.275,-3.33 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2506"
|
||||
d="m 7499.8575,1971.235 c -89.916,0 -144.866,71.601 -144.866,163.183 0,91.582 54.95,163.182 144.866,163.182 91.582,0 144.867,-71.6 144.867,-163.182 0,-91.582 -53.285,-163.183 -144.867,-163.183 z m 0,284.737 c -63.275,0 -89.916,-56.614 -89.916,-121.554 0,-64.94 26.641,-121.555 89.916,-121.555 63.275,0 89.917,56.615 89.917,121.555 0,64.94 -26.642,121.554 -89.917,121.554 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2520"
|
||||
d="m 7747.9625,2132.752 c 0,-78.261 44.958,-119.889 104.903,-119.889 29.972,0 58.279,6.66 79.926,18.317 l 4.99,-41.629 c -18.317,-9.99 -48.289,-18.316 -81.592,-18.316 -93.247,0 -163.182,58.28 -163.182,168.178 0,103.238 63.275,158.187 148.196,158.187 36.633,0 63.275,-4.99 94.913,-18.316 l -6.66,-41.628 c -24.977,11.655 -53.284,18.316 -79.927,18.316 -59.944,0 -101.572,-39.963 -101.572,-123.22 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2534"
|
||||
d="m 8195.8815,2239.321 1.66,51.619 h 49.954 v -313.044 h -51.619 v 171.508 c 0,64.94 -38.298,103.238 -84.922,103.238 -48.288,0 -59.944,-28.307 -59.944,-88.252 v -186.494 h -53.284 v 203.145 c 0,76.596 33.302,116.559 98.242,116.559 44.959,0 76.596,-26.642 98.243,-58.279 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2548"
|
||||
d="m 8705.4105,2097.785 v 193.155 h 51.6191 v -211.472 c 0,-68.27 -31.637,-108.233 -89.916,-108.233 -43.294,0 -78.2622,28.307 -98.243,69.935 h -1.6589 c -11.657,-43.293 -34.9692,-69.935 -83.258,-69.935 -43.2931,0 -69.9351,24.977 -91.5821,58.28 h -1.66 l -1.6611,-51.619 h -49.954 v 313.044 h 51.619 v -159.853 c 0,-69.935 29.972,-114.894 76.5961,-114.894 39.963,0 54.949,28.308 54.949,81.592 v 193.155 h 51.6189 v -159.853 c 0,-71.6 29.972,-114.894 76.596,-114.894 39.963,0 54.949,28.308 54.949,81.592 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2562"
|
||||
d="m 9085.0595,2146.074 c 1.6589,-11.656 1.6589,-21.647 1.6589,-29.973 0,-79.926 -39.9629,-144.866 -118.224,-144.866 -83.2559,0 -144.866,73.266 -144.866,168.178 0,106.568 61.6101,158.187 144.866,158.187 38.2982,0 66.606,-6.66 94.9132,-18.316 l -4.99,-41.628 c -23.3122,11.655 -54.95,18.316 -81.592,18.316 -59.944,0 -99.9072,-38.298 -99.9072,-109.898 z m -119.8891,-133.211 c 46.6241,0 69.936,38.298 69.936,91.582 h -156.5219 c 8.3301,-54.949 36.6331,-91.582 86.5859,-91.582 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2576"
|
||||
d="m 9213.2745,2029.515 -3.3301,-51.619 h -49.9528 v 313.044 h 53.2839 v -173.174 c 0,-63.275 36.6329,-101.573 83.2559,-101.573 49.954,0 61.61,28.308 61.61,88.252 v 186.495 h 51.619 v -204.811 c 0,-74.931 -33.303,-114.894 -98.243,-114.894 -44.958,0 -76.5958,26.642 -98.2419,58.28 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2590"
|
||||
d="m 9639.5474,1976.23 h -73.265 v -68.27 h -51.619 v 68.27 h -48.289 v 41.629 h 48.289 v 194.82 c 0,56.614 29.972,83.256 78.261,83.256 26.642,0 43.293,-3.33 56.614,-8.33 l -6.66,-39.963 c -9.99,5 -21.647,6.66 -33.303,6.66 -31.637,0 -43.293,-18.317 -43.293,-54.949 v -181.499 h 73.266 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2604"
|
||||
d="m 9905.9684,2289.275 v -196.486 h 149.8616 v -43.293 h -149.8616 v -153.192 h 171.5076 v -43.293 h -224.7916 v 436.264 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2618"
|
||||
d="m 10263.971,1971.235 c -89.917,0 -144.867,71.601 -144.867,163.183 0,91.582 54.95,163.182 144.867,163.182 91.582,0 144.866,-71.6 144.866,-163.182 0,-91.582 -53.284,-163.183 -144.866,-163.183 z m 0,284.737 c -63.275,0 -89.917,-56.614 -89.917,-121.554 0,-64.94 26.642,-121.555 89.917,-121.555 63.275,0 89.917,56.615 89.917,121.555 0,64.94 -26.642,121.554 -89.917,121.554 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2632"
|
||||
d="m 10673.592,2239.321 3.33,51.619 h 49.953 v -313.044 h -53.284 v 171.508 c 0,64.94 -36.633,103.238 -83.256,103.238 -48.289,0 -59.945,-28.307 -59.945,-88.252 v -186.494 h -53.284 v 203.145 c 0,76.596 33.303,116.559 98.243,116.559 44.958,0 76.596,-26.642 98.242,-58.279 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2646"
|
||||
d="m 10871.743,2029.515 -3.33,-51.619 h -49.954 v 313.044 h 53.284 v -173.174 c 0,-63.275 36.632,-101.573 83.257,-101.573 49.953,0 61.609,28.308 61.609,88.252 v 186.495 h 51.62 v -204.811 c 0,-74.931 -33.304,-114.894 -98.243,-114.894 -44.958,0 -76.597,26.642 -98.243,58.28 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2660"
|
||||
d="m 11367.951,2026.184 c -23.312,-38.298 -54.949,-53.284 -98.243,-53.284 -79.926,0 -134.875,68.27 -134.875,168.178 0,93.247 48.289,154.857 131.545,154.857 43.293,0 78.261,-19.981 101.573,-53.284 v 0 l 3.33,48.289 h 49.954 v -464.571 h -53.284 z m 0,126.55 c 0,54.949 -31.638,103.238 -84.922,103.238 -59.944,0 -93.247,-49.954 -93.247,-121.554 0,-73.266 31.638,-121.555 91.582,-121.555 48.289,0 86.587,43.294 86.587,103.238 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2674"
|
||||
d="m 11619.385,1971.235 c -29.972,0 -61.609,4.99 -93.247,18.316 l 5,41.629 c 29.972,-13.321 54.948,-18.317 81.59,-18.317 44.958,0 64.94,26.642 64.94,71.601 v 8.32 c -14.986,-1.66 -28.307,-3.33 -49.954,-3.33 -76.596,0 -134.875,39.963 -134.875,108.234 0,63.274 44.958,99.907 94.912,99.907 38.298,0 71.6,-21.646 88.253,-54.949 h 1.659 l 1.659,48.289 h 49.954 v -213.137 c 0,-69.935 -39.963,-106.568 -109.899,-106.568 z m 58.279,184.829 c 0,61.61 -31.637,99.908 -74.93,99.908 -31.637,0 -53.284,-24.977 -53.284,-63.275 0,-39.963 24.977,-68.27 86.587,-68.27 14.986,0 28.306,1.67 41.627,5 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2688"
|
||||
d="m 11959.072,1976.23 h -73.266 v -68.27 h -51.619 v 68.27 h -48.289 v 41.629 h 48.289 v 194.82 c 0,56.614 29.972,83.256 78.261,83.256 26.641,0 43.292,-3.33 54.948,-8.33 l -4.99,-39.963 c -9.99,5 -21.647,6.66 -33.303,6.66 -31.637,0 -43.293,-18.317 -43.293,-54.949 v -181.499 h 73.266 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2702"
|
||||
d="m 12032.337,2289.275 h 53.283 v -311.379 h -53.283 z m 26.642,-358.003 c 18.317,0 33.303,-14.986 33.303,-33.303 0,-18.316 -14.986,-33.302 -33.303,-33.302 -18.317,0 -33.303,14.986 -33.303,33.302 0,18.317 14.986,33.303 33.303,33.303 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2716"
|
||||
d="m 12302.087,1971.235 c -89.917,0 -144.866,71.601 -144.866,163.183 0,91.582 54.949,163.182 144.866,163.182 91.583,0 144.866,-71.6 144.866,-163.182 0,-91.582 -53.283,-163.183 -144.866,-163.183 z m 0,284.737 c -63.275,0 -89.917,-56.614 -89.917,-121.554 0,-64.94 26.642,-121.555 89.917,-121.555 63.276,0 89.918,56.615 89.918,121.555 0,64.94 -26.642,121.554 -89.918,121.554 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2730"
|
||||
d="m 12570.173,2029.515 -3.33,-51.619 h -49.954 v 313.044 h 53.284 v -173.174 c 0,-63.275 36.634,-101.573 83.257,-101.573 49.954,0 61.609,28.308 61.609,88.252 v 186.495 h 51.62 v -204.811 c 0,-74.931 -33.303,-114.894 -98.243,-114.894 -44.958,0 -76.597,26.642 -98.243,58.28 z" /><path
|
||||
style="fill:#18a303;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2296"
|
||||
d="M 5805.8552,625.89193 V 1658.272 h 666.052 V 1501.75 h -462.906 V 625.89193 Z" /><path
|
||||
style="fill:#18a303;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2310"
|
||||
d="m 6591.7962,1659.937 h 204.811 V 915.62495 h -204.811 z m 103.238,-807.58705 c 63.275,0 116.559,-51.61901 116.559,-118.22401 0,-63.27501 -53.284,-116.55901 -116.559,-116.55901 -66.605,0 -118.224,53.284 -118.224,116.55901 0,66.605 51.619,118.22401 118.224,118.22401 z" /><path
|
||||
style="fill:#18a303;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2324"
|
||||
d="m 7149.6142,1002.2109 h -3.3299 V 562.61693 h -203.146 V 1658.272 h 199.816 l 3.33,-86.587 h 3.3299 c 63.2741,71.601 128.2141,101.573 231.4521,101.573 198.151,0 328.031,-178.169 328.031,-399.631 0,-214.801 -116.559,-372.98906 -318.04,-372.98906 -108.233,0 -171.508,31.638 -241.4431,101.57296 z m -3.3299,268.0861 c 0,-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.945,231.453 -179.834,231.453 -104.903,0 -169.843,-81.591 -169.843,-213.137 z" /><path
|
||||
style="fill:#18a303;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2338"
|
||||
d="m 8253.5943,898.97294 c -96.577,6.66002 -189.824,64.94 -233.118,148.19706 h -1.66 l -4.99,-133.21105 h -199.815 V 1658.272 h 204.811 v -281.407 c 0,-148.196 26.642,-201.48 73.265,-234.783 41.628,-29.972 89.917,-41.628 156.522,-44.958 z" /><path
|
||||
style="fill:#18a303;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2352"
|
||||
d="m 8999.5725,1241.99 c 0,-184.83 -113.2293,-343.01706 -306.3841,-343.01706 -234.7831,0 -384.6451,161.51806 -384.6451,406.29206 0,239.778 154.8571,367.993 384.6451,367.993 108.2328,0 183.1639,-16.651 254.7649,-49.954 l -21.6469,-151.527 c -66.6051,28.308 -134.875,44.959 -208.1411,44.959 -123.2191,0 -201.481,-56.614 -209.8061,-173.173 h 481.2221 c 6.66,-26.643 9.9901,-69.936 9.9901,-101.573 z m -328.0313,-186.495 c 88.2521,0 129.88,71.601 131.545,148.197 h -286.4019 c 14.9871,-84.922 74.9311,-148.197 154.8569,-148.197 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2366"
|
||||
d="m 9612.339,610.90593 c -271.416,0 -496.207,199.815 -496.207,531.17607 0,331.361 224.791,531.176 496.207,531.176 274.746,0 497.874,-199.815 497.874,-531.176 0,-331.36107 -223.128,-531.17607 -497.874,-531.17607 z m 0,103.23801 c 204.811,0 358.004,153.19201 358.004,427.93806 0,276.411 -153.193,427.938 -358.004,427.938 -201.481,0 -356.338,-151.527 -356.338,-427.938 0,-274.74605 154.857,-427.93806 356.338,-427.93806 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2380"
|
||||
d="m 10303.369,873.99593 v 46.62401 h -119.89 v 96.57706 h 119.89 v 639.41 h 128.214 v -639.41 h 188.159 v -96.57706 h -188.159 v -66.605 c 0,-133.21 54.949,-211.47101 158.187,-211.47101 46.625,0 76.597,8.32001 104.904,18.316 l 13.32,-93.247 c -28.306,-11.656 -79.926,-21.647 -119.889,-21.647 -181.498,0 -284.736,116.55901 -284.736,328.03 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2394"
|
||||
d="m 10724.646,873.99593 v 46.62401 h -119.89 v 96.57706 h 119.89 v 639.41 h 128.214 v -639.41 h 188.161 v -96.57706 h -188.161 v -66.605 c 0,-133.21 54.95,-211.47101 158.189,-211.47101 46.623,0 76.595,8.32001 104.903,18.316 l 13.321,-93.247 c -26.642,-11.656 -78.262,-21.647 -119.891,-21.647 -181.498,0 -284.736,116.55901 -284.736,328.03 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2408"
|
||||
d="m 11185.887,1658.272 h 129.88 V 920.61994 h -129.88 z m 64.939,-845.88506 c 44.959,0 79.927,-34.968 79.927,-78.261 0,-44.959 -34.968,-79.92701 -79.927,-79.92701 -44.958,0 -79.925,34.96801 -79.925,79.92701 0,43.293 34.967,78.261 79.925,78.261 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2422"
|
||||
d="m 11577.192,1286.948 c 0,-186.494 111.563,-283.072 256.429,-283.072 74.932,0 141.536,16.652 196.486,43.294 l 13.321,-98.24306 c -46.623,-21.64699 -119.889,-43.293 -199.816,-43.293 -228.123,0 -399.631,138.20506 -399.631,397.96506 0,243.109 154.857,369.659 359.668,369.659 91.583,0 156.522,-9.99 231.453,-43.293 l -11.655,-96.578 c -64.941,29.973 -133.212,43.294 -196.485,43.294 -148.197,0 -249.77,-93.248 -249.77,-289.733 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2436"
|
||||
d="m 12759.433,1318.586 c 3.33,-26.642 4.99,-49.954 4.99,-73.266 0,-188.16 -99.908,-339.68606 -289.732,-339.68606 -204.811,0 -354.672,171.50806 -354.672,397.96506 0,249.77 149.861,369.659 354.672,369.659 91.582,0 159.852,-13.321 231.452,-43.293 l -11.655,-96.578 c -56.615,26.642 -138.206,43.294 -201.481,43.294 -146.531,0 -243.109,-89.917 -244.774,-258.095 z m -294.728,-314.71 c 111.563,0 173.173,91.582 173.173,214.802 h -384.645 c 18.317,-129.88 89.917,-214.802 211.472,-214.802 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2744"
|
||||
d="m 4664.7371,544.21994 c -16.652,0 -33.303,9.99 -39.964,26.642 -6.66,14.986 -3.33,33.302 8.33,44.958 l 366.329,366.328 c 11.656,13.322 29.972,16.652 46.623,9.99 14.986,-6.66 26.642,-21.646 26.642,-38.298 v -367.993 c 0,-21.647 -19.982,-41.628 -43.293,-41.628 z m 0,0 z" /><path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round;stroke-opacity:0"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2758"
|
||||
d="m 3665.6601,544.21994 c -23.312,0 -43.294,19.981 -43.294,43.293 V 2254.307 c 0,21.6459 19.982,41.628 43.294,43.293 h 1363.74 c 21.646,0 41.628,-21.6471 41.628,-43.293 V 1180.2989 c 0,-11.656 -3.33,-21.647 -11.656,-29.973 l -589.455,-592.78496 c -8.33,-8.33 -19.982,-13.321 -31.638,-13.321 z m 41.628,86.586 h 712.675 l 566.143,567.80896 v 1012.398 h -1278.818 z m 0,0 z" /></g></g></svg>
|
||||
|
After Width: | Height: | Size: 26 KiB |
271
icon-themes/colibre/brand/shell/logo_inverted.svg
Normal file
271
icon-themes/colibre/brand/shell/logo_inverted.svg
Normal file
@ -0,0 +1,271 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:ooo="http://xml.openoffice.org/svg/export"
|
||||
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="91.442924mm"
|
||||
height="17.53381mm"
|
||||
viewBox="0 0 9144.2926 1753.381"
|
||||
preserveAspectRatio="xMidYMid"
|
||||
xml:space="preserve"
|
||||
id="svg2"
|
||||
inkscape:version="0.92.4 5da689c313, 2019-01-14"
|
||||
sodipodi:docname="logo_inverted.svg"
|
||||
style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"><metadata
|
||||
id="metadata2770"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
|
||||
pagecolor="#000000"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="2933"
|
||||
inkscape:window-height="1131"
|
||||
id="namedview2768"
|
||||
showgrid="false"
|
||||
inkscape:zoom="2.7097031"
|
||||
inkscape:cx="342.02579"
|
||||
inkscape:cy="79.669673"
|
||||
inkscape:window-x="274"
|
||||
inkscape:window-y="77"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="g57"
|
||||
fit-margin-top="0"
|
||||
fit-margin-left="0"
|
||||
fit-margin-right="0"
|
||||
fit-margin-bottom="0"
|
||||
inkscape:pagecheckerboard="true"
|
||||
showguides="false" /><defs
|
||||
class="ClipPathGroup"
|
||||
id="defs4"><clipPath
|
||||
id="presentation_clip_path"
|
||||
clipPathUnits="userSpaceOnUse"><rect
|
||||
x="0"
|
||||
y="0"
|
||||
width="17145"
|
||||
height="2822"
|
||||
id="rect7" /></clipPath><clipPath
|
||||
id="presentation_clip_path_shrink"
|
||||
clipPathUnits="userSpaceOnUse"><rect
|
||||
x="17"
|
||||
y="2"
|
||||
width="17111"
|
||||
height="2817"
|
||||
id="rect10" /></clipPath></defs><defs
|
||||
class="TextShapeIndex"
|
||||
id="defs12"><g
|
||||
ooo:slide="id1"
|
||||
ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10 id11 id12 id13 id14 id15 id16 id17 id18 id19 id20 id21 id22 id23 id24 id25 id26 id27 id28 id29 id30 id31 id32 id33 id34 id35 id36 id37 id38 id39 id40 id41 id42 id43 id44 id45 id46 id47 id48 id49 id50 id51 id52 id53 id54 id55 id56 id57 id58 id59 id60 id61 id62 id63 id64 id65 id66 id67 id68 id69 id70 id71 id72 id73 id74 id75 id76 id77 id78 id79 id80 id81 id82 id83 id84 id85 id86 id87 id88 id89 id90 id91 id92 id93 id94 id95 id96 id97 id98 id99 id100 id101 id102 id103 id104 id105 id106 id107 id108 id109 id110 id111 id112 id113 id114 id115 id116 id117 id118 id119 id120 id121 id122 id123 id124 id125 id126 id127 id128 id129 id130 id131 id132 id133 id134 id135 id136 id137 id138 id139 id140 id141 id142 id143 id144 id145 id146 id147 id148 id149 id150 id151 id152 id153 id154 id155 id156 id157 id158 id159 id160 id161 id162 id163 id164 id165 id166 id167 id168 id169 id170 id171 id172 id173 id174 id175 id176 id177 id178 id179 id180 id181 id182 id183 id184 id185 id186 id187 id188 id189 id190 id191 id192 id193 id194 id195 id196 id197 id198 id199 id200 id201 id202 id203 id204 id205 id206 id207 id208 id209 id210 id211 id212 id213 id214 id215 id216 id217 id218 id219 id220 id221 id222 id223 id224 id225 id226 id227 id228 id229 id230 id231 id232 id233 id234 id235 id236 id237 id238 id239 id240 id241 id242 id243 id244 id245 id246 id247 id248 id249 id250 id251 id252 id253 id254 id255 id256 id257 id258 id259 id260 id261 id262 id263 id264 id265 id266 id267 id268 id269 id270 id271 id272 id273 id274 id275 id276 id277 id278 id279 id280 id281 id282 id283 id284 id285 id286 id287 id288 id289 id290 id291 id292 id293 id294 id295 id296 id297 id298 id299 id300 id301 id302 id303 id304 id305 id306 id307 id308 id309 id310 id311 id312 id313 id314 id315 id316 id317 id318 id319 id320 id321 id322 id323 id324 id325 id326 id327 id328 id329 id330 id331 id332 id333 id334 id335 id336 id337 id338 id339 id340 id341 id342 id343 id344 id345 id346 id347 id348 id349 id350 id351 id352 id353 id354 id355 id356 id357 id358 id359 id360 id361 id362 id363 id364 id365 id366 id367 id368 id369 id370 id371 id372 id373 id374 id375 id376 id377 id378 id379 id380 id381 id382 id383 id384 id385 id386 id387 id388 id389 id390 id391 id392 id393"
|
||||
id="g14" /></defs><defs
|
||||
class="EmbeddedBulletChars"
|
||||
id="defs16"><g
|
||||
id="bullet-char-template-57356"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 580,1141 1163,571 580,0 -4,571 Z"
|
||||
id="path19"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-57354"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 8,1128 H 1137 V 0 H 8 Z"
|
||||
id="path22"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-10146"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 174,0 602,739 174,1481 1456,739 Z M 1358,739 309,1346 659,739 Z"
|
||||
id="path25"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-10132"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 2015,739 1276,0 H 717 l 543,543 H 174 v 393 h 1086 l -543,545 h 557 z"
|
||||
id="path28"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-10007"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="m 0,-2 c -7,16 -16,29 -25,39 l 381,530 c -94,256 -141,385 -141,387 0,25 13,38 40,38 9,0 21,-2 34,-5 21,4 42,12 65,25 l 27,-13 111,-251 280,301 64,-25 24,25 c 21,-10 41,-24 62,-43 C 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 c 0,-27 -21,-55 -63,-84 l 16,-20 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 c -22,-34 -53,-51 -92,-51 -42,0 -63,17 -64,51 -7,9 -10,24 -10,44 0,9 1,19 2,30 z"
|
||||
id="path31"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-10004"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 c 0,78 14,145 41,201 34,71 87,106 158,106 53,0 88,-31 106,-94 l 23,-176 c 8,-64 28,-97 59,-98 l 735,706 c 11,11 33,17 66,17 42,0 63,-15 63,-46 V 965 c 0,-36 -10,-64 -30,-84 L 442,47 C 390,-6 338,-33 285,-33 Z"
|
||||
id="path34"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-9679"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 c 0,181 53,324 160,431 106,107 249,161 430,161 179,0 323,-54 432,-161 108,-107 162,-251 162,-431 0,-180 -54,-324 -162,-431 C 1136,54 992,0 813,0 Z"
|
||||
id="path37"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-8226"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="m 346,457 c -73,0 -137,26 -191,78 -54,51 -81,114 -81,188 0,73 27,136 81,188 54,52 118,78 191,78 73,0 134,-26 185,-79 51,-51 77,-114 77,-187 0,-75 -25,-137 -76,-188 -50,-52 -112,-78 -186,-78 z"
|
||||
id="path40"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-8211"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="M -4,459 H 1135 V 606 H -4 Z"
|
||||
id="path43"
|
||||
inkscape:connector-curvature="0" /></g><g
|
||||
id="bullet-char-template-61548"
|
||||
transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path
|
||||
d="m 173,740 c 0,163 58,303 173,419 116,115 255,173 419,173 163,0 302,-58 418,-173 116,-116 174,-256 174,-419 0,-163 -58,-303 -174,-418 C 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577 173,740 Z"
|
||||
id="path46"
|
||||
inkscape:connector-curvature="0" /></g></defs><defs
|
||||
class="TextEmbeddedBitmaps"
|
||||
id="defs48" /><g
|
||||
id="g50"
|
||||
transform="translate(-3622.3661,-544.21894)"><g
|
||||
id="id2"
|
||||
class="Master_Slide"><g
|
||||
id="bg-id2"
|
||||
class="Background" /><g
|
||||
id="bo-id2"
|
||||
class="BackgroundObjects" /></g></g><g
|
||||
class="SlideGroup"
|
||||
id="g55"
|
||||
transform="translate(-3622.3661,-544.21894)"><g
|
||||
id="g57"><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2450"
|
||||
d="m 6114.4714,1853.011 h -306.384 v 43.293 h 126.55 v 392.971 h 51.619 v -392.971 h 128.215 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2464"
|
||||
d="m 6212.7134,2029.515 v -203.146 h -53.284 v 464.571 h 53.284 v -171.509 c 0,-64.94 36.633,-103.238 83.257,-103.238 49.953,0 61.609,28.308 61.609,88.252 v 186.495 h 51.619 v -203.146 c 0,-76.596 -33.302,-114.894 -98.242,-114.894 -44.959,0 -76.596,24.977 -98.243,56.615 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2478"
|
||||
d="m 6738.8944,2146.074 c 1.66,-11.656 1.66,-21.647 1.66,-29.973 0,-79.926 -39.963,-144.866 -118.224,-144.866 -83.257,0 -144.866,73.266 -144.866,168.178 0,106.568 61.609,158.187 144.866,158.187 38.298,0 66.605,-6.66 94.912,-18.316 l -4.99,-41.628 c -23.312,11.655 -54.95,18.316 -81.592,18.316 -59.944,0 -99.907,-38.298 -101.572,-109.898 z m -119.89,-133.211 c 46.624,0 69.936,38.298 69.936,91.582 h -156.522 c 8.32,-54.949 36.633,-91.582 86.586,-91.582 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2492"
|
||||
d="m 6952.0304,1858.006 v 427.938 c 29.972,5 74.931,6.66 108.234,6.66 128.2141,0 248.1041,-76.596 248.1041,-234.783 0,-139.871 -93.248,-208.141 -246.4391,-208.141 -33.303,0 -73.2659,1.66 -109.899,8.32 z m 51.6191,39.963 c 19.982,-3.33 39.9629,-4.99 63.275,-4.99 119.889,0 183.164,66.605 183.164,171.508 0,124.885 -83.2561,184.829 -183.164,184.829 -18.316,0 -39.9631,-1.66 -63.275,-3.33 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2506"
|
||||
d="m 7499.8575,1971.235 c -89.916,0 -144.866,71.601 -144.866,163.183 0,91.582 54.95,163.182 144.866,163.182 91.582,0 144.867,-71.6 144.867,-163.182 0,-91.582 -53.285,-163.183 -144.867,-163.183 z m 0,284.737 c -63.275,0 -89.916,-56.614 -89.916,-121.554 0,-64.94 26.641,-121.555 89.916,-121.555 63.275,0 89.917,56.615 89.917,121.555 0,64.94 -26.642,121.554 -89.917,121.554 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2520"
|
||||
d="m 7747.9625,2132.752 c 0,-78.261 44.958,-119.889 104.903,-119.889 29.972,0 58.279,6.66 79.926,18.317 l 4.99,-41.629 c -18.317,-9.99 -48.289,-18.316 -81.592,-18.316 -93.247,0 -163.182,58.28 -163.182,168.178 0,103.238 63.275,158.187 148.196,158.187 36.633,0 63.275,-4.99 94.913,-18.316 l -6.66,-41.628 c -24.977,11.655 -53.284,18.316 -79.927,18.316 -59.944,0 -101.572,-39.963 -101.572,-123.22 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2534"
|
||||
d="m 8195.8815,2239.321 1.66,51.619 h 49.954 v -313.044 h -51.619 v 171.508 c 0,64.94 -38.298,103.238 -84.922,103.238 -48.288,0 -59.944,-28.307 -59.944,-88.252 v -186.494 h -53.284 v 203.145 c 0,76.596 33.302,116.559 98.242,116.559 44.959,0 76.596,-26.642 98.243,-58.279 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2548"
|
||||
d="m 8705.4105,2097.785 v 193.155 h 51.6191 v -211.472 c 0,-68.27 -31.637,-108.233 -89.916,-108.233 -43.294,0 -78.2622,28.307 -98.243,69.935 h -1.6589 c -11.657,-43.293 -34.9692,-69.935 -83.258,-69.935 -43.2931,0 -69.9351,24.977 -91.5821,58.28 h -1.66 l -1.6611,-51.619 h -49.954 v 313.044 h 51.619 v -159.853 c 0,-69.935 29.972,-114.894 76.5961,-114.894 39.963,0 54.949,28.308 54.949,81.592 v 193.155 h 51.6189 v -159.853 c 0,-71.6 29.972,-114.894 76.596,-114.894 39.963,0 54.949,28.308 54.949,81.592 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2562"
|
||||
d="m 9085.0595,2146.074 c 1.6589,-11.656 1.6589,-21.647 1.6589,-29.973 0,-79.926 -39.9629,-144.866 -118.224,-144.866 -83.2559,0 -144.866,73.266 -144.866,168.178 0,106.568 61.6101,158.187 144.866,158.187 38.2982,0 66.606,-6.66 94.9132,-18.316 l -4.99,-41.628 c -23.3122,11.655 -54.95,18.316 -81.592,18.316 -59.944,0 -99.9072,-38.298 -99.9072,-109.898 z m -119.8891,-133.211 c 46.6241,0 69.936,38.298 69.936,91.582 h -156.5219 c 8.3301,-54.949 36.6331,-91.582 86.5859,-91.582 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2576"
|
||||
d="m 9213.2745,2029.515 -3.3301,-51.619 h -49.9528 v 313.044 h 53.2839 v -173.174 c 0,-63.275 36.6329,-101.573 83.2559,-101.573 49.954,0 61.61,28.308 61.61,88.252 v 186.495 h 51.619 v -204.811 c 0,-74.931 -33.303,-114.894 -98.243,-114.894 -44.958,0 -76.5958,26.642 -98.2419,58.28 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2590"
|
||||
d="m 9639.5474,1976.23 h -73.265 v -68.27 h -51.619 v 68.27 h -48.289 v 41.629 h 48.289 v 194.82 c 0,56.614 29.972,83.256 78.261,83.256 26.642,0 43.293,-3.33 56.614,-8.33 l -6.66,-39.963 c -9.99,5 -21.647,6.66 -33.303,6.66 -31.637,0 -43.293,-18.317 -43.293,-54.949 v -181.499 h 73.266 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2604"
|
||||
d="m 9905.9684,2289.275 v -196.486 h 149.8616 v -43.293 h -149.8616 v -153.192 h 171.5076 v -43.293 h -224.7916 v 436.264 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2618"
|
||||
d="m 10263.971,1971.235 c -89.917,0 -144.867,71.601 -144.867,163.183 0,91.582 54.95,163.182 144.867,163.182 91.582,0 144.866,-71.6 144.866,-163.182 0,-91.582 -53.284,-163.183 -144.866,-163.183 z m 0,284.737 c -63.275,0 -89.917,-56.614 -89.917,-121.554 0,-64.94 26.642,-121.555 89.917,-121.555 63.275,0 89.917,56.615 89.917,121.555 0,64.94 -26.642,121.554 -89.917,121.554 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2632"
|
||||
d="m 10673.592,2239.321 3.33,51.619 h 49.953 v -313.044 h -53.284 v 171.508 c 0,64.94 -36.633,103.238 -83.256,103.238 -48.289,0 -59.945,-28.307 -59.945,-88.252 v -186.494 h -53.284 v 203.145 c 0,76.596 33.303,116.559 98.243,116.559 44.958,0 76.596,-26.642 98.242,-58.279 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2646"
|
||||
d="m 10871.743,2029.515 -3.33,-51.619 h -49.954 v 313.044 h 53.284 v -173.174 c 0,-63.275 36.632,-101.573 83.257,-101.573 49.953,0 61.609,28.308 61.609,88.252 v 186.495 h 51.62 v -204.811 c 0,-74.931 -33.304,-114.894 -98.243,-114.894 -44.958,0 -76.597,26.642 -98.243,58.28 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2660"
|
||||
d="m 11367.951,2026.184 c -23.312,-38.298 -54.949,-53.284 -98.243,-53.284 -79.926,0 -134.875,68.27 -134.875,168.178 0,93.247 48.289,154.857 131.545,154.857 43.293,0 78.261,-19.981 101.573,-53.284 v 0 l 3.33,48.289 h 49.954 v -464.571 h -53.284 z m 0,126.55 c 0,54.949 -31.638,103.238 -84.922,103.238 -59.944,0 -93.247,-49.954 -93.247,-121.554 0,-73.266 31.638,-121.555 91.582,-121.555 48.289,0 86.587,43.294 86.587,103.238 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2674"
|
||||
d="m 11619.385,1971.235 c -29.972,0 -61.609,4.99 -93.247,18.316 l 5,41.629 c 29.972,-13.321 54.948,-18.317 81.59,-18.317 44.958,0 64.94,26.642 64.94,71.601 v 8.32 c -14.986,-1.66 -28.307,-3.33 -49.954,-3.33 -76.596,0 -134.875,39.963 -134.875,108.234 0,63.274 44.958,99.907 94.912,99.907 38.298,0 71.6,-21.646 88.253,-54.949 h 1.659 l 1.659,48.289 h 49.954 v -213.137 c 0,-69.935 -39.963,-106.568 -109.899,-106.568 z m 58.279,184.829 c 0,61.61 -31.637,99.908 -74.93,99.908 -31.637,0 -53.284,-24.977 -53.284,-63.275 0,-39.963 24.977,-68.27 86.587,-68.27 14.986,0 28.306,1.67 41.627,5 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2688"
|
||||
d="m 11959.072,1976.23 h -73.266 v -68.27 h -51.619 v 68.27 h -48.289 v 41.629 h 48.289 v 194.82 c 0,56.614 29.972,83.256 78.261,83.256 26.641,0 43.292,-3.33 54.948,-8.33 l -4.99,-39.963 c -9.99,5 -21.647,6.66 -33.303,6.66 -31.637,0 -43.293,-18.317 -43.293,-54.949 v -181.499 h 73.266 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2702"
|
||||
d="m 12032.337,2289.275 h 53.283 v -311.379 h -53.283 z m 26.642,-358.003 c 18.317,0 33.303,-14.986 33.303,-33.303 0,-18.316 -14.986,-33.302 -33.303,-33.302 -18.317,0 -33.303,14.986 -33.303,33.302 0,18.317 14.986,33.303 33.303,33.303 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2716"
|
||||
d="m 12302.087,1971.235 c -89.917,0 -144.866,71.601 -144.866,163.183 0,91.582 54.949,163.182 144.866,163.182 91.583,0 144.866,-71.6 144.866,-163.182 0,-91.582 -53.283,-163.183 -144.866,-163.183 z m 0,284.737 c -63.275,0 -89.917,-56.614 -89.917,-121.554 0,-64.94 26.642,-121.555 89.917,-121.555 63.276,0 89.918,56.615 89.918,121.555 0,64.94 -26.642,121.554 -89.918,121.554 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2730"
|
||||
d="m 12570.173,2029.515 -3.33,-51.619 h -49.954 v 313.044 h 53.284 v -173.174 c 0,-63.275 36.634,-101.573 83.257,-101.573 49.954,0 61.609,28.308 61.609,88.252 v 186.495 h 51.62 v -204.811 c 0,-74.931 -33.303,-114.894 -98.243,-114.894 -44.958,0 -76.597,26.642 -98.243,58.28 z" /><path
|
||||
style="fill:#18a303;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2296"
|
||||
d="M 5805.8552,625.89193 V 1658.272 h 666.052 V 1501.75 h -462.906 V 625.89193 Z" /><path
|
||||
style="fill:#18a303;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2310"
|
||||
d="m 6591.7962,1659.937 h 204.811 V 915.62495 h -204.811 z m 103.238,-807.58705 c 63.275,0 116.559,-51.61901 116.559,-118.22401 0,-63.27501 -53.284,-116.55901 -116.559,-116.55901 -66.605,0 -118.224,53.284 -118.224,116.55901 0,66.605 51.619,118.22401 118.224,118.22401 z" /><path
|
||||
style="fill:#18a303;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2324"
|
||||
d="m 7149.6142,1002.2109 h -3.3299 V 562.61693 h -203.146 V 1658.272 h 199.816 l 3.33,-86.587 h 3.3299 c 63.2741,71.601 128.2141,101.573 231.4521,101.573 198.151,0 328.031,-178.169 328.031,-399.631 0,-214.801 -116.559,-372.98906 -318.04,-372.98906 -108.233,0 -171.508,31.638 -241.4431,101.57296 z m -3.3299,268.0861 c 0,-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.945,231.453 -179.834,231.453 -104.903,0 -169.843,-81.591 -169.843,-213.137 z" /><path
|
||||
style="fill:#18a303;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2338"
|
||||
d="m 8253.5943,898.97294 c -96.577,6.66002 -189.824,64.94 -233.118,148.19706 h -1.66 l -4.99,-133.21105 h -199.815 V 1658.272 h 204.811 v -281.407 c 0,-148.196 26.642,-201.48 73.265,-234.783 41.628,-29.972 89.917,-41.628 156.522,-44.958 z" /><path
|
||||
style="fill:#18a303;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2352"
|
||||
d="m 8999.5725,1241.99 c 0,-184.83 -113.2293,-343.01706 -306.3841,-343.01706 -234.7831,0 -384.6451,161.51806 -384.6451,406.29206 0,239.778 154.8571,367.993 384.6451,367.993 108.2328,0 183.1639,-16.651 254.7649,-49.954 l -21.6469,-151.527 c -66.6051,28.308 -134.875,44.959 -208.1411,44.959 -123.2191,0 -201.481,-56.614 -209.8061,-173.173 h 481.2221 c 6.66,-26.643 9.9901,-69.936 9.9901,-101.573 z m -328.0313,-186.495 c 88.2521,0 129.88,71.601 131.545,148.197 h -286.4019 c 14.9871,-84.922 74.9311,-148.197 154.8569,-148.197 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2366"
|
||||
d="m 9612.339,610.90593 c -271.416,0 -496.207,199.815 -496.207,531.17607 0,331.361 224.791,531.176 496.207,531.176 274.746,0 497.874,-199.815 497.874,-531.176 0,-331.36107 -223.128,-531.17607 -497.874,-531.17607 z m 0,103.23801 c 204.811,0 358.004,153.19201 358.004,427.93806 0,276.411 -153.193,427.938 -358.004,427.938 -201.481,0 -356.338,-151.527 -356.338,-427.938 0,-274.74605 154.857,-427.93806 356.338,-427.93806 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2380"
|
||||
d="m 10303.369,873.99593 v 46.62401 h -119.89 v 96.57706 h 119.89 v 639.41 h 128.214 v -639.41 h 188.159 v -96.57706 h -188.159 v -66.605 c 0,-133.21 54.949,-211.47101 158.187,-211.47101 46.625,0 76.597,8.32001 104.904,18.316 l 13.32,-93.247 c -28.306,-11.656 -79.926,-21.647 -119.889,-21.647 -181.498,0 -284.736,116.55901 -284.736,328.03 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2394"
|
||||
d="m 10724.646,873.99593 v 46.62401 h -119.89 v 96.57706 h 119.89 v 639.41 h 128.214 v -639.41 h 188.161 v -96.57706 h -188.161 v -66.605 c 0,-133.21 54.95,-211.47101 158.189,-211.47101 46.623,0 76.595,8.32001 104.903,18.316 l 13.321,-93.247 c -26.642,-11.656 -78.262,-21.647 -119.891,-21.647 -181.498,0 -284.736,116.55901 -284.736,328.03 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2408"
|
||||
d="m 11185.887,1658.272 h 129.88 V 920.61994 h -129.88 z m 64.939,-845.88506 c 44.959,0 79.927,-34.968 79.927,-78.261 0,-44.959 -34.968,-79.92701 -79.927,-79.92701 -44.958,0 -79.925,34.96801 -79.925,79.92701 0,43.293 34.967,78.261 79.925,78.261 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2422"
|
||||
d="m 11577.192,1286.948 c 0,-186.494 111.563,-283.072 256.429,-283.072 74.932,0 141.536,16.652 196.486,43.294 l 13.321,-98.24306 c -46.623,-21.64699 -119.889,-43.293 -199.816,-43.293 -228.123,0 -399.631,138.20506 -399.631,397.96506 0,243.109 154.857,369.659 359.668,369.659 91.583,0 156.522,-9.99 231.453,-43.293 l -11.655,-96.578 c -64.941,29.973 -133.212,43.294 -196.485,43.294 -148.197,0 -249.77,-93.248 -249.77,-289.733 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2436"
|
||||
d="m 12759.433,1318.586 c 3.33,-26.642 4.99,-49.954 4.99,-73.266 0,-188.16 -99.908,-339.68606 -289.732,-339.68606 -204.811,0 -354.672,171.50806 -354.672,397.96506 0,249.77 149.861,369.659 354.672,369.659 91.582,0 159.852,-13.321 231.452,-43.293 l -11.655,-96.578 c -56.615,26.642 -138.206,43.294 -201.481,43.294 -146.531,0 -243.109,-89.917 -244.774,-258.095 z m -294.728,-314.71 c 111.563,0 173.173,91.582 173.173,214.802 h -384.645 c 18.317,-129.88 89.917,-214.802 211.472,-214.802 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2744"
|
||||
d="m 4664.7371,544.21994 c -16.652,0 -33.303,9.99 -39.964,26.642 -6.66,14.986 -3.33,33.302 8.33,44.958 l 366.329,366.328 c 11.656,13.322 29.972,16.652 46.623,9.99 14.986,-6.66 26.642,-21.646 26.642,-38.298 v -367.993 c 0,-21.647 -19.982,-41.628 -43.293,-41.628 z m 0,0 z" /><path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:46.99325562;stroke-linejoin:round;stroke-opacity:0"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path2758"
|
||||
d="m 3665.6601,544.21994 c -23.312,0 -43.294,19.981 -43.294,43.293 V 2254.307 c 0,21.6459 19.982,41.628 43.294,43.293 h 1363.74 c 21.646,0 41.628,-21.6471 41.628,-43.293 V 1180.2989 c 0,-11.656 -3.33,-21.647 -11.656,-29.973 l -589.455,-592.78496 c -8.33,-8.33 -19.982,-13.321 -31.638,-13.321 z m 41.628,86.586 h 712.675 l 566.143,567.80896 v 1012.398 h -1278.818 z m 0,0 z" /></g></g></svg>
|
||||
|
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB |
@ -135,7 +135,6 @@ public:
|
||||
virtual VclPtr<SfxAbstractPasteDialog> CreatePasteDialog(weld::Window* pParent) = 0;
|
||||
virtual VclPtr<SfxAbstractLinksDialog> CreateLinksDialog(weld::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=nullptr) = 0;
|
||||
virtual VclPtr<VclAbstractDialog> CreateSvxScriptOrgDialog(weld::Window* pParent, const OUString& rLanguage) = 0;
|
||||
virtual VclPtr<VclAbstractDialog> CreateAboutDialog(weld::Window* pParent) = 0;
|
||||
|
||||
virtual VclPtr<AbstractScriptSelectorDialog> CreateScriptSelectorDialog(weld::Window* pParent,
|
||||
const css::uno::Reference< css::frame::XFrame >& rxFrame) = 0;
|
||||
|
||||
@ -125,6 +125,12 @@ protected:
|
||||
virtual ~AbstractQrCodeGenDialog() override = default;
|
||||
};
|
||||
|
||||
class VCL_DLLPUBLIC AbstractAboutDialog : public VclAbstractDialog
|
||||
{
|
||||
protected:
|
||||
virtual ~AbstractAboutDialog() override = default;
|
||||
};
|
||||
|
||||
class VCL_DLLPUBLIC AbstractTipOfTheDayDialog : public VclAbstractDialog
|
||||
{
|
||||
protected:
|
||||
@ -173,6 +179,10 @@ public:
|
||||
virtual VclPtr<AbstractScreenshotAnnotationDlg> CreateScreenshotAnnotationDlg(
|
||||
weld::Dialog& rParentDialog) = 0;
|
||||
|
||||
// create about dialog
|
||||
virtual VclPtr<AbstractAboutDialog>
|
||||
CreateAboutDialog(weld::Window* pParent) = 0;
|
||||
|
||||
// create info dialog to show tip-of-the-day
|
||||
virtual VclPtr<AbstractTipOfTheDayDialog>
|
||||
CreateTipOfTheDayDialog(weld::Window* pParent) = 0;
|
||||
|
||||
@ -2132,9 +2132,6 @@ public:
|
||||
bool bTakeOwnership = true)
|
||||
= 0;
|
||||
virtual std::unique_ptr<Dialog> weld_dialog(const OString& id, bool bTakeOwnership = true) = 0;
|
||||
virtual std::unique_ptr<AboutDialog> weld_about_dialog(const OString& id,
|
||||
bool bTakeOwnership = true)
|
||||
= 0;
|
||||
virtual std::unique_ptr<Assistant> weld_assistant(const OString& id, bool bTakeOwnership = true)
|
||||
= 0;
|
||||
virtual std::unique_ptr<Window> weld_window(const OString& id, bool bTakeOwnership = true) = 0;
|
||||
|
||||
@ -28,7 +28,7 @@ class tdf106667(UITestCase):
|
||||
|
||||
self.ui_test.execute_dialog_through_command(".uno:About")
|
||||
xAboutDlg = self.xUITest.getTopFocusWindow()
|
||||
xCloseBtn = xAboutDlg.getChild("close")
|
||||
xCloseBtn = xAboutDlg.getChild("btnClose")
|
||||
self.ui_test.close_dialog_through_button(xCloseBtn)
|
||||
|
||||
self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "A")
|
||||
|
||||
@ -75,7 +75,6 @@
|
||||
#define SFX_FILE_THUMBNAIL_MATH "res/math128.png"
|
||||
#define SFX_FILE_THUMBNAIL_DEFAULT "res/main128.png"
|
||||
|
||||
#define BMP_WELCOME "sfx2/res/logo.png"
|
||||
#define BMP_RECENTDOC_REMOVE "res/recentdoc_remove.png"
|
||||
#define BMP_RECENTDOC_REMOVE_HIGHLIGHTED "res/recentdoc_remove_highlighted.png"
|
||||
#define BMP_DEFAULT "res/templatestar.png"
|
||||
|
||||
@ -89,7 +89,7 @@ private:
|
||||
size_t mnLastMouseDownItem;
|
||||
|
||||
/// Image that appears when there is no recent document.
|
||||
Image maWelcomeImage;
|
||||
BitmapEx maWelcomeImage;
|
||||
OUString maWelcomeLine1;
|
||||
OUString maWelcomeLine2;
|
||||
};
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
*/
|
||||
|
||||
#include <config_folders.h>
|
||||
#include <ucbhelper/content.hxx>
|
||||
|
||||
#include <vcl/canvastools.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
@ -101,6 +102,29 @@ bool SfxApplication::IsDowning() const { return pImpl->bDowning; }
|
||||
SfxDispatcher* SfxApplication::GetAppDispatcher_Impl() { return pImpl->pAppDispat; }
|
||||
SfxSlotPool& SfxApplication::GetAppSlotPool_Impl() const { return *pImpl->pSlotPool; }
|
||||
|
||||
static bool FileExists( const INetURLObject& rURL )
|
||||
{
|
||||
bool bRet = false;
|
||||
|
||||
if( rURL.GetProtocol() != INetProtocol::NotValid )
|
||||
{
|
||||
try
|
||||
{
|
||||
::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
|
||||
OUString aTitle;
|
||||
|
||||
aCnt.getPropertyValue("Title") >>= aTitle;
|
||||
bRet = ( !aTitle.isEmpty() );
|
||||
}
|
||||
catch(const Exception&)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return bRet;
|
||||
}
|
||||
|
||||
bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWidth)
|
||||
{
|
||||
// Load from disk
|
||||
@ -109,7 +133,11 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid
|
||||
|
||||
OUString uri = "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER + aBaseName + ".svg";
|
||||
rtl::Bootstrap::expandMacros( uri );
|
||||
|
||||
INetURLObject aObj( uri );
|
||||
if ( !FileExists(aObj) )
|
||||
return false;
|
||||
|
||||
VectorGraphicData aVectorGraphicData(aObj.PathToFileName(), VectorGraphicDataType::Svg);
|
||||
|
||||
// transform into [0,0,width,width*aspect] std dimensions
|
||||
@ -175,8 +203,7 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid
|
||||
BitmapEx SfxApplication::GetApplicationLogo(long nWidth)
|
||||
{
|
||||
BitmapEx aBitmap;
|
||||
SfxApplication::loadBrandSvg("flat_logo", aBitmap, nWidth);
|
||||
(void)Application::LoadBrandBitmap ("about", aBitmap);
|
||||
SfxApplication::loadBrandSvg("shell/about", aBitmap, nWidth);
|
||||
return aBitmap;
|
||||
}
|
||||
|
||||
|
||||
@ -653,7 +653,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
case SID_ABOUT:
|
||||
{
|
||||
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
|
||||
VclAbstractDialogFactory* pFact = VclAbstractDialogFactory::Create();
|
||||
ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateAboutDialog(rReq.GetFrameWeld()));
|
||||
pDlg->Execute();
|
||||
bDone = true;
|
||||
|
||||
@ -39,6 +39,7 @@
|
||||
#include <bitmaps.hlst>
|
||||
#include <vcl/virdev.hxx>
|
||||
#include "recentdocsviewitem.hxx"
|
||||
#include <sfx2/app.hxx>
|
||||
|
||||
#include <officecfg/Office/Common.hxx>
|
||||
|
||||
@ -124,7 +125,7 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent )
|
||||
: ThumbnailView(pParent)
|
||||
, mnFileTypes(ApplicationType::TYPE_NONE)
|
||||
, mnLastMouseDownItem(THUMBNAILVIEW_ITEM_NOTFOUND)
|
||||
, maWelcomeImage(StockImage::Yes, BMP_WELCOME)
|
||||
, maWelcomeImage()
|
||||
, maWelcomeLine1(SfxResId(STR_WELCOME_LINE1))
|
||||
, maWelcomeLine2(SfxResId(STR_WELCOME_LINE2))
|
||||
{
|
||||
@ -135,6 +136,8 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent )
|
||||
setItemMaxTextLength( 30 );
|
||||
setItemDimensions( mnItemMaxSize, mnItemMaxSize, gnTextHeight, gnItemPadding );
|
||||
|
||||
maWelcomeImage = SfxApplication::GetApplicationLogo(500);
|
||||
|
||||
maFillColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get());
|
||||
maTextColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get());
|
||||
maHighlightColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get());
|
||||
@ -365,13 +368,13 @@ void RecentDocsView::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
|
||||
const int nX = (rSize.Width() - rImgSize.Width())/2;
|
||||
int nY = (rSize.Height() - 3 * nTextHeight - rImgSize.Height())/2;
|
||||
Point aImgPoint(nX, nY);
|
||||
rRenderContext.DrawImage(aImgPoint, rImgSize, maWelcomeImage);
|
||||
rRenderContext.DrawBitmapEx(aImgPoint, rImgSize, maWelcomeImage);
|
||||
|
||||
nY = nY + rImgSize.Height();
|
||||
rRenderContext.DrawText(tools::Rectangle(0, nY, rSize.Width(), nY + nTextHeight),
|
||||
rRenderContext.DrawText(tools::Rectangle(0, nY + 1 * nTextHeight, rSize.Width(), nY + nTextHeight),
|
||||
maWelcomeLine1,
|
||||
DrawTextFlags::Center);
|
||||
rRenderContext.DrawText(tools::Rectangle(0, nY + 1.5 * nTextHeight, rSize.Width(), rSize.Height()),
|
||||
rRenderContext.DrawText(tools::Rectangle(0, nY + 2 * nTextHeight, rSize.Width(), rSize.Height()),
|
||||
maWelcomeLine2,
|
||||
DrawTextFlags::MultiLine | DrawTextFlags::WordBreak | DrawTextFlags::Center);
|
||||
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
cui/uiconfig/ui/aboutdialog.ui://GtkImage[@id='imAbout'] no-labelled-by
|
||||
cui/uiconfig/ui/aboutdialog.ui://GtkImage[@id='imBrand'] no-labelled-by
|
||||
cui/uiconfig/ui/aboutdialog.ui://GtkLabel[@id='lbCopyright'] orphan-label
|
||||
cui/uiconfig/ui/aboutdialog.ui://GtkLabel[@id='lbAbout'] orphan-label
|
||||
cui/uiconfig/ui/aboutdialog.ui://GtkLabel[@id='lbVersion'] orphan-label
|
||||
cui/uiconfig/ui/aboutconfigdialog.ui://GtkEntry[@id='searchEntry'] no-labelled-by
|
||||
cui/uiconfig/ui/acorexceptpage.ui://GtkEntry[@id='abbrev'] no-labelled-by
|
||||
cui/uiconfig/ui/acorexceptpage.ui://GtkEntry[@id='double'] no-labelled-by
|
||||
|
||||
@ -17,7 +17,7 @@ class AboutDlgTest(UITestCase):
|
||||
|
||||
xAboutDlg = self.xUITest.getTopFocusWindow()
|
||||
|
||||
xCloseBtn = xAboutDlg.getChild("close")
|
||||
xCloseBtn = xAboutDlg.getChild("btnClose")
|
||||
self.ui_test.close_dialog_through_button(xCloseBtn)
|
||||
|
||||
self.ui_test.close_doc()
|
||||
|
||||
@ -17,7 +17,7 @@ class AboutDlgTest(UITestCase):
|
||||
|
||||
xAboutDlg = self.xUITest.getTopFocusWindow()
|
||||
|
||||
xCloseBtn = xAboutDlg.getChild("close")
|
||||
xCloseBtn = xAboutDlg.getChild("btnClose")
|
||||
self.ui_test.close_dialog_through_button(xCloseBtn)
|
||||
|
||||
self.ui_test.close_doc()
|
||||
|
||||
@ -27,7 +27,7 @@ class CheckBoxTest(UITestCase):
|
||||
print(json_content)
|
||||
print(json.dumps(json_content, indent=4))
|
||||
|
||||
closeBtn = xAboutDlg.getChild("close")
|
||||
closeBtn = xAboutDlg.getChild("btnClose")
|
||||
self.ui_test.close_dialog_through_button(closeBtn)
|
||||
|
||||
self.ui_test.close_doc()
|
||||
|
||||
@ -22,9 +22,6 @@ public:
|
||||
virtual std::unique_ptr<weld::MessageDialog>
|
||||
weld_message_dialog(const OString& id, bool bTakeOwnership = true) override;
|
||||
|
||||
virtual std::unique_ptr<weld::AboutDialog>
|
||||
weld_about_dialog(const OString& id, bool bTakeOwnership = true) override;
|
||||
|
||||
virtual std::unique_ptr<weld::Dialog> weld_dialog(const OString& id,
|
||||
bool bTakeOwnership = true) override;
|
||||
|
||||
|
||||
@ -1615,48 +1615,6 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
class SalInstanceAboutDialog : public SalInstanceDialog, public virtual weld::AboutDialog
|
||||
{
|
||||
private:
|
||||
VclPtr<vcl::AboutDialog> m_xAboutDialog;
|
||||
|
||||
public:
|
||||
SalInstanceAboutDialog(vcl::AboutDialog* pDialog, SalInstanceBuilder* pBuilder,
|
||||
bool bTakeOwnership)
|
||||
: SalInstanceDialog(pDialog, pBuilder, bTakeOwnership)
|
||||
, m_xAboutDialog(pDialog)
|
||||
{
|
||||
}
|
||||
virtual void set_version(const OUString& rVersion) override
|
||||
{
|
||||
m_xAboutDialog->SetVersion(rVersion);
|
||||
}
|
||||
virtual void set_copyright(const OUString& rCopyright) override
|
||||
{
|
||||
m_xAboutDialog->SetCopyright(rCopyright);
|
||||
}
|
||||
virtual void set_website(const OUString& rURL) override
|
||||
{
|
||||
m_xAboutDialog->SetWebsiteLink(rURL);
|
||||
}
|
||||
virtual void set_website_label(const OUString& rLabel) override
|
||||
{
|
||||
m_xAboutDialog->SetWebsiteLabel(rLabel);
|
||||
}
|
||||
virtual OUString get_website_label() const override
|
||||
{
|
||||
return m_xAboutDialog->GetWebsiteLabel();
|
||||
}
|
||||
virtual void set_logo(const css::uno::Reference<css::graphic::XGraphic>& rImage) override
|
||||
{
|
||||
m_xAboutDialog->SetLogo(Image(rImage));
|
||||
}
|
||||
virtual void set_background(const css::uno::Reference<css::graphic::XGraphic>& rImage) override
|
||||
{
|
||||
m_xAboutDialog->SetBackground(Image(rImage));
|
||||
}
|
||||
};
|
||||
|
||||
class SalInstanceAssistant : public SalInstanceDialog, public virtual weld::Assistant
|
||||
{
|
||||
private:
|
||||
@ -6270,21 +6228,6 @@ std::unique_ptr<weld::MessageDialog> SalInstanceBuilder::weld_message_dialog(con
|
||||
return pRet;
|
||||
}
|
||||
|
||||
std::unique_ptr<weld::AboutDialog> SalInstanceBuilder::weld_about_dialog(const OString& id,
|
||||
bool bTakeOwnership)
|
||||
{
|
||||
vcl::AboutDialog* pAboutDialog = m_xBuilder->get<vcl::AboutDialog>(id);
|
||||
std::unique_ptr<weld::AboutDialog> pRet(
|
||||
pAboutDialog ? new SalInstanceAboutDialog(pAboutDialog, this, false) : nullptr);
|
||||
if (bTakeOwnership && pAboutDialog)
|
||||
{
|
||||
assert(!m_aOwnedToplevel && "only one toplevel per .ui allowed");
|
||||
m_aOwnedToplevel.set(pAboutDialog);
|
||||
m_xBuilder->drop_ownership(pAboutDialog);
|
||||
}
|
||||
return pRet;
|
||||
}
|
||||
|
||||
std::unique_ptr<weld::Dialog> SalInstanceBuilder::weld_dialog(const OString& id,
|
||||
bool bTakeOwnership)
|
||||
{
|
||||
|
||||
@ -1842,7 +1842,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
|
||||
extractButtonImage(id, rMap, name == "GtkRadioButton");
|
||||
|
||||
VclPtr<vcl::Window> xWindow;
|
||||
if (name == "GtkDialog" || name == "GtkAboutDialog" || name == "GtkAssistant")
|
||||
if (name == "GtkDialog" || name == "GtkAssistant")
|
||||
{
|
||||
// WB_ALLOWMENUBAR because we don't know in advance if we will encounter
|
||||
// a menubar, and menubars need a BorderWindow in the toplevel, and
|
||||
@ -1855,8 +1855,6 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
|
||||
Dialog::InitFlag eInit = !pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default;
|
||||
if (name == "GtkAssistant")
|
||||
xWindow = VclPtr<vcl::RoadmapWizard>::Create(pParent, nBits, eInit);
|
||||
else if (name == "GtkAboutDialog")
|
||||
xWindow = VclPtr<vcl::AboutDialog>::Create(pParent, nBits, eInit);
|
||||
else
|
||||
xWindow = VclPtr<Dialog>::Create(pParent, nBits, eInit);
|
||||
#if HAVE_FEATURE_DESKTOP
|
||||
|
||||
@ -4730,103 +4730,6 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
class GtkInstanceAboutDialog final : public GtkInstanceDialog, public virtual weld::AboutDialog
|
||||
{
|
||||
private:
|
||||
GtkAboutDialog* m_pAboutDialog;
|
||||
GtkCssProvider* m_pCssProvider;
|
||||
std::unique_ptr<utl::TempFile> mxBackgroundImage;
|
||||
public:
|
||||
GtkInstanceAboutDialog(GtkAboutDialog* pAboutDialog, GtkInstanceBuilder* pBuilder, bool bTakeOwnership)
|
||||
: GtkInstanceDialog(GTK_WINDOW(pAboutDialog), pBuilder, bTakeOwnership)
|
||||
, m_pAboutDialog(pAboutDialog)
|
||||
, m_pCssProvider(nullptr)
|
||||
{
|
||||
// in GtkAboutDialog apply_use_header_bar if headerbar is false it
|
||||
// automatically adds a default close button which it doesn't if
|
||||
// headerbar is true and which doesn't appear in the .ui
|
||||
if (GtkWidget* pDefaultButton = gtk_dialog_get_widget_for_response(GTK_DIALOG(pAboutDialog), GTK_RESPONSE_DELETE_EVENT))
|
||||
gtk_widget_destroy(pDefaultButton);
|
||||
}
|
||||
|
||||
virtual void set_version(const OUString& rVersion) override
|
||||
{
|
||||
gtk_about_dialog_set_version(m_pAboutDialog, OUStringToOString(rVersion, RTL_TEXTENCODING_UTF8).getStr());
|
||||
}
|
||||
|
||||
virtual void set_copyright(const OUString& rCopyright) override
|
||||
{
|
||||
gtk_about_dialog_set_copyright(m_pAboutDialog, OUStringToOString(rCopyright, RTL_TEXTENCODING_UTF8).getStr());
|
||||
}
|
||||
|
||||
virtual void set_website(const OUString& rURL) override
|
||||
{
|
||||
OString sURL(OUStringToOString(rURL, RTL_TEXTENCODING_UTF8));
|
||||
gtk_about_dialog_set_website(m_pAboutDialog, sURL.isEmpty() ? nullptr : sURL.getStr());
|
||||
}
|
||||
|
||||
virtual void set_website_label(const OUString& rLabel) override
|
||||
{
|
||||
OString sLabel(OUStringToOString(rLabel, RTL_TEXTENCODING_UTF8));
|
||||
gtk_about_dialog_set_website_label(m_pAboutDialog, sLabel.isEmpty() ? nullptr : sLabel.getStr());
|
||||
}
|
||||
|
||||
virtual OUString get_website_label() const override
|
||||
{
|
||||
const gchar* pText = gtk_about_dialog_get_website_label(m_pAboutDialog);
|
||||
return OUString(pText, pText ? strlen(pText) : 0, RTL_TEXTENCODING_UTF8);
|
||||
}
|
||||
|
||||
virtual void set_logo(const css::uno::Reference<css::graphic::XGraphic>& rImage) override
|
||||
{
|
||||
GdkPixbuf* pixbuf = rImage.is() ? getPixbuf(rImage) : nullptr;
|
||||
if (!pixbuf)
|
||||
gtk_about_dialog_set_logo(m_pAboutDialog, nullptr);
|
||||
else
|
||||
{
|
||||
gtk_about_dialog_set_logo(m_pAboutDialog, pixbuf);
|
||||
g_object_unref(pixbuf);
|
||||
}
|
||||
}
|
||||
|
||||
virtual void set_background(const css::uno::Reference<css::graphic::XGraphic>& rImage) override
|
||||
{
|
||||
GtkStyleContext *pStyleContext = gtk_widget_get_style_context(GTK_WIDGET(m_pAboutDialog));
|
||||
if (m_pCssProvider)
|
||||
{
|
||||
gtk_style_context_remove_provider(pStyleContext, GTK_STYLE_PROVIDER(m_pCssProvider));
|
||||
m_pCssProvider= nullptr;
|
||||
}
|
||||
|
||||
mxBackgroundImage.reset();
|
||||
|
||||
if (rImage.is())
|
||||
{
|
||||
mxBackgroundImage.reset(new utl::TempFile());
|
||||
mxBackgroundImage->EnableKillingFile(true);
|
||||
|
||||
Image aImage(rImage);
|
||||
|
||||
vcl::PNGWriter aPNGWriter(aImage.GetBitmapEx());
|
||||
SvStream* pStream = mxBackgroundImage->GetStream(StreamMode::WRITE);
|
||||
aPNGWriter.Write(*pStream);
|
||||
mxBackgroundImage->CloseStream();
|
||||
|
||||
m_pCssProvider = gtk_css_provider_new();
|
||||
OUString aBuffer = "* { background-image: url(\"" + mxBackgroundImage->GetURL() + "\"); }";
|
||||
OString aResult = OUStringToOString(aBuffer, RTL_TEXTENCODING_UTF8);
|
||||
gtk_css_provider_load_from_data(m_pCssProvider, aResult.getStr(), aResult.getLength(), nullptr);
|
||||
gtk_style_context_add_provider(pStyleContext, GTK_STYLE_PROVIDER(m_pCssProvider),
|
||||
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
|
||||
}
|
||||
}
|
||||
|
||||
virtual ~GtkInstanceAboutDialog() override
|
||||
{
|
||||
set_background(nullptr);
|
||||
}
|
||||
};
|
||||
|
||||
class GtkInstanceAssistant : public GtkInstanceDialog, public virtual weld::Assistant
|
||||
{
|
||||
private:
|
||||
@ -14117,24 +14020,6 @@ private:
|
||||
set_primary_text(pMessageDialog, (*m_pStringReplace)(get_primary_text(pMessageDialog)));
|
||||
set_secondary_text(pMessageDialog, (*m_pStringReplace)(get_secondary_text(pMessageDialog)));
|
||||
}
|
||||
else if (GTK_IS_ABOUT_DIALOG(pWindow))
|
||||
{
|
||||
GtkAboutDialog* pAboutDialog = GTK_ABOUT_DIALOG(pWindow);
|
||||
const gchar *pComments = gtk_about_dialog_get_comments(pAboutDialog);
|
||||
if (pComments)
|
||||
{
|
||||
OUString sComments(pComments, strlen(pComments), RTL_TEXTENCODING_UTF8);
|
||||
sComments = (*m_pStringReplace)(sComments);
|
||||
gtk_about_dialog_set_comments(pAboutDialog, OUStringToOString(sComments, RTL_TEXTENCODING_UTF8).getStr());
|
||||
}
|
||||
const gchar *pProgramName = gtk_about_dialog_get_program_name(pAboutDialog);
|
||||
if (pProgramName)
|
||||
{
|
||||
OUString sProgramName(pProgramName, strlen(pProgramName), RTL_TEXTENCODING_UTF8);
|
||||
sProgramName = (*m_pStringReplace)(sProgramName);
|
||||
gtk_about_dialog_set_program_name(pAboutDialog, OUStringToOString(sProgramName, RTL_TEXTENCODING_UTF8).getStr());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -14283,15 +14168,6 @@ public:
|
||||
return std::make_unique<GtkInstanceMessageDialog>(pMessageDialog, this, bTakeOwnership);
|
||||
}
|
||||
|
||||
virtual std::unique_ptr<weld::AboutDialog> weld_about_dialog(const OString &id, bool bTakeOwnership) override
|
||||
{
|
||||
GtkAboutDialog* pAboutDialog = GTK_ABOUT_DIALOG(gtk_builder_get_object(m_pBuilder, id.getStr()));
|
||||
if (!pAboutDialog)
|
||||
return nullptr;
|
||||
gtk_window_set_transient_for(GTK_WINDOW(pAboutDialog), GTK_WINDOW(gtk_widget_get_toplevel(m_pParentWidget)));
|
||||
return std::make_unique<GtkInstanceAboutDialog>(pAboutDialog, this, bTakeOwnership);
|
||||
}
|
||||
|
||||
virtual std::unique_ptr<weld::Assistant> weld_assistant(const OString &id, bool bTakeOwnership) override
|
||||
{
|
||||
GtkAssistant* pAssistant = GTK_ASSISTANT(gtk_builder_get_object(m_pBuilder, id.getStr()));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user