[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - icon-themes/galaxy instsetoo_native/CustomTarget_setup.mk sfx2/source

[Jan Holesovsky]

 icon-themes/galaxy/brand/intro.png               |binary
 icon-themes/galaxy/brand_dev/intro.png           |binary
 icon-themes/galaxy/sfx2/res/logo.png             |binary
 icon-themes/galaxy/sfx2/res/startcenter-logo.png |binary
 instsetoo_native/CustomTarget_setup.mk           |   10 +++++-----
 sfx2/source/control/recentdocsview.cxx           |    6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 907d368a8b0ff88d8b3269cdb8947795100df1ae
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Jul 9 18:48:11 2015 +0200

    New branding for the 5.0.
    
    Change-Id: Ifc9c0db1763f89fb7e3865f80021f57b29f47705
    Reviewed-on: https://gerrit.libreoffice.org/16897
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/icon-themes/galaxy/brand/intro.png b/icon-themes/galaxy/brand/intro.png
index 7fa68a1..ebe7da0 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 654e43f..ebe7da0 100644
Binary files a/icon-themes/galaxy/brand_dev/intro.png and b/icon-themes/galaxy/brand_dev/intro.png differ
diff --git a/icon-themes/galaxy/sfx2/res/logo.png b/icon-themes/galaxy/sfx2/res/logo.png
index d5f2c25..99b8263 100644
Binary files a/icon-themes/galaxy/sfx2/res/logo.png and b/icon-themes/galaxy/sfx2/res/logo.png differ
diff --git a/icon-themes/galaxy/sfx2/res/startcenter-logo.png b/icon-themes/galaxy/sfx2/res/startcenter-logo.png
index e72c333..e2de8cb 100644
Binary files a/icon-themes/galaxy/sfx2/res/startcenter-logo.png and b/icon-themes/galaxy/sfx2/res/startcenter-logo.png differ
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index b020e96..5420b56 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -106,11 +106,11 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& echo 'HideEula=1' \
 		&& echo 'Logo=1' \
 		&& echo 'NativeProgress=false' \
-		&& echo 'ProgressBarColor=128,128,128' \
-		&& echo 'ProgressFrameColor=245,245,245' \
-		&& echo 'ProgressPosition=72,189' \
-		&& echo 'ProgressSize=409,8' \
-		&& echo 'ProgressTextBaseline=170' \
+		&& echo 'ProgressBarColor=0,0,0' \
+		&& echo 'ProgressFrameColor=102,102,102' \
+		&& echo 'ProgressPosition=35,153' \
+		&& echo 'ProgressSize=444,8' \
+		&& echo 'ProgressTextBaseline=145' \
 		&& echo 'ProgressTextColor=255,255,255' \
 		&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \
 	) > $@
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 69952e1..43b8d55 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -284,10 +284,10 @@ void RecentDocsView::Paint(vcl::RenderContext& rRenderContext, const Rectangle &
         const int nY = (rSize.Height() - 3 * nTextHeight - rImgSize.Height())/2;
 
         Point aImgPoint(nX, nY);
-        Point aStr1Point((rSize.Width() - nTextWidth1)/2, nY + rImgSize.Height() + 0.7 * nTextHeight);
-        Point aStr2Point((rSize.Width() - nTextWidth2)/2, nY + rImgSize.Height() + 1.7 * nTextHeight);
+        Point aStr1Point((rSize.Width() - nTextWidth1)/2, nY + rImgSize.Height());
+        Point aStr2Point((rSize.Width() - nTextWidth2)/2, nY + rImgSize.Height() + 1.5 * nTextHeight);
 
-        rRenderContext.DrawImage(aImgPoint, rImgSize, maWelcomeImage, DrawImageFlags::SemiTransparent);
+        rRenderContext.DrawImage(aImgPoint, rImgSize, maWelcomeImage);
         rRenderContext.DrawText(aStr1Point, maWelcomeLine1);
         rRenderContext.DrawText(aStr2Point, maWelcomeLine2);