r10607 - in /branches/bieri_gui/gui_bieri: components/spectrum.py paths.py -- February 01, 2010 - 21:23

Author: bugman
Date: Mon Feb  1 21:22:59 2010
New Revision: 10607

URL: http://svn.gna.org/viewcvs/relax?rev=10607&view=rev
Log:
Switched to using the smaller icons for the peak list selection GUI element.

This was requested by Michael Bieri at 
https://mail.gna.org/public/relax-devel/2010-02/msg00000.html
(Message-id: <4B6645C6.6040104@xxxxxx>).


Modified:
    branches/bieri_gui/gui_bieri/components/spectrum.py
    branches/bieri_gui/gui_bieri/paths.py

Modified: branches/bieri_gui/gui_bieri/components/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/components/spectrum.py?rev=10607&r1=10606&r2=10607&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/components/spectrum.py (original)
+++ branches/bieri_gui/gui_bieri/components/spectrum.py Mon Feb  1 21:22:59 
2010
@@ -27,6 +27,7 @@
 # Python module imports.
 from os import sep
 import wx
+import wx.lib.buttons
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
@@ -89,23 +90,23 @@
         sizer_main.Add(sizer_buttons, 1, wx.EXPAND, 0)
 
         # Button sizes.
-        size_button = [60, 60]
+        size_button = [80, 40]
 
         # The add button.
-        button = wx.BitmapButton(panel_main, -1, wx.Bitmap(ADD_ICON, 
wx.BITMAP_TYPE_ANY))
+        button = wx.lib.buttons.GenBitmapTextButton(panel_main, -1, 
bitmap=wx.Bitmap(ADD_ICON, wx.BITMAP_TYPE_ANY), label="Add")
         button.SetMinSize((size_button[0], size_button[1]))
         button.SetToolTipString("Add new peak lists")
         self.gui.Bind(wx.EVT_BUTTON, self.peak_list_add_action, button)
         sizer_buttons.Add(button, 0, wx.ADJUST_MINSIZE, 0)
 
         # The remove single item button.
-        button = wx.BitmapButton(panel_main, -1, wx.Bitmap(REMOVE_ICON, 
wx.BITMAP_TYPE_ANY))
+        button = wx.lib.buttons.GenBitmapTextButton(panel_main, -1, 
bitmap=wx.Bitmap(REMOVE_ICON, wx.BITMAP_TYPE_ANY), label="Remove")
         button.SetMinSize((size_button[0], size_button[1]))
         button.SetToolTipString("Removed selected items (disabled)")
         sizer_buttons.Add(button, 0, wx.ADJUST_MINSIZE, 0)
 
         # The cancel button.
-        button = wx.BitmapButton(panel_main, -1, wx.Bitmap(CANCEL_ICON, 
wx.BITMAP_TYPE_ANY))
+        button = wx.lib.buttons.GenBitmapTextButton(panel_main, -1, 
bitmap=wx.Bitmap(CANCEL_ICON, wx.BITMAP_TYPE_ANY), label="Clear")
         button.SetMinSize((size_button[0], size_button[1]))
         button.SetToolTipString("Clear the list")
         self.gui.Bind(wx.EVT_BUTTON, self.empty_list, button)

Modified: branches/bieri_gui/gui_bieri/paths.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/paths.py?rev=10607&r1=10606&r2=10607&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/paths.py (original)
+++ branches/bieri_gui/gui_bieri/paths.py Mon Feb  1 21:22:59 2010
@@ -39,6 +39,8 @@
 # 16x16 icons.
 ABOUT_RELAX_ICON = IMAGE_PATH + 'relax_16x16.png'
 ABOUT_RELAXGUI_ICON = IMAGE_PATH + 'relax_16x16.png'
+ADD_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'list-add-relax-blue.png'
+CANCEL_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'dialog-cancel.png'
 CONTACT_ICON = ICON_PATH + 
'16x16'+sep+'actions'+sep+'mail-mark-unread-new.png'
 CONTROLLER_ICON = ICON_PATH + 
'16x16'+sep+'apps'+sep+'preferences-system-performance.png'
 EXIT_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'system-shutdown.png'
@@ -46,6 +48,7 @@
 MANUAL_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'help-contents.png'
 NEW_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'document-new.png'
 OPEN_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'document-open.png'
+REMOVE_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'list-remove.png'
 SAVE_AS_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'document-save-as.png'
 SETTINGS_ICON = ICON_PATH + 
'16x16'+sep+'actions'+sep+'document-properties.png'
 SETTINGS_GLOBAL_ICON = ICON_PATH + 
'16x16'+sep+'categories'+sep+'preferences-system.png'
@@ -53,6 +56,6 @@
 REF_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'flag-blue.png'
 
 # 48x48 icons.
-ADD_ICON = ICON_PATH + '48x48'+sep+'actions'+sep+'list-add-relax-blue.png'
-CANCEL_ICON = ICON_PATH + '48x48'+sep+'actions'+sep+'dialog-cancel.png'
-REMOVE_ICON = ICON_PATH + '48x48'+sep+'actions'+sep+'list-remove.png'
+#ADD_ICON = ICON_PATH + '48x48'+sep+'actions'+sep+'list-add-relax-blue.png'
+#CANCEL_ICON = ICON_PATH + '48x48'+sep+'actions'+sep+'dialog-cancel.png'
+#REMOVE_ICON = ICON_PATH + '48x48'+sep+'actions'+sep+'list-remove.png'