Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: XMLConsole: Use GTKSourceView
by Daniel Brötzmann (＠wurstsalat) 11 Dec '21

11 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7ab04140 by wurstsalat at 2021-12-11T21:48:30+01:00 XMLConsole: Use GTKSourceView - - - - - f4e46117 by wurstsalat at 2021-12-11T21:52:21+01:00 MessageRow: Only update text tags for MessageWidget - - - - - 0c1b1947 by wurstsalat at 2021-12-11T21:57:12+01:00 CodeWidget: Update color scheme on style change - - - - - 4 changed files: - gajim/data/gui/xml_console.ui - gajim/gtk/conversation/code_widget.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/xml_console.py Changes: ===================================== gajim/data/gui/xml_console.ui ===================================== @@ -2,6 +2,7 @@  <interface> <requires lib="gtk+" version="3.22"/> + <requires lib="gtksourceview" version="4.0"/> <object class="GtkHeaderBar" id="headerbar"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -193,7 +194,7 @@ <property name="can-focus">True</property> <property name="shadow-type">in</property> <child> - <object class="GtkTextView" id="textview"> + <object class="GtkSourceView" id="sourceview"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="editable">False</property> @@ -201,6 +202,7 @@ <property name="right-margin">6</property> <property name="top-margin">6</property> <property name="bottom-margin">6</property> + <property name="monospace">True</property> </object> </child> </object> ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -22,6 +22,7 @@ from gi.repository import GtkSource from gajim.common import app +from gajim.common import ged from gajim.common.i18n import _ log = logging.getLogger('gajim.gui.conversation.code_widget') @@ -98,12 +99,25 @@ def __init__(self) -> None: self._source_manager = GtkSource.LanguageManager.get_default() self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() + app.ged.register_event_handler('style-changed', + ged.GUI1, + self._on_style_changed) + + style_scheme = self._get_style_scheme() + if style_scheme is not None: + self.get_buffer().set_style_scheme(style_scheme) + + def _get_style_scheme(self): if app.css_config.prefer_dark: style_scheme = self._style_scheme_manager.get_scheme( 'solarized-dark') else: style_scheme = self._style_scheme_manager.get_scheme( 'solarized-light') + return style_scheme + + def _on_style_changed(self, *args): + style_scheme = self._get_style_scheme() if style_scheme is not None: self.get_buffer().set_style_scheme(style_scheme) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -210,7 +210,8 @@ def __init__(self, self.show_all() def update_text_tags(self) -> None: - self._message_widget.update_text_tags() + if isinstance(self._message_widget, MessageWidget): + self._message_widget.update_text_tags() def _check_for_highlight(self, content: ParsingResult) -> None: needs_highlight = message_needs_highlight( ===================================== gajim/gtk/xml_console.py ===================================== @@ -18,6 +18,7 @@ from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib +from gi.repository import GtkSource from gajim.common import app from gajim.common import ged @@ -41,7 +42,7 @@ def __init__(self): EventHelper.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) - self.set_default_size(600, 600) + self.set_default_size(800, 600) self.set_resizable(True) self.set_show_menubar(False) self.set_name('XMLConsoleWindow') @@ -77,6 +78,16 @@ def __init__(self): self._ui.actionbar.pack_end(self._combo) self._create_tags() + + source_manager = GtkSource.LanguageManager.get_default() + lang = source_manager.get_language('xml') + self._ui.sourceview.get_buffer().set_language(lang) + + self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() + style_scheme = self._get_style_scheme() + if style_scheme is not None: + self._ui.sourceview.get_buffer().set_style_scheme(style_scheme) + self.show_all() self.connect('key_press_event', self._on_key_press_event) @@ -85,8 +96,23 @@ def __init__(self): self.register_events([ ('stanza-received', ged.GUI1, self._nec_stanza_received), ('stanza-sent', ged.GUI1, self._nec_stanza_sent), + ('style-changed', ged.GUI1, self._on_style_changed) ]) + def _get_style_scheme(self): + if app.css_config.prefer_dark: + style_scheme = self._style_scheme_manager.get_scheme( + 'solarized-dark') + else: + style_scheme = self._style_scheme_manager.get_scheme( + 'solarized-light') + return style_scheme + + def _on_style_changed(self, *args): + style_scheme = self._get_style_scheme() + if style_scheme is not None: + self._ui.sourceview.get_buffer().set_style_scheme(style_scheme) + def _on_value_change(self, combo): self._selected_send_account = combo.get_active_id() @@ -98,21 +124,16 @@ def _set_titlebar(self): self._ui.headerbar.set_subtitle(title) def _create_tags(self): - buffer_ = self._ui.textview.get_buffer() - in_color = app.css_config.get_value( - '.gajim-incoming-nickname', StyleAttr.COLOR) - out_color = app.css_config.get_value( - '.gajim-outgoing-nickname', StyleAttr.COLOR) - - tags = ['presence', 'message', 'stream', 'iq'] - - tag = buffer_.create_tag('incoming') - tag.set_property('foreground', in_color) - tag = buffer_.create_tag('outgoing') - tag.set_property('foreground', out_color) - + tags = [ + 'incoming', + 'outgoing', + 'presence', + 'message', + 'stream', + 'iq' + ] for tag_name in tags: - buffer_.create_tag(tag_name) + self._ui.sourceview.get_buffer().create_tag(tag_name) def _on_key_press_event(self, _widget, event): if event.keyval == Gdk.KEY_Escape: @@ -230,7 +251,7 @@ def _on_search_clicked(self, button): def _find(self, forward): search_str = self._ui.search_entry.get_text() - textbuffer = self._ui.textview.get_buffer() + textbuffer = self._ui.sourceview.get_buffer() cursor_mark = textbuffer.get_insert() current_pos = textbuffer.get_iter_at_mark(cursor_mark) @@ -262,7 +283,7 @@ def _find(self, forward): match_start, match_end = match textbuffer.select_range(match_start, match_end) mark = textbuffer.create_mark('last_pos', match_end, True) - self._ui.textview.scroll_to_mark(mark, 0, True, 0.5, 0.5) + self._ui.sourceview.scroll_to_mark(mark, 0, True, 0.5, 0.5) self.last_search = search_str @staticmethod @@ -320,7 +341,7 @@ def _on_filter_destroyed(self, _win): self.filter_dialog = None def _on_clear(self, *args): - self._ui.textview.get_buffer().set_text('') + self._ui.sourceview.get_buffer().set_text('') def _set_account(self, value, _data): self.selected_account = value @@ -329,7 +350,7 @@ def _set_account(self, value, _data): def _on_setting(self, value, data): setattr(self, data, value) value = not value - table = self._ui.textview.get_buffer().get_tag_table() + table = self._ui.sourceview.get_buffer().get_tag_table() tag = table.lookup(data) if data in ('incoming', 'outgoing'): if value: @@ -365,7 +386,7 @@ def _print_stanza(self, event, kind): at_the_end = util.at_the_end(self._ui.scrolled) - buffer_ = self._ui.textview.get_buffer() + buffer_ = self._ui.sourceview.get_buffer() end_iter = buffer_.get_end_iter() type_ = kind View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f55a012764a1a4e0da7bc7b34441fc0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f55a012764a1a4e0da7bc7b34441fc0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] (Re)store unread counts
by Daniel Brötzmann (＠wurstsalat) 11 Dec '21

