configure.ac | 2 +-
cui/source/dialogs/whatsnewtabpage.cxx | 17 ++++++-----------
cui/source/inc/whatsnewtabpage.hxx | 6 +++---
dev/null |binary
4 files changed, 10 insertions(+), 15 deletions(-)
New commits:
commit 0001439fba32103de7ed0bb3a64940bd5ae1a581
Author: Deepanshu Sharma <129deepanshusha...@gmail.com>
AuthorDate: Thu Jul 17 21:14:06 2025 +0530
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Fri Aug 1 11:16:54 2025 +0200
tdf#166596 replace animated image in first launch dialog with static
one
Change-Id: Ifcd2f2046623000e50914d6a79f50615c0330e6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188015
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit c5750839461a6bdffd363bbba8333122f709dfb5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188648
(cherry picked from commit 6f6f0a388527a2e52c03bdacb71a14be5926a0c9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188727
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/configure.ac b/configure.ac
index 42b79999da24..fdca6816302a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15047,7 +15047,7 @@ dnl
===================================================================
AC_MSG_CHECKING([for alternative branding images directory])
# initialize mapped arrays
BRAND_INTRO_IMAGES="intro.png intro-highres.png"
-brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg logo-sc.svg
logo-sc_inverted.svg about.svg animatedbrand.gif"
+brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg logo-sc.svg
logo-sc_inverted.svg about.svg"
if test -z "$with_branding" -o "$with_branding" = "no"; then
AC_MSG_RESULT([none])
diff --git a/cui/source/dialogs/whatsnewtabpage.cxx
b/cui/source/dialogs/whatsnewtabpage.cxx
index 6bfd152a5085..f8eec976948a 100644
--- a/cui/source/dialogs/whatsnewtabpage.cxx
+++ b/cui/source/dialogs/whatsnewtabpage.cxx
@@ -47,16 +47,16 @@ void WhatsNewTabPage::ActivatePage(const SfxItemSet& /*
rSet */)
m_aBrand.SetIsFirstStart(aIterator->second.get<sal_Bool>());
}
-AnimatedBrand::AnimatedBrand()
+BrandGraphic::BrandGraphic()
: m_bIsFirstStart(false)
{
- OUString aURL(u"$BRAND_BASE_DIR/" LIBO_SHARE_SHELL_FOLDER
"/animatedbrand.gif"_ustr);
- rtl::Bootstrap::expandMacros(aURL);
- GraphicFilter::LoadGraphic(aURL, OUString(), m_aGraphic);
+ BitmapEx aBackgroundBitmap;
+ SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, 250);
+ m_aGraphic = aBackgroundBitmap;
m_aGraphicSize = m_aGraphic.GetSizePixel();
}
-void AnimatedBrand::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect)
+void BrandGraphic::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect)
{
//clear
rRenderContext.SetBackground(COL_WHITE);
@@ -64,12 +64,7 @@ void AnimatedBrand::Paint(vcl::RenderContext&
rRenderContext, const tools::Recta
const Point aGraphicPosition((rRect.GetWidth() - m_aGraphicSize.Width()),
(rRect.GetHeight() - m_aGraphicSize.Height())
>> 1);
-#ifndef MACOSX
- if (m_aGraphic.IsAnimated() && MiscSettings::IsAnimatedOthersAllowed())
- m_aGraphic.StartAnimation(rRenderContext, aGraphicPosition,
m_aGraphicSize);
- else
-#endif
- m_aGraphic.Draw(rRenderContext, aGraphicPosition, m_aGraphicSize);
+ m_aGraphic.Draw(rRenderContext, aGraphicPosition, m_aGraphicSize);
tools::Rectangle aTextRect;
if (m_aGraphic.isAvailable())
diff --git a/cui/source/inc/whatsnewtabpage.hxx
b/cui/source/inc/whatsnewtabpage.hxx
index 5a10a57f2b3e..acb49d80ffc3 100644
--- a/cui/source/inc/whatsnewtabpage.hxx
+++ b/cui/source/inc/whatsnewtabpage.hxx
@@ -13,7 +13,7 @@
#include <sfx2/tabdlg.hxx>
#include <vcl/graph.hxx>
-class AnimatedBrand : public weld::CustomWidgetController
+class BrandGraphic : public weld::CustomWidgetController
{
private:
bool m_bIsFirstStart;
@@ -22,7 +22,7 @@ private:
virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&) override;
public:
- AnimatedBrand();
+ BrandGraphic();
const Size& GetGraphicSize() const { return m_aGraphicSize; };
void SetIsFirstStart(const bool bIsFirstStart) { m_bIsFirstStart =
bIsFirstStart; };
};
@@ -30,7 +30,7 @@ public:
class WhatsNewTabPage : public SfxTabPage
{
private:
- AnimatedBrand m_aBrand;
+ BrandGraphic m_aBrand;
std::unique_ptr<weld::CustomWeld> m_pBrand;
virtual void ActivatePage(const SfxItemSet&) override;
diff --git a/icon-themes/colibre/brand/shell/animatedbrand.gif
b/icon-themes/colibre/brand/shell/animatedbrand.gif
deleted file mode 100644
index 3e26366a2814..000000000000
Binary files a/icon-themes/colibre/brand/shell/animatedbrand.gif and /dev/null
differ
