--- a/Templates/TemplatePropertiesDialog.py Tue Oct 08 19:52:11 2013 +0200 +++ b/Templates/TemplatePropertiesDialog.py Wed Oct 09 18:34:30 2013 +0200 @@ -106,33 +106,38 @@ E5MessageBox.information(self, self.trUtf8("Template Help"), self.trUtf8( - """<p>To use variables in a template, you just have to enclose""" - """ the variablename with $-characters. When you use the template,""" - """ you will then be asked for a value for this variable.</p>""" + """<p>To use variables in a template, you just have to""" + """ enclose the variablename with $-characters. When you""" + """ use the template, you will then be asked for a value""" + """ for this variable.</p>""" """<p>Example template: This is a $VAR$</p>""" - """<p>When you use this template you will be prompted for a value""" - """ for the variable $VAR$. Any occurrences of $VAR$ will then be""" - """ replaced with whatever you've entered.</p>""" - """<p>If you need a single $-character in a template, which is not""" - """ used to enclose a variable, type $$(two dollar characters)""" - """ instead. They will automatically be replaced with a single""" - """ $-character when you use the template.</p>""" - """<p>If you want a variables contents to be treated specially,""" - """ the variablename must be followed by a ':' and one formatting""" - """ specifier (e.g. $VAR:ml$). The supported specifiers are:""" + """<p>When you use this template you will be prompted for""" + """ a value for the variable $VAR$. Any occurrences of $VAR$""" + """ will then be replaced with whatever you've entered.</p>""" + """<p>If you need a single $-character in a template, which""" + """ is not used to enclose a variable, type $$(two dollar""" + """ characters) instead. They will automatically be replaced""" + """ with a single $-character when you use the template.</p>""" + """<p>If you want a variables contents to be treated""" + """ specially, the variablename must be followed by a ':'""" + """ and one formatting specifier (e.g. $VAR:ml$). The""" + """ supported specifiers are:""" """<table>""" """<tr><td>ml</td><td>Specifies a multiline formatting.""" - """ The first line of the variable contents is prefixed with the string""" - """ occurring before the variable on the same line of the template.""" - """ All other lines are prefixed by the same amount of whitespace""" - """ as the line containing the variable.""" + """ The first line of the variable contents is prefixed with""" + """ the string occurring before the variable on the same""" + """ line of the template. All other lines are prefixed by""" + """ the same amount of whitespace as the line containing""" + """ the variable.""" """</td></tr>""" """<tr><td>rl</td><td>Specifies a repeated line formatting.""" - """ Each line of the variable contents is prefixed with the string""" - """ occuring before the variable on the same line of the template.""" + """ Each line of the variable contents is prefixed with the""" + """ string occuring before the variable on the same line of""" + """ the template.""" """</td></tr>""" """</table></p>""" - """<p>The following predefined variables may be used in a template:""" + """<p>The following predefined variables may be used in a""" + """ template:""" """<table>""" """<tr><td>date</td>""" """<td>today's date in ISO format (YYYY-MM-DD)</td></tr>""" @@ -149,25 +154,29 @@ """<tr><td>file_name</td>""" """<td>the current file name (without directory)</td></tr>""" """<tr><td>base_name</td>""" - """<td>like <i>file_name</i>, but without extension</td></tr>""" + """<td>like <i>file_name</i>, but without extension""" + """</td></tr>""" """<tr><td>ext</td>""" """<td>the extension of the current file</td></tr>""" """<tr><td>cur_select</td>""" """<td>the currently selected text</td></tr>""" """<tr><td>insertion</td>""" - """<td>Sets insertion point for cursor after template is inserted.</td>""" + """<td>Sets insertion point for cursor after template is""" + """ inserted.</td>""" """</tr>""" """<tr><td>select_start</td>""" - """<td>Sets span of selected text in template after template is """ - """inserted (used together with 'select_end').</td></tr>""" + """<td>Sets span of selected text in template after template""" + """ is inserted (used together with 'select_end').</td></tr>""" """<tr><td>select_end</td>""" - """<td>Sets span of selected text in template after template is """ - """inserted (used together with 'select_start').</td></tr>""" + """<td>Sets span of selected text in template after template""" + """ is inserted (used together with 'select_start').""" + """</td></tr>""" """<tr><td>clipboard</td>""" """<td>the text of the clipboard</td></tr>""" """</table></p>""" - """<p>If you want to change the default delimiter to anything""" - """ different, please use the configuration dialog to do so.</p>""")) + """<p>If you want to change the default delimiter to""" + """ anything different, please use the configuration""" + """ dialog to do so.</p>""")) def setSelectedGroup(self, name): """ @@ -182,9 +191,9 @@ """ Public method to get the data entered into the dialog. - @return a tuple of two strings (name, language), if the dialog is in group mode, - and a tuple of four strings (name, description, group name, template) - otherwise. + @return a tuple of two strings (name, language), if the dialog is in + group mode, and a tuple of four strings (name, description, group + name, template) otherwise. """ if self.groupMode: return (self.nameEdit.text(),