Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] 3 commits: ChatList: Add Start Chat placeholder
by Daniel Brötzmann 09 Mar '21

09 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 2688edca by wurstsalat at 2021-03-09T20:43:38+01:00 ChatList: Add Start Chat placeholder - - - - - da3aec33 by wurstsalat at 2021-03-09T20:54:28+01:00 Tooltips: Reduce icon sizes - - - - - 5ffb2902 by wurstsalat at 2021-03-09T20:58:30+01:00 ChatList: Increase list header spacing - - - - - 4 changed files: - gajim/common/const.py - gajim/data/style/gajim.css - gajim/gtk/chat_list.py - gajim/gtk/tooltips.py Changes: ===================================== gajim/common/const.py ===================================== @@ -24,6 +24,7 @@ class RowHeaderType(IntEnum): class AvatarSize(IntEnum): TAB = 16 + STATUS_CIRCLE = 24 ROSTER = 32 ACCOUNT_SIDE_BAR = 40 WORKSPACE = 40 @@ -31,7 +32,7 @@ class AvatarSize(IntEnum): CHAT = 48 NOTIFICATION = 48 GROUP_INFO = 100 - TOOLTIP = 125 + TOOLTIP = 100 VCARD = 200 PUBLISH = 200 ===================================== gajim/data/style/gajim.css ===================================== @@ -155,16 +155,6 @@ padding: 12px; background: transparent; } -.chatlist-placeholder { - padding: 24px 12px; -} -.chatlist-placeholder image { - color: alpha(@theme_text_color, 0.3); -} -.chatlist-placeholder label { - color: alpha(@theme_text_color, 0.5); - font-weight: bold; -} .chatlist { background: transparent; } @@ -236,7 +226,7 @@ border-radius: 10px; } .header-box label { - padding: 0px 18px 0px 18px; + padding: 12px 18px 6px 18px; font-weight: bold; color:@insensitive_fg_color; font-size: small; ===================================== gajim/gtk/chat_list.py ===================================== @@ -111,18 +111,17 @@ def _sort_func(row1, row2): return -1 if row1.is_recent else 1 def _set_placeholder(self): - icon = Gtk.Image.new_from_icon_name( - 'go-up-symbolic', Gtk.IconSize.DND) - icon.set_halign(Gtk.Align.END) - label = Gtk.Label(label=_('Add a chat to get started')) - label.set_line_wrap(True) - label.set_max_width_chars(20) - box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=18) - box.get_style_context().add_class('chatlist-placeholder') - box.add(icon) - box.add(label) - box.show_all() - self.set_placeholder(box) + button = Gtk.Button.new_with_label(_('Start Chat')) + button.get_style_context().add_class('suggested-action') + button.set_halign(Gtk.Align.CENTER) + button.set_valign(Gtk.Align.CENTER) + button.connect('clicked', self._on_start_chat_clicked) + button.show() + self.set_placeholder(button) + + @staticmethod + def _on_start_chat_clicked(_widget): + app.app.activate_action('start-chat', GLib.Variant('s', '')) def set_filter_text(self, text): self._current_filter_text = text ===================================== gajim/gtk/tooltips.py ===================================== @@ -197,7 +197,7 @@ def _build_resource_grid(self, resources, scale): row_num = 0 for contact in resources: show_surface = get_show_circle( - contact.show, AvatarSize.ROSTER, scale) + contact.show, AvatarSize.STATUS_CIRCLE, scale) show_image = Gtk.Image.new_from_surface(show_surface) show_image.set_halign(Gtk.Align.START) show_image.set_valign(Gtk.Align.CENTER) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c3defe4b397c189e32cbf3a8306dc6e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c3defe4b397c189e32cbf3a8306dc6e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] RosterTooltip: Remove old idle time remnant
by Daniel Brötzmann 09 Mar '21

09 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: c3defe4b by wurstsalat at 2021-03-09T20:05:57+01:00 RosterTooltip: Remove old idle time remnant - - - - - 2 changed files: - gajim/data/gui/roster_tooltip.ui - gajim/gtk/tooltips.py Changes: ===================================== gajim/data/gui/roster_tooltip.ui ===================================== @@ -2,7 +2,7 @@  <interface> <requires lib="gtk+" version="3.24"/> -  +  <object class="GtkGrid" id="tooltip_grid"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -192,32 +192,6 @@ <property name="top-attach">7</property> </packing> </child> - <child> - <object class="GtkLabel" id="idle_since_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Idle since:</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">8</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="idle_since"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">8</property> - </packing> - </child> <child>  <object class="GtkGrid" id="resource_grid"> ===================================== gajim/gtk/tooltips.py ===================================== @@ -184,7 +184,7 @@ def _populate_grid(self, contact): # This sets the bottom-most widget to expand, in case the avatar # takes more space than the labels row_count = 1 - while row_count < 9: + while row_count < 8: widget = self._ui.tooltip_grid.get_child_at(1, row_count) if widget and widget.get_visible(): last_widget = widget View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c3defe4b397c189e32cbf3a8306dc6e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c3defe4b397c189e32cbf3a8306dc6e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] RosterTooltip: Add idle time
by Daniel Brötzmann 09 Mar '21

09 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9faf09ca by wurstsalat at 2021-03-09T19:29:45+01:00 RosterTooltip: Add idle time - - - - - 1 changed file: - gajim/gtk/tooltips.py Changes: ===================================== gajim/gtk/tooltips.py ===================================== @@ -174,10 +174,6 @@ def _populate_grid(self, contact): self._ui.sub.show() self._ui.sub_label.show() - # Idle time - # TODO - # self._set_idle_time(contact) - # PEP info # TODO # self._append_pep_info(contact) @@ -219,15 +215,30 @@ def _build_resource_grid(self, resources, scale): if contact.status: row_num += 1 status_text = GLib.markup_escape_text(contact.status) - status_label = Gtk.Label() + status_label = Gtk.Label(label=status_text) status_label.set_halign(Gtk.Align.START) status_label.set_xalign(0) status_label.set_ellipsize(Pango.EllipsizeMode.END) status_label.set_max_width_chars(30) - status_label.set_text(status_text) self._ui.resource_grid.attach( status_label, 1, row_num, 1, 1) + if contact.idle_time: + row_num += 1 + idle_time = time.localtime(contact.idle_time) + idle_time = datetime(*(idle_time[:6])) + current = datetime.now() + if idle_time.date() == current.date(): + formatted = idle_time.strftime('%X') + else: + formatted = idle_time.strftime('%c') + idle_text = _('Idle since: %s') % formatted + idle_label = Gtk.Label(label=idle_text) + idle_label.set_halign(Gtk.Align.START) + idle_label.set_xalign(0) + self._ui.resource_grid.attach( + idle_label, 1, row_num, 1, 1) + row_num += 1 self._ui.resource_grid.show_all() @@ -257,20 +268,6 @@ def _append_pep_info(self, contact): self._ui.location.show() self._ui.location_label.show() - def _set_idle_time(self, contact): - if contact.idle_time: - idle_time = contact.idle_time - idle_time = time.localtime(contact.idle_time) - idle_time = datetime(*(idle_time[:6])) - current = datetime.now() - if idle_time.date() == current.date(): - formatted = idle_time.strftime('%X') - else: - formatted = idle_time.strftime('%c') - self._ui.idle_since.set_text(formatted) - self._ui.idle_since.show() - self._ui.idle_since_label.show() - class FileTransfersTooltip: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9faf09ca5dfd7d53eb8e9e13a0388c90… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9faf09ca5dfd7d53eb8e9e13a0388c90… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Tooltips: Remove NotificationAreaTooltip
by Daniel Brötzmann 09 Mar '21

