python/gui/qgisinterface.sip

@@ -64,6 +64,25 @@ class QgisInterface : QObject
     virtual int addToolBarIcon(QAction *qAction) =0;
     //! Remove an action (icon) from the plugin toolbar
     virtual void removeToolBarIcon(QAction *qAction) = 0;
+    //! Add an icon to the Raster toolbar
+    //! @note added in 2.0
+    virtual int addRasterToolBarIcon(QAction *qAction) =0;
+    //! Remove an action (icon) from the Raster toolbar
+    //! @note added in 2.0
+    virtual void removeRasterToolBarIcon(QAction *qAction) = 0;
+    //! Add an icon to the Vector toolbar
+    //! @note added in 2.0
+    virtual int addVectorToolBarIcon(QAction *qAction) =0;
+    //! Remove an action (icon) from the Vector toolbar
+    //! @note added in 2.0
+    virtual void removeVectorToolBarIcon(QAction *qAction) = 0;
+    //! Add an icon to the Database toolbar
+    //! @note added in 2.0
+    virtual int addDatabaseToolBarIcon(QAction *qAction) =0;
+    //! Remove an action (icon) from the Database toolbar
+    //! @note added in 2.0
+    virtual void removeDatabaseToolBarIcon(QAction *qAction) = 0;
+
     //! Add toolbar with specified name
     virtual QToolBar* addToolBar(QString name)=0 /Factory/;
 
@@ -115,6 +134,26 @@ class QgisInterface : QObject
       */
     virtual void removePluginDatabaseMenu(QString name, QAction* action)=0;
 
+    /** Add action to the Raster menu
+      * @note added in 2.0
+      */
+    virtual void addPluginToRasterMenu(QString name, QAction* action)=0;
+
+    /** Remove action from the Raster menu
+      * @note added in 2.0
+      */
+    virtual void removePluginRasterMenu(QString name, QAction* action)=0;
+
+    /** Add action to the Vector menu
+      * @note added in 2.0
+      */
+    virtual void addPluginToVectorMenu(QString name, QAction* action)=0;
+
+    /** Remove action from the Vector menu
+      * @note added in 2.0
+      */
+    virtual void removePluginVectorMenu(QString name, QAction* action)=0;
+
     /** Add a dock widget to the main window
        @note added in 1.7 */
     virtual void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget )=0;
@@ -167,6 +206,10 @@ class QgisInterface : QObject
     virtual QMenu *layerMenu() = 0;
     virtual QMenu *settingsMenu() = 0;
     virtual QMenu *pluginMenu() = 0;
+    virtual QMenu *rasterMenu() = 0;
+    //** @note added in 2.0
+    virtual QMenu *vectorMenu() = 0;
+    virtual QMenu *databaseMenu() = 0;
     virtual QMenu *firstRightStandardMenu() = 0;
     virtual QMenu *windowMenu() = 0;
     virtual QMenu *helpMenu() = 0;
@@ -181,6 +224,10 @@ class QgisInterface : QObject
     virtual QToolBar *pluginToolBar() = 0;
     virtual QToolBar *helpToolBar() = 0;
     virtual QToolBar *rasterToolBar() = 0;
+    //** @note added in 2.0
+    virtual QToolBar *vectorToolBar() = 0;
+    //** @note added in 2.0
+    virtual QToolBar *databaseToolBar() = 0;
 
     //! File menu actions
     virtual QAction *actionNewProject() = 0;

python/plugins/GdalTools/__init__.py

@@ -21,6 +21,8 @@ def name():
   return "GdalTools"
 def description():
   return "Integrate gdal tools into qgis"
+def category():
+  return "Raster"
 def version():
   return "Version 1.2.29"
 def qgisMinimumVersion():

python/plugins/fTools/__init__.py

@@ -29,23 +29,26 @@
 #---------------------------------------------------------------------
 
 def name():
-	return "fTools"
+  return "fTools"
 
 def description():
-	return "Tools for vector data analysis and management"
+  return "Tools for vector data analysis and management"
+
+def category():
+  return "Vector"
 
 def version():
