Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Don’t notify on messages from ourself
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 72d0d568 by lovetox at 2021-02-06T13:49:57+01:00 Don’t notify on messages from ourself - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -149,9 +149,20 @@ def _on_message_received(self, event): return row = self._chats.get((event.account, event.jid)) - row.add_unread() row.set_last_message_text('Me', event.msgtxt) + self._add_unread(row, event.properties) + + @staticmethod + def _add_unread(row, properties): + if properties.is_carbon_message and properties.carbon.is_sent: + return + + if properties.is_from_us(): + return + + row.add_unread() + class ChatRow(Gtk.ListBoxRow): def __init__(self, workspace_id, account, jid, type_): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/72d0d56894a06d2ea4237f2f02214b21… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/72d0d56894a06d2ea4237f2f02214b21… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Dont allow chats to be opened multiple times
by Philipp Hörist 06 Feb '21

06 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 69416bf4 by lovetox at 2021-02-06T10:37:49+01:00 Dont allow chats to be opened multiple times - - - - - 6 changed files: - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gtk/start_chat.py - gajim/gtk/workspace_side_bar.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -37,6 +37,10 @@ def __init__(self, workspace_id): self.show_all() + @property + def workspace_id(self): + return self._workspace_id + def get_unread_count(self): return sum([chats.unread_count for chats in self._chats.values()]) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -20,6 +20,9 @@ class ChatListStack(Gtk.Stack): 'unread-count-changed': (GObject.SignalFlags.RUN_LAST, None, (str, int)), + 'chat-selected': (GObject.SignalFlags.RUN_LAST, + None, + (str, str, str)), } def __init__(self, main_window, ui, chat_stack): @@ -92,6 +95,7 @@ def _on_row_selected(self, _chat_list, row): self._chat_stack.show_chat(row.account, row.jid) if row.is_active: row.reset_unread() + self.emit('chat-selected', row.workspace_id, row.account, row.jid) def show_chat_list(self, workspace_id): current_workspace_id = self.get_visible_child_name() @@ -111,9 +115,12 @@ def add_chat(self, workspace_id, account, jid, type_): chat_list = self.add_chat_list(workspace_id) chat_list.add_chat(account, jid, type_) - def select_chat(self, workspace_id, account, jid): - self.show_chat_list(workspace_id) - chat_list = self._chat_lists.get(workspace_id) + def select_chat(self, account, jid): + chat_list = self._find_chat(account, jid) + if chat_list is None: + return + + self.show_chat_list(chat_list.workspace_id) chat_list.select_chat(account, jid) def store_open_chats(self, workspace_id): ===================================== gajim/gtk/main.py ===================================== @@ -205,19 +205,38 @@ def _add_group_chat(self, _action, param): account, jid = param.unpack() self.add_group_chat(account, jid) - def add_group_chat(self, account, jid): + def add_group_chat(self, account, jid, select=False): workspace_id = self._workspace_side_bar.get_active_workspace() - self.add_chat_for_workspace(workspace_id, account, jid, 'groupchat') + self.add_chat_for_workspace(workspace_id, + account, + jid, + 'groupchat', + select=select) def _add_chat(self, _action, param): account, jid, type_ = param.unpack() self.add_chat(account, jid, type_) - def add_chat(self, account, jid, type_): + def add_chat(self, account, jid, type_, select=False): workspace_id = self._workspace_side_bar.get_active_workspace() - self.add_chat_for_workspace(workspace_id, account, jid, type_) + self.add_chat_for_workspace(workspace_id, + account, + jid, + type_, + select=select) + + def add_chat_for_workspace(self, + workspace_id, + account, + jid, + type_, + select=False): + + if self.chat_exists(account, jid): + if select: + self._chat_list_stack.select_chat(account, jid) + return - def add_chat_for_workspace(self, workspace_id, account, jid, type_): if type_ == 'groupchat': self._chat_stack.add_group_chat(account, jid) else: @@ -225,7 +244,8 @@ def add_chat_for_workspace(self, workspace_id, account, jid, type_): self._chat_list_stack.add_chat(workspace_id, account, jid, type_) if self._startup_finished: - self._chat_list_stack.select_chat(workspace_id, account, jid) + if select: + self._chat_list_stack.select_chat(account, jid) self._chat_list_stack.store_open_chats(workspace_id) def _remove_chat(self, _action, param): @@ -242,10 +262,6 @@ def chat_exists_for_workspace(self, workspace_id, account, jid): return self._chat_list_stack.contains_chat( account, jid, workspace_id=workspace_id) - def select_chat(self, workspace_id, account, jid): - self._workspace_side_bar.activate_workspace(workspace_id) - self._chat_list_stack.select_chat(workspace_id, account, jid) - def get_control(self, account, jid): return self._chat_stack.get_control(account, jid) ===================================== gajim/gtk/start_chat.py ===================================== @@ -295,8 +295,7 @@ def _start_new_chat(self, row): self._disco_muc(row.account, row.jid, request_vcard=row.new) else: - # app.interface.new_chat_from_jid(row.account, row.jid) - app.window.add_chat(row.account, row.jid, 'contact') + app.window.add_chat(row.account, row.jid, 'contact', select=True) self.ready_to_destroy = True self.destroy() ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -22,12 +22,17 @@ def __init__(self, chat_list_stack): chat_list_stack.connect('unread-count-changed', self._on_unread_count_changed) + chat_list_stack.connect('chat-selected', + self._on_chat_selected) self._workspaces = {} def _on_unread_count_changed(self, _chat_list_stack, workspace_id, count): workspace = self._workspaces[workspace_id] workspace.set_unread_count(count) + def _on_chat_selected(self, _chat_list_stack, workspace_id, *args): + self.activate_workspace(workspace_id) + @staticmethod def _sort_func(child1, child2): if child1.sort_index < child2.sort_index: ===================================== gajim/gui_interface.py ===================================== @@ -1469,16 +1469,11 @@ def create_groupchat(self, account, room_jid, config=None): app.connections[account].get_module('MUC').create(muc_data) def show_add_join_groupchat(self, account, jid, nickname=None): - workspace_id = app.window.get_active_workspace() - if app.window.chat_exists_for_workspace(workspace_id, account, jid): - app.window.select_chat(workspace_id, account, jid) - return - if not app.window.chat_exists(account, jid): client = app.get_client(account) client.get_module('MUC').join(jid, nick=nickname) - app.window.add_group_chat(account, str(jid)) + app.window.add_group_chat(account, str(jid), select=True) @staticmethod def _on_muc_added(_muc_manger, _signal_name, account, jid): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/69416bf47c898e2661687870430e16c1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/69416bf47c898e2661687870430e16c1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Unread count improv
by Philipp Hörist 05 Feb '21

