Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] StartChat: Load contacts incremental
by Philipp Hörist 28 Jan '20

28 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 904c6209 by Philipp Hörist at 2020-01-28T23:05:47+01:00 StartChat: Load contacts incremental - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -59,6 +59,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self._destroyed = False self._search_stopped = False self._redirected = False + self._source_id = None self._ui = get_builder('start_chat_dialog.ui') self.add(self._ui.stack) @@ -67,9 +68,11 @@ class StartChatDialog(Gtk.ApplicationWindow): self.new_contact_rows = {} self.new_groupchat_rows = {} self._accounts = app.get_enabled_accounts_with_labels() + + rows = [] self._add_accounts() - self._add_contacts() - self._add_groupchats() + self._add_contacts(rows) + self._add_groupchats(rows) self._ui.search_entry.connect('search-changed', self._on_search_changed) @@ -81,7 +84,6 @@ class StartChatDialog(Gtk.ApplicationWindow): 'stop-search', lambda *args: self._ui.search_entry.set_text('')) self._ui.listbox.set_filter_func(self._filter_func, None) - self._ui.listbox.set_sort_func(self._sort_func, None) self._ui.listbox.connect('row-activated', self._on_row_activated) self._global_search_listbox = GlobalSearch() @@ -99,6 +101,9 @@ class StartChatDialog(Gtk.ApplicationWindow): self._ui.connect_signals(self) self.show_all() + if rows: + self._load_contacts(rows) + def set_search_text(self, text): self._ui.search_entry.set_text(text) @@ -109,7 +114,7 @@ class StartChatDialog(Gtk.ApplicationWindow): for account in self._accounts: self._ui.account_store.append([None, *account]) - def _add_contacts(self): + def _add_contacts(self, rows): show_account = len(self._accounts) > 1 for account, _label in self._accounts: self.new_contact_rows[account] = None @@ -118,11 +123,10 @@ class StartChatDialog(Gtk.ApplicationWindow): account, jid) if contact.is_groupchat: continue - row = ContactRow(account, contact, jid, - contact.get_shown_name(), show_account) - self._ui.listbox.add(row) + rows.append(ContactRow(account, contact, jid, + contact.get_shown_name(), show_account)) - def _add_groupchats(self): + def _add_groupchats(self, rows): show_account = len(self._accounts) > 1 for account, _label in self._accounts: self.new_groupchat_rows[account] = None @@ -131,8 +135,21 @@ class StartChatDialog(Gtk.ApplicationWindow): for bookmark in bookmarks: jid = str(bookmark.jid) name = get_groupchat_name(con, jid) - row = ContactRow(account, None, jid, name, show_account, True) - self._ui.listbox.add(row) + rows.append(ContactRow(account, None, jid, + name, show_account, True)) + + def _load_contacts(self, rows): + generator = self._incremental_add(rows) + self._source_id = GLib.idle_add(lambda: next(generator, False), + priority=GLib.PRIORITY_LOW) + + def _incremental_add(self, rows): + for row in rows: + self._ui.listbox.add(row) + yield True + + self._ui.listbox.set_sort_func(self._sort_func, None) + self._source_id = None def _on_page_changed(self, stack, _param): if stack.get_visible_child_name() == 'account': @@ -562,6 +579,8 @@ class StartChatDialog(Gtk.ApplicationWindow): user_data=(con, True)) def _destroy(self, *args): + if self._source_id is not None: + GLib.source_remove(self._source_id) self._destroyed = True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/904c6209df9225b82185f074cb5dae724d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/904c6209df9225b82185f074cb5dae724d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Add invite page
by Philipp Hörist 27 Jan '20