-	return "0.6.1"
-  
+  return "0.6.1"
+
 def qgisMinimumVersion():
-	return "1.4"
+  return "1.4"
 
 def icon():
-	return "icons/logo_small.png"
-	
+  return "icons/logo_small.png"
+
 def authorName():
-	return "Carson J. Q. Farmer"
+  return "Carson J. Q. Farmer"
 
 def classFactory( iface ):
-	from fTools import fToolsPlugin
-	return fToolsPlugin( iface )
+  from fTools import fToolsPlugin
+  return fToolsPlugin( iface )

python/plugins/fTools/fTools.py

@@ -123,8 +123,6 @@ def initGui(self):
       + QCoreApplication.translate("fTools", "This version of fTools requires at least QGIS version 1.0.0\nPlugin will not be enabled."))
       return None
     QObject.connect(self.iface, SIGNAL("currentThemeChanged (QString)"), self.updateThemeIcons)
-    self.menu = QMenu()
-    self.menu.setTitle(QCoreApplication.translate("fTools", "Vect&or"))
 
     self.analysisMenu = QMenu(QCoreApplication.translate("fTools", "&Analysis Tools"))
     self.distMatrix = QAction(QCoreApplication.translate("fTools", "Distance matrix"),self.iface.mainWindow())
@@ -187,16 +185,70 @@ def initGui(self):
     self.dataManageMenu.addActions([self.define, self.spatJoin, self.splitVect, self.mergeShapes, self.spatialIndex])
     self.updateThemeIcons("theme")
 
-    self.menu.addMenu(self.analysisMenu)
-    self.menu.addMenu(self.researchMenu)
-    self.menu.addMenu(self.geoMenu)
-    self.menu.addMenu(self.conversionMenu)
-    self.menu.addMenu(self.dataManageMenu)
-
-    menu_bar = self.iface.mainWindow().menuBar()
-    actions = menu_bar.actions()
-    lastAction = actions[len(actions) - 1]
-    menu_bar.insertMenu(lastAction, self.menu)
+    self.menu = None
+    if hasattr(self.iface, "addPluginToVectorMenu"):
+      menuName = QCoreApplication.translate("fTools", "&Analysis Tools")
+      self.iface.addPluginToVectorMenu(menuName, self.distMatrix)
+      self.iface.addPluginToVectorMenu(menuName, self.sumLines)
+      self.iface.addPluginToVectorMenu(menuName, self.pointsPoly)
+      self.iface.addPluginToVectorMenu(menuName, self.listUnique)
+      self.iface.addPluginToVectorMenu(menuName, self.compStats)
+      self.iface.addPluginToVectorMenu(menuName, self.nearestNeigh)
+      self.iface.addPluginToVectorMenu(menuName, self.meanCoords)
+      self.iface.addPluginToVectorMenu(menuName, self.intLines)
+
+      menuName = QCoreApplication.translate("fTools", "&Research Tools")
+      self.iface.addPluginToVectorMenu(menuName, self.randSel)
+      self.iface.addPluginToVectorMenu(menuName, self.randSub)
+      self.iface.addPluginToVectorMenu(menuName, self.randPoints)
+      self.iface.addPluginToVectorMenu(menuName, self.regPoints)
+      self.iface.addPluginToVectorMenu(menuName, self.vectGrid)
+      self.iface.addPluginToVectorMenu(menuName, self.selectLocation)
+      self.iface.addPluginToVectorMenu(menuName, self.layerExtent)
+
+      menuName = QCoreApplication.translate("fTools", "&Geoprocessing Tools")
+      self.iface.addPluginToVectorMenu(menuName, self.minConvex)
+      self.iface.addPluginToVectorMenu(menuName, self.dynaBuffer)
+      self.iface.addPluginToVectorMenu(menuName, self.intersect)
+      self.iface.addPluginToVectorMenu(menuName, self.union)
+      self.iface.addPluginToVectorMenu(menuName, self.symDifference)
+      self.iface.addPluginToVectorMenu(menuName, self.clip)
+      self.iface.addPluginToVectorMenu(menuName, self.erase)
+      self.iface.addPluginToVectorMenu(menuName, self.dissolve)
+
+      menuName = QCoreApplication.translate("fTools", "G&eometry Tools")
+      self.iface.addPluginToVectorMenu(menuName, self.checkGeom)
+      self.iface.addPluginToVectorMenu(menuName, self.compGeo)
+      self.iface.addPluginToVectorMenu(menuName, self.centroids)
+      self.iface.addPluginToVectorMenu(menuName, self.delaunay)
+      self.iface.addPluginToVectorMenu(menuName, self.voronoi)
+      self.iface.addPluginToVectorMenu(menuName, self.simplify)
+      self.iface.addPluginToVectorMenu(menuName, self.densify)
+      self.iface.addPluginToVectorMenu(menuName, self.multiToSingle)
+      self.iface.addPluginToVectorMenu(menuName, self.singleToMulti)
+      self.iface.addPluginToVectorMenu(menuName, self.polysToLines)
+      self.iface.addPluginToVectorMenu(menuName, self.linesToPolys)
+      self.iface.addPluginToVectorMenu(menuName, self.extNodes)
+
+      menuName = QCoreApplication.translate("fTools", "&Data Management Tools")
+      self.iface.addPluginToVectorMenu(menuName, self.define)
+      self.iface.addPluginToVectorMenu(menuName, self.spatJoin)
+      self.iface.addPluginToVectorMenu(menuName, self.splitVect)
+      self.iface.addPluginToVectorMenu(menuName, self.mergeShapes)
+      self.iface.addPluginToVectorMenu(menuName, self.spatialIndex)
+    else:
+      self.menu = QMenu()
+      self.menu.setTitle(QCoreApplication.translate("fTools", "Vect&or"))
+      self.menu.addMenu(self.analysisMenu)
+      self.menu.addMenu(self.researchMenu)
+      self.menu.addMenu(self.geoMenu)
+      self.menu.addMenu(self.conversionMenu)
+      self.menu.addMenu(self.dataManageMenu)
+
+      menu_bar = self.iface.mainWindow().menuBar()
+      actions = menu_bar.actions()
+      lastAction = actions[len(actions) - 1]
+      menu_bar.insertMenu(lastAction, self.menu)
 
     QObject.connect(self.distMatrix, SIGNAL("triggered()"), self.dodistMatrix)
     QObject.connect(self.sumLines, SIGNAL("triggered()"), self.dosumLines)
