[GRASS-SVN] r54570 - in grass/trunk/gui/wxpython: core gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-01-08 01:48:06 -0800 (Tue, 08 Jan 2013)
New Revision: 54570

Modified:
   grass/trunk/gui/wxpython/core/utils.py
   grass/trunk/gui/wxpython/gui_core/gselect.py
Log:
wxGUI: add FileGDB to db formats


Modified: grass/trunk/gui/wxpython/core/utils.py
===================================================================
--- grass/trunk/gui/wxpython/core/utils.py	2013-01-08 09:34:42 UTC (rev 54569)
+++ grass/trunk/gui/wxpython/core/utils.py	2013-01-08 09:48:06 UTC (rev 54570)
@@ -720,7 +720,8 @@
                     'PostGIS WKT Raster driver',
                     'PostGIS Raster driver',
                     'CouchDB',
-                    'MSSQLSpatial'):
+                    'MSSQLSpatial',
+                    'FileGDB'):
             formats['database'].append(name)
         elif name in ('GeoJSON',
                       'OGC Web Coverage Service',

Modified: grass/trunk/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/gselect.py	2013-01-08 09:34:42 UTC (rev 54569)
+++ grass/trunk/gui/wxpython/gui_core/gselect.py	2013-01-08 09:48:06 UTC (rev 54570)
@@ -1309,6 +1309,7 @@
                                  dsnPro,
                                  GetFormats(writableOnly = dest)[fType]['protocol']],
                        'db-win' : { 'file'   : dsnDbFile,
+                                    'dir'    : dsnDir,
                                     'text'   : dsnDbText,
                                     'choice' : dsnDbChoice },
                        'native' : [_("Name:"), dsnDir, ''],
@@ -1819,8 +1820,10 @@
         else: # database
             if format in ('SQLite', 'Rasterlite'):
                 win = self.input['db-win']['file']
+            elif format in ('FileGDB'):
+                win = self.input['db-win']['dir']
             elif format in ('PostgreSQL', 'PostGIS WKT Raster driver',
-                            'PostGIS Raster driver', 'MSSQLSpatial'):
+                            'PostGIS Raster driver'):
                 win = self.input['db-win']['choice']
                 # try to get list of PG databases
                 db = RunCommand('db.databases', quiet = True, read = True,