[GRASS-SVN] r59287 - grass/trunk/gui/wxpython/animation

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-03-20 20:52:45 -0700 (Thu, 20 Mar 2014)
New Revision: 59287

Modified:
   grass/trunk/gui/wxpython/animation/controller.py
   grass/trunk/gui/wxpython/animation/dialogs.py
   grass/trunk/gui/wxpython/animation/frame.py
   grass/trunk/gui/wxpython/animation/utils.py
Log:
wxGUI/animation: fix some issues related to wxPython 3

Modified: grass/trunk/gui/wxpython/animation/controller.py
===================================================================
--- grass/trunk/gui/wxpython/animation/controller.py	2014-03-20 02:17:43 UTC (rev 59286)
+++ grass/trunk/gui/wxpython/animation/controller.py	2014-03-21 03:52:45 UTC (rev 59287)
@@ -456,6 +456,7 @@
         else:
             dlg = ExportDialog(self.frame, temporal=self.temporalMode,
                                timeTick=self.timeTick)
+            dlg.CenterOnParent()
             dlg.doExport.connect(self._export)
             self._dialogs['export'] = dlg
             dlg.Show()

Modified: grass/trunk/gui/wxpython/animation/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/animation/dialogs.py	2014-03-20 02:17:43 UTC (rev 59286)
+++ grass/trunk/gui/wxpython/animation/dialogs.py	2014-03-21 03:52:45 UTC (rev 59287)
@@ -932,12 +932,12 @@
                                                     startDirectory=os.getcwd())
 
         dirGridSizer = wx.GridBagSizer(hgap=5, vgap=5)
-        dirGridSizer.AddGrowableCol(1)
         dirGridSizer.Add(prefixLabel, pos=(0, 0), flag = wx.ALIGN_CENTER_VERTICAL)
         dirGridSizer.Add(self.prefixCtrl, pos=(0, 1), flag = wx.EXPAND)
         dirGridSizer.Add(formatLabel, pos=(1, 0), flag = wx.ALIGN_CENTER_VERTICAL)
         dirGridSizer.Add(self.imSeqFormatChoice, pos=(1, 1), flag = wx.EXPAND)
         dirGridSizer.Add(self.dirBrowse, pos=(2, 0), flag = wx.EXPAND, span = (1, 2))
+        dirGridSizer.AddGrowableCol(1)
         imSeqPanel.SetSizer(dirGridSizer)
         dirGridSizer.Fit(imSeqPanel)
 
@@ -1001,7 +1001,6 @@
                                             "if not satisfied with video quality. "
                                             "Options depend on ffmpeg version."))
         aviGridSizer = wx.GridBagSizer(hgap=5, vgap=5)
-        aviGridSizer.AddGrowableCol(1)
         aviGridSizer.Add(self.aviBrowse, pos=(0, 0), span = (1, 2), flag = wx.EXPAND)
         aviGridSizer.Add(encodingLabel, pos=(1, 0), flag = wx.ALIGN_CENTER_VERTICAL)
         aviGridSizer.Add(self.encodingText, pos=(1, 1), flag = wx.EXPAND)
@@ -1011,6 +1010,7 @@
             aviGridSizer.Add(warningLabel, pos=(3, 0), span=(1, 2),
                              flag=wx.ALIGN_CENTER_VERTICAL | wx.EXPAND)
 
+        aviGridSizer.AddGrowableCol(1)
         aviPanel.SetSizer(aviGridSizer)
         aviGridSizer.Fit(aviPanel)
 

Modified: grass/trunk/gui/wxpython/animation/frame.py
===================================================================
--- grass/trunk/gui/wxpython/animation/frame.py	2014-03-20 02:17:43 UTC (rev 59286)
+++ grass/trunk/gui/wxpython/animation/frame.py	2014-03-21 03:52:45 UTC (rev 59287)
@@ -249,6 +249,7 @@
             win = SpeedDialog(self, temporalMode=self.controller.GetTemporalMode(),
                               timeGranularity=self.controller.GetTimeGranularity(),
                               initialSpeed=self.controller.timeTick)
+            win.CenterOnParent()
             self.dialogs['speed'] = win
             win.speedChanged.connect(self.ChangeSpeed)
             win.Show()

Modified: grass/trunk/gui/wxpython/animation/utils.py
===================================================================
--- grass/trunk/gui/wxpython/animation/utils.py	2014-03-20 02:17:43 UTC (rev 59286)
+++ grass/trunk/gui/wxpython/animation/utils.py	2014-03-21 03:52:45 UTC (rev 59287)
@@ -229,8 +229,8 @@
     dc.SetBackgroundMode(wx.TRANSPARENT)
     dc.Clear()
     dc.DrawText(text, 1, 1)
+    dc.SelectObject(wx.NullBitmap)
     bmp.SetMaskColour(wx.WHITE)
-    dc.SelectObject(wx.NullBitmap)
 
     return bmp