05 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 23b50cc6 by lovetox at 2021-02-05T22:00:17+01:00 Unread count improv - - - - - b5fcbd49 by lovetox at 2021-02-05T22:04:05+01:00 Add unread count to workspace - - - - - 4 changed files: - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -37,10 +37,19 @@ def __init__(self, workspace_id): self.show_all() + def get_unread_count(self): + return sum([chats.unread_count for chats in self._chats.values()]) + + def emit_unread_changed(self): + count = self.get_unread_count() + self.get_parent().emit('unread-count-changed', + self._workspace_id, + count) + def is_visible(self): return self.get_parent().get_property('child-widget') == self - def _on_destroy(self): + def _on_destroy(self, *args): GLib.source_remove(self._timer_id) def _update_timer(self): @@ -220,6 +229,16 @@ def __init__(self, workspace_id, account, jid, type_): self.show_all() + @property + def unread_count(self): + return self._unread_count + + @unread_count.setter + def unread_count(self, value): + self._unread_count = value + self._update_unread() + self.get_parent().emit_unread_changed() + @property def is_active(self): return (self.is_selected() and @@ -241,23 +260,19 @@ def update_time(self): get_uf_relative_time(self._timestamp)) def _update_unread(self): - print('Update unread', self.account, self.jid, self._unread_count) if self._unread_count < 1000: self._ui.unread_label.set_text(str(self._unread_count)) else: self._ui.unread_label.set_text('999+') - self._ui.unread_label.set_text(str(self._unread_count)) self._ui.unread_label.set_visible(bool(self._unread_count)) def add_unread(self): if self.is_active: return - self._unread_count += 1 - self._update_unread() + self.unread_count += 1 def reset_unread(self): - self._unread_count = 0 - self._update_unread() + self.unread_count = 0 def set_last_message_text(self, nickname, text): self._ui.message_label.set_text(text) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -1,5 +1,6 @@ from gi.repository import Gtk +from gi.repository import GObject from gajim.common import app @@ -14,6 +15,13 @@ class ChatListStack(Gtk.Stack): + + __gsignals__ = { + 'unread-count-changed': (GObject.SignalFlags.RUN_LAST, + None, + (str, int)), + } + def __init__(self, main_window, ui, chat_stack): Gtk.Stack.__init__(self) self.set_hexpand(True) ===================================== gajim/gtk/main.py ===================================== @@ -49,7 +49,7 @@ def __init__(self): self._ui.chat_list_scrolled.add(self._chat_list_stack) self._account_side_bar = AccountSideBar() - self._workspace_side_bar = WorkspaceSideBar() + self._workspace_side_bar = WorkspaceSideBar(self._chat_list_stack) surface = load_icon('org.gajim.Gajim', self, 40) self._ui.app_image.set_from_surface(surface) @@ -107,7 +107,6 @@ def __init__(self): ('muc-configuration-finished', ged.GUI1, self._on_event), ('muc-configuration-failed', ged.GUI1, self._on_event), ('update-room-avatar', ged.GUI1, self._on_event), - ('message-sent', ged.OUT_POSTCORE, self._on_event), ('message-error', ged.GUI1, self._on_event), ]) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -10,7 +10,7 @@ class WorkspaceSideBar(Gtk.ListBox): - def __init__(self): + def __init__(self, chat_list_stack): Gtk.ListBox.__init__(self) self.set_vexpand(True) self.set_valign(Gtk.Align.START) @@ -20,8 +20,14 @@ def __init__(self): self.connect('button-press-event', self._on_button_press) self.connect('row-activated', self._on_row_activated) + chat_list_stack.connect('unread-count-changed', + self._on_unread_count_changed) self._workspaces = {} + def _on_unread_count_changed(self, _chat_list_stack, workspace_id, count): + workspace = self._workspaces[workspace_id] + workspace.set_unread_count(count) + @staticmethod def _sort_func(child1, child2): if child1.sort_index < child2.sort_index: @@ -92,7 +98,6 @@ def __init__(self, workspace_id): CommonWorkspace.__init__(self, workspace_id) self.sort_index = 0 - self._unread_count = 0 self._unread_label = Gtk.Label() self._unread_label.get_style_context().add_class( @@ -111,31 +116,15 @@ def __init__(self, workspace_id): self.add(overlay) self.show_all() - @property - def is_active(self): - return (self.is_selected() and - self.get_toplevel().get_property('is-active')) - def update_avatar(self): self._image.update() - def _update_unread(self): - print('Update unread', self.workspace_id, self._unread_count) - if self._unread_count < 1000: - self._unread_label.set_text(str(self._unread_count)) + def set_unread_count(self, count): + if count < 1000: + self._unread_label.set_text(str(count)) else: self._unread_label.set_text('999+') - self._unread_label.set_visible(bool(self._unread_count)) - - def add_unread(self): - if self.is_active: - return - self._unread_count += 1 - self._update_unread() - - def reset_unread(self): - self._unread_count = 0 - self._update_unread() + self._unread_label.set_visible(bool(count)) class AddWorkspace(CommonWorkspace): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5731c0ec3ce72b820e4deaa99d97732… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5731c0ec3ce72b820e4deaa99d97732… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] WorkspaceSidebar: Add unread counter
by Daniel Brötzmann 05 Feb '21

05 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 5731c0ec by wurstsalat at 2021-02-05T21:25:02+01:00 WorkspaceSidebar: Add unread counter - - - - - 3 changed files: - gajim/data/style/gajim.css - gajim/gtk/chat_list.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -61,11 +61,11 @@ /* Workspace sidebar */ .workspace-sidebar { background: transparent; - margin-left: 12px; - margin-right: 12px; + margin-left: 12px; + margin-right: 6px; } .workspace-sidebar-item { - padding-top: 6px; + padding-top: 0px; padding-bottom: 6px; } .workspace-sidebar-item:selected, @@ -80,6 +80,8 @@ } .workspace-sidebar-item image { border-radius: 9px; + margin-top: 6px; + margin-right: 6px; } /* Account sidebar */ ===================================== gajim/gtk/chat_list.py ===================================== @@ -242,6 +242,10 @@ def update_time(self): def _update_unread(self): print('Update unread', self.account, self.jid, self._unread_count) + if self._unread_count < 1000: + self._ui.unread_label.set_text(str(self._unread_count)) + else: + self._ui.unread_label.set_text('999+') self._ui.unread_label.set_text(str(self._unread_count)) self._ui.unread_label.set_visible(bool(self._unread_count)) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -92,15 +92,51 @@ def __init__(self, workspace_id): CommonWorkspace.__init__(self, workspace_id) self.sort_index = 0 + self._unread_count = 0 + + self._unread_label = Gtk.Label() + self._unread_label.get_style_context().add_class( + 'unread-counter') + self._unread_label.set_no_show_all(True) + self._unread_label.set_halign(Gtk.Align.END) + self._unread_label.set_valign(Gtk.Align.START) self._image = WorkspaceAvatar(workspace_id) self._image.set_halign(Gtk.Align.CENTER) - self.add(self._image) + + overlay = Gtk.Overlay() + overlay.add(self._image) + overlay.add_overlay(self._unread_label) + + self.add(overlay) self.show_all() + @property + def is_active(self): + return (self.is_selected() and + self.get_toplevel().get_property('is-active')) + def update_avatar(self): self._image.update() + def _update_unread(self): + print('Update unread', self.workspace_id, self._unread_count) + if self._unread_count < 1000: + self._unread_label.set_text(str(self._unread_count)) + else: + self._unread_label.set_text('999+') + self._unread_label.set_visible(bool(self._unread_count)) + + def add_unread(self): + if self.is_active: + return + self._unread_count += 1 + self._update_unread() + + def reset_unread(self): + self._unread_count = 0 + self._update_unread() + class AddWorkspace(CommonWorkspace): def __init__(self, workspace_id): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5731c0ec3ce72b820e4deaa99d977323… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5731c0ec3ce72b820e4deaa99d977323… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix more events
by Philipp Hörist 05 Feb '21