09 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: cbbcac0d by wurstsalat at 2021-03-09T19:13:06+01:00 Tooltips: Remove NotificationAreaTooltip - - - - - 16aaf747 by wurstsalat at 2021-03-09T19:13:13+01:00 Tooltips: Refactor - - - - - 5 changed files: - gajim/common/helpers.py - gajim/data/gui/tooltip_roster_contact.ui → gajim/data/gui/roster_tooltip.ui - gajim/gtk/roster.py - gajim/gtk/statusicon.py - gajim/gtk/tooltips.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -714,108 +714,6 @@ def allow_sound_notification(account, sound_event): return True return False -def get_notification_icon_tooltip_dict(): - """ - Return a dict of the form {acct: {'show': show, 'message': message, - 'event_lines': [list of text lines to show in tooltip]} - """ - # How many events before we show summarized, not per-user - max_ungrouped_events = 10 - - accounts = get_accounts_info() - - # Gather events. (With accounts, when there are more.) - for account in accounts: - account_name = account['name'] - account['event_lines'] = [] - # Gather events per-account - pending_events = app.events.get_events(account=account_name) - messages, non_messages = {}, {} - total_messages, total_non_messages = 0, 0 - for jid in pending_events: - for event in pending_events[jid]: - if event.type_.count('file') > 0: - # This is a non-messagee event. - messages[jid] = non_messages.get(jid, 0) + 1 - total_non_messages = total_non_messages + 1 - else: - # This is a message. - messages[jid] = messages.get(jid, 0) + 1 - total_messages = total_messages + 1 - # Display unread messages numbers, if any - if total_messages > 0: - if total_messages > max_ungrouped_events: - text = ngettext('%d message pending', - '%d messages pending', - total_messages, - total_messages, - total_messages) - account['event_lines'].append(text) - else: - for jid in messages: - text = ngettext('%d message pending', - '%d messages pending', - messages[jid], - messages[jid], - messages[jid]) - contact = app.contacts.get_first_contact_from_jid( - account['name'], jid) - text += ' ' - if jid in app.gc_connected[account['name']]: - text += _('from group chat %s') % (jid) - elif contact: - name = contact.get_shown_name() - text += _('from user %s') % (name) - else: - text += _('from %s') % (jid) - account['event_lines'].append(text) - - # Display unseen events numbers, if any - if total_non_messages > 0: - if total_non_messages > max_ungrouped_events: - text = ngettext('%d event pending', - '%d events pending', - total_non_messages, - total_non_messages, - total_non_messages) - account['event_lines'].append(text) - else: - for jid in non_messages: - text = ngettext('%d event pending', - '%d events pending', - non_messages[jid], - non_messages[jid], - non_messages[jid]) - text += ' ' + _('from user %s') % (jid) - account[account]['event_lines'].append(text) - - return accounts - -def get_accounts_info(): - """ - Helper for notification icon tooltip - """ - accounts = [] - accounts_list = sorted(app.settings.get_active_accounts()) - for account in accounts_list: - - status = get_connection_status(account) - message = app.connections[account].status_message - single_line = get_uf_show(status) - if message is None: - message = '' - else: - message = message.strip() - if message != '': - single_line += ': ' + message - account_label = app.get_account_label(account) - accounts.append({'name': account, - 'account_label': account_label, - 'status_line': single_line, - 'show': status, - 'message': message}) - return accounts - def get_current_show(account): if account not in app.connections: return 'offline' ===================================== gajim/data/gui/tooltip_roster_contact.ui → gajim/data/gui/roster_tooltip.ui ===================================== @@ -1,289 +1,241 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.22"/> + <requires lib="gtk+" version="3.24"/> +  <object class="GtkGrid" id="tooltip_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="border_width">6</property> - <property name="row_spacing">3</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="resource_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Resource:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="resource"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> + <property name="border-width">6</property> + <property name="row-spacing">3</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="jid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="hexpand">True</property> + <property name="label"><jid></property> <property name="ellipsize">end</property> - <property name="max_width_chars">36</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="idle_since_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Idle since:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">12</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="idle_since"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="hexpand">True</property> + <property name="max-width-chars">36</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">12</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="mood_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Mood:</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="activity_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Activity:</property> <property name="lines">2</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="tune_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Tune:</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> + <property name="left-attach">0</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkLabel" id="location_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Location:</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> + <property name="left-attach">0</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkLabel" id="mood"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="activity"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> + <property name="left-attach">1</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="tune"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> + <property name="left-attach">1</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkLabel" id="location"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">9</property> + <property name="left-attach">1</property> + <property name="top-attach">6</property> </packing> </child> <child> - <object class="GtkLabel" id="sub_label"> + <object class="GtkLabel" id="name"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> + <property name="can-focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> - <property name="label" translatable="yes">Subscription:</property> + <property name="label"><name></property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="max-width-chars">25</property> + <property name="yalign">0</property> + <style> + <class name="large-header"/> + </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">11</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="sub"> + <object class="GtkImage" id="avatar"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="hexpand">True</property> + <property name="icon-name">image-missing</property> + <property name="icon_size">6</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">11</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + <property name="height">3</property> </packing> </child> <child> - <object class="GtkLabel" id="status"> + <object class="GtkLabel" id="sub_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="can-focus">False</property> + <property name="halign">end</property> <property name="valign">start</property> - <property name="wrap">True</property> - <property name="wrap_mode">word-char</property> - <property name="ellipsize">end</property> - <property name="max_width_chars">40</property> - <property name="lines">3</property> - <property name="xalign">0</property> - <attributes> - <attribute name="style" value="italic"/> - </attributes> + <property name="label" translatable="yes">Subscription:</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">7</property> </packing> </child> <child> - <object class="GtkLabel" id="name"> + <object class="GtkLabel" id="sub"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="ellipsize">end</property> - <property name="single_line_mode">True</property> - <property name="max_width_chars">25</property> - <style> - <class name="large-header"/> - </style> + <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">7</property> </packing> </child> <child> - <object class="GtkLabel" id="user_show"> + <object class="GtkLabel" id="idle_since_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="can-focus">False</property> + <property name="halign">end</property> <property name="valign">start</property> - <property name="vexpand">True</property> + <property name="label" translatable="yes">Idle since:</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">8</property> </packing> </child> <child> - <object class="GtkImage" id="avatar"> + <object class="GtkLabel" id="idle_since"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="icon_name">image-missing</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="height">5</property> + <property name="left-attach">1</property> + <property name="top-attach">8</property> </packing> </child> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> +  + <object class="GtkGrid" id="resource_grid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> </child> </object> </interface> ===================================== gajim/gtk/roster.py ===================================== @@ -19,6 +19,7 @@ from gajim.gui_menu_builder import get_roster_menu +from .tooltips import RosterTooltip from .util import EventHelper from .util import get_builder @@ -49,6 +50,8 @@ def __init__(self, account): self._account = account self._client = app.get_client(account) + self._roster_tooltip = RosterTooltip() + self._ui = get_builder('roster.ui') self._ui.roster_treeview.set_model(None) self.add(self._ui.roster_treeview) @@ -62,6 +65,8 @@ def __init__(self, account): self._store.set_sort_func(Column.TEXT, self._tree_compare_iters) self._roster = self._ui.roster_treeview + self._roster.set_has_tooltip(True) + self._roster.connect('query-tooltip', self._on_query_tooltip) # Drag and Drop entries = [Gtk.TargetEntry.new( @@ -214,6 +219,37 @@ def _on_drag_data_received(self, treeview, _drag_context, x_coord, source_group, dest_group) + def _on_query_tooltip(self, treeview, x_coord, y_coord, _keyboard_mode, + tooltip): + try: + path = treeview.get_path_at_pos(x_coord, y_coord) + row = path[0] + except TypeError: + self._roster_tooltip.clear_tooltip() + return False + + if not row: + self._roster_tooltip.clear_tooltip() + return False + + iter_ = None + try: + model = treeview.get_model() + iter_ = model.get_iter(row) + except Exception: + self._roster_tooltip.clear_tooltip() + return False + + if not model[iter_][Column.IS_CONTACT]: + # It’s a group + self._roster_tooltip.clear_tooltip() + return False + + contact = self._get_contact(model[iter_][Column.JID_OR_GROUP]) + value, widget = self._roster_tooltip.get_tooltip(row, contact) + tooltip.set_custom(widget) + return value + def _on_show_offline(self, action, param): action.set_state(param) app.settings.set('showoffline', param.get_boolean()) ===================================== gajim/gtk/statusicon.py ===================================== @@ -34,7 +34,6 @@ from .util import restore_roster_position from .util import open_window from .single_message import SingleMessageWindow -from .tooltips import NotificationAreaTooltip class StatusIcon: @@ -53,16 +52,13 @@ def __init__(self): self._ui.connect_signals(self) self.popup_menus = [] self.status_icon = None - self.tooltip = NotificationAreaTooltip() self._icon_size = '16' def show_icon(self): if not self.status_icon: self.status_icon = Gtk.StatusIcon() - self.status_icon.set_property('has-tooltip', True) self.status_icon.connect('activate', self._on_activate) self.status_icon.connect('popup-menu', self._on_popup_menu) - self.status_icon.connect('query-tooltip', self._on_query_tooltip) self.status_icon.connect('size-changed', self.set_img) self.set_img() @@ -108,10 +104,6 @@ def _on_event_removed(self, _event_list): """ self.set_img() - def _on_query_tooltip(self, _status_icon, _x, _y, _keyboard_mode, tooltip): - tooltip.set_custom(self.tooltip.get_tooltip()) - return True - def _on_popup_menu(self, _status_icon, button, activate_time): if button == 1: # Left click self._on_left_click() @@ -137,7 +129,7 @@ def on_status_icon_size_changed(self, _statusicon, size): def set_img(self, *args): """ - Apart from image, we also update tooltip text here + Update image """ if not app.interface.systray_enabled: return ===================================== gajim/gtk/tooltips.py ===================================== @@ -35,129 +35,24 @@ from gajim.common import app from gajim.common import helpers -from gajim.common.helpers import get_connection_status from gajim.common.const import AvatarSize from gajim.common.const import PEPEventType from gajim.common.i18n import Q_ from gajim.common.i18n import _ from gajim.gtkgui_helpers import add_css_class +from .avatar import get_show_circle from .util import get_builder -from .util import get_icon_name from .util import format_mood from .util import format_activity from .util import format_tune from .util import format_location from .util import get_css_show_class - log = logging.getLogger('gajim.gui.tooltips') -class StatusTable: - """ - Contains methods for creating status table. This is used in Roster and - NotificationArea tooltips - """ - - def __init__(self): - self.current_row = 0 - self.table = None - self.text_label = None - self.spacer_label = ' ' - - def create_table(self): - self.table = Gtk.Grid() - self.table.insert_column(0) - self.table.set_property('column-spacing', 3) - - def add_text_row(self, text, col_inc=0): - self.table.insert_row(self.current_row) - self.text_label = Gtk.Label() - self.text_label.set_line_wrap(True) - self.text_label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) - self.text_label.set_lines(3) - self.text_label.set_ellipsize(Pango.EllipsizeMode.END) - self.text_label.set_max_width_chars(30) - self.text_label.set_halign(Gtk.Align.START) - self.text_label.set_valign(Gtk.Align.START) - self.text_label.set_xalign(0) - self.text_label.set_selectable(False) - - self.text_label.set_text(text) - self.table.attach(self.text_label, 1 + col_inc, - self.current_row, - 3 - col_inc, - 1) - self.current_row += 1 - - def add_status_row(self, show, str_status, indent=True, transport=None): - """ - Append a new row with status icon to the table - """ - self.table.insert_row(self.current_row) - image = Gtk.Image() - icon_name = get_icon_name(show, transport=transport) - image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) - spacer = Gtk.Label(label=self.spacer_label) - image.set_halign(Gtk.Align.START) - image.set_valign(Gtk.Align.CENTER) - if indent: - self.table.attach(spacer, 1, self.current_row, 1, 1) - self.table.attach(image, 2, self.current_row, 1, 1) - status_label = Gtk.Label() - status_label.set_text(str_status) - status_label.set_halign(Gtk.Align.START) - status_label.set_valign(Gtk.Align.START) - status_label.set_xalign(0) - status_label.set_line_wrap(True) - status_label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) - status_label.set_lines(3) - status_label.set_ellipsize(Pango.EllipsizeMode.END) - status_label.set_max_width_chars(30) - self.table.attach(status_label, 3, self.current_row, 1, 1) - self.current_row += 1 - - def fill_table_with_accounts(self, accounts): - for acct in accounts: - message = acct['message'] - message = helpers.reduce_chars_newlines(message, 100, 1) - message = GLib.markup_escape_text(message) - - account_label = GLib.markup_escape_text(acct['account_label']) - if message: - status = '%s - %s' % (account_label, message) - else: - status = account_label - - self.add_status_row(acct['show'], status, indent=False) - - for line in acct['event_lines']: - self.add_text_row(' ' + line, 1) - - -class NotificationAreaTooltip(StatusTable): - """ - Tooltip that is shown in the notification area - """ - - def __init__(self): - StatusTable.__init__(self) - - def get_tooltip(self): - self.create_table() - - accounts = helpers.get_notification_icon_tooltip_dict() - self.fill_table_with_accounts(accounts) - self.table.set_property('column-spacing', 1) - - hbox = Gtk.HBox() - hbox.add(self.table) - hbox.show_all() - return hbox - - -class GCTooltip(): +class GCTooltip: def __init__(self): self.contact = None @@ -231,198 +126,113 @@ def destroy(self): self._ui.tooltip_grid.destroy() -class RosterTooltip(StatusTable): +class RosterTooltip: def __init__(self): - StatusTable.__init__(self) - self.create_table() - self.account = None - self.row = None - self.contact_jid = None - self.prim_contact = None - self.last_widget = None - self.num_resources = 0 - - self._ui = get_builder('tooltip_roster_contact.ui') + self._row = None + self._ui = get_builder('roster_tooltip.ui') def clear_tooltip(self): - """ - Hide all Elements of the Tooltip Grid - """ - for child in self._ui.tooltip_grid.get_children(): - child.hide() - status_table = self._ui.tooltip_grid.get_child_at(1, 3) - if status_table: - status_table.destroy() - self.create_table() - self.row = None - - def get_tooltip(self, row, connected_contacts, account, typ): - if self.row == row: + self._row = None + for widget in self._ui.resource_grid.get_children(): + widget.destroy() + for widget in self._ui.tooltip_grid.get_children(): + widget.hide() + + def get_tooltip(self, row, contact): + if self._row == row: return True, self._ui.tooltip_grid - self._populate_grid(connected_contacts, account, typ) - self.row = row + self._populate_grid(contact) + self._row = row return False, self._ui.tooltip_grid - def _populate_grid(self, contacts, account, typ): - """ - Populate the Tooltip Grid with data of from the contact - """ - self.current_row = 0 - self.account = account - if self.last_widget: - self.last_widget.set_vexpand(False) - + def _populate_grid(self, contact): self.clear_tooltip() + scale = self._ui.tooltip_grid.get_scale_factor() - if account == 'all': - # Tooltip for merged accounts row - self._show_merged_account_tooltip() - return - - if typ == 'account': - jid = app.get_jid_from_account(account) - contacts = [] - connection = app.connections[account] - # get our current contact info - - nbr_on, nbr_total = app.\ - contacts.get_nb_online_total_contacts(accounts=[account]) - account_name = app.get_account_label(account) - if app.account_is_available(account): - account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) - contact = app.contacts.create_self_contact( - jid=jid, - account=account, - name=account_name, - show=get_connection_status(account), - status=connection.status_message, - resource=connection.get_own_jid().resource, - priority=connection.priority) - - contacts.append(contact) - - # Username/Account/Groupchat - self.prim_contact = app.contacts.get_highest_prio_contact_from_contacts( - contacts) - if self.prim_contact is None: - log.error('No contact for Roster tooltip found') - log.error('contacts: %s, typ: %s, account: %s', - contacts, typ, account) - return - self.contact_jid = self.prim_contact.jid - name = GLib.markup_escape_text(self.prim_contact.get_shown_name()) - - if app.settings.get('mergeaccounts'): - name = GLib.markup_escape_text( - self.prim_contact.account.name) - - self._ui.name.set_markup(name) - self._ui.name.show() + # Avatar + surface = contact.get_avatar(AvatarSize.TOOLTIP, scale) + self._ui.avatar.set_from_surface(surface) + self._ui.avatar.show() - self.num_resources = 0 - # put contacts in dict, where key is priority - contacts_dict = {} - for contact in contacts: - if contact.resource: - self.num_resources += 1 - priority = int(contact.priority) - if priority in contacts_dict: - contacts_dict[priority].append(contact) - else: - contacts_dict[priority] = [contact] - if self.num_resources > 1: - transport = app.get_transport_name_from_jid(self.prim_contact.jid) - if transport == 'jabber': - transport = None - contact_keys = sorted(contacts_dict.keys()) - contact_keys.reverse() - for priority in contact_keys: - for acontact in contacts_dict[priority]: - show = self._get_icon_name_for_tooltip(acontact) - status = acontact.status - resource_line = '%s (%s)' % (acontact.resource, - str(acontact.priority)) - self.add_status_row( - show, resource_line, transport=transport) - if status: - self.add_text_row(status, 2) - - self._ui.tooltip_grid.attach(self.table, 1, 3, 2, 1) - self.table.show_all() - - else: # only one resource - if contact.is_groupchat: - disco_info = app.storage.cache.get_last_disco_info(contact.jid) - if disco_info is not None: - description = disco_info.muc_description - if description: - self._ui.status.set_text(description) - self._ui.status.show() - elif contact.show and contact.status: - status = contact.status.strip() - if status: - self._ui.status.set_text(status) - self._ui.status.show() - - # PEP Info - self._append_pep_info(contact) + # Name + self._ui.name.set_markup(GLib.markup_escape_text(contact.name)) + self._ui.name.show() # JID - self._ui.jid.set_text(self.prim_contact.jid) + self._ui.jid.set_text(str(contact.jid)) self._ui.jid.show() - # contact has only one resource - if self.num_resources == 1 and contact.resource: - res = GLib.markup_escape_text(contact.resource) - prio = str(contact.priority) - self._ui.resource.set_text("{} ({})".format(res, prio)) - self._ui.resource.show() - self._ui.resource_label.show() - - if self.prim_contact.jid not in app.gc_connected[account]: - if (account and - self.prim_contact.sub and - self.prim_contact.sub != 'both'): - # ('both' is the normal sub so we don't show it) - self._ui.sub.set_text(helpers.get_uf_sub(self.prim_contact.sub)) - self._ui.sub.show() - self._ui.sub_label.show() - - self._set_idle_time(contact) + # Resources with show, status, priority + resources = contact.get_resources() + self._build_resource_grid(resources, scale) - # Avatar - scale = self._ui.tooltip_grid.get_scale_factor() - surface = app.contacts.get_avatar( - account, self.prim_contact.jid, AvatarSize.TOOLTIP, scale) - self._ui.avatar.set_from_surface(surface) - self._ui.avatar.show() + # Subscription + if contact.subscription and contact.subscription != 'both': + # 'both' is the normal subscription value, just omit it + self._ui.sub.set_text(helpers.get_uf_sub(contact.subscription)) + self._ui.sub.show() + self._ui.sub_label.show() + + # Idle time + # TODO + # self._set_idle_time(contact) + + # PEP info + # TODO + # self._append_pep_info(contact) app.plugin_manager.gui_extension_point( - 'roster_tooltip_populate', self, contacts, self._ui.tooltip_grid) - - # Sets the Widget that is at the bottom to expand. - # This is needed in case the Picture takes more Space than the Labels - i = 1 - while i < 15: - if self._ui.tooltip_grid.get_child_at(1, i): - if self._ui.tooltip_grid.get_child_at(1, i).get_visible(): - self.last_widget = self._ui.tooltip_grid.get_child_at(1, i) - i += 1 - self.last_widget.set_vexpand(True) - - def _show_merged_account_tooltip(self): - accounts = helpers.get_notification_icon_tooltip_dict() - self.spacer_label = '' - self.fill_table_with_accounts(accounts) - self._ui.tooltip_grid.attach(self.table, 1, 3, 2, 1) - self.table.show_all() + 'roster_tooltip_populate', self, contact, self._ui.tooltip_grid) + + # This sets the bottom-most widget to expand, in case the avatar + # takes more space than the labels + row_count = 1 + while row_count < 9: + widget = self._ui.tooltip_grid.get_child_at(1, row_count) + if widget and widget.get_visible(): + last_widget = widget + row_count += 1 + else: + break + last_widget.set_vexpand(True) + + def _build_resource_grid(self, resources, scale): + row_num = 0 + for contact in resources: + show_surface = get_show_circle( + contact.show, AvatarSize.ROSTER, scale) + show_image = Gtk.Image.new_from_surface(show_surface) + show_image.set_halign(Gtk.Align.START) + show_image.set_valign(Gtk.Align.CENTER) + self._ui.resource_grid.attach(show_image, 0, row_num, 1, 1) + + resource_string = GLib.markup_escape_text(contact.jid.resource) + resource_label = Gtk.Label() + resource_label.set_halign(Gtk.Align.START) + resource_label.set_xalign(0) + resource_label.set_ellipsize(Pango.EllipsizeMode.END) + resource_label.set_max_width_chars(30) + resource_label.set_text(f'{resource_string} ({contact.priority})') + self._ui.resource_grid.attach(resource_label, 1, row_num, 1, 1) + + if contact.status: + row_num += 1 + status_text = GLib.markup_escape_text(contact.status) + status_label = Gtk.Label() + status_label.set_halign(Gtk.Align.START) + status_label.set_xalign(0) + status_label.set_ellipsize(Pango.EllipsizeMode.END) + status_label.set_max_width_chars(30) + status_label.set_text(status_text) + self._ui.resource_grid.attach( + status_label, 1, row_num, 1, 1) + + row_num += 1 + + self._ui.resource_grid.show_all() def _append_pep_info(self, contact): - """ - Append Tune, Mood, Activity, Location information of the - specified contact to the given property list. - """ if PEPEventType.MOOD in contact.pep: mood = format_mood(*contact.pep[PEPEventType.MOOD]) self._ui.mood.set_markup(mood) @@ -461,36 +271,8 @@ def _set_idle_time(self, contact): self._ui.idle_since.show() self._ui.idle_since_label.show() - if contact.show and self.num_resources < 2: - show = helpers.get_uf_show(contact.show) - # Contact is Groupchat - if (self.account and - self.prim_contact.jid in app.gc_connected[self.account]): - if app.gc_connected[self.account][self.prim_contact.jid]: - show = _('Connected') - else: - show = _('Disconnected') - - colorize_status(self._ui.user_show, contact.show) - self._ui.user_show.set_text(show) - self._ui.user_show.show() - - @staticmethod - def _get_icon_name_for_tooltip(contact): - """ - Helper function used for tooltip contacts/accounts - - Tooltip on account has fake contact with sub == '', in this case we show - real status of the account - """ - if contact.ask == 'subscribe': - return 'requested' - if contact.sub in ('both', 'to', ''): - return contact.show - return 'not in roster' - -class FileTransfersTooltip(): +class FileTransfersTooltip: def __init__(self): self.sid = None self.widget = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/74fc36e644c0dfe4988a14c31ed201d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/74fc36e644c0dfe4988a14c31ed201d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Raise cache size
by Philipp Hörist 07 Mar '21

