diff -r 1334238d4863 -r c32c169b8f63 GraphicViewer.py --- a/GraphicViewer.py Thu Feb 02 01:08:57 2012 +0100 +++ b/GraphicViewer.py Thu Feb 02 16:12:26 2012 +0100 @@ -41,7 +41,7 @@ HOUR = 60 * MINUTE RANGE_VALUES = [(str(25 * 2 ** i), 25 * 2 ** i) for i in xrange(6)] -TIME_RANGE_VALUES = [("%ds" % i, i * SECOND) for i in (10, 20, 30)] + \ +TIME_RANGE_VALUES = [("%ds" % i, i * SECOND) for i in (1, 2, 5, 10, 20, 30)] + \ [("%dm" % i, i * MINUTE) for i in (1, 2, 5, 10, 20, 30)] + \ [("%dh" % i, i * HOUR) for i in (1, 2, 3, 6, 12, 24)] @@ -114,9 +114,8 @@ self.CanvasRange = wx.ComboBox(id=ID_GRAPHICVIEWERCANVASRANGE, name='CanvasRange', parent=self.Editor, pos=wx.Point(0, 0), - size=wx.Size(100, 28), style=0) + size=wx.Size(100, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnRangeChanged, id=ID_GRAPHICVIEWERCANVASRANGE) - self.Bind(wx.EVT_TEXT_ENTER, self.OnRangeChanged, id=ID_GRAPHICVIEWERCANVASRANGE) self.staticText2 = wx.StaticText(id=ID_GRAPHICVIEWERSTATICTEXT2, label=_('Position:'), name='staticText2', parent=self.Editor,