Philipp Hörist pushed to branch master at gajim / gajim
Commits:
c4012a30 by Philipp Hörist at 2019-06-11T17:31:03Z
Fix undefined var error
- - - - -
37507ec2 by Philipp Hörist at 2019-06-11T17:31:03Z
DataForms: Add validation for list-multi fields
- - - - -
b262b560 by Philipp Hörist at 2019-06-11T17:31:03Z
DataForms: Wrap and justify instructions and title
- - - - -
1f626f51 by Philipp Hörist at 2019-06-11T17:31:03Z
DataForms: Center some widgets vertically
- - - - -
2 changed files:
- gajim/gtk/dataform.py
- gajim/gui_menu_builder.py
Changes:
=====================================
gajim/gtk/dataform.py
=====================================
@@ -178,6 +178,9 @@ class SizeAdjustment:
class Title:
def __init__(self, title):
self._label = Gtk.Label(label=title)
+ self._label.set_line_wrap(True)
+ self._label.set_line_wrap_mode(Pango.WrapMode.WORD)
+ self._label.set_justify(Gtk.Justification.CENTER)
self._label.get_style_context().add_class('data-form-title')
def add(self, form_grid, row_number):
@@ -189,6 +192,7 @@ class Instructions:
self._label = Gtk.Label(label=instructions)
self._label.set_line_wrap(True)
self._label.set_line_wrap_mode(Pango.WrapMode.WORD)
+ self._label.set_justify(Gtk.Justification.CENTER)
def add(self, form_grid, row_number):
form_grid.attach(self._label, 0, row_number, 2, 1)
@@ -232,7 +236,8 @@ class Field:
'jid-multi',
'text-single',
'text-private',
- 'text-multi'):
+ 'text-multi',
+ 'list-multi'):
form_grid.attach_next_to(self._warning_box,
self._widget,
Gtk.PositionType.RIGHT, 1, 1)
@@ -280,6 +285,7 @@ class BooleanField(Field):
self._widget = Gtk.CheckButton()
self._widget.set_active(field.value)
self._widget.connect('toggled', self._toggled)
+ self._widget.set_valign(Gtk.Align.CENTER)
def _toggled(self, _widget):
self._field.value = self._widget.get_active()
@@ -310,6 +316,7 @@ class ListSingleField(Field):
Field.__init__(self, field, form_grid, options)
self._widget = Gtk.ComboBoxText()
+ self._widget.set_valign(Gtk.Align.CENTER)
for value, label in field.iter_options():
if not label:
label = value
@@ -327,7 +334,7 @@ class ListMultiField(Field):
Field.__init__(self, field, form_grid, options)
self._label.set_valign(Gtk.Align.START)
- self._treeview = ListMutliTreeView(field)
+ self._treeview = ListMutliTreeView(field, self)
self._widget = Gtk.ScrolledWindow()
self._widget.set_propagate_natural_height(True)
@@ -335,12 +342,16 @@ class ListMultiField(Field):
self._widget.set_max_content_height(300)
self._widget.add(self._treeview)
+ def validate(self):
+ self._validate()
+
class ListMutliTreeView(Gtk.TreeView):
- def __init__(self, field):
+ def __init__(self, field, multi_field):
Gtk.TreeView.__init__(self)
self._field = field
+ self._multi_field = multi_field
self._store = Gtk.ListStore(str, str, bool)
@@ -374,6 +385,7 @@ class ListMutliTreeView(Gtk.TreeView):
current_value = self._store[iter_][2]
self._store.set_value(iter_, 2, not current_value)
self._set_values()
+ self._multi_field.validate()
def _set_values(self):
values = []
@@ -487,6 +499,7 @@ class TextSingleField(Field):
self._widget = Gtk.Entry()
self._widget.set_text(field.value)
self._widget.connect('changed', self._changed)
+ self._widget.set_valign(Gtk.Align.CENTER)
def _changed(self, _widget):
self._field.value = self._widget.get_text()
=====================================
gajim/gui_menu_builder.py
=====================================
@@ -427,11 +427,11 @@ control=None, gc_contact=None, is_anonymous=True):
con = app.connections[account]
if con and (con.get_module('PrivacyLists').supported or
con.get_module('Blocking').supported):
+ transport = app.get_transport_name_from_jid(jid,
use_config_setting=False)
if helpers.jid_is_blocked(account, jid):
block_menuitem.set_no_show_all(True)
block_menuitem.hide()
- if app.get_transport_name_from_jid(jid, use_config_setting=False)\
- and transport != 'jabber':
+ if transport != 'jabber':
unblock_menuitem.set_no_show_all(True)
unblock_menuitem.hide()
unignore_menuitem.set_no_show_all(False)
@@ -443,8 +443,7 @@ control=None, gc_contact=None, is_anonymous=True):
else:
unblock_menuitem.set_no_show_all(True)
unblock_menuitem.hide()
- if app.get_transport_name_from_jid(jid, use_config_setting=False)\
- and transport != 'jabber':
+ if transport != 'jabber':
block_menuitem.set_no_show_all(True)
block_menuitem.hide()
ignore_menuitem.set_no_show_all(False)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/29a7f5cda0f068795feee03deafe5ba645392a9d...1f626f51e6b74addeb7616152f13a2894769388a
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/29a7f5cda0f068795feee03deafe5ba645392a9d...1f626f51e6b74addeb7616152f13a2894769388a
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
