Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Sidebar: Use selection sidebar throughout all sidebar elements
by Daniel Brötzmann (＠wurstsalat) 25 Sep '21

25 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 691e2f3c by wurstsalat at 2021-09-25T13:37:21+02:00 Sidebar: Use selection sidebar throughout all sidebar elements - - - - - 3 changed files: - gajim/gtk/account_side_bar.py - gajim/gtk/app_side_bar.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -24,6 +24,7 @@ def __init__(self): Gtk.ListBox.__init__(self) self.set_vexpand(True) self.set_valign(Gtk.Align.END) + self.set_selection_mode(Gtk.SelectionMode.SINGLE) self.get_style_context().add_class('account-sidebar') self.connect('row-activated', self._on_row_activated) @@ -56,7 +57,6 @@ class Account(Gtk.ListBoxRow): def __init__(self, account): Gtk.ListBoxRow.__init__(self) self.get_style_context().add_class('account-sidebar-item') - self.set_selectable(False) self.account = account self._account_class = None ===================================== gajim/gtk/app_side_bar.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from gi.repository import GLib from gi.repository import Gtk from gajim.common import app @@ -22,8 +23,8 @@ class AppSideBar(Gtk.ListBox): def __init__(self, app_page): Gtk.ListBox.__init__(self) - self.set_selection_mode(Gtk.SelectionMode.NONE) self.set_valign(Gtk.Align.START) + self.set_selection_mode(Gtk.SelectionMode.SINGLE) self.get_style_context().add_class('workspace-sidebar') self.connect('row-activated', self._on_app_row_activated) @@ -35,6 +36,9 @@ def __init__(self, app_page): self.show_all() + # Use idle_add to unselect listbox selection on startup + GLib.idle_add(self.unselect_all) + @staticmethod def _on_app_row_activated(_listbox, _row): app.window.show_app_page() ===================================== gajim/gtk/main.py ===================================== @@ -307,6 +307,8 @@ def _set_startup_finished(self): self._chat_page.set_startup_finished() def show_account_page(self, account): + self._app_side_bar.unselect_all() + self._workspace_side_bar.unselect_all() self._account_side_bar.activate_account_page(account) self._main_stack.show_account(account) @@ -359,6 +361,8 @@ def _activate_workspace(self, _action, param): self.activate_workspace(workspace_id) def activate_workspace(self, workspace_id): + self._app_side_bar.unselect_all() + self._account_side_bar.unselect_all() self._main_stack.show_chats(workspace_id) self._workspace_side_bar.activate_workspace(workspace_id) @@ -397,6 +401,8 @@ def add_private_chat(self, account, jid, select=False): select=select) def select_chat(self, account, jid): + self._app_side_bar.unselect_all() + self._account_side_bar.unselect_all() self._main_stack.show_chat_page() self._chat_page.select_chat(account, jid) @@ -418,6 +424,8 @@ def _add_to_roster(_action, param): open_window('AddContact', account=account, jid=jid) def show_app_page(self): + self._account_side_bar.unselect_all() + self._workspace_side_bar.unselect_all() self._main_stack.show_app_page() def add_app_message(self, category, message=None): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/691e2f3cdd66d5fdafe80e4fbad4c895… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/691e2f3cdd66d5fdafe80e4fbad4c895… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Interface: Fix handling message URIs without message
by Daniel Brötzmann (＠wurstsalat) 20 Sep '21

