Author: bugman
Date: Wed Jun 6 16:24:15 2012
New Revision: 16703
URL: http://svn.gna.org/viewcvs/relax?rev=16703&view=rev
Log:
The spectrum and relaxation data list GUI elements now use the user function
definitions for icons.
Modified:
branches/uf_redesign/gui/components/relax_data.py
branches/uf_redesign/gui/components/spectrum.py
Modified: branches/uf_redesign/gui/components/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/components/relax_data.py?rev=16703&r1=16702&r2=16703&view=diff
==============================================================================
--- branches/uf_redesign/gui/components/relax_data.py (original)
+++ branches/uf_redesign/gui/components/relax_data.py Wed Jun 6 16:24:15 2012
@@ -31,6 +31,7 @@
# relax module imports.
from graphics import fetch_icon
from status import Status; status = Status()
+from user_functions.data import Uf_info; uf_info = Uf_info()
# relax GUI module imports.
from gui.components.menu import build_menu_item
@@ -469,13 +470,13 @@
menu = wx.Menu()
# Add some menu items for the spin user functions.
- menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_DATA_DELETE, text="&Delete the relaxation data",
icon=fetch_icon("oxygen.actions.list-remove")))
- menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_DATA_DISPLAY, text="Dis&play the relaxation data",
icon=fetch_icon("oxygen.actions.document-preview")))
- menu.AppendItem(build_menu_item(menu, id=self.MENU_RELAX_DATA_FRQ,
text="Set the relaxation data &frequency", icon=fetch_icon("relax.frq")))
- menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_DATA_PEAK_INTENSITY_TYPE, text="Set the peak &intensity
type", icon=fetch_icon("oxygen.actions.edit-rename")))
- menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_DATA_TEMP_CALIBRATION, text="Set the temperature
&calibration", icon=fetch_icon("oxygen.status.weather-clear")))
- menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_DATA_TEMP_CONTROL, text="Set the temperature c&ontrol",
icon=fetch_icon("oxygen.status.weather-clear")))
- menu.AppendItem(build_menu_item(menu, id=self.MENU_RELAX_DATA_TYPE,
text="Set the relaxation data &type",
icon=fetch_icon("oxygen.actions.edit-rename")))
+ menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_DATA_DELETE, text="&Delete the relaxation data",
icon=fetch_icon(uf_info.get_uf('relax_data.delete').gui_icon)))
+ menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_DATA_DISPLAY, text="Dis&play the relaxation data",
icon=fetch_icon(uf_info.get_uf('relax_data.display').gui_icon)))
+ menu.AppendItem(build_menu_item(menu, id=self.MENU_RELAX_DATA_FRQ,
text="Set the relaxation data &frequency",
icon=fetch_icon(uf_info.get_uf('relax_data.frq').gui_icon)))
+ menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_DATA_PEAK_INTENSITY_TYPE, text="Set the peak &intensity
type",
icon=fetch_icon(uf_info.get_uf('relax_data.peak_intensity_type').gui_icon)))
+ menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_DATA_TEMP_CALIBRATION, text="Set the temperature
&calibration",
icon=fetch_icon(uf_info.get_uf('relax_data.temp_calibration').gui_icon)))
+ menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_DATA_TEMP_CONTROL, text="Set the temperature c&ontrol",
icon=fetch_icon(uf_info.get_uf('relax_data.temp_control').gui_icon)))
+ menu.AppendItem(build_menu_item(menu, id=self.MENU_RELAX_DATA_TYPE,
text="Set the relaxation data &type",
icon=fetch_icon(uf_info.get_uf('relax_data.type').gui_icon)))
# Bind clicks.
self.element.Bind(wx.EVT_MENU, self.action_relax_data_delete,
id=self.MENU_RELAX_DATA_DELETE)
Modified: branches/uf_redesign/gui/components/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/components/spectrum.py?rev=16703&r1=16702&r2=16703&view=diff
==============================================================================
--- branches/uf_redesign/gui/components/spectrum.py (original)
+++ branches/uf_redesign/gui/components/spectrum.py Wed Jun 6 16:24:15 2012
@@ -32,6 +32,7 @@
from status import Status; status = Status()
from generic_fns.spectrum import replicated_flags, replicated_ids
from graphics import fetch_icon
+from user_functions.data import Uf_info; uf_info = Uf_info()
# relax GUI module imports.
from gui.components.menu import build_menu_item
@@ -393,11 +394,11 @@
menu = wx.Menu()
# Add some menu items for the spin user functions.
- menu.AppendItem(build_menu_item(menu,
id=self.MENU_SPECTRUM_BASEPLANE_RMSD, text="Set the &baseplane RMSD",
icon=fetch_icon("oxygen.actions.edit-rename")))
- menu.AppendItem(build_menu_item(menu, id=self.MENU_SPECTRUM_DELETE,
text="&Delete the peak intensities",
icon=fetch_icon("oxygen.actions.list-remove")))
- menu.AppendItem(build_menu_item(menu,
id=self.MENU_SPECTRUM_INTEGRATION_POINTS, text="Set the number of integration
&points", icon=fetch_icon("oxygen.actions.edit-rename")))
- menu.AppendItem(build_menu_item(menu,
id=self.MENU_SPECTRUM_REPLICATED, text="Specify which spectra are
&replicated", icon=fetch_icon("oxygen.actions.edit-rename")))
- menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_FIT_RELAX_TIME, text="Set the relaxation &time",
icon=fetch_icon("oxygen.actions.edit-rename")))
+ menu.AppendItem(build_menu_item(menu,
id=self.MENU_SPECTRUM_BASEPLANE_RMSD, text="Set the &baseplane RMSD",
icon=fetch_icon(uf_info.get_uf('spectrum.baseplane_rmsd').gui_icon)))
+ menu.AppendItem(build_menu_item(menu, id=self.MENU_SPECTRUM_DELETE,
text="&Delete the peak intensities",
icon=fetch_icon(uf_info.get_uf('spectrum.delete').gui_icon)))
+ menu.AppendItem(build_menu_item(menu,
id=self.MENU_SPECTRUM_INTEGRATION_POINTS, text="Set the number of integration
&points",
icon=fetch_icon(uf_info.get_uf('spectrum.integration_points').gui_icon)))
+ menu.AppendItem(build_menu_item(menu,
id=self.MENU_SPECTRUM_REPLICATED, text="Specify which spectra are
&replicated",
icon=fetch_icon(uf_info.get_uf('spectrum.replicated').gui_icon)))
+ menu.AppendItem(build_menu_item(menu,
id=self.MENU_RELAX_FIT_RELAX_TIME, text="Set the relaxation &time",
icon=fetch_icon(uf_info.get_uf('relax_fit.relax_time').gui_icon)))
# Bind clicks.
self.element.Bind(wx.EVT_MENU, self.action_relax_fit_relax_time,
id=self.MENU_RELAX_FIT_RELAX_TIME)
r16703 - in /branches/uf_redesign/gui/components: relax_data.py spectrum.py