r21455 - in /trunk/gui: analyses/elements/float_element.py components/grid.py -- November 16, 2013 - 17:12

Author: bugman
Date: Sat Nov 16 17:12:16 2013
New Revision: 21455

URL: http://svn.gna.org/viewcvs/relax?rev=21455&view=rev
Log:
More fixes for the elimination of the gui.paths module.

Modified:
    trunk/gui/analyses/elements/float_element.py
    trunk/gui/components/grid.py

Modified: trunk/gui/analyses/elements/float_element.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/elements/float_element.py?rev=21455&r1=21454&r2=21455&view=diff
==============================================================================
--- trunk/gui/analyses/elements/float_element.py (original)
+++ trunk/gui/analyses/elements/float_element.py Sat Nov 16 17:12:16 2013
@@ -29,7 +29,6 @@
 
 # relax module imports.
 from gui.fonts import font
-from gui.paths import icon_16x16
 from gui.string_conv import str_to_gui
 
 

Modified: trunk/gui/components/grid.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/components/grid.py?rev=21455&r1=21454&r2=21455&view=diff
==============================================================================
--- trunk/gui/components/grid.py (original)
+++ trunk/gui/components/grid.py Sat Nov 16 17:12:16 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)