11 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f55a0127 by wurstsalat at 2021-12-11T20:30:07+01:00 (Re)store unread counts - - - - - 4 changed files: - gajim/common/storage/cache.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py Changes: ===================================== gajim/common/storage/cache.py ===================================== @@ -317,6 +317,11 @@ def get_contact(self, jid, prop): # TODO: Expire entries return value + @timeit + def get_unread(self): + sql = 'SELECT * FROM unread' + return self._con.execute(sql).fetchall() + @timeit def get_unread_count(self, account, jid): sql = '''SELECT count, message_id, timestamp FROM unread @@ -325,10 +330,14 @@ def get_unread_count(self, account, jid): @timeit def set_unread_count(self, account, jid, count, message_id, timestamp): - sql = '''INSERT INTO unread (account, jid, count, message_id, timestamp) - VALUES (?, ?, ?, ?, ?)''' - self._con.execute(sql, (account, jid, count, message_id, timestamp)) - self._delayed_commit() + if self.get_unread_count(account, jid) is not None: + self.update_unread_count(account, jid, count) + else: + sql = '''INSERT INTO unread + (account, jid, count, message_id, timestamp) + VALUES (?, ?, ?, ?, ?)''' + self._con.execute(sql, (account, jid, count, message_id, timestamp)) + self._delayed_commit() @timeit def update_unread_count(self, account, jid, count): ===================================== gajim/gtk/chat_list.py ===================================== @@ -113,6 +113,15 @@ def get_chat_unread_count(self, return chat.unread_count return None + def set_chat_unread_count(self, + account: str, + jid: JID, + count: int + ) -> None: + chat = self._chats.get((account, jid)) + if chat is not None: + chat.unread_count = count + def mark_as_read(self, account: str, jid: JID) -> None: chat = self._chats.get((account, jid)) if chat is not None: @@ -744,6 +753,12 @@ def add_unread(self, text: str) -> None: self._unread_count += 1 self._update_unread() self.get_parent().emit_unread_changed() + app.storage.cache.set_unread_count( + self.account, + self.jid, + self.get_real_unread_count(), + self.message_id, + self.timestamp) if self.contact.is_groupchat: needs_highlight = message_needs_highlight( @@ -758,6 +773,7 @@ def reset_unread(self) -> None: self._unread_count = 0 self._update_unread() self.get_parent().emit_unread_changed() + app.storage.cache.reset_unread_count(self.account, self.jid) # Add class again in case we were mentioned previously if self.contact.is_groupchat and not self.contact.can_notify(): ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -260,6 +260,14 @@ def get_chat_unread_count(self, return count return None + def set_chat_unread_count(self, + account: str, + jid: JID, + count: int + ) -> None: + for chat_list in self._chat_lists.values(): + chat_list.set_chat_unread_count(account, jid, count) + def mark_as_read(self, account: str, jid: JID) -> None: for chat_list in self._chat_lists.values(): chat_list.mark_as_read(account, jid) ===================================== gajim/gtk/main.py ===================================== @@ -123,6 +123,7 @@ def __init__(self): self._check_for_account() self._load_chats() + self._load_unread_counts() self._add_actions() self._add_actions2() @@ -332,6 +333,16 @@ def _set_startup_finished(self): self._startup_finished = True self._chat_page.set_startup_finished() + def _load_unread_counts(self) -> None: + chats = app.storage.cache.get_unread() + chat_list_stack = self._chat_page.get_chat_list_stack() + + for chat in chats: + chat_list_stack.set_chat_unread_count( + chat.account, + chat.jid, + chat.count) + def show_account_page(self, account: str) -> None: self._app_side_bar.unselect_all() self._workspace_side_bar.unselect_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f55a012764a1a4e0da7bc7b34441fc0c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f55a012764a1a4e0da7bc7b34441fc0c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MoreMenuButton: Create Popover on demand
by Daniel Brötzmann (＠wurstsalat) 11 Dec '21

