move MapServer export and OSM plugins to Web menu

Author: alexbruy

python/plugins/mapserver_export/__init__.py

@@ -24,7 +24,7 @@ def name():
 def description():
   return "Export a saved QGIS project file to a MapServer map file"
 def category():
-  return "Plugins"
+  return "Web"
 def version():
   return "Version 0.4.3"
 def qgisMinimumVersion():

python/plugins/mapserver_export/mapserverexport.py

@@ -62,13 +62,13 @@ def initGui(self):
     QObject.connect(self.action, SIGNAL("triggered()"), self.run) 
     QObject.connect(self.iface, SIGNAL("currentThemeChanged ( QString )"), self.setCurrentTheme)
     # Add toolbar button and menu item
-    self.iface.addToolBarIcon(self.action)
-    self.iface.addPluginToMenu("&MapServer Export...", self.action)
+    self.iface.addWebToolBarIcon(self.action)
+    self.iface.addPluginToWebMenu("&MapServer Export...", self.action)
 
   def unload(self):
     # Remove the plugin menu item and icon
-    self.iface.removePluginMenu("&MapServer Export...",self.action)
-    self.iface.removeToolBarIcon(self.action)
+    self.iface.removePluginWebMenu("&MapServer Export...",self.action)
+    self.iface.removeWebToolBarIcon(self.action)
 
   # run method that performs all the real work
   def run(self): 

python/plugins/osm/OsmPlugin.py

@@ -116,12 +116,12 @@ def initGui(self):
         self.toolBar.addAction(self.actionSave)
 
         # populate plugins menu
-        self.iface.addPluginToMenu("&OpenStreetMap", self.actionLoad)
-        self.iface.addPluginToMenu("&OpenStreetMap", self.actionDockWidget)
-        self.iface.addPluginToMenu("&OpenStreetMap", self.actionDownload)
-        self.iface.addPluginToMenu("&OpenStreetMap", self.actionUpload)
-        self.iface.addPluginToMenu("&OpenStreetMap", self.actionImport)
-        self.iface.addPluginToMenu("&OpenStreetMap", self.actionSave)
+        self.iface.addPluginToWebMenu("&OpenStreetMap", self.actionLoad)
+        self.iface.addPluginToWebMenu("&OpenStreetMap", self.actionDockWidget)
+        self.iface.addPluginToWebMenu("&OpenStreetMap", self.actionDownload)
+        self.iface.addPluginToWebMenu("&OpenStreetMap", self.actionUpload)
+        self.iface.addPluginToWebMenu("&OpenStreetMap", self.actionImport)
+        self.iface.addPluginToWebMenu("&OpenStreetMap", self.actionSave)
 
         # create manager of sqlite database(-s)
         self.dbm=OsmDatabaseManager(self)
@@ -153,12 +153,12 @@ def unload(self):
         self.dockWidget.mapTool=None
 
         # remove the plugin menu items
-        self.iface.removePluginMenu("&OpenStreetMap",self.actionLoad)
-        self.iface.removePluginMenu("&OpenStreetMap",self.actionSave)
-        self.iface.removePluginMenu("&OpenStreetMap",self.actionDownload)
-        self.iface.removePluginMenu("&OpenStreetMap",self.actionUpload)
-        self.iface.removePluginMenu("&OpenStreetMap",self.actionImport)
-        self.iface.removePluginMenu("&OpenStreetMap",self.actionDockWidget)
+        self.iface.removePluginWebMenu("&OpenStreetMap",self.actionLoad)
+        self.iface.removePluginWebMenu("&OpenStreetMap",self.actionSave)
+        self.iface.removePluginWebMenu("&OpenStreetMap",self.actionDownload)
+        self.iface.removePluginWebMenu("&OpenStreetMap",self.actionUpload)
+        self.iface.removePluginWebMenu("&OpenStreetMap",self.actionImport)
+        self.iface.removePluginWebMenu("&OpenStreetMap",self.actionDockWidget)
 
         self.dockWidget.close()
         if self.dockWidget.rubBand:

python/plugins/osm/__init__.py

@@ -39,7 +39,7 @@ def category():
     @return category of this plugin.
     """
 
-    return "Plugins"
+    return "Web"
 
 
 def version():