summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Koller <[email protected]>2016-07-13 19:41:28 +0200
committerMartin Koller <[email protected]>2016-07-13 19:41:28 +0200
commita8c9d13b4ffdd8b175b8936fad51ed8ce9497ad6 (patch)
treed90949fbaaa410c48d72fbf35a14ca764d986512
parent6c8d56fc966311468c13bcc855c8fffbf5240394 (diff)
more KF5 porting
-rw-r--r--CMakeLists.txt8
-rw-r--r--ChangeLog9
-rw-r--r--NEWS3
-rw-r--r--pics/CMakeLists.txt8
-rw-r--r--pics/action/16-actions-tool_brush.png (renamed from pics/action/hi16-action-tool_brush.png)bin675 -> 675 bytes
-rw-r--r--pics/action/16-actions-tool_color_eraser.png (renamed from pics/action/hi16-action-tool_color_eraser.png)bin1007 -> 1007 bytes
-rw-r--r--pics/action/16-actions-tool_color_picker.png (renamed from pics/action/hi16-action-tool_color_picker.png)bin634 -> 634 bytes
-rw-r--r--pics/action/16-actions-tool_curve.png (renamed from pics/action/hi16-action-tool_curve.png)bin478 -> 478 bytes
-rw-r--r--pics/action/16-actions-tool_ellipse.png (renamed from pics/action/hi16-action-tool_ellipse.png)bin807 -> 807 bytes
-rw-r--r--pics/action/16-actions-tool_elliptical_selection.png (renamed from pics/action/hi16-action-tool_elliptical_selection.png)bin886 -> 886 bytes
-rw-r--r--pics/action/16-actions-tool_eraser.png (renamed from pics/action/hi16-action-tool_eraser.png)bin798 -> 798 bytes
-rw-r--r--pics/action/16-actions-tool_flood_fill.png (renamed from pics/action/hi16-action-tool_flood_fill.png)bin636 -> 636 bytes
-rw-r--r--pics/action/16-actions-tool_free_form_selection.png (renamed from pics/action/hi16-action-tool_free_form_selection.png)bin836 -> 836 bytes
-rw-r--r--pics/action/16-actions-tool_line.png (renamed from pics/action/hi16-action-tool_line.png)bin390 -> 390 bytes
-rw-r--r--pics/action/16-actions-tool_pen.png (renamed from pics/action/hi16-action-tool_pen.png)bin572 -> 572 bytes
-rw-r--r--pics/action/16-actions-tool_polygon.png (renamed from pics/action/hi16-action-tool_polygon.png)bin879 -> 879 bytes
-rw-r--r--pics/action/16-actions-tool_polyline.png (renamed from pics/action/hi16-action-tool_polyline.png)bin542 -> 542 bytes
-rw-r--r--pics/action/16-actions-tool_rect_selection.png (renamed from pics/action/hi16-action-tool_rect_selection.png)bin910 -> 910 bytes
-rw-r--r--pics/action/16-actions-tool_rectangle.png (renamed from pics/action/hi16-action-tool_rectangle.png)bin548 -> 548 bytes
-rw-r--r--pics/action/16-actions-tool_rounded_rectangle.png (renamed from pics/action/hi16-action-tool_rounded_rectangle.png)bin723 -> 723 bytes
-rw-r--r--pics/action/16-actions-tool_spraycan.png (renamed from pics/action/hi16-action-tool_spraycan.png)bin776 -> 776 bytes
-rw-r--r--pics/action/16-actions-tool_text.png (renamed from pics/action/hi16-action-tool_text.png)bin434 -> 434 bytes
-rw-r--r--pics/action/22-actions-tool_brush.png (renamed from pics/action/hi22-action-tool_brush.png)bin965 -> 965 bytes
-rw-r--r--pics/action/22-actions-tool_color_eraser.png (renamed from pics/action/hi22-action-tool_color_eraser.png)bin1493 -> 1493 bytes
-rw-r--r--pics/action/22-actions-tool_color_picker.png (renamed from pics/action/hi22-action-tool_color_picker.png)bin941 -> 941 bytes
-rw-r--r--pics/action/22-actions-tool_curve.png (renamed from pics/action/hi22-action-tool_curve.png)bin639 -> 639 bytes
-rw-r--r--pics/action/22-actions-tool_ellipse.png (renamed from pics/action/hi22-action-tool_ellipse.png)bin1155 -> 1155 bytes
-rw-r--r--pics/action/22-actions-tool_elliptical_selection.png (renamed from pics/action/hi22-action-tool_elliptical_selection.png)bin1316 -> 1316 bytes
-rw-r--r--pics/action/22-actions-tool_eraser.png (renamed from pics/action/hi22-action-tool_eraser.png)bin1218 -> 1218 bytes
-rw-r--r--pics/action/22-actions-tool_flood_fill.png (renamed from pics/action/hi22-action-tool_flood_fill.png)bin836 -> 836 bytes
-rw-r--r--pics/action/22-actions-tool_free_form_selection.png (renamed from pics/action/hi22-action-tool_free_form_selection.png)bin1241 -> 1241 bytes
-rw-r--r--pics/action/22-actions-tool_line.png (renamed from pics/action/hi22-action-tool_line.png)bin395 -> 395 bytes
-rw-r--r--pics/action/22-actions-tool_pen.png (renamed from pics/action/hi22-action-tool_pen.png)bin827 -> 827 bytes
-rw-r--r--pics/action/22-actions-tool_polygon.png (renamed from pics/action/hi22-action-tool_polygon.png)bin1303 -> 1303 bytes
-rw-r--r--pics/action/22-actions-tool_polyline.png (renamed from pics/action/hi22-action-tool_polyline.png)bin772 -> 772 bytes
-rw-r--r--pics/action/22-actions-tool_rect_selection.png (renamed from pics/action/hi22-action-tool_rect_selection.png)bin1263 -> 1263 bytes
-rw-r--r--pics/action/22-actions-tool_rectangle.png (renamed from pics/action/hi22-action-tool_rectangle.png)bin795 -> 795 bytes
-rw-r--r--pics/action/22-actions-tool_rounded_rectangle.png (renamed from pics/action/hi22-action-tool_rounded_rectangle.png)bin1096 -> 1096 bytes
-rw-r--r--pics/action/22-actions-tool_spraycan.png (renamed from pics/action/hi22-action-tool_spraycan.png)bin1149 -> 1149 bytes
-rw-r--r--pics/action/22-actions-tool_text.png (renamed from pics/action/hi22-action-tool_text.png)bin728 -> 728 bytes
-rw-r--r--pics/action/32-actions-tool_brush.png (renamed from pics/action/hi32-action-tool_brush.png)bin1557 -> 1557 bytes
-rw-r--r--pics/action/32-actions-tool_color_eraser.png (renamed from pics/action/hi32-action-tool_color_eraser.png)bin2538 -> 2538 bytes
-rw-r--r--pics/action/32-actions-tool_color_picker.png (renamed from pics/action/hi32-action-tool_color_picker.png)bin1422 -> 1422 bytes
-rw-r--r--pics/action/32-actions-tool_curve.png (renamed from pics/action/hi32-action-tool_curve.png)bin907 -> 907 bytes
-rw-r--r--pics/action/32-actions-tool_ellipse.png (renamed from pics/action/hi32-action-tool_ellipse.png)bin1726 -> 1726 bytes
-rw-r--r--pics/action/32-actions-tool_elliptical_selection.png (renamed from pics/action/hi32-action-tool_elliptical_selection.png)bin1855 -> 1855 bytes
-rw-r--r--pics/action/32-actions-tool_eraser.png (renamed from pics/action/hi32-action-tool_eraser.png)bin1939 -> 1939 bytes
-rw-r--r--pics/action/32-actions-tool_flood_fill.png (renamed from pics/action/hi32-action-tool_flood_fill.png)bin1229 -> 1229 bytes
-rw-r--r--pics/action/32-actions-tool_free_form_selection.png (renamed from pics/action/hi32-action-tool_free_form_selection.png)bin2085 -> 2085 bytes
-rw-r--r--pics/action/32-actions-tool_line.png (renamed from pics/action/hi32-action-tool_line.png)bin602 -> 602 bytes
-rw-r--r--pics/action/32-actions-tool_pen.png (renamed from pics/action/hi32-action-tool_pen.png)bin1192 -> 1192 bytes
-rw-r--r--pics/action/32-actions-tool_polygon.png (renamed from pics/action/hi32-action-tool_polygon.png)bin1930 -> 1930 bytes
-rw-r--r--pics/action/32-actions-tool_polyline.png (renamed from pics/action/hi32-action-tool_polyline.png)bin1061 -> 1061 bytes
-rw-r--r--pics/action/32-actions-tool_rect_selection.png (renamed from pics/action/hi32-action-tool_rect_selection.png)bin2055 -> 2055 bytes
-rw-r--r--pics/action/32-actions-tool_rectangle.png (renamed from pics/action/hi32-action-tool_rectangle.png)bin942 -> 942 bytes
-rw-r--r--pics/action/32-actions-tool_rounded_rectangle.png (renamed from pics/action/hi32-action-tool_rounded_rectangle.png)bin1514 -> 1514 bytes
-rw-r--r--pics/action/32-actions-tool_spraycan.png (renamed from pics/action/hi32-action-tool_spraycan.png)bin1912 -> 1912 bytes
-rw-r--r--pics/action/32-actions-tool_text.png (renamed from pics/action/hi32-action-tool_text.png)bin1047 -> 1047 bytes
-rw-r--r--pics/action/48-actions-tool_brush.png (renamed from pics/action/hi48-action-tool_brush.png)bin2662 -> 2662 bytes
-rw-r--r--pics/action/48-actions-tool_color_eraser.png (renamed from pics/action/hi48-action-tool_color_eraser.png)bin4381 -> 4381 bytes
-rw-r--r--pics/action/48-actions-tool_color_picker.png (renamed from pics/action/hi48-action-tool_color_picker.png)bin2422 -> 2422 bytes
-rw-r--r--pics/action/48-actions-tool_curve.png (renamed from pics/action/hi48-action-tool_curve.png)bin1310 -> 1310 bytes
-rw-r--r--pics/action/48-actions-tool_ellipse.png (renamed from pics/action/hi48-action-tool_ellipse.png)bin2590 -> 2590 bytes
-rw-r--r--pics/action/48-actions-tool_elliptical_selection.png (renamed from pics/action/hi48-action-tool_elliptical_selection.png)bin2964 -> 2964 bytes
-rw-r--r--pics/action/48-actions-tool_eraser.png (renamed from pics/action/hi48-action-tool_eraser.png)bin3381 -> 3381 bytes
-rw-r--r--pics/action/48-actions-tool_flood_fill.png (renamed from pics/action/hi48-action-tool_flood_fill.png)bin1527 -> 1527 bytes
-rw-r--r--pics/action/48-actions-tool_free_form_selection.png (renamed from pics/action/hi48-action-tool_free_form_selection.png)bin3631 -> 3631 bytes
-rw-r--r--pics/action/48-actions-tool_line.png (renamed from pics/action/hi48-action-tool_line.png)bin802 -> 802 bytes
-rw-r--r--pics/action/48-actions-tool_pen.png (renamed from pics/action/hi48-action-tool_pen.png)bin2005 -> 2005 bytes
-rw-r--r--pics/action/48-actions-tool_polygon.png (renamed from pics/action/hi48-action-tool_polygon.png)bin2967 -> 2967 bytes
-rw-r--r--pics/action/48-actions-tool_polyline.png (renamed from pics/action/hi48-action-tool_polyline.png)bin1394 -> 1394 bytes
-rw-r--r--pics/action/48-actions-tool_rect_selection.png (renamed from pics/action/hi48-action-tool_rect_selection.png)bin3509 -> 3509 bytes
-rw-r--r--pics/action/48-actions-tool_rectangle.png (renamed from pics/action/hi48-action-tool_rectangle.png)bin1378 -> 1378 bytes
-rw-r--r--pics/action/48-actions-tool_rounded_rectangle.png (renamed from pics/action/hi48-action-tool_rounded_rectangle.png)bin2237 -> 2237 bytes
-rw-r--r--pics/action/48-actions-tool_spraycan.png (renamed from pics/action/hi48-action-tool_spraycan.png)bin3253 -> 3253 bytes
-rw-r--r--pics/action/48-actions-tool_text.png (renamed from pics/action/hi48-action-tool_text.png)bin1263 -> 1263 bytes
-rw-r--r--pics/action/CMakeLists.txt103
-rw-r--r--pics/action/sc-actions-tool_brush.svgz (renamed from pics/action/hisc-action-tool_brush.svgz)bin8136 -> 8136 bytes
-rw-r--r--pics/action/sc-actions-tool_color_eraser.svgz (renamed from pics/action/hisc-action-tool_color_eraser.svgz)bin7818 -> 7818 bytes
-rw-r--r--pics/action/sc-actions-tool_color_picker.svgz (renamed from pics/action/hisc-action-tool_color_picker.svgz)bin10939 -> 10939 bytes
-rw-r--r--pics/action/sc-actions-tool_curve.svgz (renamed from pics/action/hisc-action-tool_curve.svgz)bin2380 -> 2380 bytes
-rw-r--r--pics/action/sc-actions-tool_ellipse.svgz (renamed from pics/action/hisc-action-tool_ellipse.svgz)bin1994 -> 1994 bytes
-rw-r--r--pics/action/sc-actions-tool_elliptical_selection.svgz (renamed from pics/action/hisc-action-tool_elliptical_selection.svgz)bin3597 -> 3597 bytes
-rw-r--r--pics/action/sc-actions-tool_eraser.svgz (renamed from pics/action/hisc-action-tool_eraser.svgz)bin6959 -> 6959 bytes
-rw-r--r--pics/action/sc-actions-tool_flood_fill.svgz (renamed from pics/action/hisc-action-tool_flood_fill.svgz)bin2903 -> 2903 bytes
-rw-r--r--pics/action/sc-actions-tool_free_form_selection.svgz (renamed from pics/action/hisc-action-tool_free_form_selection.svgz)bin4661 -> 4661 bytes
-rw-r--r--pics/action/sc-actions-tool_line.svgz (renamed from pics/action/hisc-action-tool_line.svgz)bin1333 -> 1333 bytes
-rw-r--r--pics/action/sc-actions-tool_pen.svgz (renamed from pics/action/hisc-action-tool_pen.svgz)bin4924 -> 4924 bytes
-rw-r--r--pics/action/sc-actions-tool_polygon.svgz (renamed from pics/action/hisc-action-tool_polygon.svgz)bin2276 -> 2276 bytes
-rw-r--r--pics/action/sc-actions-tool_polyline.svgz (renamed from pics/action/hisc-action-tool_polyline.svgz)bin2098 -> 2098 bytes
-rw-r--r--pics/action/sc-actions-tool_rect_selection.svgz (renamed from pics/action/hisc-action-tool_rect_selection.svgz)bin3819 -> 3819 bytes
-rw-r--r--pics/action/sc-actions-tool_rectangle.svgz (renamed from pics/action/hisc-action-tool_rectangle.svgz)bin1960 -> 1960 bytes
-rw-r--r--pics/action/sc-actions-tool_rounded_rectangle.svgz (renamed from pics/action/hisc-action-tool_rounded_rectangle.svgz)bin2220 -> 2220 bytes
-rw-r--r--pics/action/sc-actions-tool_spraycan.svgz (renamed from pics/action/hisc-action-tool_spraycan.svgz)bin8587 -> 8587 bytes
-rw-r--r--pics/action/sc-actions-tool_text.svgz (renamed from pics/action/hisc-action-tool_text.svgz)bin2666 -> 2666 bytes
-rw-r--r--pics/app/16-apps-kolourpaint.png (renamed from pics/app/hi16-app-kolourpaint.png)bin812 -> 812 bytes
-rw-r--r--pics/app/22-apps-kolourpaint.png (renamed from pics/app/hi22-app-kolourpaint.png)bin1259 -> 1259 bytes
-rw-r--r--pics/app/32-apps-kolourpaint.png (renamed from pics/app/hi32-app-kolourpaint.png)bin2139 -> 2139 bytes
-rw-r--r--pics/app/48-apps-kolourpaint.png (renamed from pics/app/hi48-app-kolourpaint.png)bin3975 -> 3975 bytes
-rw-r--r--pics/app/CMakeLists.txt18
-rw-r--r--pics/app/sc-apps-kolourpaint.svgz (renamed from pics/app/hisc-app-kolourpaint.svgz)bin12874 -> 12874 bytes
-rw-r--r--tools/flow/kpToolColorEraser.cpp18
-rw-r--r--tools/kpToolAction.cpp2
103 files changed, 125 insertions, 44 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ade191..dabd490 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -296,8 +296,12 @@ add_subdirectory(lgpl)
# Executable
#
-file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/hi*-app-kolourpaint.png")
-ecm_add_app_icon(kolourpaint_SRCS ICONS ${ICONS_SRCS})
+ecm_add_app_icon(kolourpaint_SRCS ICONS
+ 16-apps-kolourpaint.png
+ 22-apps-kolourpaint.png
+ 32-apps-kolourpaint.png
+ 48-apps-kolourpaint.png
+)
add_executable(kolourpaint ${kolourpaint_SRCS})
diff --git a/ChangeLog b/ChangeLog
index 9acd039..569bc33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,14 +2,7 @@
For logs of _every_ single change made to KolourPaint between any date or
revision, visit:
- http://websvn.kde.org/trunk/KDE/kdegraphics/kolourpaint
-
- http://websvn.kde.org/branches/KDE/<version>/kdegraphics/kolourpaint
- http://websvn.kde.org/tags/KDE/<version>/kdegraphics/kolourpaint
-
- http://websvn.kde.org/branches/kolourpaint
- http://websvn.kde.org/tags/kolourpaint
-
+https://quickgit.kde.org/?p=kolourpaint.git&a=log
For a summary of user-visible changes between each release, read NEWS.
diff --git a/NEWS b/NEWS
index 4f32e10..8a6afb4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+KolourPaint - KF5 based
+
+* Port to KF5
KolourPaint 4 Series (trunk/KDE/)
====================
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index cfdfb88..f1dc5a2 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -1,11 +1,3 @@
-
-# Change this number every time you add an icon to force the build system
-# to rebuild and pick the icon up:
-#
-# 3
-#
-
add_subdirectory( action )
add_subdirectory( app )
add_subdirectory( custom )
-
diff --git a/pics/action/hi16-action-tool_brush.png b/pics/action/16-actions-tool_brush.png
index 372ff62..372ff62 100644
--- a/pics/action/hi16-action-tool_brush.png
+++ b/pics/action/16-actions-tool_brush.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_color_eraser.png b/pics/action/16-actions-tool_color_eraser.png
index 0967ae9..0967ae9 100644
--- a/pics/action/hi16-action-tool_color_eraser.png
+++ b/pics/action/16-actions-tool_color_eraser.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_color_picker.png b/pics/action/16-actions-tool_color_picker.png
index 2aba49a..2aba49a 100644
--- a/pics/action/hi16-action-tool_color_picker.png
+++ b/pics/action/16-actions-tool_color_picker.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_curve.png b/pics/action/16-actions-tool_curve.png
index c7e0b27..c7e0b27 100644
--- a/pics/action/hi16-action-tool_curve.png
+++ b/pics/action/16-actions-tool_curve.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_ellipse.png b/pics/action/16-actions-tool_ellipse.png
index 4e2fe52..4e2fe52 100644
--- a/pics/action/hi16-action-tool_ellipse.png
+++ b/pics/action/16-actions-tool_ellipse.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_elliptical_selection.png b/pics/action/16-actions-tool_elliptical_selection.png
index acd1d6c..acd1d6c 100644
--- a/pics/action/hi16-action-tool_elliptical_selection.png
+++ b/pics/action/16-actions-tool_elliptical_selection.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_eraser.png b/pics/action/16-actions-tool_eraser.png
index f3ef915..f3ef915 100644
--- a/pics/action/hi16-action-tool_eraser.png
+++ b/pics/action/16-actions-tool_eraser.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_flood_fill.png b/pics/action/16-actions-tool_flood_fill.png
index f0900a7..f0900a7 100644
--- a/pics/action/hi16-action-tool_flood_fill.png
+++ b/pics/action/16-actions-tool_flood_fill.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_free_form_selection.png b/pics/action/16-actions-tool_free_form_selection.png
index 31e3a48..31e3a48 100644
--- a/pics/action/hi16-action-tool_free_form_selection.png
+++ b/pics/action/16-actions-tool_free_form_selection.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_line.png b/pics/action/16-actions-tool_line.png
index 2bdb607..2bdb607 100644
--- a/pics/action/hi16-action-tool_line.png
+++ b/pics/action/16-actions-tool_line.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_pen.png b/pics/action/16-actions-tool_pen.png
index 467b0d5..467b0d5 100644
--- a/pics/action/hi16-action-tool_pen.png
+++ b/pics/action/16-actions-tool_pen.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_polygon.png b/pics/action/16-actions-tool_polygon.png
index bd0eac1..bd0eac1 100644
--- a/pics/action/hi16-action-tool_polygon.png
+++ b/pics/action/16-actions-tool_polygon.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_polyline.png b/pics/action/16-actions-tool_polyline.png
index ca8dd6a..ca8dd6a 100644
--- a/pics/action/hi16-action-tool_polyline.png
+++ b/pics/action/16-actions-tool_polyline.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_rect_selection.png b/pics/action/16-actions-tool_rect_selection.png
index 35d9f18..35d9f18 100644
--- a/pics/action/hi16-action-tool_rect_selection.png
+++ b/pics/action/16-actions-tool_rect_selection.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_rectangle.png b/pics/action/16-actions-tool_rectangle.png
index b373fa4..b373fa4 100644
--- a/pics/action/hi16-action-tool_rectangle.png
+++ b/pics/action/16-actions-tool_rectangle.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_rounded_rectangle.png b/pics/action/16-actions-tool_rounded_rectangle.png
index 2fd0b3e..2fd0b3e 100644
--- a/pics/action/hi16-action-tool_rounded_rectangle.png
+++ b/pics/action/16-actions-tool_rounded_rectangle.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_spraycan.png b/pics/action/16-actions-tool_spraycan.png
index f34b2a1..f34b2a1 100644
--- a/pics/action/hi16-action-tool_spraycan.png
+++ b/pics/action/16-actions-tool_spraycan.png
Binary files differ
diff --git a/pics/action/hi16-action-tool_text.png b/pics/action/16-actions-tool_text.png
index 9eaa24d..9eaa24d 100644
--- a/pics/action/hi16-action-tool_text.png
+++ b/pics/action/16-actions-tool_text.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_brush.png b/pics/action/22-actions-tool_brush.png
index c51dd59..c51dd59 100644
--- a/pics/action/hi22-action-tool_brush.png
+++ b/pics/action/22-actions-tool_brush.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_color_eraser.png b/pics/action/22-actions-tool_color_eraser.png
index f1065fd..f1065fd 100644
--- a/pics/action/hi22-action-tool_color_eraser.png
+++ b/pics/action/22-actions-tool_color_eraser.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_color_picker.png b/pics/action/22-actions-tool_color_picker.png
index b59adff..b59adff 100644
--- a/pics/action/hi22-action-tool_color_picker.png
+++ b/pics/action/22-actions-tool_color_picker.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_curve.png b/pics/action/22-actions-tool_curve.png
index 9723e20..9723e20 100644
--- a/pics/action/hi22-action-tool_curve.png
+++ b/pics/action/22-actions-tool_curve.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_ellipse.png b/pics/action/22-actions-tool_ellipse.png
index 5861f79..5861f79 100644
--- a/pics/action/hi22-action-tool_ellipse.png
+++ b/pics/action/22-actions-tool_ellipse.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_elliptical_selection.png b/pics/action/22-actions-tool_elliptical_selection.png
index 10e8ed3..10e8ed3 100644
--- a/pics/action/hi22-action-tool_elliptical_selection.png
+++ b/pics/action/22-actions-tool_elliptical_selection.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_eraser.png b/pics/action/22-actions-tool_eraser.png
index e3fa028..e3fa028 100644
--- a/pics/action/hi22-action-tool_eraser.png
+++ b/pics/action/22-actions-tool_eraser.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_flood_fill.png b/pics/action/22-actions-tool_flood_fill.png
index 0b98f3a..0b98f3a 100644
--- a/pics/action/hi22-action-tool_flood_fill.png
+++ b/pics/action/22-actions-tool_flood_fill.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_free_form_selection.png b/pics/action/22-actions-tool_free_form_selection.png
index 1434670..1434670 100644
--- a/pics/action/hi22-action-tool_free_form_selection.png
+++ b/pics/action/22-actions-tool_free_form_selection.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_line.png b/pics/action/22-actions-tool_line.png
index 22f5aa5..22f5aa5 100644
--- a/pics/action/hi22-action-tool_line.png
+++ b/pics/action/22-actions-tool_line.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_pen.png b/pics/action/22-actions-tool_pen.png
index fcedd23..fcedd23 100644
--- a/pics/action/hi22-action-tool_pen.png
+++ b/pics/action/22-actions-tool_pen.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_polygon.png b/pics/action/22-actions-tool_polygon.png
index 9bf2d40..9bf2d40 100644
--- a/pics/action/hi22-action-tool_polygon.png
+++ b/pics/action/22-actions-tool_polygon.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_polyline.png b/pics/action/22-actions-tool_polyline.png
index e5ef4ef..e5ef4ef 100644
--- a/pics/action/hi22-action-tool_polyline.png
+++ b/pics/action/22-actions-tool_polyline.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_rect_selection.png b/pics/action/22-actions-tool_rect_selection.png
index 39a7c29..39a7c29 100644
--- a/pics/action/hi22-action-tool_rect_selection.png
+++ b/pics/action/22-actions-tool_rect_selection.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_rectangle.png b/pics/action/22-actions-tool_rectangle.png
index 8f94c8b..8f94c8b 100644
--- a/pics/action/hi22-action-tool_rectangle.png
+++ b/pics/action/22-actions-tool_rectangle.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_rounded_rectangle.png b/pics/action/22-actions-tool_rounded_rectangle.png
index 758e617..758e617 100644
--- a/pics/action/hi22-action-tool_rounded_rectangle.png
+++ b/pics/action/22-actions-tool_rounded_rectangle.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_spraycan.png b/pics/action/22-actions-tool_spraycan.png
index bf8f2a4..bf8f2a4 100644
--- a/pics/action/hi22-action-tool_spraycan.png
+++ b/pics/action/22-actions-tool_spraycan.png
Binary files differ
diff --git a/pics/action/hi22-action-tool_text.png b/pics/action/22-actions-tool_text.png
index 98602e3..98602e3 100644
--- a/pics/action/hi22-action-tool_text.png
+++ b/pics/action/22-actions-tool_text.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_brush.png b/pics/action/32-actions-tool_brush.png
index 1f60a55..1f60a55 100644
--- a/pics/action/hi32-action-tool_brush.png
+++ b/pics/action/32-actions-tool_brush.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_color_eraser.png b/pics/action/32-actions-tool_color_eraser.png
index bf96e2d..bf96e2d 100644
--- a/pics/action/hi32-action-tool_color_eraser.png
+++ b/pics/action/32-actions-tool_color_eraser.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_color_picker.png b/pics/action/32-actions-tool_color_picker.png
index 7714dc2..7714dc2 100644
--- a/pics/action/hi32-action-tool_color_picker.png
+++ b/pics/action/32-actions-tool_color_picker.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_curve.png b/pics/action/32-actions-tool_curve.png
index ed69479..ed69479 100644
--- a/pics/action/hi32-action-tool_curve.png
+++ b/pics/action/32-actions-tool_curve.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_ellipse.png b/pics/action/32-actions-tool_ellipse.png
index 84eac23..84eac23 100644
--- a/pics/action/hi32-action-tool_ellipse.png
+++ b/pics/action/32-actions-tool_ellipse.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_elliptical_selection.png b/pics/action/32-actions-tool_elliptical_selection.png
index dfc8eef..dfc8eef 100644
--- a/pics/action/hi32-action-tool_elliptical_selection.png
+++ b/pics/action/32-actions-tool_elliptical_selection.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_eraser.png b/pics/action/32-actions-tool_eraser.png
index dab6391..dab6391 100644
--- a/pics/action/hi32-action-tool_eraser.png
+++ b/pics/action/32-actions-tool_eraser.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_flood_fill.png b/pics/action/32-actions-tool_flood_fill.png
index 7302a98..7302a98 100644
--- a/pics/action/hi32-action-tool_flood_fill.png
+++ b/pics/action/32-actions-tool_flood_fill.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_free_form_selection.png b/pics/action/32-actions-tool_free_form_selection.png
index ce0f518..ce0f518 100644
--- a/pics/action/hi32-action-tool_free_form_selection.png
+++ b/pics/action/32-actions-tool_free_form_selection.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_line.png b/pics/action/32-actions-tool_line.png
index 4dfcbdc..4dfcbdc 100644
--- a/pics/action/hi32-action-tool_line.png
+++ b/pics/action/32-actions-tool_line.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_pen.png b/pics/action/32-actions-tool_pen.png
index ba35f90..ba35f90 100644
--- a/pics/action/hi32-action-tool_pen.png
+++ b/pics/action/32-actions-tool_pen.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_polygon.png b/pics/action/32-actions-tool_polygon.png
index 87dbe46..87dbe46 100644
--- a/pics/action/hi32-action-tool_polygon.png
+++ b/pics/action/32-actions-tool_polygon.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_polyline.png b/pics/action/32-actions-tool_polyline.png
index dd4ec9b..dd4ec9b 100644
--- a/pics/action/hi32-action-tool_polyline.png
+++ b/pics/action/32-actions-tool_polyline.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_rect_selection.png b/pics/action/32-actions-tool_rect_selection.png
index 17308a4..17308a4 100644
--- a/pics/action/hi32-action-tool_rect_selection.png
+++ b/pics/action/32-actions-tool_rect_selection.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_rectangle.png b/pics/action/32-actions-tool_rectangle.png
index 2cd5919..2cd5919 100644
--- a/pics/action/hi32-action-tool_rectangle.png
+++ b/pics/action/32-actions-tool_rectangle.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_rounded_rectangle.png b/pics/action/32-actions-tool_rounded_rectangle.png
index 2937e29..2937e29 100644
--- a/pics/action/hi32-action-tool_rounded_rectangle.png
+++ b/pics/action/32-actions-tool_rounded_rectangle.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_spraycan.png b/pics/action/32-actions-tool_spraycan.png
index 215be80..215be80 100644
--- a/pics/action/hi32-action-tool_spraycan.png
+++ b/pics/action/32-actions-tool_spraycan.png
Binary files differ
diff --git a/pics/action/hi32-action-tool_text.png b/pics/action/32-actions-tool_text.png
index ea5ff10..ea5ff10 100644
--- a/pics/action/hi32-action-tool_text.png
+++ b/pics/action/32-actions-tool_text.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_brush.png b/pics/action/48-actions-tool_brush.png
index 71c5a8e..71c5a8e 100644
--- a/pics/action/hi48-action-tool_brush.png
+++ b/pics/action/48-actions-tool_brush.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_color_eraser.png b/pics/action/48-actions-tool_color_eraser.png
index 118fcfe..118fcfe 100644
--- a/pics/action/hi48-action-tool_color_eraser.png
+++ b/pics/action/48-actions-tool_color_eraser.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_color_picker.png b/pics/action/48-actions-tool_color_picker.png
index a630c5a..a630c5a 100644
--- a/pics/action/hi48-action-tool_color_picker.png
+++ b/pics/action/48-actions-tool_color_picker.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_curve.png b/pics/action/48-actions-tool_curve.png
index 98e220f..98e220f 100644
--- a/pics/action/hi48-action-tool_curve.png
+++ b/pics/action/48-actions-tool_curve.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_ellipse.png b/pics/action/48-actions-tool_ellipse.png
index e23579f..e23579f 100644
--- a/pics/action/hi48-action-tool_ellipse.png
+++ b/pics/action/48-actions-tool_ellipse.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_elliptical_selection.png b/pics/action/48-actions-tool_elliptical_selection.png
index 92691a4..92691a4 100644
--- a/pics/action/hi48-action-tool_elliptical_selection.png
+++ b/pics/action/48-actions-tool_elliptical_selection.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_eraser.png b/pics/action/48-actions-tool_eraser.png
index 8cf4e23..8cf4e23 100644
--- a/pics/action/hi48-action-tool_eraser.png
+++ b/pics/action/48-actions-tool_eraser.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_flood_fill.png b/pics/action/48-actions-tool_flood_fill.png
index 61dd49f..61dd49f 100644
--- a/pics/action/hi48-action-tool_flood_fill.png
+++ b/pics/action/48-actions-tool_flood_fill.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_free_form_selection.png b/pics/action/48-actions-tool_free_form_selection.png
index 5eff822..5eff822 100644
--- a/pics/action/hi48-action-tool_free_form_selection.png
+++ b/pics/action/48-actions-tool_free_form_selection.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_line.png b/pics/action/48-actions-tool_line.png
index 95a2fae..95a2fae 100644
--- a/pics/action/hi48-action-tool_line.png
+++ b/pics/action/48-actions-tool_line.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_pen.png b/pics/action/48-actions-tool_pen.png
index 9dfaef1..9dfaef1 100644
--- a/pics/action/hi48-action-tool_pen.png
+++ b/pics/action/48-actions-tool_pen.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_polygon.png b/pics/action/48-actions-tool_polygon.png
index 579802a..579802a 100644
--- a/pics/action/hi48-action-tool_polygon.png
+++ b/pics/action/48-actions-tool_polygon.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_polyline.png b/pics/action/48-actions-tool_polyline.png
index 135ba32..135ba32 100644
--- a/pics/action/hi48-action-tool_polyline.png
+++ b/pics/action/48-actions-tool_polyline.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_rect_selection.png b/pics/action/48-actions-tool_rect_selection.png
index fe228d0..fe228d0 100644
--- a/pics/action/hi48-action-tool_rect_selection.png
+++ b/pics/action/48-actions-tool_rect_selection.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_rectangle.png b/pics/action/48-actions-tool_rectangle.png
index 3f40684..3f40684 100644
--- a/pics/action/hi48-action-tool_rectangle.png
+++ b/pics/action/48-actions-tool_rectangle.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_rounded_rectangle.png b/pics/action/48-actions-tool_rounded_rectangle.png
index 3787d02..3787d02 100644
--- a/pics/action/hi48-action-tool_rounded_rectangle.png
+++ b/pics/action/48-actions-tool_rounded_rectangle.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_spraycan.png b/pics/action/48-actions-tool_spraycan.png
index 51b397b..51b397b 100644
--- a/pics/action/hi48-action-tool_spraycan.png
+++ b/pics/action/48-actions-tool_spraycan.png
Binary files differ
diff --git a/pics/action/hi48-action-tool_text.png b/pics/action/48-actions-tool_text.png
index 9fd75d9..9fd75d9 100644
--- a/pics/action/hi48-action-tool_text.png
+++ b/pics/action/48-actions-tool_text.png
Binary files differ
diff --git a/pics/action/CMakeLists.txt b/pics/action/CMakeLists.txt
index 9c426b3..0198cb9 100644
--- a/pics/action/CMakeLists.txt
+++ b/pics/action/CMakeLists.txt
@@ -1,9 +1,94 @@
-
-# Change this number every time you add an icon to force the build system
-# to rebuild and pick the icon up:
-#
-# 4
-#
-
-kde4_install_icons( ${DATA_INSTALL_DIR}/kolourpaint/icons )
-
+ecm_install_icons(ICONS
+ 16-actions-tool_brush.png
+ 16-actions-tool_color_eraser.png
+ 16-actions-tool_color_picker.png
+ 16-actions-tool_curve.png
+ 16-actions-tool_ellipse.png
+ 16-actions-tool_elliptical_selection.png
+ 16-actions-tool_eraser.png
+ 16-actions-tool_flood_fill.png
+ 16-actions-tool_free_form_selection.png
+ 16-actions-tool_line.png
+ 16-actions-tool_pen.png
+ 16-actions-tool_polygon.png
+ 16-actions-tool_polyline.png
+ 16-actions-tool_rect_selection.png
+ 16-actions-tool_rectangle.png
+ 16-actions-tool_rounded_rectangle.png
+ 16-actions-tool_spraycan.png
+ 16-actions-tool_text.png
+ 22-actions-tool_brush.png
+ 22-actions-tool_color_eraser.png
+ 22-actions-tool_color_picker.png
+ 22-actions-tool_curve.png
+ 22-actions-tool_ellipse.png
+ 22-actions-tool_elliptical_selection.png
+ 22-actions-tool_eraser.png
+ 22-actions-tool_flood_fill.png
+ 22-actions-tool_free_form_selection.png
+ 22-actions-tool_line.png
+ 22-actions-tool_pen.png
+ 22-actions-tool_polygon.png
+ 22-actions-tool_polyline.png
+ 22-actions-tool_rect_selection.png
+ 22-actions-tool_rectangle.png
+ 22-actions-tool_rounded_rectangle.png
+ 22-actions-tool_spraycan.png
+ 22-actions-tool_text.png
+ 32-actions-tool_brush.png
+ 32-actions-tool_color_eraser.png
+ 32-actions-tool_color_picker.png
+ 32-actions-tool_curve.png
+ 32-actions-tool_ellipse.png
+ 32-actions-tool_elliptical_selection.png
+ 32-actions-tool_eraser.png
+ 32-actions-tool_flood_fill.png
+ 32-actions-tool_free_form_selection.png
+ 32-actions-tool_line.png
+ 32-actions-tool_pen.png
+ 32-actions-tool_polygon.png
+ 32-actions-tool_polyline.png
+ 32-actions-tool_rect_selection.png
+ 32-actions-tool_rectangle.png
+ 32-actions-tool_rounded_rectangle.png
+ 32-actions-tool_spraycan.png
+ 32-actions-tool_text.png
+ 48-actions-tool_brush.png
+ 48-actions-tool_color_eraser.png
+ 48-actions-tool_color_picker.png
+ 48-actions-tool_curve.png
+ 48-actions-tool_ellipse.png
+ 48-actions-tool_elliptical_selection.png
+ 48-actions-tool_eraser.png
+ 48-actions-tool_flood_fill.png
+ 48-actions-tool_free_form_selection.png
+ 48-actions-tool_line.png
+ 48-actions-tool_pen.png
+ 48-actions-tool_polygon.png
+ 48-actions-tool_polyline.png
+ 48-actions-tool_rect_selection.png
+ 48-actions-tool_rectangle.png
+ 48-actions-tool_rounded_rectangle.png
+ 48-actions-tool_spraycan.png
+ 48-actions-tool_text.png
+ sc-actions-tool_brush.svgz
+ sc-actions-tool_color_eraser.svgz
+ sc-actions-tool_color_picker.svgz
+ sc-actions-tool_curve.svgz
+ sc-actions-tool_ellipse.svgz
+ sc-actions-tool_elliptical_selection.svgz
+ sc-actions-tool_eraser.svgz
+ sc-actions-tool_flood_fill.svgz
+ sc-actions-tool_free_form_selection.svgz
+ sc-actions-tool_line.svgz
+ sc-actions-tool_pen.svgz
+ sc-actions-tool_polygon.svgz
+ sc-actions-tool_polyline.svgz
+ sc-actions-tool_rect_selection.svgz
+ sc-actions-tool_rectangle.svgz
+ sc-actions-tool_rounded_rectangle.svgz
+ sc-actions-tool_spraycan.svgz
+ sc-actions-tool_text.svgz
+ DESTINATION ${DATA_INSTALL_DIR}/kolourpaint/icons
+ THEME hicolor
+)
diff --git a/pics/action/hisc-action-tool_brush.svgz b/pics/action/sc-actions-tool_brush.svgz
index 4848fad..4848fad 100644
--- a/pics/action/hisc-action-tool_brush.svgz
+++ b/pics/action/sc-actions-tool_brush.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_color_eraser.svgz b/pics/action/sc-actions-tool_color_eraser.svgz
index e3b93a3..e3b93a3 100644
--- a/pics/action/hisc-action-tool_color_eraser.svgz
+++ b/pics/action/sc-actions-tool_color_eraser.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_color_picker.svgz b/pics/action/sc-actions-tool_color_picker.svgz
index e680a1a..e680a1a 100644
--- a/pics/action/hisc-action-tool_color_picker.svgz
+++ b/pics/action/sc-actions-tool_color_picker.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_curve.svgz b/pics/action/sc-actions-tool_curve.svgz
index 9aaa3e7..9aaa3e7 100644
--- a/pics/action/hisc-action-tool_curve.svgz
+++ b/pics/action/sc-actions-tool_curve.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_ellipse.svgz b/pics/action/sc-actions-tool_ellipse.svgz
index c57a0e6..c57a0e6 100644
--- a/pics/action/hisc-action-tool_ellipse.svgz
+++ b/pics/action/sc-actions-tool_ellipse.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_elliptical_selection.svgz b/pics/action/sc-actions-tool_elliptical_selection.svgz
index 63c3280..63c3280 100644
--- a/pics/action/hisc-action-tool_elliptical_selection.svgz
+++ b/pics/action/sc-actions-tool_elliptical_selection.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_eraser.svgz b/pics/action/sc-actions-tool_eraser.svgz
index d741594..d741594 100644
--- a/pics/action/hisc-action-tool_eraser.svgz
+++ b/pics/action/sc-actions-tool_eraser.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_flood_fill.svgz b/pics/action/sc-actions-tool_flood_fill.svgz
index 11cd796..11cd796 100644
--- a/pics/action/hisc-action-tool_flood_fill.svgz
+++ b/pics/action/sc-actions-tool_flood_fill.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_free_form_selection.svgz b/pics/action/sc-actions-tool_free_form_selection.svgz
index 768eec8..768eec8 100644
--- a/pics/action/hisc-action-tool_free_form_selection.svgz
+++ b/pics/action/sc-actions-tool_free_form_selection.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_line.svgz b/pics/action/sc-actions-tool_line.svgz
index 6222482..6222482 100644
--- a/pics/action/hisc-action-tool_line.svgz
+++ b/pics/action/sc-actions-tool_line.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_pen.svgz b/pics/action/sc-actions-tool_pen.svgz
index 0dfdd29..0dfdd29 100644
--- a/pics/action/hisc-action-tool_pen.svgz
+++ b/pics/action/sc-actions-tool_pen.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_polygon.svgz b/pics/action/sc-actions-tool_polygon.svgz
index d7358c9..d7358c9 100644
--- a/pics/action/hisc-action-tool_polygon.svgz
+++ b/pics/action/sc-actions-tool_polygon.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_polyline.svgz b/pics/action/sc-actions-tool_polyline.svgz
index 96ba22e..96ba22e 100644
--- a/pics/action/hisc-action-tool_polyline.svgz
+++ b/pics/action/sc-actions-tool_polyline.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_rect_selection.svgz b/pics/action/sc-actions-tool_rect_selection.svgz
index ddb1a27..ddb1a27 100644
--- a/pics/action/hisc-action-tool_rect_selection.svgz
+++ b/pics/action/sc-actions-tool_rect_selection.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_rectangle.svgz b/pics/action/sc-actions-tool_rectangle.svgz
index a4f8b15..a4f8b15 100644
--- a/pics/action/hisc-action-tool_rectangle.svgz
+++ b/pics/action/sc-actions-tool_rectangle.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_rounded_rectangle.svgz b/pics/action/sc-actions-tool_rounded_rectangle.svgz
index 359eed2..359eed2 100644
--- a/pics/action/hisc-action-tool_rounded_rectangle.svgz
+++ b/pics/action/sc-actions-tool_rounded_rectangle.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_spraycan.svgz b/pics/action/sc-actions-tool_spraycan.svgz
index 7e7c1ec..7e7c1ec 100644
--- a/pics/action/hisc-action-tool_spraycan.svgz
+++ b/pics/action/sc-actions-tool_spraycan.svgz
Binary files differ
diff --git a/pics/action/hisc-action-tool_text.svgz b/pics/action/sc-actions-tool_text.svgz
index 52d87f8..52d87f8 100644
--- a/pics/action/hisc-action-tool_text.svgz
+++ b/pics/action/sc-actions-tool_text.svgz
Binary files differ
diff --git a/pics/app/hi16-app-kolourpaint.png b/pics/app/16-apps-kolourpaint.png
index 5951eac..5951eac 100644
--- a/pics/app/hi16-app-kolourpaint.png
+++ b/pics/app/16-apps-kolourpaint.png
Binary files differ
diff --git a/pics/app/hi22-app-kolourpaint.png b/pics/app/22-apps-kolourpaint.png
index 4e93f63..4e93f63 100644
--- a/pics/app/hi22-app-kolourpaint.png
+++ b/pics/app/22-apps-kolourpaint.png
Binary files differ
diff --git a/pics/app/hi32-app-kolourpaint.png b/pics/app/32-apps-kolourpaint.png
index 19ae9bf..19ae9bf 100644
--- a/pics/app/hi32-app-kolourpaint.png
+++ b/pics/app/32-apps-kolourpaint.png
Binary files differ
diff --git a/pics/app/hi48-app-kolourpaint.png b/pics/app/48-apps-kolourpaint.png
index fa64e2f..fa64e2f 100644
--- a/pics/app/hi48-app-kolourpaint.png
+++ b/pics/app/48-apps-kolourpaint.png
Binary files differ
diff --git a/pics/app/CMakeLists.txt b/pics/app/CMakeLists.txt
index 8bf119c..c9e8008 100644
--- a/pics/app/CMakeLists.txt
+++ b/pics/app/CMakeLists.txt
@@ -1,9 +1,9 @@
-
-# Change this number every time you add an icon to force the build system
-# to rebuild and pick the icon up:
-#
-# 3
-#
-
-kde4_install_icons( ${ICON_INSTALL_DIR} )
-
+ecm_install_icons(ICONS
+ 16-apps-kolourpaint.png
+ 22-apps-kolourpaint.png
+ 32-apps-kolourpaint.png
+ 48-apps-kolourpaint.png
+ sc-apps-kolourpaint.svgz
+ DESTINATION ${ICON_INSTALL_DIR}
+ THEME hicolor
+)
diff --git a/pics/app/hisc-app-kolourpaint.svgz b/pics/app/sc-apps-kolourpaint.svgz
index 8b5a63b..8b5a63b 100644
--- a/pics/app/hisc-app-kolourpaint.svgz
+++ b/pics/app/sc-apps-kolourpaint.svgz
Binary files differ
diff --git a/tools/flow/kpToolColorEraser.cpp b/tools/flow/kpToolColorEraser.cpp
index 41e3c31..52003dd 100644
--- a/tools/flow/kpToolColorEraser.cpp
+++ b/tools/flow/kpToolColorEraser.cpp
@@ -1,4 +1,3 @@
-
/*
Copyright (c) 2003-2007 Clarence Dang <[email protected]>
All rights reserved.
@@ -28,14 +27,10 @@
#define DEBUG_KP_TOOL_COLOR_ERASER 0
+#include <QApplication>
#include "kpToolColorEraser.h"
-#include <qbitmap.h>
-#include <qimage.h>
-#include <qpainter.h>
-
-#include <kapplication.h>
#include <kdebug.h>
#include <klocale.h>
@@ -48,6 +43,7 @@
#include "commands/tools/flow/kpToolFlowCommand.h"
#include "environments/tools/kpToolEnvironment.h"
+//--------------------------------------------------------------------------------
kpToolColorEraser::kpToolColorEraser (kpToolEnvironment *environ, QObject *parent)
: kpToolFlowBase (i18n ("Color Eraser"),
@@ -58,12 +54,15 @@ kpToolColorEraser::kpToolColorEraser (kpToolEnvironment *environ, QObject *paren
{
}
+//--------------------------------------------------------------------------------
+
kpToolColorEraser::~kpToolColorEraser ()
{
}
-
+//--------------------------------------------------------------------------------
// public virtual [base kpTool]
+
void kpToolColorEraser::globalDraw ()
{
#if DEBUG_KP_TOOL_COLOR_ERASER
@@ -110,11 +109,14 @@ void kpToolColorEraser::globalDraw ()
QApplication::restoreOverrideCursor ();
}
+//--------------------------------------------------------------------------------
+
QString kpToolColorEraser::haventBegunDrawUserMessage () const
{
return i18n ("Click or drag to erase pixels of the foreground color.");
}
+//--------------------------------------------------------------------------------
bool kpToolColorEraser::drawShouldProceed (const QPoint & /*thisPoint*/,
const QPoint & /*lastPoint*/,
@@ -129,6 +131,7 @@ bool kpToolColorEraser::drawShouldProceed (const QPoint & /*thisPoint*/,
return true;
}
+//--------------------------------------------------------------------------------
QRect kpToolColorEraser::drawLine (const QPoint &thisPoint, const QPoint &lastPoint)
{
@@ -160,3 +163,4 @@ QRect kpToolColorEraser::drawLine (const QPoint &thisPoint, const QPoint &lastPo
return QRect ();
}
+//--------------------------------------------------------------------------------
diff --git a/tools/kpToolAction.cpp b/tools/kpToolAction.cpp
index cd4ed11..8bbd36f 100644
--- a/tools/kpToolAction.cpp
+++ b/tools/kpToolAction.cpp
@@ -56,7 +56,7 @@ kpToolAction::kpToolAction(const QString &text,
void kpToolAction::updateToolTip()
{
const QString newToolTip =
- kpTool::toolTipForTextAndShortcut(text(), shortcuts());
+ kpTool::toolTipForTextAndShortcut(text(), shortcuts()).remove(QLatin1Char('&'));
if ( newToolTip == toolTip() )
return;