11 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: bae27f1c by wurstsalat at 2021-12-11T19:32:22+01:00 MoreMenuButton: Create Popover on demand - - - - - 1 changed file: - gajim/gtk/conversation/rows/base.py Changes: ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -95,9 +95,9 @@ def __destroy(widget: Gtk.Widget) -> None: @wrap_with_event_box -class MoreMenuButton(Gtk.MenuButton): +class MoreMenuButton(Gtk.Button): def __init__(self, row, contact, name): - Gtk.MenuButton.__init__(self) + Gtk.Button.__init__(self) self.set_valign(Gtk.Align.START) self.set_halign(Gtk.Align.END) self.set_relief(Gtk.ReliefStyle.NONE) @@ -111,11 +111,9 @@ def __init__(self, row, contact, name): image = Gtk.Image.new_from_icon_name( 'feather-more-horizontal-symbolic', Gtk.IconSize.BUTTON) self.add(image) - self._create_popover() - self.connect('clicked', self._on_click) - def _on_click(self, _button): + def _on_click(self, _button: Gtk.Button) -> None: show_retract = False if self._contact.is_groupchat: disco_info = app.storage.cache.get_last_disco_info( @@ -125,9 +123,9 @@ def _on_click(self, _button): is_allowed = is_retraction_allowed(self_contact, contact) if disco_info.has_message_moderation and is_allowed: show_retract = True - self._retract_button.set_visible(show_retract) + self._create_popover(show_retract) - def _create_popover(self): + def _create_popover(self, show_retract: bool) -> None: menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) menu_box.get_style_context().add_class('padding-6') @@ -147,17 +145,25 @@ def _create_popover(self): 'edit-copy-symbolic', Gtk.IconSize.MENU)) menu_box.add(copy_button) - self._retract_button = Gtk.ModelButton() - self._retract_button.set_halign(Gtk.Align.START) - self._retract_button.connect( - 'clicked', self._row.on_retract_message) - self._retract_button.set_label(_('Retract')) - self._retract_button.set_image(Gtk.Image.new_from_icon_name( - 'edit-undo-symbolic', Gtk.IconSize.MENU)) - menu_box.add(self._retract_button) + if show_retract: + retract_button = Gtk.ModelButton() + retract_button.set_halign(Gtk.Align.START) + retract_button.connect( + 'clicked', self._row.on_retract_message) + retract_button.set_label(_('Retract')) + retract_button.set_image(Gtk.Image.new_from_icon_name( + 'edit-undo-symbolic', Gtk.IconSize.MENU)) + menu_box.add(retract_button) menu_box.show_all() popover = Gtk.PopoverMenu() popover.add(menu_box) - self.set_popover(popover) + popover.set_relative_to(self) + popover.set_position(Gtk.PositionType.BOTTOM) + popover.connect('closed', self._on_closed) + popover.popup() + + @staticmethod + def _on_closed(popover: Gtk.Popover) -> None: + GLib.idle_add(popover.destroy) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bae27f1c78a815d6647b622dc7dfa8b7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bae27f1c78a815d6647b622dc7dfa8b7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Fix getting type for group chat setting with default
by Daniel Brötzmann (＠wurstsalat) 11 Dec '21

11 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0d5f5cc6 by wurstsalat at 2021-12-11T18:38:43+01:00 Settings: Fix getting type for group chat setting with default The dict fallback always returned a str, instead of looking up a key value Fixes #10716 - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -689,8 +689,9 @@ def set_group_chat_setting(self, if default is HAS_ACCOUNT_DEFAULT: default_store = ACCOUNT_SETTINGS['account'] - default = default_store.get(f'gc_{setting}_{context}_default', - f'gc_{setting}_default') + default = default_store.get(f'gc_{setting}_{context}_default') + if default is None: + default = default_store.get(f'gc_{setting}_default') if not isinstance(value, type(default)) and value is not None: raise TypeError(f'Invalid type for {setting}: ' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0d5f5cc6c63e605b6f4b2beb95f77cdf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0d5f5cc6c63e605b6f4b2beb95f77cdf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Preview: Hide buttons by default
by Daniel Brötzmann (＠wurstsalat) 11 Dec '21

