changeset bb3ee4b1c0ab in tryton:default
details: https://hg.tryton.org/tryton?cmd=changeset;node=bb3ee4b1c0ab
description:
        Display revision on dialog

        issue10059
        review335531002
diffstat:

 CHANGELOG                     |   1 +
 tryton/gui/window/form.py     |   2 +-
 tryton/gui/window/win_form.py |  16 ++++++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r 4fd1a5b8994e -r bb3ee4b1c0ab CHANGELOG
--- a/CHANGELOG Fri Feb 12 20:37:04 2021 +0100
+++ b/CHANGELOG Sun Feb 14 14:03:55 2021 +0100
@@ -1,3 +1,4 @@
+* Display revision on dialog
 * Execute report asynchronously
 * Add support for Python 3.9
 * Support empty value for timedelta converter
diff -r 4fd1a5b8994e -r bb3ee4b1c0ab tryton/gui/window/form.py
--- a/tryton/gui/window/form.py Fri Feb 12 20:37:04 2021 +0100
+++ b/tryton/gui/window/form.py Sun Feb 14 14:03:55 2021 +0100
@@ -278,7 +278,7 @@
         else:
             label = common.ellipsize(self.name, 80)
             tooltip = self.name
-        self.title.set_markup(label)
+        self.title.set_text(label)
         tooltips.set_tip(self.title, tooltip)
         self.set_buttons_sensitive(revision)
 
diff -r 4fd1a5b8994e -r bb3ee4b1c0ab tryton/gui/window/win_form.py
--- a/tryton/gui/window/win_form.py     Fri Feb 12 20:37:04 2021 +0100
+++ b/tryton/gui/window/win_form.py     Sun Feb 14 14:03:55 2021 +0100
@@ -107,11 +107,23 @@
 
         self.win.set_title(self.title)
 
+        revision = self.screen.context.get('_datetime')
+        if revision and self.screen.model_name in common.MODELHISTORY:
+            format_ = self.screen.context.get('date_format', '%x')
+            format_ += ' %H:%M:%S.%f'
+            revision_label = ' @ %s' % revision.strftime(format_)
+            label = common.ellipsize(
+                self.title, 80 - len(revision_label)) + revision_label
+            tooltip = self.title + revision_label
+        else:
+            label = common.ellipsize(self.title, 80)
+            tooltip = self.title
+
         title = Gtk.Label(
-            label=common.ellipsize(self.title, 80),
+            label=label,
             halign=Gtk.Align.START, margin=5,
             ellipsize=Pango.EllipsizeMode.END)
-        tooltips.set_tip(title, self.title)
+        tooltips.set_tip(title, tooltip)
         title.set_size_request(0, -1)  # Allow overflow
         title.show()
 

Reply via email to