[Libreoffice-commits] .: 5 commits - basctl/uiconfig chart2/uiconfig configure.in cui/source dbaccess/uiconfig framework/uiconfig icon-themes/galaxy instsetoo_native/res reportdesign/uiconfig sc/uiconfig sd/uiconfig starmath/uiconfig sw/uiconfig
Stefan Knorr
astron at kemper.freedesktop.org
Tue Jul 3 05:31:00 PDT 2012
basctl/uiconfig/basicide/menubar/menubar.xml | 1
chart2/uiconfig/menubar/menubar.xml | 1
configure.in | 8
cui/source/dialogs/about.cxx | 94 ----
cui/source/dialogs/about.hrc | 1
cui/source/dialogs/about.src | 8
cui/source/inc/about.hxx | 2
dbaccess/uiconfig/dbapp/menubar/menubar.xml | 1
dbaccess/uiconfig/dbquery/menubar/menubar.xml | 1
dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 1
dbaccess/uiconfig/dbtable/menubar/menubar.xml | 1
dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1
framework/uiconfig/startmodule/menubar/menubar.xml | 1
icon-themes/galaxy/brand/flat_logo.svg | 396 +++++++------------
icon-themes/galaxy/brand/intro.png |binary
icon-themes/galaxy/brand/shell/backing_left.png |binary
icon-themes/galaxy/brand/shell/backing_right.png |binary
icon-themes/galaxy/brand/shell/backing_rtl_left.png |binary
icon-themes/galaxy/brand/shell/backing_rtl_right.png |binary
icon-themes/galaxy/brand/shell/backing_space.png |binary
icon-themes/galaxy/brand_dev/intro.png |binary
instsetoo_native/res/nologobanner.bmp |binary
instsetoo_native/res/nologoinstall.bmp |binary
reportdesign/uiconfig/dbreport/menubar/menubar.xml | 1
sc/uiconfig/scalc/menubar/menubar.xml | 1
sd/uiconfig/sdraw/menubar/menubar.xml | 1
sd/uiconfig/simpress/menubar/menubar.xml | 1
starmath/uiconfig/smath/menubar/menubar.xml | 1
sw/uiconfig/sglobal/menubar/menubar.xml | 1
sw/uiconfig/sweb/menubar/menubar.xml | 1
sw/uiconfig/swform/menubar/menubar.xml | 1
sw/uiconfig/swreport/menubar/menubar.xml | 1
sw/uiconfig/swriter/menubar/menubar.xml | 1
sw/uiconfig/swxform/menubar/menubar.xml | 1
34 files changed, 173 insertions(+), 355 deletions(-)
New commits:
commit 64011a43020b108febf94cbd89fb352dc61c75df
Author: Stefan Knorr (astron) <heinzlesspam at gmail.com>
Date: Mon Jul 2 15:05:50 2012 +0200
New Windows installer artwork
Based on Andrea Soragna's splash screen images.
Change-Id: I1aa0a5c5b0b238451c358007d8213c6a4bb3e512
diff --git a/instsetoo_native/res/nologobanner.bmp b/instsetoo_native/res/nologobanner.bmp
index 2659555..39a1e0c 100644
Binary files a/instsetoo_native/res/nologobanner.bmp and b/instsetoo_native/res/nologobanner.bmp differ
diff --git a/instsetoo_native/res/nologoinstall.bmp b/instsetoo_native/res/nologoinstall.bmp
index 8af9fc4..6d1a3bb 100644
Binary files a/instsetoo_native/res/nologoinstall.bmp and b/instsetoo_native/res/nologoinstall.bmp differ
commit 7804c249753ce88491979a7058b6cca05421cefa
Author: Stefan Knorr (astron) <heinzlesspam at gmail.com>
Date: Mon Jul 2 08:37:53 2012 +0200
Get new Branding Stuff into About
Flat_logo.svg based upon the splash screen design by Andrea Sorogna
There were a few more changes that I had to make to the dialog layout
because the background image is gone now, which meant I had to also
* remove the hard-coded font colors
* remove much of the code that referred to laying out the background image
Sorry for doing the umpteenth change to this stuff in this release cycle. :)
Change-Id: I62b3372113033b387ad41ef5720e05c8101444f1
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 5b3da4b..daa6628 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-// TODO: make the background of the dialog transparent and remove the titlebar
-
// include ---------------------------------------------------------------
#include <vcl/svapp.hxx>
@@ -156,7 +154,6 @@ void AboutDialog::StyleControls()
aVersionText.SetPaintTransparent( sal_True );
aDescriptionText.SetPaintTransparent( sal_True );
aCopyrightText.SetPaintTransparent( sal_True );
- aCopyrightTextShadow.SetPaintTransparent( sal_True );
Font aLabelFont = GetSettings().GetStyleSettings().GetLabelFont();
Font aLargeFont = aLabelFont;
@@ -164,17 +161,13 @@ void AboutDialog::StyleControls()
// Description Text
aDescriptionText.SetControlFont( aLargeFont );
- aDescriptionText.SetControlForeground( Color( 51, 51, 51 ) );
aDescriptionText.SetTextSelectable( sal_False );
// Version Text
aLargeFont.SetSize( Size( 0, aLabelFont.GetSize().Height() * 1.2 ) );
aVersionText.SetControlFont( aLargeFont );
- aVersionText.SetControlForeground( Color( 102, 102, 102 ) );
// Copyright Text
- aCopyrightText.SetControlForeground( Color( 102, 102, 102 ) );
- aCopyrightTextShadow.SetControlForeground( Color( 255, 255, 255 ) );
aCopyrightText.SetTextSelectable( sal_False );
aCopyrightTextShadow.SetTextSelectable( sal_False );
@@ -189,16 +182,15 @@ void AboutDialog::LayoutControls()
sal_Int32 aIdealTextWidth = aScreenRect.GetWidth() / 2.4;
sal_Int32 aDialogBorder = 12;
- sal_Int32 aDialogWidth = aIdealTextWidth + aDialogBorder * 2;
+ Size aDialogSize ( aIdealTextWidth + aDialogBorder * 2, 0);
// Render and Position Logo
vcl::RenderGraphicRasterizer aRasterizerLogo = Application::LoadBrandSVG("flat_logo");
float aLogoWidthHeightRatio = (float)aRasterizerLogo.GetDefaultSizePixel().Width() /
(float)aRasterizerLogo.GetDefaultSizePixel().Height();
- Size aLogoSize( aDialogWidth * 0.6, (aDialogWidth * 0.6) / aLogoWidthHeightRatio );
- Point aLogoPos( ( aDialogWidth - aLogoSize.Width() ) / 2,
- aDialogBorder );
+ Size aLogoSize( aIdealTextWidth, aIdealTextWidth / aLogoWidthHeightRatio );
+ Point aLogoPos( aDialogBorder, aDialogBorder );
aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
aLogoImage.SetImage( Image( aLogoBitmap ) );
aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
@@ -229,74 +221,35 @@ void AboutDialog::LayoutControls()
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 );
-
// Layout Buttons
Size aButtonSize;
Point aButtonPos;
sal_Int32 aButtonsWidth = 0;
- LayoutButtons( aDialogWidth, aDialogBorder, aCopyrightPos,
- aCopyrightText.GetSizePixel().Height() + 1,
+ LayoutButtons( aDialogSize.Width(), aDialogBorder, aCopyrightPos,
+ aCopyrightText.GetSizePixel().Height(),
aVersionDescriptionSpacing, aButtonPos, aButtonSize, aButtonsWidth );
// 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 = aButtonPos.Y() + aButtonSize.Height() + aDialogBorder;
- // If not, make the dialog taller (and to maintain the aspect ratio of the background also wider)
- if (aButtonsWidth > 0)
- {
- aBackgroundSize.Width() += aButtonsWidth;
- aBackgroundSize.Height() = aBackgroundSize.Width() / aBackgroundWidthHeightRatio;
- }
+ aDialogSize.Height() = aButtonPos.Y() + aButtonSize.Height() + aDialogBorder;
- if (aBottomY > aBackgroundSize.Height())
- {
- aBackgroundSize.Width() = aBottomY * aBackgroundWidthHeightRatio;
- aBackgroundSize.Height() = aBottomY;
- }
-
- // Not pretty, but better than having the buttons in the center of the dialog.
- if (aBottomY < aBackgroundSize.Height())
- {
- sal_Int32 aHeightDifference = aBackgroundSize.Height() - aBottomY;
-
- MoveControl(aVersionText, 0, aHeightDifference * 0.25);
- MoveControl(aDescriptionText, 0, aHeightDifference * 0.5 );
- MoveControl(aCopyrightText, 0, aHeightDifference * 0.75 );
- MoveControl(aCopyrightTextShadow, 0, aHeightDifference * 0.75 );
- MoveControl(aCreditsButton, 0, aHeightDifference);
- MoveControl(aWebsiteButton, 0, aHeightDifference);
- MoveControl(aCancelButton, 0, aHeightDifference);
- }
-
- // If needed, adjust all control position to the new width
- if (aBackgroundSize.Width() != aDialogWidth)
+ // If dialog isn't wide enough to accommodate the buttons
+ if (aButtonsWidth > 0)
{
- sal_Int32 aWidthDifference = aBackgroundSize.Width() - aDialogWidth;
-
- MoveControl(aLogoImage, aWidthDifference / 2, 0);
- MoveControl(aVersionText, aWidthDifference / 2, 0);
- MoveControl(aDescriptionText, aWidthDifference / 2, 0);
- MoveControl(aCopyrightText, aWidthDifference / 2, 0);
- MoveControl(aCopyrightTextShadow, aWidthDifference / 2, 0);
+ aDialogSize.Width() += aButtonsWidth;
+ MoveControl(aLogoImage, aButtonsWidth / 2, 0);
+ MoveControl(aVersionText, aButtonsWidth / 2, 0);
+ MoveControl(aDescriptionText, aButtonsWidth / 2, 0);
+ MoveControl(aCopyrightText, aButtonsWidth / 2, 0);
if (aButtonsWidth <= 0)
- MoveControl(aCancelButton, aWidthDifference, 0);
+ MoveControl(aCancelButton, aButtonsWidth, 0);
}
+ SetOutputSizePixel( aDialogSize );
- // Render Background and set final dialog size
- aBackgroundBitmap = aRasterizerBackground.Rasterize( aBackgroundSize );
- SetOutputSizePixel( aBackgroundSize );
}
void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder,
@@ -327,7 +280,7 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder,
aWebsiteButton.SetSizePixel( aButtonSize );
aCancelButton.SetSizePixel( aButtonSize );
- sal_Int32 aButtonSpacing = aDialogWidth - ( aDialogBorder * 2 ) - ( aButtonSize.Width() * 4 ) - ( aAdjacentButtonSpacing * 2);
+ sal_Int32 aButtonSpacing = aDialogWidth - ( aDialogBorder * 2 ) - ( aButtonSize.Width() * 3 ) - aAdjacentButtonSpacing ;
if (aButtonSpacing < aAdjacentButtonSpacing)
{
aButtonsWidth = aAdjacentButtonSpacing - aButtonSpacing;
diff --git a/icon-themes/galaxy/brand/flat_logo.svg b/icon-themes/galaxy/brand/flat_logo.svg
index 5f05198..371e838 100644
--- a/icon-themes/galaxy/brand/flat_logo.svg
+++ b/icon-themes/galaxy/brand/flat_logo.svg
@@ -7,40 +7,76 @@
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"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
version="1.1"
- inkscape:version="0.48+devel r10127 custom"
- sodipodi:docname="New document 3">
+ width="486"
+ height="80"
+ id="svg1205">
<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" />
+ id="defs1207">
+ <clipPath
+ id="clipPath11479">
+ <rect
+ width="530"
+ height="87.272736"
+ x="6.6086682e-06"
+ y="-18.000011"
+ id="rect11481"
+ style="opacity:0.6;fill:#530260;fill-opacity:1;stroke:none" />
+ </clipPath>
+ <radialGradient
+ cx="372.53757"
+ cy="76.763672"
+ r="275.5"
+ fx="372.53757"
+ fy="76.763672"
+ id="radialGradient10422"
+ xlink:href="#linearGradient4015"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.4902096,1.5799259,-1.6480165,-1.5544337,967.06636,-628.31357)" />
+ <linearGradient
+ id="linearGradient4015">
+ <stop
+ id="stop4017"
+ style="stop-color:#92e285;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop4019"
+ style="stop-color:#18a303;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ cx="520.80676"
+ cy="183.92038"
+ r="265"
+ fx="520.80676"
+ fy="183.92038"
+ id="radialGradient10424"
+ xlink:href="#linearGradient13473"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.92370346,0,0,-0.81991269,1087.8944,75.325519)" />
+ <linearGradient
+ id="linearGradient13473">
+ <stop
+ id="stop13475"
+ style="stop-color:#fde9a9;stop-opacity:0.78571427"
+ offset="0" />
+ <stop
+ id="stop13477"
+ style="stop-color:#fde9a9;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ cx="520.80676"
+ cy="183.92038"
+ r="265"
+ fx="520.80676"
+ fy="183.92038"
+ id="radialGradient11592"
+ xlink:href="#linearGradient13473"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.92370346,0,0,-0.81991269,1087.8944,75.325519)" />
+ </defs>
<metadata
id="metadata1210">
<rdf:RDF>
@@ -54,216 +90,90 @@
</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>
+ transform="matrix(0.91698112,0,0,0.91666657,-6.0600239e-6,16.500008)"
+ clip-path="url(#clipPath11479)"
+ id="g10412">
+ <text
+ x="-287.35712"
+ y="233.28569"
+ id="text2985"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur"><tspan
+ x="-287.35712"
+ y="233.28569"
+ id="tspan2987" /></text>
+ <path
+ d="m 530,-18.000011 0,300.000031 -530,0 0,-300.000031 z"
+ id="rect3983"
+ style="fill:url(#radialGradient10422);fill-opacity:1;stroke:none" />
+ <rect
+ width="530"
+ height="300"
+ x="5.4150391e-06"
+ y="-18"
+ id="rect13441"
+ style="fill:url(#radialGradient11592);fill-opacity:1;stroke:none" />
+ </g>
+ <g
+ transform="matrix(0.67103871,0,0,0.67103868,-260.75081,-1572.1824)"
+ id="g4122"
+ style="display:inline">
+ <path
+ d="m 643.40618,2379.7827 0,45.9017 29.59884,0 0,-6.9733 -20.56412,0 0,-38.9284 -9.03472,0"
+ id="path3047"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur" />
+ <path
+ d="m 678.46533,2425.6844 9.03473,0 0,-33.0384 -9.03473,0 0,33.0384 m 4.51736,-35.8819 c 2.83178,0 5.1916,-2.3019 5.1916,-5.2131 0,-2.8434 -2.35982,-5.2129 -5.1916,-5.2129 -2.89921,0 -5.1916,2.3695 -5.1916,5.2129 0,2.9112 2.29239,5.2131 5.1916,5.2131"
+ id="path3049"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur" />
+ <path
+ d="m 703.23342,2396.505 -0.13485,0 0,-19.5658 -9.03472,0 0,48.7452 8.83246,0 0.20226,-3.8591 0.13485,0 c 2.83178,3.1821 5.66357,4.5361 10.31577,4.5361 8.76503,0 14.56345,-7.9211 14.56345,-17.8056 0,-9.5459 -5.19161,-16.5869 -14.1589,-16.5869 -4.78706,0 -7.61885,1.4218 -10.72032,4.5361 m -0.13485,11.9155 c 0,-5.6869 2.5621,-9.4782 7.41657,-9.4782 5.39387,0 8.09081,3.8589 8.09081,10.1552 0,6.2285 -2.62952,10.2906 -7.95596,10.2906 -4.6522,0 -7.55142,-3.6559 -7.55142,-9.4782 l 0,-1.4894"
+ id="path3051"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur" />
+ <path
+ d="m 752.35511,2391.9689 c -4.3151,0.2709 -8.42793,2.9112 -10.31578,6.5671 l -0.13484,0 -0.20227,-5.89 -8.83246,0 0,33.0384 9.03473,0 0,-12.4571 c 0,-6.6348 1.21362,-9.0044 3.30374,-10.4937 1.82043,-1.2864 3.97798,-1.828 6.94461,-1.9635 l 0.20227,-8.8012"
+ id="path3053"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur" />
+ <path
+ d="m 785.59681,2407.2019 c 0,-8.192 -4.98934,-15.233 -13.61952,-15.233 -10.38318,0 -17.05811,7.1765 -17.05811,18.0764 0,10.6292 6.8772,16.3161 17.05811,16.3161 4.78706,0 8.15824,-0.7448 11.32712,-2.1665 l -0.94392,-6.7701 c -2.96662,1.2186 -6.00068,1.9633 -9.237,1.9633 -5.46128,0 -8.96731,-2.5049 -9.30442,-7.6503 l 21.3732,0 c 0.2697,-1.2186 0.40454,-3.1142 0.40454,-4.5359 m -14.56344,-8.2596 c 3.91055,0 5.73099,3.1819 5.86583,6.567 l -12.74302,0 c 0.67423,-3.7913 3.30375,-6.567 6.87719,-6.567"
+ id="path3055"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur" />
+ <path
+ d="m 813.02447,2379.1057 c -12.13619,0 -22.11485,8.8689 -22.11485,23.6279 0,14.7588 9.97866,23.6278 22.11485,23.6278 12.1362,0 22.11486,-8.869 22.11486,-23.6278 0,-14.759 -9.97866,-23.6279 -22.11486,-23.6279 m 0,4.6036 c 9.03472,0 15.91191,6.7703 15.91191,19.0243 0,12.2539 -6.87719,19.0241 -15.91191,19.0241 -9.03471,0 -15.91191,-6.7702 -15.91191,-19.0241 0,-12.254 6.8772,-19.0243 15.91191,-19.0243"
+ id="path3057"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Andale Mono" />
+ <path
+ d="m 843.77424,2390.8181 0,2.0987 -5.32645,0 0,4.3329 5.32645,0 0,28.4347 5.66355,0 0,-28.4347 8.3605,0 0,-4.3329 -8.3605,0 0,-2.9789 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.1974 c -1.21362,-0.474 -3.50601,-0.9479 -5.32644,-0.9479 -8.02337,0 -12.60816,5.213 -12.60816,14.5559"
+ id="path3059"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Andale Mono" />
+ <path
+ d="m 862.60286,2390.8181 0,2.0987 -5.32645,0 0,4.3329 5.32645,0 0,28.4347 5.66355,0 0,-28.4347 8.3605,0 0,-4.3329 -8.3605,0 0,-2.9789 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.1974 c -1.21362,-0.474 -3.50603,-0.9479 -5.32645,-0.9479 -8.02337,0 -12.60816,5.213 -12.60816,14.5559"
+ id="path3061"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Andale Mono" />
+ <path
+ d="m 883.18692,2425.6844 5.66356,0 0,-32.7676 -5.66356,0 0,32.7676 m 2.83178,-37.5744 c 1.95528,0 3.50601,-1.5571 3.50601,-3.5206 0,-1.9633 -1.55073,-3.5204 -3.50601,-3.5204 -1.95528,0 -3.50601,1.5571 -3.50601,3.5204 0,1.9635 1.55073,3.5206 3.50601,3.5206"
+ id="path3063"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Andale Mono" />
+ <path
+ d="m 900.62683,2409.1652 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.9633 -8.83246,-1.9633 -10.1135,0 -17.73234,6.1609 -17.73234,17.6701 0,10.8322 6.87719,16.4515 15.97933,16.4515 4.0454,0 6.9446,-0.4739 10.24835,-1.8956 l -0.53938,-4.3329 c -2.83179,1.2863 -5.86584,1.8956 -8.69761,1.8956 -6.54006,0 -11.05743,-4.1298 -11.05743,-12.8633"
+ id="path3065"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Andale Mono" />
+ <path
+ d="m 953.20391,2410.5869 c 0.13484,-1.2186 0.20227,-2.2342 0.20227,-3.2497 0,-8.3949 -4.38252,-15.0974 -12.81043,-15.0974 -9.10215,0 -15.77707,7.5826 -15.77707,17.6701 0,11.1031 6.67492,16.4515 15.77707,16.4515 4.04539,0 7.07945,-0.6094 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.9945 -10.92257,-11.4416 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"
+ id="path3067"
+ style="font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Andale Mono" />
+ </g>
+ <g
+ transform="matrix(0.66678797,0,0,0.66667177,-359.81436,-717.48894)"
+ id="g2977"
+ style="display:inline">
+ <path
+ 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"
+ id="path2979"
+ style="font-size:medium;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" />
+ <path
+ 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"
+ id="path2981"
+ style="font-size:medium;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" />
</g>
</svg>
commit 6b49f186bc79e30d459352d6a4d4c5a6baec384e
Author: Stefan Knorr (astron) <heinzlesspam at gmail.com>
Date: Mon Jul 2 07:36:46 2012 +0200
Replace Start Center images
Based upon the splash screen design by Andrea Soragna,
made by myself.
Change-Id: I3bec1d06af7bfd147da27d17f0ced558ccae2e87
diff --git a/icon-themes/galaxy/brand/shell/backing_left.png b/icon-themes/galaxy/brand/shell/backing_left.png
index 8819380..8a19196 100644
Binary files a/icon-themes/galaxy/brand/shell/backing_left.png and b/icon-themes/galaxy/brand/shell/backing_left.png differ
diff --git a/icon-themes/galaxy/brand/shell/backing_right.png b/icon-themes/galaxy/brand/shell/backing_right.png
index 343daa3..3328c3e 100644
Binary files a/icon-themes/galaxy/brand/shell/backing_right.png and b/icon-themes/galaxy/brand/shell/backing_right.png differ
diff --git a/icon-themes/galaxy/brand/shell/backing_rtl_left.png b/icon-themes/galaxy/brand/shell/backing_rtl_left.png
index 8819380..8a19196 100644
Binary files a/icon-themes/galaxy/brand/shell/backing_rtl_left.png and b/icon-themes/galaxy/brand/shell/backing_rtl_left.png differ
diff --git a/icon-themes/galaxy/brand/shell/backing_rtl_right.png b/icon-themes/galaxy/brand/shell/backing_rtl_right.png
index 343daa3..3328c3e 100644
Binary files a/icon-themes/galaxy/brand/shell/backing_rtl_right.png and b/icon-themes/galaxy/brand/shell/backing_rtl_right.png differ
diff --git a/icon-themes/galaxy/brand/shell/backing_space.png b/icon-themes/galaxy/brand/shell/backing_space.png
index 49d21e4..34750cc 100644
Binary files a/icon-themes/galaxy/brand/shell/backing_space.png and b/icon-themes/galaxy/brand/shell/backing_space.png differ
commit e4691755ac871b41083cc4bee7dd060cdb00f078
Author: Stefan Knorr (astron) <heinzlesspam at gmail.com>
Date: Mon Jul 2 07:29:32 2012 +0200
Add new splash screen by Andrea Sorogna
With some modifications to fit the brand colors etc. by myself.
* The visible progress bar frame is now in the image itself which
has two advantages
- it is always there (otherwise the splash could come up without any progress
bar frame at all, and then would appear a second later)
- you can have arbitrary distances between the bar frame and the bar
The frame defined in configure.in is now in a barely visible colour.
Change-Id: Ief361b68d6a8665afa8da42325ac39fa750654ef
diff --git a/configure.in b/configure.in
index b816350..d0ca7d5 100644
--- a/configure.in
+++ b/configure.in
@@ -11384,7 +11384,7 @@ AC_SUBST(GIT_LINK_SRC)
AC_MSG_CHECKING([for custom 'intro' progress bar color])
PROGRESSBARCOLOR=
if test -z "$with_intro_progressbar_color"; then
- PROGRESSBARCOLOR="126,170,23"
+ PROGRESSBARCOLOR="255,255,255"
AC_MSG_RESULT([none])
else
PROGRESSBARCOLOR="$with_intro_progressbar_color"
@@ -11395,7 +11395,7 @@ AC_SUBST(PROGRESSBARCOLOR)
AC_MSG_CHECKING([for custom 'intro' progress bar size])
PROGRESSSIZE=
if test -z "$with_intro_progressbar_size"; then
- PROGRESSSIZE="319,10"
+ PROGRESSSIZE="407,6"
AC_MSG_RESULT([none])
else
PROGRESSSIZE="$with_intro_progressbar_size"
@@ -11406,7 +11406,7 @@ AC_SUBST(PROGRESSSIZE)
AC_MSG_CHECKING([for custom 'intro' progress bar position])
PROGRESSPOSITION=
if test -z "$with_intro_progressbar_position"; then
- PROGRESSPOSITION="164,225"
+ PROGRESSPOSITION="61,317"
AC_MSG_RESULT([none])
else
PROGRESSPOSITION="$with_intro_progressbar_position"
@@ -11417,7 +11417,7 @@ AC_SUBST(PROGRESSPOSITION)
AC_MSG_CHECKING([for custom 'intro' progress bar frame color])
PROGRESSFRAMECOLOR=
if test -z "$with_intro_progressbar_frame_color"; then
- PROGRESSFRAMECOLOR="207,208,211"
+ PROGRESSFRAMECOLOR="20,136,3"
AC_MSG_RESULT([none])
else
PROGRESSFRAMECOLOR="$with_intro_progressbar_frame_color"
diff --git a/icon-themes/galaxy/brand/intro.png b/icon-themes/galaxy/brand/intro.png
index f1bc4d2..23f45af 100644
Binary files a/icon-themes/galaxy/brand/intro.png and b/icon-themes/galaxy/brand/intro.png differ
diff --git a/icon-themes/galaxy/brand_dev/intro.png b/icon-themes/galaxy/brand_dev/intro.png
index ec74b1e..30eb1e2 100644
Binary files a/icon-themes/galaxy/brand_dev/intro.png and b/icon-themes/galaxy/brand_dev/intro.png differ
commit 0617454d3b9cfa68df9917d47cf35be539506ec1
Author: Stefan Knorr (astron) <heinzlesspam at gmail.com>
Date: Thu Jun 28 16:45:08 2012 +0200
Remove duplication of License/Credits information
A bit differently this time around:
+ remove Credits menu item from menu
+ remove License button from the About dialog
Change-Id: I07c1e115aa209ef1d69458f5b188d73caaae4294
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml
index e326a25..aa5530f 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -103,7 +103,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml
index 353a8ad..61832fb 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -151,7 +151,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index c8576ab..5b3da4b 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -63,7 +63,6 @@ using namespace ::com::sun::star;
enum AboutDialogButton
{
CREDITS_BUTTON,
- LICENSE_BUTTON,
WEBSITE_BUTTON
};
@@ -75,7 +74,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
aCopyrightTextShadow ( this, ResId( ABOUT_COPYRIGHT_TEXT, *rId.GetResMgr() ) ),
aLogoImage ( this, ResId( ABOUT_IMAGE_LOGO, *rId.GetResMgr() ) ),
aCreditsButton ( this, ResId( ABOUT_BTN_CREDITS, *rId.GetResMgr() ) ),
- aLicenseButton ( this, ResId( ABOUT_BTN_LICENSE, *rId.GetResMgr() ) ),
aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ),
aCancelButton ( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr() ) ),
m_aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr()).toString().trim()),
@@ -85,7 +83,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
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(ABOUT_STR_BUILD, *rId.GetResMgr())),
m_aDescriptionTextStr(ResId(ABOUT_STR_DESCRIPTION, *rId.GetResMgr()))
{
@@ -103,12 +100,10 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
// Allow the button to be identifiable once they are clicked
aCreditsButton.SetData( (void*)CREDITS_BUTTON );
- aLicenseButton.SetData( (void*)LICENSE_BUTTON );
aWebsiteButton.SetData( (void*)WEBSITE_BUTTON );
// Connect all handlers
aCreditsButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
- aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) );
@@ -127,8 +122,6 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
AboutDialogButton* pDialogButton = (AboutDialogButton*)pButton->GetData();
if ( pDialogButton == (AboutDialogButton*)CREDITS_BUTTON )
sURL = m_aCreditsLinkStr;
- else if ( pDialogButton == (AboutDialogButton*)LICENSE_BUTTON)
- sURL = m_aLicenseLinkStr;
else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
sURL = m_aWebsiteLinkStr;
@@ -282,7 +275,6 @@ void AboutDialog::LayoutControls()
MoveControl(aCopyrightText, 0, aHeightDifference * 0.75 );
MoveControl(aCopyrightTextShadow, 0, aHeightDifference * 0.75 );
MoveControl(aCreditsButton, 0, aHeightDifference);
- MoveControl(aLicenseButton, 0, aHeightDifference);
MoveControl(aWebsiteButton, 0, aHeightDifference);
MoveControl(aCancelButton, 0, aHeightDifference);
}
@@ -317,15 +309,12 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder,
sal_Int32 aButtonHPadding = 4;
sal_Int32 aAdjacentButtonSpacing = 15;
sal_Int32 aCreditsButtonWidth = aCreditsButton.CalcMinimumSize().Width();
- sal_Int32 aLicenseButtonWidth = aLicenseButton.CalcMinimumSize().Width();
sal_Int32 aWebsiteButtonWidth = aWebsiteButton.CalcMinimumSize().Width();
sal_Int32 aCancelButtonWidth = aCancelButton.CalcMinimumSize().Width();
sal_Int32 aLargestButtonWidth = 70;
if ( aLargestButtonWidth < aCreditsButtonWidth )
aLargestButtonWidth = aCreditsButtonWidth;
- if ( aLargestButtonWidth < aLicenseButtonWidth )
- aLargestButtonWidth = aLicenseButtonWidth;
if ( aLargestButtonWidth < aWebsiteButtonWidth )
aLargestButtonWidth = aWebsiteButtonWidth;
if ( aLargestButtonWidth < aCancelButtonWidth )
@@ -335,7 +324,6 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder,
aButtonSize.Height() = aWebsiteButton.CalcMinimumSize().Height() + ( 2 * aButtonVPadding );
aCreditsButton.SetSizePixel( aButtonSize );
- aLicenseButton.SetSizePixel( aButtonSize );
aWebsiteButton.SetSizePixel( aButtonSize );
aCancelButton.SetSizePixel( aButtonSize );
@@ -352,9 +340,6 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder,
aCreditsButton.SetPosPixel( aButtonPos );
aButtonPos.X() += aButtonSize.Width() + aAdjacentButtonSpacing;
- aLicenseButton.SetPosPixel( aButtonPos );
-
- aButtonPos.X() += aButtonSize.Width() + aAdjacentButtonSpacing;
aWebsiteButton.SetPosPixel( aButtonPos );
aButtonPos.X() += aButtonSize.Width() + aButtonSpacing;
diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc
index ee52aae..6ad08e7 100644
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@ -26,7 +26,6 @@
#define ABOUT_STR_BASED_DERIVED 6
#define ABOUT_STR_LINK_WEBSITE 7
#define ABOUT_STR_LINK_CREDITS 8
-#define ABOUT_STR_LINK_LICENSE 9
#define ABOUT_BTN_CREDITS 10
#define ABOUT_DESCRIPTION_TEXT 11
#define ABOUT_COPYRIGHT_TEXT 12
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 3a38862..63c5f2c 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -105,18 +105,10 @@ ModalDialog RID_DEFAULTABOUT
{
Text[ en-US ] = "http://www.libreoffice.org/about-us/credits/";
};
- String ABOUT_STR_LINK_LICENSE
- {
- Text[ en-US ] = "http://www.libreoffice.org/download/license/";
- };
PushButton ABOUT_BTN_CREDITS
{
Text [ en-US ] = "Credits";
};
- PushButton ABOUT_BTN_LICENSE
- {
- Text [ en-US ] = "License";
- };
PushButton ABOUT_BTN_WEBSITE
{
Text [ en-US ] = "Website";
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 5d1af3d..6394908 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -52,7 +52,6 @@ private:
MultiLineEdit aCopyrightTextShadow;
FixedImage aLogoImage;
PushButton aCreditsButton;
- PushButton aLicenseButton;
PushButton aWebsiteButton;
CancelButton aCancelButton;
@@ -64,7 +63,6 @@ private:
String m_aBasedDerivedTextStr;
String m_aWebsiteLinkStr;
String m_aCreditsLinkStr;
- String m_aLicenseLinkStr;
rtl::OUString m_sBuildStr;
String m_aDescriptionTextStr;
diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index e15bfe4..84e999a 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -153,7 +153,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index 09ab390..4e98080 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -94,7 +94,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index 7587caa..688ecf2 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -77,7 +77,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index 213afbc..5fa1200 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -78,7 +78,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index f1fe857..5f35b46 100644
--- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
@@ -86,7 +86,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index 055810b..0a6c5cf 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -77,7 +77,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
index fd5b0d2..21bfb56 100644
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -426,7 +426,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 0c36653..ff7b327 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -469,7 +469,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index dade19b..a6cbd33 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -338,7 +338,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index b4ca6bf..6d5e362 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -314,7 +314,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml
index 9716fc2..084f1da 100644
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -125,7 +125,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 693048d..19da430 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -463,7 +463,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 648d396..453ba89 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -393,7 +393,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 192894d..8dcb2c9 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -458,7 +458,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 192894d..8dcb2c9 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -458,7 +458,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 03b0ee9..ea0d2f1 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -470,7 +470,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index afa86d7..b1ece9d 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -459,7 +459,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
More information about the Libreoffice-commits
mailing list