[GRASS-SVN] r67735 - in grass/branches/releasebranch_7_0/gui/wxpython: core mapdisp

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-02-06 04:01:11 -0800 (Sat, 06 Feb 2016)
New Revision: 67735

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/core/globalvar.py
   grass/branches/releasebranch_7_0/gui/wxpython/core/settings.py
   grass/branches/releasebranch_7_0/gui/wxpython/core/workspace.py
   grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py
Log:
wxGUI: fix windows layout (on gnome)
       (merge r67725 from trunk)


Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/globalvar.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/globalvar.py	2016-02-06 11:59:04 UTC (rev 67734)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/globalvar.py	2016-02-06 12:01:11 UTC (rev 67735)
@@ -3,7 +3,7 @@
 
 @brief Global variables used by wxGUI
 
-(C) 2007-2014 by the GRASS Development Team
+(C) 2007-2016 by the GRASS Development Team
 
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.
@@ -112,7 +112,7 @@
 DIALOG_LAYER_SIZE = (100, -1)
 DIALOG_COLOR_SIZE = (30, 30)
 
-MAP_WINDOW_SIZE = (800, 600)
+MAP_WINDOW_SIZE = (825, 600)
 
 GM_WINDOW_MIN_SIZE = (525, 400)
 # small for ms window which wraps the menu

Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/settings.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/settings.py	2016-02-06 11:59:04 UTC (rev 67734)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/settings.py	2016-02-06 12:01:11 UTC (rev 67735)
@@ -11,7 +11,7 @@
 from core.settings import UserSettings
 @endcode
 
-(C) 2007-2011 by the GRASS Development Team
+(C) 2007-2016 by the GRASS Development Team
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.
 
@@ -83,10 +83,10 @@
                 # use default window layout (layer manager, displays, ...)
                 'defWindowPos' : {
                     'enabled' : True,
-                    'dim' : '0,0,%d,%d,%d,0,%d,%d' % \
+                    'dim' : '1,1,%d,%d,%d,1,%d,%d' % \
                         (globalvar.GM_WINDOW_SIZE[0],
                          globalvar.GM_WINDOW_SIZE[1],
-                         globalvar.GM_WINDOW_SIZE[0],
+                         globalvar.GM_WINDOW_SIZE[0] + 1,
                          globalvar.MAP_WINDOW_SIZE[0],
                          globalvar.MAP_WINDOW_SIZE[1])
                     },

Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/workspace.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/workspace.py	2016-02-06 11:59:04 UTC (rev 67734)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/workspace.py	2016-02-06 12:01:11 UTC (rev 67735)
@@ -8,7 +8,7 @@
  - workspace::WriteWorkspaceFile
  - workspace::ProcessGrcFile
 
-(C) 2007-2011 by the GRASS Development Team
+(C) 2007-2016 by the GRASS Development Team
 
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.

Modified: grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py	2016-02-06 11:59:04 UTC (rev 67734)
+++ grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py	2016-02-06 12:01:11 UTC (rev 67735)
@@ -250,7 +250,7 @@
             grassVersion = "?"
 
         gisenv = grass.gisenv()
-        title = _("GRASS GIS %(version)s Map Display: %(id)s  - Location: %(loc)s@%(mapset)s") % \
+        title = _("GRASS GIS %(version)s Map Display: %(id)s - Location: %(loc)s@%(mapset)s") % \
             {'version': grassVersion,
              'id': str(displayId),
              'loc': gisenv["LOCATION_NAME"],