Better enum-type help text

This commit is contained in:
Charles Haley 2010-12-02 09:16:45 +00:00
parent 6ba2d854fa
commit 438e0d5305
2 changed files with 13 additions and 9 deletions

View File

@ -27,21 +27,21 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
3:{'datatype':'series', 3:{'datatype':'series',
'text':_('Text column for keeping series-like information'), 'text':_('Text column for keeping series-like information'),
'is_multiple':False}, 'is_multiple':False},
4:{'datatype':'datetime', 4:{'datatype':'enumeration',
'text':_('Text, but with a fixed set of permitted values'), 'is_multiple':False},
5:{'datatype':'datetime',
'text':_('Date'), 'is_multiple':False}, 'text':_('Date'), 'is_multiple':False},
5:{'datatype':'float', 6:{'datatype':'float',
'text':_('Floating point numbers'), 'is_multiple':False}, 'text':_('Floating point numbers'), 'is_multiple':False},
6:{'datatype':'int', 7:{'datatype':'int',
'text':_('Integers'), 'is_multiple':False}, 'text':_('Integers'), 'is_multiple':False},
7:{'datatype':'rating', 8:{'datatype':'rating',
'text':_('Ratings, shown with stars'), 'text':_('Ratings, shown with stars'),
'is_multiple':False}, 'is_multiple':False},
8:{'datatype':'bool', 9:{'datatype':'bool',
'text':_('Yes/No'), 'is_multiple':False}, 'text':_('Yes/No'), 'is_multiple':False},
9:{'datatype':'composite', 10:{'datatype':'composite',
'text':_('Column built from other columns'), 'is_multiple':False}, 'text':_('Column built from other columns'), 'is_multiple':False},
10:{'datatype':'enumeration',
'text':_('Fixed set of text values'), 'is_multiple':False},
} }
def __init__(self, parent, editing, standard_colheads, standard_colnames): def __init__(self, parent, editing, standard_colheads, standard_colnames):
@ -61,6 +61,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
self.editing_col = editing self.editing_col = editing
self.standard_colheads = standard_colheads self.standard_colheads = standard_colheads
self.standard_colnames = standard_colnames self.standard_colnames = standard_colnames
self.column_type_box.setMaxVisibleItems(len(self.column_types))
for t in self.column_types: for t in self.column_types:
self.column_type_box.addItem(self.column_types[t]['text']) self.column_type_box.addItem(self.column_types[t]['text'])
self.column_type_box.currentIndexChanged.connect(self.datatype_changed) self.column_type_box.currentIndexChanged.connect(self.datatype_changed)

View File

@ -212,7 +212,7 @@
<item> <item>
<widget class="QLineEdit" name="enum_box"> <widget class="QLineEdit" name="enum_box">
<property name="toolTip"> <property name="toolTip">
<string>A comma-separated list of valid values.</string> <string>A comma-separated list of permitted values. The empty value is always permitted</string>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@ -227,6 +227,9 @@
<property name="text"> <property name="text">
<string>Default: (nothing)</string> <string>Default: (nothing)</string>
</property> </property>
<property name="toolTip">
<string>Note that the empty value is always permitted, but is not shown in the list</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>