Commits September 2020

commits@gajim.org

1 participants
105 discussions

[Git][gajim/gajim][master] ChatControlBase: Delete objects later
by Philipp Hörist 03 Sep '20

03 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8afca1d1 by lovetox at 2020-09-03T07:21:01+02:00 ChatControlBase: Delete objects later Fixes #10255 - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -653,6 +653,14 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): menu.show_all() def shutdown(self): + # remove_gui_extension_point() is called on shutdown, but also when + # a plugin is getting disabled. Plugins don’t know the difference. + # Plugins might want to remove their widgets on + # remove_gui_extension_point(), so delete the objects only afterwards. + app.plugin_manager.remove_gui_extension_point('chat_control_base', self) + app.plugin_manager.remove_gui_extension_point( + 'chat_control_base_update_toolbar', self) + for i in list(self.handlers.keys()): if self.handlers[i].handler_is_connected(i): self.handlers[i].disconnect(i) @@ -668,12 +676,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): del self.xml - # PluginSystem: removing GUI extension points - # connected with ChatControlBase instance object - app.plugin_manager.remove_gui_extension_point('chat_control_base', self) - app.plugin_manager.remove_gui_extension_point( - 'chat_control_base_update_toolbar', self) - self.unregister_events() def on_msg_textview_populate_popup(self, _textview, menu): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8afca1d1c98ab53550aeb9f631f380dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8afca1d1c98ab53550aeb9f631f380dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: ChatControlBase: Remove unused extension point
by Philipp Hörist 02 Sep '20