20 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: dcefc3f6 by wurstsalat at 2021-09-20T20:56:28+02:00 Interface: Fix handling message URIs without message - - - - - 3c76173d by wurstsalat at 2021-09-20T20:56:48+02:00 Remove obsolete ConversationTextview - - - - - 89467ae7 by wurstsalat at 2021-09-20T20:57:38+02:00 MessageTextview: Fix context menu and clean up handlers - - - - - 3 changed files: - gajim/gtk/conversation/plain_widget.py - − gajim/gtk/conversation_textview.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import logging from urllib.parse import quote from gi.repository import GObject @@ -28,9 +29,12 @@ from gajim.common.helpers import parse_uri from gajim.common.i18n import _ -from .util import get_cursor -from .util import make_pango_attribute +from gajim.gui_menu_builder import get_conv_context_menu +from ..util import get_cursor +from ..util import make_pango_attribute + +log = logging.getLogger('gajim.gui.conversaion.plain_widget') URI_TAGS = ['uri', 'address', 'xmppadr', 'mailadr'] STYLE_TAGS = ['strong', 'emphasis', 'strike', 'pre'] @@ -43,6 +47,7 @@ def __init__(self, account, selectable): self._account = account + # TODO: Window/Linux handling # self._text_widget = MessageTextview(self._account) self._text_widget = MessageLabel(self._account, selectable) self.add(self._text_widget) @@ -100,9 +105,14 @@ def __init__(self, account): self.set_cursor_visible(False) self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) - self.connect('query-tooltip', self._query_tooltip) - self.connect('button-press-event', self._on_button_press) - self.connect('populate-popup', self._on_populate_popup) + self._handlers = {} + + id_ = self.connect('query-tooltip', self._query_tooltip) + self._handlers[id_] = self + id_ = self.connect('button-press-event', self._on_button_press) + self._handlers[id_] = self + id_ = self.connect('populate-popup', self._on_populate_popup) + self._handlers[id_] = self self._account = account @@ -124,7 +134,10 @@ def __init__(self, account): self.connect('destroy', self._on_destroy) def _on_destroy(self, *args): - pass + for id_, widget in self._handlers.items(): + if widget.handler_is_connected(id_): + widget.disconnect(id_) + self._handlers.clear() def _create_url_tags(self): color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) @@ -252,11 +265,6 @@ def _on_populate_popup(self, _textview, menu): menu.show_all() return - item = Gtk.MenuItem.new_with_mnemonic(_('_Quote')) - id_ = item.connect('activate', self._on_quote) - self.handlers[id_] = item - menu.prepend(item) - selected_text_short = reduce_chars_newlines( self._selected_text, 25, 2) item = Gtk.MenuItem.new_with_mnemonic( @@ -274,7 +282,7 @@ def _on_populate_popup(self, _textview, menu): f'wiki/Special:Search?search={uri_text}') item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) id_ = item.connect('activate', self._visit_uri, uri) - self.handlers[id_] = item + self._handlers[id_] = item submenu.append(item) item = Gtk.MenuItem.new_with_mnemonic( @@ -289,7 +297,7 @@ def _on_populate_popup(self, _textview, menu): uri = (f'https://{i18n.get_short_lang_code()}.wiktionary.org/' f'wiki/Special:Search?search={uri_text}') id_ = item.connect('activate', self._visit_uri, uri) - self.handlers[id_] = item + self._handlers[id_] = item else: if dict_link.find('%s') == -1: # There has to be a '%s' in the url if it’s not WIKTIONARY @@ -299,7 +307,7 @@ def _on_populate_popup(self, _textview, menu): else: uri = dict_link % uri_text id_ = item.connect('activate', self._visit_uri, uri) - self.handlers[id_] = item + self._handlers[id_] = item submenu.append(item) search_link = app.settings.get('search_engine') @@ -312,12 +320,12 @@ def _on_populate_popup(self, _textview, menu): item = Gtk.MenuItem.new_with_mnemonic(_('Web _Search for it')) uri = search_link % uri_text id_ = item.connect('activate', self._visit_uri, uri) - self.handlers[id_] = item + self._handlers[id_] = item submenu.append(item) item = Gtk.MenuItem.new_with_mnemonic(_('Open as _Link')) id_ = item.connect('activate', self._visit_uri, uri) - self.handlers[id_] = item + self._handlers[id_] = item submenu.append(item) menu.show_all() @@ -341,8 +349,8 @@ def _on_uri_clicked(self, texttag, _widget, event, iter_, _kind): word = self.get_buffer().get_text(begin_iter, end_iter, True) uri = parse_uri(word) - if event.button.button == 3: # right click - self.show_context_menu(uri) + if event.button.button == 3: # right click + self._show_context_menu(uri) return Gdk.EVENT_STOP # self.plugin_modified = False @@ -354,8 +362,20 @@ def _on_uri_clicked(self, texttag, _widget, event, iter_, _kind): open_uri(uri, account=self._account) return Gdk.EVENT_STOP - def _on_quote(self, _widget): - self.emit('quote', self._selected_text) + def _show_context_menu(self, uri): + menu = get_conv_context_menu(self._account, uri) + if menu is None: + log.warning('No handler for URI type: %s', uri) + return + + def destroy(menu, _pspec): + visible = menu.get_property('visible') + if not visible: + GLib.idle_add(menu.destroy) + + menu.attach_to_widget(self, None) + menu.connect('notify::visible', destroy) + menu.popup_at_pointer() @staticmethod def _visit_uri(_widget, uri): ===================================== gajim/gtk/conversation_textview.py deleted ===================================== @@ -1,619 +0,0 @@ -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -import logging -from urllib.parse import quote - -from gi.repository import GLib -from gi.repository import GObject -from gi.repository import Gtk -from gi.repository import Pango - -from gajim.common import app -from gajim.common import i18n -from gajim.common.const import StyleAttr -from gajim.common.const import URI_SCHEMES -from gajim.common.helpers import AdditionalDataDict -from gajim.common.helpers import open_uri -from gajim.common.helpers import puny_encode_url -from gajim.common.helpers import reduce_chars_newlines -from gajim.common.i18n import _ -from gajim.common.regex import STH_AT_STH_DOT_STH_REGEX -from gajim.common.regex import BASIC_REGEX -from gajim.common.regex import LINK_REGEX -from gajim.common.regex import EMOT_AND_BASIC_REGEX -from gajim.common.regex import EMOT_AND_LINK_REGEX - -from .htmltextview import HtmlTextView -from .emoji_data import emoji_pixbufs -from .emoji_data import is_emoji -from .emoji_data import get_emoji_pixbuf -from .util import get_cursor - -log = logging.getLogger('gajim.gui.conversation_view') - - -class ConversationTextview(HtmlTextView): - - __gsignals__ = { - 'quote': ( - GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, - None, - (str, ) - ), - } - - def __init__(self, account): - HtmlTextView.__init__(self, account) - self.set_hexpand(True) - self.set_vexpand(True) - self.set_margin_start(0) - self.set_margin_end(0) - self.set_border_width(0) - self.set_left_margin(0) - self.set_right_margin(0) - - self.handlers = {} - - id_ = self.connect('query-tooltip', self._query_tooltip) - self.handlers[id_] = self - id_ = self.connect('button-press-event', self._on_button_press) - self.handlers[id_] = self - id_ = self.connect('populate-popup', self._on_populate_popup) - self.handlers[id_] = self - - # Used for changing the mouse pointer when hovering clickable URIs - self._cursor_changed = False - - # Keeps text selections for quoting and search actions - self._selected_text = '' - - self.get_style_context().add_class('gajim-conversation-font') - - buffer_ = self.get_buffer() - - self.tag_in = buffer_.create_tag('incoming') - color = app.css_config.get_value( - '.gajim-incoming-nickname', StyleAttr.COLOR) - self.tag_in.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-incoming-nickname') - self.tag_in.set_property('font-desc', desc) - - self.tag_out = buffer_.create_tag('outgoing') - color = app.css_config.get_value( - '.gajim-outgoing-nickname', StyleAttr.COLOR) - self.tag_out.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-outgoing-nickname') - self.tag_out.set_property('font-desc', desc) - - self.tag_status = buffer_.create_tag('status') - color = app.css_config.get_value( - '.gajim-status-message', StyleAttr.COLOR) - self.tag_status.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-status-message') - self.tag_status.set_property('font-desc', desc) - - tag_in_text = buffer_.create_tag('incomingtxt') - color = app.css_config.get_value( - '.gajim-incoming-message-text', StyleAttr.COLOR) - if color: - tag_in_text.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-incoming-message-text') - tag_in_text.set_property('font-desc', desc) - - tag_out_text = buffer_.create_tag('outgoingtxt') - color = app.css_config.get_value( - '.gajim-outgoing-message-text', StyleAttr.COLOR) - if color: - tag_out_text.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-outgoing-message-text') - tag_out_text.set_property('font-desc', desc) - - self.tag_marked = buffer_.create_tag('marked') - color = app.css_config.get_value( - '.gajim-highlight-message', StyleAttr.COLOR) - self.tag_marked.set_property('foreground', color) - self.tag_marked.set_property('weight', Pango.Weight.BOLD) - - tag = buffer_.create_tag('small') - tag.set_property('scale', 0.8333333333333) - - tag = buffer_.create_tag('bold') - tag.set_property('weight', Pango.Weight.BOLD) - - tag = buffer_.create_tag('italic') - tag.set_property('style', Pango.Style.ITALIC) - - tag = buffer_.create_tag('strikethrough') - tag.set_property('strikethrough', True) - - self.create_tags() - - self.connect('destroy', self._on_destroy) - - def _on_destroy(self, *args): - super()._on_destroy() - for i in self.handlers: - if self.handlers[i].handler_is_connected(i): - self.handlers[i].disconnect(i) - self.handlers.clear() - - def update_text_tags(self): - self.tag_in.set_property('foreground', app.css_config.get_value( - '.gajim-incoming-nickname', StyleAttr.COLOR)) - self.tag_out.set_property('foreground', app.css_config.get_value( - '.gajim-outgoing-nickname', StyleAttr.COLOR)) - self.tag_status.set_property('foreground', app.css_config.get_value( - '.gajim-status-message', StyleAttr.COLOR)) - self.tag_marked.set_property('foreground', app.css_config.get_value( - '.gajim-highlight-message', StyleAttr.COLOR)) - self.update_tags() - - def clear(self): - buffer_ = self.get_buffer() - start, end = buffer_.get_bounds() - buffer_.delete(start, end) - - def get_text(self): - buffer_ = self.get_buffer() - start, end = buffer_.get_bounds() - return buffer_.get_text(start, end, False) - - def print_text(self, text, other_text_tags=None, kind=None, graphics=True, - name=None, additional_data=None): - if additional_data is None: - additional_data = AdditionalDataDict() - - # Print XHTML if present - xhtml = additional_data.get_value('gajim', 'xhtml', False) - if xhtml and app.settings.get('show_xhtml'): - try: - if (name and (text.startswith('/me ') or - text.startswith('/me\n'))): - xhtml = xhtml.replace('/me', '<i>* %s</i>' % (name,), 1) - self.display_html(xhtml, self) - return - except Exception as err: - log.debug('Error processing xhtml: %s', err) - log.debug('with |%s|', xhtml) - - text_tags = [] - if other_text_tags: - text_tags = other_text_tags[:] # create a new list - - if (kind == 'status' or - text.startswith('/me') or text.startswith('/me\n')): - text_tags.append(kind) - - if name and (text.startswith('/me ') or text.startswith('/me\n')): - text = '* ' + name + text[3:] - text_tags.append('italic') - - if kind in ('incoming', 'incoming_queue'): - text_tags.append('incomingtxt') - elif kind == 'outgoing': - text_tags.append('outgoingtxt') - - self.parse_formatting( - text, text_tags, graphics=graphics, additional_data=additional_data) - - # Queue a widget resize after the Textview has been populated. - # This prevents for example large allocations of vertial space (blank - # space after the text) for messages containing many line breaks. - GLib.idle_add(self.queue_resize) - - def parse_formatting(self, text, text_tags, graphics=True, - additional_data=None, iter_=None): - ''' - Parses message formatting (Emojis, URIs, Styles). - A regex is used for text matching. Each text fragment gets - passed to apply_formatting(), where respective TextTags are added. - Unformatted text (no match) will be passed through unaltered. - ''' - if not text: - return - - if text_tags is None: - text_tags = [] - - buffer_ = self.get_buffer() - - if text_tags: - insert_tags_func = buffer_.insert_with_tags_by_name - else: - insert_tags_func = buffer_.insert - - # parse_formatting() is used by HtmlHandler.handle_specials() - # and uses Gtk.TextTag objects, not strings - if text_tags and isinstance(text_tags[0], Gtk.TextTag): - insert_tags_func = buffer_.insert_with_tags - - # TODO: Plugin system GUI extension point - # self.plugin_modified = False - # app.plugin_manager.extension_point('print_real_text', self, - # text, text_tags, graphics, additional_data) - # if self.plugin_modified: - # return - - # Add XEP-0066 Out of Band text to the end - oob_url = additional_data.get_value('gajim', 'oob_url') - if oob_url is not None: - oob_desc = additional_data.get_value('gajim', 'oob_desc', 'URL:') - if oob_url != text: - text += f'\n{oob_desc} {oob_url}' - - if app.settings.get('emoticons_theme') and graphics: - # Match for Emojis & URIs - if app.settings.get('ascii_formatting'): - regex = EMOT_AND_BASIC_REGEX - else: - regex = EMOT_AND_LINK_REGEX - else: - if app.settings.get('ascii_formatting'): - # Match for URIs + mail + formatting - regex = BASIC_REGEX - else: - # Match only for URIs + formatting - regex = LINK_REGEX - - iterator = regex.finditer(text) - if iter_: - end_iter = iter_ - else: - end_iter = buffer_.get_end_iter() - - # TODO: Evaluate limit - # Too many fragments (emoticons, LaTeX formulas, etc) - # may cause Gajim to freeze (see #5129). - # We impose an arbitrary limit of 100 fragments per message. - fragment_limit = 100 - index = 0 - for match in iterator: - start, end = match.span() - fragment = text[start:end] - if start > index: - text_before_fragment = text[index:start] - if not iter_: - end_iter = buffer_.get_end_iter() - if text_tags: - insert_tags_func( - end_iter, text_before_fragment, *text_tags) - else: - buffer_.insert(end_iter, text_before_fragment) - index = end - - self.apply_formatting(fragment, - text_tags, - graphics=graphics, - additional_data=additional_data, - iter_=end_iter) - fragment_limit += 1 - if fragment_limit <= 0: - break - - # Add remaining text after last match - insert_tags_func(buffer_.get_end_iter(), text[index:], *text_tags) - - return end_iter - - def apply_formatting(self, fragment, text_tags, graphics=True, - additional_data=None, iter_=None): - # TODO: Plugin system GUI extension point - # self.plugin_modified = False - # app.plugin_manager.extension_point('print_special_text', self, - # fragment, text_tags, graphics, additional_data) - # if self.plugin_modified: - # return - - tags = [] - buffer_ = self.get_buffer() - ttt = buffer_.get_tag_table() - - # Detect XHTML-IM link - is_xhtml_uri = False - tags_ = [ - (ttt.lookup(t) if isinstance(t, str) else t) for t in text_tags] - for tag in tags_: - is_xhtml_uri = getattr(tag, 'href', False) - if is_xhtml_uri: - break - - # Check if we accept this as an uri - is_valid_uri = fragment.startswith(tuple(URI_SCHEMES)) - - if iter_: - end_iter = iter_ - else: - end_iter = buffer_.get_end_iter() - - theme = app.settings.get('emoticons_theme') - show_emojis = theme and theme != 'font' - - # XEP-0393 Message Styling - # * = bold - # _ = italic - # ~ = strikethrough - show_formatting_chars = app.settings.get( - 'show_ascii_formatting_chars') - - if show_emojis and graphics and is_emoji(fragment): - # it's an emoticon - if emoji_pixbufs.complete: - # only search for the pixbuf if we are sure - # that loading is completed - pixbuf = get_emoji_pixbuf(fragment) - if pixbuf is None: - buffer_.insert(end_iter, fragment) - else: - pixbuf = pixbuf.copy() - anchor = buffer_.create_child_anchor(end_iter) - anchor.plaintext = fragment - img = Gtk.Image.new_from_pixbuf(pixbuf) - img.show() - self.add_child_at_anchor(img, anchor) - else: - # Set marks and save them so we can replace emojis - # once the loading is complete - start_mark = buffer_.create_mark(None, end_iter, True) - buffer_.insert(end_iter, fragment) - end_mark = buffer_.create_mark(None, end_iter, True) - emoji_pixbufs.append_marks( - self, start_mark, end_mark, fragment) - elif (fragment.startswith('www.') or - fragment.startswith('ftp.') or - is_valid_uri and not is_xhtml_uri): - tags.append('url') - elif fragment.startswith('mailto:') and not is_xhtml_uri: - tags.append('mail') - elif fragment.startswith('xmpp:') and not is_xhtml_uri: - tags.append('xmpp') - elif STH_AT_STH_DOT_STH_REGEX.match(fragment) and not is_xhtml_uri: - # JID or E-Mail - tags.append('sth_at_sth') - elif fragment.startswith('*'): - tags.append('bold') - if (fragment[1] == '~' and fragment[-2] == '~' and - len(fragment) > 4): - tags.append('strikethrough') - if not show_formatting_chars: - fragment = fragment[2:-2] - elif (fragment[1] == '_' and fragment[-2] == '_' and - len(fragment) > 4): - tags.append('italic') - if not show_formatting_chars: - fragment = fragment[2:-2] - else: - if not show_formatting_chars: - fragment = fragment[1:-1] - elif fragment.startswith('~'): - tags.append('strikethrough') - if (fragment[1] == '*' and fragment[-2] == '*' and - len(fragment) > 4): - tags.append('bold') - if not show_formatting_chars: - fragment = fragment[2:-2] - elif (fragment[1] == '_' and fragment[-2] == '_' and - len(fragment) > 4): - tags.append('italic') - if not show_formatting_chars: - fragment = fragment[2:-2] - else: - if not show_formatting_chars: - fragment = fragment[1:-1] - elif fragment.startswith('_'): - tags.append('italic') - if (fragment[1] == '*' and fragment[-2] == '*' and - len(fragment) > 4): - tags.append('bold') - if not show_formatting_chars: - fragment = fragment[2:-2] - elif (fragment[1] == '~' and fragment[-2] == '~' and - len(fragment) > 4): - tags.append('strikethrough') - if not show_formatting_chars: - fragment = fragment[2:-2] - else: - if not show_formatting_chars: - fragment = fragment[1:-1] - else: - insert_tags_func = buffer_.insert_with_tags_by_name - if text_tags and isinstance(text_tags[0], Gtk.TextTag): - insert_tags_func = buffer_.insert_with_tags - if text_tags: - insert_tags_func(end_iter, fragment, *text_tags) - else: - buffer_.insert(end_iter, fragment) - - if tags: - all_tags = tags[:] - all_tags += text_tags - # convert all names to TextTag - all_tags = [ - (ttt.lookup(t) if isinstance(t, str) else t) for t in all_tags] - buffer_.insert_with_tags(end_iter, fragment, *all_tags) - if 'url' in tags: - puny_text = puny_encode_url(fragment) - if puny_text != fragment: - puny_tags = [] - if not puny_text: - puny_text = _('Invalid URL') - puny_tags = [(ttt.lookup(t) if isinstance( - t, str) else t) for t in puny_tags] - puny_tags += text_tags - buffer_.insert_with_tags( - end_iter, " (%s)" % puny_text, *puny_tags) - - def _query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): - window = widget.get_window(Gtk.TextWindowType.TEXT) - x_pos, y_pos = self.window_to_buffer_coords( - Gtk.TextWindowType.TEXT, x_pos, y_pos) - - iter_ = self.get_iter_at_position(x_pos, y_pos)[1] - for tag in iter_.get_tags(): - tag_name = tag.get_property('name') - if getattr(tag, 'is_anchor', False): - text = getattr(tag, 'title', False) - if text: - if len(text) > 50: - text = reduce_chars_newlines(text, 47, 1) - tooltip.set_text(text) - window.set_cursor(get_cursor('pointer')) - self._cursor_changed = True - return True - if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): - window.set_cursor(get_cursor('pointer')) - self._cursor_changed = True - return False - - if self._cursor_changed: - window.set_cursor(get_cursor('text')) - self._cursor_changed = False - return False - - def _on_button_press(self, _widget, event): - ''' - We don’t open the standard context menu when receiving - a click on tagged text. - If it’s untagged text, check if something is selected - ''' - self._selected_text = '' - - if event.button != 3: - # If it’s not a right click - return False - - x_pos, y_pos = self.window_to_buffer_coords( - Gtk.TextWindowType.TEXT, - int(event.x), - int(event.y)) - iter_ = self.get_iter_at_location(x_pos, y_pos) - if isinstance(iter_, tuple): - iter_ = iter_[1] - tags = iter_.get_tags() - - if tags: - # A tagged text fragment has been clicked - for tag in tags: - tag_name = tag.get_property('name') - if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): - # Block regular context menu - return True - - # Check if there is a selection and make it available for - # _on_populate_popup - buffer_ = self.get_buffer() - return_val = buffer_.get_selection_bounds() - if return_val: - # Something has been selected, get the text - start_sel, finish_sel = return_val[0], return_val[1] - self._selected_text = buffer_.get_text( - start_sel, finish_sel, True) - elif iter_.get_char() and ord(iter_.get_char()) > 31: - # Clicked on a word, take whole word for selection - start_sel = iter_.copy() - if not start_sel.starts_word(): - start_sel.backward_word_start() - finish_sel = iter_.copy() - if not finish_sel.ends_word(): - finish_sel.forward_word_end() - self._selected_text = buffer_.get_text( - start_sel, finish_sel, True) - return False - - def _on_populate_popup(self, _textview, menu): - ''' - Overrides the default context menu. - If text is selected, a submenu with actions on the selection is added. - (see _on_button_press) - ''' - if not self._selected_text: - menu.show_all() - return - - item = Gtk.MenuItem.new_with_mnemonic(_('_Quote')) - id_ = item.connect('activate', self._on_quote) - self.handlers[id_] = item - menu.prepend(item) - - selected_text_short = reduce_chars_newlines( - self._selected_text, 25, 2) - item = Gtk.MenuItem.new_with_mnemonic( - _('_Actions for "%s"') % selected_text_short) - menu.prepend(item) - submenu = Gtk.Menu() - item.set_submenu(submenu) - uri_text = quote(self._selected_text.encode('utf-8')) - - if app.settings.get('always_english_wikipedia'): - uri = (f'https://en.wikipedia.org/wiki/' - f'Special:Search?search={uri_text}') - else: - uri = (f'https://{i18n.get_short_lang_code()}.wikipedia.org/' - f'wiki/Special:Search?search={uri_text}') - item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) - id_ = item.connect('activate', self._visit_uri, uri) - self.handlers[id_] = item - submenu.append(item) - - item = Gtk.MenuItem.new_with_mnemonic( - _('Look it up in _Dictionary')) - dict_link = app.settings.get('dictionary_url') - if dict_link == 'WIKTIONARY': - # Default is wikitionary.org - if app.settings.get('always_english_wiktionary'): - uri = (f'https://en.wiktionary.org/wiki/' - f'Special:Search?search={uri_text}') - else: - uri = (f'https://{i18n.get_short_lang_code()}.wiktionary.org/' - f'wiki/Special:Search?search={uri_text}') - id_ = item.connect('activate', self._visit_uri, uri) - self.handlers[id_] = item - else: - if dict_link.find('%s') == -1: - # There has to be a '%s' in the url if it’s not WIKTIONARY - item = Gtk.MenuItem.new_with_label( - _('Dictionary URL is missing a "%s"')) - item.set_sensitive(False) - else: - uri = dict_link % uri_text - id_ = item.connect('activate', self._visit_uri, uri) - self.handlers[id_] = item - submenu.append(item) - - search_link = app.settings.get('search_engine') - if search_link.find('%s') == -1: - # There has to be a '%s' in the url - item = Gtk.MenuItem.new_with_label( - _('Web Search URL is missing a "%s"')) - item.set_sensitive(False) - else: - item = Gtk.MenuItem.new_with_mnemonic(_('Web _Search for it')) - uri = search_link % uri_text - id_ = item.connect('activate', self._visit_uri, uri) - self.handlers[id_] = item - submenu.append(item) - - item = Gtk.MenuItem.new_with_mnemonic(_('Open as _Link')) - id_ = item.connect('activate', self._visit_uri, uri) - self.handlers[id_] = item - submenu.append(item) - - menu.show_all() - - def _on_quote(self, _widget): - self.emit('quote', self._selected_text) - - @staticmethod - def _visit_uri(_widget, uri): - open_uri(uri) ===================================== gajim/gui_interface.py ===================================== @@ -1085,8 +1085,9 @@ def show_add_join_groupchat(self, account, jid, nickname=None, def start_chat_from_jid(self, account, jid, message=None): if app.window.chat_exists(account, jid): app.window.select_chat(account, jid) - control = app.window.get_control(account, jid) - control.msg_textview.insert_text(message) + if message is not None: + control = app.window.get_control(account, jid) + control.msg_textview.insert_text(message) return # TODO: handle message arg in StartChat View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/46aad329c4acd4f6869698d763e687a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/46aad329c4acd4f6869698d763e687a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add setting for XEP-0258 Security Labels
by Daniel Brötzmann (＠wurstsalat) 20 Sep '21