27 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d5e74812 by Daniel Brötzmann at 2020-01-27T22:07:46+01:00 Groupchat: Add invite page - - - - - 5 changed files: - gajim/data/gui/groupchat_control.ui - + gajim/data/gui/groupchat_invite.ui - gajim/groupchat_control.py - + gajim/gtk/groupchat_invite.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1691,6 +1691,84 @@ <property name="position">12</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid" id="invite_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="border_width">18</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</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> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</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">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="name">invite</property> + <property name="position">13</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/data/gui/groupchat_invite.ui ===================================== @@ -0,0 +1,238 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkListStore" id="account_store"> + <columns> +  + <column type="GdkPixbuf"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkBox" id="contacts_placeholder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <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"/> + </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">No contacts left. +You can also type an XMPP address.</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max_width_chars">35</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> + </object> + <object class="GtkGrid" id="invite_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">24</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Invitees</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Contacts</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="invitees"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkListBox" id="invitees_listbox"> + <property name="name">StartChatListBox</property> + <property name="width_request">300</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">False</property> + <property name="selection_mode">browse</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="width_request">300</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="is_focus">True</property> + <property name="hexpand">True</property> + <property name="primary_icon_name">edit-find-symbolic</property> + <property name="primary_icon_activatable">False</property> + <property name="primary_icon_sensitive">False</property> + <property name="placeholder_text" translatable="yes">Search contacts...</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkListBox" id="contacts_listbox"> + <property name="name">StartChatListBox</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="selection_mode">browse</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <object class="GtkBox" id="invitees_placeholder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">contact-new-symbolic</property> + <property name="icon_size">6</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Click on contacts you would like to invite to this group chat.</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max_width_chars">35</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> + </object> +</interface> ===================================== gajim/groupchat_control.py ===================================== @@ -71,6 +71,7 @@ from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.dataform import DataFormWidget from gajim.gtk.groupchat_info import GroupChatInfoScrolled +from gajim.gtk.groupchat_invite import GroupChatInvite from gajim.gtk.groupchat_roster import GroupchatRoster from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_icon_name @@ -174,6 +175,11 @@ class GroupchatControl(ChatControlBase): self._muc_info_box = GroupChatInfoScrolled(self.account, {'width': 600}) self.xml.info_grid.attach(self._muc_info_box, 0, 0, 1, 1) + # Groupchat invite + self._invite_box = GroupChatInvite(self.room_jid) + self.xml.invite_grid.attach(self._invite_box, 0, 0, 1, 1) + self._invite_box.connect('listbox-changed', self._on_invite_ready) + self.control_menu = gui_menu_builder.get_groupchat_menu(self.control_id, self.account, self.room_jid) @@ -264,6 +270,7 @@ class GroupchatControl(ChatControlBase): ('request-voice-', None, self._on_request_voice), ('upload-avatar-', None, self._on_upload_avatar), ('information-', None, self._on_information), + ('invite-', None, self._on_invite), ('contact-information-', 's', self._on_contact_information), ('execute-command-', 's', self._on_execute_command), ('block-', 's', self._on_block), @@ -503,6 +510,20 @@ class GroupchatControl(ChatControlBase): self._subject_data.user_timestamp) self._show_page('muc-info') + def _on_invite(self, _action, _param): + self._invite_box.update() + self._show_page('invite') + + def _on_invite_ready(self, _, invitable): + self.xml.invite_button.set_sensitive(invitable) + + def _on_invite_clicked(self, _button): + invitees = self._invite_box.get_invitees() + con = app.connections[self.account] + for jid in invitees: + con.get_module('MUC').invite(self.room_jid, jid) + self._show_page('groupchat') + def _on_destroy_room(self, _action, _param): self.xml.destroy_reason_entry.grab_focus() self.xml.destroy_button.grab_default() @@ -1913,6 +1934,8 @@ class GroupchatControl(ChatControlBase): self.xml.subject_textview.grab_focus() elif page_name == 'captcha': self._captcha_request.focus_first_entry() + elif page_name == 'invite': + self._invite_box.focus_search_entry() elif page_name == 'destroy': self.xml.destroy_reason_entry.grab_focus_without_selecting() ===================================== gajim/gtk/groupchat_invite.py ===================================== @@ -0,0 +1,357 @@ +# 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 locale + +from gi.repository import Gdk +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.i18n import _ +from gajim.common.const import AvatarSize +from gajim.common.helpers import validate_jid + +from gajim.gtk.util import get_builder + + +class GroupChatInvite(Gtk.Box): + __gsignals__ = { + 'listbox-changed': (GObject.SignalFlags.RUN_LAST, None, (bool,)) + } + + def __init__(self, room_jid): + Gtk.Box.__init__(self) + self.set_size_request(-1, 300) + self._ui = get_builder('groupchat_invite.ui') + self.add(self._ui.invite_grid) + + self._ui.contacts_listbox.set_filter_func(self._filter_func, None) + self._ui.contacts_listbox.set_sort_func(self._sort_func, None) + self._ui.contacts_listbox.set_placeholder(self._ui.contacts_placeholder) + self._ui.contacts_listbox.connect('row-activated', + self._on_contacts_row_activated) + + self._ui.invitees_listbox.set_sort_func(self._sort_func, None) + self._ui.invitees_listbox.set_placeholder( + self._ui.invitees_placeholder) + self._ui.invitees_listbox.connect('row-activated', + self._on_invitees_row_activated) + + self._new_contact_row_visible = False + self._room_jid = room_jid + + self.update() + + self._ui.search_entry.connect('search-changed', + self._on_search_changed) + self._ui.search_entry.connect('next-match', + self._select_new_match, 'next') + self._ui.search_entry.connect('previous-match', + self._select_new_match, 'prev') + self._ui.search_entry.connect( + 'stop-search', lambda *args: self._ui.search_entry.set_text('')) + self._ui.search_entry.connect('activate', + self._on_search_activate) + self.connect('key-press-event', self._on_key_press) + self._ui.connect_signals(self) + + self.show_all() + + def _add_accounts(self): + for account in self._accounts: + self._ui.account_store.append([None, *account]) + + def _add_contacts(self): + show_account = len(self._accounts) > 1 + our_jids = app.get_our_jids() + for account, _label in self._accounts: + self.new_contact_rows[account] = None + participant_jids = [] + for contact in app.contacts.get_gc_contact_list( + account, self._room_jid): + if contact.jid is not None: + participant_jids.append(app.get_jid_without_resource( + contact.jid)) + for jid in app.contacts.get_jid_list(account): + contact = app.contacts.get_contact_with_highest_priority( + account, jid) + # Exclude group chats + if contact.is_groupchat: + continue + # Exclude our own jid + if jid in our_jids: + continue + # Exclude group chat participants + if jid in participant_jids: + continue + row = ContactRow(account, contact, jid, + contact.get_shown_name(), show_account) + self._ui.contacts_listbox.add(row) + + def _on_contacts_row_activated(self, listbox, row): + if row.new: + jid = row.jid + try: + validate_jid(jid) + except ValueError as error: + icon = 'dialog-warning-symbolic' + self._ui.search_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, icon) + self._ui.search_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, str(error)) + return + self._ui.search_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, None) + show_account = len(self._accounts) > 1 + row = ContactRow( + row.account, None, '', None, show_account) + row.update_jid(jid) + self._remove_new_jid_row() + else: + listbox.remove(row) + self._ui.invitees_listbox.add(row) + self._ui.invitees_listbox.unselect_row(row) + self._ui.search_entry.set_text('') + + GLib.timeout_add(50, self._select_first_row) + self._ui.search_entry.grab_focus() + + invitable = self._ui.invitees_listbox.get_row_at_index(0) is not None + self.emit('listbox-changed', invitable) + + def _on_invitees_row_activated(self, listbox, row): + listbox.remove(row) + if not row.new: + self._ui.contacts_listbox.add(row) + self._ui.contacts_listbox.unselect_row(row) + self._ui.search_entry.grab_focus() + invitable = listbox.get_row_at_index(0) is not None + self.emit('listbox-changed', invitable) + + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Down: + self._ui.search_entry.emit('next-match') + return Gdk.EVENT_STOP + + if event.keyval == Gdk.KEY_Up: + self._ui.search_entry.emit('previous-match') + return Gdk.EVENT_STOP + + if event.keyval == Gdk.KEY_Return: + row = self._ui.contacts_listbox.get_selected_row() + if row is not None: + row.emit('activate') + return Gdk.EVENT_STOP + + self._ui.search_entry.grab_focus_without_selecting() + + return Gdk.EVENT_PROPAGATE + + def _on_search_activate(self, _entry): + row = self._ui.contacts_listbox.get_selected_row() + if row is not None and row.get_child_visible(): + row.emit('activate') + + def _on_search_changed(self, entry): + search_text = entry.get_text() + if '@' in search_text: + self._add_new_jid_row() + self._update_new_jid_rows(search_text) + else: + self._remove_new_jid_row() + self._ui.contacts_listbox.invalidate_filter() + + def _add_new_jid_row(self): + if self._new_contact_row_visible: + return + for account in self.new_contact_rows: + show_account = len(self._accounts) > 1 + row = ContactRow(account, None, '', None, show_account) + self.new_contact_rows[account] = row + self._ui.contacts_listbox.add(row) + row.get_parent().show_all() + self._new_contact_row_visible = True + + def _remove_new_jid_row(self): + if not self._new_contact_row_visible: + return + for account in self.new_contact_rows: + self._ui.contacts_listbox.remove( + self.new_contact_rows[account]) + self._new_contact_row_visible = False + + def _update_new_jid_rows(self, search_text): + for account in self.new_contact_rows: + self.new_contact_rows[account].update_jid(search_text) + + def _select_new_match(self, _entry, direction): + selected_row = self._ui.contacts_listbox.get_selected_row() + if selected_row is None: + return + + index = selected_row.get_index() + + if direction == 'next': + index += 1 + else: + index -= 1 + + while True: + new_selected_row = self._ui.contacts_listbox.get_row_at_index(index) + if new_selected_row is None: + return + if new_selected_row.get_child_visible(): + self._ui.contacts_listbox.select_row(new_selected_row) + new_selected_row.grab_focus() + return + if direction == 'next': + index += 1 + else: + index -= 1 + + def _select_first_row(self): + first_row = self._ui.contacts_listbox.get_row_at_y(0) + self._ui.contacts_listbox.select_row(first_row) + + def _scroll_to_first_row(self): + self._ui.scrolledwindow.get_vadjustment().set_value(0) + + def _filter_func(self, row, _user_data): + search_text = self._ui.search_entry.get_text().lower() + search_text_list = search_text.split() + row_text = row.get_search_text().lower() + for text in search_text_list: + if text not in row_text: + GLib.timeout_add(50, self._select_first_row) + return None + GLib.timeout_add(50, self._select_first_row) + return True + + @staticmethod + def _sort_func(row1, row2, _user_data): + name1 = row1.get_search_text() + name2 = row2.get_search_text() + account1 = row1.account + account2 = row2.account + + result = locale.strcoll(account1.lower(), account2.lower()) + if result != 0: + return result + + return locale.strcoll(name1.lower(), name2.lower()) + + def update(self): + self._ui.contacts_listbox.foreach(self._ui.contacts_listbox.remove) + self._ui.invitees_listbox.foreach(self._ui.invitees_listbox.remove) + self._accounts = app.get_enabled_accounts_with_labels() + self.new_contact_rows = {} + self._add_accounts() + self._add_contacts() + first_row = self._ui.contacts_listbox.get_row_at_index(0) + self._ui.contacts_listbox.select_row(first_row) + self._ui.search_entry.grab_focus() + self.emit('listbox-changed', False) + + def focus_search_entry(self): + self._ui.search_entry.grab_focus() + + def get_invitees(self): + invitees = [] + for row in self._ui.invitees_listbox.get_children(): + invitees.append(row.jid) + return invitees + + +class ContactRow(Gtk.ListBoxRow): + def __init__(self, account, contact, jid, name, show_account): + Gtk.ListBoxRow.__init__(self) + self.get_style_context().add_class('start-chat-row') + self.account = account + self.account_label = app.get_account_label(account) + self.show_account = show_account + self.jid = jid + self.contact = contact + self.name = name + self.new = jid == '' + + show = contact.show if contact else 'offline' + + grid = Gtk.Grid() + grid.set_column_spacing(12) + grid.set_size_request(260, -1) + + image = self._get_avatar_image(account, jid, show) + image.set_size_request(AvatarSize.ROSTER, AvatarSize.ROSTER) + grid.add(image) + + middle_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) + middle_box.set_hexpand(True) + + if self.name is None: + self.name = _('Invite New Contact') + + self.name_label = Gtk.Label(label=self.name) + self.name_label.set_ellipsize(Pango.EllipsizeMode.END) + self.name_label.set_xalign(0) + self.name_label.set_width_chars(25) + self.name_label.set_halign(Gtk.Align.START) + self.name_label.get_style_context().add_class('bold16') + middle_box.add(self.name_label) + + self.jid_label = Gtk.Label(label=jid) + self.jid_label.set_ellipsize(Pango.EllipsizeMode.END) + self.jid_label.set_xalign(0) + self.jid_label.set_width_chars(25) + self.jid_label.set_halign(Gtk.Align.START) + self.jid_label.get_style_context().add_class('dim-label') + middle_box.add(self.jid_label) + + grid.add(middle_box) + + if show_account: + account_label = Gtk.Label(label=self.account_label) + account_label.set_halign(Gtk.Align.START) + account_label.set_valign(Gtk.Align.START) + + right_box = Gtk.Box() + right_box.set_vexpand(True) + right_box.add(account_label) + grid.add(right_box) + + self.add(grid) + self.show_all() + + def _get_avatar_image(self, account, jid, show): + if self.new: + icon_name = 'avatar-default' + return Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.DND) + + scale = self.get_scale_factor() + avatar = app.contacts.get_avatar( + account, jid, AvatarSize.ROSTER, scale, show) + return Gtk.Image.new_from_surface(avatar) + + def update_jid(self, jid): + self.jid = jid + self.jid_label.set_text(jid) + + def get_search_text(self): + if self.contact is None: + return self.jid + if self.show_account: + return '%s %s %s' % (self.name, self.jid, self.account_label) + return '%s %s' % (self.name, self.jid) ===================================== gajim/gui_menu_builder.py ===================================== @@ -572,6 +572,7 @@ def get_singlechat_menu(control_id, account, jid): def get_groupchat_menu(control_id, account, jid): groupchat_menu = [ ('win.information-', _('Information')), + ('win.invite-', _('Invite Contact')), (_('Manage Group Chat'), [ ('win.rename-groupchat-', _('Rename Group Chat')), ('win.change-subject-', _('Change Subject')), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d5e7481246203290359f18cb3a8bd1c1b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d5e7481246203290359f18cb3a8bd1c1b6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Update README.md
by Philipp Hörist 26 Jan '20

