copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Dont use deprecated method to set tooltip alignment

Browse source
This commit is contained in:
lovetox 2016-09-25 23:44:38 +02:00
parent 93b1284fa5
commit d5526af3d0
3 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/chat_control.py
View file

@ -1573,7 +1573,8 @@ class ChatControl(ChatControlBase):
content_area = self.info_bar.get_content_area() content_area = self.info_bar.get_content_area()
self.info_bar_label = Gtk.Label() self.info_bar_label = Gtk.Label()
self.info_bar_label.set_use_markup(True) 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) content_area.add(self.info_bar_label)
self.info_bar.set_no_show_all(True) self.info_bar.set_no_show_all(True)
widget = self.xml.get_object('vbox2') widget = self.xml.get_object('vbox2')

9
src/dataforms_widget.py
View file

@ -553,7 +553,8 @@ class SingleForm(Gtk.Table, object):
widget = Gtk.Label(label=field.value) widget = Gtk.Label(label=field.value)
widget.set_property('selectable', selectable) widget.set_property('selectable', selectable)
widget.set_sensitive(True) 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) widget=decorate_with_tooltip(widget, field)
self.attach(widget, 1, 2, linecounter, linecounter+1, self.attach(widget, 1, 2, linecounter, linecounter+1,
yoptions=Gtk.AttachOptions.FILL) yoptions=Gtk.AttachOptions.FILL)
@ -561,9 +562,11 @@ class SingleForm(Gtk.Table, object):
if commonlabel and field.label is not None: if commonlabel and field.label is not None:
label = Gtk.Label(label=field.label) label = Gtk.Label(label=field.label)
if commonlabelcenter: if commonlabelcenter:
label.set_alignment(0.0, 0.5) label.set_halign(Gtk.Align.START)
label.set_valign(Gtk.Align.CENTER)
else: 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) label = decorate_with_tooltip(label, field)
self.attach(label, 0, 1, linecounter, linecounter+1, self.attach(label, 0, 1, linecounter, linecounter+1,
xoptions=Gtk.AttachOptions.FILL, yoptions=Gtk.AttachOptions.FILL) xoptions=Gtk.AttachOptions.FILL, yoptions=Gtk.AttachOptions.FILL)

38
src/tooltips.py
View file