@@ -244,7 +296,58 @@ def initGui(self):
     QObject.connect(self.spatialIndex, SIGNAL("triggered()"), self.doSpatIndex)
 
   def unload(self):
-    pass
+    if self.menu == None:
+      menuName = QCoreApplication.translate("fTools", "&Analysis Tools")
+      self.iface.removePluginVectorMenu(menuName, self.distMatrix)
+      self.iface.removePluginVectorMenu(menuName, self.sumLines)
+      self.iface.removePluginVectorMenu(menuName, self.pointsPoly)
+      self.iface.removePluginVectorMenu(menuName, self.listUnique)
+      self.iface.removePluginVectorMenu(menuName, self.compStats)
+      self.iface.removePluginVectorMenu(menuName, self.nearestNeigh)
+      self.iface.removePluginVectorMenu(menuName, self.meanCoords)
+      self.iface.removePluginVectorMenu(menuName, self.intLines)
+
+      menuName = QCoreApplication.translate("fTools", "&Research Tools")
+      self.iface.removePluginVectorMenu(menuName, self.randSel)
+      self.iface.removePluginVectorMenu(menuName, self.randSub)
+      self.iface.removePluginVectorMenu(menuName, self.randPoints)
+      self.iface.removePluginVectorMenu(menuName, self.regPoints)
+      self.iface.removePluginVectorMenu(menuName, self.vectGrid)
+      self.iface.removePluginVectorMenu(menuName, self.selectLocation)
+      self.iface.removePluginVectorMenu(menuName, self.layerExtent)
+
+      menuName = QCoreApplication.translate("fTools", "&Geoprocessing Tools")
+      self.iface.removePluginVectorMenu(menuName, self.minConvex)
+      self.iface.removePluginVectorMenu(menuName, self.dynaBuffer)
+      self.iface.removePluginVectorMenu(menuName, self.intersect)
+      self.iface.removePluginVectorMenu(menuName, self.union)
+      self.iface.removePluginVectorMenu(menuName, self.symDifference)
+      self.iface.removePluginVectorMenu(menuName, self.clip)
+      self.iface.removePluginVectorMenu(menuName, self.erase)
+      self.iface.removePluginVectorMenu(menuName, self.dissolve)
+
+      menuName = QCoreApplication.translate("fTools", "G&eometry Tools")
+      self.iface.removePluginVectorMenu(menuName, self.checkGeom)
+      self.iface.removePluginVectorMenu(menuName, self.compGeo)
+      self.iface.removePluginVectorMenu(menuName, self.centroids)
+      self.iface.removePluginVectorMenu(menuName, self.delaunay)
+      self.iface.removePluginVectorMenu(menuName, self.voronoi)
+      self.iface.removePluginVectorMenu(menuName, self.simplify)
+      self.iface.removePluginVectorMenu(menuName, self.densify)
+      self.iface.removePluginVectorMenu(menuName, self.multiToSingle)
+      self.iface.removePluginVectorMenu(menuName, self.singleToMulti)
+      self.iface.removePluginVectorMenu(menuName, self.polysToLines)
+      self.iface.removePluginVectorMenu(menuName, self.linesToPolys)
+      self.iface.removePluginVectorMenu(menuName, self.extNodes)
+
+      menuName = QCoreApplication.translate("fTools", "&Data Management Tools")
+      self.iface.removePluginVectorMenu(menuName, self.define)
+      self.iface.removePluginVectorMenu(menuName, self.spatJoin)
+      self.iface.removePluginVectorMenu(menuName, self.splitVect)
+      self.iface.removePluginVectorMenu(menuName, self.mergeShapes)
+      self.iface.removePluginVectorMenu(menuName, self.spatialIndex)
+    else:
+      pass
 
   def doSimplify(self):
     d = doSimplify.Dialog(self.iface, 1)

