Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
73928836
by Philipp Hörist at 2018-08-17T22:10:10Z
-
042d8aa6
by Philipp Hörist at 2018-08-17T22:13:51Z
5 changed files:
- gajim/accounts_window.py
- gajim/chat_control_base.py
- gajim/filetransfers_window.py
- gajim/gtk/start_chat.py
- gajim/gtk/themes.py
Changes:
| ... | ... | @@ -313,7 +313,7 @@ class AddAccount(Gtk.Box): |
| 313 | 313 |
|
| 314 | 314 |
self.account = None
|
| 315 | 315 |
|
| 316 |
- self.label = Gtk.Label(_('Add Account…'))
|
|
| 316 |
+ self.label = Gtk.Label(label=_('Add Account…'))
|
|
| 317 | 317 |
self.label.set_halign(Gtk.Align.START)
|
| 318 | 318 |
self.label.set_hexpand(True)
|
| 319 | 319 |
|
| ... | ... | @@ -342,7 +342,7 @@ class Preferences(Gtk.Box): |
| 342 | 342 |
self.parent = parent
|
| 343 | 343 |
self.account = None
|
| 344 | 344 |
|
| 345 |
- self.label = Gtk.Label(_('Preferences'))
|
|
| 345 |
+ self.label = Gtk.Label(label=_('Preferences'))
|
|
| 346 | 346 |
self.label.set_halign(Gtk.Align.START)
|
| 347 | 347 |
self.label.set_hexpand(True)
|
| 348 | 348 |
|
| ... | ... | @@ -75,7 +75,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): |
| 75 | 75 |
A base class containing a banner, ConversationTextview, MessageTextView
|
| 76 | 76 |
"""
|
| 77 | 77 |
|
| 78 |
- keymap = Gdk.Keymap.get_default()
|
|
| 78 |
+ keymap = Gdk.Keymap.get_for_display(Gdk.Display.get_default())
|
|
| 79 | 79 |
try:
|
| 80 | 80 |
keycode_c = keymap.get_entries_for_keyval(Gdk.KEY_c)[1][0].keycode
|
| 81 | 81 |
except TypeError:
|
| ... | ... | @@ -1071,7 +1071,7 @@ class FileRow(Gtk.ListBoxRow): |
| 1071 | 1071 |
def __init__(self, path):
|
| 1072 | 1072 |
Gtk.ListBoxRow.__init__(self)
|
| 1073 | 1073 |
self.path = Path(path)
|
| 1074 |
- label = Gtk.Label(self.path.name)
|
|
| 1074 |
+ label = Gtk.Label(label=self.path.name)
|
|
| 1075 | 1075 |
label.set_ellipsize(Pango.EllipsizeMode.END)
|
| 1076 | 1076 |
label.set_xalign(0)
|
| 1077 | 1077 |
self.add(label)
|
| ... | ... | @@ -297,7 +297,7 @@ class ContactRow(Gtk.Grid): |
| 297 | 297 |
else:
|
| 298 | 298 |
self.name = _('New Contact')
|
| 299 | 299 |
|
| 300 |
- self.name_label = Gtk.Label(self.name)
|
|
| 300 |
+ self.name_label = Gtk.Label(label=self.name)
|
|
| 301 | 301 |
self.name_label.set_ellipsize(Pango.EllipsizeMode.END)
|
| 302 | 302 |
self.name_label.set_xalign(0)
|
| 303 | 303 |
self.name_label.set_width_chars(25)
|
| ... | ... | @@ -310,7 +310,7 @@ class ContactRow(Gtk.Grid): |
| 310 | 310 |
self.name_label.get_style_context().add_class(css_class)
|
| 311 | 311 |
middle_box.add(self.name_label)
|
| 312 | 312 |
|
| 313 |
- self.jid_label = Gtk.Label(jid)
|
|
| 313 |
+ self.jid_label = Gtk.Label(label=jid)
|
|
| 314 | 314 |
self.jid_label.set_ellipsize(Pango.EllipsizeMode.END)
|
| 315 | 315 |
self.jid_label.set_xalign(0)
|
| 316 | 316 |
self.jid_label.set_width_chars(25)
|
| ... | ... | @@ -320,7 +320,7 @@ class ContactRow(Gtk.Grid): |
| 320 | 320 |
self.add(middle_box)
|
| 321 | 321 |
|
| 322 | 322 |
if show_account:
|
| 323 |
- account_label = Gtk.Label(self.account_label)
|
|
| 323 |
+ account_label = Gtk.Label(label=self.account_label)
|
|
| 324 | 324 |
account_label.set_halign(Gtk.Align.START)
|
| 325 | 325 |
account_label.set_valign(Gtk.Align.START)
|
| 326 | 326 |
|
| ... | ... | @@ -409,7 +409,7 @@ class ChooseOption(Gtk.ListBoxRow): |
| 409 | 409 |
def __init__(self, option):
|
| 410 | 410 |
Gtk.ListBoxRow.__init__(self)
|
| 411 | 411 |
self.option = option
|
| 412 |
- label = Gtk.Label(option.label)
|
|
| 412 |
+ label = Gtk.Label(label=option.label)
|
|
| 413 | 413 |
label.set_xalign(0)
|
| 414 | 414 |
self.add(label)
|
| 415 | 415 |
self.show_all()
|