11 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 45173cd1 by wurstsalat at 2021-12-11T17:51:20+01:00 Preview: Hide buttons by default - - - - - 5c0618cf by wurstsalat at 2021-12-11T17:51:23+01:00 Preview: Improve display for public MUCs - - - - - 3 changed files: - gajim/common/preview.py - gajim/data/gui/preview.ui - gajim/gtk/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -61,11 +61,14 @@ def __init__(self, orig_path: Optional[Path], thumb_path: Optional[Path], size: int, - widget: Any) -> None: + widget: Any, + context: Optional[str] = None + ) -> None: self._uri = uri self._urlparts = urlparts self._filename = filename_from_uri(uri) self._widget = widget + self._context = context self.account = widget.account self.orig_path = orig_path @@ -102,6 +105,10 @@ def is_audio(self) -> bool: def uri(self) -> str: return self._uri + @property + def context(self) -> Optional[str]: + return self._context + @property def filename(self) -> str: return self._filename @@ -240,13 +247,17 @@ def is_previewable(self, return True - def create_preview(self, uri: str, widget: Any, context: str) -> None: + def create_preview(self, + uri: str, + widget: Any, + context: Optional[str] = None + ) -> None: if uri.startswith('geo:'): preview = Preview(uri, None, None, None, 96, widget) preview.update_widget() return - preview = self._process_web_uri(uri, widget) + preview = self._process_web_uri(uri, widget, context) if not preview.orig_exists(): if context is not None: @@ -267,7 +278,11 @@ def create_preview(self, uri: str, widget: Any, context: str) -> None: self._on_thumb_load_finished, preview) - def _process_web_uri(self, uri: str, widget: Any) -> Preview: + def _process_web_uri(self, + uri: str, + widget: Any, + context: Optional[str] = None + ) -> Preview: urlparts = urlparse(uri) size = app.settings.get('preview_size') orig_path, thumb_path = get_image_paths(uri, @@ -280,7 +295,8 @@ def _process_web_uri(self, uri: str, widget: Any) -> Preview: orig_path, thumb_path, size, - widget) + widget, + context=context) def _on_orig_load_finished(self, data: Optional[bytes], ===================================== gajim/data/gui/preview.ui ===================================== @@ -55,7 +55,6 @@ <signal name="realize" handler="_on_realize" swapped="no"/> <child> <object class="GtkButton" id="download_button"> - <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> <property name="no-show-all">True</property> @@ -91,7 +90,6 @@ <signal name="realize" handler="_on_realize" swapped="no"/> <child> <object class="GtkButton" id="save_as_button"> - <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> <property name="no-show-all">True</property> @@ -126,7 +124,6 @@ <signal name="realize" handler="_on_realize" swapped="no"/> <child> <object class="GtkButton" id="open_folder_button"> - <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> <property name="no-show-all">True</property> ===================================== gajim/gtk/preview.py ===================================== @@ -114,6 +114,11 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._ui.icon_event_box.show() image.set_property('pixel-size', 64) + file_size_string = _('File size unknown') + if preview.file_size != 0: + file_size_string = GLib.format_size_full( + preview.file_size, self._units) + if preview.orig_exists(): self._ui.download_button.hide() self._ui.open_folder_button.show() @@ -126,19 +131,21 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._ui.right_box.pack_end(audio_widget, False, True, 0) self._ui.right_box.reorder_child(audio_widget, 1) else: + self._ui.download_button.show() self._ui.save_as_button.hide() self._ui.open_folder_button.hide() + allow_in_public = app.settings.get('preview_anonymous_muc') + if preview.context == 'public' and not allow_in_public: + image = Gtk.Image.new_from_icon_name( + 'dialog-question', Gtk.IconSize.DIALOG) + self._ui.icon_button.set_image(image) + file_size_string = _('Automatic preview disabled') - file_size_string = _('File size unknown') - if preview.file_size != 0: - file_size_string = GLib.format_size_full( - preview.file_size, self._units) self._ui.file_size.set_text(file_size_string) - self._ui.file_name.set_text(preview.filename) self._ui.file_name.set_tooltip_text(preview.filename) - def _get_context_menu(self): + def _get_context_menu(self) -> Gtk.Menu: def _destroy(menu, _pspec): visible = menu.get_property('visible') if not visible: @@ -167,12 +174,17 @@ def _destroy(menu, _pspec): return menu.context_menu - def _on_download(self, _menu): + def _on_download(self, _menu: Gtk.Menu) -> None: + if self._preview is None: + return if not self._preview.orig_exists(): app.interface.preview_manager.download_content( self._preview, force=True) - def _on_open(self, _menu): + def _on_open(self, _menu: Gtk.Menu) -> None: + if self._preview is None: + return + if self._preview.is_geo_uri: open_uri(self._preview.uri) return @@ -184,7 +196,7 @@ def _on_open(self, _menu): open_file(self._preview.orig_path) - def _on_save_as(self, _menu): + def _on_save_as(self, _menu: Gtk.Menu) -> None: def _on_ok(target_path): dirname = Path(target_path).parent if not os.access(dirname, os.W_OK): @@ -206,18 +218,18 @@ def _on_ok(target_path): file_name=self._preview.filename, transient_for=app.app.get_active_window()) - def _on_open_folder(self, _menu): + def _on_open_folder(self, _menu: Gtk.Menu) -> None: if not self._preview.orig_exists(): app.interface.preview_manager.download_content( self._preview, force=True) return open_file(self._preview.orig_path.parent) - def _on_copy_link_location(self, _menu): + def _on_copy_link_location(self, _menu: Gtk.Menu) -> None: clipboard = Gtk.Clipboard.get_default(Gdk.Display.get_default()) clipboard.set_text(self._preview.uri, -1) - def _on_open_link_in_browser(self, _menu): + def _on_open_link_in_browser(self, _menu: Gtk.Menu) -> None: if self._preview.is_aes_encrypted: if self._preview.is_geo_uri: open_uri(self._preview.uri) @@ -226,17 +238,20 @@ def _on_open_link_in_browser(self, _menu): else: open_uri(self._preview.uri) - def _on_content_button_clicked(self, _button): + def _on_content_button_clicked(self, _button: Gtk.Button) -> None: action = app.settings.get('preview_leftclick_action') method = getattr(self, f'_on_{action}') method(None) - def _on_button_press_event(self, _button, event): + def _on_button_press_event(self, + _button: Gtk.Button, + event: Gdk.EventButton + ) -> None: if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3: # Right click menu = self._get_context_menu() menu.popup_at_pointer(event) @staticmethod - def _on_realize(event_box): + def _on_realize(event_box: Gtk.EventBox) -> None: event_box.get_window().set_cursor(get_cursor('pointer')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/644db237d875d2a2a20066503bcd7a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/644db237d875d2a2a20066503bcd7a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] BaseControl: Fix _allow_add_message
by Daniel Brötzmann (＠wurstsalat) 11 Dec '21

