Commits February 2021

commits@gajim.org

1 participants
124 discussions

[Git][gajim/gajim][mainwindow] ChatList: Add group chat nicks
by Daniel Brötzmann 02 Feb '21

02 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 97dfbb01 by Daniel Brötzmann at 2021-02-02T19:42:06+01:00 ChatList: Add group chat nicks - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -9,6 +9,7 @@ from gajim.common.const import KindConstant from gajim.common.i18n import _ from gajim.common.helpers import get_groupchat_name +from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_uf_relative_time log = logging.getLogger('gajim.gtk.chatlist') @@ -167,14 +168,23 @@ def __init__(self, workspace_id, account, jid, type_): if line is not None and line.message is not None: one_line = ' '.join(line.message.splitlines()) last_message_label.set_text(one_line) - nick_label = Gtk.Label(label=_('Me:')) + nick_label = Gtk.Label() nick_label.set_halign(Gtk.Align.START) nick_label.get_style_context().add_class('small-label') nick_label.get_style_context().add_class('dim-label') if line.kind in (KindConstant.CHAT_MSG_SENT, KindConstant.SINGLE_MSG_SENT): + nick_label.set_text(_('Me:')) last_message_box.add(nick_label) - # TODO: MUC nick + if line.kind == KindConstant.GC_MSG: + our_nick = get_group_chat_nick(account, jid) + if line.contact_name == our_nick: + nick_label.set_text(_('Me:')) + else: + nick_label.set_text(_('%(muc_nick)s: ') % { + 'muc_nick': line.contact_name}) + last_message_box.add(nick_label) + # TODO: file transfers have to be displayed differently self._timestamp = line.time View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/97dfbb01b552f37cbb1444759e907ce7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/97dfbb01b552f37cbb1444759e907ce7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Paned: Improve ChatList resizing
by Daniel Brötzmann 02 Feb '21

02 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 3ff47301 by Daniel Brötzmann at 2021-02-02T19:24:16+01:00 Paned: Improve ChatList resizing - - - - - 517424b8 by Daniel Brötzmann at 2021-02-02T19:25:11+01:00 ChatList: Use groupchat name, improve ellipsizing - - - - - 2 changed files: - gajim/data/gui/main.ui - gajim/gtk/chat_list.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -317,8 +317,8 @@ </style> </object> <packing> - <property name="resize">True</property> - <property name="shrink">True</property> + <property name="resize">False</property> + <property name="shrink">False</property> </packing> </child> <child> ===================================== gajim/gtk/chat_list.py ===================================== @@ -8,6 +8,7 @@ from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.i18n import _ +from gajim.common.helpers import get_groupchat_name from gajim.common.helpers import get_uf_relative_time log = logging.getLogger('gajim.gtk.chatlist') @@ -118,32 +119,39 @@ def __init__(self, workspace_id, account, jid, type_): contact = app.contacts.get_contact(account, jid) - if contact and not contact.is_groupchat: - avatar = app.contacts.get_avatar(account, - contact.jid, - AvatarSize.ROSTER, - self.get_scale_factor(), - contact.show) - name = contact.get_shown_name() + scale = self.get_scale_factor() + if contact: + if contact.is_groupchat: + avatar = app.contacts.get_avatar(account, + jid, + AvatarSize.ROSTER, + scale) + con = app.connections[account] + name = get_groupchat_name(con, jid) + else: + avatar = app.contacts.get_avatar(account, + contact.jid, + AvatarSize.ROSTER, + scale, + contact.show) + name = contact.get_shown_name() else: avatar = app.contacts.get_avatar(account, jid, AvatarSize.ROSTER, - self.get_scale_factor()) + scale) name = jid avatar_image = Gtk.Image.new_from_surface(avatar) chat_name_label = Gtk.Label() chat_name_label.set_halign(Gtk.Align.START) chat_name_label.set_xalign(0) - chat_name_label.set_max_width_chars(18) chat_name_label.set_ellipsize(Pango.EllipsizeMode.END) chat_name_label.set_text(name) last_message_label = Gtk.Label() last_message_label.set_halign(Gtk.Align.START) last_message_label.set_xalign(0) - last_message_label.set_max_width_chars(20) last_message_label.set_ellipsize(Pango.EllipsizeMode.END) last_message_label.get_style_context().add_class('small-label') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3b4d96a92acfa73fafa512656ba4a06… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3b4d96a92acfa73fafa512656ba4a06… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Group chat avatars and message lines
by Daniel Brötzmann 01 Feb '21

