Skip to content

Commit 5431337

Browse files
committed
grass: do not install icon files, use them from the resource file
1 parent ad7e502 commit 5431337

File tree

6 files changed

+113
-121
lines changed

6 files changed

+113
-121
lines changed

src/plugins/grass/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ ENDIF (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}")
1414
ADD_SUBDIRECTORY(modules-common)
1515
ADD_SUBDIRECTORY(${GRASS_MODULES_DIR})
1616
ADD_SUBDIRECTORY(scripts)
17-
ADD_SUBDIRECTORY(themes)
1817

1918
ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
2019
ADD_DEFINITIONS(-DHAVE_OPENPTY=${HAVE_OPENPTY})

src/plugins/grass/qgsgrass_plugin.qrc

+113-102
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,118 @@
11
<RCC>
2-
<qresource prefix="/images/themes/default/grass" >
3-
<file alias="grass_add_map.png">themes/default/grass_add_map.png</file>
4-
<file alias="grass_add_raster.png">themes/default/grass_add_raster.png</file>
5-
<file alias="grass_add_vector.png">themes/default/grass_add_vector.png</file>
6-
<file alias="grass_add_vertex.png">themes/default/grass_add_vertex.png</file>
7-
<file alias="grass_browser_raster_layer.png">themes/default/grass_browser_raster_layer.png</file>
8-
<file alias="grass_browser_vector_layer.png">themes/default/grass_browser_vector_layer.png</file>
9-
<file alias="grass_clear_input.png">themes/default/grass_clear_input.png</file>
10-
<file alias="grass_close_edit.png">themes/default/grass_close_edit.png</file>
11-
<file alias="grass_close_mapset.png">themes/default/grass_close_mapset.png</file>
12-
<file alias="grass_copy_map.png">themes/default/grass_copy_map.png</file>
13-
<file alias="grass_delete_line.png">themes/default/grass_delete_line.png</file>
14-
<file alias="grass_delete_map.png">themes/default/grass_delete_map.png</file>
15-
<file alias="grass_delete_vertex.png">themes/default/grass_delete_vertex.png</file>
16-
<file alias="grass_edit_attributes.png">themes/default/grass_edit_attributes.png</file>
17-
<file alias="grass_edit.png">themes/default/grass_edit.png</file>
18-
<file alias="grass_module_error.png">themes/default/grass_module_error.png</file>
19-
<file alias="grass_module_warning.png">themes/default/grass_module_warning.png</file>
20-
<file alias="grass_move_line.png">themes/default/grass_move_line.png</file>
21-
<file alias="grass_move_vertex.png">themes/default/grass_move_vertex.png</file>
22-
<file alias="grass_new_boundary.png">themes/default/grass_new_boundary.png</file>
23-
<file alias="grass_new_centroid.png">themes/default/grass_new_centroid.png</file>
24-
<file alias="grass_new_line.png">themes/default/grass_new_line.png</file>
25-
<file alias="grass_new_mapset.png">themes/default/grass_new_mapset.png</file>
26-
<file alias="grass_new_point.png">themes/default/grass_new_point.png</file>
27-
<file alias="grass_new_vector_layer.png">themes/default/grass_new_vector_layer.png</file>
28-
<file alias="grass_open_mapset.png">themes/default/grass_open_mapset.png</file>
29-
<file alias="grass_refresh.png">themes/default/grass_refresh.png</file>
30-
<file alias="grass_region_edit.png">themes/default/grass_region_edit.png</file>
31-
<file alias="grass_region.png">themes/default/grass_region.png</file>
32-
<file alias="grass_rename_map.png">themes/default/grass_rename_map.png</file>
33-
<file alias="grass_set_region.png">themes/default/grass_set_region.png</file>
34-
<file alias="grass_shell.png">themes/default/grass_shell.png</file>
35-
<file alias="grass_split_line.png">themes/default/grass_split_line.png</file>
36-
<file alias="grass_tools.png">themes/default/grass_tools.png</file>
37-
<file alias="mapcalc_add_connection.png">themes/default/mapcalc_add_connection.png</file>
38-
<file alias="mapcalc_add_constant.png">themes/default/mapcalc_add_constant.png</file>
39-
<file alias="mapcalc_add_function.png">themes/default/mapcalc_add_function.png</file>
40-
<file alias="mapcalc_add_map.png">themes/default/mapcalc_add_map.png</file>
41-
<file alias="mapcalc_delete.png">themes/default/mapcalc_delete.png</file>
42-
<file alias="mapcalc_open.png">themes/default/mapcalc_open.png</file>
43-
<file alias="mapcalc_save_as.png">themes/default/mapcalc_save_as.png</file>
44-
<file alias="mapcalc_save.png">themes/default/mapcalc_save.png</file>
45-
<file alias="mapcalc_select.png">themes/default/mapcalc_select.png</file>
46-
<file alias="world.png">themes/default/world.png</file>
2+
<qresource prefix="/images/themes/default/grass">
3+
<file alias="grass_add_map.png">themes/default/grass_add_map.png</file>
4+
<file alias="grass_add_raster.png">themes/default/grass_add_raster.png</file>
5+
<file alias="grass_add_vector.png">themes/default/grass_add_vector.png</file>
6+
<file alias="grass_add_vertex.png">themes/default/grass_add_vertex.png</file>
7+
<file alias="grass_browser_raster_layer.png">themes/default/grass_browser_raster_layer.png</file>
8+
<file alias="grass_browser_vector_layer.png">themes/default/grass_browser_vector_layer.png</file>
9+
<file alias="grass_clear_input.png">themes/default/grass_clear_input.png</file>
10+
<file alias="grass_close_edit.png">themes/default/grass_close_edit.png</file>
11+
<file alias="grass_close_mapset.png">themes/default/grass_close_mapset.png</file>
12+
<file alias="grass_copy_map.png">themes/default/grass_copy_map.png</file>
13+
<file alias="grass_delete_line.png">themes/default/grass_delete_line.png</file>
14+
<file alias="grass_delete_map.png">themes/default/grass_delete_map.png</file>
15+
<file alias="grass_delete_vertex.png">themes/default/grass_delete_vertex.png</file>
16+
<file alias="grass_edit_attributes.png">themes/default/grass_edit_attributes.png</file>
17+
<file alias="grass_edit.png">themes/default/grass_edit.png</file>
18+
<file alias="grass_module_error.png">themes/default/grass_module_error.png</file>
19+
<file alias="grass_module_warning.png">themes/default/grass_module_warning.png</file>
20+
<file alias="grass_move_line.png">themes/default/grass_move_line.png</file>
21+
<file alias="grass_move_vertex.png">themes/default/grass_move_vertex.png</file>
22+
<file alias="grass_new_boundary.png">themes/default/grass_new_boundary.png</file>
23+
<file alias="grass_new_centroid.png">themes/default/grass_new_centroid.png</file>
24+
<file alias="grass_new_line.png">themes/default/grass_new_line.png</file>
25+
<file alias="grass_new_mapset.png">themes/default/grass_new_mapset.png</file>
26+
<file alias="grass_new_point.png">themes/default/grass_new_point.png</file>
27+
<file alias="grass_new_vector_layer.png">themes/default/grass_new_vector_layer.png</file>
28+
<file alias="grass_open_mapset.png">themes/default/grass_open_mapset.png</file>
29+
<file alias="grass_refresh.png">themes/default/grass_refresh.png</file>
30+
<file alias="grass_region_edit.png">themes/default/grass_region_edit.png</file>
31+
<file alias="grass_region.png">themes/default/grass_region.png</file>
32+
<file alias="grass_rename_map.png">themes/default/grass_rename_map.png</file>
33+
<file alias="grass_set_region.png">themes/default/grass_set_region.png</file>
34+
<file alias="grass_shell.png">themes/default/grass_shell.png</file>
35+
<file alias="grass_split_line.png">themes/default/grass_split_line.png</file>
36+
<file alias="grass_tools.png">themes/default/grass_tools.png</file>
37+
<file alias="mapcalc_add_connection.png">themes/default/mapcalc_add_connection.png</file>
38+
<file alias="mapcalc_add_constant.png">themes/default/mapcalc_add_constant.png</file>
39+
<file alias="mapcalc_add_function.png">themes/default/mapcalc_add_function.png</file>
40+
<file alias="mapcalc_add_map.png">themes/default/mapcalc_add_map.png</file>
41+
<file alias="mapcalc_delete.png">themes/default/mapcalc_delete.png</file>
42+
<file alias="mapcalc_open.png">themes/default/mapcalc_open.png</file>
43+
<file alias="mapcalc_save_as.png">themes/default/mapcalc_save_as.png</file>
44+
<file alias="mapcalc_save.png">themes/default/mapcalc_save.png</file>
45+
<file alias="mapcalc_select.png">themes/default/mapcalc_select.png</file>
46+
<file alias="world.png">themes/default/world.png</file>
4747
</qresource>
48-
<qresource prefix="/images/themes/classic/grass" >
49-
<file alias="grass_add_map.png">themes/classic/grass_add_map.png</file>
50-
<file alias="grass_add_raster.png">themes/classic/grass_add_raster.png</file>
51-
<file alias="grass_add_vector.png">themes/classic/grass_add_vector.png</file>
52-
<file alias="grass_add_vertex.png">themes/classic/grass_add_vertex.png</file>
53-
<file alias="grass_browser_raster_layer.png">themes/classic/grass_browser_raster_layer.png</file>
54-
<file alias="grass_browser_vector_layer.png">themes/classic/grass_browser_vector_layer.png</file>
55-
<file alias="grass_clear_input.png">themes/classic/grass_clear_input.png</file>
56-
<file alias="grass_close_edit.png">themes/classic/grass_close_edit.png</file>
57-
<file alias="grass_close_mapset.png">themes/classic/grass_close_mapset.png</file>
58-
<file alias="grass_copy_map.png">themes/classic/grass_copy_map.png</file>
59-
<file alias="grass_delete_line.png">themes/classic/grass_delete_line.png</file>
60-
<file alias="grass_delete_map.png">themes/classic/grass_delete_map.png</file>
61-
<file alias="grass_delete_vertex.png">themes/classic/grass_delete_vertex.png</file>
62-
<file alias="grass_edit_attributes.png">themes/classic/grass_edit_attributes.png</file>
63-
<file alias="grass_edit.png">themes/classic/grass_edit.png</file>
64-
<file alias="grass_module_error.png">themes/classic/grass_module_error.png</file>
65-
<file alias="grass_module_warning.png">themes/classic/grass_module_warning.png</file>
66-
<file alias="grass_move_line.png">themes/classic/grass_move_line.png</file>
67-
<file alias="grass_move_vertex.png">themes/classic/grass_move_vertex.png</file>
68-
<file alias="grass_new_boundary.png">themes/classic/grass_new_boundary.png</file>
69-
<file alias="grass_new_centroid.png">themes/classic/grass_new_centroid.png</file>
70-
<file alias="grass_new_line.png">themes/classic/grass_new_line.png</file>
71-
<file alias="grass_new_mapset.png">themes/classic/grass_new_mapset.png</file>
72-
<file alias="grass_new_point.png">themes/classic/grass_new_point.png</file>
73-
<file alias="grass_new_vector_layer.png">themes/classic/grass_new_vector_layer.png</file>
74-
<file alias="grass_open_mapset.png">themes/classic/grass_open_mapset.png</file>
75-
<file alias="grass_refresh.png">themes/classic/grass_refresh.png</file>
76-
<file alias="grass_region_edit.png">themes/classic/grass_region_edit.png</file>
77-
<file alias="grass_region.png">themes/classic/grass_region.png</file>
78-
<file alias="grass_rename_map.png">themes/classic/grass_rename_map.png</file>
79-
<file alias="grass_set_region.png">themes/classic/grass_set_region.png</file>
80-
<file alias="grass_shell.png">themes/classic/grass_shell.png</file>
81-
<file alias="grass_split_line.png">themes/classic/grass_split_line.png</file>
82-
<file alias="grass_tools.png">themes/classic/grass_tools.png</file>
83-
<file alias="mapcalc_add_connection.png">themes/classic/mapcalc_add_connection.png</file>
84-
<file alias="mapcalc_add_constant.png">themes/classic/mapcalc_add_constant.png</file>
85-
<file alias="mapcalc_add_function.png">themes/classic/mapcalc_add_function.png</file>
86-
<file alias="mapcalc_add_map.png">themes/classic/mapcalc_add_map.png</file>
87-
<file alias="mapcalc_delete.png">themes/classic/mapcalc_delete.png</file>
88-
<file alias="mapcalc_open.png">themes/classic/mapcalc_open.png</file>
89-
<file alias="mapcalc_save_as.png">themes/classic/mapcalc_save_as.png</file>
90-
<file alias="mapcalc_save.png">themes/classic/mapcalc_save.png</file>
91-
<file alias="mapcalc_select.png">themes/classic/mapcalc_select.png</file>
92-
<file alias="world.png">themes/classic/world.png</file>
48+
<qresource prefix="/images/themes/classic/grass">
49+
<file alias="grass_add_map.png">themes/classic/grass_add_map.png</file>
50+
<file alias="grass_add_raster.png">themes/classic/grass_add_raster.png</file>
51+
<file alias="grass_add_vector.png">themes/classic/grass_add_vector.png</file>
52+
<file alias="grass_add_vertex.png">themes/classic/grass_add_vertex.png</file>
53+
<file alias="grass_browser_raster_layer.png">themes/classic/grass_browser_raster_layer.png</file>
54+
<file alias="grass_browser_vector_layer.png">themes/classic/grass_browser_vector_layer.png</file>
55+
<file alias="grass_clear_input.png">themes/classic/grass_clear_input.png</file>
56+
<file alias="grass_close_edit.png">themes/classic/grass_close_edit.png</file>
57+
<file alias="grass_close_mapset.png">themes/classic/grass_close_mapset.png</file>
58+
<file alias="grass_copy_map.png">themes/classic/grass_copy_map.png</file>
59+
<file alias="grass_delete_line.png">themes/classic/grass_delete_line.png</file>
60+
<file alias="grass_delete_map.png">themes/classic/grass_delete_map.png</file>
61+
<file alias="grass_delete_vertex.png">themes/classic/grass_delete_vertex.png</file>
62+
<file alias="grass_edit_attributes.png">themes/classic/grass_edit_attributes.png</file>
63+
<file alias="grass_edit.png">themes/classic/grass_edit.png</file>
64+
<file alias="grass_module_error.png">themes/classic/grass_module_error.png</file>
65+
<file alias="grass_module_warning.png">themes/classic/grass_module_warning.png</file>
66+
<file alias="grass_move_line.png">themes/classic/grass_move_line.png</file>
67+
<file alias="grass_move_vertex.png">themes/classic/grass_move_vertex.png</file>
68+
<file alias="grass_new_boundary.png">themes/classic/grass_new_boundary.png</file>
69+
<file alias="grass_new_centroid.png">themes/classic/grass_new_centroid.png</file>
70+
<file alias="grass_new_line.png">themes/classic/grass_new_line.png</file>
71+
<file alias="grass_new_mapset.png">themes/classic/grass_new_mapset.png</file>
72+
<file alias="grass_new_point.png">themes/classic/grass_new_point.png</file>
73+
<file alias="grass_new_vector_layer.png">themes/classic/grass_new_vector_layer.png</file>
74+
<file alias="grass_open_mapset.png">themes/classic/grass_open_mapset.png</file>
75+
<file alias="grass_refresh.png">themes/classic/grass_refresh.png</file>
76+
<file alias="grass_region_edit.png">themes/classic/grass_region_edit.png</file>
77+
<file alias="grass_region.png">themes/classic/grass_region.png</file>
78+
<file alias="grass_rename_map.png">themes/classic/grass_rename_map.png</file>
79+
<file alias="grass_set_region.png">themes/classic/grass_set_region.png</file>
80+
<file alias="grass_shell.png">themes/classic/grass_shell.png</file>
81+
<file alias="grass_split_line.png">themes/classic/grass_split_line.png</file>
82+
<file alias="grass_tools.png">themes/classic/grass_tools.png</file>
83+
<file alias="mapcalc_add_connection.png">themes/classic/mapcalc_add_connection.png</file>
84+
<file alias="mapcalc_add_constant.png">themes/classic/mapcalc_add_constant.png</file>
85+
<file alias="mapcalc_add_function.png">themes/classic/mapcalc_add_function.png</file>
86+
<file alias="mapcalc_add_map.png">themes/classic/mapcalc_add_map.png</file>
87+
<file alias="mapcalc_delete.png">themes/classic/mapcalc_delete.png</file>
88+
<file alias="mapcalc_open.png">themes/classic/mapcalc_open.png</file>
89+
<file alias="mapcalc_save_as.png">themes/classic/mapcalc_save_as.png</file>
90+
<file alias="mapcalc_save.png">themes/classic/mapcalc_save.png</file>
91+
<file alias="mapcalc_select.png">themes/classic/mapcalc_select.png</file>
92+
<file alias="world.png">themes/classic/world.png</file>
9393
</qresource>
94-
<qresource prefix="/images/themes/gis/grass" >
95-
<file alias="grass_add_raster.png">themes/gis/grass_add_raster.png</file>
96-
<file alias="grass_add_vector.png">themes/gis/grass_add_vector.png</file>
97-
<file alias="grass_close_mapset.png">themes/gis/grass_close_mapset.png</file>
98-
<file alias="grass_new_mapset.png">themes/gis/grass_new_mapset.png</file>
99-
<file alias="grass_open_mapset.png">themes/gis/grass_open_mapset.png</file>
100-
<file alias="grass_new_vector_layer.png">themes/gis/grass_new_vector_layer.png</file>
101-
<file alias="grass_region_edit.png">themes/gis/grass_region_edit.png</file>
102-
<file alias="grass_region.png">themes/gis/grass_region.png</file>
103-
<file alias="grass_edit.png">themes/gis/grass_edit.png</file>
104-
<file alias="grass_tools.png">themes/gis/grass_tools.png</file>
94+
<qresource prefix="/images/themes/gis/grass">
95+
<file alias="grass_add_raster.png">themes/gis/grass_add_raster.png</file>
96+
<file alias="grass_add_vector.png">themes/gis/grass_add_vector.png</file>
97+
<file alias="grass_close_mapset.png">themes/gis/grass_close_mapset.png</file>
98+
<file alias="grass_new_mapset.png">themes/gis/grass_new_mapset.png</file>
99+
<file alias="grass_open_mapset.png">themes/gis/grass_open_mapset.png</file>
100+
<file alias="grass_new_vector_layer.png">themes/gis/grass_new_vector_layer.png</file>
101+
<file alias="grass_region_edit.png">themes/gis/grass_region_edit.png</file>
102+
<file alias="grass_region.png">themes/gis/grass_region.png</file>
103+
<file alias="grass_edit.png">themes/gis/grass_edit.png</file>
104+
<file alias="grass_tools.png">themes/gis/grass_tools.png</file>
105+
<file alias="grass_add_vertex.png">themes/gis/grass_add_vertex.png</file>
106+
<file alias="grass_close_edit.png">themes/gis/grass_close_edit.png</file>
107+
<file alias="grass_delete_line.png">themes/gis/grass_delete_line.png</file>
108+
<file alias="grass_delete_vertex.png">themes/gis/grass_delete_vertex.png</file>
109+
<file alias="grass_edit_attributes.png">themes/gis/grass_edit_attributes.png</file>
110+
<file alias="grass_move_line.png">themes/gis/grass_move_line.png</file>
111+
<file alias="grass_move_vertex.png">themes/gis/grass_move_vertex.png</file>
112+
<file alias="grass_new_boundary.png">themes/gis/grass_new_boundary.png</file>
113+
<file alias="grass_new_centroid.png">themes/gis/grass_new_centroid.png</file>
114+
<file alias="grass_new_line.png">themes/gis/grass_new_line.png</file>
115+
<file alias="grass_new_point.png">themes/gis/grass_new_point.png</file>
116+
<file alias="grass_split_line.png">themes/gis/grass_split_line.png</file>
105117
</qresource>
106118
</RCC>
107-

src/plugins/grass/themes/CMakeLists.txt

-3
This file was deleted.

src/plugins/grass/themes/classic/CMakeLists.txt

-5
This file was deleted.

src/plugins/grass/themes/default/CMakeLists.txt

-5
This file was deleted.

src/plugins/grass/themes/gis/CMakeLists.txt

-5
This file was deleted.

0 commit comments

Comments
 (0)