Author: bugman
Date: Wed Dec 8 11:26:35 2010
New Revision: 11730
URL: http://svn.gna.org/viewcvs/relax?rev=11730&view=rev
Log:
Rearrangement and ordering of the icon paths into classes for the different
sizes.
Each icon size is now placed into its own class.
Modified:
branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py
branches/bieri_gui/gui_bieri/components/mol_res_spin_tree.py
branches/bieri_gui/gui_bieri/components/spectrum.py
branches/bieri_gui/gui_bieri/paths.py
branches/bieri_gui/gui_bieri/references.py
branches/bieri_gui/gui_bieri/relax_gui.py
Modified: branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py?rev=11730&r1=11729&r2=11730&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py Wed Dec 8 11:26:35
2010
@@ -46,7 +46,7 @@
from gui_bieri.derived_wx_classes import StructureTextCtrl
from gui_bieri.filedialog import multi_openfile, opendir
from gui_bieri.message import error_message, missing_data
-from gui_bieri.paths import ADD_ICON, CANCEL_ICON, IMAGE_PATH, REMOVE_ICON
+from gui_bieri import paths
from gui_bieri.settings import load_sequence
@@ -103,7 +103,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.execute, button)
Modified: branches/bieri_gui/gui_bieri/components/mol_res_spin_tree.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/components/mol_res_spin_tree.py?rev=11730&r1=11729&r2=11730&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/components/mol_res_spin_tree.py (original)
+++ branches/bieri_gui/gui_bieri/components/mol_res_spin_tree.py Wed Dec 8
11:26:35 2010
@@ -62,9 +62,9 @@
# Build the icon list.
icon_list = wx.ImageList(self.icon_size, self.icon_size)
- self.icon_mol_index = icon_list.Add(wx.Bitmap(paths.MOLECULE_ICON,
wx.BITMAP_TYPE_ANY))
- self.icon_res_index = icon_list.Add(wx.Bitmap(paths.RESIDUE_ICON,
wx.BITMAP_TYPE_ANY))
- self.icon_spin_index = icon_list.Add(wx.Bitmap(paths.SPIN_ICON,
wx.BITMAP_TYPE_ANY))
+ self.icon_mol_index =
icon_list.Add(wx.Bitmap(paths.icon_22x22.molecule, wx.BITMAP_TYPE_ANY))
+ self.icon_res_index =
icon_list.Add(wx.Bitmap(paths.icon_22x22.residue, wx.BITMAP_TYPE_ANY))
+ self.icon_spin_index =
icon_list.Add(wx.Bitmap(paths.icon_22x22.spin, wx.BITMAP_TYPE_ANY))
self.tree.SetImageList(icon_list)
# Some weird black magic (this is essential)!!
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=11730&r1=11729&r2=11730&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/components/spectrum.py (original)
+++ branches/bieri_gui/gui_bieri/components/spectrum.py Wed Dec 8 11:26:35
2010
@@ -38,7 +38,7 @@
from gui_bieri.derived_wx_classes import StructureTextCtrl
from gui_bieri.filedialog import multi_openfile, opendir
from gui_bieri.message import error_message
-from gui_bieri.paths import ADD_ICON, CANCEL_ICON, IMAGE_PATH, REMOVE_ICON
+from gui_bieri import paths
@@ -105,20 +105,20 @@
sizer_main.Add(sizer_buttons, 1, wx.EXPAND, 0)
# The add button.
- button = wx.BitmapButton(panel_main, -1, bitmap=wx.Bitmap(ADD_ICON,
wx.BITMAP_TYPE_ANY))
+ button = wx.BitmapButton(panel_main, -1,
bitmap=wx.Bitmap(paths.icon_16x16.add, wx.BITMAP_TYPE_ANY))
button.SetMinSize((button_width, button_height))
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,
bitmap=wx.Bitmap(REMOVE_ICON, wx.BITMAP_TYPE_ANY))
+ button = wx.BitmapButton(panel_main, -1,
bitmap=wx.Bitmap(paths.icon_16x16.remove, wx.BITMAP_TYPE_ANY))
button.SetMinSize((button_width, button_height))
button.SetToolTipString("Removed selected items (disabled)")
sizer_buttons.Add(button, 0, wx.ADJUST_MINSIZE, 0)
# The cancel button.
- button = wx.BitmapButton(panel_main, -1,
bitmap=wx.Bitmap(CANCEL_ICON, wx.BITMAP_TYPE_ANY))
+ button = wx.BitmapButton(panel_main, -1,
bitmap=wx.Bitmap(paths.icon_16x16.cancel, wx.BITMAP_TYPE_ANY))
button.SetMinSize((button_width, button_height))
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=11730&r1=11729&r2=11730&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/paths.py (original)
+++ branches/bieri_gui/gui_bieri/paths.py Wed Dec 8 11:26:35 2010
@@ -34,39 +34,76 @@
# GUI image and icon paths.
-ICON_PATH = __main__.install_path +sep+'gui_bieri'+sep+'oxygen_icons'+sep
-IMAGE_PATH = __main__.install_path +sep+'gui_bieri'+sep+'images'+sep
-ICON_RELAX_PATH = __main__.install_path +sep+'graphics'+sep+'relax_icons'+sep
+OXY_ICON_PATH = __main__.install_path + sep + 'gui_bieri' + sep +
'oxygen_icons' + sep
+IMAGE_PATH = __main__.install_path + sep + 'gui_bieri' + sep + 'images' + sep
+ICON_RELAX_PATH = __main__.install_path + sep + 'graphics' + sep +
'relax_icons' + sep
-# 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'
-LOAD_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'arrow-right.png'
-MANUAL_ICON = ICON_PATH + '16x16'+sep+'mimetypes'+sep+'application-pdf.png'
-NEW_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'document-new.png'
-OPEN_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'document-open.png'
-RELAX_PROMPT_ICON = ICON_PATH +
'16x16'+sep+'mimetypes'+sep+'application-x-executable-script.png'
-REMOVE_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'list-remove.png'
-SAVE_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'document-save.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'
-SETTINGS_RESET_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'edit-delete.png'
-REF_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'flag-blue.png'
-UF_SCRIPT_ICON = ICON_PATH +
'16x16'+sep+'mimetypes'+sep+'application-x-desktop.png'
-# 48x48 icons.
-#ADD_ICON = ICON_PATH + '48x48'+sep+'actions'+sep+'list-add-relax-blue.png'
-BACKWARDS_ICON = ICON_PATH + '48x48'+sep+'actions'+sep+'go-previous-view.png'
-#CANCEL_ICON = ICON_PATH + '48x48'+sep+'actions'+sep+'dialog-cancel.png'
-FORWARDS_ICON = ICON_PATH + '48x48'+sep+'actions'+sep+'go-next-view.png'
-#REMOVE_ICON = ICON_PATH + '48x48'+sep+'actions'+sep+'list-remove.png'
-MOLECULE_ICON = ICON_RELAX_PATH + '22x22'+sep+'molecule.png'
-RESIDUE_ICON = ICON_RELAX_PATH + '22x22'+sep+'residue.png'
-SPIN_ICON = ICON_RELAX_PATH + '22x22'+sep+'spin.png'
+class I16x16:
+ """The 16x16 pixel icons."""
+
+ def __init__(self):
+ """Initialise all paths."""
+
+ # relax icons.
+ self.about_relax = IMAGE_PATH + 'relax_16x16.png'
+ self.about_relaxgui = IMAGE_PATH + 'relax_16x16.png'
+
+ # Oxygen icons.
+ path = OXY_ICON_PATH + '16x16' + sep
+ 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'
+ self.controller = path + 'apps' + sep +
'preferences-system-performance.png'
+ self.exit = path + 'actions' + sep +
'system-shutdown.png'
+ self.load = path + 'actions' + sep +
'arrow-right.png'
+ self.manual = path + 'mimetypes' + sep +
'application-pdf.png'
+ self.new = path + 'actions' + sep +
'document-new.png'
+ self.open = path + 'actions' + sep +
'document-open.png'
+ self.relax_prompt = path + 'mimetypes' + sep +
'application-x-executable-script.png'
+ self.remove = path + 'actions' + sep +
'list-remove.png'
+ self.save = path + 'actions' + sep +
'document-save.png'
+ self.save_as = path + 'actions' + sep +
'document-save-as.png'
+ self.settings = path + 'actions' + sep +
'document-properties.png'
+ self.settings_global = path + 'categories' + sep +
'preferences-system.png'
+ self.settings_reset = path + 'actions' + sep +
'edit-delete.png'
+ self.ref = path + 'actions' + sep +
'flag-blue.png'
+ self.uf_script = path + 'mimetypes' + sep +
'application-x-desktop.png'
+
+
+
+class I22x22:
+ """The 22x22 pixel icons."""
+
+ def __init__(self):
+ """Initialise all paths."""
+
+ # relax icons.
+ path = ICON_RELAX_PATH + '22x22' + sep
+ self.molecule = path + 'molecule.png'
+ self.residue = path + 'residue.png'
+ self.spin = path + 'spin.png'
+
+
+
+class I48x48:
+ """The 48x48 pixel icons."""
+
+ def __init__(self):
+ """Initialise all paths."""
+
+ # Oxygen icons.
+ path = OXY_ICON_PATH + '48x48' + sep
+ 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'
+ self.forwards = path + 'actions' + sep + 'go-next-view.png'
+ self.remove = path + 'actions' + sep + 'list-remove.png'
+
+
+
+# Set up all icon classes.
+icon_16x16 = I16x16()
+icon_22x22 = I22x22()
+icon_48x48 = I48x48()
Modified: branches/bieri_gui/gui_bieri/references.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/references.py?rev=11730&r1=11729&r2=11730&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/references.py (original)
+++ branches/bieri_gui/gui_bieri/references.py Wed Dec 8 11:26:35 2010
@@ -32,7 +32,7 @@
from info import Info_box
# relax GUI module imports.
-from gui_bieri.paths import IMAGE_PATH, BACKWARDS_ICON, FORWARDS_ICON
+from gui_bieri import paths
# HTML header.
HTML_HEADER = """\
@@ -107,13 +107,13 @@
button_box = wx.BoxSizer(wx.HORIZONTAL)
# Backwards button.
- button = wx.BitmapButton(self, -1, wx.Bitmap(BACKWARDS_ICON,
wx.BITMAP_TYPE_ANY), style=wx.NO_BORDER)
+ button = wx.BitmapButton(self, -1,
wx.Bitmap(paths.icons_48x48.backwards, wx.BITMAP_TYPE_ANY),
style=wx.NO_BORDER)
button.SetSize(button.GetBestSize())
self.Bind(wx.EVT_BUTTON, self.backwards, button)
button_box.Add(button)
# Forwards button.
- button = wx.BitmapButton(self, -1, wx.Bitmap(FORWARDS_ICON,
wx.BITMAP_TYPE_ANY), style=wx.NO_BORDER)
+ button = wx.BitmapButton(self, -1,
wx.Bitmap(paths.icons_48x48.forwards, wx.BITMAP_TYPE_ANY), style=wx.NO_BORDER)
button.SetSize(button.GetBestSize())
self.Bind(wx.EVT_BUTTON, self.forwards, button)
button_box.Add(button)
@@ -155,7 +155,7 @@
# The reference header.
text = text + "<center>"
- text = text + "<img src=%s%s></img>" % (IMAGE_PATH,
'ulysses_shadowless_400x168.png')
+ text = text + "<img src=%s%s></img>" % (paths.IMAGE_PATH,
'ulysses_shadowless_400x168.png')
text = text + "<h1>relax references</h1>"
text = text + "</center>"
Modified: branches/bieri_gui/gui_bieri/relax_gui.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/relax_gui.py?rev=11730&r1=11729&r2=11730&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Wed Dec 8 11:26:35 2010
@@ -56,7 +56,6 @@
from controller import Controller
from filedialog import opendir, openfile, savefile
from message import dir_message, error_message, question
-from paths import ABOUT_RELAX_ICON, ABOUT_RELAXGUI_ICON, CONTACT_ICON,
CONTROLLER_ICON, EXIT_ICON, IMAGE_PATH, LOAD_ICON, MANUAL_ICON, NEW_ICON,
OPEN_ICON, REF_ICON, RELAX_PROMPT_ICON, SAVE_ICON, SAVE_AS_ICON,
SETTINGS_ICON, SETTINGS_GLOBAL_ICON, SETTINGS_RESET_ICON
from gui_bieri import paths
from references import References
from relax_prompt import Prompt
@@ -160,7 +159,7 @@
# begin wxGlade: main.__set_properties
self.SetTitle("relaxGUI " + GUI_version)
_icon = wx.EmptyIcon()
- _icon.CopyFromBitmap(wx.Bitmap(IMAGE_PATH+'relax.gif',
wx.BITMAP_TYPE_ANY))
+ _icon.CopyFromBitmap(wx.Bitmap(paths.IMAGE_PATH+'relax.gif',
wx.BITMAP_TYPE_ANY))
self.SetIcon(_icon)
self.SetSize((1000, 600))
self.frame_1_statusbar.SetStatusWidths([800, 50, -1])
@@ -276,13 +275,13 @@
# The 'File' menu entries.
menu = wx.Menu()
- menu.AppendItem(self.build_menu_sub_item(menu, id=0,
text="&New\tCtrl+N", icon=NEW_ICON))
- menu.AppendItem(self.build_menu_sub_item(menu, id=1,
text="&Open\tCtrl+O", icon=OPEN_ICON))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=0,
text="&New\tCtrl+N", icon=paths.icon_16x16.new))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=1,
text="&Open\tCtrl+O", icon=paths.icon_16x16.open))
menu.AppendSeparator()
- menu.AppendItem(self.build_menu_sub_item(menu, id=2,
text="S&ave\tCtrl+S", icon=SAVE_ICON))
- menu.AppendItem(self.build_menu_sub_item(menu, id=3, text="Save
as...\tCtrl+Shift+S", icon=SAVE_AS_ICON))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=2,
text="S&ave\tCtrl+S", icon=paths.icon_16x16.save))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=3, text="Save
as...\tCtrl+Shift+S", icon=paths.icon_16x16.save_as))
menu.AppendSeparator()
- menu.AppendItem(self.build_menu_sub_item(menu, id=4,
text="E&xit\tCtrl+Q", icon=EXIT_ICON))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=4,
text="E&xit\tCtrl+Q", icon=paths.icon_16x16.exit))
menubar.Append(menu, "&File")
# The 'File' menu actions.
@@ -294,8 +293,8 @@
# The 'View' menu entries.
menu = wx.Menu()
- menu.AppendItem(self.build_menu_sub_item(menu, id=50,
text="&Controller\tCtrl+Z", icon=CONTROLLER_ICON))
- menu.AppendItem(self.build_menu_sub_item(menu, id=51, text="relax
&prompt\tCtrl+P", icon=RELAX_PROMPT_ICON))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=50,
text="&Controller\tCtrl+Z", icon=paths.icon_16x16.controller))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=51, text="relax
&prompt\tCtrl+P", icon=paths.icon_16x16.relax_prompt))
menu.AppendItem(self.build_menu_sub_item(menu, id=52, text="Spin
&tree view\tCtrl+T"))
menubar.Append(menu, "&View")
@@ -306,7 +305,7 @@
# The 'User functions' menu entries.
menu = wx.Menu()
- menu.AppendItem(self.build_menu_sub_item(menu, id=30,
text="&script", icon=paths.UF_SCRIPT_ICON))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=30,
text="&script", icon=paths.icon_16x16.uf_script))
menubar.Append(menu, "&User functions")
# The 'User functions' menu actions.
@@ -314,8 +313,8 @@
# The 'Molecule' menu entries.
menu = wx.Menu()
- menu.AppendItem(self.build_menu_sub_item(menu, id=10, text="Load
&PDB File", icon=LOAD_ICON))
- menu.AppendItem(self.build_menu_sub_item(menu, id=11, text="Load
se&quence file", icon=LOAD_ICON))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=10, text="Load
&PDB File", icon=paths.icon_16x16.load))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=11, text="Load
se&quence file", icon=paths.icon_16x16.load))
menubar.Append(menu, "&Molecule")
# The 'Molecule' menu actions.
@@ -324,9 +323,9 @@
# The 'Settings' menu entries.
menu = wx.Menu()
- menu.AppendItem(self.build_menu_sub_item(menu, id=20, text="&Global
relax settings", icon=SETTINGS_GLOBAL_ICON))
- menu.AppendItem(self.build_menu_sub_item(menu, id=21,
text="&Parameter file settings", icon=SETTINGS_ICON))
- menu.AppendItem(self.build_menu_sub_item(menu, id=22, text="Reset
a&ll settings", icon=SETTINGS_RESET_ICON))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=20, text="&Global
relax settings", icon=paths.icon_16x16.settings_global))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=21,
text="&Parameter file settings", icon=paths.icon_16x16.settings))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=22, text="Reset
a&ll settings", icon=paths.icon_16x16.settings_reset))
menubar.Append(menu, "&Settings")
# The 'Settings' menu actions.
@@ -336,13 +335,13 @@
# The 'Help' menu entries.
menu = wx.Menu()
- menu.AppendItem(self.build_menu_sub_item(menu, id=40, text="relax
user &manual\tF1", icon=MANUAL_ICON))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=40, text="relax
user &manual\tF1", icon=paths.icon_16x16.manual))
menu.AppendSeparator()
- menu.AppendItem(self.build_menu_sub_item(menu, id=41, text="&Contact
relaxGUI (relax-users@xxxxxxx)", icon=CONTACT_ICON))
- menu.AppendItem(self.build_menu_sub_item(menu, id=42,
text="&References", icon=REF_ICON))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=41, text="&Contact
relaxGUI (relax-users@xxxxxxx)", icon=paths.icon_16x16.contact))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=42,
text="&References", icon=paths.icon_16x16.ref))
menu.AppendSeparator()
- menu.AppendItem(self.build_menu_sub_item(menu, id=43, text="About
relaxG&UI", icon=ABOUT_RELAXGUI_ICON))
- menu.AppendItem(self.build_menu_sub_item(menu, id=44, text="About
rela&x", icon=ABOUT_RELAX_ICON))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=43, text="About
relaxG&UI", icon=paths.icon_16x16.about_relaxgui))
+ menu.AppendItem(self.build_menu_sub_item(menu, id=44, text="About
rela&x", icon=paths.icon_16x16.about_relax))
menubar.Append(menu, "&Help")
# The 'Help' menu actions.
r11730 - in /branches/bieri_gui/gui_bieri: ./ analyses/ components/