diff -r 4ff73b969ab1 -r f8cf9bcaa1fa Templates/TemplateViewer.py
--- a/Templates/TemplateViewer.py Fri Jul 07 19:05:53 2017 +0200
+++ b/Templates/TemplateViewer.py Fri Jul 07 19:18:35 2017 +0200
@@ -632,11 +632,14 @@
"""
project = e5App().getObject("Project")
editor = self.viewmanager.activeWindow()
- today = datetime.datetime.now().date()
+ now = datetime.datetime.now()
sepchar = Preferences.getTemplates("SeparatorChar")
keyfmt = sepchar + "{0}" + sepchar
- varValues = {keyfmt.format('date'): today.isoformat(),
- keyfmt.format('year'): str(today.year)}
+ varValues = {
+ keyfmt.format('date'): now.date().isoformat(),
+ keyfmt.format('year'): str(now.date().year),
+ keyfmt.format('time'): now.time().strftime("%H:%M:%S"),
+ }
if project.name:
varValues[keyfmt.format('project_name')] = project.name
@@ -650,9 +653,13 @@
base_name, ext = os.path.splitext(file_name)
if ext:
ext = ext[1:]
+ path_name_rel = project.getRelativePath(path_name)
+ dir_name_rel = project.getRelativePath(dir_name)
varValues.update({
keyfmt.format('path_name'): path_name,
+ keyfmt.format('path_name_rel'): path_name_rel,
keyfmt.format('dir_name'): dir_name,
+ keyfmt.format('dir_name_rel'): dir_name_rel,
keyfmt.format('file_name'): file_name,
keyfmt.format('base_name'): base_name,
keyfmt.format('ext'): ext
