Author: bugman Date: Wed Nov 27 10:16:55 2013 New Revision: 21667 URL: http://svn.gna.org/viewcvs/relax?rev=21667&view=rev Log: Bug fixes for a number of broken Oxygen icon lookups in the GUI. Modified: trunk/gui/components/free_file_format.py trunk/gui/input_elements/sequence.py trunk/gui/pipe_editor.py Modified: trunk/gui/components/free_file_format.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/components/free_file_format.py?rev=21667&r1=21666&r2=21667&view=diff ============================================================================== --- trunk/gui/components/free_file_format.py (original) +++ trunk/gui/components/free_file_format.py Wed Nov 27 10:16:55 2013 @@ -610,7 +610,7 @@ # The reset button. button = wx.lib.buttons.ThemedGenBitmapTextButton(self, -1, None, " Reset") - button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit_delete', "22x22"), wx.BITMAP_TYPE_ANY)) + button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit-delete', "22x22"), wx.BITMAP_TYPE_ANY)) button.SetFont(font.normal) button.SetToolTipString("Reset the free file format settings to the original values.") button.SetMinSize(self.SIZE_BUTTON) Modified: trunk/gui/input_elements/sequence.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/input_elements/sequence.py?rev=21667&r1=21666&r2=21667&view=diff ============================================================================== --- trunk/gui/input_elements/sequence.py (original) +++ trunk/gui/input_elements/sequence.py Wed Nov 27 10:16:55 2013 @@ -175,7 +175,7 @@ sub_sizer.AddSpacer(5) # The edit button. - button = wx.BitmapButton(parent, -1, wx.Bitmap(fetch_icon('oxygen.actions.edit_rename', "16x16"), wx.BITMAP_TYPE_ANY)) + button = wx.BitmapButton(parent, -1, wx.Bitmap(fetch_icon('oxygen.actions.edit-rename', "16x16"), wx.BITMAP_TYPE_ANY)) button.SetMinSize((height_element, height_element)) button.SetToolTipString("Edit the values.") sub_sizer.Add(button, 0, wx.ADJUST_MINSIZE|wx.ALIGN_CENTER_VERTICAL, 0) @@ -565,7 +565,7 @@ # The delete all button. button = wx.lib.buttons.ThemedGenBitmapTextButton(self, -1, None, " Delete all") - button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit_delete', "22x22"), wx.BITMAP_TYPE_ANY)) + button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit-delete', "22x22"), wx.BITMAP_TYPE_ANY)) button.SetFont(font.normal) button.SetToolTipString("Delete all items.") button.SetMinSize(self.SIZE_BUTTON) Modified: trunk/gui/pipe_editor.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/pipe_editor.py?rev=21667&r1=21666&r2=21667&view=diff ============================================================================== --- trunk/gui/pipe_editor.py (original) +++ trunk/gui/pipe_editor.py Wed Nov 27 10:16:55 2013 @@ -216,7 +216,7 @@ # The delete button. self.button_delete = wx.lib.buttons.ThemedGenBitmapTextButton(self.main_panel, -1, None, " Delete") - self.button_delete.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.list_remove', "22x22"), 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.SetToolTipString("Delete a data pipe.") button_sizer.Add(self.button_delete, 1, wx.ALL|wx.EXPAND, 0)