02 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: f4a732b5 by lovetox at 2020-09-02T22:04:53+02:00 ChatControlBase: Remove unused extension point - - - - - e5112592 by lovetox at 2020-09-02T22:05:19+02:00 Settings: Remove show_avatar_in_chat setting - - - - - 47efd936 by lovetox at 2020-09-02T22:05:27+02:00 Controls: Unify method name for updating avatar - - - - - 7 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/config.py - gajim/common/setting_values.py - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -141,7 +141,7 @@ class ChatControl(ChatControlBase): self.update_toolbar() self.update_all_pep_types() - self.show_avatar() + self._update_avatar() # Hook up signals widget = self.xml.location_eventbox @@ -673,7 +673,7 @@ class ChatControl(ChatControlBase): @event_filter(['account', 'jid']) def _on_update_roster_avatar(self, obj): - self.show_avatar() + self._update_avatar() def _nec_ping(self, event): if self.contact != event.contact: @@ -838,7 +838,7 @@ class ChatControl(ChatControlBase): # The name banner is drawn here ChatControlBase.update_ui(self) self.update_toolbar() - self.show_avatar() + self._update_avatar() def draw_banner_text(self): """ @@ -1159,10 +1159,7 @@ class ChatControl(ChatControlBase): return on_yes(self) - def show_avatar(self): - if not app.settings.get('show_avatar_in_chat'): - return - + def _update_avatar(self): scale = self.parent_win.window.get_scale_factor() surface = app.contacts.get_avatar(self.account, self.contact.jid, ===================================== gajim/chat_control_base.py ===================================== @@ -344,9 +344,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): Derived types MAY implement this. """ self.draw_banner_text() - self._update_banner_state_image() - app.plugin_manager.gui_extension_point('chat_control_base_draw_banner', - self) def update_toolbar(self): """ @@ -373,11 +370,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): """ self.draw_banner() - def _update_banner_state_image(self): - """ - Derived types MAY implement this - """ - def _update_toolbar(self): """ Derived types MAY implement this @@ -679,8 +671,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): # PluginSystem: removing GUI extension points # connected with ChatControlBase instance object app.plugin_manager.remove_gui_extension_point('chat_control_base', self) - app.plugin_manager.remove_gui_extension_point( - 'chat_control_base_draw_banner', self) app.plugin_manager.remove_gui_extension_point( 'chat_control_base_update_toolbar', self) ===================================== gajim/common/config.py ===================================== @@ -194,7 +194,6 @@ class Config: #always, never, peracct, pertype should not be translated _('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'always_with_roster\' - Like \'always\' but the messages are in a single window along with the contact list.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g. chats vs. group chats) is sent to a specific window.')], 'show_roster_on_startup':[opt_str, 'always', _('Show contact list window on startup.\n\'always\' - Always show contact list window.\n\'never\' - Never show contact list window.\n\'last_state\' - Restore last state of the contact list window.')], - 'show_avatar_in_chat': [opt_bool, True, _('If enabled, Gajim displays the avatar in the chat window.')], 'escape_key_closes': [opt_bool, False, _('If enabled, pressing Esc closes a tab/window.')], 'hide_groupchat_banner': [opt_bool, False, _('Hides the banner in a group chat window.')], 'hide_chat_banner': [opt_bool, False, _('Hides the banner in a 1:1 chat window.')], ===================================== gajim/common/setting_values.py ===================================== @@ -131,7 +131,6 @@ APP_SETTINGS = { 'notification_timeout': 5, 'one_message_window': 'always', 'show_roster_on_startup': 'always', - 'show_avatar_in_chat': True, 'escape_key_closes': False, 'hide_groupchat_banner': False, 'hide_chat_banner': False, @@ -426,7 +425,6 @@ ADVANCED_SETTINGS = { 'roster_window_skip_taskbar': _('Don\'t show contact list window in the system taskbar.'), 'use_urgency_hint': _('If enabled, Gajim makes the window flash (the default behaviour in most Window Managers) when holding pending events.'), 'notification_timeout': '', - 'show_avatar_in_chat': _('If enabled, Gajim displays the avatar in the chat window.'), 'escape_key_closes': _('If enabled, pressing Esc closes a tab/window.'), 'hide_groupchat_banner': _('Hides the banner in a group chat window.'), 'hide_chat_banner': _('Hides the banner in a 1:1 chat window.'), ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -161,7 +161,7 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkImage" id="gc_banner_status_image"> + <object class="GtkImage" id="avatar_image"> <property name="width_request">48</property> <property name="height_request">48</property> <property name="visible">True</property> ===================================== gajim/groupchat_control.py ===================================== @@ -166,6 +166,8 @@ class GroupchatControl(ChatControlBase): lambda *args: self.show_roster()) self.xml.banner_actionbar.pack_end(self.hide_roster_button) + self._update_avatar() + # Holds CaptchaRequest widget self._captcha_request = None @@ -808,14 +810,14 @@ class GroupchatControl(ChatControlBase): AvatarSize.ROSTER, self.scale_factor) - def _update_banner_state_image(self): + def _update_avatar(self): surface = app.interface.avatar_storage.get_muc_surface( self.account, self.contact.jid, AvatarSize.CHAT, self.scale_factor) - self.xml.gc_banner_status_image.set_from_surface(surface) + self.xml.avatar_image.set_from_surface(surface) def draw_banner_text(self): """ @@ -826,7 +828,7 @@ class GroupchatControl(ChatControlBase): @event_filter(['jid=room_jid']) def _on_update_room_avatar(self, event): - self._update_banner_state_image() + self._update_avatar() @event_filter(['account']) def _on_bookmarks_received(self, _event): @@ -1187,8 +1189,6 @@ class GroupchatControl(ChatControlBase): self.is_connected = True ChatControlBase.got_connected(self) - # We don't redraw the whole banner here, because only icon change - self._update_banner_state_image() if self.parent_win: self.parent_win.redraw_tab(self) @@ -1224,8 +1224,6 @@ class GroupchatControl(ChatControlBase): # Update Roster app.interface.roster.draw_contact(self.room_jid, self.account) - # We don't redraw the whole banner here, because only icon change - self._update_banner_state_image() if self.parent_win: self.parent_win.redraw_tab(self) ===================================== gajim/privatechat_control.py ===================================== @@ -181,7 +181,7 @@ class PrivateChatControl(ChatControl): def _on_update_gc_avatar(self, event): if event.contact != self.gc_contact: return - self.show_avatar() + self._update_avatar() def send_message(self, message, xhtml=None, process_commands=True, attention=False): @@ -215,10 +215,7 @@ class PrivateChatControl(ChatControl): else: self.got_connected() - def show_avatar(self): - if not app.settings.get('show_avatar_in_chat'): - return - + def _update_avatar(self): scale = self.parent_win.window.get_scale_factor() surface = self.gc_contact.get_avatar(AvatarSize.CHAT, scale, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/78e4e2bab4da4de283dc23b6797a21e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/78e4e2bab4da4de283dc23b6797a21e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Controls: Cleanup references on shutdown
by Philipp Hörist 02 Sep '20

