Diffusion KReport f5d474126cef

Make KReport use resource files for icons
f5d474126cef
Actions

Authored by staniek on Sep 26 2016, 6:28 PM.

Description

Make KReport use resource files for icons

Summary:

use kreport_THEME.rcc for library-global icons
use URL_THEME.rcc for plugin icons with prefix :/icons/URL so there is little risk of conflicts
use consistent kreport-foo-bar icon naming
make it easy to add new icons and plugins via cmake
make plugin files more unique (org.kde.kreport. prefix), helps in co-installation
make KReportExample work with the changes

Reviewers: piggz

Subscribers: Kexi-Devel-list

Tags: KReport

Differential Revision: https://phabricator.kde.org/D2860

Details

Committed

staniek

Oct 3 2016, 9:10 AM

Differential Revision

D2860: Make KReport use resource files for icons

Parents

R14:dfc3cad545f5: Initial port of web plugin to Qt5/KReport3/QtWebEngine

Branches

Unknown

Tags

Unknown

staniek committed R14:f5d474126cef: Make KReport use resource files for icons (authored by staniek).Oct 3 2016, 9:10 AM

Changes (109)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		CMakeLists.txt
A		cmake/modules/KReportAddIconsRccFile.cmake
M		cmake/modules/KReportMacros.cmake
A		cmake/modules/update_icon_list.sh
M		examples/CMakeLists.txt
M		examples/main.cpp
M		src/common/KReportPluginManager.cpp
M		src/common/KReportSectionData.cpp
A		src/common/KReportUtils_p.h
M		src/items/check/check.json
M		src/items/field/field.json
M		src/items/image/image.json
M		src/items/label/label.json
M		src/items/text/text.json
M		src/pics/CMakeLists.txt
D		src/pics/hicolor
V		src/pics/{hicolor/16-actions-kreport_checkbox_element.svg → icons/breeze/actions/16/kreport-checkbox-element.svg}
V		src/pics/{hicolor/16-actions-kreport_field_element.svg → icons/breeze/actions/16/kreport-field-element.svg}
V		src/pics/{hicolor/16-actions-kreport_image_element.svg → icons/breeze/actions/16/kreport-image-element.svg}
V		src/pics/{hicolor/16-actions-kreport_label_element.svg → icons/breeze/actions/16/kreport-label-element.svg}
V		src/pics/{hicolor/16-actions-kreport_line_element.svg → icons/breeze/actions/16/kreport-line-element.svg}
V		src/pics/{hicolor/16-actions-kreport_text_element.svg → icons/breeze/actions/16/kreport-text-element.svg}
V		src/pics/{hicolor/22-actions-kreport_checkbox_element.svg → icons/breeze/actions/22/kreport-checkbox-element.svg}
V		src/pics/{hicolor/22-actions-kreport_field_element.svg → icons/breeze/actions/22/kreport-field-element.svg}
V		src/pics/{hicolor/22-actions-kreport_image_element.svg → icons/breeze/actions/22/kreport-image-element.svg}
V		src/pics/{hicolor/22-actions-kreport_label_element.svg → icons/breeze/actions/22/kreport-label-element.svg}
V		src/pics/{hicolor/22-actions-kreport_line_element.svg → icons/breeze/actions/22/kreport-line-element.svg}
V		src/pics/{hicolor/22-actions-kreport_text_element.svg → icons/breeze/actions/22/kreport-text-element.svg}
D		src/pics/hicolor/CMakeLists.txt
A	(dir)	src/pics/icons/
A	(dir)	src/pics/icons/breeze/
A	(dir)	src/pics/icons/breeze/actions/
A	(dir)	src/pics/icons/breeze/actions/16/
V		src/pics/{icons/breeze/actions/16/kreport-checkbox-element.svg ← hicolor/16-actions-kreport_checkbox_element.svg}
V		src/pics/{icons/breeze/actions/16/kreport-field-element.svg ← hicolor/16-actions-kreport_field_element.svg}
V		src/pics/{icons/breeze/actions/16/kreport-image-element.svg ← hicolor/16-actions-kreport_image_element.svg}
V		src/pics/{icons/breeze/actions/16/kreport-label-element.svg ← hicolor/16-actions-kreport_label_element.svg}
V		src/pics/{icons/breeze/actions/16/kreport-line-element.svg ← hicolor/16-actions-kreport_line_element.svg}
V		src/pics/{icons/breeze/actions/16/kreport-text-element.svg ← hicolor/16-actions-kreport_text_element.svg}
A	(dir)	src/pics/icons/breeze/actions/22/
V		src/pics/{icons/breeze/actions/22/kreport-checkbox-element.svg ← hicolor/22-actions-kreport_checkbox_element.svg}
V		src/pics/{icons/breeze/actions/22/kreport-field-element.svg ← hicolor/22-actions-kreport_field_element.svg}
V		src/pics/{icons/breeze/actions/22/kreport-image-element.svg ← hicolor/22-actions-kreport_image_element.svg}
V		src/pics/{icons/breeze/actions/22/kreport-label-element.svg ← hicolor/22-actions-kreport_label_element.svg}
V		src/pics/{icons/breeze/actions/22/kreport-line-element.svg ← hicolor/22-actions-kreport_line_element.svg}
V		src/pics/{icons/breeze/actions/22/kreport-text-element.svg ← hicolor/22-actions-kreport_text_element.svg}
A		src/pics/icons/breeze/files.cmake
M		src/plugins/barcode/CMakeLists.txt
M		src/plugins/barcode/kreport_barcodeplugin.json
M		src/plugins/barcode/pics/CMakeLists.txt
D		src/plugins/barcode/pics/hicolor
V		src/plugins/barcode/pics/{hicolor/16-actions-kreport_barcode_element.svg → icons/breeze/actions/16/kreport-barcode-element.svg}
V		src/plugins/barcode/pics/{hicolor/22-actions-kreport_barcode_element.svg → icons/breeze/actions/22/kreport-barcode-element.svg}
D		src/plugins/barcode/pics/hicolor/CMakeLists.txt
A	(dir)	src/plugins/barcode/pics/icons/
A	(dir)	src/plugins/barcode/pics/icons/breeze/
A	(dir)	src/plugins/barcode/pics/icons/breeze/actions/
A	(dir)	src/plugins/barcode/pics/icons/breeze/actions/16/
V		src/plugins/barcode/pics/{icons/breeze/actions/16/kreport-barcode-element.svg ← hicolor/16-actions-kreport_barcode_element.svg}
A	(dir)	src/plugins/barcode/pics/icons/breeze/actions/22/
V		src/plugins/barcode/pics/{icons/breeze/actions/22/kreport-barcode-element.svg ← hicolor/22-actions-kreport_barcode_element.svg}
A		src/plugins/barcode/pics/icons/breeze/files.cmake
M		src/plugins/chart/CMakeLists.txt
M		src/plugins/chart/kreport_chartplugin.json
M		src/plugins/chart/pics/CMakeLists.txt
D		src/plugins/chart/pics/hicolor
V		src/plugins/chart/pics/{hicolor/16-actions-kreport_chart_element.svg → icons/breeze/actions/16/kreport-chart-element.svg}
V		src/plugins/chart/pics/{hicolor/22-actions-kreport_chart_element.svg → icons/breeze/actions/22/kreport-chart-element.svg}
D		src/plugins/chart/pics/hicolor/CMakeLists.txt
A	(dir)	src/plugins/chart/pics/icons/
A	(dir)	src/plugins/chart/pics/icons/breeze/
A	(dir)	src/plugins/chart/pics/icons/breeze/actions/
A	(dir)	src/plugins/chart/pics/icons/breeze/actions/16/
V		src/plugins/chart/pics/{icons/breeze/actions/16/kreport-chart-element.svg ← hicolor/16-actions-kreport_chart_element.svg}
A	(dir)	src/plugins/chart/pics/icons/breeze/actions/22/
V		src/plugins/chart/pics/{icons/breeze/actions/22/kreport-chart-element.svg ← hicolor/22-actions-kreport_chart_element.svg}
A		src/plugins/chart/pics/icons/breeze/files.cmake
M		src/plugins/maps/CMakeLists.txt
M		src/plugins/maps/kreport_mapsplugin.json
M		src/plugins/maps/pics/CMakeLists.txt
D		src/plugins/maps/pics/hicolor
V		src/plugins/maps/pics/{hicolor/16-actions-kreport_maps_element.svg → icons/breeze/actions/16/kreport-maps-element.svg}
V		src/plugins/maps/pics/{hicolor/22-actions-kreport_maps_element.svg → icons/breeze/actions/22/kreport-maps-element.svg}
D		src/plugins/maps/pics/hicolor/CMakeLists.txt
A	(dir)	src/plugins/maps/pics/icons/
A	(dir)	src/plugins/maps/pics/icons/breeze/
A	(dir)	src/plugins/maps/pics/icons/breeze/actions/
A	(dir)	src/plugins/maps/pics/icons/breeze/actions/16/
V		src/plugins/maps/pics/{icons/breeze/actions/16/kreport-maps-element.svg ← hicolor/16-actions-kreport_maps_element.svg}
A	(dir)	src/plugins/maps/pics/icons/breeze/actions/22/
V		src/plugins/maps/pics/{icons/breeze/actions/22/kreport-maps-element.svg ← hicolor/22-actions-kreport_maps_element.svg}
A		src/plugins/maps/pics/icons/breeze/files.cmake
M		src/plugins/web/CMakeLists.txt
M		src/plugins/web/kreport_webplugin.json
M		src/plugins/web/pics/CMakeLists.txt
D		src/plugins/web/pics/hicolor
V		src/plugins/web/pics/{hicolor/16-actions-kreport_web_element.svg → icons/breeze/actions/16/kreport-web-element.svg}
V		src/plugins/web/pics/{hicolor/22-actions-kreport_web_element.svg → icons/breeze/actions/22/kreport-web-element.svg}
D		src/plugins/web/pics/hicolor/CMakeLists.txt
A	(dir)	src/plugins/web/pics/icons/
A	(dir)	src/plugins/web/pics/icons/breeze/
A	(dir)	src/plugins/web/pics/icons/breeze/actions/
A	(dir)	src/plugins/web/pics/icons/breeze/actions/16/
V		src/plugins/web/pics/{icons/breeze/actions/16/kreport-web-element.svg ← hicolor/16-actions-kreport_web_element.svg}
A	(dir)	src/plugins/web/pics/icons/breeze/actions/22/
V		src/plugins/web/pics/{icons/breeze/actions/22/kreport-web-element.svg ← hicolor/22-actions-kreport_web_element.svg}
A		src/plugins/web/pics/icons/breeze/files.cmake
M		src/wrtembed/KReportDesigner.cpp
M		src/wrtembed/KReportDesigner.h