Author: bugman
Date: Mon Dec 27 11:35:49 2010
New Revision: 11963
URL: http://svn.gna.org/viewcvs/relax?rev=11963&view=rev
Log:
Created an 'about' button for the auto model-free analysis tab.
Added:
branches/bieri_gui/graphics/oxygen_icons/16x16/actions/help-about.png
(with props)
branches/bieri_gui/graphics/oxygen_icons/22x22/actions/help-about.png
(with props)
branches/bieri_gui/graphics/oxygen_icons/32x32/actions/help-about.png
(with props)
branches/bieri_gui/graphics/oxygen_icons/48x48/actions/help-about.png
(with props)
Modified:
branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
branches/bieri_gui/gui_bieri/paths.py
Added: branches/bieri_gui/graphics/oxygen_icons/16x16/actions/help-about.png
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/graphics/oxygen_icons/16x16/actions/help-about.png?rev=11963&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
branches/bieri_gui/graphics/oxygen_icons/16x16/actions/help-about.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: branches/bieri_gui/graphics/oxygen_icons/22x22/actions/help-about.png
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/graphics/oxygen_icons/22x22/actions/help-about.png?rev=11963&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
branches/bieri_gui/graphics/oxygen_icons/22x22/actions/help-about.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: branches/bieri_gui/graphics/oxygen_icons/32x32/actions/help-about.png
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/graphics/oxygen_icons/32x32/actions/help-about.png?rev=11963&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
branches/bieri_gui/graphics/oxygen_icons/32x32/actions/help-about.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: branches/bieri_gui/graphics/oxygen_icons/48x48/actions/help-about.png
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/graphics/oxygen_icons/48x48/actions/help-about.png?rev=11963&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
branches/bieri_gui/graphics/oxygen_icons/48x48/actions/help-about.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_model_free.py?rev=11963&r1=11962&r2=11963&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Mon Dec 27
11:35:49 2010
@@ -49,7 +49,7 @@
from gui_bieri.derived_wx_classes import StructureTextCtrl
from gui_bieri.filedialog import opendir, openfile
from gui_bieri.message import error_message, missing_data
-from gui_bieri.paths import IMAGE_PATH
+from gui_bieri import paths
class Auto_model_free:
@@ -112,7 +112,7 @@
sizer.Add(label, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# The button.
- button = wx.BitmapButton(self.parent, -1,
wx.Bitmap(IMAGE_PATH+'relax_start.gif', wx.BITMAP_TYPE_ANY))
+ button = wx.BitmapButton(self.parent, -1,
wx.Bitmap(paths.IMAGE_PATH+'relax_start.gif', wx.BITMAP_TYPE_ANY))
button.SetName('hello')
button.SetSize(button.GetBestSize())
self.gui.Bind(wx.EVT_BUTTON, self.automatic_protocol_controller,
button)
@@ -710,9 +710,36 @@
# Use a horizontal packing of elements.
box = wx.BoxSizer(wx.HORIZONTAL)
+ # Build the left hand box.
+ left_box = wx.BoxSizer(wx.VERTICAL)
+
# Add the model-free bitmap picture.
- bitmap = wx.StaticBitmap(self.parent, -1,
wx.Bitmap(IMAGE_PATH+'modelfree.png', wx.BITMAP_TYPE_ANY))
- box.Add(bitmap, 0, wx.ADJUST_MINSIZE, 0)
+ bitmap = wx.StaticBitmap(self.parent, -1,
wx.Bitmap(paths.IMAGE_PATH+'modelfree.png', wx.BITMAP_TYPE_ANY))
+ left_box.Add(bitmap, 0, wx.ALL, 0)
+
+ # A spacer.
+ left_box.AddStretchSpacer()
+
+ # A button sizer, with some initial spacing.
+ button_sizer = wx.BoxSizer(wx.HORIZONTAL)
+ button_sizer.AddSpacer(10)
+
+ # An about button.
+ button = wx.lib.buttons.ThemedGenBitmapTextButton(self.parent, -1,
None, "About")
+ button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.about,
wx.BITMAP_TYPE_ANY))
+ button.SetToolTipString("Information about this automatic analysis")
+ button_sizer.Add(button, 0, 0, 0)
+ left_box.Add(button_sizer, 0, wx.ALL, 0)
+
+ # A cursor for the button.
+ cursor = wx.StockCursor(wx.CURSOR_QUESTION_ARROW)
+ button.SetCursor(cursor)
+
+ # Spacer.
+ left_box.AddSpacer(10)
+
+ # Add to the main box.
+ box.Add(left_box, 0, wx.ALL|wx.EXPAND, 0)
# Build the right hand box and pack it next to the bitmap.
right_box = self.build_right_box()
Modified: branches/bieri_gui/gui_bieri/paths.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/paths.py?rev=11963&r1=11962&r2=11963&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/paths.py (original)
+++ branches/bieri_gui/gui_bieri/paths.py Mon Dec 27 11:35:49 2010
@@ -59,6 +59,7 @@
# Oxygen icons.
path = OXY_ICON_PATH + '16x16' + sep
+ self.about = path + 'actions' + sep +
'help-about.png'
self.add = path + 'actions' + sep +
'list-add-relax-blue.png'
self.cancel = path + 'actions' + sep +
'dialog-cancel.png'
self.contact = path + 'actions' + sep +
'mail-mark-unread-new.png'
@@ -91,6 +92,7 @@
# Oxygen icons.
path = OXY_ICON_PATH + '22x22' + sep
+ self.about = path + 'actions' + sep + 'help-about.png'
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'
@@ -115,6 +117,7 @@
# Oxygen icons.
path = OXY_ICON_PATH + '32x32' + sep
+ self.about = path + 'actions' + sep + 'help-about.png'
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'
@@ -131,6 +134,7 @@
# Oxygen icons.
path = OXY_ICON_PATH + '48x48' + sep
+ self.about = path + 'actions' + sep + 'help-about.png'
self.add = path + 'actions' + sep +
'list-add-relax-blue.png'
self.backwards = path + 'actions' + sep + 'go-previous-view.png'
self.cancel = path + 'actions' + sep + 'dialog-cancel.png'
r11963 - in /branches/bieri_gui: graphics/oxygen_icons/16x16/actions/ graphics/oxygen_icons/22x22/actions/ graphics/oxygen_i...
