Author: bugman
Date: Tue May 8 14:37:04 2012
New Revision: 16094
URL: http://svn.gna.org/viewcvs/relax?rev=16094&view=rev
Log:
The default file name is now passed all the way into the RelaxFileDialog.
This is for the auto-generated GUI user functions.
Modified:
branches/uf_redesign/gui/uf_objects.py
branches/uf_redesign/gui/wizard.py
branches/uf_redesign/gui/wizard_elements.py
Modified: branches/uf_redesign/gui/uf_objects.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/uf_objects.py?rev=16094&r1=16093&r2=16094&view=diff
==============================================================================
--- branches/uf_redesign/gui/uf_objects.py (original)
+++ branches/uf_redesign/gui/uf_objects.py Tue May 8 14:37:04 2012
@@ -194,7 +194,7 @@
# Special arg type: file selection dialog.
if arg['arg_type'] == 'file sel':
- self.element_file_sel(key=arg['name'], sizer=sizer, desc=desc,
tooltip=arg['desc'], read_only=arg['wiz_read_only'])
+ self.element_file_sel(key=arg['name'], default=arg['default'],
sizer=sizer, desc=desc, tooltip=arg['desc'], read_only=arg['wiz_read_only'])
# Special arg type: dir arg.
elif arg['arg_type'] == 'dir':
@@ -210,6 +210,10 @@
free_format = True
if arg['name'] == 'data_col':
free_format_data = True
+
+ # Special arg type: functions!
+ elif arg['arg_type'] == 'func':
+ pass
# Value types.
elif arg['py_type'] in ['float', 'int', 'num', 'str']:
Modified: branches/uf_redesign/gui/wizard.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/wizard.py?rev=16094&r1=16093&r2=16094&view=diff
==============================================================================
--- branches/uf_redesign/gui/wizard.py (original)
+++ branches/uf_redesign/gui/wizard.py Tue May 8 14:37:04 2012
@@ -647,11 +647,13 @@
self._elements[key] = element
- def element_file_sel(self, key=None, sizer=None, desc=None, message='File
selection', wildcard=wx.FileSelectorDefaultWildcardStr,
style=wx.FD_DEFAULT_STYLE, tooltip=None, divider=None, padding=0, spacer=None,
read_only=False):
+ def element_file_sel(self, key=None, default=None, sizer=None, desc=None,
message='File selection', wildcard=wx.FileSelectorDefaultWildcardStr,
style=wx.FD_DEFAULT_STYLE, tooltip=None, divider=None, padding=0, spacer=None,
read_only=False):
"""Set up the integer element and store it.
@keyword key: The dictionary key to store the element with.
@type key: str
+ @keyword default: The default value of the element.
+ @type default: str
@keyword sizer: The sizer to put the input field widget into.
@type sizer: wx.Sizer instance
@keyword desc: The text description.
@@ -675,7 +677,7 @@
"""
# Create the element.
- element = Selector_file(name=key, parent=self, sizer=sizer, desc=desc,
message=message, wildcard=wildcard, style=style, tooltip=tooltip,
divider=divider, padding=padding, spacer=spacer, read_only=read_only)
+ element = Selector_file(name=key, default=default, parent=self,
sizer=sizer, desc=desc, message=message, wildcard=wildcard, style=style,
tooltip=tooltip, divider=divider, padding=padding, spacer=spacer,
read_only=read_only)
# Store it.
self._elements[key] = element
Modified: branches/uf_redesign/gui/wizard_elements.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/wizard_elements.py?rev=16094&r1=16093&r2=16094&view=diff
==============================================================================
--- branches/uf_redesign/gui/wizard_elements.py (original)
+++ branches/uf_redesign/gui/wizard_elements.py Tue May 8 14:37:04 2012
@@ -537,11 +537,13 @@
class Selector_file:
"""Wizard GUI element for selecting files."""
- def __init__(self, name=None, parent=None, sizer=None, desc=None,
message='File selection', wildcard=wx.FileSelectorDefaultWildcardStr,
style=wx.FD_DEFAULT_STYLE, tooltip=None, divider=None, padding=0, spacer=None,
preview=True, read_only=False):
+ def __init__(self, name=None, default=None, parent=None, sizer=None,
desc=None, message='File selection',
wildcard=wx.FileSelectorDefaultWildcardStr, style=wx.FD_DEFAULT_STYLE,
tooltip=None, divider=None, padding=0, spacer=None, preview=True,
read_only=False):
"""Build the file selection element.
@keyword name: The name of the element to use in titles, etc.
@type name: str
+ @keyword default: The default value of the element.
+ @type default: str
@keyword parent: The wizard GUI element.
@type parent: wx.Panel instance
@keyword sizer: The sizer to put the input field into.
@@ -593,14 +595,16 @@
# The input field.
if not hasattr(parent, 'file_selection_field'):
parent.file_selection_field = []
- parent.file_selection_field.append(wx.TextCtrl(parent, -1, ''))
+ parent.file_selection_field.append(wx.TextCtrl(parent, -1, default))
self._field = parent.file_selection_field[-1]
self._field.SetMinSize((-1, parent.height_element))
self._field.SetFont(font.normal)
sub_sizer.Add(self._field, 1,
wx.ADJUST_MINSIZE|wx.ALIGN_CENTER_VERTICAL, 0)
# The file selection object.
- obj = RelaxFileDialog(parent, field=self._field, message=message,
wildcard=wildcard, style=style)
+ if default == None:
+ default = wx.EmptyString
+ obj = RelaxFileDialog(parent, field=self._field, message=message,
defaultFile=default, wildcard=wildcard, style=style)
# A little spacing.
sub_sizer.AddSpacer(5)
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
