--- a/GraphicViewer.py	Fri Jun 15 18:03:25 2012 +0200
+++ b/GraphicViewer.py	Mon Jun 25 20:03:53 2012 +0200
@@ -31,6 +31,7 @@
 
 from graphics.GraphicCommons import DebugViewer, MODE_SELECTION, MODE_MOTION
 from controls import EditorPanel
+from utils.BitmapLibrary import GetBitmap
 
 colours = ['blue', 'red', 'green', 'yellow', 'orange', 'purple', 'brown', 'cyan',
            'pink', 'grey']
@@ -90,7 +91,7 @@
         self.CanvasRange = wx.ComboBox(self.Editor, 
               size=wx.Size(100, 28), style=wx.CB_READONLY)
         self.Bind(wx.EVT_COMBOBOX, self.OnRangeChanged, self.CanvasRange)
-        range_sizer.AddWindow(self.CanvasRange, 0, border=0, flag=0)
+        range_sizer.AddWindow(self.CanvasRange, 0, border=0, flag=wx.ALIGN_CENTER_VERTICAL)
         
         zoom_label = wx.StaticText(self.Editor, label=_('Zoom:'))
         range_sizer.AddWindow(zoom_label, 0, border=0, flag=wx.ALIGN_CENTER_VERTICAL)
@@ -98,7 +99,7 @@
         self.CanvasZoom = wx.ComboBox(self.Editor, 
               size=wx.Size(70, 28), style=wx.CB_READONLY)
         self.Bind(wx.EVT_COMBOBOX, self.OnZoomChanged, self.CanvasZoom)
-        range_sizer.AddWindow(self.CanvasZoom, 0, border=0, flag=0)
+        range_sizer.AddWindow(self.CanvasZoom, 0, border=0, flag=wx.ALIGN_CENTER_VERTICAL)
         
         position_label = wx.StaticText(self.Editor, label=_('Position:'))
         range_sizer.AddWindow(position_label, 0, border=0, flag=wx.ALIGN_CENTER_VERTICAL)
@@ -118,17 +119,21 @@
               self.OnPositionChanging, self.CanvasPosition)
         range_sizer.AddWindow(self.CanvasPosition, 0, border=5, flag=wx.GROW|wx.ALL)
         
-        self.ResetButton = wx.Button(self.Editor, label='Reset', size=wx.Size(72, 24))
+        self.ResetButton = wx.lib.buttons.GenBitmapButton(self.Editor, 
+              bitmap=GetBitmap("reset"), size=wx.Size(28, 28), style=wx.NO_BORDER)
+        self.ResetButton.SetToolTipString(_("Clear the graph values"))
         self.Bind(wx.EVT_BUTTON, self.OnResetButton, self.ResetButton)
         range_sizer.AddWindow(self.ResetButton, 0, border=0, flag=0)
         
-        self.CurrentButton = wx.Button(self.Editor, label='Current', size=wx.Size(72, 24))
+        self.CurrentButton = wx.lib.buttons.GenBitmapButton(self.Editor, 
+              bitmap=GetBitmap("current"), size=wx.Size(28, 28), style=wx.NO_BORDER)
+        self.CurrentButton.SetToolTipString(_("Go to current value"))
         self.Bind(wx.EVT_BUTTON, self.OnCurrentButton, self.CurrentButton)
         range_sizer.AddWindow(self.CurrentButton, 0, border=0, flag=0)
         
         self.ExportGraphButton = wx.lib.buttons.GenBitmapButton(self.Editor, 
-              bitmap=self.ParentWindow.GenerateBitmap("export_graph"), 
-              size=wx.Size(28, 28), style=wx.NO_BORDER)
+              bitmap=GetBitmap("export_graph"), size=wx.Size(28, 28), style=wx.NO_BORDER)
+        self.ExportGraphButton.SetToolTipString(_("Export graph values to clipboard"))
         self.Bind(wx.EVT_BUTTON, self.OnExportGraphButtonClick, 
                 self.ExportGraphButton)
         range_sizer.AddWindow(self.ExportGraphButton, 0, border=0, flag=0)