Replace Galaxy icon theme by Colibre
Galaxy goes into an extension, fallback updated Change-Id: I4b6998035857f01368b39d4f16b2639d8a665065 Reviewed-on: https://gerrit.libreoffice.org/53092 Reviewed-by: andreas_kainz <kainz.a@gmail.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
12
configure.ac
|
@ -1542,7 +1542,7 @@ AC_ARG_WITH(galleries,
|
|||
AC_ARG_WITH(theme,
|
||||
AS_HELP_STRING([--with-theme="theme1 theme2..."],
|
||||
[Choose which themes to include. By default those themes with an '*' are included.
|
||||
Possible choices: *breeze, *breeze_dark, *colibre, *elementary, *galaxy, oxygen, *sifr, *sifr_dark, *tango.]),
|
||||
Possible choices: *breeze, *breeze_dark, *colibre, *elementary, oxygen, *sifr, *sifr_dark, *tango.]),
|
||||
,)
|
||||
|
||||
libo_FUZZ_ARG_WITH(helppack-integration,
|
||||
|
@ -11213,15 +11213,15 @@ dnl ===================================================================
|
|||
AC_MSG_CHECKING([which themes to include])
|
||||
# if none given use default subset of available themes
|
||||
if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
|
||||
with_theme="breeze breeze_dark colibre elementary galaxy sifr sifr_dark tango"
|
||||
with_theme="breeze breeze_dark colibre elementary sifr sifr_dark tango"
|
||||
fi
|
||||
|
||||
WITH_THEMES=""
|
||||
if test "x$with_theme" != "xno"; then
|
||||
for theme in $with_theme; do
|
||||
case $theme in
|
||||
breeze|breeze_dark|colibre|elementary|galaxy|oxygen|sifr|sifr_dark|tango) real_theme="$theme" ;;
|
||||
default) real_theme=galaxy ;;
|
||||
breeze|breeze_dark|colibre|elementary|oxygen|sifr|sifr_dark|tango) real_theme="$theme" ;;
|
||||
default) real_theme=colibre ;;
|
||||
*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
|
||||
esac
|
||||
WITH_THEMES=`echo "$WITH_THEMES $real_theme"|tr '\ ' '\n'|sort|uniq|tr '\n' '\ '`
|
||||
|
@ -11229,10 +11229,10 @@ if test "x$with_theme" != "xno"; then
|
|||
fi
|
||||
AC_MSG_RESULT([$WITH_THEMES])
|
||||
AC_SUBST([WITH_THEMES])
|
||||
# FIXME: remove this, and the convenience default->galaxy remapping after a crace period
|
||||
# FIXME: remove this, and the convenience default->colibre remapping after a crace period
|
||||
for theme in $with_theme; do
|
||||
case $theme in
|
||||
default) AC_MSG_WARN([--with-theme=default is deprecated and will be removed, use --with-theme=galaxy]) ;;
|
||||
default) AC_MSG_WARN([--with-theme=default is deprecated and will be removed, use --with-theme=colibre]) ;;
|
||||
*) ;;
|
||||
esac
|
||||
done
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
|
||||
$(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy))
|
||||
$(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/colibre))
|
||||
|
||||
$(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\
|
||||
$(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\
|
||||
|
|
|
@ -13,7 +13,7 @@ In general the layering is done like this:
|
|||
<leaf theme>
|
||||
tango
|
||||
industrial
|
||||
galaxy
|
||||
colibre
|
||||
|
||||
|
||||
How to add a new image set:
|
||||
|
@ -51,13 +51,13 @@ How to add a new icon for a new command:
|
|||
Here, you need to define a property named "Properties", with its value set
|
||||
to 1 so that the icons show up.
|
||||
|
||||
- Now, you need to add 2 new icon images under icon-themes/galaxy/cmd/, one
|
||||
- Now, you need to add 2 new icon images under icon-themes/colibre/cmd/, one
|
||||
for the large size and one for the smaller size. The name of each image
|
||||
must be lc_<command name>.png and sc_<command name>.png. Here, the command
|
||||
name is the name given in the above .xcu file without the ".uno:" prefix and
|
||||
all its letters lower-cased. In this example, the file names will be
|
||||
lc_openfromcalc.png and sc_openfromcalc.png. Note that you need to add new
|
||||
images to the galaxy theme for them to show up in any themes at all.
|
||||
images to the colibre theme for them to show up in any themes at all.
|
||||
|
||||
How to call optipng to optimize size:
|
||||
---------------------------
|
||||
|
|
Before Width: | Height: | Size: 203 KiB After Width: | Height: | Size: 203 KiB |
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 437 B |
Before Width: | Height: | Size: 533 B |
Before Width: | Height: | Size: 637 B |
Before Width: | Height: | Size: 469 B |
Before Width: | Height: | Size: 578 B |
Before Width: | Height: | Size: 266 B |
Before Width: | Height: | Size: 772 B |
Before Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 850 B |
Before Width: | Height: | Size: 737 B |
Before Width: | Height: | Size: 858 B |
Before Width: | Height: | Size: 633 B |
Before Width: | Height: | Size: 886 B |
Before Width: | Height: | Size: 602 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 772 B |
Before Width: | Height: | Size: 707 B |
Before Width: | Height: | Size: 589 B |
Before Width: | Height: | Size: 551 B |
Before Width: | Height: | Size: 810 B |
Before Width: | Height: | Size: 645 B |
Before Width: | Height: | Size: 599 B |
Before Width: | Height: | Size: 768 B |
Before Width: | Height: | Size: 451 B |
Before Width: | Height: | Size: 561 B |
Before Width: | Height: | Size: 440 B |
Before Width: | Height: | Size: 566 B |
Before Width: | Height: | Size: 436 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 536 B |
Before Width: | Height: | Size: 597 B |
Before Width: | Height: | Size: 437 B |
Before Width: | Height: | Size: 614 B |
Before Width: | Height: | Size: 760 B |
Before Width: | Height: | Size: 441 B |
Before Width: | Height: | Size: 593 B |
Before Width: | Height: | Size: 442 B |
Before Width: | Height: | Size: 481 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 977 B |
Before Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 938 B |
Before Width: | Height: | Size: 992 B |
Before Width: | Height: | Size: 993 B |
Before Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 773 B |
Before Width: | Height: | Size: 896 B |
Before Width: | Height: | Size: 720 B |
Before Width: | Height: | Size: 1,001 B |
Before Width: | Height: | Size: 908 B |
Before Width: | Height: | Size: 920 B |
Before Width: | Height: | Size: 894 B |
Before Width: | Height: | Size: 897 B |
Before Width: | Height: | Size: 502 B |
Before Width: | Height: | Size: 374 B |
Before Width: | Height: | Size: 225 B |
Before Width: | Height: | Size: 299 B |
Before Width: | Height: | Size: 457 B |
Before Width: | Height: | Size: 402 B |
Before Width: | Height: | Size: 523 B |
Before Width: | Height: | Size: 534 B |
Before Width: | Height: | Size: 501 B |
Before Width: | Height: | Size: 910 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 829 B |
Before Width: | Height: | Size: 963 B |
Before Width: | Height: | Size: 490 B |
Before Width: | Height: | Size: 545 B |
Before Width: | Height: | Size: 499 B |
Before Width: | Height: | Size: 476 B |
Before Width: | Height: | Size: 479 B |
Before Width: | Height: | Size: 513 B |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 918 B |
Before Width: | Height: | Size: 712 B |
Before Width: | Height: | Size: 610 B |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.1 KiB |