From fd380e345c91816bf263bba7c9916e3fb2cf14f9 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Thu, 20 Aug 2020 19:23:36 +0100 Subject: [PATCH] Install application icons into correct directories --- images/hicolor/16x16/{actions => apps}/gramps.png | Bin images/hicolor/22x22/{actions => apps}/gramps.png | Bin images/hicolor/24x24/{actions => apps}/gramps.png | Bin images/hicolor/48x48/{actions => apps}/gramps.png | Bin .../hicolor/scalable/{actions => apps}/gramps.svg | 0 setup.py | 12 +++++++++++- 6 files changed, 11 insertions(+), 1 deletion(-) rename images/hicolor/16x16/{actions => apps}/gramps.png (100%) rename images/hicolor/22x22/{actions => apps}/gramps.png (100%) rename images/hicolor/24x24/{actions => apps}/gramps.png (100%) rename images/hicolor/48x48/{actions => apps}/gramps.png (100%) rename images/hicolor/scalable/{actions => apps}/gramps.svg (100%) diff --git a/images/hicolor/16x16/actions/gramps.png b/images/hicolor/16x16/apps/gramps.png similarity index 100% rename from images/hicolor/16x16/actions/gramps.png rename to images/hicolor/16x16/apps/gramps.png diff --git a/images/hicolor/22x22/actions/gramps.png b/images/hicolor/22x22/apps/gramps.png similarity index 100% rename from images/hicolor/22x22/actions/gramps.png rename to images/hicolor/22x22/apps/gramps.png diff --git a/images/hicolor/24x24/actions/gramps.png b/images/hicolor/24x24/apps/gramps.png similarity index 100% rename from images/hicolor/24x24/actions/gramps.png rename to images/hicolor/24x24/apps/gramps.png diff --git a/images/hicolor/48x48/actions/gramps.png b/images/hicolor/48x48/apps/gramps.png similarity index 100% rename from images/hicolor/48x48/actions/gramps.png rename to images/hicolor/48x48/apps/gramps.png diff --git a/images/hicolor/scalable/actions/gramps.svg b/images/hicolor/scalable/apps/gramps.svg similarity index 100% rename from images/hicolor/scalable/actions/gramps.svg rename to images/hicolor/scalable/apps/gramps.svg diff --git a/setup.py b/setup.py index 6bc311077..bfc000d29 100755 --- a/setup.py +++ b/setup.py @@ -330,7 +330,7 @@ package_data = package_data_core + package_data_gui # Resources # #------------------------------------------------------------------------- -data_files_core = [('share/icons', ['images/gramps.png'])] +data_files_core = [] DOC_FILES = ['AUTHORS', 'COPYING', 'FAQ', 'INSTALL', 'NEWS', 'README.md', 'TODO'] GEDCOM_FILES = glob.glob(os.path.join('example', 'gedcom', '*.*')) @@ -375,6 +375,16 @@ data_files_gui.append(('share/gramps/images/hicolor/22x22/actions', ICON_22)) data_files_gui.append(('share/gramps/images/hicolor/24x24/actions', ICON_24)) data_files_gui.append(('share/gramps/images/hicolor/48x48/actions', ICON_48)) data_files_gui.append(('share/gramps/images/hicolor/scalable/actions', ICON_SC)) +APP_16 = os.path.join(THEME, '16x16', 'apps', 'gramps.png') +APP_22 = os.path.join(THEME, '22x22', 'apps', 'gramps.png') +APP_24 = os.path.join(THEME, '24x24', 'apps', 'gramps.png') +APP_48 = os.path.join(THEME, '48x48', 'apps', 'gramps.png') +APP_SC = os.path.join(THEME, 'scalable', 'apps', 'gramps.svg') +data_files_gui.append(('share/icons/hicolor/16x16/apps', [APP_16])) +data_files_gui.append(('share/icons/hicolor/22x22/apps', [APP_22])) +data_files_gui.append(('share/icons/hicolor/24x24/apps', [APP_24])) +data_files_gui.append(('share/icons/hicolor/48x48/apps', [APP_48])) +data_files_gui.append(('share/icons/hicolor/scalable/apps', [APP_SC])) data_files = data_files_core + data_files_gui