Daniel Brötzmann pushed to branch mainwindow at gajim / gajim
Commits:
0767454c by wurstsalat at 2021-07-19T21:13:46+02:00
Append group chat name in PM conversation
- - - - -
2 changed files:
- gajim/gtk/chat_list.py
- gajim/gtk/controls/chat.py
Changes:
=====================================
gajim/gtk/chat_list.py
=====================================
@@ -416,9 +416,10 @@ def update_avatar(self):
def update_name(self):
if self.type == 'pm':
client = app.get_client(self.account)
- muc_name = get_groupchat_name(client, self.jid)
+ muc_name = get_groupchat_name(client, self.jid.bare)
self._ui.name_label.set_text(f'{self.contact.name} ({muc_name})')
return
+
own_jid = self._client.get_own_jid().bare
if self.jid == own_jid:
self._ui.name_label.set_text(_('Note to myself'))
=====================================
gajim/gtk/controls/chat.py
=====================================
@@ -860,40 +860,35 @@ def update_ui(self):
def draw_banner_text(self):
"""
- Draw the text in the fat line at the top of the window that houses the
- name, jid
+ Draws the chat banner's text (e.g. name, chat state) in the top of the
+ chat window
"""
contact = self.contact
name = contact.name
- # if self.resource:
- # name += '/' + self.resource
- # if self._type.is_privatechat:
- # name = i18n.direction_mark + _(
- # '%(nickname)s from group chat %(room_name)s') % \
- # {'nickname': name, 'room_name': self.room_name}
- # name = i18n.direction_mark + GLib.markup_escape_text(name)
+ if self._type.is_privatechat:
+ name = f'{name} ({self.room_name})'
- cs = self.contact.chatstate
- if cs is not None:
- cs = cs.value
+ chatstate = self.contact.chatstate
+ if chatstate is not None:
+ chatstate = chatstate.value
if app.settings.get('show_chatstate_in_banner'):
- chatstate = helpers.get_uf_chatstate(cs)
+ chatstate = helpers.get_uf_chatstate(chatstate)
- label_text = '<span>%s</span><span size="x-small" weight="light">
%s</span>' % \
- (name, chatstate)
- label_tooltip = '%s %s' % (name, chatstate)
+ label_text = f'<span>{name}</span>' \
+ f'<span size="x-small" weight="light">' \
+ f'{chatstate}</span>'
+ label_tooltip = f'{name} {chatstate}'
else:
- label_text = '<span>%s</span>' % name
+ label_text = f'<span>{name}</span>'
label_tooltip = name
status_text = ''
self.xml.banner_label.hide()
self.xml.banner_label.set_no_show_all(True)
-
self.xml.banner_label.set_markup(status_text)
- # setup the label that holds name and jid
+
self.xml.banner_name_label.set_markup(label_text)
self.xml.banner_name_label.set_tooltip_text(label_tooltip)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/0767454c015f1c44f3293deb89c25289df85820b
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/0767454c015f1c44f3293deb89c25289df85820b
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