26 Jan '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: eeab345a by Daniel Brötzmann at 2020-01-26T22:40:01+01:00 Update README.md - - - - - a53ccef3 by Daniel Brötzmann at 2020-01-26T22:40:01+01:00 Remove obsolete README file - - - - - 2 changed files: - − README - README.md Changes: ===================================== README deleted ===================================== @@ -1,17 +0,0 @@ - python-nbxmpp - http://dev.gajim.org/gajim/python-nbxmpp - - The goal of this python library is to provide a way for python applications -to use Jabber/XMPP networks in a non-blocking way. This library is initialy a -fork of xmpppy one, but using non-blocking sockets. - - Installation - -Simply run 'python setup.py install' as root - - Usage - -You have to 'import nbxmpp' in your program. Then look at examples in the doc -folder. - -2012-05-08 Yann Leboulanger ===================================== README.md ===================================== @@ -1,18 +1,29 @@ -## Welcome to python-nbxmpp website +# Welcome to python-nbxmpp -python-nbxmpp is a Python library that provides a way for Python applications to use Jabber/XMPP networks in a non-blocking way. This library is initialy a fork of xmpppy one, but using non-blocking sockets. +`python-nbxmpp` is a Python library that provides a way for Python applications to use the Jabber/XMPP network in a non-blocking way. This library was initialy a fork of `xmpppy`, but is now using non-blocking sockets. ## Features - * Asynchronous - * Supports ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1(PLUS), SCRAM-SHA-256(PLUS) and PLAIN authentication mechanisms. - * Supports connection via proxies - * Suppors TLS - * Supports [BOSH (XEP-0124)](https://xmpp.org/extensions/xep-0124.html) - * Support [Stream Management (XEP-0198)](https://xmpp.org/extensions/xep-0198.html) +* Asynchronous +* Supports ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1, DIGEST-MD5, PLAIN, and X-MESSENGER-OAUTH2 authentication mechanisms. +* Supports connection via proxies +* Supports TLS +* Supports [BOSH (XEP-0124)](https://xmpp.org/extensions/xep-0124.html) +* Supports [Stream Managemen (XEP-0198)](https://xmpp.org/extensions/xep-0198.html) +* List of [supported XEPs](./Supported-XEPs-in-python-nbxmpp/) ## Starting Points - * [Downloads](http://dev.gajim.org/gajim/python-nbxmpp/tags) - * You can also clone the git repository at http://dev.gajim.org/gajim/python-nbxmpp.git - * [Example](http://dev.gajim.org/gajim/python-nbxmpp/tree/master/doc/examples) \ No newline at end of file +* [Downloads](https://dev.gajim.org/gajim/python-nbxmpp/tags) +* You can also clone the [git repository](https://dev.gajim.org/gajim/python-nbxmpp.git) +* [Examples](https://dev.gajim.org/gajim/python-nbxmpp/tree/master/doc/example… + +### Setup + +Run the following: + + sudo python setup.py install + +### Usage + +To use python-nbxmpp, `import nbxmpp` in your application. Have a look at the [Examples](https://dev.gajim.org/gajim/python-nbxmpp/tree/master/doc/example… in the doc folder. View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/8c4bbc694a75cc708ddae6890… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/8c4bbc694a75cc708ddae6890… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 1.1.93
by Philipp Hörist 26 Jan '20

