r16705 - in /branches/uf_redesign/gui/components: relax_data.py spectrum.py -- June 06, 2012 - 16:32

Author: bugman
Date: Wed Jun  6 16:32:16 2012
New Revision: 16705

URL: http://svn.gna.org/viewcvs/relax?rev=16705&view=rev
Log:
The spectrum and relaxation data list GUI elements now use 
graphics.fetch_icon for all icons.


Modified:
    branches/uf_redesign/gui/components/relax_data.py
    branches/uf_redesign/gui/components/spectrum.py

Modified: branches/uf_redesign/gui/components/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/components/relax_data.py?rev=16705&r1=16704&r2=16705&view=diff
==============================================================================
--- branches/uf_redesign/gui/components/relax_data.py (original)
+++ branches/uf_redesign/gui/components/relax_data.py Wed Jun  6 16:32:16 2012
@@ -37,7 +37,6 @@
 from gui.components.menu import build_menu_item
 from gui.fonts import font
 from gui.misc import add_border
-from gui import paths
 from gui.string_conv import float_to_gui, gui_to_str, str_to_gui
 from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
 
@@ -330,7 +329,7 @@
 
         # Add button.
         self.button_add = 
wx.lib.buttons.ThemedGenBitmapTextButton(self.panel, -1, None, " Add")
-        self.button_add.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.add, 
wx.BITMAP_TYPE_ANY))
+        
self.button_add.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.list-add-relax-blue',
 "22x22"), wx.BITMAP_TYPE_ANY))
         self.button_add.SetFont(font.normal)
         self.button_add.SetSize((80, self.height_buttons))
         button_sizer.Add(self.button_add, 0, 0, 0)
@@ -339,7 +338,7 @@
 
         # Bruker button.
         self.button_bruker = 
wx.lib.buttons.ThemedGenBitmapTextButton(self.panel, -1, None, " Add")
-        
self.button_bruker.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.bruker_add, 
wx.BITMAP_TYPE_ANY))
+        
self.button_bruker.SetBitmapLabel(wx.Bitmap(fetch_icon('relax.bruker_add', 
"22x22"), wx.BITMAP_TYPE_ANY))
         self.button_bruker.SetFont(font.normal)
         self.button_bruker.SetSize((80, self.height_buttons))
         button_sizer.Add(self.button_bruker, 0, 0, 0)
@@ -348,7 +347,7 @@
 
         # Delete button.
         self.button_delete = 
wx.lib.buttons.ThemedGenBitmapTextButton(self.panel, -1, None, " Delete")
-        
self.button_delete.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.list_remove, 
wx.BITMAP_TYPE_ANY))
+        
self.button_delete.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.list-remove',
 "22x22"), wx.BITMAP_TYPE_ANY))
         self.button_delete.SetFont(font.normal)
         self.button_delete.SetSize((80, self.height_buttons))
         button_sizer.Add(self.button_delete, 0, 0, 0)

Modified: branches/uf_redesign/gui/components/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/components/spectrum.py?rev=16705&r1=16704&r2=16705&view=diff
==============================================================================
--- branches/uf_redesign/gui/components/spectrum.py (original)
+++ branches/uf_redesign/gui/components/spectrum.py Wed Jun  6 16:32:16 2012
@@ -38,7 +38,6 @@
 from gui.components.menu import build_menu_item
 from gui.fonts import font
 from gui.misc import add_border
-from gui import paths
 from gui.string_conv import float_to_gui, gui_to_str, str_to_gui
 from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
 
@@ -249,7 +248,7 @@
 
         # Add button.
         self.button_add = 
wx.lib.buttons.ThemedGenBitmapTextButton(self.panel, -1, None, " Add")
-        self.button_add.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.add, 
wx.BITMAP_TYPE_ANY))
+        
self.button_add.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.list-add-relax-blue',
 "22x22") wx.BITMAP_TYPE_ANY))
         self.button_add.SetFont(font.normal)
         self.button_add.SetSize((80, self.height_buttons))
         button_sizer.Add(self.button_add, 0, 0, 0)
@@ -258,7 +257,7 @@
 
         # Delete button.
         self.button_delete = 
wx.lib.buttons.ThemedGenBitmapTextButton(self.panel, -1, None, " Delete")
-        
self.button_delete.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.list_remove, 
wx.BITMAP_TYPE_ANY))
+        
self.button_delete.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.list-remove',
 "22x22"), wx.BITMAP_TYPE_ANY))
         self.button_delete.SetFont(font.normal)
         self.button_delete.SetSize((80, self.height_buttons))
         button_sizer.Add(self.button_delete, 0, 0, 0)