20 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 46aad329 by wurstsalat at 2021-09-20T09:06:13+02:00 Add setting for XEP-0258 Security Labels - - - - - 4 changed files: - gajim/common/setting_values.py - gajim/gtk/accounts.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -219,6 +219,7 @@ class _ACCOUNT_DEFAULT: 'gc_send_marker_public_default': False, 'chat_history_max_age': -1, 'enable_gssapi': False, + 'enable_security_labels': False, }, 'contact': { ===================================== gajim/gtk/accounts.py ===================================== @@ -841,7 +841,7 @@ def __init__(self, account): 'confirm_unencrypted_connection', desc=_('Show a confirmation dialog before connecting ' 'unencrypted')), - ] + ] GenericSettingPage.__init__(self, account, settings) @staticmethod @@ -877,8 +877,12 @@ def __init__(self, account): props={'entries': {'httpupload': _('Upload Files'), 'jingle': _('Send Files Directly')}}, desc=_('Preferred file transfer mechanism for ' - 'file drag&drop on a chat window')) - ] + 'file drag&drop on a chat window')), + Setting(SettingKind.SWITCH, _('Security Labels'), + SettingType.ACCOUNT_CONFIG, 'enable_security_labels', + desc=_('Show labels describing confidentiality of ' + 'messages, if the server supports XEP-0258')) + ] GenericSettingPage.__init__(self, account, settings) @@ -905,7 +909,7 @@ def __init__(self, account): Setting(SettingKind.SWITCH, _('Global Status'), SettingType.ACCOUNT_CONFIG, 'sync_with_global_status', desc=_('Synchronize the status of all accounts')), - ] + ] GenericSettingPage.__init__(self, account, settings) @@ -925,7 +929,7 @@ def __init__(self, account, parent): Setting(SettingKind.ENTRY, _('Email'), SettingType.ACCOUNT_CONFIG, 'zeroconf_email'), - ] + ] SettingsDialog.__init__(self, parent, _('Profile'), Gtk.DialogFlags.MODAL, settings, account) @@ -951,7 +955,7 @@ def __init__(self, account, parent): bind='account::adjust_priority_with_status', inverted=True, props={'range_': range_}), - ] + ] SettingsDialog.__init__(self, parent, _('Priority'), Gtk.DialogFlags.MODAL, settings, account) @@ -990,7 +994,7 @@ def __init__(self, account, parent): SettingType.ACCOUNT_CONFIG, 'custom_type', bind='account::use_custom_host', props={'combo_items': type_values}), - ] + ] SettingsDialog.__init__(self, parent, _('Connection Settings'), Gtk.DialogFlags.MODAL, settings, account) @@ -1006,7 +1010,7 @@ def __init__(self, account, parent): Setting(SettingKind.SWITCH, _('Encrypted Certificate'), SettingType.ACCOUNT_CONFIG, 'client_cert_encrypted'), - ] + ] SettingsDialog.__init__(self, parent, _('Certificate Settings'), Gtk.DialogFlags.MODAL, settings, account) @@ -1029,7 +1033,7 @@ def __init__(self, account, parent): Setting(SettingKind.SWITCH, _('Use GSSAPI'), SettingType.ACCOUNT_CONFIG, 'enable_gssapi'), - ] + ] SettingsDialog.__init__(self, parent, _('Login Settings'), Gtk.DialogFlags.MODAL, settings, account) ===================================== gajim/gtk/controls/base.py ===================================== @@ -457,6 +457,11 @@ def _sec_labels_received(self, event): if event.jid != jid: return + + if not app.settings.get_account_setting( + event.account, 'enable_security_labels'): + return + model = self.xml.label_selector.get_model() model.clear() ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -114,7 +114,8 @@ def __init__(self, if encryption_img: self._meta_box.pack_end(encryption_img, False, True, 0) - if display_marking: + if display_marking and app.settings.get_account_setting( + account, 'enable_security_labels'): label_text = GLib.markup_escape_text(display_marking.name) if label_text: bgcolor = display_marking.bgcolor View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/46aad329c4acd4f6869698d763e687a1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/46aad329c4acd4f6869698d763e687a1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] SearchView: Connect edge-reached signal
by Daniel Brötzmann (＠wurstsalat) 16 Sep '21

