Author: bugman Date: Wed Jun 6 16:27:28 2012 New Revision: 16704 URL: http://svn.gna.org/viewcvs/relax?rev=16704&view=rev Log: Renamed some of the methods in the relaxation data list GUI element. Modified: branches/uf_redesign/gui/components/relax_data.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=16704&r1=16703&r2=16704&view=diff ============================================================================== --- branches/uf_redesign/gui/components/relax_data.py (original) +++ branches/uf_redesign/gui/components/relax_data.py Wed Jun 6 16:27:28 2012 @@ -130,6 +130,17 @@ self.button_delete.Enable(enable) + def action_bruker_read(self, event): + """Launch the bruker.read user function. + + @param event: The wx event. + @type event: wx event + """ + + # Launch the dialog. + uf_store['bruker.read']() + + def action_relax_data_delete(self, event): """Launch the relax_data.delete user function. @@ -218,6 +229,17 @@ uf_store['relax_data.peak_intensity_type'](ri_id=id) else: uf_store['relax_data.peak_intensity_type'](ri_id=id, type=type) + + + def action_relax_data_read(self, event): + """Launch the relax_data.read user function. + + @param event: The wx event. + @type event: wx event + """ + + # Launch the dialog. + uf_store['relax_data.read']() def action_relax_data_temp_calibration(self, event): @@ -312,7 +334,7 @@ self.button_add.SetFont(font.normal) self.button_add.SetSize((80, self.height_buttons)) button_sizer.Add(self.button_add, 0, 0, 0) - self.gui.Bind(wx.EVT_BUTTON, self.relax_data_read, self.button_add) + self.gui.Bind(wx.EVT_BUTTON, self.action_relax_data_read, self.button_add) self.button_add.SetToolTipString("Read relaxation data from a file.") # Bruker button. @@ -321,7 +343,7 @@ self.button_bruker.SetFont(font.normal) self.button_bruker.SetSize((80, self.height_buttons)) button_sizer.Add(self.button_bruker, 0, 0, 0) - self.gui.Bind(wx.EVT_BUTTON, self.bruker_read, self.button_bruker) + self.gui.Bind(wx.EVT_BUTTON, self.action_bruker_read, self.button_bruker) self.button_bruker.SetToolTipString("Read a Bruker Dynamics Center relaxation data file.") # Delete button. @@ -334,17 +356,6 @@ self.button_delete.SetToolTipString("Delete loaded relaxation data from the relax data store.") - def bruker_read(self, event): - """Launch the bruker.read user function. - - @param event: The wx event. - @type event: wx event - """ - - # Launch the dialog. - uf_store['bruker.read']() - - def build_element(self): """Build the relaxation data listing grid.""" @@ -493,17 +504,6 @@ menu.Destroy() - def relax_data_read(self, event): - """Launch the relax_data.read user function. - - @param event: The wx event. - @type event: wx event - """ - - # Launch the dialog. - uf_store['relax_data.read']() - - def resize(self, event): """Catch the resize to allow the element to be resized.