[QGIS Commit] r8812 - branches/grass-tidyup-branch/src/plugins/grass
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Jul 17 18:04:38 EDT 2008
Author: timlinux
Date: 2008-07-17 18:04:38 -0400 (Thu, 17 Jul 2008)
New Revision: 8812
Added:
branches/grass-tidyup-branch/src/plugins/grass/grass_add_map.png
branches/grass-tidyup-branch/src/plugins/grass/grass_add_raster.png
branches/grass-tidyup-branch/src/plugins/grass/grass_add_vector.png
branches/grass-tidyup-branch/src/plugins/grass/grass_add_vertex.png
branches/grass-tidyup-branch/src/plugins/grass/grass_browser_raster_layer.png
branches/grass-tidyup-branch/src/plugins/grass/grass_browser_vector_layer.png
branches/grass-tidyup-branch/src/plugins/grass/grass_close_edit.png
branches/grass-tidyup-branch/src/plugins/grass/grass_copy_map.png
branches/grass-tidyup-branch/src/plugins/grass/grass_delete_line.png
branches/grass-tidyup-branch/src/plugins/grass/grass_delete_map.png
branches/grass-tidyup-branch/src/plugins/grass/grass_delete_vertex.png
branches/grass-tidyup-branch/src/plugins/grass/grass_edit_attributes.png
branches/grass-tidyup-branch/src/plugins/grass/grass_module_error.png
branches/grass-tidyup-branch/src/plugins/grass/grass_module_warning.png
branches/grass-tidyup-branch/src/plugins/grass/grass_move_line.png
branches/grass-tidyup-branch/src/plugins/grass/grass_move_vertex.png
branches/grass-tidyup-branch/src/plugins/grass/grass_new_boundary.png
branches/grass-tidyup-branch/src/plugins/grass/grass_new_centroid.png
branches/grass-tidyup-branch/src/plugins/grass/grass_new_line.png
branches/grass-tidyup-branch/src/plugins/grass/grass_new_point.png
branches/grass-tidyup-branch/src/plugins/grass/grass_refresh.png
branches/grass-tidyup-branch/src/plugins/grass/grass_rename_map.png
branches/grass-tidyup-branch/src/plugins/grass/grass_set_region.png
branches/grass-tidyup-branch/src/plugins/grass/grass_shell.png
branches/grass-tidyup-branch/src/plugins/grass/grass_split_line.png
branches/grass-tidyup-branch/src/plugins/grass/mapcalc_add_connection.png
branches/grass-tidyup-branch/src/plugins/grass/mapcalc_add_constant.png
branches/grass-tidyup-branch/src/plugins/grass/mapcalc_add_function.png
branches/grass-tidyup-branch/src/plugins/grass/mapcalc_add_map.png
branches/grass-tidyup-branch/src/plugins/grass/mapcalc_delete.png
branches/grass-tidyup-branch/src/plugins/grass/mapcalc_open.png
branches/grass-tidyup-branch/src/plugins/grass/mapcalc_save.png
branches/grass-tidyup-branch/src/plugins/grass/mapcalc_save_as.png
branches/grass-tidyup-branch/src/plugins/grass/mapcalc_select.png
Removed:
branches/grass-tidyup-branch/src/plugins/grass/images/
branches/grass-tidyup-branch/src/plugins/grass/themes/
Modified:
branches/grass-tidyup-branch/src/plugins/grass/CMakeLists.txt
branches/grass-tidyup-branch/src/plugins/grass/qgsgrass_plugin.qrc
branches/grass-tidyup-branch/src/plugins/grass/qgsgrassplugin.cpp
branches/grass-tidyup-branch/src/plugins/grass/qgsgrassplugin.h
Log:
Rearranged grass icons (this is a transitional commit - they will be put into images/ after this commit)
Modified: branches/grass-tidyup-branch/src/plugins/grass/CMakeLists.txt
===================================================================
--- branches/grass-tidyup-branch/src/plugins/grass/CMakeLists.txt 2008-07-17 21:40:23 UTC (rev 8811)
+++ branches/grass-tidyup-branch/src/plugins/grass/CMakeLists.txt 2008-07-17 22:04:38 UTC (rev 8812)
@@ -1,5 +1,5 @@
-SUBDIRS(config modules themes)
+SUBDIRS(config modules )
ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
ADD_DEFINITIONS(-DHAVE_OPENPTY=${HAVE_OPENPTY})
@@ -141,5 +141,5 @@
FILE (GLOB GMLS *.gml)
-INSTALL (FILES ${GMLS} images/world.png
+INSTALL (FILES ${GMLS}
DESTINATION ${QGIS_DATA_DIR}/grass)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_add_map.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_add_map.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_add_raster.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_add_raster.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_add_vector.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_add_vector.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_add_vertex.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_add_vertex.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_browser_raster_layer.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_browser_raster_layer.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_browser_vector_layer.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_browser_vector_layer.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_close_edit.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_close_edit.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_copy_map.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_copy_map.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_delete_line.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_delete_line.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_delete_map.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_delete_map.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_delete_vertex.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_delete_vertex.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_edit_attributes.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_edit_attributes.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_module_error.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_module_error.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_module_warning.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_module_warning.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_move_line.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_move_line.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_move_vertex.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_move_vertex.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_new_boundary.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_new_boundary.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_new_centroid.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_new_centroid.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_new_line.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_new_line.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_new_point.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_new_point.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_refresh.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_refresh.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_rename_map.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_rename_map.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_set_region.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_set_region.png)
===================================================================
(Binary files differ)
Added: branches/grass-tidyup-branch/src/plugins/grass/grass_shell.png
===================================================================
(Binary files differ)
Property changes on: branches/grass-tidyup-branch/src/plugins/grass/grass_shell.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: branches/grass-tidyup-branch/src/plugins/grass/grass_split_line.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/grass_split_line.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/mapcalc_add_connection.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/mapcalc_add_connection.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/mapcalc_add_constant.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/mapcalc_add_constant.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/mapcalc_add_function.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/mapcalc_add_function.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/mapcalc_add_map.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/mapcalc_add_map.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/mapcalc_delete.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/mapcalc_delete.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/mapcalc_open.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/mapcalc_open.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/mapcalc_save.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/mapcalc_save.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/mapcalc_save_as.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/mapcalc_save_as.png)
===================================================================
(Binary files differ)
Copied: branches/grass-tidyup-branch/src/plugins/grass/mapcalc_select.png (from rev 8807, branches/grass-tidyup-branch/src/plugins/grass/themes/default/mapcalc_select.png)
===================================================================
(Binary files differ)
Modified: branches/grass-tidyup-branch/src/plugins/grass/qgsgrass_plugin.qrc
===================================================================
--- branches/grass-tidyup-branch/src/plugins/grass/qgsgrass_plugin.qrc 2008-07-17 21:40:23 UTC (rev 8811)
+++ branches/grass-tidyup-branch/src/plugins/grass/qgsgrass_plugin.qrc 2008-07-17 22:04:38 UTC (rev 8812)
@@ -1,16 +1,50 @@
<RCC>
- <qresource prefix="/grass" >
- <file>add_raster.png</file>
- <file>add_vector.png</file>
- <file>clearInput.png</file>
- <file>grass_close_mapset.png</file>
- <file>grass_edit.png</file>
- <file>grass_new_mapset.png</file>
- <file>grass_new_vector_layer.png</file>
- <file>grass_open_mapset.png</file>
- <file>grass_region.png</file>
- <file>grass_region_edit.png</file>
- <file>grass_tools.png</file>
- <file>world.png</file>
- </qresource>
+ <qresource prefix="/grass" >
+ <file>add_raster.png</file>
+ <file>add_vector.png</file>
+ <file>clearInput.png</file>
+ <file>grass_add_map.png</file>
+ <file>grass_add_raster.png</file>
+ <file>grass_add_vector.png</file>
+ <file>grass_add_vertex.png</file>
+ <file>grass_browser_raster_layer.png</file>
+ <file>grass_browser_vector_layer.png</file>
+ <file>grass_close_edit.png</file>
+ <file>grass_close_mapset.png</file>
+ <file>grass_copy_map.png</file>
+ <file>grass_delete_line.png</file>
+ <file>grass_delete_map.png</file>
+ <file>grass_delete_vertex.png</file>
+ <file>grass_edit_attributes.png</file>
+ <file>grass_edit.png</file>
+ <file>grass_module_error.png</file>
+ <file>grass_module_warning.png</file>
+ <file>grass_move_line.png</file>
+ <file>grass_move_vertex.png</file>
+ <file>grass_new_boundary.png</file>
+ <file>grass_new_centroid.png</file>
+ <file>grass_new_line.png</file>
+ <file>grass_new_mapset.png</file>
+ <file>grass_new_point.png</file>
+ <file>grass_new_vector_layer.png</file>
+ <file>grass_open_mapset.png</file>
+ <file>grass_refresh.png</file>
+ <file>grass_region_edit.png</file>
+ <file>grass_region.png</file>
+ <file>grass_rename_map.png</file>
+ <file>grass_set_region.png</file>
+ <file>grass_shell.png</file>
+ <file>grass_split_line.png</file>
+ <file>grass_tools.png</file>
+ <file>mapcalc_add_connection.png</file>
+ <file>mapcalc_add_constant.png</file>
+ <file>mapcalc_add_function.png</file>
+ <file>mapcalc_add_map.png</file>
+ <file>mapcalc_delete.png</file>
+ <file>mapcalc_open.png</file>
+ <file>mapcalc_save_as.png</file>
+ <file>mapcalc_save.png</file>
+ <file>mapcalc_select.png</file>
+ <file>world.png</file>
+ </qresource>
</RCC>
Modified: branches/grass-tidyup-branch/src/plugins/grass/qgsgrassplugin.cpp
===================================================================
--- branches/grass-tidyup-branch/src/plugins/grass/qgsgrassplugin.cpp 2008-07-17 21:40:23 UTC (rev 8811)
+++ branches/grass-tidyup-branch/src/plugins/grass/qgsgrassplugin.cpp 2008-07-17 22:04:38 UTC (rev 8812)
@@ -158,8 +158,8 @@
tr("Add GRASS vector layer"), this);
mAddRasterAction = new QAction(QIcon(":/grass/add_raster.png"),
tr("Add GRASS raster layer"), this);
- //mOpenToolsAction = new QAction(QIcon(":/grass/grass_tools.png"),
- // tr("Open GRASS tools"), this);
+ mOpenShellAction = new QAction(QIcon(":/grass/grass_tools.png"),
+ tr("Open GRASS shell"), this);
mRegionAction = new QAction(QIcon(":/grass/grass_region.png"),
tr("Display Current Grass Region"), this);
@@ -173,7 +173,7 @@
mAddVectorAction->setWhatsThis(tr("Adds a GRASS vector layer to the map canvas"));
mAddRasterAction->setWhatsThis(tr("Adds a GRASS raster layer to the map canvas"));
- //mOpenToolsAction->setWhatsThis(tr("Open GRASS tools"));
+ mOpenShellAction->setWhatsThis(tr("Open GRASS shell"));
mRegionAction->setWhatsThis(tr("Displays the current GRASS region as a rectangle on the map canvas"));
mEditRegionAction->setWhatsThis(tr("Edit the current GRASS region"));
mEditAction->setWhatsThis(tr("Edit the currently selected GRASS vector layer."));
@@ -181,7 +181,7 @@
// Connect the action
connect(mAddVectorAction, SIGNAL(triggered()), this, SLOT(addVector()));
connect(mAddRasterAction, SIGNAL(triggered()), this, SLOT(addRaster()));
- //connect(mOpenToolsAction, SIGNAL(triggered()), this, SLOT(openTools()));
+ connect(mOpenShellAction, SIGNAL(triggered()), this, SLOT(openShell()));
connect(mEditAction, SIGNAL(triggered()), this, SLOT(edit()));
connect(mNewVectorAction, SIGNAL(triggered()), this, SLOT(newVector()));
connect(mRegionAction, SIGNAL(toggled(bool)), this, SLOT(switchRegion(bool)));
@@ -198,7 +198,7 @@
qGisInterface->addPluginMenu(tr("&GRASS"), mAddRasterAction);
qGisInterface->addPluginMenu(tr("&GRASS"), mNewVectorAction);
qGisInterface->addPluginMenu(tr("&GRASS"), mEditAction);
- //qGisInterface->addPluginMenu(tr("&GRASS"), mOpenToolsAction);
+ qGisInterface->addPluginMenu(tr("&GRASS"), mOpenShellAction);
qGisInterface->addPluginMenu(tr("&GRASS"), mRegionAction);
qGisInterface->addPluginMenu(tr("&GRASS"), mEditRegionAction);
@@ -216,7 +216,7 @@
mAddRasterAction->addTo(toolBarPointer);
mNewVectorAction->addTo(toolBarPointer);
mEditAction->addTo(toolBarPointer);
- //mOpenToolsAction->addTo(toolBarPointer);
+ mOpenShellAction->addTo(toolBarPointer);
mRegionAction->addTo(toolBarPointer);
mEditRegionAction->addTo(toolBarPointer);
@@ -240,7 +240,7 @@
{
if ( !QgsGrass::activeMode() )
{
- //mOpenToolsAction->setEnabled(false);
+ //mOpenShellAction->setEnabled(false);
mRegionAction->setEnabled(false);
mEditRegionAction->setEnabled(false);
mRegionBand->reset();
@@ -257,7 +257,7 @@
}
else
{
- //mOpenToolsAction->setEnabled(true);
+ mOpenShellAction->setEnabled(true);
mRegionAction->setEnabled(true);
mEditRegionAction->setEnabled(true);
mCloseMapsetAction->setEnabled(true);
@@ -412,7 +412,10 @@
qGisInterface->addRasterLayer(uri, sel->map);
}
}
-
+void QgsGrassPlugin::openShell()
+{
+ QMessageBox::warning( 0, tr("Info"), tr("If I was a shell you would sea me...ssssshweessshh.") );
+}
// Open tools
void QgsGrassPlugin::openTools()
{
@@ -797,7 +800,7 @@
qGisInterface->removePluginMenu(tr("&GRASS"), mCloseMapsetAction);
qGisInterface->removePluginMenu(tr("&GRASS"), mAddVectorAction);
qGisInterface->removePluginMenu(tr("&GRASS"), mAddRasterAction);
- qGisInterface->removePluginMenu(tr("&GRASS"), mOpenToolsAction);
+ qGisInterface->removePluginMenu(tr("&GRASS"), mOpenShellAction);
qGisInterface->removePluginMenu(tr("&GRASS"), mRegionAction);
qGisInterface->removePluginMenu(tr("&GRASS"), mEditRegionAction);
qGisInterface->removePluginMenu(tr("&GRASS"), mEditAction);
@@ -808,7 +811,7 @@
delete mCloseMapsetAction;
delete mAddVectorAction;
delete mAddRasterAction;
- delete mOpenToolsAction;
+ delete mOpenShellAction;
delete mRegionAction;
delete mEditRegionAction;
delete mEditAction;
Modified: branches/grass-tidyup-branch/src/plugins/grass/qgsgrassplugin.h
===================================================================
--- branches/grass-tidyup-branch/src/plugins/grass/qgsgrassplugin.h 2008-07-17 21:40:23 UTC (rev 8811)
+++ branches/grass-tidyup-branch/src/plugins/grass/qgsgrassplugin.h 2008-07-17 22:04:38 UTC (rev 8812)
@@ -98,6 +98,8 @@
void redrawRegion(void);
//! Post render
void postRender(QPainter *);
+ //! Open GRASS shell
+ void openShell();
//! Open tools
void openTools(void);
//! Create new mapset
@@ -155,7 +157,7 @@
QAction *mCloseMapsetAction;
QAction *mAddVectorAction;
QAction *mAddRasterAction;
- QAction *mOpenToolsAction;
+ QAction *mOpenShellAction;
QAction *mEditRegionAction;
QAction *mEditAction;
QAction *mNewVectorAction;
More information about the QGIS-commit
mailing list