02 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 78e4e2ba by lovetox at 2020-09-02T16:20:28+02:00 Controls: Cleanup references on shutdown - - - - - 3 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -352,6 +352,20 @@ class ChatControl(ChatControlBase): win.lookup_action( 'information-' + self.control_id).set_enabled(online) + def remove_actions(self): + super().remove_actions() + actions = [ + 'invite-contacts-', + 'add-to-roster-', + 'block-contact-', + 'information-', + 'toggle-audio-', + 'toggle-video-', + 'send-chatstate-', + ] + for action in actions: + self.parent_win.window.remove_action(f'{action}{self.control_id}') + def focus(self): self.msg_textview.grab_focus() @@ -1076,12 +1090,15 @@ class ChatControl(ChatControlBase): self.unsubscribe_events() + self.remove_actions() + # Send 'gone' chatstate con = app.connections[self.account] con.get_module('Chatstate').set_chatstate(self.contact, Chatstate.GONE) for jingle_type in ('audio', 'video'): self.close_jingle_content(jingle_type) + self.jingle.clear() # disconnect self from session if self.session: ===================================== gajim/chat_control_base.py ===================================== @@ -527,6 +527,17 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): action.set_enabled(False) self.parent_win.window.add_action(action) + def remove_actions(self): + actions = [ + 'set-encryption-', + 'send-file-', + 'send-file-httpupload-', + 'send-file-jingle-', + ] + + for action in actions: + self.parent_win.window.remove_action(f'{action}{self.control_id}') + def change_encryption(self, action, param): encryption = param.get_string() if encryption == 'disabled': ===================================== gajim/groupchat_control.py ===================================== @@ -431,6 +431,37 @@ class GroupchatControl(ChatControlBase): self._get_action('kick-').set_enabled(self.is_connected) + def remove_actions(self): + super().remove_actions() + actions = [ + 'rename-groupchat-', + 'change-subject-', + 'change-nickname-', + 'disconnect-', + 'destroy-', + 'configure-', + 'request-voice-', + 'upload-avatar-', + 'information-', + 'invite-', + 'contact-information-', + 'execute-command-', + 'ban-', + 'kick-', + 'change-role-', + 'change-affiliation-', + 'minimize-on-close-', + 'minimize-on-autojoin-', + 'send-chatstate-', + 'notify-on-message-', + 'print-status-', + 'print-join-left-', + 'choose-sync-', + ] + + for action in actions: + self.parent_win.window.remove_action(f'{action}{self.control_id}') + def _restore_conversation(self): rows = app.logger.load_groupchat_messages( self.account, self.contact.jid) @@ -1603,7 +1634,7 @@ class GroupchatControl(ChatControlBase): return self.contact.settings.get('minimize_on_close') def minimize(self): - # Minimize it + self.remove_actions() win = app.interface.msg_win_mgr.get_window(self.contact.jid, self.account) ctrl = win.get_control(self.contact.jid, self.account) @@ -1668,6 +1699,9 @@ class GroupchatControl(ChatControlBase): # Remove unread events from systray app.events.remove_events(self.account, self.room_jid) + if self.parent_win is not None: + self.remove_actions() + super(GroupchatControl, self).shutdown() def safe_shutdown(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/78e4e2bab4da4de283dc23b6797a21ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/78e4e2bab4da4de283dc23b6797a21ef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageWindow: Remove controls on destroy
by Philipp Hörist 02 Sep '20