07 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 74fc36e6 by lovetox at 2021-03-07T21:35:02+01:00 Raise cache size - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -148,7 +148,7 @@ def add_status_to_avatar(surface, show): return context.get_target() -@lru_cache(maxsize=8) +@lru_cache(maxsize=128) def get_show_circle(show, size, scale): size = size * scale center = size / 2 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/74fc36e644c0dfe4988a14c31ed201d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/74fc36e644c0dfe4988a14c31ed201d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add get_show_circle()
by Philipp Hörist 07 Mar '21

07 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: c168a5d3 by lovetox at 2021-03-07T21:20:56+01:00 Add get_show_circle() - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -148,6 +148,36 @@ def add_status_to_avatar(surface, show): return context.get_target() +@lru_cache(maxsize=8) +def get_show_circle(show, size, scale): + size = size * scale + center = size / 2 + radius = size / 3 + + surface = cairo.ImageSurface(cairo.Format.ARGB32, size, size) + context = cairo.Context(surface) + + css_color = get_css_show_class(show.value) + color = convert_rgb_string_to_float( + app.css_config.get_value(css_color, StyleAttr.COLOR)) + + context.set_source_rgb(*color) + context.set_operator(cairo.Operator.OVER) + context.arc(center, center, radius, 0, 2 * pi) + context.fill() + + if show.value == 'dnd': + line_length = radius * 0.65 + context.move_to(center - line_length, center) + context.line_to(center + line_length, center) + + context.set_source_rgb(255, 255, 255) + context.set_line_width(size / 10) + context.stroke() + + return context.get_target() + + def square(surface, size): width = surface.get_width() height = surface.get_height() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c168a5d3b3b42a1cf0fa96170e0fc62f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c168a5d3b3b42a1cf0fa96170e0fc62f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add methods for accessing resources
by Philipp Hörist 07 Mar '21

