r21474 - in /branches/relax_disp: ./ gui/components/grid.py -- November 16, 2013 - 17:13

Author: bugman
Date: Sat Nov 16 17:13:59 2013
New Revision: 21474

URL: http://svn.gna.org/viewcvs/relax?rev=21474&view=rev
Log:
Merged revisions 21455 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r21455 | bugman | 2013-11-16 17:12:16 +0100 (Sat, 16 Nov 2013) | 1 line
  
  More fixes for the elimination of the gui.paths module.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/gui/components/grid.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Nov 16 17:13:59 2013
@@ -1,1 +1,1 @@
-/trunk:1-21453
+/trunk:1-21473

Modified: branches/relax_disp/gui/components/grid.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/components/grid.py?rev=21474&r1=21473&r2=21474&view=diff
==============================================================================
--- branches/relax_disp/gui/components/grid.py (original)
+++ branches/relax_disp/gui/components/grid.py Sat Nov 16 17:13:59 2013
@@ -30,7 +30,7 @@
 
 # relax module imports.
 from data_store import Relax_data_store; ds = Relax_data_store()
-from gui import paths
+from graphics import fetch_icon
 from gui.filedialog import RelaxFileDialog
 from gui.fonts import font
 from gui.message import error_message
@@ -305,7 +305,7 @@
         button_sizer = wx.BoxSizer(wx.VERTICAL)
 
         # Add peaklist button
-        add_pkl = wx.BitmapButton(self.parent, -1, 
bitmap=wx.Bitmap(paths.icon_16x16.add, wx.BITMAP_TYPE_ANY))
+        add_pkl = wx.BitmapButton(self.parent, -1, 
bitmap=wx.Bitmap(fetch_icon('oxygen.actions.list-add-relax-blue', "16x16"), 
wx.BITMAP_TYPE_ANY))
         add_pkl.SetMinSize((50, 50))
         self.gui.Bind(wx.EVT_BUTTON, self.load_peaklist, add_pkl)
         button_sizer.Add(add_pkl, 0, wx.ADJUST_MINSIZE, 0)