changeset 2e1f9cb8c36e in /home/hg/repos/gajim

author: lovetox forenjunkie@chelo.at branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2e1f9cb8c36e description: Dont use deprecated method to set tooltip alignment

diffstat:

src/chat_control.py | 3 ++- src/dataforms_widget.py | 9 ++++++--- src/tooltips.py | 38 +++++++++++++++++++++++++------------- 3 files changed, 33 insertions(+), 17 deletions(-)

diffs (166 lines):

diff -r 28985e72cebd -r 2e1f9cb8c36e src/chat_control.py --- a/src/chat_control.py Sun Sep 25 23:21:51 2016 +0200 +++ b/src/chat_control.py Sun Sep 25 23:44:38 2016 +0200 @@ -1573,7 +1573,8 @@ content_area = self.info_bar.get_content_area() self.info_bar_label = Gtk.Label() self.info_bar_label.set_use_markup(True) - self.info_bar_label.set_alignment(0, 0) + self.info_bar_label.set_halign(Gtk.Align.START) + self.info_bar_label.set_valign(Gtk.Align.START) content_area.add(self.info_bar_label) self.info_bar.set_no_show_all(True) widget = self.xml.get_object('vbox2') diff -r 28985e72cebd -r 2e1f9cb8c36e src/dataforms_widget.py --- a/src/dataforms_widget.py Sun Sep 25 23:21:51 2016 +0200 +++ b/src/dataforms_widget.py Sun Sep 25 23:44:38 2016 +0200 @@ -553,7 +553,8 @@ widget = Gtk.Label(label=field.value) widget.set_property('selectable', selectable) widget.set_sensitive(True) - widget.set_alignment(0.0, 0.5) + widget.set_halign(Gtk.Align.START) + widget.set_valign(Gtk.Align.CENTER) widget=decorate_with_tooltip(widget, field) self.attach(widget, 1, 2, linecounter, linecounter+1, yoptions=Gtk.AttachOptions.FILL) @@ -561,9 +562,11 @@ if commonlabel and field.label is not None: label = Gtk.Label(label=field.label) if commonlabelcenter: - label.set_alignment(0.0, 0.5) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.CENTER) else: - label.set_alignment(0.0, 0.0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label = decorate_with_tooltip(label, field) self.attach(label, 0, 1, linecounter, linecounter+1, xoptions=Gtk.AttachOptions.FILL, yoptions=Gtk.AttachOptions.FILL) diff -r 28985e72cebd -r 2e1f9cb8c36e src/tooltips.py --- a/src/tooltips.py Sun Sep 25 23:21:51 2016 +0200 +++ b/src/tooltips.py Sun Sep 25 23:44:38 2016 +0200 @@ -255,7 +255,8 @@ self.current_row += 1 self.text_label = Gtk.Label() self.text_label.set_line_wrap(True) - self.text_label.set_alignment(0, 0) + self.text_label.set_halign(Gtk.Align.START) + self.text_label.set_valign(Gtk.Align.START) self.text_label.set_selectable(False) self.text_label.set_markup(text) self.table.attach(self.text_label, 1 + col_inc, self.current_row, @@ -292,14 +293,15 @@ image.set_from_file(f) break spacer = Gtk.Label(label=self.spacer_label) - image.set_halign(Gtk.Align.FILL) + image.set_halign(Gtk.Align.START) image.set_valign(Gtk.Align.CENTER) if indent: self.table.attach(spacer, 1, self.current_row, 1, 1) self.table.attach(image, 2, self.current_row, 1, 1) status_label = Gtk.Label() status_label.set_markup(str_status) - status_label.set_alignment(0, 0) + status_label.set_halign(Gtk.Align.START) + status_label.set_valign(Gtk.Align.START) status_label.set_line_wrap(True) self.table.attach(status_label, 3, self.current_row, 1, 1) if show_lock: @@ -363,7 +365,8 @@ self.account = None self.text_label = Gtk.Label() self.text_label.set_line_wrap(True) - self.text_label.set_alignment(0, 0) + self.text_label.set_halign(Gtk.Align.START) + self.text_label.set_valign(Gtk.Align.START) self.text_label.set_selectable(False) self.avatar_image = Gtk.Image()

@@ -432,14 +435,16 @@ label = Gtk.Label() if not properties: label.set_vexpand(True) - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) if property_[1]: label.set_markup(property_[0]) vcard_table.attach(label, 1, vcard_current_row, 1, 1) label = Gtk.Label() if not properties: label.set_vexpand(True) - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label.set_markup(property_[1]) label.set_line_wrap(True) vcard_table.attach(label, 2, vcard_current_row, 1, 1) @@ -448,7 +453,8 @@ label.set_line_wrap(True) vcard_table.attach(label, 1, vcard_current_row, 2, 1)

- self.avatar_image.set_alignment(0, 0) + self.avatar_image.set_halign(Gtk.Align.START) + self.avatar_image.set_valign(Gtk.Align.START) vcard_table.attach(self.avatar_image, 3, 2, 1, vcard_current_row - 1) gajim.plugin_manager.gui_extension_point('gc_tooltip_populate', self, contact, vcard_table) @@ -668,14 +674,16 @@ label = Gtk.Label() if not properties and table_size == 4: label.set_vexpand(True) - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) if property_[1]: label.set_markup(property_[0]) vcard_table.attach(label, 1, vcard_current_row, 1, 1) label = Gtk.Label() if not properties and table_size == 4: label.set_vexpand(True) - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label.set_markup(property_[1]) label.set_line_wrap(True) vcard_table.attach(label, 2, vcard_current_row, 1, 1) @@ -686,7 +694,8 @@ else: label = property_[0] vcard_table.attach(label, 1, vcard_current_row, 2, 1) - self.avatar_image.set_alignment(0, 0) + self.avatar_image.set_halign(Gtk.Align.START) + self.avatar_image.set_valign(Gtk.Align.START) if table_size == 4: vcard_table.attach(self.avatar_image, 3, 2, 1, vcard_current_row - 1)

@@ -793,12 +802,14 @@ property_ = properties.pop(0) current_row += 1 label = Gtk.Label() - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label.set_markup(property_[0]) ft_table.attach(label, 1, 2, current_row, current_row + 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0) label = Gtk.Label() - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label.set_line_wrap(True) label.set_markup(property_[1]) ft_table.attach(label, 2, 3, current_row, current_row + 1, @@ -815,7 +826,8 @@ self.create_window() label = Gtk.Label() label.set_line_wrap(True) - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label.set_selectable(False) if status == 1: label.set_text(