16 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: bc0c44d8 by wurstsalat at 2021-09-16T23:46:31+02:00 SearchView: Connect edge-reached signal - - - - - 1 changed file: - gajim/data/gui/search_view.ui Changes: ===================================== gajim/data/gui/search_view.ui ===================================== @@ -221,6 +221,7 @@ <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can-focus">True</property> + <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> <child> <object class="GtkViewport"> <property name="visible">True</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc0c44d81eb0d2d5be917b204e1735a9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc0c44d81eb0d2d5be917b204e1735a9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AdhocMUC: Rework
by Daniel Brötzmann (＠wurstsalat) 16 Sep '21

16 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 2f77f7f8 by wurstsalat at 2021-09-16T23:43:36+02:00 AdhocMUC: Rework - - - - - 4 changed files: - gajim/data/gui/adhoc_muc.ui - gajim/gtk/adhoc_muc.py - gajim/gtk/const.py - gajim/gtk/controls/chat.py Changes: ===================================== gajim/data/gui/adhoc_muc.ui ===================================== @@ -12,184 +12,180 @@ <column type="gchararray"/> </columns> </object> - <object class="GtkWindow" id="adhoc_muc_window"> + <object class="GtkListStore" id="server_store"> + <columns> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkBox" id="adhoc_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="border-width">5</property> - <property name="title" translatable="yes">Invite Friends!</property> - <property name="type-hint">dialog</property> - <signal name="destroy" handler="on_chat_to_muc_window_destroy" swapped="no"/> - <signal name="key-press-event" handler="on_chat_to_muc_window_key_press_event" swapped="no"/> + <property name="border-width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">You are now entering a group chat. -Select the contacts you want to invite</property> - <property name="justify">center</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">4</property> - <property name="position">0</property> - </packing> - </child> + <property name="label" translatable="yes">Group Chat Invitation</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="description_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max-width-chars">40</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">4</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> - <object class="GtkScrolledWindow" id="guests_scrolledwindow"> + <object class="GtkTreeView" id="guests_treeview"> + <property name="height-request">300</property> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="shadow-type">in</property> + <property name="model">guests_store</property> + <property name="headers-visible">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> <child> - <object class="GtkTreeView" id="guests_treeview"> - <property name="height-request">300</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="model">guests_store</property> - <property name="headers-visible">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> + <object class="GtkTreeViewColumn"> + <property name="title" translatable="yes">column</property> <child> - <object class="GtkTreeViewColumn"> - <property name="title" translatable="yes">column</property> - <child> - <object class="GtkCellRendererPixbuf"/> - <attributes> - <attribute name="icon-name">0</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="title" translatable="yes">column</property> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererPixbuf"/> + <attributes> + <attribute name="icon-name">0</attribute> + </attributes> </child> </object> </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">4</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkExpander"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="server_select_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Please select a group chat server.</property> - <property name="justify">center</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">4</property> - <property name="position">0</property> - </packing> - </child> + <object class="GtkTreeViewColumn"> + <property name="title" translatable="yes">column</property> <child> - <object class="GtkComboBox" id="server_list_comboboxentry"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Group chat server</property> - </object> - </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">4</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkExpander"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkButtonBox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="spacing">6</property> - <property name="layout-style">end</property> + <property name="margin-top">6</property> + <property name="spacing">12</property> <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">_Cancel</property> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Server</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">3</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="invite_button"> - <property name="label" translatable="yes">Invite</property> + <object class="GtkComboBox" id="server_combobox"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="on_invite_button_clicked" swapped="no"/> + <property name="can-focus">False</property> + <property name="model">server_store</property> + <property name="active">0</property> + <property name="has-entry">True</property> + <property name="entry-text-column">0</property> + <child internal-child="entry"> + <object class="GtkEntry" id="server_entry"> + <property name="can-focus">True</property> + <signal name="changed" handler="_on_server_combobox_entry_changed" swapped="no"/> + </object> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">3</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Advanced</property> + <style> + <class name="dim-label"/> + </style> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="invite_button"> + <property name="label" translatable="yes">_Invite</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="halign">end</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_invite_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">3</property> + <property name="position">4</property> + </packing> </child> </object> </interface> ===================================== gajim/gtk/adhoc_muc.py ===================================== @@ -12,10 +12,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Dict # pylint: disable=unused-import -from typing import List # pylint: disable=unused-import -from typing import Tuple # pylint: disable=unused-import - import uuid import logging @@ -31,104 +27,114 @@ log = logging.getLogger('gajim.gui.adhoc_muc') -class AdhocMUC: - - # Keep a reference on windows so garbage collector don't restroy them - instances = [] # type: List[AdhocMUC] - - def __init__(self, account, jids, preselected=None): +class AdhocMUC(Gtk.ApplicationWindow): + def __init__(self, account, contact, preselected=None): """ This window is used to transform a one-to-one chat to a MUC. We do 2 things: first select the server and then make a guests list """ + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_show_menubar(False) + self.set_title(_('Adhoc Group Chat')) + self.set_default_size(500, 400) + self.set_resizable(True) - self.instances.append(self) self.account = account - self.auto_jids = jids - self.preselected_jids = preselected - - self.xml = get_builder('adhoc_muc.ui') - self.window = self.xml.get_object('adhoc_muc_window') - - server_list = [] - self.servers = Gtk.ListStore(str) - self.xml.server_list_comboboxentry.set_model(self.servers) - cell = Gtk.CellRendererText() - self.xml.server_list_comboboxentry.pack_start(cell, True) - self.xml.server_list_comboboxentry.add_attribute(cell, 'text', 0) - - # get the muc server of our server + self.jid = contact.jid + self._preselected_jids = preselected self._client = app.get_client(account) - service_jid = self._client.get_module('MUC').service_jid - if service_jid is not None: - server_list.append(str(service_jid)) - # add servers or recently joined groupchats - recent_groupchats = app.settings.get_account_setting( - account, 'recent_groupchats').split() - for group_chat in recent_groupchats: - server = app.get_server_from_jid(group_chat) - if server not in server_list and not server.startswith('irc'): - server_list.append(server) - # add a default server - if not server_list: - server_list.append('conference.jabber.org') + self._ui = get_builder('adhoc_muc.ui') + self.add(self._ui.adhoc_box) - for serv in server_list: - self.servers.append([serv]) + self._ui.description_label.set_text( + _('Invite someone to your chat with %s') % contact.name) - self.xml.server_list_comboboxentry.set_active(0) + # Setup treeview: name, jid + self._ui.guests_store.set_sort_column_id(1, Gtk.SortType.ASCENDING) + self._ui.guests_treeview.get_selection().set_mode( + Gtk.SelectionMode.MULTIPLE) - # set treeview - # name, jid + self._add_possible_invitees() + self._fill_server_list() - self.xml.guests_store.set_sort_column_id(1, Gtk.SortType.ASCENDING) - self.xml.guests_treeview.get_selection().set_mode( - Gtk.SelectionMode.MULTIPLE) + self.connect('key-press-event', self._on_key_press) + self._ui.connect_signals(self) + self.show_all() + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def _add_possible_invitees(self): for acc in app.settings.get_active_accounts(): client = app.get_client(acc) if client.is_zeroconf: continue for contact in client.get_module('Roster').iter_contacts(): jid = str(contact.jid) - if (jid not in self.auto_jids and - jid != str(self._client.get_own_jid().bare)): + # Add contact if it can be invited + if self._is_invitable(contact): icon = get_icon_name(contact.show.value) - iter_ = self.xml.guests_store.append( + iter_ = self._ui.guests_store.append( [icon, contact.name, jid]) # preselect treeview rows - if self.preselected_jids and jid in self.preselected_jids: - path = self.xml.guests_store.get_path(iter_) - self.xml.guests_treeview.get_selection().select_path( + if (self._preselected_jids and + jid in self._preselected_jids): + path = self._ui.guests_store.get_path(iter_) + self._ui.guests_treeview.get_selection().select_path( path) - # show all - self.window.show_all() + def _is_invitable(self, contact): + # All contacts BUT the following can be invited: + # ourself, gateway contacts, zeroconf contacts + return (str(contact.jid) != str(self.jid) and + contact.jid != str(self._client.get_own_jid().bare) and + str(contact.jid) != app.get_jid_from_account(self.account) and + contact.show.value != 'error' and + not contact.is_gateway) - self.xml.connect_signals(self) + def _fill_server_list(self): + servers = [] - def on_chat_to_muc_window_destroy(self, _widget): - self.instances.remove(self) + # Add own server to combobox + service_jid = self._client.get_module('MUC').service_jid + if service_jid is not None: + servers.append(str(service_jid)) - def on_chat_to_muc_window_key_press_event(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: - self.window.destroy() + # Add servers or recently joined groupchats + recent_groupchats = app.get_recent_groupchats(self.account) + for groupchat in recent_groupchats: + if (groupchat.server not in servers and + not groupchat.server.startswith('irc')): + servers.append(groupchat.server) - def on_invite_button_clicked(self, _widget): - row = self.xml.server_list_comboboxentry.get_child().get_displayed_row() - model = self.xml.server_list_comboboxentry.get_model() - server = model[row][0].strip() - if server == '': - return + # Add a default server (necessary?) + if not servers: + servers.append('conference.jabber.org') + for server in servers: + self._ui.server_store.append([server]) + + self._ui.server_combobox.set_active(0) + + def _on_server_combobox_entry_changed(self, _widget): + server = self._ui.server_entry.get_text() + self._ui.invite_button.set_sensitive(server != '') + + def _on_invite_clicked(self, _widget): + server = self._ui.server_entry.get_text() guest_list = [] - guests = self.xml.guests_treeview.get_selection().get_selected_rows() + guests = self._ui.guests_treeview.get_selection().get_selected_rows() for guest in guests[1]: - iter_ = self.xml.guests_store.get_iter(guest) - guest_list.append(self.xml.guests_store[iter_][2]) - for guest in self.auto_jids: - guest_list.append(guest) + iter_ = self._ui.guests_store.get_iter(guest) + guest_list.append(self._ui.guests_store[iter_][2]) + guest_list.append(self.jid) + + # Build group chat JID room_jid = f'{uuid.uuid4()}@{server}' app.automatic_rooms[self.account][room_jid] = {} app.automatic_rooms[self.account][room_jid]['invities'] = guest_list @@ -149,7 +155,4 @@ def on_invite_button_clicked(self, _widget): app.interface.create_groupchat(self.account, room_jid, config) app.window.select_chat(self.account, room_jid) - self.window.destroy() - - def on_cancel_button_clicked(self, _widget): - self.window.destroy() + self.destroy() ===================================== gajim/gtk/const.py ===================================== @@ -139,5 +139,6 @@ def __str__(self): 'WorkspaceDialog': 'gajim.gui.workspace_dialog', 'RosterItemExchange': 'gajim.gui.roster_item_exchange', 'ServiceRegistration': 'gajim.gui.service_registration', - 'SynchronizeAccounts': 'gajim.gui.synchronize_accounts' + 'SynchronizeAccounts': 'gajim.gui.synchronize_accounts', + 'AdhocMUC': 'gajim.gui.adhoc_muc', } ===================================== gajim/gtk/controls/chat.py ===================================== @@ -52,7 +52,6 @@ from gajim import gui_menu_builder -from gajim.gui.adhoc_muc import AdhocMUC from gajim.gui.call_widget import CallWidget from gajim.gui.const import TARGET_TYPE_URI_LIST from gajim.gui.const import ControlType @@ -319,7 +318,7 @@ def _on_information(self, _action, _param): app.window.contact_info(self.account, self.contact.jid) def _on_invite_contacts(self, _action, _param): - AdhocMUC(self.account, [self.contact.jid]) + open_window('AdhocMUC', account=self.account, contact=self.contact) def _on_send_chatstate(self, action, param): action.set_state(param) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2f77f7f8164862c45eebad82b924fd75… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2f77f7f8164862c45eebad82b924fd75… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: SynchronizeAccounts: Rewrite dialog
by Daniel Brötzmann (＠wurstsalat) 15 Sep '21

15 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e7b0717e by wurstsalat at 2021-09-16T00:09:15+02:00 SynchronizeAccounts: Rewrite dialog - - - - - 85d100dd by wurstsalat at 2021-09-16T00:09:38+02:00 Interface: Remove obsolete instances - - - - - 6 changed files: - gajim/app_actions.py - − gajim/data/gui/synchronise_select_contacts_dialog.ui - gajim/data/gui/synchronise_select_account_dialog.ui → gajim/data/gui/synchronize_accounts.ui - gajim/gtk/const.py - gajim/gtk/synchronise_contacts.py → gajim/gtk/synchronize_accounts.py - gajim/gui_interface.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -25,7 +25,6 @@ from gajim.gui.dialogs import ShortcutsWindow from gajim.gui.about import AboutDialog from gajim.gui.discovery import ServiceDiscoveryWindow -from gajim.gui.synchronise_contacts import SynchroniseSelectAccountDialog from gajim.gui.util import open_window # General Actions @@ -123,12 +122,7 @@ def on_add_account(_action, _param): def on_import_contacts(_action, param): - account = param.get_string() - if 'import_contacts' in app.interface.instances: - app.interface.instances['import_contacts'].dialog.present() - else: - app.interface.instances['import_contacts'] = \ - SynchroniseSelectAccountDialog(account) + open_window('SynchronizeAccounts', account=param.get_string()) # Advanced Actions ===================================== gajim/data/gui/synchronise_select_contacts_dialog.ui deleted ===================================== @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="synchronise_select_contacts_dialog"> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="title" translatable="yes">Synchronise : select contacts</property> - <property name="default_width">400</property> - <property name="default_height">300</property> - <property name="type_hint">dialog</property> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_ok_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label210"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Select the contacts you want to synchronise</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> - <property name="width_request">150</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="contacts_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">cancel_button</action-widget> - <action-widget response="-5">ok_button</action-widget> - </action-widgets> - </object> -</interface> ===================================== gajim/data/gui/synchronise_select_account_dialog.ui → gajim/data/gui/synchronize_accounts.ui ===================================== @@ -1,90 +1,102 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="synchronise_select_account_dialog"> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="title" translatable="yes">Synchronise contacts</property> - <property name="default_width">350</property> - <property name="default_height">300</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_destroy" swapped="no"/> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox7"> + <object class="GtkStack" id="stack"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkBox" id="sync_accounts_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> + <property name="border-width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area6"> + <child> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Select the account with which you want to synchronise</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="width-request">150</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> - <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> + <object class="GtkTreeView" id="accounts_treeview"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_ok_button_clicked" swapped="no"/> + <property name="can-focus">True</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label">Selects Contacts</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="receives-default">False</property> + <property name="halign">end</property> + <signal name="clicked" handler="_on_next_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="name">accounts</property> + </packing> + </child> + <child> + <object class="GtkBox" id="sync_contacts_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="border-width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label210"> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Select the account with which you want to synchronise</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Select the contacts you want to synchronise</property> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> - <property name="width_request">150</property> + <object class="GtkScrolledWindow"> + <property name="width-request">150</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> - <object class="GtkTreeView" id="accounts_treeview"> + <object class="GtkTreeView" id="contacts_treeview"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> + <object class="GtkTreeSelection"/> </child> </object> </child> @@ -92,14 +104,58 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkButton"> + <property name="label">Synchronize</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="halign">end</property> + <signal name="clicked" handler="_on_sync_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Back</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="clicked" handler="_on_back_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> + <packing> + <property name="name">contacts</property> + <property name="position">1</property> + </packing> </child> - <action-widgets> - <action-widget response="-6">cancel_button</action-widget> - <action-widget response="-5">ok_button</action-widget> - </action-widgets> </object> </interface> ===================================== gajim/gtk/const.py ===================================== @@ -139,4 +139,5 @@ def __str__(self): 'WorkspaceDialog': 'gajim.gui.workspace_dialog', 'RosterItemExchange': 'gajim.gui.roster_item_exchange', 'ServiceRegistration': 'gajim.gui.service_registration', + 'SynchronizeAccounts': 'gajim.gui.synchronize_accounts' } ===================================== gajim/gtk/synchronise_contacts.py → gajim/gtk/synchronize_accounts.py ===================================== @@ -24,43 +24,73 @@ from .util import get_builder -class SynchroniseSelectAccountDialog: +class SynchronizeAccounts(Gtk.ApplicationWindow): def __init__(self, account): - # 'account' can be None if we are about to create our first one + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_default_size(400, 550) + self.set_resizable(True) + self.set_title(_('Synchronize Accounts')) + self.set_transient_for(get_app_window('AccountsWindow')) + if not app.account_is_available(account): ErrorDialog( _('You are not connected to the server'), _('You cannot synchronize with an account unless it is ' 'connected.')) raise GajimGeneralException('You are not connected to the server') + self.account = account - self.xml = get_builder('synchronise_select_account_dialog.ui') - self.dialog = self.xml.get_object('synchronise_select_account_dialog') - self.dialog.set_transient_for(get_app_window('AccountsWindow')) - self.accounts_treeview = self.xml.get_object('accounts_treeview') + self._local_client = app.get_client(account) + + self._remote_account = None + self._remote_client = None + + self._ui = get_builder('synchronize_accounts.ui') + self.add(self._ui.stack) + + # Accounts model = Gtk.ListStore(str, str, bool) - self.accounts_treeview.set_model(model) - # columns + self._ui.accounts_treeview.set_model(model) renderer = Gtk.CellRendererText() - self.accounts_treeview.insert_column_with_attributes( + self._ui.accounts_treeview.insert_column_with_attributes( -1, _('Name'), renderer, text=0) renderer = Gtk.CellRendererText() - self.accounts_treeview.insert_column_with_attributes( + self._ui.accounts_treeview.insert_column_with_attributes( -1, _('Server'), renderer, text=1) - self.xml.connect_signals(self) - self.init_accounts() - self.dialog.show_all() + # Contacts + model = Gtk.ListStore(bool, str) + self._ui.contacts_treeview.set_model(model) + # columns + renderer1 = Gtk.CellRendererToggle() + renderer1.set_property('activatable', True) + renderer1.connect('toggled', self._on_sync_toggled) + self._ui.contacts_treeview.insert_column_with_attributes( + -1, _('Synchronise'), renderer1, active=0) + renderer2 = Gtk.CellRendererText() + self._ui.contacts_treeview.insert_column_with_attributes( + -1, _('Name'), renderer2, text=1) + + self._ui.connect_signals(self) + self.connect('key-press-event', self._on_key_press) + + self._init_accounts() + + self.show_all() - def on_accounts_window_key_press_event(self, _widget, event): + def _on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: - self.window.destroy() + self.destroy() - def init_accounts(self): + def _init_accounts(self): """ Initialize listStore with existing accounts """ - model = self.accounts_treeview.get_model() + model = self._ui.accounts_treeview.get_model() model.clear() for remote_account in app.connections: if remote_account == self.account: @@ -74,75 +104,32 @@ def init_accounts(self): 1, app.get_hostname_from_account(remote_account)) - def on_cancel_button_clicked(self, _widget): - self.dialog.destroy() - - def on_ok_button_clicked(self, _widget): - sel = self.accounts_treeview.get_selection() - (model, iter_) = sel.get_selected() + def _on_next_clicked(self, _widget): + selection = self._ui.accounts_treeview.get_selection() + (model, iter_) = selection.get_selected() if not iter_: return - remote_account = model.get_value(iter_, 0) - if not app.account_is_available(remote_account): + self._remote_account = model.get_value(iter_, 0) + self._remote_client = app.get_client(self._remote_account) + + if not app.account_is_available(self._remote_account): ErrorDialog( _('This account is not connected to the server'), _('You cannot synchronize with an account unless it is ' 'connected.')) return - try: - SynchroniseSelectContactsDialog(self.account, remote_account) - except GajimGeneralException: - # if we showed ErrorDialog, there will not be dialog instance - return - self.dialog.destroy() - - @staticmethod - def on_destroy(_widget): - del app.interface.instances['import_contacts'] - + self._init_contacts() + self._ui.stack.set_visible_child_full( + 'contacts', Gtk.StackTransitionType.SLIDE_LEFT) -class SynchroniseSelectContactsDialog: - def __init__(self, local_account, remote_account): - self._remote_account = remote_account + def _on_back_clicked(self, _button): + self._ui.stack.set_visible_child_full( + 'accounts', Gtk.StackTransitionType.SLIDE_RIGHT) - self._local_client = app.get_client(local_account) - self._remote_client = app.get_client(remote_account) - - self.xml = get_builder('synchronise_select_contacts_dialog.ui') - self.dialog = self.xml.get_object('synchronise_select_contacts_dialog') - self.contacts_treeview = self.xml.get_object('contacts_treeview') - model = Gtk.ListStore(bool, str) - self.contacts_treeview.set_model(model) - # columns - renderer1 = Gtk.CellRendererToggle() - renderer1.set_property('activatable', True) - renderer1.connect('toggled', self.toggled_callback) - self.contacts_treeview.insert_column_with_attributes( - -1, _('Synchronise'), renderer1, active=0) - renderer2 = Gtk.CellRendererText() - self.contacts_treeview.insert_column_with_attributes( - -1, _('Name'), renderer2, text=1) - - self.xml.connect_signals(self) - self.init_contacts() - self.dialog.show_all() - - def toggled_callback(self, cell, path): - model = self.contacts_treeview.get_model() - iter_ = model.get_iter(path) - model[iter_][0] = not cell.get_active() - - def on_contacts_window_key_press_event(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: - self.window.destroy() - - def init_contacts(self): - """ - Initialize listStore with existing accounts - """ - model = self.contacts_treeview.get_model() + def _init_contacts(self): + model = self._ui.contacts_treeview.get_model() model.clear() # recover local contacts @@ -159,11 +146,13 @@ def init_contacts(self): iter_ = model.append() model.set(iter_, 0, True, 1, remote_jid) - def on_cancel_button_clicked(self, _widget): - self.dialog.destroy() + def _on_sync_toggled(self, cell, path): + model = self._ui.contacts_treeview.get_model() + iter_ = model.get_iter(path) + model[iter_][0] = not cell.get_active() - def on_ok_button_clicked(self, _widget): - model = self.contacts_treeview.get_model() + def _on_sync_clicked(self, _widget): + model = self._ui.contacts_treeview.get_model() iter_ = model.get_iter_first() while iter_: if model[iter_][0]: @@ -185,4 +174,4 @@ def on_ok_button_clicked(self, _widget): auto_auth=True) iter_ = model.iter_next(iter_) - self.dialog.destroy() + self.destroy() ===================================== gajim/gui_interface.py ===================================== @@ -157,8 +157,6 @@ def __init__(self): self.instances[a] = { 'infos': {}, 'disco': {}, - 'gc_config': {}, - 'search': {}, 'sub_request': {} } app.contacts.add_account(a) @@ -1171,8 +1169,10 @@ def enable_account(self, account): # update variables self.instances[account] = { - 'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}, - 'sub_request': {}} + 'infos': {}, + 'disco': {}, + 'sub_request': {} + } app.groups[account] = {} app.contacts.add_account(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8b5ceb3e44bebc059638aad8f3cf04e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8b5ceb3e44bebc059638aad8f3cf04e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 9 commits: GajimRemote: Adapt to changes in contact API
by Daniel Brötzmann (＠wurstsalat) 14 Sep '21

14 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6ff6ffc4 by wurstsalat at 2021-09-14T22:45:45+02:00 GajimRemote: Adapt to changes in contact API - - - - - f95bdf4f by wurstsalat at 2021-09-14T23:22:17+02:00 CommandSystem: Adapt to new contacts API - - - - - 5acad1de by wurstsalat at 2021-09-14T23:28:35+02:00 Interface: Cleanup, add TODOs - - - - - 4cc25118 by wurstsalat at 2021-09-14T23:29:34+02:00 AppActions: Remove reference to msg_win_mgr - - - - - 821f02b5 by wurstsalat at 2021-09-14T23:30:17+02:00 PrivateControl: Remove refenrece to old contacts API - - - - - 92cb61be by wurstsalat at 2021-09-14T23:30:37+02:00 Ping: Remove reference to old contacts API - - - - - a97e88f0 by wurstsalat at 2021-09-14T23:31:05+02:00 Bytestream: Remove reference to old contacts API - - - - - 15574136 by wurstsalat at 2021-09-14T23:31:47+02:00 ChatCommandProcessor: Remove reference to old contacts API - - - - - 8b5ceb3e by wurstsalat at 2021-09-14T23:36:55+02:00 Remove old roster references - - - - - 10 changed files: - gajim/app_actions.py - gajim/command_system/implementation/middleware.py - gajim/command_system/implementation/standard.py - gajim/common/modules/bytestream.py - gajim/common/modules/ping.py - gajim/gtk/controls/private.py - gajim/gtk/preferences.py - gajim/gtk/themes.py - gajim/gui_interface.py - gajim/remote_control.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -232,11 +232,7 @@ def on_remove_event(_action, param): account, jid, type_ = dict_['account'], dict_['jid'], dict_['type_'] event = app.events.get_first_event(account, jid, type_) app.events.remove_events(account, jid, event) - # TODO reset unread counter, urgency hint, etc. - # win = app.interface.msg_win_mgr.get_window(jid, account) - # if win: - # win.redraw_tab(win.get_control(jid, account)) - # win.show_title() + # TODO reset unread counter, set window urgency hint, etc. # Other Actions ===================================== gajim/command_system/implementation/middleware.py ===================================== @@ -196,4 +196,4 @@ def full_jid(self): """ Get a full JID of the contact. """ - return self.contact.get_full_jid() + return self.contact.jid ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -289,7 +289,10 @@ def nick(self, new_nick): @command('query', raw=True) @doc(_("Open a private chat window with a specified participant")) def chat(self, nick): - nicks = app.contacts.get_nick_list(self.account, self.room_jid) + client = app.get_client(self.account) + groupchat_contact = client.get_module('Contacts').get_contact( + self.room_jid, groupchat=True) + nicks = groupchat_contact.get_user_nicknames() if nick in nicks: self.send_pm(nick) else: @@ -299,7 +302,10 @@ def chat(self, nick): @doc(_("Open a private chat window with a specified participant and send " "him a message")) def message(self, nick, message): - nicks = app.contacts.get_nick_list(self.account, self.room_jid) + client = app.get_client(self.account) + groupchat_contact = client.get_module('Contacts').get_contact( + self.room_jid, groupchat=True) + nicks = groupchat_contact.get_user_nicknames() if nick in nicks: self.send_pm(nick, message) else: @@ -344,9 +350,12 @@ def leave(self, reason): If given nickname is not found it will be treated as a JID. """)) def ban(self, who, reason=''): - if who in app.contacts.get_nick_list(self.account, self.room_jid): - contact = app.contacts.get_gc_contact( - self.account, self.room_jid, who) + client = app.get_client(self.account) + groupchat_contact = client.get_module('Contacts').get_contact( + self.room_jid, groupchat=True) + nick_list = groupchat_contact.get_user_nicknames() + if who in nicks: + contact = groupchat_contact.get_resource(who) who = contact.jid self.connection.get_module('MUC').set_affiliation( self.room_jid, @@ -356,7 +365,11 @@ def ban(self, who, reason=''): @command(raw=True, empty=True) @doc(_("Kick user from group chat by nickname")) def kick(self, who, reason): - if who not in app.contacts.get_nick_list(self.account, self.room_jid): + client = app.get_client(self.account) + groupchat_contact = client.get_module('Contacts').get_contact( + self.room_jid, groupchat=True) + nick_list = groupchat_contact.get_user_nicknames() + if who not in nick_list: raise CommandError(_("Nickname not found")) self.connection.get_module('MUC').set_role( self.room_jid, who, 'none', reason) @@ -369,7 +382,11 @@ def kick(self, who, reason): def role(self, who, role): if role not in ('moderator', 'participant', 'visitor', 'none'): raise CommandError(_("Invalid role given")) - if who not in app.contacts.get_nick_list(self.account, self.room_jid): + client = app.get_client(self.account) + groupchat_contact = client.get_module('Contacts').get_contact( + self.room_jid, groupchat=True) + nick_list = groupchat_contact.get_user_nicknames() + if who not in nick_list: raise CommandError(_("Nickname not found")) self.connection.get_module('MUC').set_role(self.room_jid, who, role) @@ -381,9 +398,14 @@ def role(self, who, role): def affiliate(self, who, affiliation): if affiliation not in ('owner', 'admin', 'member', 'outcast', 'none'): raise CommandError(_("Invalid affiliation given")) - if who not in app.contacts.get_nick_list(self.account, self.room_jid): + client = app.get_client(self.account) + groupchat_contact = client.get_module('Contacts').get_contact( + self.room_jid, groupchat=True) + nick_list = groupchat_contact.get_user_nicknames() + if who not in nick_list: raise CommandError(_("Nickname not found")) - contact = app.contacts.get_gc_contact(self.account, self.room_jid, who) + + contact = groupchat_contact.get_resource(who) self.connection.get_module('MUC').set_affiliation( self.room_jid, @@ -392,12 +414,17 @@ def affiliate(self, who, affiliation): @command @doc(_("Display names of all group chat participants")) def names(self, verbose=False): - ggc = app.contacts.get_gc_contact - gnl = app.contacts.get_nick_list + client = app.get_client(self.account) + groupchat_contact = client.get_module('Contacts').get_contact( + self.room_jid, groupchat=True) + + def get_contact(nick): + return groupchat_contact.get_resource(nick) + + def get_role(nick): + return get_contact(nick).role - get_contact = lambda nick: ggc(self.account, self.room_jid, nick) - get_role = lambda nick: get_contact(nick).role - nicks = gnl(self.account, self.room_jid) + nicks = groupchat_contact.get_user_nicknames() nicks = sorted(nicks) nicks = sorted(nicks, key=get_role) @@ -427,7 +454,13 @@ def ping(self, nick): if self.account == app.ZEROCONF_ACC_NAME: raise CommandError( _('Command is not supported for zeroconf accounts')) - gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) - if gc_c is None: + + client = app.get_client(self.account) + groupchat_contact = client.get_module('Contacts').get_contact( + self.room_jid, groupchat=True) + nick_list = groupchat_contact.get_user_nicknames() + if nick not in nick_list: raise CommandError(_("Unknown nickname")) - app.connections[self.account].get_module('Ping').send_ping(gc_c) + + client.get_module('Ping').send_ping( + groupchat_contact.get_resource(nick)) ===================================== gajim/common/modules/bytestream.py ===================================== @@ -209,7 +209,7 @@ def stop_all_active_file_transfers(self, contact): if is_transfer_stopped(file_props): continue receiver_jid = file_props.receiver - if contact.get_full_jid() == receiver_jid: + if contact.jid == receiver_jid: file_props.error = -5 self.remove_transfer(file_props) app.nec.push_incoming_event( @@ -219,7 +219,7 @@ def stop_all_active_file_transfers(self, contact): file_props=file_props, error_msg='')) sender_jid = file_props.sender - if contact.get_full_jid() == sender_jid: + if contact.jid == sender_jid: file_props.error = -3 self.remove_transfer(file_props) ===================================== gajim/common/modules/ping.py ===================================== @@ -49,9 +49,9 @@ def send_ping(self, contact: ContactsT) -> Generator: if not app.account_is_available(self._account): return - jid = contact.get_full_jid() + jid = contact.jid - self._log.info('Send ping to %s', jid) + self._log.info('Send ping to %s', str(jid)) app.nec.push_incoming_event(NetworkEvent('ping-sent', account=self._account, ===================================== gajim/gtk/controls/private.py ===================================== @@ -121,7 +121,7 @@ def _on_user_status_show_changed(self, self.update_ui() # def _on_disconnected(self, event): - # if event.properties.jid != self.gc_contact.get_full_jid(): + # if event.properties.jid != self.contact.jid: # return # self.got_disconnected() ===================================== gajim/gtk/preferences.py ===================================== @@ -232,11 +232,15 @@ def __init__(self, *args): @staticmethod def _on_show_avatar_in_roster_changed(*args): - app.interface.roster.setup_and_draw_roster() + # TODO + # app.interface.roster.setup_and_draw_roster() + pass @staticmethod def _on_sort_by_show_in_roster(*args): - app.interface.roster.setup_and_draw_roster() + # TODO + # app.interface.roster.setup_and_draw_roster() + pass class Chats(PreferenceBox): @@ -764,7 +768,9 @@ def __init__(self, *args): @staticmethod def _on_iconset_changed(*args): - app.interface.roster.update_icons() + # TODO: + # app.interface.roster.update_icons() + pass class Server(PreferenceBox): ===================================== gajim/gtk/themes.py ===================================== @@ -323,10 +323,6 @@ def _apply_theme(theme): app.css_config.change_theme(theme) app.nec.push_incoming_event(NetworkEvent('theme-update')) - # Begin repainting themed widgets throughout - app.interface.roster.repaint_themed_widgets() - app.interface.roster.change_roster_style(None) - @staticmethod def _update_preferences_window(): window = get_app_window('Preferences') ===================================== gajim/gui_interface.py ===================================== @@ -110,7 +110,6 @@ def __init__(self): self._passphrase_dialogs = {} self.handlers = {} - self.roster = None self.avatar_storage = AvatarStorage() self.preview_manager = PreviewManager() @@ -261,10 +260,6 @@ def add_event(self, account, jid, event): app.events.add_event(account, jid, event) # TODO: set urgency hint; show unread count in window title? - # self.roster.show_title() - # if not has_queue: # We didn't have a queue: we change icons - # if app.contacts.get_contact_with_highest_priority(account, jid): - # self.roster.draw_contact(jid, account) def handle_event(self, account, jid, type_): jid = JID.from_string(jid) @@ -630,7 +625,8 @@ def handle_event_read_state_sync(event): app.events.remove_events(event.account, jid, types=types) def handle_event_roster_info(self, obj): - #('ROSTER_INFO', account, (jid, name, sub, ask, groups)) + # TODO: + # ('ROSTER_INFO', account, (jid, name, sub, ask, groups)) account = obj.conn.name contacts = app.contacts.get_contacts(account, obj.jid) if (not obj.sub or obj.sub == 'none') and \ @@ -1519,20 +1515,13 @@ def run(self, application): if app.settings.get('trayicon') != 'never': self.show_systray() - # self.roster = roster_window.RosterWindow(application) - # if self.msg_win_mgr.mode == \ - # MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - # self.msg_win_mgr.create_window(None, None, None) - # Creating plugin manager from gajim import plugins app.plugin_manager = plugins.PluginManager() app.plugin_manager.init_plugins() - # self.roster._before_fill() for account in app.connections: app.connections[account].get_module('Roster').load_roster() - # self.roster._after_fill() # get instances for windows/dialogs that will show_all()/hide() self.instances['file_transfers'] = FileTransfersWindow() ===================================== gajim/remote_control.py ===================================== @@ -301,15 +301,10 @@ def __init__(self): app.ged.register_event_handler('message-sent', ged.POSTGUI, self.on_message_sent) - def on_chatstate_received(self, obj): - if obj.contact.is_gc_contact: - jid = obj.contact.get_full_jid() - chatstate = obj.contact.chatstate - else: - jid = obj.contact.jid - chatstate = app.contacts.get_combined_chatstate( - obj.account, obj.contact.jid) - self.raise_signal('ChatState', (obj.account, [jid, chatstate])) + def on_chatstate_received(self, event): + self.raise_signal( + 'ChatState', + (event.account, [event.contact.jid, event.contact.chatstate])) def on_message_sent(self, obj): try: @@ -421,18 +416,16 @@ def _get_account_and_contact(self, account, jid): if account: if app.account_is_available(account): # account is connected connected_account = account - contact = app.contacts.get_contact_with_highest_priority( - account, jid) + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) else: for account_ in accounts: - contact = app.contacts.get_contact_with_highest_priority( - account, jid) - if contact and app.account_is_available(account_): + client = app.get_client(account_) + contact = client.get_module('Contacts').get_contact(jid) + if app.account_is_available(account_): # account is connected connected_account = account_ break - if not contact: - contact = jid return connected_account, contact @@ -498,19 +491,18 @@ def _send_message(self, if not connected_account or contact is None: return False - connection = app.connections[connected_account] - ctrl = app.interface.msg_win_mgr.search_control( - jid, connected_account) - if ctrl: - ctrl.send_message(message) + client = app.get_client(connected_account) + control = app.window.get_control(connected_account, jid) + if control is not None: + control.send_message(message) else: message_ = OutgoingMessage(account=connected_account, contact=contact, message=message, type_=type_, subject=subject, - control=ctrl) - connection.send_message(message_) + control=control) + client.send_message(message_) return True def send_chat_message(self, jid, message, account): @@ -538,24 +530,24 @@ def send_groupchat_message(self, room_jid, message, account): if not connected_account: return False - contact = app.contacts.get_groupchat_contact(connected_account, - room_jid) - if contact is None: + client = app.get_client(connected_account) + contact = client.get_module('Contacts').get_contact( + connected_account, room_jid, groupchat=True) + + if not contact.is_joined: return False message_ = OutgoingMessage(account=connected_account, contact=contact, message=message, type_='groupchat') - con = app.connections[connected_account] - con.send_message(message_) + client.send_message(message_) return True - def open_chat(self, jid, account, message): """ - Shows the tabbed window for new message to 'jid', using account (optional) - 'account' + Shows the tabbed window for new message to 'jid', using account + 'account' (optional) """ if not jid: raise ValueError('jid is missing') @@ -576,12 +568,14 @@ def open_chat(self, jid, account, message): first_connected_acct = None for acct in accounts: if app.account_is_available(acct): # account is online - contact = app.contacts.get_first_contact_from_jid(acct, jid) - if app.interface.msg_win_mgr.has_window(jid, acct): + client = app.get_client(acct) + contact = client.get_module('Contact').get_contact(jid) + control = app.window.get_control(acct, jid) + if control is not None: connected_account = acct break # jid is in roster - if contact: + if contact.is_in_roster: connected_account = acct break # we send the message to jid not in roster, because account is @@ -709,9 +703,9 @@ def list_contacts(self, account): accounts_to_search = accounts for acct in accounts_to_search: if acct in accounts: - for jid in app.contacts.get_jid_list(acct): - item = self._contacts_as_dbus_structure( - app.contacts.get_contacts(acct, jid)) + client = app.get_client(acct) + for contact in client.get_module('Roster').iter_contacts(): + item = self._contacts_as_dbus_structure(contact) if item: result.append(item) return result @@ -738,12 +732,11 @@ def remove_contact(self, jid, account): accounts = [account] contact_exists = False for account_ in accounts: - contacts = app.contacts.get_contacts(account_, jid) - if contacts: - app.connections[account_].get_module('Presence').unsubscribe(jid) - for contact in contacts: - app.interface.roster.remove_contact(contact, account_) - app.contacts.remove_jid(account_, jid) + client = app.get_client(account_) + contact = client.get_module('Contact').get_contact(jid) + if contact.is_in_roster: + client.get_module('Presence').unsubscribe(jid) + client.get_module('Roster').delete_item(jid) contact_exists = True return contact_exists @@ -755,8 +748,8 @@ def _is_first(self): def _get_real_jid(self, jid, account=None): """ - Get the real jid from the given one: removes xmpp: or get jid from nick if - account is specified, search only in this account + Get the real jid from the given one: removes xmpp: or get jid from nick + if account is specified, search only in this account """ if account: accounts = [account] @@ -764,49 +757,39 @@ def _get_real_jid(self, jid, account=None): accounts = app.connections.keys() if jid.startswith('xmpp:'): return jid[5:] # len('xmpp:') = 5 - nick_in_roster = None # Is jid a nick ? for account_ in accounts: # Does jid exists in roster of one account ? - if app.contacts.get_contacts(account_, jid): - return jid - if not nick_in_roster: - # look in all contact if one has jid as nick - for jid_ in app.contacts.get_jid_list(account_): - c = app.contacts.get_contacts(account_, jid_) - if c[0].name == jid: - nick_in_roster = jid_ - break - if nick_in_roster: - # We have not found jid in roster, but we found is as a nick - return nick_in_roster - # We have not found it as jid nor as nick, probably a not in roster jid - return jid + client = app.get_client(account_) + contact = client.get_module('Contacts').get_contact(jid) + if contact.is_pm_contact: + return contact.real_jid + return jid - def _contacts_as_dbus_structure(self, contacts): + def _contacts_as_dbus_structure(self, bare_contact): """ Get info from list of Contact objects and create dbus dict """ - if not contacts: - return None prim_contact = None # primary contact - for contact in contacts: - if prim_contact is None or contact.priority > prim_contact.priority: - prim_contact = contact + for res_contact in bare_contact: + if (prim_contact is None or + res_contact.priority > prim_contact.priority): + prim_contact = res_contact contact_dict = {} - name = prim_contact.name if prim_contact.name is not None else '' + name = bare_contact.name contact_dict['name'] = GLib.Variant('s', name) contact_dict['show'] = GLib.Variant('s', prim_contact.show) contact_dict['jid'] = GLib.Variant('s', prim_contact.jid) resources = GLib.VariantBuilder(GLib.VariantType('a(sis)')) - for contact in contacts: - resource_props = (contact.resource, int(contact.priority), - contact.status) + for res_contact in bare_contact: + resource_props = (res_contact.jid.resource, + int(res_contact.priority), + res_contact.status) resources.add_value(GLib.Variant('(sis)', resource_props)) contact_dict['resources'] = resources.end() groups = GLib.VariantBuilder(GLib.VariantType('as')) - for group in prim_contact.groups: + for group in bare_contact.groups: groups.add_value(GLib.Variant('s', group)) contact_dict['groups'] = groups.end() return contact_dict @@ -814,9 +797,11 @@ def _contacts_as_dbus_structure(self, contacts): def get_unread_msgs_number(self): unread = app.events.get_nb_events() for event in app.events.get_all_events(['group-chat-message']): - contact = app.contacts.get_groupchat_contact(event.account, - event.jid) - if contact is None or not contact.can_notify(): + client = app.get_client(event.account) + contact = client.get_module('Contacts').get_contact( + event.jid, groupchat=True) + + if not contact.can_notify(): unread -= 1 continue View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bb9b393404a1ffe3e523c6097f43746… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bb9b393404a1ffe3e523c6097f43746… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StartChat: Fix bad indentation
by Daniel Brötzmann (＠wurstsalat) 14 Sep '21

14 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: bb9b3934 by wurstsalat at 2021-09-14T19:04:38+02:00 StartChat: Fix bad indentation - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -334,10 +334,10 @@ def _start_new_chat(self, row): def _disco_info(self, row): if not app.account_is_available(row.account): - # Account is disconnected: offer to open 1:1 chat anyway - self._new_chat_row = row - self._ui.stack.set_visible_child_name('no-disco') - return + # Account is disconnected: offer to open 1:1 chat anyway + self._new_chat_row = row + self._ui.stack.set_visible_child_name('no-disco') + return self._ui.stack.set_visible_child_name('progress') client = app.get_client(row.account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bb9b393404a1ffe3e523c6097f43746f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bb9b393404a1ffe3e523c6097f43746f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StartChat: Improve no disco info handling
by Daniel Brötzmann (＠wurstsalat) 14 Sep '21

14 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f2abb4b9 by wurstsalat at 2021-09-14T19:01:11+02:00 StartChat: Improve no disco info handling - - - - - 2 changed files: - gajim/data/gui/start_chat_dialog.ui - gajim/gtk/start_chat.py Changes: ===================================== gajim/data/gui/start_chat_dialog.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.22"/> + <requires lib="gtk+" version="3.24"/> <object class="GtkListStore" id="account_store"> <columns>  @@ -546,6 +546,110 @@ <property name="position">4</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Start New Chat</property> + <style> + <class name="large-header"/> + <class name="margin-12"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Gajim was not able to gather infos about this address.</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max-width-chars">40</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">avatar-default-symbolic</property> + <property name="icon_size">6</property> + <style> + <class name="dim-label"/> + <class name="margin-12"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">6</property> + <property name="label" translatable="yes">You can start a direct message chat, if you are sure this address is correct.</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max-width-chars">40</property> + <style> + <class name="margin-12"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Start New Chat</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">center</property> + <signal name="clicked" handler="_on_no_disco_continue" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <style> + <class name="margin-18"/> + </style> + </object> + <packing> + <property name="name">no-disco</property> + <property name="position">5</property> + </packing> + </child> </object> <object class="GtkBox" id="placeholder"> <property name="visible">True</property> ===================================== gajim/gtk/start_chat.py ===================================== @@ -22,6 +22,7 @@ from nbxmpp.errors import is_error from nbxmpp.errors import StanzaError +from nbxmpp.errors import TimeoutStanzaError from nbxmpp.errors import CancelledError from gajim.common import app @@ -64,7 +65,6 @@ def __init__(self): self._search_stopped = False self._redirected = False self._source_id = None - self._skip_disco = False self._ui = get_builder('start_chat_dialog.ui') self.add(self._ui.stack) @@ -72,6 +72,9 @@ def __init__(self): self._nick_chooser = NickChooser() self._ui.join_box.pack_start(self._nick_chooser, True, False, 0) + # Helper for the case where we don't receive a disco info + self._new_chat_row = None + self.new_contact_row_visible = False self.new_contact_rows = {} self._accounts = app.get_enabled_accounts_with_labels() @@ -306,7 +309,6 @@ def _start_new_chat(self, row): return self._disco_info(row) - GLib.timeout_add_seconds(10, self._continue_without_disco, row) return if row.groupchat: @@ -332,22 +334,20 @@ def _start_new_chat(self, row): def _disco_info(self, row): if not app.account_is_available(row.account): - # Account is disconnected: start a 1:1 chat - self._continue_without_disco(row) - return + # Account is disconnected: offer to open 1:1 chat anyway + self._new_chat_row = row + self._ui.stack.set_visible_child_name('no-disco') + return - # Reset self._skip_disco and start a disco info - self._skip_disco = False self._ui.stack.set_visible_child_name('progress') client = app.get_client(row.account) client.get_module('Discovery').disco_info( - row.jid, callback=self._disco_info_received, user_data=row) + row.jid, + callback=self._disco_info_received, + user_data=row, + timeout=10) def _disco_info_received(self, task): - if self._skip_disco: - # Stop here if disco time limit has been exceeded - return - row = task.get_user_data() try: result = task.finish() @@ -357,12 +357,21 @@ def _disco_info_received(self, task): 'subscription-required' # ejabberd ] if error.condition in contact_conditions: + # These error conditions are the result of + # querying contacts without subscription row.update_chat_type() self._start_new_chat(row) return + # Handle other possible errors self._show_error_page(error.get_text()) return + except TimeoutStanzaError: + # We reached the 10s timeout, but we should + # offer to open a chat anyway + self._new_chat_row = row + self._ui.stack.set_visible_child_name('no-disco') + return if result.is_muc: row.update_chat_type(groupchat=True) @@ -370,17 +379,9 @@ def _disco_info_received(self, task): row.update_chat_type() self._start_new_chat(row) - def _continue_without_disco(self, row): - current_page = self._ui.stack.get_visible_child_name() - if current_page not in ('progress', 'search'): - # Stop here if disco info already succeeded - return - - # Disco time limit has been exceeded, chat type is unknown: - # start a 1:1 chat - self._skip_disco = True - row.update_chat_type() - self._start_new_chat(row) + def _on_no_disco_continue(self, _button): + self._new_chat_row.update_chat_type() + self._start_new_chat(self._new_chat_row) def _disco_muc(self, account, jid, request_vcard): self._ui.stack.set_visible_child_name('progress') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f2abb4b915e2991f30530ffe4318ab67… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f2abb4b915e2991f30530ffe4318ab67… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Interface: (Re)Introduce start_chat_from_jid
by Daniel Brötzmann (＠wurstsalat) 13 Sep '21

13 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9ebc1826 by wurstsalat at 2021-09-13T23:42:05+02:00 Interface: (Re)Introduce start_chat_from_jid - - - - - 5 changed files: - gajim/app_actions.py - gajim/application.py - gajim/common/helpers.py - gajim/gui_interface.py - gajim/remote_control.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -283,7 +283,7 @@ def copy_text(_action, param): def start_chat(_action, param): account, jid = param.get_strv() - app.interface.new_chat_from_jid(account, jid) + app.interface.start_chat_from_jid(account, jid) def on_groupchat_join(_action, param): ===================================== gajim/application.py ===================================== @@ -293,10 +293,7 @@ def _open_uris(self, uris): except Exception: app.log('uri_handler').error('Invalid URI: %s', cmd) - if len(accounts) == 1: - app.interface.new_chat_from_jid(accounts[0], jid, message) - else: - self.activate_action('start-chat', GLib.Variant('s', jid)) + app.interface.start_chat_from_jid(accounts[0], jid, message) def do_shutdown(self, *args): Gtk.Application.do_shutdown(self) ===================================== gajim/common/helpers.py ===================================== @@ -1017,7 +1017,7 @@ def open_uri(uri, account=None): Gio.AppInfo.launch_default_for_uri(uri.data) elif uri.type == URIType.AT: - app.interface.new_chat_from_jid(account, uri.data) + app.interface.start_chat_from_jid(account, uri.data) elif uri.type == URIType.XMPP: if account is None: @@ -1029,8 +1029,8 @@ def open_uri(uri, account=None): 'groupchat-join', GLib.Variant('as', [account, uri.data['jid']])) elif uri.action == URIAction.MESSAGE: - app.interface.new_chat_from_jid(account, uri.data['jid'], - message=uri.data.get('body')) + app.interface.start_chat_from_jid(account, uri.data['jid'], + message=uri.data.get('body')) else: log.warning('Cant open URI: %s', uri) ===================================== gajim/gui_interface.py ===================================== @@ -1088,6 +1088,16 @@ def show_add_join_groupchat(self, account, jid, nickname=None, app.window.add_group_chat(account, str(jid), select=True) + def start_chat_from_jid(self, account, jid, message=None): + if app.window.chat_exists(account, jid): + app.window.select_chat(account, jid) + control = app.window.get_control(account, jid) + control.msg_textview.insert_text(message) + return + + # TODO: handle message arg in StartChat + app.app.activate_action('start-chat', GLib.Variant('s', jid)) + @staticmethod def _on_muc_added(event): if app.window.chat_exists(event.account, event.jid): ===================================== gajim/remote_control.py ===================================== @@ -596,12 +596,10 @@ def open_chat(self, jid, account, message): connected_account = first_connected_acct if connected_account: - app.interface.new_chat_from_jid(connected_account, jid, message) + app.interface.start_chat_from_jid(connected_account, jid, message) # preserve the 'steal focus preservation' - win = app.interface.msg_win_mgr.get_window( - jid, connected_account).window - if win.get_property('visible'): - win.window.present() + if app.window.get_property('visible'): + app.window.present() return True return False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ebc18265fceafe948cb9dccb33ef397… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ebc18265fceafe948cb9dccb33ef397… 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