11 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 644db237 by wurstsalat at 2021-12-11T15:50:17+01:00 BaseControl: Fix _allow_add_message - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1127,7 +1127,7 @@ def _allow_add_message(self) -> bool: lower_complete = self._scrolled_view.get_lower_complete() chat_idle = app.window.is_chat_idle(self.account, self.contact.jid) chat_selected = bool(app.window.get_active_control() is not None) - return lower_complete and chat_idle or chat_selected + return lower_complete and (chat_idle or chat_selected) def add_info_message(self, text: str) -> None: self.conversation_view.add_info_message(text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/644db237d875d2a2a20066503bcd7a45… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/644db237d875d2a2a20066503bcd7a45… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Improve logic for adding messages
by Daniel Brötzmann (＠wurstsalat) 11 Dec '21

11 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8a812783 by wurstsalat at 2021-12-11T13:23:29+01:00 Improve logic for adding messages - - - - - 3 changed files: - gajim/gtk/chat_page.py - gajim/gtk/controls/base.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -92,7 +92,7 @@ def __init__(self): self._ui.paned.set_position(app.settings.get('chat_handle_position')) self._ui.paned.connect('button-release-event', self._on_button_release) - self._currently_loaded_control: Optional[ControlType] = None + self._last_control: Optional[ControlType] = None self._startup_finished: bool = False self._add_actions() @@ -168,7 +168,7 @@ def unload_idle_chats(self) -> bool: return True def _on_chat_selected(self, - chat_list_stack: ChatListStack, + _chat_list_stack: ChatListStack, workspace_id: str, account: str, jid: JID) -> None: @@ -181,11 +181,12 @@ def _on_chat_selected(self, control = self.get_control(account, jid) if control is None: return - if self._currently_loaded_control != control: - if self._currently_loaded_control is not None: - self._currently_loaded_control.set_control_active(False) + + if control != self._last_control: + if self._last_control is not None: + self._last_control.set_control_active(False) control.set_control_active(True) - self._currently_loaded_control = control + self._last_control = control def _on_chat_unselected(self, _chat_list_stack): self._chat_stack.clear() @@ -302,7 +303,7 @@ def remove_chat(self, account: str, jid: JID) -> None: def _on_chat_removed(self, _chat_list: ChatList, account: str, jid: JID, type_: str) -> None: self._chat_stack.remove_chat(account, jid) - self._currently_loaded_control = None + self._last_control = None if type_ == 'groupchat': client = app.get_client(account) client.get_module('MUC').leave(jid) @@ -324,8 +325,9 @@ def get_active_control(self) -> Optional[ControlType]: return None return self.get_control(chat.account, chat.jid) - def get_currently_loaded_control(self) -> Optional[ControlType]: - return self._currently_loaded_control + def is_chat_idle(self, account: str, jid: JID) -> bool: + entry = self._chat_idle_time.get((account, jid)) + return entry is not None def get_controls(self, account: Optional[str] ) -> Generator[ControlType, None, None]: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1123,6 +1123,12 @@ def save_message(self, message: str, msg_type: str) -> None: else: self.received_history_pos = pos + def _allow_add_message(self) -> bool: + lower_complete = self._scrolled_view.get_lower_complete() + chat_idle = app.window.is_chat_idle(self.account, self.contact.jid) + chat_selected = bool(app.window.get_active_control() is not None) + return lower_complete and chat_idle or chat_selected + def add_info_message(self, text: str) -> None: self.conversation_view.add_info_message(text) @@ -1130,15 +1136,11 @@ def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: self.conversation_view.add_file_transfer(transfer) def add_jingle_file_transfer(self, event): - control_selected = bool( - self == app.window.get_currently_loaded_control()) - if self._scrolled_view.get_lower_complete() and control_selected: + if self._allow_add_message(): self.conversation_view.add_jingle_file_transfer(event) def add_call_message(self, event): - control_selected = bool( - self == app.window.get_currently_loaded_control()) - if self._scrolled_view.get_lower_complete() and control_selected: + if self._allow_add_message(): self.conversation_view.add_call_message(event=event) def add_message(self, @@ -1157,9 +1159,7 @@ def add_message(self, if additional_data is None: additional_data = AdditionalDataDict() - control_selected = bool( - self == app.window.get_currently_loaded_control()) - if self._scrolled_view.get_lower_complete() and control_selected: + if self._allow_add_message(): self.conversation_view.add_message( text, kind, ===================================== gajim/gtk/main.py ===================================== @@ -506,8 +506,8 @@ def get_controls(self, account: Optional[str] = None def get_active_control(self) -> Optional[ControlType]: return self._chat_page.get_active_control() - def get_currently_loaded_control(self) -> Optional[ControlType]: - return self._chat_page.get_currently_loaded_control() + def is_chat_idle(self, account: str, jid: JID) -> bool: + return self._chat_page.is_chat_idle(account, jid) def chat_exists(self, account: str, jid: JID) -> bool: return self._chat_page.chat_exists(account, jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8a812783d7713cd510fb9dbf91ccd51c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8a812783d7713cd510fb9dbf91ccd51c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add possibility to set custom shortcuts
by Philipp Hörist (＠lovetox) 10 Dec '21

10 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: c6561cec by lovetox at 2021-12-10T22:46:48+01:00 Add possibility to set custom shortcuts - - - - - 4 changed files: - gajim/application.py - gajim/common/configpaths.py - gajim/common/helpers.py - + gajim/data/other/shortcuts.json Changes: ===================================== gajim/application.py ===================================== @@ -55,6 +55,7 @@ from gajim.common.storage.archive import MessageArchiveStorage from gajim.common.settings import Settings from gajim.common.settings import LegacyConfig +from gajim.common.helpers import load_json class GajimApplication(Gtk.Application): @@ -209,7 +210,7 @@ def _startup(self, _application): self.interface = Interface() self.interface.run(self) self.add_actions() - self._set_shortcuts() + self._load_shortcuts() from gajim import gui_menu_builder gui_menu_builder.build_accounts_menu() self.update_app_actions_state() @@ -470,41 +471,18 @@ def update_app_actions_state(self): enabled_accounts = app.settings.get_active_accounts() self.lookup_action('start-chat').set_enabled(enabled_accounts) - def _set_shortcuts(self): - shortcuts = { - 'app.quit': ['<Primary>Q'], - 'app.shortcuts': ['<Primary>question'], - 'app.preferences': ['<Primary>P'], - 'app.plugins': ['<Primary>E'], - 'app.xml-console': ['<Primary><Shift>X'], - 'app.file-transfer': ['<Primary>T'], - 'app.ipython': ['<Primary><Alt>I'], - 'app.start-chat::': ['<Primary>N'], - 'app.create-groupchat::': ['<Primary>G'], - 'win.change-nickname': ['<Primary><Shift>N'], - 'win.change-subject': ['<Primary><Shift>S'], - 'win.escape': ['Escape'], - 'win.send-file': ['<Primary>F'], - 'win.show-contact-info': ['<Primary>I'], - 'win.show-emoji-chooser': ['<Primary><Shift>M'], - 'win.clear-chat': ['<Primary>L'], - 'win.delete-line': ['<Primary>U'], - 'win.close-tab': ['<Primary>W'], - 'win.switch-next-tab': ['<Primary>Page_Down'], - 'win.switch-prev-tab': ['<Primary>Page_Up'], - 'win.switch-next-unread-tab': ['<Primary>Tab'], - 'win.switch-prev-unread-tab': ['<Primary>ISO_Left_Tab'], - 'win.switch-tab-1': ['<Alt>1', '<Alt>KP_1'], - 'win.switch-tab-2': ['<Alt>2', '<Alt>KP_2'], - 'win.switch-tab-3': ['<Alt>3', '<Alt>KP_3'], - 'win.switch-tab-4': ['<Alt>4', '<Alt>KP_4'], - 'win.switch-tab-5': ['<Alt>5', '<Alt>KP_5'], - 'win.switch-tab-6': ['<Alt>6', '<Alt>KP_6'], - 'win.switch-tab-7': ['<Alt>7', '<Alt>KP_7'], - 'win.switch-tab-8': ['<Alt>8', '<Alt>KP_8'], - 'win.switch-tab-9': ['<Alt>9', '<Alt>KP_9'], - 'win.search-history': ['<Primary>H'], - } + def _load_shortcuts(self): + default_path = configpaths.get('DATA') / 'other' / 'shortcuts.json' + shortcuts = load_json(default_path) + assert shortcuts is not None + + user_path = configpaths.get('MY_SHORTCUTS') + user_shortcuts = {} + if user_path.exists(): + app.log('app').info('Load user shortcuts') + user_shortcuts = load_json(user_path, default={}) + + shortcuts.update(user_shortcuts) for action, accels in shortcuts.items(): self.set_accels_for_action(action, accels) ===================================== gajim/common/configpaths.py ===================================== @@ -200,6 +200,7 @@ def init(self): ('PLUGINS_CONFIG_DIR', 'pluginsconfig', PathLocation.CONFIG, PathType.FOLDER), ('MY_CERT', 'localcerts', PathLocation.CONFIG, PathType.FOLDER), + ('MY_SHORTCUTS', 'shortcuts.json', PathLocation.CONFIG, PathType.FILE), ] for path in unique_profile_paths: ===================================== gajim/common/helpers.py ===================================== @@ -812,7 +812,9 @@ def helper(self, restart=False): return func(self) return helper -def load_json(path, key=None, default=None): +def load_json(path: Path, + key: Optional[str] = None, + default: Optional[Any] = None) -> Any: try: with path.open('r') as file: json_dict = json.loads(file.read()) ===================================== gajim/data/other/shortcuts.json ===================================== @@ -0,0 +1,34 @@ +{ + "app.quit": ["<Primary>Q"], + "app.shortcuts": ["<Primary>question"], + "app.preferences": ["<Primary>P"], + "app.plugins": ["<Primary>E"], + "app.xml-console": ["<Primary><Shift>X"], + "app.file-transfer": ["<Primary>T"], + "app.ipython": ["<Primary><Alt>I"], + "app.start-chat::": ["<Primary>N"], + "app.create-groupchat::": ["<Primary>G"], + "win.change-nickname": ["<Primary><Shift>N"], + "win.change-subject": ["<Primary><Shift>S"], + "win.escape": ["Escape"], + "win.send-file": ["<Primary>F"], + "win.show-contact-info": ["<Primary>I"], + "win.show-emoji-chooser": ["<Primary><Shift>M"], + "win.clear-chat": ["<Primary>L"], + "win.delete-line": ["<Primary>U"], + "win.close-tab": ["<Primary>W"], + "win.switch-next-tab": ["<Primary>Page_Down"], + "win.switch-prev-tab": ["<Primary>Page_Up"], + "win.switch-next-unread-tab": ["<Primary>Tab"], + "win.switch-prev-unread-tab": ["<Primary>ISO_Left_Tab"], + "win.switch-tab-1": ["<Alt>1", "<Alt>KP_1"], + "win.switch-tab-2": ["<Alt>2", "<Alt>KP_2"], + "win.switch-tab-3": ["<Alt>3", "<Alt>KP_3"], + "win.switch-tab-4": ["<Alt>4", "<Alt>KP_4"], + "win.switch-tab-5": ["<Alt>5", "<Alt>KP_5"], + "win.switch-tab-6": ["<Alt>6", "<Alt>KP_6"], + "win.switch-tab-7": ["<Alt>7", "<Alt>KP_7"], + "win.switch-tab-8": ["<Alt>8", "<Alt>KP_8"], + "win.switch-tab-9": ["<Alt>9", "<Alt>KP_9"], + "win.search-history": ["<Primary>H"] +} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c6561cecf7f84a9c16b0966ad7cf1696… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c6561cecf7f84a9c16b0966ad7cf1696… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Main: Unload only idle views
by Philipp Hörist (＠lovetox) 10 Dec '21

10 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: f0917b7b by lovetox at 2021-12-10T21:54:52+01:00 Main: Unload only idle views Unloading the Views on switching the chat freezes Gajim. For example if chats are switched very fast. - - - - - 4 changed files: - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -15,6 +15,9 @@ from typing import Optional from typing import Generator +import time +import logging + from gi.repository import Gtk from gi.repository import GLib from gi.repository import Gio @@ -31,6 +34,10 @@ from .chat_stack import ChatStack from .search_view import SearchView from .types import ControlType +from .const import UNLOAD_CHAT_TIME + + +log = logging.getLogger('gajim.gui.chat_page') class ChatPage(Gtk.Box): @@ -43,6 +50,9 @@ class ChatPage(Gtk.Box): def __init__(self): Gtk.Box.__init__(self) + + self._chat_idle_time: dict[tuple[str, JID], Optional[float]] = {} + self._ui = get_builder('chat_paned.ui') self.add(self._ui.paned) self._ui.connect_signals(self) @@ -132,12 +142,41 @@ def _on_filter_revealer_toggled(self, toggle_button): def _on_edit_workspace_clicked(_button): app.window.activate_action('edit-workspace', GLib.Variant('s', '')) - def _on_chat_selected(self, _chat_list_stack: ChatListStack, - workspace_id: str, account: str, + def _reset_chat_idle_time(self, account: str, jid: JID) -> None: + # Set the idle time of the current chat to None + # and start the timer for the last one + for chat, idle_time in self._chat_idle_time.items(): + if idle_time is None: + self._chat_idle_time[chat] = time.time() + + self._chat_idle_time[(account, jid)] = None + + def unload_idle_chats(self) -> bool: + log.debug('Unload idle chats') + for chat, idle_time in list(self._chat_idle_time.items()): + if idle_time is None: + continue + + if time.time() - UNLOAD_CHAT_TIME > idle_time: + account, jid = chat + self._chat_stack.unload_chat(account, jid) + self._chat_idle_time.pop(chat) + log.debug('Chat %s:%s unloaded', account, jid) + + # Return true because we call this method with + # GLib.timeout_add_seconds() + return True + + def _on_chat_selected(self, + chat_list_stack: ChatListStack, + workspace_id: str, + account: str, jid: JID) -> None: + self._chat_stack.show_chat(account, jid) self._search_view.set_context(account, jid) self.emit('chat-selected', workspace_id, account, jid) + self._reset_chat_idle_time(account, jid) control = self.get_control(account, jid) if control is None: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -55,7 +55,6 @@ def __init__(self): self.show_all() self._controls: Dict[Tuple[str, JID], ControlType] = {} - self._active_control: Optional[ControlType] = None def get_control(self, account: str, jid: JID) -> Optional[ControlType]: try: @@ -101,8 +100,6 @@ def add_private_chat(self, account: str, jid: JID) -> None: def remove_chat(self, account: str, jid: JID) -> None: control = self._controls.pop((account, jid)) - if control == self._active_control: - self._active_control = None self.remove(control.widget) control.shutdown() @@ -112,12 +109,15 @@ def show_chat(self, account: str, jid: JID) -> None: if control is None: log.warning('No Control found for %s, %s', account, jid) return - if control != self._active_control: - if self._active_control is not None: - self._active_control.reset_view() - self._active_control = control + GLib.idle_add(control.focus) + def unload_chat(self, account: str, jid: JID) -> None: + control = self.get_control(account, jid) + if control is None: + return + control.reset_view() + def clear(self) -> None: self.set_visible_child_name('empty') ===================================== gajim/gtk/const.py ===================================== @@ -31,6 +31,8 @@ # Drag and drop target type URI list (for dropped files) TARGET_TYPE_URI_LIST = 80 +UNLOAD_CHAT_TIME = 300 # seconds + @unique class Theme(IntEnum): ===================================== gajim/gtk/main.py ===================================== @@ -53,6 +53,7 @@ from .util import save_main_window_position from .util import open_window from .util import set_urgency_hint +from .const import UNLOAD_CHAT_TIME log = logging.getLogger('gajim.gui.main') @@ -126,11 +127,16 @@ def __init__(self): self._add_actions2() self._prepare_window() + self._start_timers() if not app.is_display(Display.WAYLAND): app.interface.systray.connect_unread_changed( self._chat_page.get_chat_list_stack()) + def _start_timers(self): + GLib.timeout_add_seconds(UNLOAD_CHAT_TIME, + self._chat_page.unload_idle_chats) + def _prepare_window(self) -> None: if app.settings.get('main_window_skip_taskbar'): self.set_property('skip-taskbar-hint', True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f0917b7b0f36c557e151ef37dd187847… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f0917b7b0f36c557e151ef37dd187847… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DOAP: Update status for some XEPs
by Daniel Brötzmann (＠wurstsalat) 10 Dec '21

10 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 70282c6c by wurstsalat at 2021-12-10T21:09:14+01:00 DOAP: Update status for some XEPs - - - - - 1 changed file: - data/gajim.doap Changes: ===================================== data/gajim.doap ===================================== @@ -86,7 +86,6 @@ <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0045.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.31.2</xmpp:version> - <xmpp:note>All basics stuff is supported. Also, some more advanced features like invitations, creation of rooms, etc.</xmpp:note> </xmpp:SupportedXep> </implements> <implements> @@ -240,6 +239,22 @@ <xmpp:version>1.1.1</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0107.html"/> + <xmpp:status>removed</xmpp:status> + <xmpp:version>1.2</xmpp:version> + <xmpp:note>Removed in 1.4.0</xmpp:note> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0108.html"/> + <xmpp:status>removed</xmpp:status> + <xmpp:version>1.3</xmpp:version> + <xmpp:note>Removed in 1.4.0</xmpp:note> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0115.html"/> @@ -556,6 +571,7 @@ <xmpp:status>partial</xmpp:status> <xmpp:version>0.4</xmpp:version> <xmpp:note>'displayed' markers are supported, but 'acknowledged' markers are not.</xmpp:note> + <xmpp:since>1.3.0</xmpp:since> </xmpp:SupportedXep> </implements> <implements> @@ -651,6 +667,7 @@ <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0425.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.2.1</xmpp:version> + <xmpp:since>1.4.0</xmpp:since> </xmpp:SupportedXep> </implements> <implements> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/70282c6cf6d708590fc1bdc5253f383f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/70282c6cf6d708590fc1bdc5253f383f… 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