01 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 3b4d96a9 by Daniel Brötzmann at 2021-02-01T20:29:45+01:00 ChatList: Group chat avatars and message lines - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -118,7 +118,7 @@ def __init__(self, workspace_id, account, jid, type_): contact = app.contacts.get_contact(account, jid) - if contact: + if contact and not contact.is_groupchat: avatar = app.contacts.get_avatar(account, contact.jid, AvatarSize.ROSTER, @@ -157,7 +157,8 @@ def __init__(self, workspace_id, account, jid, type_): line = app.storage.archive.get_last_conversation_line(account, jid) last_message_box = Gtk.Box(spacing=3) if line is not None and line.message is not None: - last_message_label.set_text(line.message) + one_line = ' '.join(line.message.splitlines()) + last_message_label.set_text(one_line) nick_label = Gtk.Label(label=_('Me:')) nick_label.set_halign(Gtk.Align.START) nick_label.get_style_context().add_class('small-label') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3b4d96a92acfa73fafa512656ba4a06c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3b4d96a92acfa73fafa512656ba4a06c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: ChatList: Add friendly timestamps
by Daniel Brötzmann 01 Feb '21

01 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 1c96ce9d by Daniel Brötzmann at 2021-02-01T20:01:53+01:00 ChatList: Add friendly timestamps - - - - - 8740fa22 by Daniel Brötzmann at 2021-02-01T20:08:45+01:00 ChatList: Unread counter styling - - - - - 3 changed files: - gajim/common/helpers.py - gajim/data/style/gajim.css - gajim/gtk/chat_list.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -49,6 +49,8 @@ import string from string import Template import urllib +from datetime import datetime +from datetime import timedelta from urllib.parse import unquote from encodings.punycode import punycode_encode from functools import wraps @@ -283,6 +285,30 @@ def get_uf_affiliation(affiliation, plural=False): affiliation_name = _('Member') return affiliation_name +def get_uf_relative_time(timestamp: int) -> str: + date_time = datetime.fromtimestamp(timestamp) + now = datetime.now() + timespan = now - date_time + + if timespan > timedelta(days=365): + return str(date_time.year) + if timespan > timedelta(days=7): + return date_time.strftime('%b %d') + if timespan > timedelta(days=2): + return date_time.strftime('%a') + if date_time.strftime('%d') != now.strftime('%d'): + return _('Yesterday') + if timespan > timedelta(minutes=15): + return date_time.strftime('%H:%M') + if timespan > timedelta(minutes=1): + minutes = int(timespan.seconds / 60) + return ngettext('%i min ago', + '%i mins ago', + minutes, + minutes, + minutes) + return _('Just now') + def get_sorted_keys(adict): keys = sorted(adict.keys()) return keys ===================================== gajim/data/style/gajim.css ===================================== @@ -159,12 +159,13 @@ margin-right: 6px; } .unread-counter { + background-color: rgb(22, 100, 169); color: rgb(242, 242, 242); + font-weight: bold; + font-size: 80%; padding-left: 6px; padding-right: 6px; border-radius: 10px; - font-size: 80%; - background-color: rgb(22, 100, 169); } /* VCardWindow */ ===================================== gajim/gtk/chat_list.py ===================================== @@ -1,16 +1,14 @@ import logging -from datetime import datetime - +from gi.repository import GLib from gi.repository import Gtk from gi.repository import Pango -from gi.repository import GLib from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.i18n import _ - +from gajim.common.helpers import get_uf_relative_time log = logging.getLogger('gajim.gtk.chatlist') @@ -24,11 +22,22 @@ def __init__(self, workspace_id): self._workspace_id = workspace_id self.get_style_context().add_class('chatlist') + self.connect('destroy', self._on_destroy) self.show_all() self.set_filter_func(self._filter_func) + self._timer_id = GLib.timeout_add_seconds(60, self._update_timer) + + def _on_destroy(self): + if self._timer_id is not None: + GLib.source_remove(self._timer_id) + + def _update_timer(self): + self.update() + GLib.timeout_add_seconds(60, self._update_timer) + def _filter_func(self, row): if not self._current_filter_text: return True @@ -76,6 +85,10 @@ def get_open_chats(self): open_chats.append(key + (value.type,)) return open_chats + def update(self): + for _, row in self._chats.items(): + row.update() + class ChatRow(Gtk.ListBoxRow): def __init__(self, workspace_id, account, jid, type_): @@ -85,6 +98,8 @@ def __init__(self, workspace_id, account, jid, type_): self.jid = jid self.workspace_id = workspace_id self.type = type_ + + self._timestamp = None self._unread_count = 0 self.get_style_context().add_class('chatlist-row') @@ -132,11 +147,11 @@ def __init__(self, workspace_id, account, jid, type_): last_message_label.set_ellipsize(Pango.EllipsizeMode.END) last_message_label.get_style_context().add_class('small-label') - timestamp_label = Gtk.Label() - timestamp_label.set_halign(Gtk.Align.END) - timestamp_label.set_valign(Gtk.Align.END) - timestamp_label.get_style_context().add_class('small-label') - timestamp_label.get_style_context().add_class('dim-label') + self._timestamp_label = Gtk.Label() + self._timestamp_label.set_halign(Gtk.Align.END) + self._timestamp_label.set_valign(Gtk.Align.END) + self._timestamp_label.get_style_context().add_class('small-label') + self._timestamp_label.get_style_context().add_class('dim-label') # Get last chat message from archive line = app.storage.archive.get_last_conversation_line(account, jid) @@ -153,10 +168,10 @@ def __init__(self, workspace_id, account, jid, type_): # TODO: MUC nick # TODO: file transfers have to be displayed differently - # TODO: Calculate user friendly timestamp for yesterday, etc. - date_time = datetime.fromtimestamp(line.time) - timestamp = date_time.strftime('%H:%M') - timestamp_label.set_text(timestamp) + self._timestamp = line.time + uf_timestamp = get_uf_relative_time(line.time) + self._timestamp_label.set_text(uf_timestamp) + last_message_box.add(last_message_label) self._unread_label = Gtk.Label() @@ -180,7 +195,7 @@ def __init__(self, workspace_id, account, jid, type_): meta_box = Gtk.Box(spacing=6) meta_box.pack_start(chat_name_label, False, True, 0) meta_box.pack_end(self._unread_label, False, True, 0) - meta_box.pack_end(timestamp_label, False, True, 0) + meta_box.pack_end(self._timestamp_label, False, True, 0) text_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) text_box.add(meta_box) @@ -208,6 +223,11 @@ def _on_state_flags_changed(self, _listboxrow, *args): def _on_close_button_clicked(self, _button): app.window.remove_chat(self.workspace_id, self.account, self.jid) + def update(self): + if self._timestamp is not None: + uf_timestamp = get_uf_relative_time(self._timestamp) + self._timestamp_label.set_text(uf_timestamp) + def set_unread(self, count): log.info('Set unread count: %s (%s)', self.jid, count) self._unread_count = count View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1634ed6e28abf7eb19a908fbe0305d1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1634ed6e28abf7eb19a908fbe0305d1… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2021