r11804 - in /branches/bieri_gui/gui_bieri: paths.py user_functions/base.py -- December 14, 2010 - 00:08

Author: bugman
Date: Tue Dec 14 00:08:04 2010
New Revision: 11804

URL: http://svn.gna.org/viewcvs/relax?rev=11804&view=rev
Log:
The 22x22 pixel icons are now used instead of 32x32 for the user function 
dialog buttons.


Modified:
    branches/bieri_gui/gui_bieri/paths.py
    branches/bieri_gui/gui_bieri/user_functions/base.py

Modified: branches/bieri_gui/gui_bieri/paths.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/paths.py?rev=11804&r1=11803&r2=11804&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/paths.py (original)
+++ branches/bieri_gui/gui_bieri/paths.py Tue Dec 14 00:08:04 2010
@@ -88,6 +88,13 @@
     def __init__(self):
         """Initialise all paths."""
 
+        # Oxygen icons.
+        path = OXY_ICON_PATH + '22x22' + sep
+        self.apply =                path + 'actions' + sep + 
'dialog-ok-apply.png'
+        self.cancel =               path + 'actions' + sep + 
'dialog-cancel.png'
+        self.close =                path + 'actions' + sep + 
'dialog-close.png'
+        self.ok =                   path + 'actions' + sep + 'dialog-ok.png'
+
         # relax icons.
         path = ICON_RELAX_PATH + '22x22' + sep
         self.molecule =             path + 'molecule.png'

Modified: branches/bieri_gui/gui_bieri/user_functions/base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/user_functions/base.py?rev=11804&r1=11803&r2=11804&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/user_functions/base.py (original)
+++ branches/bieri_gui/gui_bieri/user_functions/base.py Tue Dec 14 00:08:04 
2010
@@ -148,7 +148,7 @@
         # The apply button.
         if self.button_apply:
             button = buttons.ThemedGenBitmapTextButton(self, -1, None, 
"Apply")
-            button.SetBitmapLabel(wx.Bitmap(paths.icon_32x32.apply, 
wx.BITMAP_TYPE_ANY))
+            button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.apply, 
wx.BITMAP_TYPE_ANY))
             button.SetToolTipString("Apply the user function")
             button_sizer.Add(button, 0, wx.ADJUST_MINSIZE, 0)
             self.Bind(wx.EVT_BUTTON, self.apply, button)
@@ -159,7 +159,7 @@
         # The OK button.
         if self.button_ok:
             button = buttons.ThemedGenBitmapTextButton(self, -1, None, "OK")
-            button.SetBitmapLabel(wx.Bitmap(paths.icon_32x32.ok, 
wx.BITMAP_TYPE_ANY))
+            button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.ok, 
wx.BITMAP_TYPE_ANY))
             button.SetToolTipString("Accept the user function")
             button_sizer.Add(button, 0, wx.ADJUST_MINSIZE, 0)
             self.Bind(wx.EVT_BUTTON, self.ok, button)
@@ -170,7 +170,7 @@
         # The cancel button.
         if self.button_cancel:
             button = buttons.ThemedGenBitmapTextButton(self, -1, None, 
"Cancel")
-            button.SetBitmapLabel(wx.Bitmap(paths.icon_32x32.cancel, 
wx.BITMAP_TYPE_ANY))
+            button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.cancel, 
wx.BITMAP_TYPE_ANY))
             button.SetToolTipString("Abort the user function")
             button_sizer.Add(button, 0, wx.ADJUST_MINSIZE, 0)
             self.Bind(wx.EVT_BUTTON, self.cancel, button)