Moves icons into separate folder

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
4 weeks ago · 6eeb6f3bd8
parent 29c582cab0
commit 6eeb6f3bd8
66 changed files with 10 additions and 7 deletions
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@ -0,0 +1,2 @@
+add_subdirectory( actions )
+add_subdirectory( app )
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@ -0,0 +1 @@
+SUBDIRS = actions app
--- a/icons/actions/CMakeLists.txt
+++ b/icons/actions/CMakeLists.txt
@ -0,0 +1 @@
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/piklab/icons )
--- a/src/data/likeback/Makefile.am
+++ b/src/data/likeback/Makefile.am
@ -1,2 +1,2 @@
 piklabdir = $(kde_datadir)/piklab/icons
-piklab_ICON = AUTO
+piklab_ICON = AUTO
--- a/src/data/likeback/cr16-action-likeback_dislike.png
+++ b/src/data/likeback/cr16-action-likeback_dislike.png
--- a/src/data/likeback/cr16-action-likeback_like.png
+++ b/src/data/likeback/cr16-action-likeback_like.png
--- a/src/data/likeback/hi16-action-likeback_bug.png
+++ b/src/data/likeback/hi16-action-likeback_bug.png
--- a/icons/actions/hi16-action-piklab_addcurrentfile.png
+++ b/icons/actions/hi16-action-piklab_addcurrentfile.png
--- a/icons/actions/hi16-action-piklab_addfile.png
+++ b/icons/actions/hi16-action-piklab_addfile.png
--- a/icons/actions/hi16-action-piklab_blankcheck.png
+++ b/icons/actions/hi16-action-piklab_blankcheck.png
--- a/icons/actions/hi16-action-piklab_burnchip.png
+++ b/icons/actions/hi16-action-piklab_burnchip.png
--- a/icons/actions/hi16-action-piklab_chip.png
+++ b/icons/actions/hi16-action-piklab_chip.png
--- a/icons/actions/hi16-action-piklab_closeproject.png
+++ b/icons/actions/hi16-action-piklab_closeproject.png
--- a/icons/actions/hi16-action-piklab_compile.png
+++ b/icons/actions/hi16-action-piklab_compile.png
--- a/icons/actions/hi16-action-piklab_createproject.png
+++ b/icons/actions/hi16-action-piklab_createproject.png
--- a/icons/actions/hi16-action-piklab_decompile.png
+++ b/icons/actions/hi16-action-piklab_decompile.png
--- a/icons/actions/hi16-action-piklab_editproject.png
+++ b/icons/actions/hi16-action-piklab_editproject.png
--- a/icons/actions/hi16-action-piklab_erasechip.png
+++ b/icons/actions/hi16-action-piklab_erasechip.png
--- a/icons/actions/hi16-action-piklab_find_next.png
+++ b/icons/actions/hi16-action-piklab_find_next.png
--- a/icons/actions/hi16-action-piklab_find_previous.png
+++ b/icons/actions/hi16-action-piklab_find_previous.png
--- a/icons/actions/hi16-action-piklab_openproject.png
+++ b/icons/actions/hi16-action-piklab_openproject.png
--- a/icons/actions/hi16-action-piklab_readchip.png
+++ b/icons/actions/hi16-action-piklab_readchip.png
--- a/icons/actions/hi16-action-piklab_verifychip.png
+++ b/icons/actions/hi16-action-piklab_verifychip.png
--- a/icons/actions/hi22-action-piklab_addcurrentfile.png
+++ b/icons/actions/hi22-action-piklab_addcurrentfile.png
--- a/icons/actions/hi22-action-piklab_addfile.png
+++ b/icons/actions/hi22-action-piklab_addfile.png
--- a/icons/actions/hi22-action-piklab_blankcheck.png
+++ b/icons/actions/hi22-action-piklab_blankcheck.png
--- a/icons/actions/hi22-action-piklab_breakpoint_active.png
+++ b/icons/actions/hi22-action-piklab_breakpoint_active.png
--- a/icons/actions/hi22-action-piklab_breakpoint_disabled.png
+++ b/icons/actions/hi22-action-piklab_breakpoint_disabled.png
--- a/icons/actions/hi22-action-piklab_breakpoint_invalid.png
+++ b/icons/actions/hi22-action-piklab_breakpoint_invalid.png
--- a/icons/actions/hi22-action-piklab_breakpoint_reached.png
+++ b/icons/actions/hi22-action-piklab_breakpoint_reached.png
--- a/icons/actions/hi22-action-piklab_burnchip.png
+++ b/icons/actions/hi22-action-piklab_burnchip.png
--- a/icons/actions/hi22-action-piklab_chip.png
+++ b/icons/actions/hi22-action-piklab_chip.png
--- a/icons/actions/hi22-action-piklab_closeproject.png
+++ b/icons/actions/hi22-action-piklab_closeproject.png
--- a/icons/actions/hi22-action-piklab_compile.png
+++ b/icons/actions/hi22-action-piklab_compile.png
--- a/icons/actions/hi22-action-piklab_createproject.png
+++ b/icons/actions/hi22-action-piklab_createproject.png
--- a/icons/actions/hi22-action-piklab_debug_step.png
+++ b/icons/actions/hi22-action-piklab_debug_step.png
--- a/icons/actions/hi22-action-piklab_debug_stepin.png
+++ b/icons/actions/hi22-action-piklab_debug_stepin.png
--- a/icons/actions/hi22-action-piklab_debug_stepout.png
+++ b/icons/actions/hi22-action-piklab_debug_stepout.png
--- a/icons/actions/hi22-action-piklab_debug_stepover.png
+++ b/icons/actions/hi22-action-piklab_debug_stepover.png
--- a/icons/actions/hi22-action-piklab_debughalt.png
+++ b/icons/actions/hi22-action-piklab_debughalt.png
--- a/icons/actions/hi22-action-piklab_decompile.png
+++ b/icons/actions/hi22-action-piklab_decompile.png
--- a/icons/actions/hi22-action-piklab_editproject.png
+++ b/icons/actions/hi22-action-piklab_editproject.png
--- a/icons/actions/hi22-action-piklab_erasechip.png
+++ b/icons/actions/hi22-action-piklab_erasechip.png
--- a/icons/actions/hi22-action-piklab_find_next.png
+++ b/icons/actions/hi22-action-piklab_find_next.png
--- a/icons/actions/hi22-action-piklab_find_previous.png
+++ b/icons/actions/hi22-action-piklab_find_previous.png
--- a/icons/actions/hi22-action-piklab_openproject.png
+++ b/icons/actions/hi22-action-piklab_openproject.png
--- a/icons/actions/hi22-action-piklab_power.png
+++ b/icons/actions/hi22-action-piklab_power.png
--- a/icons/actions/hi22-action-piklab_program_counter.png
+++ b/icons/actions/hi22-action-piklab_program_counter.png
--- a/icons/actions/hi22-action-piklab_program_counter_disabled.png
+++ b/icons/actions/hi22-action-piklab_program_counter_disabled.png
--- a/icons/actions/hi22-action-piklab_readchip.png
+++ b/icons/actions/hi22-action-piklab_readchip.png
--- a/icons/actions/hi22-action-piklab_restart.png
+++ b/icons/actions/hi22-action-piklab_restart.png
--- a/icons/actions/hi22-action-piklab_run.png
+++ b/icons/actions/hi22-action-piklab_run.png
--- a/icons/actions/hi22-action-piklab_stop.png
+++ b/icons/actions/hi22-action-piklab_stop.png
--- a/icons/actions/hi22-action-piklab_verifychip.png
+++ b/icons/actions/hi22-action-piklab_verifychip.png
--- a/icons/actions/hi32-action-piklab_config_assembler.png
+++ b/icons/actions/hi32-action-piklab_config_assembler.png
--- a/icons/actions/hi32-action-piklab_config_disassembler.png
+++ b/icons/actions/hi32-action-piklab_config_disassembler.png
--- a/icons/actions/hi32-action-piklab_config_programmer.png
+++ b/icons/actions/hi32-action-piklab_config_programmer.png
--- a/icons/app/CMakeLists.txt
+++ b/icons/app/CMakeLists.txt
@ -0,0 +1 @@
+tde_install_icons( DESTINATION ${ICON_INSTALL_DIR} )
--- a/icons/app/Makefile.am
+++ b/icons/app/Makefile.am
@ -0,0 +1,2 @@
+piklabdir = $(kde_icondir)
+piklab_ICON = AUTO
--- a/src/data/app_data/hi16-app-piklab.png
+++ b/src/data/app_data/hi16-app-piklab.png
--- a/src/data/app_data/hi32-app-piklab.png
+++ b/src/data/app_data/hi32-app-piklab.png
--- a/src/data/app_data/hi32-mime-piklab_project.png
+++ b/src/data/app_data/hi32-mime-piklab_project.png
--- a/src/data/app_data/hi64-app-piklab.png
+++ b/src/data/app_data/hi64-app-piklab.png
--- a/src/data/Makefile.am
+++ b/src/data/Makefile.am
@ -1,8 +1,5 @@
 INCLUDES = $(all_includes)
-SUBDIRS = app_data likeback
-
-piklabdir = $(kde_datadir)/piklab/icons
-piklab_ICON = AUTO
+SUBDIRS = app_data

 syntaxkatedir = $(kde_datadir)/katepart/syntax
 syntaxkate_DATA = asm-pic.xml coff-pic.xml jal-pic.xml coff-c-pic.xml
--- a/src/data/app_data/Makefile.am
+++ b/src/data/app_data/Makefile.am
@ -3,7 +3,5 @@ xdg_apps_DATA = piklab.desktop
 rcdir   = $(kde_datadir)/piklab
 rc_DATA = piklabui.rc hexeditorpartui.rc

-KDE_ICON = AUTO
-
 mimedir   = $(kde_mimedir)/application
 mime_DATA = x-piklab.desktop
--- a/1
+++ b/1
@ -1,3 +1,4 @@
 doc
+icons
 po
 src
				`@ -0,0 +1 @@`
				`tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/piklab/icons )`
				`@ -0,0 +1 @@`
				`tde_install_icons( DESTINATION ${ICON_INSTALL_DIR} )`