gnucash master: Rework our icon management
Geert Janssens
gjanssens at code.gnucash.org
Sun Jul 9 15:49:17 EDT 2017
Updated via https://github.com/Gnucash/gnucash/commit/ff930716 (commit)
from https://github.com/Gnucash/gnucash/commit/2020bee0 (commit)
commit ff93071608b34aef547aa1da93992bdb43db4333
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Jul 9 21:48:36 2017 +0200
Rework our icon management
They are now all stored in a directory structure similar to the final
installation target, so no more copying of images during build is needed.
Both Makefile.am and CMakelists.txt behave the same now.
Some additional cleanups:
- move stock_move related images to art; they aren't used so don't need to be installed
- clean up icon loading
There is one harmless warning still at run time about not all requested image
sizes being found. This is odd because they are all installed. I suspect gtk
no longer searches for these resolutions. Perhaps we just shouldn't run the
check on them. The application works fine even without the images in the
requested resolution.
Summary of changes:
{src/pixmaps => art}/stock_split_title.png | Bin
{src/pixmaps => art}/stock_split_watermark.png | Bin
art/tango/{16x16/gnucash.svg => gnucash-16x16.svg} | 0
art/tango/{22x22/gnucash.svg => gnucash-22x22.svg} | 0
art/tango/{32x32/gnucash.svg => gnucash-32x32.svg} | 0
.../{scalable/gnucash.svg => gnucash-48x48+.svg} | 0
art/tango/scalable/gnucash.png | Bin 3619 -> 0 bytes
src/cmake_modules/MakeDist.cmake | 2 +-
src/cmake_modules/MakeDistFiles.cmake | 14 +-
src/core-utils/gnc-path.c | 10 +
src/core-utils/gnc-path.h | 6 +
src/gnc/gnucash.qrc | 34 +--
src/gnome-utils/gnc-gnome-utils.c | 39 ++--
src/gnome-utils/gnc-icons.c | 91 ++++----
src/gnome-utils/gnc-icons.h | 1 +
src/gnome-utils/gnc-main-window.c | 10 +-
src/pixmaps/CMakeLists.txt | 249 +++++----------------
src/pixmaps/Makefile.am | 134 ++++-------
.../128x128/apps/gnucash-icon.png} | Bin
.../pixmaps/hicolor/16x16/apps/gnucash-icon.png | Bin
.../pixmaps/hicolor/22x22/apps/gnucash-icon.png | Bin
.../pixmaps/hicolor/24x24/apps/gnucash-icon.png | Bin
.../256x256/apps/gnucash-icon.png} | Bin
.../pixmaps/hicolor/32x32/apps/gnucash-icon.png | Bin
.../48x48/apps/gnucash-icon.png} | Bin
.../64x64/apps/gnucash-icon.png} | Bin
.../96x96/apps/gnucash-icon.png} | Bin
.../pixmaps/hicolor/scalable/apps/gnucash-icon.svg | 0
28 files changed, 197 insertions(+), 393 deletions(-)
rename {src/pixmaps => art}/stock_split_title.png (100%)
rename {src/pixmaps => art}/stock_split_watermark.png (100%)
rename art/tango/{16x16/gnucash.svg => gnucash-16x16.svg} (100%)
rename art/tango/{22x22/gnucash.svg => gnucash-22x22.svg} (100%)
rename art/tango/{32x32/gnucash.svg => gnucash-32x32.svg} (100%)
copy art/tango/{scalable/gnucash.svg => gnucash-48x48+.svg} (100%)
delete mode 100644 art/tango/scalable/gnucash.png
rename src/pixmaps/{gnucash-icon-128x128.png => hicolor/128x128/apps/gnucash-icon.png} (100%)
rename art/tango/16x16/gnucash.png => src/pixmaps/hicolor/16x16/apps/gnucash-icon.png (100%)
rename art/tango/22x22/gnucash-22x22.png => src/pixmaps/hicolor/22x22/apps/gnucash-icon.png (100%)
rename art/tango/22x22/gnucash-24x24.png => src/pixmaps/hicolor/24x24/apps/gnucash-icon.png (100%)
rename src/pixmaps/{gnucash-icon-256x256.png => hicolor/256x256/apps/gnucash-icon.png} (100%)
rename art/tango/32x32/gnucash.png => src/pixmaps/hicolor/32x32/apps/gnucash-icon.png (100%)
rename src/pixmaps/{gnucash-icon-48x48.png => hicolor/48x48/apps/gnucash-icon.png} (100%)
rename src/pixmaps/{gnucash-icon-64x64.png => hicolor/64x64/apps/gnucash-icon.png} (100%)
rename src/pixmaps/{gnucash-icon-96x96.png => hicolor/96x96/apps/gnucash-icon.png} (100%)
rename art/tango/scalable/gnucash.svg => src/pixmaps/hicolor/scalable/apps/gnucash-icon.svg (100%)
More information about the gnucash-patches
mailing list