02 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1eff95f7 by lovetox at 2020-09-02T13:23:43+02:00 MessageWindow: Remove controls on destroy - - - - - 1 changed file: - gajim/message_window.py Changes: ===================================== gajim/message_window.py ===================================== @@ -397,7 +397,7 @@ class MessageWindow(EventHelper): return True # halt the delete for the moment def _on_window_destroy(self, win): - for ctrl in self.controls(): + for ctrl in self.remove_all_controls(): ctrl.shutdown() self._controls.clear() # Clean up handlers connected to the parent window, this is important since @@ -571,6 +571,7 @@ class MessageWindow(EventHelper): fctrl = self.get_control(fjid, ctrl.account) bctrl = self.get_control(jid, ctrl.account) + # keep last_message_time around unless this was our last control with # that jid if not fctrl and not bctrl and \ @@ -758,6 +759,12 @@ class MessageWindow(EventHelper): for ctrl in list(jid_dict.values()): yield ctrl + def remove_all_controls(self): + for _account, control_dict in self._controls.items(): + for contact in list(control_dict.keys()): + yield control_dict[contact] + del control_dict[contact] + def get_nb_controls(self): return sum(len(jid_dict) for jid_dict in self._controls.values()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1eff95f7c08ce42b90700d7057d0e1ca… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1eff95f7c08ce42b90700d7057d0e1ca… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: SwitchSetting: Add state label
by Philipp Hörist 01 Sep '20

01 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0059d769 by lovetox at 2020-09-01T13:34:35+02:00 SwitchSetting: Add state label - - - - - 7906c9ef by lovetox at 2020-09-01T14:01:13+02:00 Builder: Add cache - - - - - 2 changed files: - gajim/gtk/settings.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/settings.py ===================================== @@ -298,7 +298,16 @@ class SwitchSetting(GenericSetting): self.switch.set_halign(Gtk.Align.END) self.switch.set_valign(Gtk.Align.CENTER) - self.setting_box.add(self.switch) + self._switch_state_label = Gtk.Label() + self._switch_state_label.set_xalign(1) + self._switch_state_label.set_valign(Gtk.Align.CENTER) + self._set_label(self.setting_value) + + box = Gtk.Box(spacing=12) + box.set_halign(Gtk.Align.END) + box.add(self._switch_state_label) + box.add(self.switch) + self.setting_box.add(box) self.show_all() @@ -309,6 +318,11 @@ class SwitchSetting(GenericSetting): def on_switch(self, switch, *args): value = switch.get_active() self.set_value(value) + self._set_label(value) + + def _set_label(self, active): + text = _('On') if active else _('Off') + self._switch_state_label.set_text(text) class EntrySetting(GenericSetting): ===================================== gajim/gtk/util.py ===================================== @@ -24,6 +24,7 @@ import sys import weakref import logging import textwrap +import functools from importlib import import_module import xml.etree.ElementTree as ET from pathlib import Path @@ -38,6 +39,7 @@ except Exception: from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib +from gi.repository import Gio from gi.repository import Pango from gi.repository import GdkPixbuf import nbxmpp @@ -164,6 +166,16 @@ class Builder: if gettext_ is None: gettext_ = _ + xml_text = self._load_string_from_filename(filename, gettext_) + + if widgets is not None: + self._builder.add_objects_from_string(xml_text, widgets) + else: + self._builder.add_from_string(xml_text) + + @staticmethod + @functools.lru_cache(maxsize=None) + def _load_string_from_filename(filename, gettext_): file_path = str(Path(configpaths.get('GUI')) / filename) if sys.platform == "win32": @@ -173,22 +185,14 @@ class Builder: if 'translatable' in node.attrib and node.text is not None: node.text = gettext_(node.text) - xml_text = ET.tostring(tree.getroot(), - encoding='unicode', - method='xml') - - if widgets is not None: - self._builder.add_objects_from_string(xml_text, widgets) - else: - # Workaround - # https://gitlab.gnome.org/GNOME/pygobject/issues/255 - Gtk.Builder.__mro__[1].add_from_string( - self._builder, xml_text, len(xml_text.encode("utf-8"))) - else: - if widgets is not None: - self._builder.add_objects_from_file(file_path, widgets) - else: - self._builder.add_from_file(file_path) + return ET.tostring(tree.getroot(), + encoding='unicode', + method='xml') + + + file = Gio.File.new_for_path(file_path) + content = file.load_contents(None) + return content[1].decode() def __getattr__(self, name): try: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ee799b9e67ae5707fc8d09b18d7d090… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ee799b9e67ae5707fc8d09b18d7d090… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2020