07 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a6d61265 by lovetox at 2021-03-07T20:31:42+01:00 Add methods for accessing resources - - - - - 1 changed file: - gajim/common/modules/contacts.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -154,9 +154,22 @@ def get_resource(self, resource): contact = self.add_resource(resource) return contact + def get_resources(self): + resources = [] + for contact in self._resources.values(): + if contact.show != PresenceShowExt.OFFLINE: + resources.append(contact) + return resources + + def iter_resources(self): + for contact in self._resources.values(): + if contact.show != PresenceShowExt.OFFLINE: + yield contact + @property def is_available(self): - return any([contact.is_available for contact in self._resources.values()]) + return any([contact.is_available for contact + in self._resources.values()]) @property def show(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a6d61265c77b887db157c154c23d75fc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a6d61265c77b887db157c154c23d75fc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Fix saving MUC avatar
by Philipp Hörist 07 Mar '21

07 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 4dc80497 by lovetox at 2021-03-07T15:25:05+01:00 Fix saving MUC avatar - - - - - 11876843 by lovetox at 2021-03-07T18:04:03+01:00 MUC refactor Get rid of manager - - - - - 11 changed files: - gajim/common/client.py - gajim/common/modules/caps.py - gajim/common/modules/chat_markers.py - gajim/common/modules/contacts.py - gajim/common/modules/discovery.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/modules/vcard_avatars.py - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/privatechat_control.py Changes: ===================================== gajim/common/client.py ===================================== @@ -306,7 +306,7 @@ def _on_connection_failed(self, _client, _signal_name): def _on_connected(self, _client, _signal_name): self._set_state(ClientState.CONNECTED) - self.get_module('MUC').get_manager().reset_state() + self.get_module('MUC').reset_state() self.get_module('Discovery').discover_server_info() self.get_module('Discovery').discover_account_info() self.get_module('Discovery').discover_server_items() ===================================== gajim/common/modules/caps.py ===================================== @@ -212,8 +212,7 @@ def preconditions_met(self): return False if self._from_muc: - muc = client.get_module('MUC').get_manager().get( - self.entity.jid.bare) + muc = client.get_module('MUC').get_muc_data(self.entity.jid.bare) if muc is None or not muc.state.is_joined: self.set_obsolete() ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -45,8 +45,8 @@ def _process_chat_marker(self, _con, _stanza, properties): return if properties.type.is_groupchat: - manager = self._con.get_module('MUC').get_manager() - muc_data = manager.get(properties.muc_jid) + muc_data = self._con.get_module('MUC').get_muc_data( + properties.muc_jid) if muc_data is None: return ===================================== gajim/common/modules/contacts.py ===================================== @@ -303,6 +303,11 @@ def __init__(self, logger, jid, account): def is_groupchat(self): return True + @property + def state(self): + muc_data = self._module('MUC').get_muc_data(self._jid) + return muc_data.state + def add_resource(self, resource): jid = self._jid.new_with(resource=resource) contact = GroupchatParticipant(self._log, jid, self._account) @@ -344,14 +349,18 @@ def update_avatar(self, *args): app.interface.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update') + @property + def is_joined(self): + muc_data = self._module('MUC').get_muc_data(self._jid) + return muc_data.state.is_joined + def set_not_joined(self): for contact in self._resources.values(): contact.update_presence(UNKNOWN_MUC_PRESENCE, notify=False) def get_user_nicknames(self): client = app.get_client(self._account) - manager = client.get_module('MUC').get_manager() - return manager.get_joined_users(self._jid) + return client.get_module('MUC').get_joined_users(self._jid) class GroupchatParticipant(CommonContact): @@ -363,7 +372,6 @@ def __init__(self, logger, jid, account): self._client = app.get_client(self._account) self._presence = UNKNOWN_MUC_PRESENCE - self._muc_manager = self._client.get_module('MUC').get_manager() @property def is_pm_contact(self): ===================================== gajim/common/modules/discovery.py ===================================== @@ -226,8 +226,7 @@ def disco_muc(self, if not app.interface.avatar_exists(avatar_sha): app.interface.save_avatar(avatar) - app.storage.cache.set_muc_avatar_sha(result.info.jid, - avatar_sha) + app.storage.cache.set_muc(result.info.jid, 'avatar', avatar_sha) app.interface.avatar_storage.invalidate_cache(result.info.jid) self._con.get_module('VCardAvatars').muc_disco_info_update(result.info) ===================================== gajim/common/modules/muc.py ===================================== @@ -35,10 +35,8 @@ from gajim.common.const import MUCJoinedState from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config -from gajim.common.helpers import to_user_string from gajim.common.helpers import event_filter from gajim.common.helpers import get_group_chat_nick -from gajim.common.helpers import Observable from gajim.common.structs import MUCData from gajim.common.structs import MUCPresenceData from gajim.common.nec import NetworkEvent @@ -114,11 +112,12 @@ def __init__(self, con): # ('signed-in', ged.GUI1, self._on_signed_in), ]) - self._manager = MUCManager(self._account, self._log) self._rejoin_muc = set() self._join_timeouts = {} self._rejoin_timeouts = {} self._muc_service_jid = None + self._joined_users = defaultdict(dict) + self._mucs = {} @property def supported(self): @@ -128,9 +127,6 @@ def supported(self): def service_jid(self): return self._muc_service_jid - def get_manager(self): - return self._manager - def pass_disco(self, info): for identity in info.identities: if identity.category != 'conference': @@ -142,6 +138,38 @@ def pass_disco(self, info): self._muc_service_jid = info.jid raise nbxmpp.NodeProcessed + def get_muc_data(self, room_jid): + return self._mucs.get(room_jid) + + def _get_mucs_with_state(self, states): + return [muc for muc in self._mucs.values() if muc.state in states] + + def _set_muc_state(self, room_jid, state): + try: + muc = self._mucs[room_jid] + except KeyError: + raise ValueError('set_muc_state() called ' + 'on unknown muc: %s' % room_jid) + + if muc.state == state: + return + + self._log.info('Set MUC state: %s %s', room_jid, state) + + muc.state = state + contact = self._get_contact(room_jid, groupchat=True) + contact.notify('state-changed') + + def reset_state(self): + for muc in self._mucs.values(): + self._joined_users.pop(muc.jid, None) + self._set_muc_state(muc.jid, MUCJoinedState.NOT_JOINED) + room = self._get_contact(muc.jid) + room.set_not_joined() + room.notify('room-left') + + self._joined_users.clear() + def _create_muc_data(self, room_jid, nick, password, config): if not nick: nick = get_group_chat_nick(self._account, room_jid) @@ -160,10 +188,11 @@ def join(self, jid, nick=None, password=None, config=None): self._con.get_module('Contacts').add_contact(jid, groupchat=True) - muc_data = self._manager.get(jid) + muc_data = self._mucs.get(jid) if muc_data is None: muc_data = self._create_muc_data(jid, nick, password, config) - self._manager.add(muc_data) + self._mucs[jid] = muc_data + self._push_muc_added_event(jid) if not muc_data.state.is_not_joined: self._log.warning('Can’t join MUC %s, state: %s', @@ -183,8 +212,15 @@ def create(self, muc_data): if not app.account_is_available(self._account): return - self._manager.add(muc_data) + self._mucs[muc_data.jid] = muc_data self._create(muc_data) + self._push_muc_added_event(muc_data.jid) + + def _push_muc_added_event(self, jid): + app.nec.push_incoming_event( + NetworkEvent('muc-added', + account=self._account, + jid=jid)) def _on_disco_result(self, task): try: @@ -196,7 +232,7 @@ def _on_disco_result(self, task): room.notify('room-join-failed', error) return - muc_data = self._manager.get(result.info.jid) + muc_data = self._mucs.get(result.info.jid) if muc_data is None: self._log.warning('MUC Data not found, join aborted') return @@ -215,12 +251,12 @@ def _join(self, muc_data): muc_x.setTagData('password', muc_data.password) self._log.info('Join MUC: %s', muc_data.jid) - self._manager.set_state(muc_data.jid, MUCJoinedState.JOINING) + self._set_muc_state(muc_data.jid, MUCJoinedState.JOINING) self._con.send_stanza(presence) def _rejoin(self, room_jid): - muc_data = self._manager.get(room_jid) - if muc_data.state == MUCJoinedState.NOT_JOINED: + muc_data = self._mucs[room_jid] + if muc_data.state.is_not_joined: self._log.info('Rejoin %s', room_jid) self._join(muc_data) return True @@ -234,7 +270,7 @@ def _create(self, muc_data): presence.setTag(Namespace.MUC + ' x') self._log.info('Create MUC: %s', muc_data.jid) - self._manager.set_state(muc_data.jid, MUCJoinedState.CREATING) + self._set_muc_state(muc_data.jid, MUCJoinedState.CREATING) self._con.send_stanza(presence) def leave(self, room_jid, reason=None): @@ -242,11 +278,11 @@ def leave(self, room_jid, reason=None): self._con.get_module('Bookmarks').modify(room_jid, autojoin=False) - muc_data = self._manager.get(room_jid) + muc_data = self._mucs.get(room_jid) if muc_data is None: return - if muc_data.state == MUCJoinedState.NOT_JOINED: + if muc_data.state.is_not_joined: return self._remove_join_timeout(room_jid) @@ -258,7 +294,7 @@ def leave(self, room_jid, reason=None): status=reason, caps=False) - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room = self._get_contact(room_jid) room.set_not_joined() room.notify('room-left') @@ -279,7 +315,7 @@ def _on_room_config(self, task): self._log.info('Configure room: %s', result.jid) - muc_data = self._manager.get(result.jid) + muc_data = self._mucs[result.jid] self._apply_config(result.form, muc_data.config) self.set_config(result.jid, result.form, @@ -333,7 +369,7 @@ def _on_disco_result_after_config(self, task): return jid = result.info.jid - muc_data = self._manager.get(jid) + muc_data = self._mucs[jid] self._room_join_complete(muc_data) self._log.info('Configuration finished: %s', jid) @@ -342,8 +378,8 @@ def _on_disco_result_after_config(self, task): room.notify('room-config-finished') def update_presence(self): - mucs = self._manager.get_mucs_with_state([MUCJoinedState.JOINED, - MUCJoinedState.JOINING]) + mucs = self._get_mucs_with_state([MUCJoinedState.JOINED, + MUCJoinedState.JOINING]) status, message, idle = self._con.get_presence_state() for muc_data in mucs: @@ -362,7 +398,7 @@ def change_nick(self, room_jid, new_nick): def _on_error_presence(self, _con, stanza, properties): room_jid = properties.jid.bare - muc_data = self._manager.get(room_jid) + muc_data = self._mucs.get(room_jid) if muc_data is None: return @@ -383,25 +419,25 @@ def _on_error_presence(self, _con, stanza, properties): elif properties.error.condition == 'not-authorized': self._remove_rejoin_timeout(room_jid) - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.notify('room-password-required', properties) else: - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) if room_jid not in self._rejoin_muc: room.notify('room-join-failed', properties.error) elif muc_data.state == MUCJoinedState.CREATING: - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.notify('room-creation-failed', properties) elif muc_data.state == MUCJoinedState.CAPTCHA_REQUEST: - self._manager.set_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.notify('room-captcha-error', properties.error) elif muc_data.state == MUCJoinedState.CAPTCHA_FAILED: - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) else: room.notify('room-presence-error', properties) @@ -411,19 +447,19 @@ def _on_muc_user_presence(self, _con, stanza, properties): return room_jid = str(properties.muc_jid) - if room_jid not in self._manager: + if room_jid not in self._mucs: self._log.warning('Presence from unknown MUC') self._log.warning(stanza) return - muc_data = self._manager.get(room_jid) + muc_data = self._mucs[room_jid] occupant = self._get_contact(properties.jid, groupchat=True) room = self._get_contact(properties.jid.bare) if properties.is_muc_destroyed: self._log.info('MUC destroyed: %s', room_jid) self._remove_join_timeout(room_jid) - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.set_not_joined() room.notify('destroyed', properties) return @@ -444,16 +480,20 @@ def _on_muc_user_presence(self, _con, stanza, properties): new_occupant = room.add_resource(properties.muc_user.nick) new_occupant.set_presence(occupant.presence) - presence = self._manager.process_presence(properties) + presence = self._process_user_presence(properties) occupant.update_presence(presence, properties) + # new_nick = properties.muc_user.nick + # nick = properties.muc_nickname + # presence_dict = self._joined_users[properties.jid.bare] + # presence_dict[new_nick] = presence_dict.pop(nick) # self._manager.change_nickname # TODO remove presence from manager room.notify('user-nickname-changed', occupant, properties) return - is_joined = self._manager.is_joined(properties.jid) + is_joined = self._is_user_joined(properties.jid) if not is_joined and properties.type.is_available: if properties.is_muc_self_presence: self._log.info('Self presence: %s', properties.jid) @@ -470,12 +510,12 @@ def _on_muc_user_presence(self, _con, stanza, properties): self._start_join_timeout(room_jid) - presence = self._manager.process_presence(properties) + presence = self._process_user_presence(properties) occupant.update_presence(presence, properties) return if properties.is_muc_self_presence and properties.is_kicked: - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.set_not_joined() room.notify('kicked', properties) status_codes = properties.muc_status_codes or [] @@ -488,9 +528,28 @@ def _on_muc_user_presence(self, _con, stanza, properties): # unavailable presence, because we left the MUC return - presence = self._manager.process_presence(properties) + presence = self._process_user_presence(properties) occupant.update_presence(presence, properties) + def _process_user_presence(self, properties): + jid = properties.jid + muc_presence = MUCPresenceData.from_presence(properties) + if not muc_presence.available: + self._joined_users[jid.bare].pop(jid.resource) + else: + self._joined_users[jid.bare][jid.resource] = muc_presence + return muc_presence + + def _is_user_joined(self, jid): + try: + self._joined_users[jid.bare][jid.resource] + except KeyError: + return False + return True + + def get_joined_users(self, jid): + return list(self._joined_users[jid].keys()) + def _start_rejoin_timeout(self, room_jid): self._remove_rejoin_timeout(room_jid) self._rejoin_muc.add(room_jid) @@ -568,7 +627,7 @@ def _on_subject_change(self, _con, _stanza, properties): room_jid = properties.jid.bare - muc_data = self._manager.get(room_jid) + muc_data = self._mucs.get(room_jid) if muc_data is None: self._log.warning('No MUCData found for %s', room_jid) return @@ -593,7 +652,7 @@ def _fake_subject_change(self, room_jid): def _room_join_complete(self, muc_data): self._remove_join_timeout(muc_data.jid) - self._manager.set_state(muc_data.jid, MUCJoinedState.JOINED) + self._set_muc_state(muc_data.jid, MUCJoinedState.JOINED) self._remove_rejoin_timeout(muc_data.jid) # We successfully joined a MUC, set add bookmark with autojoin @@ -626,7 +685,7 @@ def _on_captcha_challenge(self, _con, _stanza, properties): self._log.warning('Ignore captcha challenge received from MAM') raise nbxmpp.NodeProcessed - muc_data = self._manager.get(properties.jid) + muc_data = self._mucs.get(properties.jid) if muc_data is None: return @@ -639,7 +698,7 @@ def _on_captcha_challenge(self, _con, _stanza, properties): store_bob_data(properties.captcha.bob_data) muc_data.captcha_id = properties.id - self._manager.set_state(properties.jid, MUCJoinedState.CAPTCHA_REQUEST) + self._set_muc_state(properties.jid, MUCJoinedState.CAPTCHA_REQUEST) self._remove_rejoin_timeout(properties.jid) room = self._get_contact(properties.jid.bare) @@ -648,7 +707,7 @@ def _on_captcha_challenge(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed def cancel_captcha(self, room_jid): - muc_data = self._manager.get(room_jid) + muc_data = self._mucs.get(room_jid) if muc_data is None: return @@ -656,11 +715,11 @@ def cancel_captcha(self, room_jid): self._log.warning('No captcha message id available') return self._nbxmpp('MUC').cancel_captcha(room_jid, muc_data.captcha_id) - self._manager.set_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) def send_captcha(self, room_jid, form_node): - self._manager.set_state(room_jid, MUCJoinedState.JOINING) + self._set_muc_state(room_jid, MUCJoinedState.JOINING) self._nbxmpp('MUC').send_captcha(room_jid, form_node, callback=self._on_captcha_result) @@ -669,10 +728,10 @@ def _on_captcha_result(self, task): try: task.finish() except StanzaError as error: - muc_data = self._manager.get(error.jid) + muc_data = self._mucs.get(error.jid) if muc_data is None: return - self._manager.set_state(error.jid, MUCJoinedState.CAPTCHA_FAILED) + self._set_muc_state(error.jid, MUCJoinedState.CAPTCHA_FAILED) room = self._get_contact(error.jid) room.notify('room-captcha-error', error) @@ -744,7 +803,7 @@ def invite(self, room, jid, reason=None, continue_=False): if contact and contact.supports(Namespace.CONFERENCE): type_ = InviteType.DIRECT - password = self._manager.get(room).password + password = self._mucs[room].password self._log.info('Invite %s to %s', jid, room) return self._nbxmpp('MUC').invite(room, jid, reason, password, continue_, type_) @@ -758,81 +817,5 @@ def _on_account_disconnected(self, _event): self._remove_join_timeout(room_jid) -class MUCManager(Observable): - def __init__(self, account, logger): - Observable.__init__(self) - self._account = account - self._log = logger - self._mucs = {} - self._joined_users = defaultdict(dict) - - def process_presence(self, properties): - jid = properties.jid - muc_presence = MUCPresenceData.from_presence(properties) - if not muc_presence.available: - self._joined_users[jid.bare].pop(jid.resource) - else: - self._joined_users[jid.bare][jid.resource] = muc_presence - return muc_presence - - def change_nickname(self, properties): - new_nick = properties.muc_user.nick - nick = properties.muc_nickname - presence_dict = self._joined_users[properties.jid.bare] - presence_dict[new_nick] = presence_dict.pop(nick) - - def is_joined(self, jid): - try: - self._joined_users[jid.bare][jid.resource] - except KeyError: - return False - return True - - def get_joined_users(self, jid): - return list(self._joined_users[jid].keys()) - - def add(self, muc): - self._mucs[muc.jid] = muc - self.notify('muc-added', self._account, muc.jid) - - def remove(self, muc): - self._mucs.pop(muc.jid, None) - self._joined_users.pop(muc.jid, None) - - def get(self, room_jid): - return self._mucs.get(room_jid) - - def set_state(self, room_jid, state): - muc = self._mucs.get(room_jid) - if muc is not None: - if muc.state == state: - return - self._log.info('Set MUC state: %s %s', room_jid, state) - - muc.state = state - self.notify('state-changed', - state, - qualifiers=(self._account, room_jid)) - - def get_joined_mucs(self): - mucs = self._mucs.values() - return [muc.jid for muc in mucs if muc.state == MUCJoinedState.JOINED] - - def get_mucs_with_state(self, states): - return [muc for muc in self._mucs.values() if muc.state in states] - - def reset_state(self): - client = app.get_client(self._account) - for muc in self._mucs.values(): - self.set_state(muc.jid, MUCJoinedState.NOT_JOINED) - self._joined_users.pop(muc.jid, None) - room = client.get_module('Contacts').get_contact(muc.jid) - room.set_not_joined() - room.notify('room-left') - - def __contains__(self, room_jid): - return room_jid in self._mucs - - def get_instance(*args, **kwargs): return MUC(*args, **kwargs), 'MUC' ===================================== gajim/common/modules/presence.py ===================================== @@ -72,7 +72,7 @@ def _presence_received(self, _con, stanza, properties): # MUC occupant presences are already handled in MUC module return - muc = self._con.get_module('MUC').get_manager().get(properties.jid) + muc = self._con.get_module('MUC').get_muc_data(properties.jid) if muc is not None: # Presence from the MUC itself, used for MUC avatar # handled in VCardAvatars module ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -102,7 +102,7 @@ def _presence_received(self, _con, _stanza, properties): else: jid = properties.jid.new_as_bare() - muc = self._con.get_module('MUC').get_manager().get(properties.jid) + muc = self._con.get_module('MUC').get_muc_data(properties.jid) self._process_update(jid, properties.avatar_state, properties.avatar_sha, ===================================== gajim/groupchat_control.py ===================================== @@ -201,12 +201,6 @@ def __init__(self, parent_win, jid, muc_data, acct): self.xml.stack.show_all() self.xml.stack.set_visible_child_name('groupchat') - client = app.get_client(self.account) - manager = client.get_module('MUC').get_manager() - manager.connect('state-changed', - self._on_muc_state_changed, - qualifiers=(self.account, self.room_jid)) - self.update_ui() self.widget.show_all() @@ -221,6 +215,7 @@ def __init__(self, parent_win, jid, muc_data, acct): def _connect_contact_signals(self): self.contact.multi_connect({ + 'state-changed': self._on_muc_state_changed, 'avatar-update': self._on_avatar_update, 'user-joined': self._on_user_joined, 'user-left': self._on_user_left, @@ -244,7 +239,8 @@ def _connect_contact_signals(self): 'room-join-failed': self._on_room_join_failed, }) - def _on_muc_state_changed(self, _muc_manager, _signal_name, state): + def _on_muc_state_changed(self, _contact, _signal_name): + state = self.contact.state if state == MUCJoinedState.JOINED: self.roster.initial_draw() @@ -273,8 +269,7 @@ def _on_muc_state_changed(self, _muc_manager, _signal_name, state): @property def _muc_data(self): client = app.get_client(self.account) - manager = client.get_module('MUC').get_manager() - return manager.get(self.room_jid) + return client.get_module('MUC').get_muc_data(self.room_jid) @property def _nick_completion(self): @@ -1380,8 +1375,6 @@ def shutdown(self, reason=None): app.settings.disconnect_signals(self) self.contact.disconnect(self) - client = app.get_client(self.account) - client.get_module('MUC').get_manager().disconnect(self) # PluginSystem: removing GUI extension points connected with # GrouphatControl instance object app.plugin_manager.remove_gui_extension_point( ===================================== gajim/gui_interface.py ===================================== @@ -1363,11 +1363,12 @@ def show_add_join_groupchat(self, account, jid, nickname=None): app.window.add_group_chat(account, str(jid), select=True) - def _on_muc_added(self, _muc_manger, _signal_name, account, jid): - if app.window.chat_exists(account, jid): + @staticmethod + def _on_muc_added(event): + if app.window.chat_exists(event.account, event.jid): return - app.window.add_group_chat(account, str(jid)) + app.window.add_group_chat(event.account, str(event.jid)) def new_private_chat(self, gc_contact, account, session=None): conn = app.connections[account] @@ -1559,8 +1560,8 @@ def enable_account(self, account): app.plugin_manager.register_modules_for_account( app.connections[account]) - muc_manager = app.connections[account].get_module('MUC').get_manager() - muc_manager.connect('muc-added', self._on_muc_added) + app.ged.register_event_handler( + 'muc-added', ged.CORE, self._on_muc_added) # update variables self.instances[account] = { @@ -2027,8 +2028,8 @@ def __init__(self): app.settings.get_account_setting(account, 'active')): client = Client(account) app.connections[account] = client - muc_manager = client.get_module('MUC').get_manager() - muc_manager.connect('muc-added', self._on_muc_added) + app.ged.register_event_handler( + 'muc-added', ged.CORE, self._on_muc_added) self.instances = {} ===================================== gajim/privatechat_control.py ===================================== @@ -46,7 +46,6 @@ class PrivateChatControl(ChatControl): def __init__(self, parent_win, jid, account): client = app.get_client(account) self._room_contact = client.get_module('Contacts').get_contact(jid.bare) - self._manager = client.get_module('MUC').get_manager() ChatControl.__init__(self, parent_win, jid, account, None) @@ -73,7 +72,8 @@ def room_name(self): return self._room_contact.name def get_our_nick(self): - muc_data = self._manager.get(self._room_contact.jid) + client = app.get_client(self.account) + muc_data = client.get_module('MUC').get_muc_data(self._room_contact.jid) return muc_data.nick def _on_user_nickname_changed(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/71ce5b66e19326941d652db18f1227a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/71ce5b66e19326941d652db18f1227a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Save workspace order
by Philipp Hörist 07 Mar '21

07 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 71ce5b66 by lovetox at 2021-03-07T13:11:50+01:00 Save workspace order - - - - - 2 changed files: - gajim/gtk/main.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -303,6 +303,8 @@ def add_workspace(self, workspace_id): self._chat_list_stack.add_chat_list(workspace_id) self._workspace_side_bar.activate_workspace(workspace_id) self._chat_list_stack.show_chat_list(workspace_id) + if self._startup_finished: + self._workspace_side_bar.store_workspace_order() def _edit_workspace(self, _action, _param): workspace_id = self.get_active_workspace() ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -104,6 +104,7 @@ def _on_drag_data_received(self, _widget, _drag_context, _x_coord, pos = len(self.get_children()) - 1 self.insert(row, pos) + self.store_workspace_order() app.window.activate_workspace(workspace_id) def _on_drag_leave(self, _widget, _drag_context, _time): @@ -147,6 +148,11 @@ def add_workspace(self, workspace_id): # Insert row before AddWorkspace row self.insert(row, len(self.get_children()) - 1) + def store_workspace_order(self): + order = [row.workspace_id for row in self.get_children()] + order.remove('add') + app.settings.set_app_setting('workspace_order', order) + def remove_workspace(self, workspace_id): if len(self._workspaces) == 1: return False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/71ce5b66e19326941d652db18f1227ae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/71ce5b66e19326941d652db18f1227ae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Fix leaving muc
by Philipp Hörist 07 Mar '21

07 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 5270bad4 by lovetox at 2021-03-07T11:12:15+01:00 Fix leaving muc - - - - - 30b27cdd by lovetox at 2021-03-07T11:21:37+01:00 Add more leak checks - - - - - 7 changed files: - gajim/chat_control.py - gajim/common/helpers.py - gajim/common/modules/chatstates.py - gajim/groupchat_control.py - gajim/gtk/chat_list_stack.py - gajim/gui_interface.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1106,6 +1106,7 @@ def shutdown(self): # Remove contact instance if contact has been removed super(ChatControl, self).shutdown() + app.check_finalize(self) def minimizable(self): return False ===================================== gajim/common/helpers.py ===================================== @@ -1299,14 +1299,14 @@ def disconnect(self, object_): for qualifier, handlers in qualifiers.items(): for handler in list(handlers): func = handler() - if func is None or func.__self__ == object_: + if func is None or func.__self__ is object_: self._callbacks[signal_name][qualifier].remove(handler) def connect(self, signal_name, func, qualifiers=None): - if inspect.ismethod(func): - weak_func = weakref.WeakMethod(func) - elif inspect.isfunction(func): - weak_func = weakref.ref(func) + if not inspect.ismethod(func): + raise ValueError('Only bound methods allowed') + + weak_func = weakref.WeakMethod(func) self._callbacks[signal_name][qualifiers].append(weak_func) ===================================== gajim/common/modules/chatstates.py ===================================== @@ -120,8 +120,9 @@ def _presence_received(self, self._log.info('Reset chatstate for %s', jid) contact = self._get_contact(jid) - if contact is None: + if contact.is_groupchat: return + contact.notify('chatstate-update') def _process_chatstate(self, _con, _stanza, properties): ===================================== gajim/groupchat_control.py ===================================== @@ -307,7 +307,6 @@ def add_actions(self): ('rename-groupchat-', None, self._on_rename_groupchat), ('change-subject-', None, self._on_change_subject), ('change-nickname-', None, self._on_change_nick), - ('disconnect-', None, self._on_disconnect), ('destroy-', None, self._on_destroy_room), ('configure-', None, self._on_configure_room), ('request-voice-', None, self._on_request_voice), @@ -476,9 +475,6 @@ def _on_muc_disco_update(self, _event): self.draw_banner_text() # Actions - def _on_disconnect(self, _action, _param): - self.leave() - def _on_information(self, _action, _param): self._muc_info_box.set_from_disco_info(self.disco_info) if self._subject_data is not None: @@ -1006,12 +1002,6 @@ def got_disconnected(self): self.update_actions() - def leave(self, reason=None): - self.got_disconnected() - self._close_control(reason=reason) - app.connections[self.account].get_module('MUC').leave( - self.room_jid, reason=reason) - def rejoin(self): app.connections[self.account].get_module('MUC').join(self._muc_data) @@ -1390,6 +1380,8 @@ def shutdown(self, reason=None): app.settings.disconnect_signals(self) self.contact.disconnect(self) + client = app.get_client(self.account) + client.get_module('MUC').get_manager().disconnect(self) # PluginSystem: removing GUI extension points connected with # GrouphatControl instance object app.plugin_manager.remove_gui_extension_point( @@ -1411,6 +1403,7 @@ def shutdown(self, reason=None): self.remove_actions() super(GroupchatControl, self).shutdown() + app.check_finalize(self) def safe_shutdown(self): # whether to ask for confirmation before closing muc ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -100,7 +100,7 @@ def add_chat_list(self, workspace_id): def remove_chat_list(self, workspace_id): chat_list = self._chat_lists[workspace_id] self.remove(chat_list) - for account, jid, _ in chat_list.get_open_chats(): + for account, jid, _, _ in chat_list.get_open_chats(): self.remove_chat(workspace_id, account, jid) self._chat_lists.pop(workspace_id) ===================================== gajim/gui_interface.py ===================================== @@ -1363,8 +1363,7 @@ def show_add_join_groupchat(self, account, jid, nickname=None): app.window.add_group_chat(account, str(jid), select=True) - @staticmethod - def _on_muc_added(_muc_manger, _signal_name, account, jid): + def _on_muc_added(self, _muc_manger, _signal_name, account, jid): if app.window.chat_exists(account, jid): return ===================================== gajim/gui_menu_builder.py ===================================== @@ -586,7 +586,6 @@ def get_groupchat_menu(control_id, account, jid): ('win.request-voice-', _('Request Voice')), ('win.execute-command-', _('Execute Command…')), ('app.browse-history', _('History')), - ('win.disconnect-', _('Leave')), ] def build_menu(preset): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7e2351d29fa2cb8809f0713973efac0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7e2351d29fa2cb8809f0713973efac0… 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