From 3df5304ada4cec75072bc71f24ab82fe9b48d97c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 29 Oct 2013 21:43:41 +0100 Subject: sysui: remove Package_icons - rename main_app.ico to soffice.ico (in case the name is relevant?) - installer: hard-code path to sysui/desktop/icons/soffice.ico Change-Id: Iacd6e28201c3f8e69375e0bfc516542e86131912 --- desktop/WinResTarget_quickstart.mk | 2 +- desktop/WinResTarget_soffice.mk | 4 ++-- desktop/WinResTarget_sofficebin.mk | 4 ++-- desktop/win32/source/QuickStart/QuickStart.rc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'desktop') diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk index 9f80cf68a093..0c06f599032e 100644 --- a/desktop/WinResTarget_quickstart.mk +++ b/desktop/WinResTarget_quickstart.mk @@ -16,7 +16,7 @@ $(eval $(call gb_WinResTarget_set_include,quickstart/QuickStart,\ )) $(eval $(call gb_WinResTarget_add_dependencies,quickstart/QuickStart,\ - sysui/desktop/icons/main_app.ico \ + sysui/desktop/icons/soffice.ico \ )) $(eval $(call gb_WinResTarget_set_rcfile,quickstart/QuickStart,desktop/win32/source/QuickStart/QuickStart)) diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk index d9e870c1f2aa..e3b7927e2999 100644 --- a/desktop/WinResTarget_soffice.mk +++ b/desktop/WinResTarget_soffice.mk @@ -17,13 +17,13 @@ $(eval $(call gb_WinResTarget_set_include,soffice/launcher,\ $(eval $(call gb_WinResTarget_add_defs,soffice/launcher,\ -DRES_APP_NAME=soffice \ -DRES_APP_FILEDESC="$(PRODUCTNAME)" \ - -DRES_APP_ICON=icons/main_app.ico \ + -DRES_APP_ICON=icons/soffice.ico \ -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) $(eval $(call gb_WinResTarget_add_dependencies,soffice/launcher,\ - sysui/desktop/icons/main_app.ico \ + sysui/desktop/icons/soffice.ico \ )) $(eval $(call gb_WinResTarget_set_rcfile,soffice/launcher,desktop/win32/source/applauncher/launcher)) diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk index d194ef5acbbd..e10c259ca2ff 100644 --- a/desktop/WinResTarget_sofficebin.mk +++ b/desktop/WinResTarget_sofficebin.mk @@ -17,13 +17,13 @@ $(eval $(call gb_WinResTarget_set_include,sofficebin/officeloader,\ $(eval $(call gb_WinResTarget_add_defs,sofficebin/officeloader,\ -DRES_APP_NAME=soffice \ -DRES_APP_FILEDESC="$(PRODUCTNAME)" \ - -DRES_APP_ICON=icons/main_app.ico \ + -DRES_APP_ICON=icons/soffice.ico \ -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) $(eval $(call gb_WinResTarget_add_dependencies,sofficebin/officeloader,\ - sysui/desktop/icons/main_app.ico \ + sysui/desktop/icons/soffice.ico \ sysui/desktop/icons/oasis-database.ico \ sysui/desktop/icons/oasis-drawing-template.ico \ sysui/desktop/icons/oasis-drawing.ico \ diff --git a/desktop/win32/source/QuickStart/QuickStart.rc b/desktop/win32/source/QuickStart/QuickStart.rc index 7c2819eda349..cf9131479495 100644 --- a/desktop/win32/source/QuickStart/QuickStart.rc +++ b/desktop/win32/source/QuickStart/QuickStart.rc @@ -1,3 +1,3 @@ #include "resource.h" -ICON_ACTIVE ICON DISCARDABLE "icons/main_app.ico" +ICON_ACTIVE ICON DISCARDABLE "icons/soffice.ico" -- cgit