[Libreoffice-commits] .: 7 commits - basic/source config_host.mk.in configure.in cui/prj cui/source desktop/Zip_brand_dev.mk desktop/Zip_brand.mk desktop/Zip_shell.mk icon-themes/galaxy Makefile packimages/CustomTarget_images.mk sc/source sfx2/Module_sfx2.mk sfx2/source svtools/inc svtools/source sw/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Apr 10 04:50:16 PDT 2012
Makefile | 2
basic/source/basmgr/basmgr.cxx | 4
basic/source/classes/sb.cxx | 17
basic/source/sbx/sbxscan.cxx | 6
config_host.mk.in | 3
configure.in | 53
cui/prj/build.lst | 2
cui/source/dialogs/about.cxx | 539 ++--
cui/source/dialogs/about.hrc | 27
cui/source/dialogs/about.src | 94
cui/source/inc/about.hxx | 46
desktop/Zip_brand.mk | 14
desktop/Zip_brand_dev.mk | 14
desktop/Zip_shell.mk | 1
icon-themes/galaxy/brand/flat_logo.svg | 269 ++
icon-themes/galaxy/brand/shell/about.svg | 3354 +++++++++++++++++++++++++++++
packimages/CustomTarget_images.mk | 2
sc/source/filter/inc/stylesbuffer.hxx | 2
sc/source/filter/oox/stylesbuffer.cxx | 5
sfx2/Module_sfx2.mk | 1
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/doc/docinf.cxx | 28
svtools/inc/svtools/svmedit.hxx | 2
svtools/source/edit/svmedit.cxx | 15
svtools/source/uno/framestatuslistener.cxx | 16
sw/source/filter/ww8/wrtw8esh.cxx | 7
unotools/inc/unotools/bootstrap.hxx | 3
unotools/source/config/bootstrap.cxx | 12
unusedcode.easy | 26
vcl/inc/vcl/ctrl.hxx | 2
vcl/inc/vcl/introwin.hxx | 2
vcl/inc/vcl/svapp.hxx | 2
vcl/inc/vcl/svgread.hxx | 3
vcl/inc/vcl/window.hxx | 5
vcl/source/app/brand.cxx | 50
vcl/source/gdi/svgread.cxx | 52
vcl/source/window/introwin.cxx | 9
vcl/source/window/window2.cxx | 9
38 files changed, 4253 insertions(+), 447 deletions(-)
New commits:
commit 8a3aae9b694deb2b41157509e84815a5b7fb7655
Author: Andrew Higginson <at.higginsonAtgmail.com>
Date: Tue Apr 10 12:43:48 2012 +0100
Resolves: fdo#31022 about dialog is suboptimal
diff --git a/config_host.mk.in b/config_host.mk.in
index 6a2cfce..378dc07 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -4,7 +4,7 @@
#
export SRC_ROOT=@SRC_ROOT@
-export ABOUT_BITMAP=@ABOUT_BITMAP@
+export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@
export ALIGNOF_DOUBLE=@ALIGNOF_DOUBLE@
export ALIGNOF_INT=@ALIGNOF_INT@
export ALIGNOF_LONG=@ALIGNOF_LONG@
@@ -142,6 +142,7 @@ export EPM=@EPM@
export EPM_FLAGS=@EPM_FLAGS@
export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
@x_Cygwin@ export FIND=@WIN_FIND@
+export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
export FLUTE_JAR=@FLUTE_JAR@
export FONTCONFIG_CFLAGS=@FONTCONFIG_CFLAGS@
export FONTCONFIG_LIBS=@FONTCONFIG_LIBS@
diff --git a/configure.in b/configure.in
index 24d55e4..d674d34 100644
--- a/configure.in
+++ b/configure.in
@@ -1763,11 +1763,16 @@ AC_ARG_WITH(intro-progressbar-frame-color,
Usage: --with-intro-progressbar-frame-color=207,208,211
],,)
-AC_ARG_WITH(about-bitmap,
-[ --with-about-bitmap Similarly to --with-intro-bitmap, this allows
- specification of bitmap for the About box.
+AC_ARG_WITH(flat-logo-svg,
+[ --with-flat-logo-svg Allows specification of the flat Logo SVG.
- Usage: --with-about-bitmap=/path/my_ooo_about.png
+ Usage: --with-about-background-svg=/path/my_flat_logo.svg
+],,)
+
+AC_ARG_WITH(about-background-svg,
+[ --with-about-background-svg Allows specification of the background SVG for the About dialog.
+
+ Usage: --with-about-background-svg=/path/my_libo_about.svg
],,)
AC_ARG_WITH(startcenter-left-bitmap,
@@ -10770,7 +10775,8 @@ AC_SUBST(PROGRESSFRAMECOLOR)
AC_MSG_CHECKING([for alternative branding images directory])
INTRO_BITMAP=
-ABOUT_BITMAP=
+ABOUT_BACKGROUND_SVG=
+FLAT_LOGO_SVG=
STARTCENTER_LEFT_BITMAP=
STARTCENTER_RIGHT_BITMAP=
STARTCENTER_RTL_LEFT_BITMAP=
@@ -10780,14 +10786,16 @@ if test -z "$with_branding" -o "$with_branding" = "no"; then
AC_MSG_RESULT([none])
else
INTRO_BITMAP="$with_branding/intro.png"
- ABOUT_BITMAP="$with_branding/about.png"
+ ABOUT_BACKGROUND_SVG="$with_branding/about.svg"
+ FLAT_LOGO_SVG="$with_branding/flat_logo.svg"
STARTCENTER_LEFT_BITMAP="$with_branding/backing_left.png"
STARTCENTER_RIGHT_BITMAP="$with_branding/backing_right.png"
STARTCENTER_RTL_LEFT_BITMAP="$with_branding/backing_rtl_left.png"
STARTCENTER_RTL_RIGHT_BITMAP="$with_branding/backing_rtl_right.png"
STARTCENTER_SPACE_BITMAP="$with_branding/backing_space.png"
for i in $INTRO_BITMAP \
- $ABOUT_BITMAP \
+ $ABOUT_BACKGROUND_SVG \
+ $FLAT_LOGO_SVG \
$STARTCENTER_LEFT_BITMAP \
$STARTCENTER_RIGHT_BITMAP \
$STARTCENTER_RTL_LEFT_BITMAP \
@@ -10815,20 +10823,35 @@ else
fi
AC_SUBST(INTRO_BITMAP)
-AC_MSG_CHECKING([for yet another 'about' bitmap])
-if test -z "$with_about_bitmap" -o "$with_about_bitmap" = "no"; then
- if test "$with_about_bitmap" = "no"; then
- ABOUT_BITMAP=
+AC_MSG_CHECKING([for yet another 'about' svg])
+if test -z "$with_about_background_svg" -o "$with_about_background_svg" = "no" ; then
+ if test "$with_about_background_svg" = "no" ; then
+ ABOUT_BACKGROUND_SVG=
+ fi
+ AC_MSG_RESULT([none])
+else
+ case "$with_about_background_svg" in
+ *.svg) ABOUT_BACKGROUND_SVG="$with_about_background_svg" ;;
+ *) AC_MSG_WARN([About background SVG should be a .svg file!]) ;;
+ esac
+ AC_MSG_RESULT([$ABOUT_BACKGROUND_SVG])
+fi
+AC_SUBST(ABOUT_BACKGROUND_SVG)
+
+AC_MSG_CHECKING([for yet another 'flat_logo' svg])
+if test -z "$with_flat_logo_svg" -o "$with_flat_logo_svg" = "no" ; then
+ if test "$with_flat_logo_svg" = "no" ; then
+ FLAT_LOGO_SVG=
fi
AC_MSG_RESULT([none])
else
- case "$with_about_bitmap" in
- *.png) ABOUT_BITMAP="$with_about_bitmap" ;;
- *) AC_MSG_WARN([About bitmap should be a .png file!]) ;;
+ case "$with_flat_logo_svg" in
+ *.svg) FLAT_LOGO_SVG="$with_flat_logo_svg" ;;
+ *) AC_MSG_WARN([Flat logo SVG should be a .svg file!]) ;;
esac
AC_MSG_RESULT([$ABOUT_BITMAP])
fi
-AC_SUBST(ABOUT_BITMAP)
+AC_SUBST(FLAT_LOGO_SVG)
AC_MSG_CHECKING([for yet another 'start center left' bitmap])
if test -z "$with_startcenter_left_bitmap" -o "$with_startcenter_left_bitmap" = "no"; then
diff --git a/cui/prj/build.lst b/cui/prj/build.lst
index de2687b..432bf39 100644
--- a/cui/prj/build.lst
+++ b/cui/prj/build.lst
@@ -1,3 +1,3 @@
-cu cui : salhelper sax svx NULL
+cu cui : salhelper sax svtools svx NULL
cu cui usr1 - all cui_mkout NULL
cu cui\prj nmake - all cui_prj NULL
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 3ee3e8f..a4352e1 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+// TODO: make the background of the dialog transparent and remove the titlebar
+
// include ---------------------------------------------------------------
#include <vcl/svapp.hxx>
@@ -53,231 +55,60 @@
#include <sfx2/sfxdefs.hxx>
#include <sfx2/app.hxx>
#include <rtl/ustrbuf.hxx>
+#include <vcl/bitmap.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
using namespace ::com::sun::star;
-// defines ---------------------------------------------------------------
-
-#define SCROLL_OFFSET 1
-#define SPACE_OFFSET 5
-#define SCROLL_TIMER 30
-
-/* get good version information */
-static String
-GetBuildId()
+enum AboutDialogButton
{
- rtl::OUString sDefault;
- rtl::OUString sBuildId( utl::Bootstrap::getBuildIdData( sDefault ) );
- if (!sBuildId.isEmpty() && sBuildId.getLength() > 50)
- {
- rtl::OUStringBuffer aBuffer;
- sal_Int32 nIndex = 0;
- do
- {
- rtl::OUString aToken = sBuildId.getToken( 0, '-', nIndex );
- if (!aToken.isEmpty())
- {
- aBuffer.append(aToken);
- if (nIndex >= 0)
- {
- if (nIndex % 5)
- aBuffer.append(static_cast<sal_Unicode>('-'));
- else
- aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n"));
- }
- }
- }
- while ( nIndex >= 0 );
- sBuildId = aBuffer.makeStringAndClear();
- }
-
- OSL_ENSURE( !sBuildId.isEmpty(), "No BUILDID in bootstrap file" );
- return sBuildId;
-}
+ CREDITS_BUTTON,
+ WEBSITE_BUTTON,
+ LICENSE_BUTTON
+};
AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
-
- SfxModalDialog ( pParent, rId ),
- aVersionText ( this, ResId( ABOUT_FTXT_VERSION, *rId.GetResMgr() ) ),
- aCopyrightText ( this, ResId( ABOUT_FTXT_COPYRIGHT, *rId.GetResMgr() ) ),
- aInfoLink ( this, ResId( ABOUT_FTXT_LINK, *rId.GetResMgr() ) ),
- aTdfLink ( this, ResId( ABOUT_TDFSTR_LINK, *rId.GetResMgr() ) ),
- aFeaturesLink ( this, ResId( ABOUT_FEATURES_LINK, *rId.GetResMgr() ) ),
- aButtonsLine ( this, ResId( ABOUT_BUTTONS_LINE, *rId.GetResMgr() ) ),
- aCancelButton ( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr() ) ),
+ SfxModalDialog ( pParent, rId ),
+ aVersionText ( this, ResId( ABOUT_VERSION_TEXT, *rId.GetResMgr() ) ),
+ aDescriptionText ( this, ResId( ABOUT_DESCRIPTION_TEXT, *rId.GetResMgr() ) ),
+ aCopyrightText ( this, ResId( ABOUT_COPYRIGHT_TEXT, *rId.GetResMgr() ) ),
+ aCopyrightTextShadow ( this, ResId( ABOUT_COPYRIGHT_TEXT, *rId.GetResMgr() ) ),
+ aLogoImage ( this, ResId( ABOUT_IMAGE_LOGO, *rId.GetResMgr() ) ),
+ aCreditsButton ( this, ResId( ABOUT_BTN_CREDITS, *rId.GetResMgr() ) ),
+ aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ),
+ aLicenseButton ( this, ResId( ABOUT_BTN_LICENSE, *rId.GetResMgr() ) ),
aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())),
m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())),
- m_aOracleCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT_ORACLE_DERIVED, *rId.GetResMgr())),
- m_aAcknowledgementTextStr(ResId(ABOUT_STR_ACKNOWLEDGEMENT, *rId.GetResMgr())),
- m_aLinkStr(ResId( ABOUT_STR_LINK, *rId.GetResMgr())),
- m_aTdfLinkStr(ResId( ABOUT_TDF_LINK, *rId.GetResMgr())),
- m_aFeaturesLinkStr(ResId( ABOUT_FEATURESSTR_LINK, *rId.GetResMgr())),
- m_sBuildStr(ResId(ABOUT_STR_BUILD, *rId.GetResMgr()))
+ m_aCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT, *rId.GetResMgr())),
+ m_aBasedTextStr(ResId(ABOUT_STR_BASED, *rId.GetResMgr())),
+ m_aBasedDerivedTextStr(ResId(ABOUT_STR_BASED_DERIVED, *rId.GetResMgr())),
+ m_aWebsiteLinkStr(ResId( ABOUT_STR_LINK_WEBSITE, *rId.GetResMgr())),
+ m_aCreditsLinkStr(ResId( ABOUT_STR_LINK_CREDITS, *rId.GetResMgr())),
+ m_aLicenseLinkStr(ResId( ABOUT_STR_LINK_LICENSE, *rId.GetResMgr())),
+ m_sBuildStr(ResId::toString(ResId(ABOUT_STR_BUILD, *rId.GetResMgr()))),
+ m_aDescriptionTextStr(ResId(ABOUT_STR_DESCRIPTION, *rId.GetResMgr()))
{
- // load image from module path
- aAppLogo = SfxApplication::GetApplicationLogo();
-
- // Transparent Font
- Font aFont = GetFont();
- aFont.SetTransparent( sal_True );
- SetFont( aFont );
-
- // if necessary more info
- String sVersion = aVersionTextStr;
- sVersion.SearchAndReplaceAscii( "$(VER)", Application::GetDisplayName() );
- sVersion += '\n';
- sVersion += m_sBuildStr;
- sVersion += ' ';
- sVersion += GetBuildId();
-#ifdef BUILD_VER_STRING
- String aBuildString( DEFINE_CONST_UNICODE( BUILD_VER_STRING ) );
- sVersion += '\n';
- sVersion += aBuildString;
-#endif
- aVersionText.SetText( sVersion );
-
- // set for background and text the correct system color
- const StyleSettings& rSettings = GetSettings().GetStyleSettings();
- Color aWhiteCol( rSettings.GetWindowColor() );
- Wallpaper aWall( aWhiteCol );
- SetBackground( aWall );
- Font aNewFont( aCopyrightText.GetFont() );
- aNewFont.SetTransparent( sal_True );
-
- aVersionText.SetFont( aNewFont );
- aCopyrightText.SetFont( aNewFont );
-
- aVersionText.SetBackground();
- aCopyrightText.SetBackground();
- aInfoLink.SetURL(m_aLinkStr);
- aInfoLink.SetBackground();
- aInfoLink.SetClickHdl( LINK( this, AboutDialog, HandleHyperlink ) );
-
- aTdfLink.SetURL(m_aTdfLinkStr);
- aTdfLink.SetBackground();
- aTdfLink.SetClickHdl( LINK( this, AboutDialog, HandleHyperlink ) );
-
- aFeaturesLink.SetURL(m_aFeaturesLinkStr);
- aFeaturesLink.SetBackground();
- aFeaturesLink.SetClickHdl( LINK( this, AboutDialog, HandleHyperlink ) );
-
- aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) );
-
- Color aTextColor( rSettings.GetWindowTextColor() );
- aVersionText.SetControlForeground( aTextColor );
- aCopyrightText.SetControlForeground( aTextColor );
-
- rtl::OUStringBuffer sText(m_aVendorTextStr);
- sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
- sal_uInt32 nCopyrightId = utl::ConfigManager::getProductName() == "LibreOffice" ? ABOUT_STR_COPYRIGHT : ABOUT_STR_COPYRIGHT_DERIVED;
- String aProductCopyrightTextStr(ResId(nCopyrightId, *rId.GetResMgr()));
- sText.append(aProductCopyrightTextStr);
- sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
- sText.append(m_aOracleCopyrightTextStr);
- sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
- sText.append(m_aAcknowledgementTextStr);
- aCopyrightText.SetText(sText.makeStringAndClear());
-
- // determine size and position of the dialog & elements
- Size aAppLogoSiz = aAppLogo.GetSizePixel();
-
- // analyze size of the aVersionText widget
- // character size
- Size a6Size = aVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
- // preferred Version widget size
- long nY = aAppLogoSiz.Height() + ( a6Size.Height() * 2 );
- long nDlgMargin = a6Size.Width() * 2;
- long nCtrlMargin = a6Size.Height() * 2;
-
- aVersionText.SetSizePixel(Size(800, 600));
- Size aVersionTextSize = aVersionText.CalcMinimumSize();
- aVersionTextSize.Width() += nDlgMargin;
-
- Size aOutSiz = GetOutputSizePixel();
- aOutSiz.Width() = aAppLogoSiz.Width();
-
- if (aOutSiz.Width() < aVersionTextSize.Width())
- aOutSiz.Width() = aVersionTextSize.Width();
-
- if (aOutSiz.Width() < 300)
- aOutSiz.Width() = 300;
-
- //round up to nearest even
- aOutSiz.Width() += aOutSiz.Width() & 1;
-
- long nTextWidth = (aOutSiz.Width() - nDlgMargin);
-
- // finally set the aVersionText widget position and size
- Size aVTSize = aVersionText.GetSizePixel();
- aVTSize.Width() = nTextWidth;
- aVersionText.SetSizePixel(aVTSize);
- aVTSize = aVersionText.CalcMinimumSize();
- Point aVTPnt;
- aVTPnt.X() = ( aOutSiz.Width() - aVTSize.Width() ) / 2;
- aVTPnt.Y() = nY;
- aVersionText.SetPosSizePixel( aVTPnt, aVTSize );
-
- nY += aVTSize.Height() + nCtrlMargin;
-
- // Multiline edit with Copyright-Text
- // preferred Version widget size
- aCopyrightText.SetSizePixel(Size(nTextWidth,600));
- Size aCTSize = aCopyrightText.CalcMinimumSize();
- aCTSize.Width()= nTextWidth;
- Point aCTPnt;
- aCTPnt.X() = ( aOutSiz.Width() - aCTSize.Width() ) / 2;
- aCTPnt.Y() = nY;
- aCopyrightText.SetPosSizePixel( aCTPnt, aCTSize );
-
- nY += aCTSize.Height() + nCtrlMargin;
-
- const int nLineSpace = 4;
- // FixedHyperlink with more info link
- Size aLTSize = aTdfLink.CalcMinimumSize();
- Point aLTPnt;
- aLTPnt.X() = ( aOutSiz.Width() - aLTSize.Width() ) / 2;
- aLTPnt.Y() = nY;
- aTdfLink.SetPosSizePixel( aLTPnt, aLTSize );
-
- nY += aLTSize.Height();
-
- aLTSize = aFeaturesLink.CalcMinimumSize();
- aLTPnt.X() = ( aOutSiz.Width() - aLTSize.Width() ) / 2;
- aLTPnt.Y() = aLTPnt.Y() + aLTSize.Height() + nLineSpace;
- aFeaturesLink.SetPosSizePixel( aLTPnt, aLTSize );
-
- nY += aLTSize.Height() + nLineSpace;
-
- aLTSize = aInfoLink.CalcMinimumSize();
- aLTPnt.X() = ( aOutSiz.Width() - aLTSize.Width() ) / 2;
- aLTPnt.Y() = aLTPnt.Y() + aLTSize.Height() + nLineSpace;
- aInfoLink.SetPosSizePixel( aLTPnt, aLTSize );
-
- nY += aLTSize.Height();
-
- // buttons delimiter line
- Size aBDSize = aButtonsLine.GetSizePixel();
- aBDSize.Width() = aOutSiz.Width();
- Point aBDPnt;
- aBDPnt.X() = 0;
- aBDPnt.Y() = nY + nCtrlMargin / 2 + aBDSize.Height() / 2;
- aButtonsLine.SetPosSizePixel( aBDPnt, aBDSize );
-
- nY += nCtrlMargin + aBDSize.Height();
-
- // Cancel-Button-Position (at the bottom and in the right)
- Size aCancelSiz = aCancelButton.GetSizePixel();
- Point aCancelPnt;
- aCancelPnt.X() = aOutSiz.Width() - aCancelSiz.Width() - nDlgMargin / 2;
- aCancelPnt.Y() = nY;
- aCancelButton.SetPosPixel( aCancelPnt );
-
- nY += aCancelSiz.Height() + nCtrlMargin / 2;
-
- aOutSiz.Height() = nY;
-
- // Change the size of the dialog
- SetOutputSizePixel( aOutSiz );
+ // Populate text items
+ aVersionText.SetText( GetVersionString() );
+
+ aDescriptionText.SetText( m_aDescriptionTextStr );
+
+ rtl::OUString aCopyrightString = GetCopyrightString();
+ aCopyrightText.SetText( aCopyrightString );
+ aCopyrightTextShadow.SetText( aCopyrightString );
+
+ StyleControls();
+ LayoutControls();
+
+ // Allow the button to be identifiable once they are clicked
+ aCreditsButton.SetData( (void*)CREDITS_BUTTON );
+ aWebsiteButton.SetData( (void*)WEBSITE_BUTTON );
+ aLicenseButton.SetData( (void*)LICENSE_BUTTON );
+
+ // Connect all handlers
+ aCreditsButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
+ aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
+ aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
FreeResource();
@@ -285,47 +116,287 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
SetHelpId( CMD_SID_ABOUT );
}
-//-----------------------------------------------------------------------
-IMPL_LINK_NOARG(AboutDialog, CancelHdl)
+IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
{
- Close();
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( AboutDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink )
-{
- rtl::OUString sURL=pHyperlink->GetURL();
- rtl::OUString sTitle=GetText();
-
- if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty
+ rtl::OUString sURL = "";
+
+ // Find which button was pressed and from this, get the URL to be opened
+ AboutDialogButton* pDialogButton = (AboutDialogButton*)pButton->GetData();
+ if ( pDialogButton == (AboutDialogButton*)CREDITS_BUTTON )
+ sURL = m_aCreditsLinkStr;
+ else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
+ sURL = m_aWebsiteLinkStr;
+ else if ( pDialogButton == (AboutDialogButton*)LICENSE_BUTTON)
+ sURL = m_aLicenseLinkStr;
+
+ // If the URL is empty, don't do anything
+ if ( sURL.isEmpty() )
return 1;
try
{
uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
::comphelper::getProcessServiceFactory()->createInstance(
DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute") ), uno::UNO_QUERY_THROW );
- xSystemShellExecute->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
+ xSystemShellExecute->execute( sURL, rtl::OUString(),
+ com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
}
- catch ( uno::Exception& )
+ catch (const uno::Exception&)
{
uno::Any exc( ::cppu::getCaughtException() );
rtl::OUString msg( ::comphelper::anyToString( exc ) );
const SolarMutexGuard guard;
ErrorBox aErrorBox( NULL, WB_OK, msg );
- aErrorBox.SetText( sTitle );
+ aErrorBox.SetText( GetText() );
aErrorBox.Execute();
}
return 1;
}
+void AboutDialog::StyleControls()
+{
+ // Make all the controls have a transparent background
+ aLogoImage.SetBackground();
+ aVersionText.SetPaintTransparent( sal_True );
+ aDescriptionText.SetPaintTransparent( sal_True );
+ aCopyrightText.SetPaintTransparent( sal_True );
+ aCopyrightTextShadow.SetPaintTransparent( sal_True );
+
+ Font aLabelFont = GetSettings().GetStyleSettings().GetLabelFont();
+ Font aLargeFont = aLabelFont;
+ aLargeFont.SetSize( Size( 0, aLabelFont.GetSize().Height() * 1.3 ) );
+
+ // Description Text
+ aDescriptionText.SetControlFont( aLargeFont );
+ aDescriptionText.SetControlForeground( Color( 46, 52, 54 ) );
+ aDescriptionText.SetTextSelectable( sal_False );
+
+ // Version Text
+ aLargeFont.SetSize( Size( 0, aLabelFont.GetSize().Height() * 1.2 ) );
+ aVersionText.SetControlFont( aLargeFont );
+ aVersionText.SetControlForeground( Color( 142, 142, 142 ) );
+
+ // Copyright Text
+ aCopyrightText.SetControlForeground( Color( 142, 142, 142 ) );
+ aCopyrightTextShadow.SetControlForeground( Color( 255, 255, 255 ) );
+ aCopyrightText.SetTextSelectable( sal_False );
+ aCopyrightTextShadow.SetTextSelectable( sal_False );
+
+ // Blue text on website button
+ aWebsiteButton.SetControlForeground( Color( 27, 102, 215 ) );
+ aWebsiteButton.GrabFocus();
+}
+
+void AboutDialog::LayoutControls()
+{
+ // Get the size of the screen
+ Rectangle aScreenRect = Application::GetScreenPosSizePixel( (unsigned int)0 );
+ // Obtain an appropriate text width from the size of the screen
+ sal_Int32 aIdealTextWidth = aScreenRect.GetWidth() / 2.4;
+
+ sal_Int32 aDialogBorder = 24;
+ sal_Int32 aContentWidth = aIdealTextWidth + aDialogBorder * 2;
+ sal_Int32 aShadowWidth = aContentWidth * 0.02;
+ sal_Int32 aDialogWidth = aContentWidth + aShadowWidth * 2;
+
+ // Render and Position Logo
+ vcl::RenderGraphicRasterizer aRasterizerLogo = Application::LoadBrandSVG("flat_logo");
+ float aLogoWidthHeightRatio = (float)aRasterizerLogo.GetDefaultSizePixel().Width() /
+ (float)aRasterizerLogo.GetDefaultSizePixel().Height();
+
+ Size aLogoSize( aContentWidth * 0.6, (aContentWidth * 0.6) / aLogoWidthHeightRatio );
+ Point aLogoPos( aShadowWidth + ( aContentWidth - aLogoSize.Width() ) / 2,
+ aShadowWidth + aDialogBorder );
+ aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
+ aLogoImage.SetImage( Image( aLogoBitmap ) );
+ aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
+
+ // Position version text
+ sal_Int32 aLogoVersionSpacing = aLogoSize.Height() * 0.15;
+ Point aVersionPos( aShadowWidth + aDialogBorder,
+ aLogoPos.Y() + aLogoSize.Height() + aLogoVersionSpacing );
+ Size aVersionSize = aVersionText.CalcMinimumSize();
+ aVersionSize.Width() = aIdealTextWidth;
+ aVersionText.SetPosSizePixel( aVersionPos, aVersionSize );
+
+ // Position description text
+ sal_Int32 aVersionDescriptionSpacing = aLogoSize.Height() * 0.45;
+ Point aDescriptionPos( aShadowWidth + aDialogBorder, aVersionPos.Y() + aVersionSize.Height() + aVersionDescriptionSpacing );
+ Size aDescriptionSize = aDescriptionText.GetSizePixel();
+ aDescriptionSize.Width() = aIdealTextWidth;
+ aDescriptionText.SetPosSizePixel( aDescriptionPos, aDescriptionSize );
+ aDescriptionSize = aDescriptionText.CalcMinimumSize();
+ aDescriptionText.SetSizePixel( aDescriptionSize );
+
+ // Layout Buttons
+ Size aButtonSize;
+ Point aButtonPos;
+ LayoutButtons( aContentWidth, aDialogBorder, aShadowWidth, aDescriptionPos,
+ aDescriptionText.GetSizePixel().Height(),
+ aVersionDescriptionSpacing, aButtonPos, aButtonSize );
+
+ // Layout copyright text
+ Point aCopyrightPos( aShadowWidth + aDialogBorder, aButtonPos.Y() + aButtonSize.Height() + aVersionDescriptionSpacing );
+ Size aCopyrightSize = aCopyrightText.GetSizePixel();
+ aCopyrightSize.Width() = aIdealTextWidth;
+ aCopyrightText.SetPosSizePixel( aCopyrightPos, aCopyrightSize );
+ aCopyrightSize = aCopyrightText.CalcMinimumSize();
+ aCopyrightSize.Width() = aIdealTextWidth;
+ aCopyrightText.SetSizePixel( aCopyrightSize );
+
+ // Position the copyright text shadow 1px below the real text
+ Point aCopyrightShadowPos = aCopyrightPos;
+ aCopyrightShadowPos.Y() += 1;
+ aCopyrightTextShadow.SetPosSizePixel( aCopyrightShadowPos, aCopyrightSize );
+
+ // Obtain preliminary dimensions for the dialog
+ vcl::RenderGraphicRasterizer aRasterizerBackground = Application::LoadBrandSVG("shell/about");
+ float aBackgroundWidthHeightRatio = (float)aRasterizerBackground.GetDefaultSizePixel().Width() /
+ (float)aRasterizerBackground.GetDefaultSizePixel().Height();
+ Size aBackgroundSize( aDialogWidth, aDialogWidth / aBackgroundWidthHeightRatio );
+
+ // Make sure the dialog is tall enough
+ sal_Int32 aBottomY = aCopyrightPos.Y() + aCopyrightText.GetSizePixel().Height() + aDialogBorder + aShadowWidth;
+ // If not, make the dialog taller (and to maintain the aspect ratio of the background also wider)
+ if (aBottomY > aBackgroundSize.Height())
+ aBackgroundSize.Width() = aBottomY * aBackgroundWidthHeightRatio;
+ aBackgroundSize.Height() = aBottomY;
+
+ // If needed, adjust all control position to the new width
+ if (aBackgroundSize.Width() != aDialogWidth)
+ {
+ sal_Int32 aWidthDifference = aBackgroundSize.Width() - aDialogWidth;
+
+ MoveControl(aLogoImage, aWidthDifference / 2);
+ MoveControl(aVersionText, aWidthDifference / 2);
+ MoveControl(aDescriptionText, aWidthDifference / 2);
+ MoveControl(aCreditsButton, aWidthDifference / 2);
+ MoveControl(aWebsiteButton, aWidthDifference / 2);
+ MoveControl(aLicenseButton, aWidthDifference / 2);
+ MoveControl(aCopyrightText, aWidthDifference / 2);
+ MoveControl(aCopyrightTextShadow, aWidthDifference / 2);
+ }
+
+ // Render Background and set final dialog size
+ aBackgroundBitmap = aRasterizerBackground.Rasterize( aBackgroundSize );
+ SetOutputSizePixel( aBackgroundSize );
+}
+
+void AboutDialog::LayoutButtons(sal_Int32 aContentWidth, sal_Int32 aDialogBorder,
+ sal_Int32 aShadowWidth, Point aDescriptionPos,
+ sal_Int32 aDescriptionTextHeight, sal_Int32 aVersionDescriptionSpacing,
+ Point& aButtonPos, Size& aButtonSize)
+{
+ // Position credits button
+ sal_Int32 aButtonVPadding = 5;
+ sal_Int32 aButtonHPadding = 4;
+ sal_Int32 aCreditsButtonWidth = aCreditsButton.CalcMinimumSize().Width();
+ sal_Int32 aLicenseButtonWidth = aLicenseButton.CalcMinimumSize().Width();
+ sal_Int32 aWebsiteButtonWidth = aWebsiteButton.CalcMinimumSize().Width();
+ sal_Int32 aLargestButtonWidth = 0;
+
+ if ( aCreditsButtonWidth >= aLicenseButtonWidth
+ && aCreditsButtonWidth >= aWebsiteButtonWidth )
+ aLargestButtonWidth = aCreditsButtonWidth;
+
+ else if ( aLicenseButtonWidth >= aCreditsButtonWidth
+ && aLicenseButtonWidth >= aWebsiteButtonWidth )
+ aLargestButtonWidth = aLicenseButtonWidth;
+ else if ( aWebsiteButtonWidth >= aCreditsButtonWidth
+ && aWebsiteButtonWidth >= aLicenseButtonWidth )
+ aLargestButtonWidth = aWebsiteButtonWidth;
+
+ aButtonSize.Width() = aLargestButtonWidth + ( 2 * aButtonHPadding );
+ aButtonSize.Height() = aWebsiteButton.CalcMinimumSize().Height() + ( 2 * aButtonVPadding );
+
+ aCreditsButton.SetSizePixel( aButtonSize );
+ aLicenseButton.SetSizePixel( aButtonSize );
+ aWebsiteButton.SetSizePixel( aButtonSize );
+
+ sal_Int32 aButtonSpacing = (aContentWidth - ( aDialogBorder * 2 ) - ( aButtonSize.Width() * 3 ) ) / 2;
+ if (aButtonSpacing < 1)
+ aButtonSpacing = 6;
+ aButtonPos.X() = aShadowWidth + aDialogBorder;
+ aButtonPos.Y() = aDescriptionPos.Y() + aDescriptionTextHeight + aVersionDescriptionSpacing;
+
+ aCreditsButton.SetPosPixel( aButtonPos );
+
+ aButtonPos.X() += aButtonSize.Width() + aButtonSpacing;
+ aWebsiteButton.SetPosPixel( aButtonPos );
+
+ aButtonPos.X() += aButtonSize.Width() + aButtonSpacing;
+ aLicenseButton.SetPosPixel( aButtonPos );
+}
+
+void AboutDialog::MoveControl(Control& rControl, sal_Int32 X)
+{
+ Point aControlPos = rControl.GetPosPixel();
+ aControlPos.X() += X;
+ rControl.SetPosPixel(aControlPos);
+}
+
void AboutDialog::Paint( const Rectangle& rRect )
{
SetClipRegion( rRect );
Point aPos( 0, 0 );
- DrawImage( aPos, aAppLogo );
+
+ DrawBitmapEx( aPos, aBackgroundBitmap );
+}
+
+rtl::OUString AboutDialog::GetBuildId()
+{
+ rtl::OUString sDefault;
+ rtl::OUString sBuildId(utl::Bootstrap::getBuildVersion(sDefault));
+ if (!sBuildId.isEmpty())
+ return sBuildId;
+
+ sBuildId = utl::Bootstrap::getBuildIdData(sDefault);
+
+ if (!sBuildId.isEmpty())
+ {
+ sal_Int32 nIndex = 0;
+ return sBuildId.getToken( 0, '-', nIndex );
+ }
+
+ OSL_ENSURE( !sBuildId.isEmpty(), "No BUILDID in bootstrap file" );
+ return sBuildId;
+}
+
+rtl::OUString AboutDialog::GetVersionString()
+{
+ rtl::OUString sVersion = aVersionTextStr;
+
+ rtl::OUString sBuildId = GetBuildId();
+
+ if (!sBuildId.isEmpty())
+ {
+ sVersion += " ";
+ sVersion += m_sBuildStr.replaceAll("%BUILDID", sBuildId);
+ }
+
+ return sVersion;
+}
+
+rtl::OUString AboutDialog::GetCopyrightString()
+{
+ rtl::OUString aCopyrightString = m_aVendorTextStr;
+ aCopyrightString += "\n";
+
+ aCopyrightString += m_aCopyrightTextStr;
+ aCopyrightString += "\n";
+
+ if (utl::ConfigManager::getProductName().equals("LibreOffice"))
+ aCopyrightString += m_aBasedTextStr;
+ else
+ aCopyrightString += m_aBasedDerivedTextStr;
+
+ return aCopyrightString;
+}
+
+IMPL_LINK_NOARG(AboutDialog, CancelHdl)
+{
+ Close();
+ return 0;
}
sal_Bool AboutDialog::Close()
diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc
index 07f1026..40dd4a2 100644
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@ -27,20 +27,21 @@
#include <sfx2/sfx.hrc>
-#define ABOUT_FTXT_VERSION 1
-#define ABOUT_FTXT_COPYRIGHT 2
-#define ABOUT_FTXT_LINK 3
-#define ABOUT_TDFSTR_LINK 4
-#define ABOUT_FEATURES_LINK 5
#define ABOUT_STR_BUILD 6
#define ABOUT_STR_VERSION 7
#define ABOUT_STR_VENDOR 8
#define ABOUT_STR_COPYRIGHT 9
-#define ABOUT_STR_COPYRIGHT_DERIVED 10
-#define ABOUT_STR_COPYRIGHT_ORACLE_DERIVED 11
-#define ABOUT_STR_ACKNOWLEDGEMENT 12
-#define ABOUT_STR_LINK 13
-#define ABOUT_TDF_LINK 14
-#define ABOUT_FEATURESSTR_LINK 15
-#define ABOUT_BUTTONS_LINE 16
-#define ABOUT_BTN_CANCEL 17
+#define ABOUT_STR_BASED 10
+#define ABOUT_STR_BASED_DERIVED 11
+#define ABOUT_STR_LINK_WEBSITE 13
+#define ABOUT_STR_LINK_CREDITS 15
+#define ABOUT_STR_LINK_LICENSE 22
+#define ABOUT_BTN_CREDITS 17
+#define ABOUT_DESCRIPTION_TEXT 18
+#define ABOUT_COPYRIGHT_TEXT 24
+#define ABOUT_COPYRIGHT_TEXT_SHADOW 25
+#define ABOUT_IMAGE_LOGO 19
+#define ABOUT_BTN_WEBSITE 20
+#define ABOUT_BTN_LICENSE 21
+#define ABOUT_VERSION_TEXT 23
+#define ABOUT_STR_DESCRIPTION 24
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index cee5330..6de34e5 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -30,14 +30,11 @@
ModalDialog RID_DEFAULTABOUT
{
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 245 , 280 ) ;
Moveable = TRUE ;
SVLook = TRUE ;
- MultiLineEdit ABOUT_FTXT_VERSION
+ MultiLineEdit ABOUT_DESCRIPTION_TEXT
{
Border = FALSE ;
- Pos = MAP_APPFONT ( 54 , 6 ) ;
- Size = MAP_APPFONT ( 118 , 16 ) ;
IgnoreTab = TRUE ;
ReadOnly = TRUE ;
AutoVScroll = TRUE ;
@@ -45,92 +42,87 @@ ModalDialog RID_DEFAULTABOUT
CENTER = TRUE ;
RIGHT = FALSE ;
};
- MultiLineEdit ABOUT_FTXT_COPYRIGHT
+ MultiLineEdit ABOUT_COPYRIGHT_TEXT
{
Border = FALSE ;
- Pos = MAP_APPFONT ( 54 , 25 ) ;
- Size = MAP_APPFONT ( 168 , 71 ) ;
IgnoreTab = TRUE ;
ReadOnly = TRUE ;
- AutoVScroll = TRUE ;
LEFT = FALSE ;
CENTER = TRUE ;
RIGHT = FALSE ;
};
- FixedText ABOUT_FTXT_LINK
+ MultiLineEdit ABOUT_COPYRIGHT_TEXT_SHADOW
{
- NoLabel = TRUE;
- TabStop = TRUE;
- Text [ en-US ] = "Contributor credits";
- Pos = MAP_APPFONT ( 54 , 100 ) ;
- Size = MAP_APPFONT ( 168 , 10 ) ;
+ Border = FALSE ;
+ IgnoreTab = TRUE ;
+ ReadOnly = TRUE ;
+ LEFT = FALSE ;
+ CENTER = TRUE ;
+ RIGHT = FALSE ;
};
- FixedText ABOUT_TDFSTR_LINK
+ MultiLineEdit ABOUT_VERSION_TEXT
{
- NoLabel = TRUE;
- TabStop = TRUE;
- Text [ en-US ] = "The Document Foundation";
- Pos = MAP_APPFONT ( 54 , 100 ) ;
- Size = MAP_APPFONT ( 168 , 10 ) ;
+ Border = FALSE ;
+ IgnoreTab = TRUE ;
+ ReadOnly = TRUE ;
+ LEFT = FALSE ;
+ CENTER = TRUE ;
+ RIGHT = FALSE ;
};
- FixedText ABOUT_FEATURES_LINK
+ String ABOUT_STR_VERSION
{
- NoLabel = TRUE;
- TabStop = TRUE;
- Text [ en-US ] = "Features";
- Pos = MAP_APPFONT ( 54 , 100 ) ;
- Size = MAP_APPFONT ( 168 , 10 ) ;
+ Text = "version %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX %PRODUCTEXTENSION";
};
- String ABOUT_STR_VERSION
+ String ABOUT_STR_DESCRIPTION
{
- Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX %PRODUCTEXTENSION";
+ Text [ en-US ] = "%PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more.";
};
String ABOUT_STR_VENDOR
{
- Text[ en-US ] = "%PRODUCTNAME is a free and open source office suite. This release was supplied by %OOOVENDOR.";
+ Text[ en-US ] = "This release was supplied by %OOOVENDOR";
};
String ABOUT_STR_COPYRIGHT
{
- Text[ en-US ] = "Copyright © 2000, 2012 LibreOffice contributors and/or their affiliates. All rights reserved.";
+ Text[ en-US ] = "Copyright © 2000, 2012 LibreOffice contributors and/or their affiliates";
+ };
+ String ABOUT_STR_BASED
+ {
+ Text[ en-US ] = "LibreOffice was based on OpenOffice.org";
};
- String ABOUT_STR_COPYRIGHT_DERIVED
+ String ABOUT_STR_BASED_DERIVED
{
- Text[ en-US ] = "%PRODUCTNAME is derived from LibreOffice. LibreOffice is copyright © 2000, 2012 LibreOffice contributors and/or their affiliates. All rights reserved.";
+ Text[ en-US ] = "%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org";
};
- String ABOUT_STR_COPYRIGHT_ORACLE_DERIVED
+ String ABOUT_STR_BUILD
{
- Text[ en-US ] = "LibreOffice is derived from OpenOffice.org. OpenOffice.org is copyright © 2000, 2011 Oracle and/or its affiliates. All rights reserved.";
+ Text[ en-US ] = "(Build ID: %BUILDID)";
};
- String ABOUT_STR_ACKNOWLEDGEMENT
+ String ABOUT_STR_LINK_WEBSITE
{
- Text[ en-US ] = "%OOOVENDOR acknowledges all community members, please find more information at the links below:";
+ Text[ en-US ] = "http://www.libreoffice.org";
};
- String ABOUT_STR_LINK
+ String ABOUT_STR_LINK_CREDITS
{
Text[ en-US ] = "http://www.libreoffice.org/about-us/credits/";
};
- String ABOUT_STR_BUILD
+ String ABOUT_STR_LINK_LICENSE
{
- Text[ en-US ] = "Build ID:";
+ Text[ en-US ] = "http://www.libreoffice.org/download/license/";
};
- String ABOUT_TDF_LINK
+ PushButton ABOUT_BTN_CREDITS
{
- Text[ en-US ] = "http://www.documentfoundation.org/";
+ Text [ en-US ] = "Credits";
};
- String ABOUT_FEATURESSTR_LINK
+ PushButton ABOUT_BTN_LICENSE
{
- Text[ en-US ] = "http://www.libreoffice.org/features/";
+ Text [ en-US ] = "License";
};
- FixedLine ABOUT_BUTTONS_LINE
+ PushButton ABOUT_BTN_WEBSITE
{
- Pos = MAP_APPFONT ( 0 , 245 ) ;
- Size = MAP_APPFONT ( 170 , 2 ) ;
+ Text [ en-US ] = "libreoffice.org";
+ DefButton = TRUE ;
};
- CancelButton ABOUT_BTN_CANCEL
+ FixedImage ABOUT_IMAGE_LOGO
{
- DefButton = TRUE ;
- Pos = MAP_APPFONT ( 174 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Close";
};
};
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 8d31a17..c94dea1 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -45,35 +45,51 @@ typedef ::std::vector< Accelerator* > AccelList;
class AboutDialog : public SfxModalDialog
{
private:
- Image aAppLogo;
+ BitmapEx aBackgroundBitmap;
+ BitmapEx aLogoBitmap;
MultiLineEdit aVersionText;
+ MultiLineEdit aDescriptionText;
MultiLineEdit aCopyrightText;
- svt::FixedHyperlink aInfoLink;
- svt::FixedHyperlink aTdfLink;
- svt::FixedHyperlink aFeaturesLink;
- FixedLine aButtonsLine;
- CancelButton aCancelButton;
+ MultiLineEdit aCopyrightTextShadow;
+ FixedImage aLogoImage;
+ PushButton aCreditsButton;
+ PushButton aWebsiteButton;
+ PushButton aLicenseButton;
String aVersionData;
String aVersionTextStr;
String m_aVendorTextStr;
- String m_aOracleCopyrightTextStr;
- String m_aAcknowledgementTextStr;
- String m_aLinkStr;
- String m_aTdfLinkStr;
- String m_aFeaturesLinkStr;
- String m_sBuildStr;
+ String m_aCopyrightTextStr;
+ String m_aBasedTextStr;
+ String m_aBasedDerivedTextStr;
+ String m_aWebsiteLinkStr;
+ String m_aCreditsLinkStr;
+ String m_aLicenseLinkStr;
+ rtl::OUString m_sBuildStr;
+ String m_aDescriptionTextStr;
+
+ void StyleControls();
+ void LayoutControls();
+ void LayoutButtons(sal_Int32 aContentWidth, sal_Int32 aDialogBorder,
+ sal_Int32 aShadowWidth, Point aDescriptionPos,
+ sal_Int32 aDescriptionTextHeight,
+ sal_Int32 aVersionDescriptionSpacing, Point& aButtonPos,
+ Size& aButtonSize);
+ void MoveControl(Control& rControl, sal_Int32 X);
+ rtl::OUString GetBuildId();
+ rtl::OUString GetVersionString();
+ rtl::OUString GetCopyrightString();
protected:
virtual sal_Bool Close();
- virtual void Paint( const Rectangle& rRect );
+ virtual void Paint( const Rectangle& rRect );
public:
AboutDialog( Window* pParent, const ResId& rId);
- DECL_LINK(CancelHdl, void *);
- DECL_LINK(HandleHyperlink, svt::FixedHyperlink *);
+ DECL_LINK( CancelHdl, void * );
+ DECL_LINK( HandleClick, PushButton* );
};
#endif // #ifndef _ABOUT_HXX
diff --git a/desktop/Zip_brand.mk b/desktop/Zip_brand.mk
index 05a2723..cb35d47 100644
--- a/desktop/Zip_brand.mk
+++ b/desktop/Zip_brand.mk
@@ -27,10 +27,16 @@
$(eval $(call gb_Zip_Zip,brand/intro,$(WORKDIR)/Zip/brand_intro))
-$(eval $(call gb_Zip_add_file,brand/intro,about.png,\
- $(if $(ABOUT_BITMAP),\
- $(ABOUT_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/about.png)\
+$(eval $(call gb_Zip_add_file,brand/intro,shell/about.svg,\
+ $(if $(ABOUT_BACKGROUND_SVG),\
+ $(ABOUT_BACKGROUND_SVG),\
+ $(SRCDIR)/icon-themes/galaxy/brand/shell/about.svg)\
+))
+
+$(eval $(call gb_Zip_add_file,brand/intro,flat_logo.svg,\
+ $(if $(FLAT_LOGO_SVG),\
+ $(FLAT_LOGO_SVG),\
+ $(SRCDIR)/icon-themes/galaxy/brand/flat_logo.svg)\
))
$(eval $(call gb_Zip_add_file,brand/intro,intro.png,\
diff --git a/desktop/Zip_brand_dev.mk b/desktop/Zip_brand_dev.mk
index b554a69..1131bec 100644
--- a/desktop/Zip_brand_dev.mk
+++ b/desktop/Zip_brand_dev.mk
@@ -27,10 +27,16 @@
$(eval $(call gb_Zip_Zip,brand_dev/intro,$(WORKDIR)/Zip/brand_intro_dev))
-$(eval $(call gb_Zip_add_file,brand_dev/intro,about.png,\
- $(if $(ABOUT_BITMAP),\
- $(ABOUT_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand_dev/about.png)\
+$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/about.svg,\
+ $(if $(ABOUT_BACKGROUND_SVG),\
+ $(ABOUT_BACKGROUND_SVG),\
+ $(SRCDIR)/icon-themes/galaxy/brand/shell/about.svg)\
+))
+
+$(eval $(call gb_Zip_add_file,brand_dev/intro,flat_logo.svg,\
+ $(if $(FLAT_LOGO_SVG),\
+ $(FLAT_LOGO_SVG),\
+ $(SRCDIR)/icon-themes/galaxy/brand/flat_logo.svg)\
))
$(eval $(call gb_Zip_add_file,brand_dev/intro,intro.png,\
diff --git a/desktop/Zip_shell.mk b/desktop/Zip_shell.mk
index 3803cf4..d23f931 100644
--- a/desktop/Zip_shell.mk
+++ b/desktop/Zip_shell.mk
@@ -28,6 +28,7 @@
$(eval $(call gb_Zip_Zip,shell,$(SRCDIR)/icon-themes/galaxy/brand/shell))
$(eval $(call gb_Zip_add_files,shell,\
+ about.svg \
backing_left.png \
backing_right.png \
backing_space.png \
diff --git a/icon-themes/galaxy/brand/flat_logo.svg b/icon-themes/galaxy/brand/flat_logo.svg
new file mode 100644
index 0000000..5f05198
--- /dev/null
+++ b/icon-themes/galaxy/brand/flat_logo.svg
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="269.02063"
+ height="54.628979"
+ id="svg1205"
+ version="1.1"
+ inkscape:version="0.48+devel r10127 custom"
+ sodipodi:docname="New document 3">
+ <defs
+ id="defs1207" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="283.79602"
+ inkscape:cy="-209.82836"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ width="0px"
+ height="0px"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="446"
+ inkscape:window-height="381"
+ inkscape:window-x="1024"
+ inkscape:window-y="55"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata1210">
+ <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>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-91.203976,-153.61913)">
+ <g
+ transform="matrix(0.88641707,0,0,0.88641707,-311.49254,149.07356)"
+ id="g4163"
+ inkscape:export-filename="/home/and471/Software/Other/libreoffice/icon-themes/galaxy/brand/logo_flat.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <g
+ style="display:inline"
+ transform="matrix(0.76587911,0,0,0.76587911,27.595168,-1355.2757)"
+ id="g4165">
+ <path
+ id="path4167"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#18a303;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"
+ d="m 643.40618,1779.7848 0,45.9016 29.59884,0 0,-6.9732 -20.56412,0 0,-38.9284 -9.03472,0"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4169"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#18a303;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"
+ d="m 678.46533,1825.6864 9.03473,0 0,-33.0383 -9.03473,0 0,33.0383 m 4.51736,-35.8818 c 2.83178,0 5.1916,-2.3018 5.1916,-5.213 0,-2.8434 -2.35982,-5.213 -5.1916,-5.213 -2.89921,0 -5.1916,2.3696 -5.1916,5.213 0,2.9112 2.29239,5.213 5.1916,5.213"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4171"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#18a303;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"
+ d="m 703.23342,1796.507 -0.13485,0 0,-19.5657 -9.03472,0 0,48.7451 8.83246,0 0.20226,-3.8589 0.13485,0 c 2.83178,3.182 5.66357,4.5359 10.31577,4.5359 8.76503,0 14.56345,-7.9211 14.56345,-17.8055 0,-9.5458 -5.19161,-16.5868 -14.1589,-16.5868 -4.78706,0 -7.61885,1.4217 -10.72032,4.5359 m -0.13485,11.9155 c 0,-5.6869 2.5621,-9.4782 7.41657,-9.4782 5.39387,0 8.09081,3.859 8.09081,10.1552 0,6.2286 -2.62952,10.2907 -7.95596,10.2907 -4.6522,0 -7.55142,-3.6559 -7.55142,-9.4782 l 0,-1.4895"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4173"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#18a303;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"
+ d="m 752.35511,1791.9711 c -4.3151,0.2707 -8.42793,2.9112 -10.31578,6.567 l -0.13484,0 -0.20227,-5.89 -8.83246,0 0,33.0383 9.03473,0 0,-12.4571 c 0,-6.6347 1.21362,-9.0043 3.30374,-10.4937 1.82043,-1.2863 3.97798,-1.8279 6.94461,-1.9633 l 0.20227,-8.8012"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4175"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#18a303;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"
+ d="m 785.59681,1807.2039 c 0,-8.1918 -4.98934,-15.2328 -13.61952,-15.2328 -10.38318,0 -17.05811,7.1764 -17.05811,18.0763 0,10.6291 6.8772,16.316 17.05811,16.316 4.78706,0 8.15824,-0.7447 11.32712,-2.1664 l -0.94392,-6.7701 c -2.96662,1.2186 -6.00068,1.9633 -9.237,1.9633 -5.46128,0 -8.96731,-2.505 -9.30442,-7.6502 l 21.3732,0 c 0.2697,-1.2187 0.40454,-3.1143 0.40454,-4.5361 m -14.56344,-8.2596 c 3.91055,0 5.73099,3.182 5.86583,6.567 l -12.74302,0 c 0.67423,-3.7913 3.30375,-6.567 6.87719,-6.567"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4177"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"
+ d="m 813.02447,1779.1077 c -12.13619,0 -22.11485,8.869 -22.11485,23.6279 0,14.759 9.97866,23.6278 22.11485,23.6278 12.1362,0 22.11486,-8.8688 22.11486,-23.6278 0,-14.7589 -9.97866,-23.6279 -22.11486,-23.6279 m 0,4.6038 c 9.03472,0 15.91191,6.7701 15.91191,19.0241 0,12.2539 -6.87719,19.0242 -15.91191,19.0242 -9.03471,0 -15.91191,-6.7703 -15.91191,-19.0242 0,-12.254 6.8772,-19.0241 15.91191,-19.0241"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4179"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"
+ d="m 843.77424,1790.8201 0,2.0987 -5.32645,0 0,4.333 5.32645,0 0,28.4346 5.66355,0 0,-28.4346 8.3605,0 0,-4.333 -8.3605,0 0,-2.9788 c 0,-5.89 2.49467,-9.3428 7.01203,-9.3428 2.09012,0 3.43859,0.3385 4.71964,0.8124 l 0.53938,-4.1975 c -1.21362,-0.4739 -3.50601,-0.9478 -5.32644,-0.9478 -8.02337,0 -12.60816,5.213 -12.60816,14.5558"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4181"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"
+ d="m 862.60286,1790.8201 0,2.0987 -5.32645,0 0,4.333 5.32645,0 0,28.4346 5.66355,0 0,-28.4346 8.3605,0 0,-4.333 -8.3605,0 0,-2.9788 c 0,-5.89 2.49467,-9.3428 7.01204,-9.3428 2.09011,0 3.43858,0.3385 4.71963,0.8124 l 0.53939,-4.1975 c -1.21362,-0.4739 -3.50603,-0.9478 -5.32645,-0.9478 -8.02337,0 -12.60816,5.213 -12.60816,14.5558"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4183"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"
+ d="m 883.18692,1825.6864 5.66356,0 0,-32.7676 -5.66356,0 0,32.7676 m 2.83178,-37.5743 c 1.95528,0 3.50601,-1.5571 3.50601,-3.5205 0,-1.9633 -1.55073,-3.5205 -3.50601,-3.5205 -1.95528,0 -3.50601,1.5572 -3.50601,3.5205 0,1.9634 1.55073,3.5205 3.50601,3.5205"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4185"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"
+ d="m 900.62683,1809.1673 c 0,-8.2596 4.9219,-12.5925 11.32712,-12.5925 3.37116,0 6.3378,0.8124 8.76503,1.9633 l 0.53939,-4.3329 c -2.0227,-1.0155 -5.25903,-1.9634 -8.83246,-1.9634 -10.1135,0 -17.73234,6.1609 -17.73234,17.6702 0,10.8322 6.87719,16.4514 15.97933,16.4514 4.0454,0 6.9446,-0.4738 10.24835,-1.8956 l -0.53938,-4.3329 c -2.83179,1.2864 -5.86584,1.8956 -8.69761,1.8956 -6.54006,0 -11.05743,-4.1298 -11.05743,-12.8632"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4187"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"
+ d="m 953.20391,1810.589 c 0.13484,-1.2186 0.20227,-2.2341 0.20227,-3.2497 0,-8.395 -4.38252,-15.0975 -12.81043,-15.0975 -9.10215,0 -15.77707,7.5826 -15.77707,17.6702 0,11.103 6.67492,16.4514 15.77707,16.4514 4.04539,0 7.07945,-0.6092 10.24834,-1.8956 l -0.53938,-4.3329 c -2.49466,1.2186 -6.06811,1.8956 -8.89989,1.8956 -6.54006,0 -10.78773,-3.9943 -10.92257,-11.4415 l 22.72166,0 m -13.08013,-14.0142 c 4.98933,0 7.68626,4.1298 7.68626,9.5459 l -17.0581,0 c 0.80907,-5.7546 3.97798,-9.5459 9.37184,-9.5459"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g4189"
+ style="font-size:28.0312252px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Vegur;-inkscape-font-specification:Andale Mono"
+ transform="matrix(0.75116131,0,0,0.78088528,27.595168,-1355.2757)">
+ <path
+ id="path4191"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 669.80391,1801.7666 -13.79137,0 0,1.9061 5.69034,0 0,17.099 2.35463,0 0,-17.099 5.7464,0 0,-1.9061"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4193"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 674.34759,1809.4471 0,-8.8579 -2.35462,0 0,20.1825 2.35462,0 0,-7.4563 c 0,-2.8031 1.70991,-4.485 3.81225,-4.485 2.18643,0 2.71903,1.2334 2.71903,3.8403 l 0,8.101 2.35462,0 0,-8.8298 c 0,-3.3077 -1.51369,-5.0176 -4.4009,-5.0176 -2.01825,0 -3.47587,1.1213 -4.42893,2.5228 l -0.0561,0"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4195"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 698.19735,1814.5208 c 0.0561,-0.5046 0.0841,-0.9251 0.0841,-1.3455 0,-3.4759 -1.82203,-6.251 -5.32593,-6.251 -3.78421,0 -6.55931,3.1395 -6.55931,7.3162 0,4.5971 2.7751,6.8115 6.55931,6.8115 1.68187,0 2.94328,-0.2522 4.26074,-0.7848 l -0.22425,-1.794 c -1.03715,0.5045 -2.52281,0.7848 -3.70012,0.7848 -2.71902,0 -4.48499,-1.6538 -4.54106,-4.7372 l 9.44653,0 m -5.43806,-5.8025 c 2.07431,0 3.19556,1.7099 3.19556,3.9524 l -7.0919,0 c 0.33637,-2.3826 1.65384,-3.9524 3.89634,-3.9524"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4197"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 707.96272,1802.0188 0,18.5847 c 1.37353,0.1963 3.39178,0.3084 4.90547,0.3084 5.74639,0 11.15643,-3.3357 11.15643,-10.2314 0,-6.0548 -4.14863,-9.0541 -11.10037,-9.0541 -1.54171,0 -3.33572,0.1121 -4.96153,0.3924 m 2.35463,1.6814 c 0.86896,-0.1396 1.82203,-0.1677 2.85918,-0.1677 5.35396,0 8.26921,2.8592 8.26921,7.4283 0,5.41 -3.75618,8.045 -8.29724,8.045 -0.86897,0 -1.85006,-0.028 -2.83115,-0.1122 l 0,-15.1929"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4199"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 732.78438,1806.9243 c -4.09256,0 -6.53128,3.0834 -6.53128,7.0639 0,3.9804 2.43872,7.0638 6.53128,7.0638 4.09255,0 6.53127,-3.0834 6.53127,-7.0638 0,-3.9805 -2.43872,-7.0639 -6.53127,-7.0639 m 0,12.3337 c -2.83115,0 -4.06453,-2.4387 -4.06453,-5.2698 0,-2.8312 1.23338,-5.2699 4.06453,-5.2699 2.83115,0 4.06452,2.4387 4.06452,5.2699 0,2.8311 -1.23337,5.2698 -4.06452,5.2698"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4201"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 744.10417,1813.9321 c 0,-3.4198 2.04628,-5.2138 4.70925,-5.2138 1.40156,0 2.63493,0.3364 3.64406,0.8129 l 0.22425,-1.794 c -0.84094,-0.4205 -2.18644,-0.8129 -3.67209,-0.8129 -4.20468,0 -7.37222,2.5508 -7.37222,7.3162 0,4.4849 2.85919,6.8115 6.6434,6.8115 1.68188,0 2.88722,-0.1962 4.26075,-0.7848 l -0.22425,-1.794 c -1.17731,0.5326 -2.43872,0.7848 -3.61603,0.7848 -2.71902,0 -4.59712,-1.7099 -4.59712,-5.3259"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4203"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 764.3944,1818.5292 0.0841,2.2425 2.27053,0 0,-13.5671 -2.35463,0 0,7.4563 c 0,2.8031 -1.7099,4.485 -3.81224,4.485 -2.18644,0 -2.71903,-1.2334 -2.71903,-3.8403 l 0,-8.101 -2.35463,0 0,8.8299 c 0,3.3076 1.51369,5.0175 4.40091,5.0175 2.01824,0 3.47587,-1.1212 4.42893,-2.5228 l 0.0561,0"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4205"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 787.57141,1812.3904 0,8.3813 2.35462,0 0,-9.1101 c 0,-3.0274 -1.40156,-4.7373 -4.09256,-4.7373 -1.93415,0 -3.47587,1.2334 -4.37287,3.0554 l -0.0841,0 c -0.5326,-1.9061 -1.65385,-3.0554 -3.81225,-3.0554 -1.93415,0 -3.16753,1.0372 -4.12059,2.5228 l -0.0561,0 -0.0841,-2.2425 -2.27053,0 0,13.5671 2.35463,0 0,-6.8957 c 0,-3.0554 1.3455,-5.0456 3.44784,-5.0456 1.76596,0 2.46675,1.2334 2.46675,3.56 l 0,8.3813 2.35462,0 0,-6.8957 c 0,-3.1114 1.3455,-5.0456 3.44784,-5.0456 1.76596,0 2.46675,1.2334 2.46675,3.56"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4207"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 804.8474,1814.5208 c 0.0561,-0.5046 0.0841,-0.9251 0.0841,-1.3455 0,-3.4759 -1.82203,-6.251 -5.32593,-6.251 -3.78421,0 -6.55931,3.1395 -6.55931,7.3162 0,4.5971 2.7751,6.8115 6.55931,6.8115 1.68187,0 2.94328,-0.2522 4.26075,-0.7848 l -0.22425,-1.794 c -1.03716,0.5045 -2.52282,0.7848 -3.70013,0.7848 -2.71902,0 -4.48499,-1.6538 -4.54105,-4.7372 l 9.44652,0 m -5.43806,-5.8025 c 2.07431,0 3.19556,1.7099 3.19556,3.9524 l -7.0919,0 c 0.33638,-2.3826 1.65385,-3.9524 3.89634,-3.9524"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4209"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 810.61657,1809.4471 -0.0841,-2.2425 -2.27053,0 0,13.5671 2.35462,0 0,-7.4563 c 0,-2.8031 1.70991,-4.485 3.81225,-4.485 2.18643,0 2.71903,1.2334 2.71903,3.8403 l 0,8.101 2.35462,0 0,-8.8298 c 0,-3.3077 -1.51369,-5.0176 -4.4009,-5.0176 -2.01825,0 -3.47587,1.1213 -4.42893,2.5228 l -0.0561,0"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4211"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 830.00936,1807.2046 -3.25162,0 0,-2.9993 -2.35462,0 0,2.9993 -2.15841,0 0,1.794 2.15841,0 0,8.4374 c 0,2.4668 1.3455,3.616 3.53193,3.616 1.14928,0 1.90612,-0.1121 2.49478,-0.3644 l -0.25228,-1.7099 c -0.47653,0.1962 -0.9811,0.2803 -1.51369,0.2803 -1.37353,0 -1.90612,-0.7848 -1.90612,-2.4106 l 0,-7.8488 3.25162,0 0,-1.794"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4213"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 842.15171,1820.7717 0,-8.5775 6.81159,0 0,-1.9061 -6.81159,0 0,-6.6154 7.76465,0 0,-1.9061 -10.11927,0 0,19.0051 2.35462,0"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4215"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 858.43216,1806.9243 c -4.09256,0 -6.53128,3.0834 -6.53128,7.0639 0,3.9804 2.43872,7.0638 6.53128,7.0638 4.09255,0 6.53127,-3.0834 6.53127,-7.0638 0,-3.9805 -2.43872,-7.0639 -6.53127,-7.0639 m 0,12.3337 c -2.83115,0 -4.06453,-2.4387 -4.06453,-5.2698 0,-2.8312 1.23338,-5.2699 4.06453,-5.2699 2.83115,0 4.06453,2.4387 4.06453,5.2699 0,2.8311 -1.23338,5.2698 -4.06453,5.2698"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4217"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 877.01204,1818.5292 0.0841,2.2425 2.27053,0 0,-13.5671 -2.35462,0 0,7.4563 c 0,2.8031 -1.70991,4.485 -3.81225,4.485 -2.18643,0 -2.71902,-1.2334 -2.71902,-3.8403 l 0,-8.101 -2.35463,0 0,8.8299 c 0,3.3076 1.51369,5.0175 4.4009,5.0175 2.01825,0 3.47588,-1.1212 4.42894,-2.5228 l 0.0561,0"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4219"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 886.00524,1809.4471 -0.0841,-2.2425 -2.27053,0 0,13.5671 2.35462,0 0,-7.4563 c 0,-2.8031 1.70991,-4.485 3.81225,-4.485 2.18643,0 2.71903,1.2334 2.71903,3.8403 l 0,8.101 2.35462,0 0,-8.8298 c 0,-3.3077 -1.51369,-5.0176 -4.4009,-5.0176 -2.01825,0 -3.47587,1.1213 -4.42893,2.5228 l -0.0561,0"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4221"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 908.53753,1809.307 c -1.00912,-1.6539 -2.46675,-2.3827 -4.37287,-2.3827 -3.64406,0 -6.11081,3.0274 -6.11081,7.3162 0,4.0925 2.21447,6.8115 5.94262,6.8115 1.96219,0 3.47587,-0.897 4.54106,-2.3826 l 0.0561,0 0.0841,2.1023 2.27053,0 0,-20.1825 -2.35463,0 0,8.7178 -0.0561,0 m 0.0561,5.4941 c 0,2.3546 -1.45762,4.4569 -3.86831,4.4569 -2.71902,0 -4.20468,-2.1303 -4.20468,-5.2418 0,-3.1956 1.42959,-5.2979 4.14862,-5.2979 2.1584,0 3.92437,1.8501 3.92437,4.457 l 0,1.6258"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4223"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 919.95107,1806.9243 c -1.37353,0 -2.74706,0.2243 -4.20468,0.7849 l 0.22425,1.794 c 1.37353,-0.5326 2.49478,-0.7849 3.64406,-0.7849 2.0743,0 2.94327,1.2053 2.94327,3.1115 l 0,0.3924 c -0.64471,-0.1121 -1.2614,-0.1682 -2.24249,-0.1682 -3.44784,0 -6.05475,1.7099 -6.05475,4.6812 0,2.7751 2.04628,4.3168 4.23272,4.3168 1.79399,0 3.27965,-0.925 4.00846,-2.3826 l 0.0561,0 0.0841,2.1023 2.27053,0 0,-9.1942 c 0,-3.0554 -1.82204,-4.6532 -4.96153,-4.6532 m 2.6069,8.0169 c 0,2.691 -1.37353,4.3168 -3.36374,4.3168 -1.42959,0 -2.41069,-1.0371 -2.41069,-2.691 0,-1.794 1.14929,-2.9713 3.89634,-2.9713 0.70078,0 1.31747,0.084 1.87809,0.1682 l 0,1.1773"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4225"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 935.4002,1807.2046 -3.25162,0 0,-2.9993 -2.35463,0 0,2.9993 -2.1584,0 0,1.794 2.1584,0 0,8.4374 c 0,2.4668 1.34551,3.616 3.53194,3.616 1.14928,0 1.90612,-0.1121 2.49478,-0.3644 l -0.25228,-1.7099 c -0.47653,0.1962 -0.9811,0.2803 -1.51369,0.2803 -1.37353,0 -1.90612,-0.7848 -1.90612,-2.4106 l 0,-7.8488 3.25162,0 0,-1.794"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4227"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 938.8371,1820.7717 2.35462,0 0,-13.5671 -2.35462,0 0,13.5671 m 1.17731,-15.5573 c 0.81291,0 1.45762,-0.6447 1.45762,-1.4576 0,-0.8129 -0.64471,-1.4576 -1.45762,-1.4576 -0.8129,0 -1.45762,0.6447 -1.45762,1.4576 0,0.8129 0.64472,1.4576 1.45762,1.4576"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4229"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 951.01185,1806.9243 c -4.09255,0 -6.53127,3.0834 -6.53127,7.0639 0,3.9804 2.43872,7.0638 6.53127,7.0638 4.09256,0 6.53128,-3.0834 6.53128,-7.0638 0,-3.9805 -2.43872,-7.0639 -6.53128,-7.0639 m 0,12.3337 c -2.83115,0 -4.06452,-2.4387 -4.06452,-5.2698 0,-2.8312 1.23337,-5.2699 4.06452,-5.2699 2.83116,0 4.06453,2.4387 4.06453,5.2699 0,2.8311 -1.23337,5.2698 -4.06453,5.2698"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4231"
+ style="fill:#000000;-inkscape-font-specification:Andale Mono"
+ d="m 963.2006,1809.4471 -0.0841,-2.2425 -2.27053,0 0,13.5671 2.35462,0 0,-7.4563 c 0,-2.8031 1.70991,-4.485 3.81225,-4.485 2.18643,0 2.71903,1.2334 2.71903,3.8403 l 0,8.101 2.35462,0 0,-8.8298 c 0,-3.3077 -1.51369,-5.0176 -4.4009,-5.0176 -2.01825,0 -3.47587,1.1213 -4.42893,2.5228 l -0.0561,0"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ style="display:inline"
+ transform="matrix(0.76587911,0,0,0.76587911,-81.890602,-834.47792)"
+ id="g4233"
+ inkscape:export-xdpi="382.10526"
+ inkscape:export-ydpi="382.10526">
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ sodipodi:nodetypes="csccscccc"
+ id="path4235"
+ d="m 746.51855,1098.7256 c -0.75464,-0.019 -1.49809,0.4529 -1.79306,1.1382 -0.29499,0.6853 -0.12281,1.5407 0.4153,2.0629 l 16.19626,16.2475 c 0.52235,0.5232 1.37287,0.6967 2.06271,0.4206 0.68985,-0.276 1.1775,-0.985 1.18266,-1.7192 l 0,-16.2776 c 0.002,-0.9808 -0.90388,-1.8741 -1.89823,-1.8724 l -16.16564,0 z"
+ style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccccccccc"
+ style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+ d="m 701.98449,1098.725 c -0.99608,0.014 -1.89207,0.9251 -1.89033,1.9213 l 0,74.1569 c -0.002,0.9961 0.89428,1.9067 1.89033,1.9212 l 60.67658,0 c 1.00641,0 1.92292,-0.9148 1.92132,-1.9212 l 0,-47.7542 c 0.003,-0.504 -0.20246,-1.0061 -0.5578,-1.3635 l -26.24773,-26.3717 c -0.35229,-0.3665 -0.85519,-0.5837 -1.36352,-0.5888 l -34.42885,0 z"
+ id="path4237"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ id="path4239"
+ d="m 701.98449,1098.725 a 1.9181599,1.9181599 0 0 0 -1.89033,1.9213 l 0,74.1569 a 1.9181599,1.9181599 0 0 0 1.89033,1.9212 l 60.67658,0 a 1.9181599,1.9181599 0 0 0 1.92132,-1.9212 l 0,-47.7542 a 1.9181599,1.9181599 0 0 0 -0.5578,-1.3635 l -26.24773,-26.3717 a 1.9181599,1.9181599 0 0 0 -1.36352,-0.5888 l -34.42885,0 z m 1.92133,3.8426 31.7018,0 25.13213,25.2562 0,45.058 -56.83393,0 0,-70.3142 z"
+ style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/icon-themes/galaxy/brand/shell/about.svg b/icon-themes/galaxy/brand/shell/about.svg
new file mode 100644
index 0000000..fe8bee6
--- /dev/null
+++ b/icon-themes/galaxy/brand/shell/about.svg
@@ -0,0 +1,3354 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="486"
+ height="322"
+ id="svg1604"
+ version="1.1"
+ inkscape:version="0.48+devel r10127 custom"
+ sodipodi:docname="about.svg"
+ inkscape:export-filename="/tmp/about.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs1606">
+ <linearGradient
+ id="linearGradient4489-3-1-3-5-4-6-4">
+ <stop
+ id="stop4491-8-7-9-3-7-4-6"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4493-2-9-6-5-0-0-4"
+ offset="1"
+ style="stop-color:#dadada;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4467-7-2-5-1-9-4-5">
+ <stop
+ id="stop4469-0-8-1-0-1-6-9"
+ offset="0"
+ style="stop-color:#aaaaaa;stop-opacity:1;" />
+ <stop
+ id="stop4471-8-9-8-0-6-2-6"
+ offset="1"
+ style="stop-color:#828282;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1178">
+ <stop
+ id="stop1180"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop1182"
+ offset="1"
+ style="stop-color:#dadada;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1185">
+ <stop
+ id="stop1187"
+ offset="0"
+ style="stop-color:#aaaaaa;stop-opacity:1;" />
+ <stop
+ id="stop1189"
+ offset="1"
+ style="stop-color:#828282;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1199">
+ <stop
+ id="stop1201"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop1203"
+ offset="1"
+ style="stop-color:#dadada;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1206">
+ <stop
+ id="stop1208"
+ offset="0"
+ style="stop-color:#aaaaaa;stop-opacity:1;" />
+ <stop
+ id="stop1210"
+ offset="1"
+ style="stop-color:#828282;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2015-0">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2017-8" />
+ <stop
+ style="stop-color:#ededed;stop-opacity:1;"
+ offset="1"
+ id="stop2019-2" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1219">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop1221" />
+ <stop
+ style="stop-color:#ededed;stop-opacity:1;"
+ offset="1"
+ id="stop1223" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1226">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop1228" />
+ <stop
+ style="stop-color:#ededed;stop-opacity:1;"
+ offset="1"
+ id="stop1230" />
+ </linearGradient>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath5934-5">
+ <g
+ transform="matrix(1,0,0,1.0152439,-459.50097,251.3901)"
+ id="g5936-3"
+ style="fill:#ffffff;fill-opacity:1">
+ <path
+ sodipodi:nodetypes="ccccccccccc"
+ inkscape:export-ydpi="191.49001"
+ inkscape:export-xdpi="191.49001"
+ id="path5938-4"
+ d="m 426,-25.63782 c -3.32641,0.04661 -5.99999,2.70362 -5.99999,5.909912 l 0,287.615618 c -0.005,3.23109 2.9477,5.86561 5.99999,5.90991 l 456,0 c 3.53772,0 6.00563,-2.28727 5.99987,-5.90991 l 0,-174.418561 c 0.0122,-2.119401 -0.85394,-4.230812 -2.35268,-5.733736 L 774.94021,-23.161821 c -1.48586,-1.541192 -3.60699,-2.454553 -5.75101,-2.475999 z"
+ style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+ inkscape:export-filename="/Freie_Software/LibreOffice/LibreOffice Initial Artwork/Presentation Template/text4339.png"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscccccc"
+ inkscape:connector-curvature="0"
+ d="m 840.191,21.439406 -38.58725,-38.007865 c -3.29282,-3.24338 -1.11069,-8.946409 2.88842,-9.069347 l 77.37451,0 c 1.66545,-0.003 3.23239,0.627275 4.34959,1.756938 1.1469,1.100416 1.78686,2.643839 1.78372,4.284296 L 888,56.616144 c -0.12482,3.939067 -5.91479,6.08843 -9.2076,2.845051"
+ style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+ id="path5940-4" />
+ </g>
+ </clipPath>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3143-0">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3145-7" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3147-6" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3185-2">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3187-7" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3189-2" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3227-2">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3229-1" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3231-4" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3269-8">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3271-5" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3273-3" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3311-3">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3313-5" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3315-4" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3353-8">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3355-1" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3357-2" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3395-1">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3397-7" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3399-4" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3437-5">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3439-5" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3441-1" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3479-2">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3481-7" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3483-9" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3521-7">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3523-0" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3525-4" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3563-4">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3565-3" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3567-1" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3605-0">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3607-5" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3609-8" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3647-2">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3649-9" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3651-1" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3695-6">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3697-8" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3699-7" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3725-1">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3727-1" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3729-2" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3749-6">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3751-1" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3753-6" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3791-0">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3793-2" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3795-5" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3833-7">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3835-7" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3837-0" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3875-0">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3877-1" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3879-9" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3917-9">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3919-9" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3921-2" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient3959-5">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop3961-3" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop3963-5" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4001-7">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4003-3" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4005-2" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4043-7">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4045-7" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4047-2" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4085-9">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4087-3" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4089-2" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4127-6">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4129-5" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4131-3" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4169-0">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4171-3" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4173-4" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4211-6">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4213-5" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4215-6" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4253-1">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4255-4" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4257-5" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4299-4">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4301-1-4" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4303-6-6" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4317-3">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4319-6" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4321-7" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4335-5">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4337-1" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4339-2" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4353-2">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4355-8" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4357-7" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4371-7">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4373-6" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4375-4" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4389-1">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4391-7" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4393-0" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4407-3">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4409-3" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4411-7" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4425-6">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4427-3" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4429-0" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4443-2">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4445-2" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4447-7" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4461-8">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4463-5" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4465-2" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4479-5">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4481-9" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4483-8" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4497-1">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4499-5" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4501-4" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4515-1">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4517-0" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4519-8" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4529-3">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4531-5" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4533-6" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4543-1">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4545-2" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4547-4" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4561-5">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4563-3" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4565-1" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4579-5">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4581-6" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4583-6" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4597-4">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4599-4" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4601-2" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4615-6">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4617-6" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4619-4" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4633-4">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4635-6" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4637-9" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4651-8">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4653-1" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4655-1" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4669-6">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4671-4" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4673-6" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4687-3">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4689-5" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4691-8" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4705-1">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4707-9" />
+ <stop
+ style="stop-opacity:1;stop-color:#28a540"
+ offset="1"
+ id="stop4709-5" />
+ </radialGradient>
+ <radialGradient
+ fx="0"
+ fy="0"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(75.000061,80.00003,-80.000015,75.000061,-35.332764,-43.185089)"
+ spreadMethod="pad"
+ id="radialGradient4723-9">
+ <stop
+ style="stop-opacity:1;stop-color:#96c22c"
+ offset="0"
+ id="stop4725-2" />
+ <stop
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list