Mercurial Repositories > eric / file diff

--- a/Templates/TemplatePropertiesDialog.py	Fri Jul 07 19:05:53 2017 +0200
+++ b/Templates/TemplatePropertiesDialog.py	Fri Jul 07 19:18:35 2017 +0200
@@ -117,7 +117,7 @@
             self.__helpDialog = E5SimpleHelpDialog(
                 title=self.tr("Template Help"),
                 label=self.tr("<b>Template Help</b>"),
-                help=self.tr(
+                helpStr=self.tr(
                     """<p>To use variables in a template, you just have to"""
                     """ enclose the variable name with $-characters. When"""
                     """ you use the template, you will then be asked for a"""
@@ -133,9 +133,9 @@
                     """ 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:"""
+                    """ specially, the variable name 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"""
@@ -157,16 +157,25 @@
                     """<td>today's date in ISO format (YYYY-MM-DD)</td></tr>"""
                     """<tr><td>year</td>"""
                     """<td>the current year</td></tr>"""
+                    """<tr><td>time</td>"""
+                    """<td>current time in ISO format (hh:mm:ss)</td></tr>"""
                     """<tr><td>project_name</td>"""
                     """<td>the name of the project (if any)</td></tr>"""
                     """<tr><td>project_path</td>"""
                     """<td>the path of the project (if any)</td></tr>"""
                     """<tr><td>path_name</td>"""
                     """<td>full path of the current file</td></tr>"""
+                    """<tr><td>path_name_rel</td>"""
+                    """<td>project relative path of the current file</td>"""
+                    """</tr>"""
                     """<tr><td>dir_name</td>"""
-                    """<td>full path of the parent directory</td></tr>"""
+                    """<td>full path of the current file's directory</td>"""
+                    """</tr>"""
+                    """<tr><td>dir_name_rel</td>"""
+                    """<td>project relative path of the current file's"""
+                    """ directory</td></tr>"""
                     """<tr><td>file_name</td>"""
-                    """<td>the current file name (without directory)"""
+                    """<td>the current file's name (without directory)"""
                     """</td></tr>"""
                     """<tr><td>base_name</td>"""
                     """<td>like <i>file_name</i>, but without extension"""