python/plugins/mapserver_export/__init__.py

@@ -19,19 +19,21 @@
  This script initializes the plugin, making it known to QGIS.
 """
 
-def name(): 
-  return "MapServer Export" 
+def name():
+  return "MapServer Export"
 def description():
   return "Export a saved QGIS project file to a MapServer map file"
-def version(): 
-  return "Version 0.4.3" 
-def qgisMinimumVersion(): 
+def category():
+  return "Plugins"
+def version():
+  return "Version 0.4.3"
+def qgisMinimumVersion():
   return "1.0"
 def icon():
   return "mapserver_export.png"
 def authorName():
   return "Gary E. Sherman"
-def classFactory(iface): 
+def classFactory(iface):
   # load MapServerExport class from file mapserverexport.py
-  from mapserverexport import MapServerExport 
-  return MapServerExport(iface) 
+  from mapserverexport import MapServerExport
+  return MapServerExport(iface)

python/plugins/osm/__init__.py

@@ -33,6 +33,15 @@ def description():
     return "Viewer and editor for OpenStreetMap data"
 
 
+def category():
+    """Function returns category of this plugin.
+
+    @return category of this plugin.
+    """
+
+    return "Plugins"
+
+
 def version():
     """Function returns version of this plugin.
 
@@ -64,5 +73,5 @@ def classFactory(iface):
 
     from OsmPlugin import OsmPlugin
     # return object of our plugin with reference to QGIS interface as the only argument
-    return OsmPlugin(iface) 
+    return OsmPlugin(iface)
 

python/plugins/plugin_installer/__init__.py

@@ -20,6 +20,9 @@ def version():
 def description():
   return "Downloads and installs QGIS python plugins"
 
+def category():
+  return "Plugins"
+
 def qgisMinimumVersion():
   return "1.0"