[GRASS-SVN] r44609 - in grass/branches/releasebranch_6_4/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-12-15 13:51:16 -0800 (Wed, 15 Dec 2010)
New Revision: 44609

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py
   grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py
Log:
quick fix, #1233 (layer manager and mapdisplay - startup position)
(merge r44607 from trunk)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py	2010-12-15 21:43:23 UTC (rev 44608)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py	2010-12-15 21:51:16 UTC (rev 44609)
@@ -62,7 +62,7 @@
         # key/value separator
         #
         self.sep = ';'
-
+        
         try:
             projFile = utils.PathJoin(os.environ["GRASS_PROJSHARE"], 'epsg')
         except KeyError:
@@ -599,6 +599,11 @@
                     },
                 },
             }
+
+        # quick fix, http://trac.osgeo.org/grass/ticket/1233
+        # TODO
+        if sys.platform == 'darwin':
+            self.defaultSettings['general']['defWindowPos']['enabled'] = False
         
         #
         # user settings

Modified: grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py	2010-12-15 21:43:23 UTC (rev 44608)
+++ grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py	2010-12-15 21:51:16 UTC (rev 44609)
@@ -150,7 +150,7 @@
         wx.CallAfter(self.notebook.SetSelection, 0)
         
         # use default window layout ?
-        if UserSettings.Get(group='general', key='defWindowPos', subkey='enabled') is True:
+        if UserSettings.Get(group='general', key='defWindowPos', subkey='enabled'):
             dim = UserSettings.Get(group='general', key='defWindowPos', subkey='dim')
             try:
                x, y = map(int, dim.split(',')[0:2])
@@ -1153,7 +1153,7 @@
         self.curr_page.maptree.Layout()
         
         # use default window layout
-        if UserSettings.Get(group='general', key='defWindowPos', subkey='enabled') is True:
+        if UserSettings.Get(group='general', key='defWindowPos', subkey='enabled'):
             dim = UserSettings.Get(group='general', key='defWindowPos', subkey='dim')
             idx = 4 + self.disp_idx * 4
             try: