vcl/qt5/QtFrame.cxx | 14 +++++++------- vcl/qt5/QtInstance.cxx | 2 +- vcl/unx/gtk3/gtkframe.cxx | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit 349eb0b74ed662b65e3313b1378feebc10fec70b Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Nov 6 13:27:22 2024 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Nov 6 14:45:15 2024 +0100 Fix the names of the branded app icons used on Linux ...to match what we install at /usr/share/icons/hicolor/*/apps/*.{png,svg} (so that e.g. a Linux desktop's Alt-Tab overview will show correct icons and app names). In a similar vein, fix the name of the .desktop file referenced in QtInstance.cxx. Unfortunately, there doesn't seem to be a way to compute the relevant names at build time, so hard-code them for now. Change-Id: Ica352c3a14820059ce69ad8019c042bb90752d3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176139 Tested-by: allotropia jenkins <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx index 1c3839a287d9..82a30554ff57 100644 --- a/vcl/qt5/QtFrame.cxx +++ b/vcl/qt5/QtFrame.cxx @@ -361,19 +361,19 @@ void QtFrame::SetIcon(sal_uInt16 nIcon) QString appicon; if (nIcon == SV_ICON_ID_TEXT) - appicon = "libreoffice-writer"; + appicon = "zetaoffice24.2-writer"; else if (nIcon == SV_ICON_ID_SPREADSHEET) - appicon = "libreoffice-calc"; + appicon = "zetaoffice24.2-calc"; else if (nIcon == SV_ICON_ID_DRAWING) - appicon = "libreoffice-draw"; + appicon = "zetaoffice24.2-draw"; else if (nIcon == SV_ICON_ID_PRESENTATION) - appicon = "libreoffice-impress"; + appicon = "zetaoffice24.2-impress"; else if (nIcon == SV_ICON_ID_DATABASE) - appicon = "libreoffice-base"; + appicon = "zetaoffice24.2-base"; else if (nIcon == SV_ICON_ID_FORMULA) - appicon = "libreoffice-math"; + appicon = "zetaoffice24.2-math"; else - appicon = "libreoffice-startcenter"; + appicon = "zetaoffice24.2-startcenter"; QIcon aIcon = QIcon::fromTheme(appicon); m_pQWidget->window()->setWindowIcon(aIcon); diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx index 2840e6e9d5d2..2fecefcfbfb3 100644 --- a/vcl/qt5/QtInstance.cxx +++ b/vcl/qt5/QtInstance.cxx @@ -283,7 +283,7 @@ void QtInstance::AfterAppInit() // set the default application icon via desktop file just on Wayland, // as this otherwise overrides the individual desktop icons on X11. if (QGuiApplication::platformName() == "wayland") - QGuiApplication::setDesktopFileName(QStringLiteral("libreoffice-startcenter.desktop")); + QGuiApplication::setDesktopFileName(QStringLiteral("zetaoffice24.2-startcenter.desktop")); QGuiApplication::setLayoutDirection(AllSettings::GetLayoutRTL() ? Qt::RightToLeft : Qt::LeftToRight); } diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index f31274e54f4e..e8a2a0b40e1d 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -1919,19 +1919,19 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon ) gchar* appicon; if (nIcon == SV_ICON_ID_TEXT) - appicon = g_strdup ("libreoffice-writer"); + appicon = g_strdup ("zetaoffice24.2-writer"); else if (nIcon == SV_ICON_ID_SPREADSHEET) - appicon = g_strdup ("libreoffice-calc"); + appicon = g_strdup ("zetaoffice24.2-calc"); else if (nIcon == SV_ICON_ID_DRAWING) - appicon = g_strdup ("libreoffice-draw"); + appicon = g_strdup ("zetaoffice24.2-draw"); else if (nIcon == SV_ICON_ID_PRESENTATION) - appicon = g_strdup ("libreoffice-impress"); + appicon = g_strdup ("zetaoffice24.2-impress"); else if (nIcon == SV_ICON_ID_DATABASE) - appicon = g_strdup ("libreoffice-base"); + appicon = g_strdup ("zetaoffice24.2-base"); else if (nIcon == SV_ICON_ID_FORMULA) - appicon = g_strdup ("libreoffice-math"); + appicon = g_strdup ("zetaoffice24.2-math"); else - appicon = g_strdup ("libreoffice-startcenter"); + appicon = g_strdup ("zetaoffice24.2-startcenter"); SetIcon(appicon); @@ -2016,7 +2016,7 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ ) if (bAppIdImmutable) { OString sOrigName(g_get_prgname()); - g_set_prgname("libreoffice-startcenter"); + g_set_prgname("zetaoffice24.2-startcenter"); gtk_widget_show(m_pWindow); g_set_prgname(sOrigName.getStr()); }
