66 files changed, 10 insertions, 7 deletions

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
new file mode 100644
index 0000000..61ab0a8
--- /dev/null
+++ b/icons/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory( actions )
+add_subdirectory( app )
diff --git a/icons/Makefile.am b/icons/Makefile.am
new file mode 100644
index 0000000..db3a124
--- /dev/null
+++ b/icons/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = actions app
diff --git a/icons/actions/CMakeLists.txt b/icons/actions/CMakeLists.txt
new file mode 100644
index 0000000..f79769c
--- /dev/null
+++ b/icons/actions/CMakeLists.txt
@@ -0,0 +1 @@
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/piklab/icons )
diff --git a/src/data/likeback/Makefile.am b/icons/actions/Makefile.am
index 1b17603..1bfd6a9 100644
--- a/src/data/likeback/Makefile.am
+++ b/icons/actions/Makefile.am
@@ -1,2 +1,2 @@
 piklabdir = $(kde_datadir)/piklab/icons
-piklab_ICON = AUTO
\ No newline at end of file
+piklab_ICON = AUTO
diff --git a/src/data/likeback/cr16-action-likeback_dislike.png b/icons/actions/cr16-action-likeback_dislike.png
index 4004c51..4004c51 100644
--- a/src/data/likeback/cr16-action-likeback_dislike.png
+++ b/icons/actions/cr16-action-likeback_dislike.png
diff --git a/src/data/likeback/cr16-action-likeback_like.png b/icons/actions/cr16-action-likeback_like.png
index 8800412..8800412 100644
--- a/src/data/likeback/cr16-action-likeback_like.png
+++ b/icons/actions/cr16-action-likeback_like.png
diff --git a/src/data/likeback/hi16-action-likeback_bug.png b/icons/actions/hi16-action-likeback_bug.png
index 766bb8c..766bb8c 100644
--- a/src/data/likeback/hi16-action-likeback_bug.png
+++ b/icons/actions/hi16-action-likeback_bug.png
diff --git a/src/data/hi16-action-piklab_addcurrentfile.png b/icons/actions/hi16-action-piklab_addcurrentfile.png
index f280e58..f280e58 100644
--- a/src/data/hi16-action-piklab_addcurrentfile.png
+++ b/icons/actions/hi16-action-piklab_addcurrentfile.png
diff --git a/src/data/hi16-action-piklab_addfile.png b/icons/actions/hi16-action-piklab_addfile.png
index b863fa1..b863fa1 100644
--- a/src/data/hi16-action-piklab_addfile.png
+++ b/icons/actions/hi16-action-piklab_addfile.png
diff --git a/src/data/hi16-action-piklab_blankcheck.png b/icons/actions/hi16-action-piklab_blankcheck.png
index b4401ba..b4401ba 100644
--- a/src/data/hi16-action-piklab_blankcheck.png
+++ b/icons/actions/hi16-action-piklab_blankcheck.png
diff --git a/src/data/hi16-action-piklab_burnchip.png b/icons/actions/hi16-action-piklab_burnchip.png
index 04a1cf5..04a1cf5 100644
--- a/src/data/hi16-action-piklab_burnchip.png
+++ b/icons/actions/hi16-action-piklab_burnchip.png
diff --git a/src/data/hi16-action-piklab_chip.png b/icons/actions/hi16-action-piklab_chip.png
index bc76ebf..bc76ebf 100644
--- a/src/data/hi16-action-piklab_chip.png
+++ b/icons/actions/hi16-action-piklab_chip.png
diff --git a/src/data/hi16-action-piklab_closeproject.png b/icons/actions/hi16-action-piklab_closeproject.png
index d9dc157..d9dc157 100644
--- a/src/data/hi16-action-piklab_closeproject.png
+++ b/icons/actions/hi16-action-piklab_closeproject.png
diff --git a/src/data/hi16-action-piklab_compile.png b/icons/actions/hi16-action-piklab_compile.png
index 5356362..5356362 100644
--- a/src/data/hi16-action-piklab_compile.png
+++ b/icons/actions/hi16-action-piklab_compile.png
diff --git a/src/data/hi16-action-piklab_createproject.png b/icons/actions/hi16-action-piklab_createproject.png
index 923c7d1..923c7d1 100644
--- a/src/data/hi16-action-piklab_createproject.png
+++ b/icons/actions/hi16-action-piklab_createproject.png
diff --git a/src/data/hi16-action-piklab_decompile.png b/icons/actions/hi16-action-piklab_decompile.png
index 1b0cdbc..1b0cdbc 100644
--- a/src/data/hi16-action-piklab_decompile.png
+++ b/icons/actions/hi16-action-piklab_decompile.png
diff --git a/src/data/hi16-action-piklab_editproject.png b/icons/actions/hi16-action-piklab_editproject.png
index 317cccf..317cccf 100644
--- a/src/data/hi16-action-piklab_editproject.png
+++ b/icons/actions/hi16-action-piklab_editproject.png
diff --git a/src/data/hi16-action-piklab_erasechip.png b/icons/actions/hi16-action-piklab_erasechip.png
index 694c443..694c443 100644
--- a/src/data/hi16-action-piklab_erasechip.png
+++ b/icons/actions/hi16-action-piklab_erasechip.png
diff --git a/src/data/hi16-action-piklab_find_next.png b/icons/actions/hi16-action-piklab_find_next.png
index 19e6ee7..19e6ee7 100644
--- a/src/data/hi16-action-piklab_find_next.png
+++ b/icons/actions/hi16-action-piklab_find_next.png
diff --git a/src/data/hi16-action-piklab_find_previous.png b/icons/actions/hi16-action-piklab_find_previous.png
index 4460eec..4460eec 100644
--- a/src/data/hi16-action-piklab_find_previous.png
+++ b/icons/actions/hi16-action-piklab_find_previous.png
diff --git a/src/data/hi16-action-piklab_openproject.png b/icons/actions/hi16-action-piklab_openproject.png
index c6c9158..c6c9158 100644
--- a/src/data/hi16-action-piklab_openproject.png
+++ b/icons/actions/hi16-action-piklab_openproject.png
diff --git a/src/data/hi16-action-piklab_readchip.png b/icons/actions/hi16-action-piklab_readchip.png
index ff894b5..ff894b5 100644
--- a/src/data/hi16-action-piklab_readchip.png
+++ b/icons/actions/hi16-action-piklab_readchip.png
diff --git a/src/data/hi16-action-piklab_verifychip.png b/icons/actions/hi16-action-piklab_verifychip.png
index acd64a1..acd64a1 100644
--- a/src/data/hi16-action-piklab_verifychip.png
+++ b/icons/actions/hi16-action-piklab_verifychip.png
diff --git a/src/data/hi22-action-piklab_addcurrentfile.png b/icons/actions/hi22-action-piklab_addcurrentfile.png
index 6b55086..6b55086 100644
--- a/src/data/hi22-action-piklab_addcurrentfile.png
+++ b/icons/actions/hi22-action-piklab_addcurrentfile.png
diff --git a/src/data/hi22-action-piklab_addfile.png b/icons/actions/hi22-action-piklab_addfile.png
index 6297359..6297359 100644
--- a/src/data/hi22-action-piklab_addfile.png
+++ b/icons/actions/hi22-action-piklab_addfile.png
diff --git a/src/data/hi22-action-piklab_blankcheck.png b/icons/actions/hi22-action-piklab_blankcheck.png
index 53c1f86..53c1f86 100644
--- a/src/data/hi22-action-piklab_blankcheck.png
+++ b/icons/actions/hi22-action-piklab_blankcheck.png
diff --git a/src/data/hi22-action-piklab_breakpoint_active.png b/icons/actions/hi22-action-piklab_breakpoint_active.png
index 987cac2..987cac2 100644
--- a/src/data/hi22-action-piklab_breakpoint_active.png
+++ b/icons/actions/hi22-action-piklab_breakpoint_active.png
diff --git a/src/data/hi22-action-piklab_breakpoint_disabled.png b/icons/actions/hi22-action-piklab_breakpoint_disabled.png
index 54f67de..54f67de 100644
--- a/src/data/hi22-action-piklab_breakpoint_disabled.png
+++ b/icons/actions/hi22-action-piklab_breakpoint_disabled.png
diff --git a/src/data/hi22-action-piklab_breakpoint_invalid.png b/icons/actions/hi22-action-piklab_breakpoint_invalid.png
index 40ddfec..40ddfec 100644
--- a/src/data/hi22-action-piklab_breakpoint_invalid.png
+++ b/icons/actions/hi22-action-piklab_breakpoint_invalid.png
diff --git a/src/data/hi22-action-piklab_breakpoint_reached.png b/icons/actions/hi22-action-piklab_breakpoint_reached.png
index 35374fc..35374fc 100644
--- a/src/data/hi22-action-piklab_breakpoint_reached.png
+++ b/icons/actions/hi22-action-piklab_breakpoint_reached.png
diff --git a/src/data/hi22-action-piklab_burnchip.png b/icons/actions/hi22-action-piklab_burnchip.png
index 01a01f5..01a01f5 100644
--- a/src/data/hi22-action-piklab_burnchip.png
+++ b/icons/actions/hi22-action-piklab_burnchip.png
diff --git a/src/data/hi22-action-piklab_chip.png b/icons/actions/hi22-action-piklab_chip.png
index 282b503..282b503 100644
--- a/src/data/hi22-action-piklab_chip.png
+++ b/icons/actions/hi22-action-piklab_chip.png
diff --git a/src/data/hi22-action-piklab_closeproject.png b/icons/actions/hi22-action-piklab_closeproject.png
index a3d1998..a3d1998 100644
--- a/src/data/hi22-action-piklab_closeproject.png
+++ b/icons/actions/hi22-action-piklab_closeproject.png
diff --git a/src/data/hi22-action-piklab_compile.png b/icons/actions/hi22-action-piklab_compile.png
index 781f151..781f151 100644
--- a/src/data/hi22-action-piklab_compile.png
+++ b/icons/actions/hi22-action-piklab_compile.png
diff --git a/src/data/hi22-action-piklab_createproject.png b/icons/actions/hi22-action-piklab_createproject.png
index d8ac80d..d8ac80d 100644
--- a/src/data/hi22-action-piklab_createproject.png
+++ b/icons/actions/hi22-action-piklab_createproject.png
diff --git a/src/data/hi22-action-piklab_debug_step.png b/icons/actions/hi22-action-piklab_debug_step.png
index ae56f66..ae56f66 100644
--- a/src/data/hi22-action-piklab_debug_step.png
+++ b/icons/actions/hi22-action-piklab_debug_step.png
diff --git a/src/data/hi22-action-piklab_debug_stepin.png b/icons/actions/hi22-action-piklab_debug_stepin.png
index 854be7a..854be7a 100644
--- a/src/data/hi22-action-piklab_debug_stepin.png
+++ b/icons/actions/hi22-action-piklab_debug_stepin.png
diff --git a/src/data/hi22-action-piklab_debug_stepout.png b/icons/actions/hi22-action-piklab_debug_stepout.png
index 1f9b7b4..1f9b7b4 100644
--- a/src/data/hi22-action-piklab_debug_stepout.png
+++ b/icons/actions/hi22-action-piklab_debug_stepout.png
diff --git a/src/data/hi22-action-piklab_debug_stepover.png b/icons/actions/hi22-action-piklab_debug_stepover.png
index 37f93e0..37f93e0 100644
--- a/src/data/hi22-action-piklab_debug_stepover.png
+++ b/icons/actions/hi22-action-piklab_debug_stepover.png
diff --git a/src/data/hi22-action-piklab_debughalt.png b/icons/actions/hi22-action-piklab_debughalt.png
index 34d105d..34d105d 100644
--- a/src/data/hi22-action-piklab_debughalt.png
+++ b/icons/actions/hi22-action-piklab_debughalt.png
diff --git a/src/data/hi22-action-piklab_decompile.png b/icons/actions/hi22-action-piklab_decompile.png
index 5fe5e17..5fe5e17 100644
--- a/src/data/hi22-action-piklab_decompile.png
+++ b/icons/actions/hi22-action-piklab_decompile.png
diff --git a/src/data/hi22-action-piklab_editproject.png b/icons/actions/hi22-action-piklab_editproject.png
index 850551b..850551b 100644
--- a/src/data/hi22-action-piklab_editproject.png
+++ b/icons/actions/hi22-action-piklab_editproject.png
diff --git a/src/data/hi22-action-piklab_erasechip.png b/icons/actions/hi22-action-piklab_erasechip.png
index 2d8dbd5..2d8dbd5 100644
--- a/src/data/hi22-action-piklab_erasechip.png
+++ b/icons/actions/hi22-action-piklab_erasechip.png
diff --git a/src/data/hi22-action-piklab_find_next.png b/icons/actions/hi22-action-piklab_find_next.png
index 618eab1..618eab1 100644
--- a/src/data/hi22-action-piklab_find_next.png
+++ b/icons/actions/hi22-action-piklab_find_next.png
diff --git a/src/data/hi22-action-piklab_find_previous.png b/icons/actions/hi22-action-piklab_find_previous.png
index 554f8f9..554f8f9 100644
--- a/src/data/hi22-action-piklab_find_previous.png
+++ b/icons/actions/hi22-action-piklab_find_previous.png
diff --git a/src/data/hi22-action-piklab_openproject.png b/icons/actions/hi22-action-piklab_openproject.png
index f7fc305..f7fc305 100644
--- a/src/data/hi22-action-piklab_openproject.png
+++ b/icons/actions/hi22-action-piklab_openproject.png
diff --git a/src/data/hi22-action-piklab_power.png b/icons/actions/hi22-action-piklab_power.png
index 92b5d27..92b5d27 100644
--- a/src/data/hi22-action-piklab_power.png
+++ b/icons/actions/hi22-action-piklab_power.png
diff --git a/src/data/hi22-action-piklab_program_counter.png b/icons/actions/hi22-action-piklab_program_counter.png
index 9bb2cfa..9bb2cfa 100644
--- a/src/data/hi22-action-piklab_program_counter.png
+++ b/icons/actions/hi22-action-piklab_program_counter.png
diff --git a/src/data/hi22-action-piklab_program_counter_disabled.png b/icons/actions/hi22-action-piklab_program_counter_disabled.png
index 578b1d1..578b1d1 100644
--- a/src/data/hi22-action-piklab_program_counter_disabled.png
+++ b/icons/actions/hi22-action-piklab_program_counter_disabled.png
diff --git a/src/data/hi22-action-piklab_readchip.png b/icons/actions/hi22-action-piklab_readchip.png
index fbccae2..fbccae2 100644
--- a/src/data/hi22-action-piklab_readchip.png
+++ b/icons/actions/hi22-action-piklab_readchip.png
diff --git a/src/data/hi22-action-piklab_restart.png b/icons/actions/hi22-action-piklab_restart.png
index 4d580b8..4d580b8 100644
--- a/src/data/hi22-action-piklab_restart.png
+++ b/icons/actions/hi22-action-piklab_restart.png
diff --git a/src/data/hi22-action-piklab_run.png b/icons/actions/hi22-action-piklab_run.png
index 9ae6f84..9ae6f84 100644
--- a/src/data/hi22-action-piklab_run.png
+++ b/icons/actions/hi22-action-piklab_run.png
diff --git a/src/data/hi22-action-piklab_stop.png b/icons/actions/hi22-action-piklab_stop.png
index 9973683..9973683 100644
--- a/src/data/hi22-action-piklab_stop.png
+++ b/icons/actions/hi22-action-piklab_stop.png
diff --git a/src/data/hi22-action-piklab_verifychip.png b/icons/actions/hi22-action-piklab_verifychip.png
index 953bdd9..953bdd9 100644
--- a/src/data/hi22-action-piklab_verifychip.png
+++ b/icons/actions/hi22-action-piklab_verifychip.png
diff --git a/src/data/hi32-action-piklab_config_assembler.png b/icons/actions/hi32-action-piklab_config_assembler.png
index 0f48fe1..0f48fe1 100644
--- a/src/data/hi32-action-piklab_config_assembler.png
+++ b/icons/actions/hi32-action-piklab_config_assembler.png
diff --git a/src/data/hi32-action-piklab_config_disassembler.png b/icons/actions/hi32-action-piklab_config_disassembler.png
index bb8df00..bb8df00 100644
--- a/src/data/hi32-action-piklab_config_disassembler.png
+++ b/icons/actions/hi32-action-piklab_config_disassembler.png
diff --git a/src/data/hi32-action-piklab_config_programmer.png b/icons/actions/hi32-action-piklab_config_programmer.png
index 470d467..470d467 100644
--- a/src/data/hi32-action-piklab_config_programmer.png
+++ b/icons/actions/hi32-action-piklab_config_programmer.png
diff --git a/icons/app/CMakeLists.txt b/icons/app/CMakeLists.txt
new file mode 100644
index 0000000..5cca3c6
--- /dev/null
+++ b/icons/app/CMakeLists.txt
@@ -0,0 +1 @@
+tde_install_icons( DESTINATION ${ICON_INSTALL_DIR} )
diff --git a/icons/app/Makefile.am b/icons/app/Makefile.am
new file mode 100644
index 0000000..59bae53
--- /dev/null
+++ b/icons/app/Makefile.am
@@ -0,0 +1,2 @@
+piklabdir = $(kde_icondir)
+piklab_ICON = AUTO
diff --git a/src/data/app_data/hi16-app-piklab.png b/icons/app/hi16-app-piklab.png
index af9434c..af9434c 100644
--- a/src/data/app_data/hi16-app-piklab.png
+++ b/icons/app/hi16-app-piklab.png
diff --git a/src/data/app_data/hi32-app-piklab.png b/icons/app/hi32-app-piklab.png
index 470d467..470d467 100644
--- a/src/data/app_data/hi32-app-piklab.png
+++ b/icons/app/hi32-app-piklab.png
diff --git a/src/data/app_data/hi32-mime-piklab_project.png b/icons/app/hi32-mime-piklab_project.png
index 470d467..470d467 100644
--- a/src/data/app_data/hi32-mime-piklab_project.png
+++ b/icons/app/hi32-mime-piklab_project.png
diff --git a/src/data/app_data/hi64-app-piklab.png b/icons/app/hi64-app-piklab.png
index acb6218..acb6218 100644
--- a/src/data/app_data/hi64-app-piklab.png
+++ b/icons/app/hi64-app-piklab.png
diff --git a/src/data/Makefile.am b/src/data/Makefile.am
index a3469ec..c7fc1c3 100644
--- 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
diff --git a/src/data/app_data/Makefile.am b/src/data/app_data/Makefile.am
index 61959e6..c106a7c 100644
--- 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
diff --git a/subdirs b/subdirs
index 0e67810..1ab0827 100644
--- a/subdirs
+++ b/subdirs
@@ -1,3 +1,4 @@
 doc
+icons
 po
 src