Skip to content

Commit f84ae5a

Browse files
author
timlinux
committedJan 28, 2008
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
·
ltr-3_40Before-merge-new_vector_api
1 parent 275160f commit f84ae5a

29 files changed

+891
-1354
lines changed
 

‎images/themes/default/mActionAddLayer.png

400 Bytes

Error rendering embedded code

Invalid image source.

‎images/themes/default/mActionAddNonDbLayer.png

1.1 KB

Error rendering embedded code

Invalid image source.

‎images/themes/default/mActionAddRasterLayer.png

820 Bytes

Error rendering embedded code

Invalid image source.

‎images/themes/default/mActionAddWmsLayer.png

808 Bytes

Error rendering embedded code

Invalid image source.

‎images/themes/default/mActionNewVectorLayer.png

1.08 KB

Error rendering embedded code

Invalid image source.

‎images/themes/default/mActionRemoveLayer.png

434 Bytes

Error rendering embedded code

Invalid image source.

‎images/themes/default/overviewMaster.svg

Lines changed: 878 additions & 93 deletions

Error rendering embedded code

Invalid image source.

‎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

Error rendering embedded code

Invalid image source.

‎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

Error rendering embedded code

Invalid image source.

‎src/plugins/grass/add_vector.xpm

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

‎src/plugins/grass/grass_close_mapset.png

1.84 KB

Error rendering embedded code

Invalid image source.

‎src/plugins/grass/grass_close_mapset.xpm

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

‎src/plugins/grass/grass_edit.png

1.88 KB

Error rendering embedded code

Invalid image source.

‎src/plugins/grass/grass_edit.xpm

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

‎src/plugins/grass/grass_new_mapset.png

1.85 KB

Error rendering embedded code

Invalid image source.

‎src/plugins/grass/grass_new_mapset.xpm

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

‎src/plugins/grass/grass_new_vector_layer.png

1.92 KB

Error rendering embedded code

Invalid image source.

‎src/plugins/grass/grass_new_vector_layer.xpm

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

‎src/plugins/grass/grass_open_mapset.png

1.51 KB

Error rendering embedded code

Invalid image source.

‎src/plugins/grass/grass_open_mapset.xpm

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

‎src/plugins/grass/grass_region.png

1.17 KB

Error rendering embedded code

Invalid image source.

‎src/plugins/grass/grass_region.xpm

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

‎src/plugins/grass/grass_region_edit.png

1.39 KB

Error rendering embedded code

Invalid image source.

‎src/plugins/grass/grass_region_edit.xpm

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

‎src/plugins/grass/grass_tools.png

2.52 KB

Error rendering embedded code

Invalid image source.

‎src/plugins/grass/grass_tools.xpm

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

‎src/plugins/grass/qgsgrassplugin.cpp

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,6 @@ extern "C" {
6767
#include "qgsgrassregion.h"
6868
#include "qgsgrassnewmapset.h"
6969

70-
// xpm for creating the toolbar icon
71-
#include "add_vector.xpm"
72-
#include "add_raster.xpm"
73-
#include "grass_tools.xpm"
74-
#include "grass_edit.xpm"
75-
#include "grass_region.xpm"
76-
#include "grass_region_edit.xpm"
77-
#include "grass_open_mapset.xpm"
78-
#include "grass_new_vector_layer.xpm"
79-
#include "grass_new_mapset.xpm"
80-
#include "grass_close_mapset.xpm"
8170
static const QString pluginVersion = QObject::tr("Version 0.1");
8271

8372
/**
@@ -155,26 +144,26 @@ void QgsGrassPlugin::initGui()
155144
mRegionBand->setZValue(20);
156145

157146
// Create the action for tool
158-
mOpenMapsetAction = new QAction(QIcon(icon_open_mapset), tr("Open mapset"), this );
159-
mNewMapsetAction = new QAction(QIcon(icon_new_mapset), tr("New mapset"), this );
160-
mCloseMapsetAction = new QAction(QIcon(icon_close_mapset), tr("Close mapset"), this );
147+
mOpenMapsetAction = new QAction(QIcon(":/grass/grass_open_mapset.png"), tr("Open mapset"), this );
148+
mNewMapsetAction = new QAction(QIcon(":/grass/grass_new_mapset.png"), tr("New mapset"), this );
149+
mCloseMapsetAction = new QAction(QIcon(":/grass/grass_close_mapset.png"), tr("Close mapset"), this );
161150

162-
mAddVectorAction = new QAction(QIcon(icon_add_vector),
151+
mAddVectorAction = new QAction(QIcon(":/grass/add_vector.png"),
163152
tr("Add GRASS vector layer"), this);
164-
mAddRasterAction = new QAction(QIcon(icon_add_raster),
153+
mAddRasterAction = new QAction(QIcon(":/grass/add_raster.png"),
165154
tr("Add GRASS raster layer"), this);
166-
mOpenToolsAction = new QAction(QIcon(icon_grass_tools),
155+
mOpenToolsAction = new QAction(QIcon(":/grass/grass_tools.png"),
167156
tr("Open GRASS tools"), this);
168157

169-
mRegionAction = new QAction(QIcon(icon_grass_region),
158+
mRegionAction = new QAction(QIcon(":/grass/grass_region.png"),
170159
tr("Display Current Grass Region"), this);
171160
mRegionAction->setCheckable(true);
172161

173-
mEditRegionAction = new QAction(QIcon(icon_grass_region_edit),
162+
mEditRegionAction = new QAction(QIcon(":/grass/grass_region_edit.png"),
174163
tr("Edit Current Grass Region"), this);
175-
mEditAction = new QAction(QIcon(icon_grass_edit),
164+
mEditAction = new QAction(QIcon(":/grass/grass_edit.png"),
176165
tr("Edit Grass Vector layer"), this);
177-
mNewVectorAction = new QAction(QIcon(icon_new_vector_layer),tr("Create new Grass Vector"), this);
166+
mNewVectorAction = new QAction(QIcon(":/grass/grass_new_vector_layer.png"),tr("Create new Grass Vector"), this);
178167

179168
mAddVectorAction->setWhatsThis(tr("Adds a GRASS vector layer to the map canvas"));
180169
mAddRasterAction->setWhatsThis(tr("Adds a GRASS raster layer to the map canvas"));

0 commit comments

Comments
 (0)
Please sign in to comment.