26 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d498dbf1 by Philipp Hörist at 2020-01-26T22:28:18+01:00 1.1.93 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.1.92" +__version__ = "1.1.93" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d498dbf1382a67d6f47e4cf0ed3267e2ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d498dbf1382a67d6f47e4cf0ed3267e2ef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Roster: Correctly process roster item updates
by Philipp Hörist 26 Jan '20

26 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3a4006ec by Philipp Hörist at 2020-01-26T22:26:21+01:00 Roster: Correctly process roster item updates A roster push contains always the whole entry, so instead of updating only the attributes which are present in the roster push, fill all missing attrs with default values, e.g. None for a missing name attr Fixes #9963 - - - - - 1 changed file: - gajim/common/modules/roster.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -149,34 +149,33 @@ class Roster(BaseModule): for item in query.getTags('item'): jid = item.getAttr('jid') - self._data[jid] = self._get_item_attrs(item, update=False) + self._data[jid] = self._get_item_attrs(item) self._log.info('Item %s: %s', jid, self._data[jid]) return version @staticmethod - def _get_item_attrs(item, update=True): + def _get_item_attrs(item, update=False): ''' update: True - returns only the attrs that are present in the item + Omit avatar_sha from the returned attrs update: False - returns the attrs of the item but fills missing - attrs with default values + Include the default value fro avatar_sha in the returned attrs ''' default_attrs = {'name': None, 'ask': None, 'subscription': None, - 'groups': [], - 'avatar_sha': None} + 'groups': []} + + if not update: + default_attrs['avatar_sha'] = None attrs = item.getAttrs() del attrs['jid'] groups = {group.getData() for group in item.getTags('group')} attrs['groups'] = list(groups) - if update: - return attrs default_attrs.update(attrs) return default_attrs @@ -196,13 +195,13 @@ class Roster(BaseModule): if item.getAttr('subscription') == 'remove': self._data.pop(jid, None) - attrs = self._get_item_attrs(item, update=False) + attrs = self._get_item_attrs(item) return RosterItem(jid, attrs) if jid not in self._data: - self._data[jid] = self._get_item_attrs(item, update=False) + self._data[jid] = self._get_item_attrs(item) else: - self._data[jid].update(self._get_item_attrs(item)) + self._data[jid].update(self._get_item_attrs(item, update=True)) return RosterItem(jid, self._data[jid]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3a4006ecbfde2282b2d9c0b202c9d739fe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3a4006ecbfde2282b2d9c0b202c9d739fe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] OMEMO: Make return value consistent for request_devicelist()
by Philipp Hörist 26 Jan '20

26 Jan '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8c4bbc69 by Philipp Hörist at 2020-01-26T21:11:12+01:00 OMEMO: Make return value consistent for request_devicelist() Always return a list instead of in some cases None Fixes #96 - - - - - 1 changed file: - nbxmpp/modules/omemo.py Changes: ===================================== nbxmpp/modules/omemo.py ===================================== @@ -173,7 +173,7 @@ class OMEMO: raise StanzaMalformed('No list node found') if not list_node.getChildren(): - return None + return [] result = [] devices_nodes = list_node.getChildren() @@ -210,7 +210,7 @@ class OMEMO: items_node = pubsub_node.getTag('items') item = items_node.getTag('item') if item is None: - return None + return [] try: return self._parse_devicelist(item) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/8c4bbc694a75cc708ddae6890c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/8c4bbc694a75cc708ddae6890c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControlBase: Add focus() method
by Philipp Hörist 26 Jan '20

26 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: aad2e1d2 by Philipp Hörist at 2020-01-26T20:46:49+01:00 ChatControlBase: Add focus() method This method is called by the MessageWindow on the currently active control, when it gains focus. This allows the controls to decide by themself what should be focused inside the control. For example the GroupchatControl could have the change nickname page open and would want to focus the nickname entry - - - - - 5 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/groupchat_control.py - gajim/gtk/dataform.py - gajim/message_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -340,6 +340,9 @@ class ChatControl(ChatControlBase): win.lookup_action( 'information-' + self.control_id).set_enabled(online) + def focus(self): + self.msg_textview.grab_focus() + def delegate_action(self, action): res = super().delegate_action(action) if res == Gdk.EVENT_STOP: ===================================== gajim/chat_control_base.py ===================================== @@ -332,6 +332,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): """ on_response_yes(self) + def focus(self): + raise NotImplementedError + def get_nb_unread(self): jid = self.contact.jid if self.resource: ===================================== gajim/groupchat_control.py ===================================== @@ -1899,6 +1899,23 @@ class GroupchatControl(ChatControlBase): return Gdk.EVENT_PROPAGATE + def focus(self): + page_name = self._get_current_page() + if page_name == 'groupchat': + self.msg_textview.grab_focus() + elif page_name == 'password': + self.xml.password_entry.grab_focus_without_selecting() + elif page_name == 'nickname': + self.xml.nickname_entry.grab_focus_without_selecting() + elif page_name == 'rename': + self.xml.name_entry.grab_focus_without_selecting() + elif page_name == 'subject': + self.xml.subject_textview.grab_focus() + elif page_name == 'captcha': + self._captcha_request.focus_first_entry() + elif page_name == 'destroy': + self.xml.destroy_reason_entry.grab_focus_without_selecting() + def _start_private_message(self, nick): gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) nick_jid = gc_c.get_full_jid() ===================================== gajim/gtk/dataform.py ===================================== @@ -69,7 +69,7 @@ class DataFormWidget(Gtk.ScrolledWindow): def focus_first_entry(self): for widget in self._form_grid.get_children(): if isinstance(widget, Gtk.Entry): - widget.grab_focus() + widget.grab_focus_without_selecting() break ===================================== gajim/message_window.py ===================================== @@ -451,7 +451,7 @@ class MessageWindow(EventHelper): # whether the tab is the active one. self.show_title() if self.get_num_controls() == 1: - GLib.timeout_add(500, control.msg_textview.grab_focus) + GLib.timeout_add(500, control.focus) def on_tab_eventbox_button_press_event(self, widget, event, child): if event.button == 3: # right click @@ -463,7 +463,7 @@ class MessageWindow(EventHelper): self.remove_tab(ctrl, self.CLOSE_TAB_MIDDLE_CLICK) else: ctrl = self._widget_to_control(child) - GLib.idle_add(ctrl.msg_textview.grab_focus) + GLib.idle_add(ctrl.focus) def _on_close_button_clicked(self, button, control): """ @@ -549,7 +549,7 @@ class MessageWindow(EventHelper): ctrl_page = self.notebook.page_num(ctrl.widget) self.notebook.set_current_page(ctrl_page) self.window.present() - GLib.idle_add(ctrl.msg_textview.grab_focus) + GLib.idle_add(ctrl.focus) def remove_tab(self, ctrl, method, reason=None, force=False): """ @@ -825,7 +825,7 @@ class MessageWindow(EventHelper): control = self.get_active_control() if isinstance(control, ChatControlBase): - control.msg_textview.grab_focus() + control.focus() def get_tab_at_xy(self, x, y): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/aad2e1d2132a3f64c39a83a8af7f1385e0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/aad2e1d2132a3f64c39a83a8af7f1385e0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Connection: Enable SoftwareVersion module
by Philipp Hörist 25 Jan '20

25 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 074e56a8 by Bronko at 2020-01-25T22:57:15+01:00 Connection: Enable SoftwareVersion module closes #9961 - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -1487,6 +1487,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.get_module('VCardTemp').request_vcard() self.get_module('Bookmarks').request_bookmarks() + self.get_module('SoftwareVersion').set_enabled(True) self.get_module('Annotations').request_annotations() self.get_module('Blocking').get_blocking_list() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/074e56a8e023a2e4d0348e9127586a91e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/074e56a8e023a2e4d0348e9127586a91e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConversationsTextview: Remove fuzzy timestamps
by Philipp Hörist 25 Jan '20

25 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2b755d2d by Bronko at 2020-01-25T19:59:41+01:00 ConversationsTextview: Remove fuzzy timestamps - Change default timestamp to include date closes #9272 - - - - - 4 changed files: - gajim/common/config.py - gajim/common/optparser.py - gajim/conversation_textview.py - gajim/history_manager.py Changes: ===================================== gajim/common/config.py ===================================== @@ -152,7 +152,7 @@ class Config: 'history_window_x-position': [opt_int, 0], 'history_window_y-position': [opt_int, 0], 'latest_disco_addresses': [opt_str, ''], - 'time_stamp': [opt_str, '[%X] ', _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html).')], + 'time_stamp': [opt_str, '%x | %X ', _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).')], 'before_nickname': [opt_str, '', _('Characters that are printed before the nickname in conversations.')], 'after_nickname': [opt_str, ':', _('Characters that are printed after the nickname in conversations.')], 'change_roster_title': [opt_bool, True, _('If enabled, Gajim will add * and [n] in contact list window title.')], ===================================== gajim/common/optparser.py ===================================== @@ -146,6 +146,8 @@ class OptionsParser: self.update_config_to_016105() if old < [0, 98, 3] and new >= [0, 98, 3]: self.update_config_to_0983() + if old < [1, 1, 93] and new >= [1, 1, 93]: + self.update_config_to_1193() app.config.set('version', new_version) @@ -212,3 +214,9 @@ class OptionsParser: elif password == "libsecret:": app.config.set_per('accounts', account, 'password', '') app.config.set('version', '0.98.3') + + def update_config_to_1193(self): + # add date to time_stamp, if user did not set a custom time_stamp + if self.old_values['time_stamp'] == '[%X] ': + app.config.set('time_stamp', '%x | %X ') + app.config.set('version', '1.1.93') ===================================== gajim/conversation_textview.py ===================================== @@ -24,11 +24,9 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import time -import os import queue import urllib import logging -from calendar import timegm from gi.repository import Gtk from gi.repository import Pango @@ -1084,34 +1082,11 @@ class ConversationTextview(GObject.GObject): self.line += 1 - def get_time_to_show(self, tim, direction_mark=''): + def get_time_to_show(self, tim): """ - Get the time, with the day before if needed and return it. It DOESN'T - format a fuzzy time + Format the time according to config setting 'time_stamp' """ - format_ = '' - # get difference in days since epoch (86400 = 24*3600) - # number of days since epoch for current time (in GMT) - - # number of days since epoch for message (in GMT) - diff_day = int(int(timegm(time.localtime())) / 86400 -\ - int(timegm(tim)) / 86400) - if diff_day == 0.0: - day_str = '' - else: - #%i is day in year (1-365) - day_str = i18n.ngettext('Yesterday', - '%(nb_days)i days ago', diff_day, {'nb_days': diff_day}, - {'nb_days': diff_day}) - if day_str: - # strftime Windows bug has problems with Unicode - # see: http://bugs.python.org/issue8304 - if os.name != 'nt': - format_ += i18n.direction_mark + day_str + direction_mark + ' ' - else: - format_ += day_str + ' ' - timestamp_str = app.config.get('time_stamp') - timestamp_str = helpers.from_one_line(timestamp_str) - format_ += timestamp_str + format_ = helpers.from_one_line(app.config.get('time_stamp')) tim_format = time.strftime(format_, tim) return tim_format @@ -1188,7 +1163,7 @@ class ConversationTextview(GObject.GObject): current_print_time = app.config.get('print_time') if current_print_time == 'always': - timestamp_str = self.get_time_to_show(local_tim, direction_mark) + timestamp_str = self.get_time_to_show(local_tim) timestamp = time.strftime(timestamp_str, local_tim) timestamp = direction_mark + timestamp + direction_mark if other_tags_for_time: @@ -1202,7 +1177,7 @@ class ConversationTextview(GObject.GObject): seconds_passed = tim - self.last_time_printout if seconds_passed > every_foo_seconds: self.last_time_printout = tim - tim_format = self.get_time_to_show(local_tim, direction_mark) + tim_format = self.get_time_to_show(local_tim) buffer_.insert_with_tags_by_name(iter_, tim_format + '\n', 'time_sometimes') ===================================== gajim/history_manager.py ===================================== @@ -364,6 +364,7 @@ class HistoryManager: self.nickname_col_for_logs.set_visible(False) self.subject_col_for_logs.set_visible(True) + format_ = helpers.from_one_line(app.config.get('time_stamp')) for row in results: # exposed in UI (TreeViewColumns) are only # time, message, subject, nickname @@ -372,7 +373,7 @@ class HistoryManager: log_line_id, jid_id, time_, kind, message, subject, nickname, \ show = row try: - time_ = time.strftime('%x', time.localtime(float(time_))) + time_ = time.strftime(format_, time.localtime(float(time_))) except ValueError: pass else: @@ -420,6 +421,7 @@ class HistoryManager: ''', (like_sql, like_sql)) results = self.cur.fetchall() + format_ = helpers.from_one_line(app.config.get('time_stamp')) for row in results: # exposed in UI (TreeViewColumns) are only # JID, time, message, subject, nickname @@ -427,7 +429,7 @@ class HistoryManager: # log_line_id, jid (from jid_id), time, message, subject, nickname log_line_id, jid_id, time_, message, subject, nickname = row try: - time_ = time.strftime('%x', time.localtime(float(time_))) + time_ = time.strftime(format_, time.localtime(float(time_))) except ValueError: pass else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2b755d2ddbe36b17d1c462cadccb4a81f0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2b755d2ddbe36b17d1c462cadccb4a81f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused imports
by Philipp Hörist 23 Jan '20

23 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e86951bd by Philipp Hörist at 2020-01-23T20:09:29+01:00 Remove unused imports - - - - - 1 changed file: - gajim/common/zeroconf/client_zeroconf.py Changes: ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -20,9 +20,7 @@ import ssl import errno import sys import os -import string import logging -from random import Random from unittest.mock import Mock import nbxmpp View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e86951bd481cee3c4a6051b6a5be4d1f62… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e86951bd481cee3c4a6051b6a5be4d1f62… 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