Skip to content

Commit f84ae5a

Browse files
author
timlinux
committed
Icon updates:
- use png instead of xpm for grass icons - put grass icons in a qt resource file - updated grass cmakelist accordingly - updated other non grass plugins Please note these icons are not final and some changes to them will be checked in over the next 24 hours. git-svn-id: http://svn.osgeo.org/qgis/trunk@8060 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 275160f commit f84ae5a

29 files changed

+891
-1354
lines changed
400 Bytes
Loading
1.1 KB
Loading
820 Bytes
Loading
808 Bytes
Loading
1.08 KB
Loading
434 Bytes
Loading

images/themes/default/overviewMaster.svg

Lines changed: 878 additions & 93 deletions
Loading

src/plugins/grass/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ SET (GRASS_PLUGIN_MOC_HDRS
6969
qgsgrassutils.h
7070
)
7171

72-
#SET (GRASS_PLUGIN_RCCS qgsgps_plugin.qrc)
72+
SET (GRASS_PLUGIN_RCCS qgsgrass_plugin.qrc)
7373

7474

7575
########################################################
@@ -79,7 +79,7 @@ QT4_WRAP_UI (GRASS_PLUGIN_UIS_H ${GRASS_PLUGIN_UIS})
7979

8080
QT4_WRAP_CPP (GRASS_PLUGIN_MOC_SRCS ${GRASS_PLUGIN_MOC_HDRS})
8181

82-
#QT4_ADD_RESOURCES(GRASS_PLUGIN_RCC_SRCS ${GRASS_PLUGIN_RCCS})
82+
QT4_ADD_RESOURCES(GRASS_PLUGIN_RCC_SRCS ${GRASS_PLUGIN_RCCS})
8383

8484
########################################################
8585
# deal with warnings
@@ -98,7 +98,7 @@ ENDIF (NOT MSVC)
9898
########################################################
9999
# build lib
100100

101-
ADD_LIBRARY (grassplugin MODULE ${GRASS_PLUGIN_SRCS} ${GRASS_PLUGIN_MOC_SRCS} ${GRASS_PLUGIN_UIS_H})
101+
ADD_LIBRARY (grassplugin MODULE ${GRASS_PLUGIN_SRCS} ${GRASS_PLUGIN_MOC_SRCS} ${GRASS_PLUGIN_UIS_H} ${GRASS_PLUGIN_RCC_SRCS})
102102

103103
INCLUDE_DIRECTORIES(
104104
.

src/plugins/grass/add_raster.png

2.03 KB
Loading

src/plugins/grass/add_raster.xpm

Lines changed: 0 additions & 187 deletions
This file was deleted.

src/plugins/grass/add_vector.png

2.19 KB
Loading

src/plugins/grass/add_vector.xpm

Lines changed: 0 additions & 112 deletions
This file was deleted.
1.84 KB
Loading

0 commit comments

Comments
 (0)