@ -255,7 +255,8 @@ class StatusTable:
self.current_row += 1 self.current_row += 1
self.text_label = Gtk.Label() self.text_label = Gtk.Label()
self.text_label.set_line_wrap(True) 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_selectable(False)
self.text_label.set_markup(text) self.text_label.set_markup(text)
self.table.attach(self.text_label, 1 + col_inc, self.current_row, self.table.attach(self.text_label, 1 + col_inc, self.current_row,
@ -292,14 +293,15 @@ class StatusTable:
image.set_from_file(f) image.set_from_file(f)
break break
spacer = Gtk.Label(label=self.spacer_label) 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) image.set_valign(Gtk.Align.CENTER)
if indent: if indent:
self.table.attach(spacer, 1, self.current_row, 1, 1) self.table.attach(spacer, 1, self.current_row, 1, 1)
self.table.attach(image, 2, self.current_row, 1, 1) self.table.attach(image, 2, self.current_row, 1, 1)
status_label = Gtk.Label() status_label = Gtk.Label()
status_label.set_markup(str_status) 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) status_label.set_line_wrap(True)
self.table.attach(status_label, 3, self.current_row, 1, 1) self.table.attach(status_label, 3, self.current_row, 1, 1)
if show_lock: if show_lock:
@ -363,7 +365,8 @@ class GCTooltip(BaseTooltip):
self.account = None self.account = None
self.text_label = Gtk.Label() self.text_label = Gtk.Label()
self.text_label.set_line_wrap(True) 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_selectable(False)
self.avatar_image = Gtk.Image() self.avatar_image = Gtk.Image()
@ -432,14 +435,16 @@ class GCTooltip(BaseTooltip):
label = Gtk.Label() label = Gtk.Label()
if not properties: if not properties:
label.set_vexpand(True) label.set_vexpand(True)
label.set_alignment(0, 0) label.set_halign(Gtk.Align.START)
label.set_valign(Gtk.Align.START)
if property_[1]: if property_[1]:
label.set_markup(property_[0]) label.set_markup(property_[0])
vcard_table.attach(label, 1, vcard_current_row, 1, 1) vcard_table.attach(label, 1, vcard_current_row, 1, 1)
label = Gtk.Label() label = Gtk.Label()
if not properties: if not properties:
label.set_vexpand(True) 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_markup(property_[1])
label.set_line_wrap(True) label.set_line_wrap(True)
vcard_table.attach(label, 2, vcard_current_row, 1, 1) vcard_table.attach(label, 2, vcard_current_row, 1, 1)
@ -448,7 +453,8 @@ class GCTooltip(BaseTooltip):
label.set_line_wrap(True) label.set_line_wrap(True)
vcard_table.attach(label, 1, vcard_current_row, 2, 1) 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) vcard_table.attach(self.avatar_image, 3, 2, 1, vcard_current_row - 1)
gajim.plugin_manager.gui_extension_point('gc_tooltip_populate', gajim.plugin_manager.gui_extension_point('gc_tooltip_populate',
self, contact, vcard_table) self, contact, vcard_table)
@ -668,14 +674,16 @@ class RosterTooltip(NotificationAreaTooltip):
label = Gtk.Label() label = Gtk.Label()
if not properties and table_size == 4: if not properties and table_size == 4:
label.set_vexpand(True) label.set_vexpand(True)
label.set_alignment(0, 0) label.set_halign(Gtk.Align.START)
label.set_valign(Gtk.Align.START)
if property_[1]: if property_[1]:
label.set_markup(property_[0]) label.set_markup(property_[0])
vcard_table.attach(label, 1, vcard_current_row, 1, 1) vcard_table.attach(label, 1, vcard_current_row, 1, 1)
label = Gtk.Label() label = Gtk.Label()
if not properties and table_size == 4: if not properties and table_size == 4:
label.set_vexpand(True) 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_markup(property_[1])
label.set_line_wrap(True) label.set_line_wrap(True)
vcard_table.attach(label, 2, vcard_current_row, 1, 1) vcard_table.attach(label, 2, vcard_current_row, 1, 1)
@ -686,7 +694,8 @@ class RosterTooltip(NotificationAreaTooltip):
else: else:
label = property_[0] label = property_[0]
vcard_table.attach(label, 1, vcard_current_row, 2, 1) 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: if table_size == 4:
vcard_table.attach(self.avatar_image, 3, 2, 1, vcard_current_row - 1) vcard_table.attach(self.avatar_image, 3, 2, 1, vcard_current_row - 1)
@ -793,12 +802,14 @@ class FileTransfersTooltip(BaseTooltip):
property_ = properties.pop(0) property_ = properties.pop(0)
current_row += 1 current_row += 1
label = Gtk.Label() 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]) label.set_markup(property_[0])
ft_table.attach(label, 1, 2, current_row, current_row + 1, ft_table.attach(label, 1, 2, current_row, current_row + 1,
Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0) Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0)
label = Gtk.Label() 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_line_wrap(True)
label.set_markup(property_[1]) label.set_markup(property_[1])
ft_table.attach(label, 2, 3, current_row, current_row + 1, ft_table.attach(label, 2, 3, current_row, current_row + 1,
@ -815,7 +826,8 @@ class ServiceDiscoveryTooltip(BaseTooltip):
self.create_window() self.create_window()
label = Gtk.Label() label = Gtk.Label()
label.set_line_wrap(True) 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) label.set_selectable(False)
if status == 1: if status == 1:
label.set_text( label.set_text(