diff --git a/tryton/gui/window/email.py b/tryton/gui/window/email.py index accac4f6ec..e4cb887f22 100644 --- a/tryton/gui/window/email.py +++ b/tryton/gui/window/email.py @@ -22,10 +22,10 @@ class Email(object): self.win.set_transient_for(parent) self.win.vbox.set_spacing(3) self.win.vbox.pack_start(gtk.Label( - _('Setting Email Program')), expand=False, fill=True) + _('Email Program Settings')), expand=False, fill=True) self.win.vbox.pack_start(gtk.HSeparator()) hbox = gtk.HBox(spacing=3) - hbox.pack_start(gtk.Label(_('Email program:')), expand=True, + hbox.pack_start(gtk.Label(_('Command Line:')), expand=True, fill=True) self.entry = gtk.Entry() self.entry.set_property('activates_default', True) @@ -34,12 +34,56 @@ class Email(object): hbox.pack_start(self.entry, expand=True, fill=True) self.win.vbox.pack_start(hbox, expand=True, fill=True) - label = gtk.Label(_('Available Values:')) + label = gtk.Label(_('Legend of Available Placeholders:')) label.set_alignment(0.0, 0.5) label.set_padding(0, 10) self.win.vbox.pack_start(label, expand=False, fill=True) - label = gtk.Label('${to}, ${cc}, ${subject}, ${body}, ${attachment}') - self.win.vbox.pack_start(label, expand=False, fill=True) + + hbox = gtk.HBox(spacing=3) + vboxl = gtk.VBox(homogeneous=True, spacing=3) + label = gtk.Label(_('To:')) + label.set_alignment(0, 0) + label.set_padding(10, 0) + vboxl.pack_start(label, expand=False, fill=False) + label = gtk.Label(_('CC:')) + label.set_alignment(0, 0) + label.set_padding(10, 0) + vboxl.pack_start(label, expand=False, fill=False) + label = gtk.Label(_('Subject:')) + label.set_alignment(0, 0) + label.set_padding(10, 0) + vboxl.pack_start(label, expand=False, fill=False) + label = gtk.Label(_('Body:')) + label.set_alignment(0, 0) + label.set_padding(10, 0) + vboxl.pack_start(label, expand=False, fill=False) + label = gtk.Label(_('Attachment:')) + label.set_alignment(0, 0) + label.set_padding(10, 0) + vboxl.pack_start(label, expand=False, fill=False) + + vboxr = gtk.VBox(homogeneous=True, spacing=3) + label = gtk.Label(' ${to}') + label.set_alignment(0, 0) + vboxr.pack_start(label, expand=False, fill=False) + label = gtk.Label(' ${cc}') + label.set_alignment(0, 0) + vboxr.pack_start(label, expand=False, fill=False) + label = gtk.Label(' ${subject}') + label.set_alignment(0, 0) + vboxr.pack_start(label, expand=False, fill=False) + label = gtk.Label(' ${body}') + label.set_alignment(0, 0) + vboxr.pack_start(label, expand=False, fill=False) + label = gtk.Label(' ${attachment}') + label.set_alignment(0, 0) + vboxr.pack_start(label, expand=False, fill=False) + + hbox.pack_start(vboxl, expand=False, fill=False) + hbox.pack_start(vboxr, expand=False, fill=False) + + self.win.vbox.pack_start(hbox, expand=True, fill=True) + self.win.show_all()