05 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 615eb3f4 by lovetox at 2021-02-05T16:59:16+01:00 Fix more events - - - - - 5 changed files: - gajim/common/modules/mam.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/history_sync.py - gajim/gtk/main.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -161,7 +161,7 @@ def _mam_message_received(self, _con, stanza, properties): return app.nec.push_incoming_event( - NetworkIncomingEvent('mam-message-received', + NetworkIncomingEvent('raw-mam-message-received', account=self._account, stanza=stanza, properties=properties)) @@ -245,7 +245,7 @@ def _mam_message_received(self, _con, stanza, properties): message_id=properties.id) app.nec.push_incoming_event( - NetworkEvent('mam-decrypted-message-received', + NetworkEvent('mam-message-received', account=self._account, additional_data=additional_data, correct_id=parse_correction(properties), @@ -253,6 +253,7 @@ def _mam_message_received(self, _con, stanza, properties): msgtxt=properties.body, properties=properties, kind=kind, + jid=str(properties.jid.bare) ) ) ===================================== gajim/gtk/chat_list.py ===================================== @@ -124,7 +124,9 @@ def update_time(self): row.update_time() def process_event(self, event): - if event.name == 'message-received': + if event.name in ('message-received', + 'mam-message-received', + 'gc-message-received'): self._on_message_received(event) else: log.warning('Unhandled Event: %s', event.name) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -7,7 +7,9 @@ HANDLED_EVENTS = [ - 'message-received' + 'message-received', + 'mam-message-received', + 'gc-message-received', ] ===================================== gajim/gtk/history_sync.py ===================================== @@ -95,7 +95,7 @@ def __init__(self, account, parent): self.register_events([ ('archiving-count-received', ged.GUI1, self._received_count), ('archiving-interval-finished', ged.GUI1, self._received_finished), - ('mam-message-received', ged.PRECORE, self._nec_mam_message_received), + ('raw-mam-message-received', ged.PRECORE, self._nec_mam_message_received), ]) # pylint: enable=line-too-long ===================================== gajim/gtk/main.py ===================================== @@ -78,6 +78,7 @@ def __init__(self): ('message-sent', ged.OUT_POSTCORE, self._on_event), ('message-received', ged.CORE, self._on_event), ('mam-message-received', ged.CORE, self._on_event), + ('gc-message-received', ged.CORE, self._on_event), ('receipt-received', ged.GUI1, self._on_event), ('displayed-received', ged.GUI1, self._on_event), ('message-error', ged.GUI1, self._on_event), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/615eb3f4f5be0784b58e43fe1bcd2b2c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/615eb3f4f5be0784b58e43fe1bcd2b2c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Reset unread counter
by Philipp Hörist 05 Feb '21

05 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: abc60184 by lovetox at 2021-02-05T16:40:23+01:00 Reset unread counter - - - - - 6 changed files: - gajim/common/modules/chatstates.py - gajim/groupchat_control.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gtk/util.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -135,6 +135,7 @@ def _presence_received(self, app.nec.push_outgoing_event( NetworkEvent('chatstate-received', account=self._account, + jid=contact.jid, contact=contact)) def _process_chatstate(self, _con, _stanza, properties): @@ -163,6 +164,7 @@ def _process_chatstate(self, _con, _stanza, properties): app.nec.push_outgoing_event( NetworkEvent('chatstate-received', account=self._account, + jid=contact.jid, contact=contact)) @ensure_enabled ===================================== gajim/groupchat_control.py ===================================== @@ -963,7 +963,7 @@ def check_focus_out_line(self): - remove previous line first """ - if app.window.is_chat_focused(self.account, self.room_jid): + if app.window.is_chat_active(self.account, self.room_jid): return self.conv_textview.show_focus_out_line() ===================================== gajim/gtk/chat_list.py ===================================== @@ -37,6 +37,9 @@ def __init__(self, workspace_id): self.show_all() + def is_visible(self): + return self.get_parent().get_property('child-widget') == self + def _on_destroy(self): GLib.source_remove(self._timer_id) @@ -101,12 +104,11 @@ def remove_chat(self, account, jid): self.remove(row) row.destroy() - def get_active_chat(self): + def get_selected_chat(self): row = self.get_selected_row() if row is None: return None - - return (row.account, row.jid) + return row def contains_chat(self, account, jid): return self._chats.get((account, jid)) is not None @@ -132,9 +134,7 @@ def _on_message_received(self, event): return row = self._chats.get((event.account, event.jid)) - if not (row.is_selected() and - self.get_toplevel().get_property('has-toplevel-focus')): - row.add_unread() + row.add_unread() row.set_last_message_text('Me', event.msgtxt) @@ -218,6 +218,11 @@ def __init__(self, workspace_id, account, jid, type_): self.show_all() + @property + def is_active(self): + return (self.is_selected() and + self.get_toplevel().get_property('is-active')) + def _on_state_flags_changed(self, _listboxrow, *args): state = self.get_state_flags() if (state & Gtk.StateFlags.PRELIGHT) != 0: @@ -233,10 +238,20 @@ def update_time(self): self._ui.timestamp_label.set_text( get_uf_relative_time(self._timestamp)) + def _update_unread(self): + print('Update unread', self.account, self.jid, self._unread_count) + self._ui.unread_label.set_text(str(self._unread_count)) + self._ui.unread_label.set_visible(bool(self._unread_count)) + def add_unread(self): + if self.is_active: + return self._unread_count += 1 - self._ui.unread_label.set_text(str(self._unread_count)) - self._ui.unread_label.show() + self._update_unread() + + def reset_unread(self): + self._unread_count = 0 + self._update_unread() def set_last_message_text(self, nickname, text): self._ui.message_label.set_text(text) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -12,7 +12,7 @@ class ChatListStack(Gtk.Stack): - def __init__(self, ui, chat_stack): + def __init__(self, main_window, ui, chat_stack): Gtk.Stack.__init__(self) self.set_hexpand(True) self.set_vexpand(True) @@ -28,19 +28,30 @@ def __init__(self, ui, chat_stack): self._ui.search_entry.connect( 'search-changed', self._on_search_changed) - def get_active_chat(self): + main_window.connect('notify::is-active', self._on_window_active) + + def _on_window_active(self, window, _param): + is_active = window.get_property('is-active') + if is_active: + chat = self.get_selected_chat() + if chat is not None: + chat.reset_unread() + + def get_selected_chat(self): workspace_id = self.get_visible_child_name() if workspace_id == 'empty': return None chat_list = self._chat_lists[workspace_id] - return chat_list.get_active_chat() + return chat_list.get_selected_chat() def is_chat_active(self, account, jid): - active = self.get_active_chat() - if active is None: + chat = self.get_selected_chat() + if chat is None: return False - return active == (account, jid) + if chat.account != account or chat.jid != jid: + return False + return chat.is_active def _on_search_changed(self, search_entry): chat_list = self.get_visible_child() @@ -67,7 +78,10 @@ def _on_row_selected(self, _chat_list, row): if row is None: self._chat_stack.clear() return + self._chat_stack.show_chat(row.account, row.jid) + if row.is_active: + row.reset_unread() def show_chat_list(self, workspace_id): current_workspace_id = self.get_visible_child_name() ===================================== gajim/gtk/main.py ===================================== @@ -45,7 +45,7 @@ def __init__(self): self.add(self._ui.main_grid) self._chat_stack = ChatStack() - self._chat_list_stack = ChatListStack(self._ui, self._chat_stack) + self._chat_list_stack = ChatListStack(self, self._ui, self._chat_stack) self._ui.chat_list_scrolled.add(self._chat_list_stack) self._account_side_bar = AccountSideBar() @@ -158,10 +158,7 @@ def get_workspace_bar(self): def get_active_workspace(self): return self._workspace_side_bar.get_active_workspace() - def get_active_chat(self): - return self._chat_list_stack.get_active_chat() - - def is_chat_focused(self, account, jid): + def is_chat_active(self, account, jid): if not self.get_property('has-toplevel-focus'): return False return self._chat_list_stack.is_chat_active(account, jid) ===================================== gajim/gtk/util.py ===================================== @@ -856,3 +856,36 @@ def _destroy(*args): def check_finalize(obj, name): weakref.finalize(obj, print, f'{name} has been finalized') + + +def _connect_destroy(sender, func, detailed_signal, handler, *args, **kwargs): + """Connect a bound method to a foreign object signal and disconnect + if the object the method is bound to emits destroy (Gtk.Widget subclass). + Also works if the handler is a nested function in a method and + references the method's bound object. + This solves the problem that the sender holds a strong reference + to the bound method and the bound to object doesn't get GCed. + """ + + if hasattr(handler, "__self__"): + obj = handler.__self__ + else: + # XXX: get the "self" var of the enclosing scope. + # Used for nested functions which ref the object but aren't methods. + # In case they don't ref "self" normal connect() should be used anyway. + index = handler.__code__.co_freevars.index("self") + obj = handler.__closure__[index].cell_contents + + assert obj is not sender + + handler_id = func(detailed_signal, handler, *args, **kwargs) + + def disconnect_cb(*args): + sender.disconnect(handler_id) + + obj.connect('destroy', disconnect_cb) + return handler_id + + +def connect_destroy(sender, *args, **kwargs): + return _connect_destroy(sender, sender.connect, *args, **kwargs) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/abc6018484ac131058f52b1fdfb1960d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/abc6018484ac131058f52b1fdfb1960d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix some events
by Philipp Hörist 05 Feb '21

05 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 848e20e5 by lovetox at 2021-02-05T15:27:49+01:00 Fix some events - - - - - 4 changed files: - gajim/chat_control.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -567,6 +567,9 @@ def _on_mam_message_received(self, event): additional_data=event.additional_data) def _on_message_received(self, event): + if not event.msgtxt: + return + typ = '' if event.properties.is_sent_carbon: typ = 'out' @@ -608,16 +611,16 @@ def _on_message_sent(self, event): correct_id=event.correct_id, additional_data=event.additional_data) - def _receipt_received(self, event): + def _on_receipt_received(self, event): self.conv_textview.show_receipt(event.receipt_id) - def _displayed_received(self, event): + def _on_displayed_received(self, event): self.conv_textview.show_displayed(event.marker_id) def _on_zeroconf_error(self, event): self.add_status_message(event.message) - def _on_update_roster_avatar(self, obj): + def _on_update_roster_avatar(self, _event): self._update_avatar() def _nec_ping(self, event): ===================================== gajim/gtk/chat_list.py ===================================== @@ -128,6 +128,9 @@ def process_event(self, event): log.warning('Unhandled Event: %s', event.name) def _on_message_received(self, event): + if not event.msgtxt: + return + row = self._chats.get((event.account, event.jid)) if not (row.is_selected() and self.get_toplevel().get_property('has-toplevel-focus')): ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -6,6 +6,11 @@ from gajim.gui.chat_list import ChatList +HANDLED_EVENTS = [ + 'message-received' +] + + class ChatListStack(Gtk.Stack): def __init__(self, ui, chat_stack): Gtk.Stack.__init__(self) @@ -122,6 +127,9 @@ def contains_chat(self, account, jid, workspace_id=None): return chat_list.contains_chat(account, jid) def process_event(self, event): + if event.name not in HANDLED_EVENTS: + return + if hasattr(event, 'jid'): jid = event.jid else: ===================================== gajim/gtk/main.py ===================================== @@ -77,6 +77,7 @@ def __init__(self): ('caps-update', ged.GUI1, self._on_event), ('message-sent', ged.OUT_POSTCORE, self._on_event), ('message-received', ged.CORE, self._on_event), + ('mam-message-received', ged.CORE, self._on_event), ('receipt-received', ged.GUI1, self._on_event), ('displayed-received', ged.GUI1, self._on_event), ('message-error', ged.GUI1, self._on_event), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/848e20e56987e9b83497b2d9a218eac2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/848e20e56987e9b83497b2d9a218eac2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Move event handling to main
by Philipp Hörist 04 Feb '21

04 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 9367879d by lovetox at 2021-02-04T23:09:09+01:00 Move event handling to main - - - - - 9 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/modules/message.py - gajim/groupchat_control.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_stack.py - gajim/gtk/main.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -41,13 +41,11 @@ from gajim.common import app from gajim.common import helpers -from gajim.common import ged from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import open_uri from gajim.common.helpers import geo_provider_from_location -from gajim.common.helpers import event_filter from gajim.common.helpers import open_file from gajim.common.contacts import GC_Contact from gajim.common.const import AvatarSize @@ -215,30 +213,6 @@ def __init__(self, parent_win, contact, acct, session, resource=None): self.restore_conversation() self.msg_textview.grab_focus() - # pylint: disable=line-too-long - self.register_events([ - ('nickname-received', ged.GUI1, self._on_nickname_received), - ('mood-received', ged.GUI1, self._on_mood_received), - ('activity-received', ged.GUI1, self._on_activity_received), - ('tune-received', ged.GUI1, self._on_tune_received), - ('location-received', ged.GUI1, self._on_location_received), - ('update-client-info', ged.GUI1, self._on_update_client_info), - ('chatstate-received', ged.GUI1, self._on_chatstate_received), - ('caps-update', ged.GUI1, self._on_caps_update), - ('message-sent', ged.OUT_POSTCORE, self._on_message_sent), - ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), - # ('decrypted-message-received', ged.GUI1, self._on_decrypted_message_received), - ('receipt-received', ged.GUI1, self._receipt_received), - ('displayed-received', ged.GUI1, self._displayed_received), - ('message-error', ged.GUI1, self._on_message_error), - ('zeroconf-error', ged.GUI1, self._on_zeroconf_error), - ]) - - if self._type.is_chat: - # Don’t connect this when PrivateChatControl is used - self.register_event('update-roster-avatar', ged.GUI1, self._on_update_roster_avatar) - # pylint: enable=line-too-long - # PluginSystem: adding GUI extension point for this ChatControl # instance object app.plugin_manager.gui_extension_point('chat_control', self) @@ -524,29 +498,23 @@ def _get_pep_widget(self, type_): return self.xml.location_image return None - @event_filter(['account', 'jid']) def _on_mood_received(self, _event): self._update_pep(PEPEventType.MOOD) - @event_filter(['account', 'jid']) def _on_activity_received(self, _event): self._update_pep(PEPEventType.ACTIVITY) - @event_filter(['account', 'jid']) def _on_tune_received(self, _event): self._update_pep(PEPEventType.TUNE) - @event_filter(['account', 'jid']) def _on_location_received(self, _event): self._update_pep(PEPEventType.LOCATION) - @event_filter(['account', 'jid']) def _on_nickname_received(self, _event): self.update_ui() self.parent_win.redraw_tab(self) self.parent_win.show_title() - @event_filter(['account', 'jid']) def _on_update_client_info(self, event): contact = app.contacts.get_contact( self.account, event.jid, event.resource) @@ -554,7 +522,6 @@ def _on_update_client_info(self, event): return self.xml.phone_image.set_visible(contact.uses_phone) - @event_filter(['account']) def _on_chatstate_received(self, event): if self._type.is_privatechat: if event.contact != self.gc_contact: @@ -573,7 +540,6 @@ def _on_chatstate_received(self, event): self.account, self.contact.jid) self.parent_win.redraw_tab(self, chatstate) - @event_filter(['account']) def _on_caps_update(self, event): if self._type.is_chat and event.jid != self.contact.jid: return @@ -581,11 +547,7 @@ def _on_caps_update(self, event): return self.update_ui() - @event_filter(['account']) - def _on_mam_decrypted_message_received(self, event): - if event.properties.type.is_groupchat: - return - + def _on_mam_message_received(self, event): if event.properties.is_muc_pm: if not event.properties.jid == self.contact.get_full_jid(): return @@ -604,11 +566,24 @@ def _on_mam_decrypted_message_received(self, event): message_id=event.properties.id, additional_data=event.additional_data) - @event_filter(['account', 'jid']) + def _on_message_received(self, event): + typ = '' + if event.properties.is_sent_carbon: + typ = 'out' + + self.add_message(event.msgtxt, + typ, + tim=event.properties.timestamp, + subject=event.properties.subject, + displaymarking=event.displaymarking, + msg_log_id=event.msg_log_id, + message_id=event.properties.id, + correct_id=event.correct_id, + additional_data=event.additional_data) + def _on_message_error(self, event): self.conv_textview.show_error(event.message_id, event.error) - @event_filter(['account', 'jid']) def _on_message_sent(self, event): if not event.message: return @@ -633,23 +608,18 @@ def _on_message_sent(self, event): correct_id=event.correct_id, additional_data=event.additional_data) - @event_filter(['account', 'jid']) def _receipt_received(self, event): self.conv_textview.show_receipt(event.receipt_id) - @event_filter(['account', 'jid']) def _displayed_received(self, event): self.conv_textview.show_displayed(event.marker_id) - @event_filter(['account', 'jid']) def _on_zeroconf_error(self, event): self.add_status_message(event.message) - @event_filter(['account', 'jid']) def _on_update_roster_avatar(self, obj): self._update_avatar() - @event_filter(['account']) def _nec_ping(self, event): if self.contact != event.contact: return ===================================== gajim/chat_control_base.py ===================================== @@ -255,7 +255,7 @@ def __init__(self, parent_win, widget_name, contact, acct, # pylint: disable=line-too-long self.register_events([ - ('our-show', ged.GUI1, self._nec_our_status), + ('our-show', ged.GUI1, self._on_our_show), ('ping-sent', ged.GUI1, self._nec_ping), ('ping-reply', ged.GUI1, self._nec_ping), ('ping-error', ged.GUI1, self._nec_ping), @@ -268,6 +268,11 @@ def __init__(self, parent_win, widget_name, contact, acct, # to properly use the super, because of the old code. CommandTools.__init__(self) + def process_event(self, event): + method_name = event.name.replace('-', '_') + method_name = f'_on_{method_name}' + getattr(self, method_name)(event) + def _on_conv_textview_key_press_event(self, textview, event): if event.get_state() & Gdk.ModifierType.SHIFT_MASK: if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): @@ -443,8 +448,7 @@ def remove_session(self, session): self.session.control = None self.session = None - @event_filter(['account']) - def _nec_our_status(self, event): + def _on_our_show(self, event): if event.show == 'connecting': return @@ -452,8 +456,6 @@ def _nec_our_status(self, event): self.got_disconnected() else: self.got_connected() - if self.parent_win: - self.parent_win.redraw_tab(self) def _nec_ping(self, obj): raise NotImplementedError ===================================== gajim/common/modules/message.py ===================================== @@ -212,6 +212,24 @@ def _message_received(self, _con, stanza, properties): app.nec.push_incoming_event( NetworkEvent('message-received', **event_attr)) + log_type = KindConstant.CHAT_MSG_RECV + if properties.is_sent_carbon: + log_type = KindConstant.CHAT_MSG_SENT + + if not should_log(self._account, jid) or not msgtxt: + return + + app.storage.archive.insert_into_logs( + self._account, + fjid if properties.is_muc_pm else jid, + properties.timestamp, + log_type, + message=msgtxt, + subject=properties.subject, + additional_data=additional_data, + stanza_id=stanza_id or message_id, + message_id=properties.id) + def _message_error_received(self, _con, _stanza, properties): jid = properties.jid if not properties.is_muc_pm: ===================================== gajim/groupchat_control.py ===================================== @@ -55,7 +55,6 @@ from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from gajim.common.const import Chatstate from gajim.common.const import MUCJoinedState from gajim.common.structs import OutgoingMessage @@ -193,43 +192,12 @@ def __init__(self, parent_win, contact, muc_data, acct): self.xml.settings_menu.set_menu_model(self.control_menu) - # pylint: disable=line-too-long - self.register_events([ - ('muc-creation-failed', ged.GUI1, self._on_muc_creation_failed), - ('muc-joined', ged.GUI1, self._on_muc_joined), - ('muc-join-failed', ged.GUI1, self._on_muc_join_failed), - ('muc-user-joined', ged.GUI1, self._on_user_joined), - ('muc-user-left', ged.GUI1, self._on_user_left), - ('muc-nickname-changed', ged.GUI1, self._on_nickname_changed), - ('muc-self-presence', ged.GUI1, self._on_self_presence), - ('muc-self-kicked', ged.GUI1, self._on_self_kicked), - ('muc-user-affiliation-changed', ged.GUI1, self._on_affiliation_changed), - ('muc-user-status-show-changed', ged.GUI1, self._on_status_show_changed), - ('muc-user-role-changed', ged.GUI1, self._on_role_changed), - ('muc-destroyed', ged.GUI1, self._on_destroyed), - ('muc-presence-error', ged.GUI1, self._on_presence_error), - ('muc-password-required', ged.GUI1, self._on_password_required), - ('muc-config-changed', ged.GUI1, self._on_config_changed), - ('muc-subject', ged.GUI1, self._on_subject), - ('muc-captcha-challenge', ged.GUI1, self._on_captcha_challenge), - ('muc-captcha-error', ged.GUI1, self._on_captcha_error), - ('muc-voice-request', ged.GUI1, self._on_voice_request), - ('muc-disco-update', ged.GUI1, self._on_disco_update), - ('muc-configuration-finished', ged.GUI1, self._on_configuration_finished), - ('muc-configuration-failed', ged.GUI1, self._on_configuration_failed), - ('gc-message-received', ged.GUI1, self._on_gc_message_received), - ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), - ('update-room-avatar', ged.GUI1, self._on_update_room_avatar), - ('decrypted-message-received', ged.GUI2, self._on_decrypted_message_received), - ('message-sent', ged.OUT_POSTCORE, self._on_message_sent), - ('message-error', ged.GUI1, self._on_message_error), - ('bookmarks-received', ged.GUI2, self._on_bookmarks_received), - ]) - app.settings.connect_signal('gc_print_join_left_default', self.update_actions) app.settings.connect_signal('gc_print_status_default', self.update_actions) - # pylint: enable=line-too-long + self.register_events([ + ('bookmarks-received', ged.GUI1, self._on_bookmarks_received), + ]) self.is_connected = False # disable win, we are not connected yet @@ -491,8 +459,7 @@ def _show_page(self, name): def _get_current_page(self): return self.xml.stack.get_visible_child_name() - @event_filter(['account', 'room_jid']) - def _on_disco_update(self, _event): + def _on_muc_disco_update(self, _event): if self.parent_win is None: return self.update_actions() @@ -802,15 +769,10 @@ def draw_banner_text(self): def _on_update_room_avatar(self, event): self._update_avatar() - @event_filter(['account']) def _on_bookmarks_received(self, _event): - if self.parent_win is None: - return - self.parent_win.redraw_tab(self) self.draw_banner_text() - @event_filter(['account', 'room_jid']) - def _on_voice_request(self, event): + def _on_muc_voice_request(self, event): def on_approve(): con = app.connections[self.account] con.get_module('MUC').approve_voice_request(self.room_jid, @@ -826,8 +788,7 @@ def on_approve(): callback=on_approve)], modal=False).show() - @event_filter(['account']) - def _on_mam_decrypted_message_received(self, event): + def _on_mam_message_received(self, event): if not event.properties.type.is_groupchat: return if event.archive_jid != self.room_jid: @@ -839,7 +800,6 @@ def _on_mam_decrypted_message_received(self, event): message_id=event.properties.id, additional_data=event.additional_data) - @event_filter(['account', 'room_jid']) def _on_gc_message_received(self, event): if event.properties.muc_nickname is None: # message from server @@ -1036,8 +996,7 @@ def needs_visual_notification(self, text): found_here = text.find(special_word, start) return False - @event_filter(['account', 'room_jid']) - def _on_subject(self, event): + def _on_muc_subject(self, event): if self.subject == event.subject or event.is_fake: # Probably a rejoin, we already showed that subject return @@ -1055,8 +1014,7 @@ def _on_subject(self, event): self._muc_data.state != MUCJoinedState.JOINING): self.add_info_message(text) - @event_filter(['account', 'room_jid']) - def _on_config_changed(self, event): + def _on_muc_config_changed(self, event): # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify changes = [] if StatusCode.SHOWING_UNAVAILABLE in event.status_codes: @@ -1094,8 +1052,7 @@ def _on_config_changed(self, event): for change in changes: self.add_info_message(change) - @event_filter(['account']) - def _on_decrypted_message_received(self, event): + def _on_message_received(self, event): if not event.properties.jid.bare_match(self.room_jid): return @@ -1113,16 +1070,12 @@ def _on_decrypted_message_received(self, event): msg_log_id=event.msg_log_id, displaymarking=event.displaymarking) - @event_filter(['account']) - def _nec_our_status(self, event): + def _on_our_show(self, event): client = app.get_client(event.account) if (event.show == 'offline' and not client.state.is_reconnect_scheduled): self.got_disconnected() - if self.parent_win: - self.parent_win.redraw_tab(self) - @event_filter(['account']) def _nec_ping(self, event): if not event.contact.is_groupchat: @@ -1163,8 +1116,7 @@ def send_pm(self, nick, message=None): if message is not None: ctrl.send_message(message) - @event_filter(['account', 'room_jid']) - def _on_self_presence(self, event): + def _on_muc_self_presence(self, event): nick = event.properties.muc_nickname status_codes = event.properties.muc_status_codes or [] @@ -1189,20 +1141,17 @@ def _on_self_presence(self, event): # Update Actions self.update_actions() - @event_filter(['account', 'room_jid']) - def _on_configuration_finished(self, _event): + def _on_muc_configuration_finished(self, _event): self.got_connected() self._show_page('groupchat') self.add_info_message(_('A new group chat has been created')) - @event_filter(['account', 'room_jid']) - def _on_configuration_failed(self, event): + def _on_muc_configuration_failed(self, event): self.xml.error_heading.set_text(_('Failed to Configure Group Chat')) self.xml.error_label.set_text(to_user_string(event.error)) self._show_page('error') - @event_filter(['account', 'room_jid']) - def _on_nickname_changed(self, event): + def _on_muc_nickname_changed(self, event): nick = event.properties.muc_nickname new_nick = event.properties.muc_user.nick if event.properties.is_muc_self_presence: @@ -1225,7 +1174,7 @@ def _on_nickname_changed(self, event): self.roster.add_contact(new_nick) @event_filter(['account', 'room_jid']) - def _on_status_show_changed(self, event): + def _on_muc_user_status_show_changed(self, event): nick = event.properties.muc_nickname status = event.properties.status status = '' if status is None else ' - %s' % status @@ -1246,8 +1195,7 @@ def _on_status_show_changed(self, event): self.add_status_message(message) self.roster.draw_contact(nick) - @event_filter(['account', 'room_jid']) - def _on_affiliation_changed(self, event): + def _on_muc_affiliation_changed(self, event): affiliation = helpers.get_uf_affiliation( event.properties.affiliation) nick = event.properties.muc_nickname @@ -1277,8 +1225,7 @@ def _on_affiliation_changed(self, event): self.roster.add_contact(nick) self.update_actions() - @event_filter(['account', 'room_jid']) - def _on_role_changed(self, event): + def _on_muc_user_role_changed(self, event): role = helpers.get_uf_role(event.properties.role) nick = event.properties.muc_nickname reason = event.properties.muc_user.reason @@ -1305,8 +1252,7 @@ def _on_role_changed(self, event): self.roster.add_contact(nick) self.update_actions() - @event_filter(['account', 'room_jid']) - def _on_self_kicked(self, event): + def _on_muc_self_kicked(self, event): status_codes = event.properties.muc_status_codes or [] reason = event.properties.muc_user.reason @@ -1363,8 +1309,7 @@ def _on_self_kicked(self, event): # Update Actions self.update_actions() - @event_filter(['account', 'room_jid']) - def _on_user_left(self, event): + def _on_muc_user_left(self, event): status_codes = event.properties.muc_status_codes or [] nick = event.properties.muc_nickname @@ -1422,24 +1367,20 @@ def _on_user_left(self, event): self.roster.remove_contact(nick) self.roster.draw_groups() - @event_filter(['account', 'room_jid']) def _on_muc_joined(self, _event): self.got_connected() self._show_page('groupchat') - @event_filter(['account', 'room_jid']) - def _on_user_joined(self, event): + def _on_muc_user_joined(self, event): nick = event.properties.muc_nickname self.roster.add_contact(nick) if self.is_connected and self.contact.settings.get('print_join_left'): self.add_info_message(_('%s has joined the group chat') % nick) - @event_filter(['account', 'room_jid']) - def _on_password_required(self, _event): + def _on_muc_password_required(self, _event): self._show_page('password') - @event_filter(['account', 'room_jid']) def _on_muc_join_failed(self, event): con = app.connections[self.account] if con.get_module('Bookmarks').is_bookmark(self.room_jid): @@ -1449,19 +1390,16 @@ def _on_muc_join_failed(self, event): self.xml.error_label.set_text(to_user_string(event.error)) self._show_page('error') - @event_filter(['account', 'room_jid']) def _on_muc_creation_failed(self, event): self.xml.error_heading.set_text(_('Failed to Create Group Chat')) self.xml.error_label.set_text(to_user_string(event.error)) self._show_page('error') - @event_filter(['account', 'room_jid']) - def _on_presence_error(self, event): + def _on_muc_presence_error(self, event): error_message = to_user_string(event.properties.error) self.add_info_message('Error: %s' % error_message) - @event_filter(['account', 'room_jid']) - def _on_destroyed(self, event): + def _on_muc_destroyed(self, event): destroyed = event.properties.muc_destroyed reason = destroyed.reason @@ -1958,8 +1896,7 @@ def _on_password_changed(self, entry, _param): def _on_password_cancel_clicked(self, _button=None): self._close_control() - @event_filter(['account', 'room_jid']) - def _on_captcha_challenge(self, event): + def _on_muc_captcha_challenge(self, event): self._remove_captcha_request() options = {'no-scrolling': True, @@ -1978,8 +1915,7 @@ def _on_captcha_challenge(self, event): self._show_page('captcha') self._captcha_request.focus_first_entry() - @event_filter(['account', 'room_jid']) - def _on_captcha_error(self, event): + def _on_muc_captcha_error(self, event): self.xml.captcha_error_label.set_text(event.error_text) self._show_page('captcha-error') ===================================== gajim/gtk/chat_list.py ===================================== @@ -14,7 +14,7 @@ from .tooltips import RosterTooltip from .util import get_builder -log = logging.getLogger('gajim.gtk.chatlist') +log = logging.getLogger('gajim.gui.chatlist') class ChatList(Gtk.ListBox): @@ -121,9 +121,17 @@ def update_time(self): for _, row in self._chats.items(): row.update_time() - def update(self, event): + def process_event(self, event): + if event.name == 'message-received': + self._on_message_received(event) + else: + log.warning('Unhandled Event: %s', event.name) + + def _on_message_received(self, event): row = self._chats.get((event.account, event.jid)) - row.add_unread() + if not (row.is_selected() and + self.get_toplevel().get_property('has-toplevel-focus')): + row.add_unread() row.set_last_message_text('Me', event.msgtxt) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -121,6 +121,10 @@ def contains_chat(self, account, jid, workspace_id=None): chat_list = self._chat_lists[workspace_id] return chat_list.contains_chat(account, jid) - def update(self, event): - chat_list = self._find_chat(event.account, event.jid) - chat_list.update(event) + def process_event(self, event): + if hasattr(event, 'jid'): + jid = event.jid + else: + jid = event.room_jid + chat_list = self._find_chat(event.account, jid) + chat_list.process_event(event) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -1,4 +1,5 @@ +import logging from gi.repository import Gtk @@ -9,6 +10,9 @@ from gajim.common.i18n import _ +log = logging.getLogger('gajim.gui.chatstack') + + class ChatStack(Gtk.Stack): def __init__(self): Gtk.Stack.__init__(self) @@ -84,19 +88,10 @@ def show_chat(self, account, jid): def clear(self): self.set_visible_child_name('empty') - def update(self, event): - control = self.get_control(event.account, event.jid) - - typ = '' - if event.properties.is_sent_carbon: - typ = 'out' - - control.add_message(event.msgtxt, - typ, - tim=event.properties.timestamp, - subject=event.properties.subject, - displaymarking=event.displaymarking, - msg_log_id=event.msg_log_id, - message_id=event.properties.id, - correct_id=event.correct_id, - additional_data=event.additional_data) + def process_event(self, event): + if hasattr(event, 'jid'): + jid = event.jid + else: + jid = event.room_jid + control = self.get_control(event.account, jid) + control.process_event(event) ===================================== gajim/gtk/main.py ===================================== @@ -18,12 +18,15 @@ from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog +from gajim.common.nec import EventHelper + from .util import open_window -class MainWindow(Gtk.ApplicationWindow): +class MainWindow(Gtk.ApplicationWindow, EventHelper): def __init__(self): Gtk.ApplicationWindow.__init__(self) + EventHelper.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_title('Gajim') @@ -62,9 +65,49 @@ def __init__(self): 'clicked', self._on_start_chat_clicked) self._ui.connect_signals(self) - app.ged.register_event_handler('message-received', - ged.CORE, - self._on_message_received) + # pylint: disable=line-too-long + self.register_events([ + ('nickname-received', ged.GUI1, self._on_event), + ('mood-received', ged.GUI1, self._on_event), + ('activity-received', ged.GUI1, self._on_event), + ('tune-received', ged.GUI1, self._on_event), + ('location-received', ged.GUI1, self._on_event), + ('update-client-info', ged.GUI1, self._on_event), + ('chatstate-received', ged.GUI1, self._on_event), + ('caps-update', ged.GUI1, self._on_event), + ('message-sent', ged.OUT_POSTCORE, self._on_event), + ('message-received', ged.CORE, self._on_event), + ('receipt-received', ged.GUI1, self._on_event), + ('displayed-received', ged.GUI1, self._on_event), + ('message-error', ged.GUI1, self._on_event), + ('zeroconf-error', ged.GUI1, self._on_event), + ('update-roster-avatar', ged.GUI1, self._on_event), + ('muc-creation-failed', ged.GUI1, self._on_event), + ('muc-joined', ged.GUI1, self._on_event), + ('muc-join-failed', ged.GUI1, self._on_event), + ('muc-user-joined', ged.GUI1, self._on_event), + ('muc-user-left', ged.GUI1, self._on_event), + ('muc-nickname-changed', ged.GUI1, self._on_event), + ('muc-self-presence', ged.GUI1, self._on_event), + ('muc-self-kicked', ged.GUI1, self._on_event), + ('muc-user-affiliation-changed', ged.GUI1, self._on_event), + ('muc-user-status-show-changed', ged.GUI1, self._on_event), + ('muc-user-role-changed', ged.GUI1, self._on_event), + ('muc-destroyed', ged.GUI1, self._on_event), + ('muc-presence-error', ged.GUI1, self._on_event), + ('muc-password-required', ged.GUI1, self._on_event), + ('muc-config-changed', ged.GUI1, self._on_event), + ('muc-subject', ged.GUI1, self._on_event), + ('muc-captcha-challenge', ged.GUI1, self._on_event), + ('muc-captcha-error', ged.GUI1, self._on_event), + ('muc-voice-request', ged.GUI1, self._on_event), + ('muc-disco-update', ged.GUI1, self._on_event), + ('muc-configuration-finished', ged.GUI1, self._on_event), + ('muc-configuration-failed', ged.GUI1, self._on_event), + ('update-room-avatar', ged.GUI1, self._on_event), + ('message-sent', ged.OUT_POSTCORE, self._on_event), + ('message-error', ged.GUI1, self._on_event), + ]) self.show_all() @@ -241,15 +284,29 @@ def _on_edit_workspace_clicked(self, _button): open_window('WorkspaceDialog', workspace_id=self.get_active_workspace()) - def _on_message_received(self, event): - if not self.chat_exists(event.account, event.jid): - self.add_chat(event.account, event.jid, 'contact') + def _on_event(self, event): + if hasattr(event, 'jid'): + jid = event.jid + else: + jid = event.room_jid + + if event.name == 'caps-update': + #TODO + return - if not event.msgtxt: + if event.name == 'update-client-info': + #TODO return - self._chat_stack.update(event) - self._chat_list_stack.update(event) + if not self.chat_exists(event.account, jid): + if event.name == 'message-received': + self.add_chat(event.account, jid, 'contact') + else: + # No chat is open, dont handle any gui events + return + + self._chat_stack.process_event(event) + self._chat_list_stack.process_event(event) def quit(self): accounts = list(app.connections.keys()) ===================================== gajim/privatechat_control.py ===================================== @@ -88,13 +88,11 @@ def room_name(self): def get_our_nick(self): return self.room_ctrl.nick - @event_filter(['account']) def _on_caps_update(self, event): if event.fjid != self.gc_contact.get_full_jid(): return self.update_contact() - @event_filter(['account']) def _on_nickname_changed(self, event): if event.properties.new_jid != self.gc_contact.get_full_jid(): return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9367879d628c98a0b67e6454939773c5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9367879d628c98a0b67e6454939773c5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Add RosterTooltip
by Daniel Brötzmann 03 Feb '21

03 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 1f221fbb by Daniel Brötzmann at 2021-02-03T19:09:25+01:00 ChatList: Add RosterTooltip - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -11,7 +11,8 @@ from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_uf_relative_time -from gajim.gui.util import get_builder +from .tooltips import RosterTooltip +from .util import get_builder log = logging.getLogger('gajim.gtk.chatlist') @@ -25,13 +26,16 @@ 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.set_has_tooltip(True) + + self.connect('destroy', self._on_destroy) + self.connect('query-tooltip', self._query_tooltip) self._timer_id = GLib.timeout_add_seconds(60, self._update_timer) + self._tab_tooltip = RosterTooltip() + + self.show_all() def _on_destroy(self): GLib.source_remove(self._timer_id) @@ -40,6 +44,32 @@ def _update_timer(self): self.update_time() return True + def _query_tooltip(self, widget, _x_pos, y_pos, _keyboard_mode, tooltip): + row = self.get_row_at_y(y_pos) + if row is None: + self._tab_tooltip.clear_tooltip() + return False + + connected_contacts = [] + contacts = app.contacts.get_contacts(row.account, row.jid) + if row.type == 'contact': + for contact in contacts: + if contact.show not in ('offline', 'error'): + connected_contacts.append(contact) + if not connected_contacts: + # no connected contacts, show the offline one + connected_contacts = contacts + elif row.type == 'groupchat': + connected_contacts = contacts + else: + # TODO + connected_contacts = [row.jid] + + value, widget = self._tab_tooltip.get_tooltip( + row, connected_contacts, row.account, None) + tooltip.set_custom(widget) + return value + def _filter_func(self, row): if not self._current_filter_text: return True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1f221fbba69244c85786a21018f95533… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1f221fbba69244c85786a21018f95533… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Move ui to glade file
by Daniel Brötzmann 03 Feb '21

03 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 2f4bae19 by Daniel Brötzmann at 2021-02-03T10:38:28+01:00 ChatList: Move ui to glade file - - - - - 3 changed files: - + gajim/data/gui/chat_list_row.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list.py Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkOverlay" id="overlay"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkBox" id="account_identifier"> + <property name="width-request">6</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="margin-end">6</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <style> + <class name="account-identifier-bar"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="avatar_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-end">12</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="name_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="timestamp_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">end</property> + <style> + <class name="small-label"/> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="unread_label"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <style> + <class name="unread-counter"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel" id="nick_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="single-line-mode">True</property> + <property name="xalign">0</property> + <style> + <class name="small-label"/> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="message_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="xalign">0</property> + <style> + <class name="small-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="index">-1</property> + </packing> + </child> + <child type="overlay"> + <object class="GtkRevealer" id="revealer"> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="transition-type">crossfade</property> + <property name="transition-duration">100</property> + <child> + <object class="GtkButton" id="close_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Close</property> + <property name="valign">center</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">window-close-symbolic</property> + </object> + </child> + <style> + <class name="revealer-close-button"/> + <class name="flat"/> + </style> + </object> + </child> + </object> + </child> + </object> +</interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -126,8 +126,8 @@ .chatlist-row { transition: none; padding: 0px; - margin-left: 6px; - margin-right: 6px; + margin-left: 12px; + margin-right: 12px; margin-bottom: 3px; border-radius: 6px; } @@ -142,7 +142,7 @@ background-color: shade(@theme_base_color, 0.9); outline: none; } -.chatlist-row:selected label { +.chatlist-row:selected label:not(.unread-counter){ color: @theme_text_color; } .chatlist-row:selected button { ===================================== gajim/gtk/chat_list.py ===================================== @@ -2,7 +2,6 @@ from gi.repository import GLib from gi.repository import Gtk -from gi.repository import Pango from gajim.common import app from gajim.common.const import AvatarSize @@ -12,6 +11,8 @@ from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_uf_relative_time +from gajim.gui.util import get_builder + log = logging.getLogger('gajim.gtk.chatlist') @@ -110,17 +111,16 @@ def __init__(self, workspace_id, account, jid, type_): self.get_style_context().add_class('chatlist-row') + self._ui = get_builder('chat_list_row.ui') + self.add(self._ui.overlay) + self.connect('state-flags-changed', self._on_state_flags_changed) + self._ui.close_button.connect('clicked', self._on_close_button_clicked) - account_bar = Gtk.Box() - account_bar.set_size_request(6, -1) - account_bar.set_no_show_all(True) account_class = app.css_config.get_dynamic_class(account) - account_bar.get_style_context().add_class(account_class) - account_bar.get_style_context().add_class( - 'account-identifier-bar') + self._ui.account_identifier.get_style_context().add_class(account_class) if len(app.get_enabled_accounts_with_labels()) > 1: - account_bar.show() + self._ui.account_identifier.show() contact = app.contacts.get_contact(account, jid) @@ -147,116 +147,56 @@ def __init__(self, workspace_id, account, jid, type_): 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_ellipsize(Pango.EllipsizeMode.END) - chat_name_label.set_text(name) - - self._last_message_label = Gtk.Label() - self._last_message_label.set_halign(Gtk.Align.START) - self._last_message_label.set_xalign(0) - self._last_message_label.set_ellipsize(Pango.EllipsizeMode.END) - self._last_message_label.get_style_context().add_class('small-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') + self._ui.avatar_image.set_from_surface(avatar) + self._ui.name_label.set_text(name) # Get last chat message from archive 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: one_line = ' '.join(line.message.splitlines()) - - self._last_message_label.set_text(one_line) - self._nick_label = Gtk.Label() - self._nick_label.set_halign(Gtk.Align.START) - self._nick_label.get_style_context().add_class('small-label') - self._nick_label.get_style_context().add_class('dim-label') + self._ui.message_label.set_text(one_line) if line.kind in (KindConstant.CHAT_MSG_SENT, KindConstant.SINGLE_MSG_SENT): - self._nick_label.set_text(_('Me:')) - last_message_box.add(self._nick_label) + self._ui.nick_label.set_text(_('Me:')) + self._ui.nick_label.show() + if line.kind == KindConstant.GC_MSG: our_nick = get_group_chat_nick(account, jid) if line.contact_name == our_nick: - self._nick_label.set_text(_('Me:')) + self._ui.nick_label.set_text(_('Me:')) else: - self._nick_label.set_text(_('%(muc_nick)s: ') % { + self._ui.nick_label.set_text(_('%(muc_nick)s: ') % { 'muc_nick': line.contact_name}) - last_message_box.add(self._nick_label) + self._ui.nick_label.show() - # TODO: file transfers have to be displayed differently + # TODO: file transfers have to be displayed differently self._timestamp = line.time uf_timestamp = get_uf_relative_time(line.time) - self._timestamp_label.set_text(uf_timestamp) - - last_message_box.add(self._last_message_label) - - self._unread_label = Gtk.Label() - self._unread_label.set_no_show_all(True) - self._unread_label.set_halign(Gtk.Align.END) - self._unread_label.get_style_context().add_class('unread-counter') - - close_button = Gtk.Button.new_from_icon_name( - 'window-close-symbolic', Gtk.IconSize.BUTTON) - close_button.set_valign(Gtk.Align.CENTER) - close_button.set_tooltip_text(_('Close')) - close_button.get_style_context().add_class('revealer-close-button') - close_button.get_style_context().add_class('flat') - close_button.connect('clicked', self._on_close_button_clicked) - self._revealer = Gtk.Revealer() - self._revealer.set_transition_type( - Gtk.RevealerTransitionType.CROSSFADE) - self._revealer.set_halign(Gtk.Align.END) - self._revealer.add(close_button) - - 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(self._timestamp_label, False, True, 0) - - text_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) - text_box.add(meta_box) - text_box.add(last_message_box) - - main_box = Gtk.Box(spacing=12) - main_box.pack_start(account_bar, False, True, 0) - main_box.pack_start(avatar_image, False, True, 0) - main_box.pack_start(text_box, True, True, 0) - - overlay = Gtk.Overlay() - overlay.add(main_box) - overlay.add_overlay(self._revealer) - - self.add(overlay) + self._ui.timestamp_label.set_text(uf_timestamp) + self.show_all() def _on_state_flags_changed(self, _listboxrow, *args): state = self.get_state_flags() if (state & Gtk.StateFlags.PRELIGHT) != 0: - self._revealer.set_reveal_child(True) + self._ui.revealer.set_reveal_child(True) else: - self._revealer.set_reveal_child(False) + self._ui.revealer.set_reveal_child(False) def _on_close_button_clicked(self, _button): app.window.remove_chat(self.workspace_id, self.account, self.jid) def update_time(self): if self._timestamp is not None: - uf_timestamp = get_uf_relative_time(self._timestamp) - self._timestamp_label.set_text(uf_timestamp) + self._ui.timestamp_label.set_text( + get_uf_relative_time(self._timestamp)) def add_unread(self): self._unread_count += 1 - self._unread_label.set_text(str(self._unread_count)) - self._unread_label.show() + self._ui.unread_label.set_text(str(self._unread_count)) + self._ui.unread_label.show() def set_last_message_text(self, nickname, text): - self._last_message_label.set_text(text) - self._nick_label.set_text(nickname) + self._ui.message_label.set_text(text) + self._ui.nick_label.set_text(nickname) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2f4bae19577b706dc1a7d62acf78751c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2f4bae19577b706dc1a7d62acf78751c… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits