Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Fix Filter
by Philipp Hörist 03 Mar '21

03 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: c8099697 by lovetox at 2021-03-03T21:37:01+01:00 Fix Filter - - - - - 2 changed files: - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -66,7 +66,8 @@ def _update_timer(self): def _filter_func(self, row): if not self._current_filter_text: return True - return self._current_filter_text in row.jid + text = self._current_filter_text.lower() + return text in row.contact.name.lower() @staticmethod def _header_func(row, before): @@ -256,11 +257,11 @@ def __init__(self, workspace_id, account, jid, type_, pinned): self.conversations_label = ConversationsHeader() self.pinned_label = PinnedHeader() - self._contact = app.get_client(account).get_module('Contacts').get_contact(jid) - self._contact.connect('presence-update', self._on_presence_update) - self._contact.connect('chatstate-update', self._on_chatstate_update) - self._contact.connect('nickname-update', self._on_nickname_update) - self._contact.connect('avatar-update', self._on_avatar_update) + self.contact = app.get_client(account).get_module('Contacts').get_contact(jid) + self.contact.connect('presence-update', self._on_presence_update) + self.contact.connect('chatstate-update', self._on_chatstate_update) + self.contact.connect('nickname-update', self._on_nickname_update) + self.contact.connect('avatar-update', self._on_avatar_update) self._timestamp = None self._unread_count = 0 @@ -367,17 +368,17 @@ def _on_avatar_update(self, _contact, _signal_name): def update_avatar(self): scale = self.get_scale_factor() - surface = self._contact.get_avatar(AvatarSize.ROSTER, scale) + surface = self.contact.get_avatar(AvatarSize.ROSTER, scale) self._ui.avatar_image.set_from_surface(surface) def update_name(self): if self.type == 'pm': client = app.get_client(self.account) muc_name = get_groupchat_name(client, self.jid) - self._ui.name_label.set_text(f'{self._contact.name} ({muc_name})') + self._ui.name_label.set_text(f'{self.contact.name} ({muc_name})') return - self._ui.name_label.set_text(self._contact.name) + self._ui.name_label.set_text(self.contact.name) def _on_chatstate_update(self, contact, _signal_name): if contact.chatstate is None: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -38,9 +38,12 @@ def __init__(self, main_window, ui, chat_stack): self._chat_stack = chat_stack self._chat_lists = {} + self._last_visible_child_name = 'default' + self.add_named(Gtk.Box(), 'default') self.show_all() + self.connect('notify::visible-child-name', self._on_visible_child_name) self._ui.search_entry.connect( 'search-changed', self._on_search_changed) @@ -53,6 +56,16 @@ def _on_window_active(self, window, _param): if chat is not None: chat.reset_unread() + def _on_visible_child_name(self, _stack, _param): + if self._last_visible_child_name == self.get_visible_child_name(): + return + + self._ui.search_entry.set_text('') + if self._last_visible_child_name != 'default': + child = self.get_child_by_name(self._last_visible_child_name) + child.set_filter_text('') + self._last_visible_child_name = self.get_visible_child_name() + def get_chatlist(self, workspace_id): return self._chat_lists[workspace_id] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8099697ccd8136f738cf5136757b706… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8099697ccd8136f738cf5136757b706… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Improve AccountPage and Roster
by Daniel Brötzmann 03 Mar '21

03 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: bc98008e by Daniel Brötzmann at 2021-03-03T11:14:17+01:00 Improve AccountPage and Roster - - - - - be18925d by Daniel Brötzmann at 2021-03-03T11:19:18+01:00 ChatList: Improve popover menu - - - - - 8 changed files: - + gajim/data/gui/account_page.ui - gajim/data/gui/main.ui - gajim/data/gui/roster.ui - gajim/data/style/gajim.css - gajim/gtk/account_page.py - gajim/gtk/chat_list.py - gajim/gtk/roster.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkPaned" id="paned"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <child> + <object class="GtkBox" id="roster_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Contact List</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="roster_menu_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="halign">end</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">open-menu-symbolic</property> + </object> + </child> + </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="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSearchEntry" id="roster_search_entry"> + <property name="visible">True</property> + <property name="can-focus">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…</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">6</property> + <property name="margin-end">6</property> + <property name="margin-top">12</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <style> + <class name="account-page-roster"/> + </style> + </object> + <packing> + <property name="resize">False</property> + <property name="shrink">False</property> + </packing> + </child> + <child> + <object class="GtkBox" id="account_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="account_label"> + <property name="visible">True</property> + <property name="can-focus">False</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="GtkButton" id="account_settings"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Account Settings…</property> + <signal name="clicked" handler="_on_account_settings" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">preferences-other-symbolic</property> + </object> + </child> + </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">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <style> + <class name="account-page-box"/> + </style> + </object> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/gui/main.ui ===================================== @@ -165,7 +165,7 @@ <property name="label">Workspace Label</property> <property name="ellipsize">end</property> <style> - <class name="large-header"/> + <class name="bold16"/> </style> </object> <packing> ===================================== gajim/data/gui/roster.ui ===================================== @@ -30,7 +30,6 @@ <child> <object class="GtkTreeViewColumn" id="contact_column"> <property name="sizing">fixed</property> - <property name="fixed-width">210</property> <property name="title">avatar</property> <property name="expand">True</property> <child> ===================================== gajim/data/style/gajim.css ===================================== @@ -132,9 +132,20 @@ background-color: darker(@theme_bg_color); margin: 0px 12px 0px 12px; } + /* Account Page */ .account-page { - background: @theme_bg_color; + background: transparent; +} +.account-page-roster { + padding: 12px; +} +.account-page-box { + padding: 18px; +} +/* Roster */ +.roster treeview { + padding: 0 3px; } /*Middle Grid*/ @@ -416,9 +427,6 @@ infobar.error > revealer > box { .start-chat-row:not(.activatable) label { color: @insensitive_fg_color; } .start-chat-row:focus { outline: none; } -/* Roster */ -.roster treeview { padding-left: 4px; } - /* GroupChatRoster */ .groupchat-roster { border-left: 1px solid; border-color: @borders; } ===================================== gajim/gtk/account_page.py ===================================== @@ -15,55 +15,41 @@ from gi.repository import Gtk from gajim.common import app -from gajim.common.i18n import _ from .roster import Roster from .status_selector import StatusSelector +from .util import get_builder from .util import open_window class AccountPage(Gtk.Box): def __init__(self, account): Gtk.Box.__init__(self) - self.get_style_context().add_class('account-page') - self._account = account - self._account_label = Gtk.Label() - self._account_label.get_style_context().add_class('large-header') + self._ui = get_builder('account_page.ui') + self.add(self._ui.paned) self._status_selector = StatusSelector() self._status_selector.set_halign(Gtk.Align.CENTER) - - settings_button = Gtk.Button(label=_('Settings')) - settings_button.set_halign(Gtk.Align.CENTER) - settings_button.connect('clicked', self._on_settings) - - box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=18) - box.set_halign(Gtk.Align.CENTER) - box.set_valign(Gtk.Align.CENTER) - box.set_hexpand(True) - box.add(self._account_label) - box.add(settings_button) - box.add(self._status_selector) + self._ui.account_box.add(self._status_selector) self._roster = Roster(account) - hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=12) - hbox.add(self._roster) - hbox.add(box) + self._ui.roster_box.add(self._roster) - self.add(hbox) + self._ui.connect_signals(self) self.show_all() + self.update() - def _on_settings(self, _button): + def _on_account_settings(self, _button): window = open_window('AccountsWindow') window.select_account(self._account) def update(self): account_label = app.settings.get_account_setting( self._account, 'account_label') - self._account_label.set_text(account_label) + self._ui.account_label.set_text(account_label) self._status_selector.update() def process_event(self, event): ===================================== gajim/gtk/chat_list.py ===================================== @@ -1,5 +1,6 @@ import logging +from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gtk @@ -14,7 +15,6 @@ from gajim.gui_menu_builder import get_chat_list_row_menu -from .tooltips import RosterTooltip from .util import get_builder log = logging.getLogger('gajim.gui.chatlist') @@ -32,7 +32,6 @@ def __init__(self, workspace_id): self.set_filter_func(self._filter_func) self.set_header_func(self._header_func) self.set_sort_func(self._sort_func) - self.set_has_tooltip(True) self._set_placeholder() self.connect('destroy', self._on_destroy) @@ -340,13 +339,21 @@ def is_pinned(self): def _on_button_press(self, _widget, event): if event.button == 3: # right click - self._popup_menu() + self._popup_menu(event) - def _popup_menu(self): + def _popup_menu(self, event): menu = get_chat_list_row_menu( self.workspace_id, self.account, self.jid, self._pinned) + + rectangle = Gdk.Rectangle() + rectangle.x = event.x + rectangle.y = event.y + rectangle.width = rectangle.height = 1 + popover = Gtk.Popover.new_from_model(self, menu) - popover.set_position(Gtk.PositionType.BOTTOM) + popover.set_relative_to(self) + popover.set_position(Gtk.PositionType.RIGHT) + popover.set_pointing_to(rectangle) popover.popup() def toggle_pinned(self): ===================================== gajim/gtk/roster.py ===================================== @@ -3,6 +3,7 @@ from typing import Optional from enum import IntEnum +from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gtk from gi.repository import GObject @@ -13,6 +14,8 @@ from gajim.common.const import StyleAttr from gajim.common.i18n import _ +from gajim.gui_menu_builder import get_roster_menu + from .util import EventHelper from .util import get_builder @@ -43,7 +46,8 @@ class Roster(Gtk.ScrolledWindow, EventHelper): def __init__(self, account): Gtk.ScrolledWindow.__init__(self) EventHelper.__init__(self) - self.set_size_request(300, -1) + self.set_size_request(200, -1) + self.set_vexpand(True) self.get_style_context().add_class('roster') self._account = account @@ -80,8 +84,8 @@ def _on_roster_row_activated(self, _treeview, path, _column): # This is a group row return - nick = self._store[iter_][Column.JID_OR_GROUP] - self.emit('row-activated', nick) + jid = self._store[iter_][Column.JID_OR_GROUP] + self.emit('row-activated', jid) def _on_roster_button_press_event(self, treeview, event): if event.button not in (2, 3): @@ -97,13 +101,13 @@ def _on_roster_button_press_event(self, treeview, event): # Group row return - nick = self._store[iter_][Column.JID_OR_GROUP] + jid = self._store[iter_][Column.JID_OR_GROUP] if event.button == 3: # right click - self._show_contact_menu(nick) + self._show_contact_menu(jid, treeview, event) if event.button == 2: # middle click - self.emit('row-activated', nick) + self.emit('row-activated', jid) @staticmethod def _on_focus_out(treeview, _param): @@ -112,15 +116,26 @@ def _on_focus_out(treeview, _param): def _on_theme_update(self, _event): self.redraw() - def _show_contact_menu(self, nick): - pass + def _show_contact_menu(self, jid, treeview, event): + menu = get_roster_menu(self._account, jid) + + rectangle = Gdk.Rectangle() + rectangle.x = event.x + rectangle.y = event.y + rectangle.width = rectangle.height = 1 + + popover = Gtk.Popover.new_from_model(self, menu) + popover.set_relative_to(treeview) + popover.set_position(Gtk.PositionType.RIGHT) + popover.set_pointing_to(rectangle) + popover.popup() def _on_destroy(self, _roster): self._contact_refs = {} self._group_refs = {} self._roster.set_model(None) self._roster = None - # Store keeps a ref on the object if we dont unset the sort func + # Store keeps a ref on the object if we don’t unset the sort func self._store.set_sort_func(Column.TEXT, print) self._store.clear() self._store = None @@ -188,13 +203,15 @@ def _add_contact(self, contact): # Avatar surface = contact.get_avatar(AvatarSize.CHAT, self.get_scale_factor()) + jid = str(contact.jid) + # TODO: Multiple groups per contact ? iter_ = self._store.append( - group_iter, (surface, contact.name, True, str(contact.jid))) - self._contact_refs[contact.jid] = Gtk.TreeRowReference( + group_iter, (surface, contact.name, True, jid)) + self._contact_refs[jid] = Gtk.TreeRowReference( self._store, self._store.get_path(iter_)) self.draw_groups() - self.draw_contact(contact.jid) + self.draw_contact(jid) if (group_path is not None and self._roster.get_model() is not None): @@ -224,14 +241,13 @@ def draw_contact(self, jid): if not iter_: return - client = app.get_client(self._account) - contact = client.get_module('Contacts').get_contact(jid) + contact = self._client.get_module('Contacts').get_contact(jid) self.draw_avatar(contact) self._store[iter_][Column.TEXT] = GLib.markup_escape_text(contact.name) def draw_avatar(self, contact): - iter_ = self._get_contact_iter(contact.jid) + iter_ = self._get_contact_iter(str(contact.jid)) if iter_ is None: return ===================================== gajim/gui_menu_builder.py ===================================== @@ -796,8 +796,25 @@ def get_conv_context_menu(account, uri): return menu +def get_roster_menu(account, jid): + menu_items = [ + ('show-contact-info', _('Contact Info')), + ] + menu = Gio.Menu() + for item in menu_items: + action, label = item + action = f'win.{action}' + menuitem = Gio.MenuItem.new(label, action) + variant_list = GLib.Variant( + 'as', [account, str(jid)]) + menuitem.set_action_and_target_value(action, variant_list) + menu.append_item(menuitem) + + return menu + + def get_chat_list_row_menu(workspace_id, account, jid, pinned): - toggle_label = _('Unpin Conversation') if pinned else _('Pin Conversation') + toggle_label = _('Unpin Chat') if pinned else _('Pin Chat') menu_items = [ ('toggle-chat-pinned', toggle_label), (_('Move Chat'), []), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/06f2b6288c9ce8bf9dc4d521ed4fcc0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/06f2b6288c9ce8bf9dc4d521ed4fcc0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Roster: Improvements
by Daniel Brötzmann 02 Mar '21

02 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 06f2b628 by wurstsalat at 2021-03-02T22:27:28+01:00 Roster: Improvements - - - - - 3 changed files: - gajim/data/gui/roster.ui - gajim/data/style/gajim.css - gajim/gtk/roster.py Changes: ===================================== gajim/data/gui/roster.ui ===================================== @@ -8,11 +8,9 @@ <column type="CairoGObjectSurface"/>  <column type="gchararray"/> -  - <column type="gboolean"/>  <column type="gboolean"/> -  +  <column type="gchararray"/> </columns> </object> @@ -42,7 +40,7 @@ <property name="xalign">0</property> </object> <attributes> - <attribute name="visible">3</attribute> + <attribute name="visible">2</attribute> <attribute name="surface">0</attribute> </attributes> </child> @@ -56,22 +54,6 @@ </child> </object> </child> - <child> - <object class="GtkTreeViewColumn" id="event_column"> - <property name="sizing">fixed</property> - <property name="fixed-width">35</property> - <property name="title">event</property> - <child> - <object class="GtkCellRendererPixbuf" id="icon"> - <property name="xalign">0</property> - <property name="icon-name">gajim-event</property> - </object> - <attributes> - <attribute name="visible">2</attribute> - </attributes> - </child> - </object> - </child> <child> <object class="GtkTreeViewColumn" id="expander"> <property name="visible">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -416,6 +416,9 @@ infobar.error > revealer > box { .start-chat-row:not(.activatable) label { color: @insensitive_fg_color; } .start-chat-row:focus { outline: none; } +/* Roster */ +.roster treeview { padding-left: 4px; } + /* GroupChatRoster */ .groupchat-roster { border-left: 1px solid; border-color: @borders; } ===================================== gajim/gtk/roster.py ===================================== @@ -1,3 +1,4 @@ +import locale import logging from typing import Optional from enum import IntEnum @@ -7,9 +8,12 @@ from gi.repository import GObject from gajim.common import app +from gajim.common import ged from gajim.common.const import AvatarSize +from gajim.common.const import StyleAttr from gajim.common.i18n import _ +from .util import EventHelper from .util import get_builder log = logging.getLogger('gajim.gui.roster') @@ -23,12 +27,11 @@ class Column(IntEnum): AVATAR = 0 TEXT = 1 - EVENT = 2 - IS_CONTACT = 3 - NICK_OR_GROUP = 4 + IS_CONTACT = 2 + JID_OR_GROUP = 3 -class Roster(Gtk.ScrolledWindow): +class Roster(Gtk.ScrolledWindow, EventHelper): __gsignals__ = { 'row-activated': ( @@ -39,11 +42,12 @@ class Roster(Gtk.ScrolledWindow): def __init__(self, account): Gtk.ScrolledWindow.__init__(self) + EventHelper.__init__(self) self.set_size_request(300, -1) + self.get_style_context().add_class('roster') self._account = account - - self._handler_ids = {} + self._client = app.get_client(account) self._ui = get_builder('roster.ui') self._ui.roster_treeview.set_model(None) @@ -55,12 +59,19 @@ def __init__(self, account): self._group_refs = {} self._store = self._ui.contact_store + self._store.set_sort_func(Column.TEXT, self._tree_compare_iters) self._roster = self._ui.roster_treeview + self._ui.contact_column.set_cell_data_func(self._ui.text_renderer, + self._text_cell_data_func) self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) + self.register_events([ + ('theme-update', ged.GUI2, self._on_theme_update), + ]) + self._initial_draw() def _on_roster_row_activated(self, _treeview, path, _column): @@ -69,7 +80,7 @@ def _on_roster_row_activated(self, _treeview, path, _column): # This is a group row return - nick = self._store[iter_][Column.NICK_OR_GROUP] + nick = self._store[iter_][Column.JID_OR_GROUP] self.emit('row-activated', nick) def _on_roster_button_press_event(self, treeview, event): @@ -86,7 +97,7 @@ def _on_roster_button_press_event(self, treeview, event): # Group row return - nick = self._store[iter_][Column.NICK_OR_GROUP] + nick = self._store[iter_][Column.JID_OR_GROUP] if event.button == 3: # right click self._show_contact_menu(nick) @@ -98,27 +109,44 @@ def _on_roster_button_press_event(self, treeview, event): def _on_focus_out(treeview, _param): treeview.get_selection().unselect_all() + def _on_theme_update(self, _event): + self.redraw() + def _show_contact_menu(self, nick): pass def _on_destroy(self, _roster): - for id_ in list(self._handler_ids.keys()): - if self._handler_ids[id_].handler_is_connected(id_): - self._handler_ids[id_].disconnect(id_) - del self._handler_ids[id_] - self._contact_refs = {} self._group_refs = {} self._roster.set_model(None) self._roster = None + # Store keeps a ref on the object if we dont unset the sort func + self._store.set_sort_func(Column.TEXT, print) self._store.clear() self._store = None # self._tooltip.destroy() # self._tooltip = None + app.check_finalize(self) def set_model(self): self._roster.set_model(self._store) + def redraw(self): + self._roster.set_model(None) + self._roster.set_model(self._store) + self._roster.expand_all() + + def enable_sort(self, enable): + column = Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID + if enable: + column = Column.TEXT + + self._store.set_sort_column_id(column, Gtk.SortType.ASCENDING) + + def invalidate_sort(self): + self.enable_sort(False) + self.enable_sort(True) + def _initial_draw(self): client = app.get_client(self._account) for contact in client.get_module('Roster').iter_contacts(): @@ -126,6 +154,7 @@ def _initial_draw(self): contact.connect('avatar-update', self._on_avatar_update) self._add_contact(contact) + self.enable_sort(True) self.set_model() self._roster.expand_all() @@ -143,7 +172,7 @@ def _add_contact(self, contact): group_iter = self._get_group_iter(group_name) if not group_iter: group_iter = self._store.append( - None, (None, group_name, None, False, group_name)) + None, (None, group_name, False, group_name)) group_path = self._store.get_path(group_iter) group_ref = Gtk.TreeRowReference(self._store, group_path) self._group_refs[group_name] = group_ref @@ -151,7 +180,7 @@ def _add_contact(self, contact): group_iter = self._get_group_iter(main_group) if not group_iter: group_iter = self._store.append( - None, (None, main_group, None, False, main_group)) + None, (None, main_group, False, main_group)) group_path = self._store.get_path(group_iter) group_ref = Gtk.TreeRowReference(self._store, group_path) self._group_refs[main_group] = group_ref @@ -160,7 +189,7 @@ def _add_contact(self, contact): surface = contact.get_avatar(AvatarSize.CHAT, self.get_scale_factor()) iter_ = self._store.append( - group_iter, (surface, contact.name, None, True, contact.name)) + group_iter, (surface, contact.name, True, str(contact.jid))) self._contact_refs[contact.jid] = Gtk.TreeRowReference( self._store, self._store.get_path(iter_)) @@ -175,12 +204,16 @@ def draw_groups(self): for group in self._group_refs: self.draw_group(group) - def draw_group(self, group): - group_iter = self._get_group_iter(group) + def draw_group(self, group_name): + group_iter = self._get_group_iter(group_name) if not group_iter: return - self._store[group_iter][Column.TEXT] = group + total_users = self._get_total_user_count() + group_users = self._store.iter_n_children(group_iter) + group_name += f' ({group_users}/{total_users})' + + self._store[group_iter][Column.TEXT] = group_name def draw_contacts(self): for jid in self._contact_refs: @@ -206,6 +239,12 @@ def draw_avatar(self, contact): AvatarSize.ROSTER, self.get_scale_factor()) self._store[iter_][Column.AVATAR] = surface + def _get_total_user_count(self): + count = 0 + for group_row in self._store: + count += self._store.iter_n_children(group_row.iter) + return count + def _get_group_iter(self, group_name: str) -> Optional[Gtk.TreeIter]: try: ref = self._group_refs[group_name] @@ -229,6 +268,54 @@ def _get_contact_iter(self, jid: str) -> Optional[Gtk.TreeIter]: return self._store.get_iter(path) + @staticmethod + def _text_cell_data_func(_column, renderer, model, iter_, _user_data): + has_parent = bool(model.iter_parent(iter_)) + style = 'contact' if has_parent else 'group' + + bgcolor = app.css_config.get_value('.gajim-%s-row' % style, + StyleAttr.BACKGROUND) + renderer.set_property('cell-background', bgcolor) + + color = app.css_config.get_value('.gajim-%s-row' % style, + StyleAttr.COLOR) + renderer.set_property('foreground', color) + + desc = app.css_config.get_font('.gajim-%s-row' % style) + renderer.set_property('font-desc', desc) + + if not has_parent: + renderer.set_property('weight', 600) + renderer.set_property('ypad', 6) + + def _tree_compare_iters(self, model, iter1, iter2, _user_data): + """ + Compare two iterators to sort them + """ + + is_contact = model.iter_parent(iter1) + if is_contact: + name1 = model[iter1][Column.TEXT] + name2 = model[iter2][Column.TEXT] + + if not app.settings.get('sort_by_show_in_roster'): + return locale.strcoll(name1.lower(), name2.lower()) + + contact1 = self._client.get_module('Contacts').get_contact( + model[iter1][Column.JID_OR_GROUP]) + contact2 = self._client.get_module('Contacts').get_contact( + model[iter2][Column.JID_OR_GROUP]) + + if contact1.show != contact2.show: + return -1 if contact1.show > contact2.show else 1 + + return locale.strcoll(name1.lower(), name2.lower()) + + # Group + group1 = model[iter1][Column.JID_OR_GROUP] + group2 = model[iter2][Column.JID_OR_GROUP] + return -1 if group1 < group2 else 1 + def clear(self): self._contact_refs = {} self._group_refs = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/06f2b6288c9ce8bf9dc4d521ed4fcc0c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/06f2b6288c9ce8bf9dc4d521ed4fcc0c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Workspaces: Fix menu, store moved chats
by Daniel Brötzmann 02 Mar '21

02 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: ec1afbee by wurstsalat at 2021-03-02T20:47:43+01:00 Workspaces: Fix menu, store moved chats - - - - - 0fb26922 by wurstsalat at 2021-03-02T20:56:00+01:00 AccountPage: Add basic roster - - - - - 5 changed files: - + gajim/data/gui/roster.ui - gajim/gtk/account_page.py - gajim/gtk/main.py - + gajim/gtk/roster.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/data/gui/roster.ui ===================================== @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkTreeStore" id="contact_store"> + <columns> +  + <column type="CairoGObjectSurface"/> +  + <column type="gchararray"/> +  + <column type="gboolean"/> +  + <column type="gboolean"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkTreeView" id="roster_treeview"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="model">contact_store</property> + <property name="headers-visible">False</property> + <property name="expander-column">expander</property> + <property name="search-column">1</property> + <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/> + <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/> + <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="contact_column"> + <property name="sizing">fixed</property> + <property name="fixed-width">210</property> + <property name="title">avatar</property> + <property name="expand">True</property> + <child> + <object class="GtkCellRendererPixbuf" id="avatar_renderer"> + <property name="width">40</property> + <property name="ypad">3</property> + <property name="xalign">0</property> + </object> + <attributes> + <attribute name="visible">3</attribute> + <attribute name="surface">0</attribute> + </attributes> + </child> + <child> + <object class="GtkCellRendererText" id="text_renderer"> + <property name="ellipsize">end</property> + </object> + <attributes> + <attribute name="markup">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="event_column"> + <property name="sizing">fixed</property> + <property name="fixed-width">35</property> + <property name="title">event</property> + <child> + <object class="GtkCellRendererPixbuf" id="icon"> + <property name="xalign">0</property> + <property name="icon-name">gajim-event</property> + </object> + <attributes> + <attribute name="visible">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="expander"> + <property name="visible">False</property> + <property name="sizing">fixed</property> + <property name="title">expander</property> + </object> + </child> + </object> +</interface> ===================================== gajim/gtk/account_page.py ===================================== @@ -17,6 +17,7 @@ from gajim.common import app from gajim.common.i18n import _ +from .roster import Roster from .status_selector import StatusSelector from .util import open_window @@ -46,7 +47,12 @@ def __init__(self, account): box.add(settings_button) box.add(self._status_selector) - self.add(box) + self._roster = Roster(account) + hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=12) + hbox.add(self._roster) + hbox.add(box) + + self.add(hbox) self.show_all() self.update() @@ -59,3 +65,6 @@ def update(self): self._account, 'account_label') self._account_label.set_text(account_label) self._status_selector.update() + + def process_event(self, event): + self._roster.process_event(event) ===================================== gajim/gtk/main.py ===================================== @@ -54,20 +54,22 @@ def __init__(self): self.add(self._ui.main_grid) + surface = load_icon('org.gajim.Gajim', self, 40) + self._ui.app_image.set_from_surface(surface) + self._chat_stack = ChatStack() + self._ui.right_grid.add(self._chat_stack) + self._chat_list_stack = ChatListStack(self, self._ui, self._chat_stack) self._ui.chat_list_scrolled.add(self._chat_list_stack) - self._account_side_bar = AccountSideBar() self._workspace_side_bar = WorkspaceSideBar(self._chat_list_stack) - - surface = load_icon('org.gajim.Gajim', self, 40) - self._ui.app_image.set_from_surface(surface) self._ui.workspace_scrolled.add(self._workspace_side_bar) + self._account_side_bar = AccountSideBar() self._ui.account_box.add(self._account_side_bar) - self._ui.right_grid.add(self._chat_stack) + self._account_pages = {} workspace_menu = Gio.Menu() for action, label in WORKSPACE_MENU_DICT.items(): @@ -419,6 +421,8 @@ def move_chat_to_workspace(self, new_workspace_id, account, jid): current_chatlist.remove_chat(account, jid) new_chatlist = self._chat_list_stack.get_chatlist(new_workspace_id) new_chatlist.add_chat(account, jid, type_) + self._chat_list_stack.store_open_chats(current_chatlist.workspace_id) + self._chat_list_stack.store_open_chats(new_workspace_id) def _remove_chat(self, _action, param): workspace_id, account, jid = param.unpack() @@ -445,8 +449,9 @@ def get_active_control(self): def _add_accounts(self): for account in list(app.connections.keys()): - self._ui.main_stack.add_named( - AccountPage(account), account) + account_page = AccountPage(account) + self._account_pages[account] = account_page + self._ui.main_stack.add_named(account_page, account) def get_controls(self, account=None): return self._chat_stack.get_controls(account) @@ -484,6 +489,9 @@ def _on_event(self, event): if event.name == 'update-roster-avatar': return + for page in self._account_pages.values(): + page.process_event(event) + if not self.chat_exists(event.account, event.jid): if event.name == 'message-received': if event.properties.is_muc_pm: ===================================== gajim/gtk/roster.py ===================================== @@ -0,0 +1,247 @@ +import logging +from typing import Optional +from enum import IntEnum + +from gi.repository import GLib +from gi.repository import Gtk +from gi.repository import GObject + +from gajim.common import app +from gajim.common.const import AvatarSize +from gajim.common.i18n import _ + +from .util import get_builder + +log = logging.getLogger('gajim.gui.roster') + + +HANDLED_EVENTS = [ + 'presence-received', +] + + +class Column(IntEnum): + AVATAR = 0 + TEXT = 1 + EVENT = 2 + IS_CONTACT = 3 + NICK_OR_GROUP = 4 + + +class Roster(Gtk.ScrolledWindow): + + __gsignals__ = { + 'row-activated': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, # return value + (str, )) # arguments + } + + def __init__(self, account): + Gtk.ScrolledWindow.__init__(self) + self.set_size_request(300, -1) + + self._account = account + + self._handler_ids = {} + + self._ui = get_builder('roster.ui') + self._ui.roster_treeview.set_model(None) + self.add(self._ui.roster_treeview) + + # Holds the Gtk.TreeRowReference for each contact + self._contact_refs = {} + # Holds the Gtk.TreeRowReference for each group + self._group_refs = {} + + self._store = self._ui.contact_store + + self._roster = self._ui.roster_treeview + + self.connect('destroy', self._on_destroy) + self._ui.connect_signals(self) + + self._initial_draw() + + def _on_roster_row_activated(self, _treeview, path, _column): + iter_ = self._store.get_iter(path) + if self._store.iter_parent(iter_) is None: + # This is a group row + return + + nick = self._store[iter_][Column.NICK_OR_GROUP] + self.emit('row-activated', nick) + + def _on_roster_button_press_event(self, treeview, event): + if event.button not in (2, 3): + return + + pos = treeview.get_path_at_pos(int(event.x), int(event.y)) + if pos is None: + return + + path, _, _, _ = pos + iter_ = self._store.get_iter(path) + if self._store.iter_parent(iter_) is None: + # Group row + return + + nick = self._store[iter_][Column.NICK_OR_GROUP] + + if event.button == 3: # right click + self._show_contact_menu(nick) + + if event.button == 2: # middle click + self.emit('row-activated', nick) + + @staticmethod + def _on_focus_out(treeview, _param): + treeview.get_selection().unselect_all() + + def _show_contact_menu(self, nick): + pass + + def _on_destroy(self, _roster): + for id_ in list(self._handler_ids.keys()): + if self._handler_ids[id_].handler_is_connected(id_): + self._handler_ids[id_].disconnect(id_) + del self._handler_ids[id_] + + self._contact_refs = {} + self._group_refs = {} + self._roster.set_model(None) + self._roster = None + self._store.clear() + self._store = None + # self._tooltip.destroy() + # self._tooltip = None + + def set_model(self): + self._roster.set_model(self._store) + + def _initial_draw(self): + client = app.get_client(self._account) + for contact in client.get_module('Roster').iter_contacts(): + contact.connect('presence-update', self._on_presence_update) + contact.connect('avatar-update', self._on_avatar_update) + self._add_contact(contact) + + self.set_model() + self._roster.expand_all() + + def _on_presence_update(self, contact, _signal_name): + self.draw_avatar(contact) + + def _on_avatar_update(self, contact, _signal_name): + self.draw_avatar(contact) + + def _add_contact(self, contact): + main_group = _('Contacts') + + if contact.groups: + for group_name in contact.groups: + group_iter = self._get_group_iter(group_name) + if not group_iter: + group_iter = self._store.append( + None, (None, group_name, None, False, group_name)) + group_path = self._store.get_path(group_iter) + group_ref = Gtk.TreeRowReference(self._store, group_path) + self._group_refs[group_name] = group_ref + else: + group_iter = self._get_group_iter(main_group) + if not group_iter: + group_iter = self._store.append( + None, (None, main_group, None, False, main_group)) + group_path = self._store.get_path(group_iter) + group_ref = Gtk.TreeRowReference(self._store, group_path) + self._group_refs[main_group] = group_ref + + # Avatar + surface = contact.get_avatar(AvatarSize.CHAT, self.get_scale_factor()) + + iter_ = self._store.append( + group_iter, (surface, contact.name, None, True, contact.name)) + self._contact_refs[contact.jid] = Gtk.TreeRowReference( + self._store, self._store.get_path(iter_)) + + self.draw_groups() + self.draw_contact(contact.jid) + + if (group_path is not None and + self._roster.get_model() is not None): + self._roster.expand_row(group_path, False) + + def draw_groups(self): + for group in self._group_refs: + self.draw_group(group) + + def draw_group(self, group): + group_iter = self._get_group_iter(group) + if not group_iter: + return + + self._store[group_iter][Column.TEXT] = group + + def draw_contacts(self): + for jid in self._contact_refs: + self.draw_contact(jid) + + def draw_contact(self, jid): + iter_ = self._get_contact_iter(jid) + if not iter_: + return + + client = app.get_client(self._account) + contact = client.get_module('Contacts').get_contact(jid) + + self.draw_avatar(contact) + self._store[iter_][Column.TEXT] = GLib.markup_escape_text(contact.name) + + def draw_avatar(self, contact): + iter_ = self._get_contact_iter(contact.jid) + if iter_ is None: + return + + surface = contact.get_avatar( + AvatarSize.ROSTER, self.get_scale_factor()) + self._store[iter_][Column.AVATAR] = surface + + def _get_group_iter(self, group_name: str) -> Optional[Gtk.TreeIter]: + try: + ref = self._group_refs[group_name] + except KeyError: + return None + + path = ref.get_path() + if path is None: + return None + return self._store.get_iter(path) + + def _get_contact_iter(self, jid: str) -> Optional[Gtk.TreeIter]: + try: + ref = self._contact_refs[jid] + except KeyError: + return None + + path = ref.get_path() + if path is None: + return None + + return self._store.get_iter(path) + + def clear(self): + self._contact_refs = {} + self._group_refs = {} + self._store.clear() + + def _on_presence_received(self, event): + pass + + def process_event(self, event): + if event.name not in HANDLED_EVENTS: + return + + if event.name == 'presence-received': + self._on_presence_received(event) + else: + log.warning('Unhandled Event: %s', event.name) ===================================== gajim/gui_menu_builder.py ===================================== @@ -809,12 +809,13 @@ def get_chat_list_row_menu(workspace_id, account, jid, pinned): action, label = item action = f'win.{action}' menuitem = Gio.MenuItem.new(label, action) - variant_list = GLib.Variant('as', [workspace_id, account, jid]) + variant_list = GLib.Variant( + 'as', [workspace_id, account, str(jid)]) menuitem.set_action_and_target_value(action, variant_list) menu.append_item(menuitem) else: # This is a submenu - submenu = build_workspaces_submenu(workspace_id, account, jid) + submenu = build_workspaces_submenu(workspace_id, account, str(jid)) menu.append_submenu(item[0], submenu) return menu View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d48d1772464ba6a1bea791bd0d8903a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d48d1772464ba6a1bea791bd0d8903a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Groupchat: Restore got_disconnected()
by Philipp Hörist 02 Mar '21

02 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: d48d1772 by lovetox at 2021-03-02T20:28:51+01:00 Groupchat: Restore got_disconnected() - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -992,6 +992,20 @@ def is_connected(self) -> bool: def is_connected(self, value: bool) -> None: app.gc_connected[self.account][self.room_jid] = value + def got_disconnected(self): + self.xml.formattings_button.set_sensitive(False) + + self.roster.enable_sort(False) + self.roster.clear() + + self.is_connected = False + ChatControlBase.got_disconnected(self) + + con = app.connections[self.account] + con.get_module('Chatstate').remove_delay_timeout(self.contact) + + self.update_actions() + def leave(self, reason=None): self.got_disconnected() self._close_control(reason=reason) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d48d1772464ba6a1bea791bd0d8903a8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d48d1772464ba6a1bea791bd0d8903a8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Refactor Avatar clipping
by Philipp Hörist 02 Mar '21

02 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 002da9f8 by lovetox at 2021-03-02T18:09:21+01:00 Refactor Avatar clipping - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -86,10 +86,7 @@ def generate_avatar(letters, color, size, scale): def generate_default_avatar(letter, color_string, size, scale, style='circle'): color = text_to_color(color_string) surface = generate_avatar(letter, color, size, scale) - if style == 'circle': - surface = clip_circle(surface) - elif style == 'round-corners': - surface = round_corners(surface) + surface = clip(surface, style) surface.set_device_scale(scale, scale) return surface @@ -97,10 +94,7 @@ def generate_default_avatar(letter, color_string, size, scale, style='circle'): @lru_cache(maxsize=None) def make_workspace_avatar(letter, color, size, scale, style='round-corners'): surface = generate_avatar(letter, color, size, scale) - if style == 'circle': - surface = clip_circle(surface) - elif style == 'round-corners': - surface = round_corners(surface) + surface = clip(surface, style) surface.set_device_scale(scale, scale) return surface @@ -178,6 +172,14 @@ def square(surface, size): return context.get_target() +def clip(surface, mode): + if mode == 'circle': + return clip_circle(surface) + if mode == 'round-corners': + return round_corners(surface) + raise ValueError('clip mode unknown: %s' % mode) + + def clip_circle(surface): new_surface = cairo.ImageSurface(cairo.Format.ARGB32, surface.get_width(), @@ -228,23 +230,6 @@ def round_corners(surface): return context.get_target() -def get_avatar_from_pixbuf(pixbuf, scale, show=None): - size = max(pixbuf.get_width(), pixbuf.get_height()) - size *= scale - surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) - if surface is None: - return None - surface = square(surface, size) - if surface is None: - return None - surface = clip_circle(surface) - if surface is None: - return None - if show is not None: - return add_status_to_avatar(surface, show) - return surface - - class AvatarStorage(metaclass=Singleton): def __init__(self): self._cache = defaultdict(dict) @@ -276,7 +261,7 @@ def get_surface(self, if surface is not None: return surface - surface = self._get_avatar_from_storage(contact, size, scale) + surface = self._get_avatar_from_storage(contact, size, scale, style) if surface is not None: if show is not None: surface = add_status_to_avatar(surface, show) @@ -294,7 +279,13 @@ def get_surface(self, self._cache[jid][(size, scale, show)] = surface return surface - def get_muc_surface(self, account, jid, size, scale, default=False): + def get_muc_surface(self, + account, + jid, + size, + scale, + default=False, + style='circle'): if not default: surface = self._cache[jid].get((size, scale)) if surface is not None: @@ -305,14 +296,14 @@ def get_muc_surface(self, account, jid, size, scale, default=False): surface = self.surface_from_filename(avatar_sha, size, scale) if surface is None: return None - surface = clip_circle(surface) + surface = clip(surface, style) self._cache[jid][(size, scale)] = surface return surface con = app.connections[account] name = get_groupchat_name(con, jid) letter = self._generate_letter(name) - surface = generate_default_avatar(letter, str(jid), size, scale) + surface = generate_default_avatar(letter, str(jid), size, scale, style) self._cache[jid][(size, scale)] = surface return surface @@ -414,7 +405,7 @@ def _load_surface_from_storage(self, filename, size, scale): surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) return square(surface, size) - def _get_avatar_from_storage(self, contact, size, scale): + def _get_avatar_from_storage(self, contact, size, scale, style): avatar_sha = contact.avatar_sha if avatar_sha is None: return None @@ -422,7 +413,7 @@ def _get_avatar_from_storage(self, contact, size, scale): surface = self._load_surface_from_storage(avatar_sha, size, scale) if surface is None: return None - return clip_circle(surface) + return clip(surface, style) @staticmethod def _generate_letter(name): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/002da9f8ad47954300977b908a4bd6c4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/002da9f8ad47954300977b908a4bd6c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Profile: Fix missing client
by Daniel Brötzmann 02 Mar '21

02 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: d6643951 by Daniel Brötzmann at 2021-03-02T08:54:18+01:00 Profile: Fix missing client - - - - - 1 changed file: - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -223,6 +223,7 @@ def _on_save_clicked(self, _widget): vcard = self._vcard_grid.get_vcard() self._current_vcard = vcard.copy() + client = app.get_client(self.account) client.get_module('VCard4').set_vcard( self._current_vcard, public=self._ui.vcard_access.get_active(), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d6643951be747463ab03bcd6720eb1d2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d6643951be747463ab03bcd6720eb1d2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix status selector
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: c2accf28 by lovetox at 2021-03-01T23:46:17+01:00 Fix status selector - - - - - 4 changed files: - gajim/common/client.py - gajim/gtk/account_side_bar.py - gajim/gtk/status_selector.py - gajim/gui_interface.py Changes: ===================================== gajim/common/client.py ===================================== @@ -28,6 +28,7 @@ from gajim.common import helpers from gajim.common import modules from gajim.common.const import ClientState +from gajim.common.structs import UNKNOWN_PRESENCE from gajim.common.helpers import get_custom_host from gajim.common.helpers import get_user_proxy from gajim.common.helpers import warn_about_plain_connection @@ -294,6 +295,9 @@ def _after_disconnect(self): self._destroy_client = False self._create_client() + jid = self.get_own_jid() + contact = self.get_module('Contacts').get_contact(jid) + contact.update_presence(UNKNOWN_PRESENCE) app.nec.push_incoming_event(NetworkEvent('account-disconnected', account=self._account)) ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -83,9 +83,13 @@ def __init__(self, account): client = app.get_client(self._account) self._contact = client.get_module('Contacts').get_contact(jid) self._contact.connect('avatar-update', self._on_avatar_update) + self._contact.connect('presence-update', self._on_presence_update) self._update_image() + def _on_presence_update(self, _contact, _signal_name): + self._update_image() + def _on_avatar_update(self, _contact, _signal_name): self._update_image() ===================================== gajim/gtk/status_selector.py ===================================== @@ -16,6 +16,7 @@ from gi.repository import Pango from gajim.common import app +from gajim.common import ged from gajim.common.helpers import get_uf_show from gajim.common.helpers import get_global_show from gajim.common.helpers import statuses_unified @@ -30,7 +31,6 @@ def __init__(self, compact=False): self.set_direction(Gtk.ArrowType.UP) self._compact = compact self._create_popover() - self.set_no_show_all(True) self._current_show_icon = Gtk.Image() self._current_show_icon.set_from_icon_name( @@ -47,6 +47,8 @@ def __init__(self, compact=False): box.show_all() self.add(box) + app.ged.register_event_handler('our-show', ged.POSTGUI, self.update) + def _create_popover(self): popover_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) popover_box.get_style_context().add_class('margin-3') @@ -106,13 +108,14 @@ def _on_change_status(self, button): if new_status == 'change_status_message': new_status = None app.interface.change_status(status=new_status) + self.update() - def update(self): - if not app.connections: - self.hide() - return + def update(self, *args, **kwargs): + # if not app.connections: + # self.hide() + # return - self.show() + # self.show() show = get_global_show() uf_show = get_uf_show(show) self._current_show_icon.set_from_icon_name( ===================================== gajim/gui_interface.py ===================================== @@ -1653,11 +1653,8 @@ def autoconnect(self): status_message = helpers.from_one_line(status_message) app.connections[account].change_status(status, status_message) - # self.roster.send_status(account, status, status_message) - - def change_status(self, status=None): - # status=None means we want to change the message only + def change_status(self, status): ask = ask_for_status_message(status) if status is None: @@ -1672,12 +1669,9 @@ def change_status(self, status=None): 'sync_with_global_status'): continue - message = app.get_client(account).status_message - self.roster.send_status(account, status, message) - - def change_account_status(self, account, status=None): - # status=None means we want to change the message only + self._change_status(account, status) + def change_account_status(self, account, status): ask = ask_for_status_message(status) client = app.get_client(account) @@ -1688,8 +1682,26 @@ def change_account_status(self, account, status=None): open_window('StatusChange', status=status, account=account) return + self._change_status(account, status) + + @staticmethod + def _change_status(account, status): + client = app.get_client(account) message = client.status_message - self.roster.send_status(account, status, message) + if status != 'offline': + app.settings.set_account_setting(account, 'last_status', status) + app.settings.set_account_setting( + account, + 'last_status_msg', + helpers.to_one_line(message)) + # TODO update systray icon + + if status == 'offline': + # TODO delete pep + # self.delete_pep(app.get_jid_from_account(account), account) + pass + + client.change_status(status, message) def show_systray(self): if not app.is_display(Display.WAYLAND): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c2accf288b308b018bc4f32601b24744… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c2accf288b308b018bc4f32601b24744… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Remove unused events and methods
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: ba5d7ead by lovetox at 2021-03-01T22:36:54+01:00 Remove unused events and methods - - - - - 3 changed files: - gajim/chat_control.py - gajim/gtk/main.py - gajim/gui_interface.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -619,12 +619,6 @@ def _on_receipt_received(self, event): def _on_displayed_received(self, event): self.conv_textview.show_displayed(event.marker_id) - def _on_zeroconf_error(self, event): - self.add_status_message(event.message) - - def _on_update_roster_avatar(self, _event): - self._update_avatar() - def _nec_ping(self, event): if self.contact != event.contact: return ===================================== gajim/gtk/main.py ===================================== @@ -84,10 +84,6 @@ def __init__(self): self.register_events([ ('presence-received', ged.GUI1, self._on_event), - ('mood-received', ged.GUI1, self._on_event), - ('activity-received', ged.GUI1, self._on_event), - ('tune-received', ged.GUI1, self._on_event), - ('location-received', ged.GUI1, self._on_event), ('caps-update', ged.GUI1, self._on_event), ('message-sent', ged.OUT_POSTCORE, self._on_event), ('message-received', ged.CORE, self._on_event), @@ -96,31 +92,10 @@ def __init__(self): ('receipt-received', ged.GUI1, self._on_event), ('displayed-received', ged.GUI1, self._on_event), ('message-error', ged.GUI1, self._on_event), - ('update-roster-avatar', ged.GUI1, self._on_event), - ('update-room-avatar', ged.GUI1, self._on_event), - ('update-gc-avatar', ged.GUI1, self._on_event), ('muc-creation-failed', ged.GUI1, self._on_event), - ('muc-joined', ged.GUI1, self._on_event), - ('muc-join-failed', ged.GUI1, self._on_event), - ('muc-user-joined', ged.GUI1, self._on_event), - ('muc-user-left', ged.GUI1, self._on_event), - ('muc-nickname-changed', ged.GUI1, self._on_event), ('muc-self-presence', ged.GUI1, self._on_event), - ('muc-self-kicked', ged.GUI1, self._on_event), - ('muc-user-affiliation-changed', ged.GUI1, self._on_event), - ('muc-user-status-show-changed', ged.GUI1, self._on_event), - ('muc-user-role-changed', ged.GUI1, self._on_event), - ('muc-destroyed', ged.GUI1, self._on_event), - ('muc-presence-error', ged.GUI1, self._on_event), - ('muc-password-required', ged.GUI1, self._on_event), - ('muc-config-changed', ged.GUI1, self._on_event), - ('muc-subject', ged.GUI1, self._on_event), - ('muc-captcha-challenge', ged.GUI1, self._on_event), - ('muc-captcha-error', ged.GUI1, self._on_event), ('muc-voice-request', ged.GUI1, self._on_event), ('muc-disco-update', ged.GUI1, self._on_event), - ('muc-configuration-finished', ged.GUI1, self._on_event), - ('muc-configuration-failed', ged.GUI1, self._on_event), ('our-show', ged.GUI1, self._on_our_show), ('signed-in', ged.GUI1, self._on_signed_in), ]) ===================================== gajim/gui_interface.py ===================================== @@ -1732,21 +1732,6 @@ def process_connections(self): def save_config(): app.settings.save() - def update_avatar(self, account=None, jid=None, - contact=None, room_avatar=False): - self.avatar_storage.invalidate_cache(jid or contact.get_full_jid()) - if room_avatar: - app.nec.push_incoming_event( - NetworkEvent('update-room-avatar', account=account, jid=jid)) - elif contact is None: - app.nec.push_incoming_event( - NetworkEvent('update-roster-avatar', account=account, jid=jid)) - else: - app.nec.push_incoming_event(NetworkEvent('update-gc-avatar', - account=account, - contact=contact, - jid=contact.room_jid)) - def save_avatar(self, data): return self.avatar_storage.save_avatar(data) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ba5d7ead8c9f42779b188ca55fa65e58… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ba5d7ead8c9f42779b188ca55fa65e58… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Remove unused imports
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 793ec22a by lovetox at 2021-03-01T22:31:39+01:00 Remove unused imports - - - - - 1 changed file: - gajim/privatechat_control.py Changes: ===================================== gajim/privatechat_control.py ===================================== @@ -26,10 +26,7 @@ from gajim.common import app from gajim.common import helpers -from gajim.common import ged from gajim.common.i18n import _ -from gajim.common.const import AvatarSize -from gajim.common.helpers import event_filter from gajim.chat_control import ChatControl from gajim.command_system.implementation.hosts import PrivateChatCommands View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/793ec22a72b3d127185f3d4d93d323ed… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/793ec22a72b3d127185f3d4d93d323ed… 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