Commits April 2021

commits@gajim.org

1 participants
60 discussions

[Git][gajim/gajim][mainwindow] Add MUCJoinLeft Row
by Philipp Hörist 29 Apr '21

29 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 6b7de0c9 by lovetox at 2021-04-29T13:34:05+02:00 Add MUCJoinLeft Row - - - - - 4 changed files: - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/rows/info.py - + gajim/gtk/conversation/rows/muc_join_left.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -911,10 +911,8 @@ def rejoin(self): def _on_user_joined(self, _contact, _signal_name, user_contact, properties): nick = user_contact.name if not properties.is_muc_self_presence: - - if (self.contact.is_joined and - self.contact.settings.get('print_join_left')): - self.add_info_message(_('%s has joined the group chat') % nick) + if self.contact.is_joined: + self.conversation_view.add_muc_user_joined(nick) return status_codes = properties.muc_status_codes or [] @@ -968,7 +966,6 @@ def _on_user_nickname_changed(self, _contact, _signal_name, user_contact, proper # tv.last_received_message_id[nick] # del tv.last_received_message_id[nick] - def _on_user_status_show_changed(self, _contact, _signal_name, @@ -1119,15 +1116,10 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties): #Group Chat: We have been removed from the room message = _('{nick} has been removed from the group chat{by}{reason}') - print_join_left = self.contact.settings.get('print_join_left') - if StatusCode.REMOVED_ERROR in status_codes: # Handle 333 before 307, some MUCs add both - if print_join_left: - #Group Chat: User was kicked because of an server error: reason - message = _('{nick} has left due to ' - 'an error{reason}').format(nick=nick, reason=reason) - self.add_info_message(message) + self.conversation_view.add_muc_user_left( + nick, properties.muc_user.reason, error=True) elif StatusCode.REMOVED_KICKED in status_codes: #Group Chat: User was kicked by Alice: reason @@ -1155,10 +1147,9 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties): message = message.format(nick=nick, by=actor, reason=reason) self.add_info_message(message) - elif print_join_left: - message = _('{nick} has left{reason}').format(nick=nick, - reason=reason) - self.add_info_message(message) + else: + self.conversation_view.add_muc_user_left( + nick, properties.muc_user.reason) def _on_room_joined(self, _contact, _signal_name): self._show_page('groupchat') ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -33,7 +33,6 @@ def __init__(self, account, text): timestamp = time.time() self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp - self.kind = 'info' text = GLib.markup_escape_text(text) ===================================== gajim/gtk/conversation/rows/muc_join_left.py ===================================== @@ -0,0 +1,75 @@ +# 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 time +from datetime import datetime + +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common.i18n import _ +from gajim.common.const import AvatarSize + +from .base import BaseRow + + +class MUCJoinLeft(BaseRow): + def __init__(self, type_, account, nick, reason=None, error=False): + BaseRow.__init__(self, account) + + self.type = type_ + timestamp = time.time() + self.timestamp = datetime.fromtimestamp(timestamp) + self.db_timestamp = timestamp + + self._label = Gtk.Label() + self._label.set_selectable(True) + self._label.set_line_wrap(True) + self._label.set_xalign(0) + self._label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) + + if type_ == 'muc-user-joined': + text = self._make_join_message(nick) + else: + text = self._make_left_message(nick, reason, error) + + self._label.set_text(text) + + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 2) + timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 2, 0, 1, 1) + + self.grid.attach(self._label, 1, 0, 1, 1) + self.show_all() + + @staticmethod + def _make_left_message(nick, reason, error): + reason = '' if reason is None else ': {reason}'.format(reason=reason) + + if error: + #Group Chat: User was kicked because of an server error: reason + message = _('{nick} has left due to ' + 'an error{reason}').format(nick=nick, reason=reason) + + else: + message = _('{nick} has left{reason}').format(nick=nick, + reason=reason) + return message + + @staticmethod + def _make_join_message(nick): + return _('%s has joined the group chat') % nick ===================================== gajim/gtk/conversation/view.py ===================================== @@ -33,6 +33,7 @@ from .conversation.rows.info import InfoMessage from .conversation.rows.date import DateRow from .conversation.rows.muc_subject import MUCSubject +from .conversation.rows.muc_join_left import MUCJoinLeft log = logging.getLogger('gajim.gui.conversation_view') @@ -52,6 +53,7 @@ def __init__(self, account, contact, history_mode=False): Gtk.ListBox.__init__(self) self.set_selection_mode(Gtk.SelectionMode.NONE) self.set_sort_func(self._sort_func) + self.set_filter_func(self._filter_func) self._account = account self._client = None if account is not None: @@ -73,6 +75,11 @@ def __init__(self, account, contact, history_mode=False): # message_id -> row mapping self._message_id_row_map = {} + app.settings.connect_signal('print_join_left', + self._on_contact_setting_changed, + account=self._account, + jid=self._contact.jid) + if self._contact is not None: self._read_marker_row = ReadMarkerRow(self._account, self._contact) self.add(self._read_marker_row) @@ -106,10 +113,29 @@ def _sort_func(self, row1, row2): return 0 return -1 if row1.timestamp < row2.timestamp else 1 + def _filter_func(self, row): + if row.type in ('muc-user-joined', 'muc-user-left'): + return self._contact.settings.get('print_join_left') + return True + def add_muc_subject(self, text, nick, date): subject = MUCSubject(self._account, text, nick, date) self._insert_message(subject) + def add_muc_user_left(self, nick, reason, error=False): + join_left = MUCJoinLeft('muc-user-left', + self._account, + nick, + reason=reason, + error=error) + self._insert_message(join_left) + + def add_muc_user_joined(self, nick): + join_left = MUCJoinLeft('muc-user-joined', + self._account, + nick) + self._insert_message(join_left) + def add_info_message(self, text): message = InfoMessage(self._account, text) self._insert_message(message) @@ -364,3 +390,6 @@ def show_error(self, id_, error): def on_quote(self, text): self.emit('quote', text) + + def _on_contact_setting_changed(self, *args): + self.invalidate_filter() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b7de0c9408bdc5ba1c65795fc384acd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b7de0c9408bdc5ba1c65795fc384acd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix Enabling/Disabling Accounts
by Philipp Hörist 29 Apr '21

29 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 827a5008 by lovetox at 2021-04-29T11:13:26+02:00 Fix Enabling/Disabling Accounts - - - - - 12 changed files: - gajim/gtk/account_page.py - gajim/gtk/account_side_bar.py - gajim/gtk/accounts.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/groupchat.py - gajim/gtk/main.py - gajim/gtk/main_stack.py - gajim/gtk/roster.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/account_page.py ===================================== @@ -19,13 +19,13 @@ from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from gajim.common.nec import EventHelper from .roster import Roster from .status_selector import StatusSelector from .notification_manager import NotificationManager from .util import get_builder from .util import open_window +from .util import EventHelper ROSTER_MENU_DICT = { 'show-offline': _('Show Offline Contacts'), ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -35,7 +35,10 @@ def add_account(self, account): self.add(Account(account)) def remove_account(self, account): - pass + for row in self.get_children(): + if row.account == account: + row.destroy() + return @staticmethod def _on_row_activated(_listbox, row): @@ -97,6 +100,7 @@ def __init__(self, account): self._contact.connect('avatar-update', self._on_avatar_update) self._contact.connect('presence-update', self._on_presence_update) + self.connect('destroy', self._on_destroy) self._update_image() def _on_presence_update(self, _contact, _signal_name): @@ -110,3 +114,7 @@ def _update_image(self): self.get_scale_factor(), style='round-corners') self.set_from_surface(surface) + + def _on_destroy(self, *args): + self._contact.disconnect_all_from_obj(self) + app.check_finalize(self) ===================================== gajim/gtk/accounts.py ===================================== @@ -23,6 +23,7 @@ from gi.repository import GObject from gajim.common import app +from gajim.common import ged from gajim.common import passwords from gajim.common.i18n import _ from gajim.common.i18n import Q_ @@ -535,9 +536,19 @@ def _set_label(self, active): self._switch_state_label.set_text(text) def _on_enable_switch(self, switch, state, account): + def _on_disconnect(event): + if event.account != account: + return + app.ged.remove_event_handler('account-disconnected', + ged.CORE, + _on_disconnect) + app.interface.disable_account(account) + def _disable(): + app.ged.register_event_handler('account-disconnected', + ged.CORE, + _on_disconnect) app.connections[account].change_status('offline', 'offline') - app.interface.disable_account(account) switch.set_state(state) self._set_label(state) ===================================== gajim/gtk/chat_list.py ===================================== @@ -168,6 +168,12 @@ def remove_chat(self, account, jid): self.remove(row) row.destroy() + def remove_chats_for_account(self, account): + for row_account, jid in list(self._chats.keys()): + if row_account != account: + continue + self.remove_chat(account, jid) + def get_selected_chat(self): row = self.get_selected_row() if row is None: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -102,12 +102,17 @@ def get_chatlist(self, workspace_id): return self._chat_lists[workspace_id] def get_selected_chat(self): + chat_list = self.get_current_chat_list() + if chat_list is None: + return None + return chat_list.get_selected_chat() + + def get_current_chat_list(self): workspace_id = self.get_visible_child_name() if workspace_id == 'empty': return None - chat_list = self._chat_lists[workspace_id] - return chat_list.get_selected_chat() + return self._chat_lists[workspace_id] def is_chat_active(self, account, jid): chat = self.get_selected_chat() @@ -202,6 +207,11 @@ def remove_chat(self, workspace_id, account, jid): self.store_open_chats(workspace_id) self.emit('chat-removed', account, jid, type_) + def remove_chats_for_account(self, account): + for workspace_id, chat_list in self._chat_lists.items(): + chat_list.remove_chats_for_account(account) + self.store_open_chats(workspace_id) + def _find_chat(self, account, jid): for chat_list in self._chat_lists.values(): if chat_list.contains_chat(account, jid): ===================================== gajim/gtk/chat_page.py ===================================== @@ -235,6 +235,14 @@ def _on_chat_removed(self, _chat_list, account, jid, type_): client = app.get_client(account) client.get_module('MUC').leave(jid) + def remove_chats_for_account(self, account): + chat_list = self._chat_list_stack.get_current_chat_list() + if chat_list is not None: + chat_list.unselect_all() + + self._chat_list_stack.remove_chats_for_account(account) + self._chat_stack.remove_chats_for_account(account) + def get_control(self, account, jid): return self._chat_stack.get_control(account, jid) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -91,3 +91,9 @@ def clear(self): def process_event(self, event): control = self.get_control(event.account, event.jid) control.process_event(event) + + def remove_chats_for_account(self, account): + for chat_account, jid in list(self._controls.keys()): + if chat_account != account: + continue + self.remove_chat(account, jid) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -1273,12 +1273,6 @@ def shutdown(self, reason=None): app.plugin_manager.remove_gui_extension_point( 'groupchat_control', self) - # They can already be removed by the destroy function - # TODO remove - if self.room_jid in app.contacts.get_gc_list(self.account): - app.contacts.remove_room(self.account, self.room_jid) - del app.gc_connected[self.account][self.room_jid] - self.roster.destroy() self.roster = None ===================================== gajim/gtk/main.py ===================================== @@ -74,6 +74,8 @@ def __init__(self): ('muc-disco-update', ged.GUI1, self._on_event), ('our-show', ged.GUI1, self._on_our_show), ('signed-in', ged.GUI1, self._on_signed_in), + ('account-enabled', ged.GUI1, self._on_account_enabled), + ('account-disabled', ged.GUI1, self._on_account_disabled), ]) self._load_chats() @@ -81,6 +83,17 @@ def __init__(self): self._add_actions2() self.show_all() + def _on_account_enabled(self, event): + self._account_side_bar.add_account(event.account) + self._main_stack.add_account_page(event.account) + + def _on_account_disabled(self, event): + workspace_id = self._workspace_side_bar.get_first_workspace() + self.activate_workspace(workspace_id) + self._account_side_bar.remove_account(event.account) + self._main_stack.remove_account_page(event.account) + self._main_stack.remove_chats_for_account(event.account) + @staticmethod def _on_our_show(event): if event.show == 'offline': ===================================== gajim/gtk/main_stack.py ===================================== @@ -24,13 +24,25 @@ class MainStack(Gtk.Stack): def __init__(self): Gtk.Stack.__init__(self) + self.add_named(Gtk.Box(), 'empty') + self._chat_page = ChatPage() self._chat_page.connect('chat-selected', self._on_chat_selected) self.add_named(self._chat_page, 'chats') for account in list(app.connections.keys()): - account_page = AccountPage(account) - self.add_named(account_page, account) + self.add_account_page(account) + + def add_account_page(self, account): + account_page = AccountPage(account) + self.add_named(account_page, account) + + def remove_account_page(self, account): + account_page = self.get_child_by_name(account) + account_page.destroy() + + def remove_chats_for_account(self, account): + self._chat_page.remove_chats_for_account(account) def show_chats(self, workspace_id): self._chat_page.show_workspace_chats(workspace_id) @@ -46,7 +58,10 @@ def get_chat_page(self): return self.get_child_by_name('chats') def process_event(self, event): + empty_box = self.get_child_by_name('empty') for page in self.get_children(): + if page is empty_box: + continue page.process_event(event) def _on_chat_selected(self, *args): ===================================== gajim/gtk/roster.py ===================================== @@ -615,8 +615,8 @@ def _on_destroy(self, _roster): self._group_refs.clear() self._unset_model() self._roster = None + self._enable_sort(False) self._store.clear() - self._store.reset_default_sort_func() self._store = None # self._tooltip.destroy() # self._tooltip = None ===================================== gajim/gui_interface.py ===================================== @@ -1417,12 +1417,16 @@ def enable_account(self, account): 'name') app.block_signed_in_notifications[account] = True app.last_message_time[account] = {} - # refresh roster - gui_menu_builder.build_accounts_menu() - app.connections[account].change_status('online', '') app.settings.set_account_setting(account, 'active', True) + gui_menu_builder.build_accounts_menu() app.app.update_app_actions_state() + + app.nec.push_incoming_event(NetworkEvent( + 'account-enabled', + account=account)) + + app.connections[account].change_status('online', '') window = get_app_window('AccountsWindow') if window is not None: GLib.idle_add(window.enable_account, account, True) @@ -1435,6 +1439,15 @@ def disable_account(self, account): continue win.destroy() + app.settings.set_account_setting(account, 'roster_version', '') + app.settings.set_account_setting(account, 'active', False) + gui_menu_builder.build_accounts_menu() + app.app.update_app_actions_state() + + app.nec.push_incoming_event(NetworkEvent( + 'account-disabled', + account=account)) + if account == app.ZEROCONF_ACC_NAME: app.connections[account].disable_account() app.connections[account].cleanup() @@ -1450,11 +1463,6 @@ def disable_account(self, account): del app.newly_added[account] del app.last_message_time[account] - app.settings.set_account_setting(account, 'roster_version', '') - gui_menu_builder.build_accounts_menu() - app.settings.set_account_setting(account, 'active', False) - app.app.update_app_actions_state() - def remove_account(self, account): if app.settings.get_account_setting(account, 'active'): self.disable_account(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/827a500840a2c6a5ffd75b6bd32ab5fc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/827a500840a2c6a5ffd75b6bd32ab5fc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] MUCSubject: Add styling
by Daniel Brötzmann 28 Apr '21

28 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 0589c500 by wurstsalat at 2021-04-28T22:15:50+02:00 MUCSubject: Add styling - - - - - 6 changed files: - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim.css - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/rows/muc_subject.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/data/style/default-dark.css ===================================== @@ -9,7 +9,8 @@ color: rgb(200, 200, 200); } .gajim-status-message { - color: rgb(140, 175, 210); + color: rgb(205, 225, 255); + background: rgb(40, 60, 80); } .gajim-url { color: rgb(60, 135, 220); ===================================== gajim/data/style/default.css ===================================== @@ -9,7 +9,8 @@ color: rgb(85, 85, 85); } .gajim-status-message { - color: rgb(100, 130, 160); + color: rgb(40, 70, 100); + background: rgb(225, 235, 250); } .gajim-url { color: rgb(30, 75, 135); ===================================== gajim/data/style/gajim.css ===================================== @@ -75,6 +75,10 @@ .conversation-date-row { padding: 12px; } +.conversation-subject-box { + border-radius: 6px; + padding: 12px; +} .conversation-meta { color: @insensitive_fg_color; font-size: small; ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -807,17 +807,15 @@ def _on_room_subject(self, _contact, _signal_name, properties): self._subject_data = properties - text = _('%(nick)s has set the subject to %(subject)s') % { - 'nick': properties.muc_nickname, 'subject': properties.subject} - + date = None if properties.user_timestamp: date = time.strftime('%c', time.localtime(properties.user_timestamp)) - text = '%s - %s' % (text, date) if (app.settings.get('show_subject_on_join') or not self.contact.is_joining): - self.conversation_view.add_muc_subject(text) + self.conversation_view.add_muc_subject( + properties.subject, properties.muc_nickname, date) def _on_room_config_changed(self, _contact, _signal_name, properties): # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify ===================================== gajim/gtk/conversation/rows/muc_subject.py ===================================== @@ -18,6 +18,8 @@ from gi.repository import GLib from gi.repository import Gtk +from gajim.common.const import AvatarSize +from gajim.common.i18n import _ from gajim.common.styling import process from .base import BaseRow @@ -28,7 +30,7 @@ class MUCSubject(BaseRow): type = 'muc-subject' - def __init__(self, account, text): + def __init__(self, account, text, nick, date): BaseRow.__init__(self, account) timestamp = time.time() @@ -37,16 +39,35 @@ def __init__(self, account, text): text = GLib.markup_escape_text(text) - # avatar_placeholder = Gtk.Box() - # avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) - # self.grid.attach(avatar_placeholder, 0, 0, 1, 2) - timestamp_widget = self.create_timestamp_widget(self.timestamp) - timestamp_widget.set_valign(Gtk.Align.START) - self.grid.attach(timestamp_widget, 2, 0, 1, 1) + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 2) + + subject_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + subject_box.get_style_context().add_class('conversation-subject-box') + subject_box.get_style_context().add_class('gajim-status-message') + + title = Gtk.Label(label=_('Subject')) + title.set_halign(Gtk.Align.START) + title.get_style_context().add_class('bold') + subject_box.add(title) + + meta_str = _('Changed by %s') % nick + if date is not None: + meta_str = f'{meta_str} ({date})' + meta = Gtk.Label(label=meta_str) + meta.set_halign(Gtk.Align.START) + meta.get_style_context().add_class('small-label') + subject_box.add(meta) result = process(text) message_widget = MessageWidget(account) message_widget.add_content(result) + subject_box.add(message_widget) + self.grid.attach(subject_box, 1, 0, 1, 1) + + timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 2, 0, 1, 1) - self.grid.attach(message_widget, 1, 0, 1, 1) self.show_all() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -106,8 +106,8 @@ def _sort_func(self, row1, row2): return 0 return -1 if row1.timestamp < row2.timestamp else 1 - def add_muc_subject(self, text): - subject = MUCSubject(self._account, text) + def add_muc_subject(self, text, nick, date): + subject = MUCSubject(self._account, text, nick, date) self._insert_message(subject) def add_info_message(self, text): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0589c50026094c05de5d5aa5e1a1d8a2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0589c50026094c05de5d5aa5e1a1d8a2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Remove old History Dialog
by Philipp Hörist 28 Apr '21

28 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 701007c7 by lovetox at 2021-04-28T13:13:00+02:00 Remove old History Dialog - - - - - 6 changed files: - gajim/app_actions.py - gajim/application.py - gajim/gtk/const.py - gajim/gtk/controls/base.py - − gajim/gtk/history.py - gajim/gtk/main.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -301,16 +301,6 @@ def start_chat(_action, param): app.interface.new_chat_from_jid(account, jid) -def on_browse_history(_action, param): - jid, account = None, None - if param is not None: - dict_ = param.unpack() - jid = dict_.get('jid') - account = dict_.get('account') - - open_window('HistoryWindow', account=account, jid=jid) - - def on_groupchat_join(_action, param): account, jid = param.get_strv() open_window('GroupchatJoin', account=account, jid=jid) ===================================== gajim/application.py ===================================== @@ -420,7 +420,6 @@ def add_actions(self): ('open-link', 'as', app_actions.open_link), ('open-mail', 's', app_actions.open_mail), ('create-groupchat', 's', app_actions.on_create_gc), - ('browse-history', 'a{sv}', app_actions.on_browse_history), ('groupchat-join', 'as', app_actions.on_groupchat_join), ] ===================================== gajim/gtk/const.py ===================================== @@ -113,7 +113,6 @@ def __str__(self): 'SingleMessageWindow': 'gajim.gui.single_message', 'Bookmarks': 'gajim.gui.bookmarks', 'AccountWizard': 'gajim.gui.account_wizard', - 'HistoryWindow': 'gajim.gui.history', 'ManageProxies': 'gajim.gui.proxies', 'ManageSounds': 'gajim.gui.manage_sounds', 'ServiceDiscoveryWindow': 'gajim.gui.discovery', ===================================== gajim/gtk/controls/base.py ===================================== @@ -477,13 +477,6 @@ def _sec_labels_received(self, event): self.xml.label_selector.show_all() def delegate_action(self, action): - if action == 'browse-history': - dict_ = {'jid': GLib.Variant('s', str(self.contact.jid)), - 'account': GLib.Variant('s', self.account)} - variant = GLib.Variant('a{sv}', dict_) - app.app.activate_action('browse-history', variant) - return Gdk.EVENT_STOP - if action == 'clear-chat': self.conversation_view.clear() return Gdk.EVENT_STOP ===================================== gajim/gtk/history.py deleted ===================================== @@ -1,627 +0,0 @@ -# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2005 Vincent Hanquez <tab AT snarc.org> -# Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -# Travis Shirk <travis AT pobox.com> -# Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -# Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> -# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -# -# 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 time -import datetime -from enum import IntEnum -from enum import unique - -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib - -from gajim.common import app -from gajim.common import helpers -from gajim.common.i18n import _ -from gajim.common.const import KindConstant -from gajim.common.exceptions import PysqliteOperationalError - -# from gajim import conversation_textview - -from .conversation.view import ConversationView -from .util import python_month -from .util import gtk_month -from .util import resize_window -from .util import move_window -from .util import get_icon_name -from .util import get_completion_liststore -from .util import get_builder -from .util import scroll_to_end - -from .dialogs import ErrorDialog - - -@unique -class InfoColumn(IntEnum): - '''Completion dict''' - JID = 0 - ACCOUNT = 1 - NAME = 2 - COMPLETION = 3 - - -@unique -class Column(IntEnum): - LOG_JID = 0 - CONTACT_NAME = 1 - UNIXTIME = 2 - MESSAGE = 3 - TIME = 4 - LOG_LINE_ID = 5 - - -class HistoryWindow(Gtk.ApplicationWindow): - def __init__(self, account=None, jid=None): - Gtk.ApplicationWindow.__init__(self) - self.set_application(app.app) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_show_menubar(False) - self.set_title(_('Conversation History')) - - self.account = account - self.jid = jid - - self._client = app.get_client(account) - self._contact = None - if jid is not None: - self._contact = self._client.get_module('Contacts').get_contact( - jid) - - self._ui = get_builder('history_window.ui') - self.add(self._ui.history_box) - - self._conversation_view = ConversationView( - account, self._contact, history_mode=True) - self._ui.scrolledwindow.add(self._conversation_view) - self._ui.scrolledwindow.set_focus_vadjustment(Gtk.Adjustment()) - - self._clearing_search = False - self._first_day = None - self._last_day = None - - self._completion_dict = {} - self._accounts_seen_online = [] # Update dict when new accounts connect - self._jids_to_search = [] - - # This will load history too - task = self._fill_completion_dict() - GLib.idle_add(next, task) - - if jid: - self._ui.query_entry.set_text(jid) - else: - self._load_history(None) - - resize_window(self, - app.settings.get('history_window_width'), - app.settings.get('history_window_height')) - move_window(self, - app.settings.get('history_window_x-position'), - app.settings.get('history_window_y-position')) - - self._ui.connect_signals(self) - self.connect('delete-event', self._on_delete) - self.connect('destroy', self._on_destroy) - self.connect('key-press-event', self._on_key_press) - self.show_all() - - # PluginSystem: adding GUI extension point for - # HistoryWindow instance object - app.plugin_manager.gui_extension_point( - 'history_window', self) - - def _on_delete(self, _widget, *args): - self._save_state() - - def _on_destroy(self, _widget): - app.plugin_manager.remove_gui_extension_point( - 'history_window', self) - - def _on_key_press(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: - if self._ui.results_scrolledwindow.get_visible(): - self._ui.results_scrolledwindow.set_visible(False) - return - self._save_state() - self.destroy() - - def _on_jid_entry_match_selected(self, _widget, model, iter_, *args): - self._jid_entry_search(model[iter_][1]) - return True - - def _on_query_combo_changed(self, combo): - # only if selected from combobox - jid = self._ui.query_entry.get_text() - if jid == combo.get_active_id(): - self._jid_entry_search(jid) - - def _on_jid_entry_activate(self, entry): - self._jid_entry_search(entry.get_text()) - - def _jid_entry_search(self, jid): - self._load_history(jid, self.account) - self._ui.results_scrolledwindow.set_visible(False) - - def _fill_completion_dict(self): - """ - Fill completion_dict for key auto completion. Then load history for - current jid (by calling another function) - - Key will be either jid or full_completion_name (contact name or long - description like "pm-contact from groupchat...."). - - {key : (jid, account, nick_name, full_completion_name} - This is a generator and does pseudo-threading via idle_add(). - """ - liststore = get_completion_liststore(self._ui.query_entry) - liststore.set_sort_column_id(1, Gtk.SortType.ASCENDING) - self._ui.query_entry.get_completion().connect( - 'match-selected', self._on_jid_entry_match_selected) - - self._ui.query_combo.set_model(liststore) - - # Add all jids in logs.db: - db_jids = app.storage.archive.get_jids_in_db() - completion_dict = dict.fromkeys(db_jids) - - self._accounts_seen_online = list(app.settings.get_active_accounts()) - - # Enhance contacts of online accounts with contact. - # Needed for mapping below - for account in self._accounts_seen_online: - completion_dict.update( - helpers.get_contact_dict_for_account(account)) - - muc_active_icon = get_icon_name('muc-active') - online_icon = get_icon_name('online') - - keys = list(completion_dict.keys()) - # Move the actual jid at first so we load history faster - actual_jid = self._ui.query_entry.get_text() - if actual_jid in keys: - keys.remove(actual_jid) - keys.insert(0, actual_jid) - if '' in keys: - keys.remove('') - if None in keys: - keys.remove(None) - # Map jid to info tuple - # Warning : This for is time critical with big DB - for key in keys: - completed = key - completed2 = None - contact = completion_dict[completed] - if contact: - info_name = contact.name - info_completion = info_name - info_jid = contact.jid - else: - # Corresponding account is offline, we know nothing - info_name = completed.split('@')[0] - info_completion = completed - info_jid = completed - - info_acc = self._get_account_for_jid(info_jid) - - if (app.storage.archive.jid_is_room_jid(completed) or - app.storage.archive.jid_is_from_pm(completed)): - icon = muc_active_icon - if app.storage.archive.jid_is_from_pm(completed): - # It's PM. Make it easier to find - room, nick = app.get_room_and_nick_from_fjid(completed) - info_completion = '%s from %s' % (nick, room) - completed = info_completion - info_completion2 = '%s/%s' % (room, nick) - completed2 = info_completion2 - info_name = nick - else: - icon = online_icon - - if len(completed) > 70: - completed = completed[:70] + '[\u2026]' - liststore.append((icon, completed)) - self._completion_dict[key] = ( - info_jid, info_acc, info_name, info_completion) - self._completion_dict[completed] = ( - info_jid, info_acc, info_name, info_completion) - if completed2: - if len(completed2) > 70: - completed2 = completed2[:70] + '[\u2026]' - liststore.append((icon, completed2)) - self._completion_dict[completed2] = ( - info_jid, info_acc, info_name, info_completion2) - if key == actual_jid: - self._load_history(info_jid, self.account or info_acc) - yield True - keys.sort() - yield False - - @staticmethod - def _get_account_for_jid(jid): - """ - Return the corresponding account of the jid. May be None if an account - could not be found - """ - accounts = app.settings.get_active_accounts() - account = None - for acc in accounts: - jid_list = app.contacts.get_jid_list(acc) - gc_list = app.contacts.get_gc_list(acc) - if jid in jid_list or jid in gc_list: - account = acc - break - return account - - def _load_history(self, jid_or_name, account=None): - """ - Load history for the given jid/name and show it - """ - if jid_or_name and jid_or_name in self._completion_dict: - # a full qualified jid or a contact name was entered - info_jid, info_account, _info_name, info_completion = self._completion_dict[jid_or_name] - self._jids_to_search = [info_jid] - self.jid = info_jid - - if account: - self.account = account - else: - self.account = info_account - if self.account is None: - # We don't know account. Probably a gc not opened or an - # account not connected. - # Disable possibility to say if we want to log or not - self._ui.store_history_switch.set_sensitive(False) - else: - # Are logs disabled for account ? - no_log_for = app.settings.get_account_setting( - self.account, 'no_log_for').split(' ') - if self.account in no_log_for: - self._ui.store_history_switch.set_active(False) - self._ui.store_history_switch.set_sensitive(False) - else: - # Are logs disabled for jid ? - self._ui.store_history_switch.set_active( - str(self.jid) not in no_log_for) - self._ui.store_history_switch.set_sensitive(True) - - self._jids_to_search = [info_jid] - - # Get first/last date we have logs with contact - self.first_log = app.storage.archive.get_first_date_that_has_logs( - self.account, self.jid) - self._first_day = self._get_date_from_timestamp(self.first_log) - self.last_log = app.storage.archive.get_last_date_that_has_logs( - self.account, self.jid) - self._last_day = self._get_date_from_timestamp(self.last_log) - - # Select logs for last date we have logs with contact - self._ui.search_menu_button.set_sensitive(True) - month = gtk_month(self._last_day.month) - self._ui.calendar.select_month(month, self._last_day.year) - self._ui.calendar.select_day(self._last_day.day) - - self._ui.button_previous_day.set_sensitive(True) - self._ui.button_next_day.set_sensitive(True) - self._ui.button_first_day.set_sensitive(True) - self._ui.button_last_day.set_sensitive(True) - - self._ui.search_entry.set_sensitive(True) - self._ui.search_entry.grab_focus() - - self._ui.query_entry.set_text(info_completion) - - else: - # neither a valid jid, nor an existing contact name was entered - # we have got nothing to show or to search in - self.jid = None - self.account = None - - self._ui.search_entry.set_sensitive(False) - self._ui.store_history_switch.set_sensitive(False) - self._ui.search_menu_button.set_sensitive(False) - self._ui.calendar.clear_marks() - self._ui.button_previous_day.set_sensitive(False) - self._ui.button_next_day.set_sensitive(False) - self._ui.button_first_day.set_sensitive(False) - self._ui.button_last_day.set_sensitive(False) - - self._ui.results_scrolledwindow.set_visible(False) - - def _on_day_selected(self, *args): - if not self.jid: - return - year, month, day = self._ui.calendar.get_date() # integers - month = python_month(month) - date_str = datetime.date(year, month, day).strftime('%x') - self._ui.date_label.set_text(date_str) - self._load_conversation(year, month, day) - GLib.idle_add(scroll_to_end, self._ui.scrolledwindow) - - def _on_month_changed(self, calendar): - """ - Ask for days in this month, if they have logs it bolds them - (marks them) - """ - if not self.jid: - return - year, month, _day = calendar.get_date() # integers - if year < 2000: - calendar.select_month(0, 2000) - calendar.select_day(1) - return - - calendar.clear_marks() - month = python_month(month) - - try: - log_days = app.storage.archive.get_days_with_logs( - self.account, self.jid, year, month) - except PysqliteOperationalError as err: - ErrorDialog(_('Disk Error'), str(err)) - return - - for date in log_days: - calendar.mark_day(date.day) - - @staticmethod - def _get_date_from_timestamp(timestamp): - # Conversion from timestamp to date - log = time.localtime(timestamp) - year, mmonth, day = log[0], log[1], log[2] - date = datetime.datetime(year, mmonth, day) - return date - - def _change_date(self, button): - year, month, day = self._ui.calendar.get_date() - python_m = python_month(month) - date_ = datetime.datetime(year, python_m, day) - - if button is self._ui.button_first_day: - gtk_m = gtk_month(self._first_day.month) - self._ui.calendar.select_month(gtk_m, self._first_day.year) - self._ui.calendar.select_day(self._first_day.day) - return - - if button is self._ui.button_last_day: - gtk_m = gtk_month(self._last_day.month) - self._ui.calendar.select_month(gtk_m, self._last_day.year) - self._ui.calendar.select_day(self._last_day.day) - return - - if button is self._ui.button_previous_day: - end_date = self._first_day - timedelta = datetime.timedelta(days=-1) - if end_date >= date_: - return - - if button is self._ui.button_next_day: - end_date = self._last_day - timedelta = datetime.timedelta(days=1) - if end_date <= date_: - return - - # Iterate through days until log entry found or - # supplied end_date (first_log / last_log) reached - logs = None - while logs is None: - date_ = date_ + timedelta - if date_ == end_date: - break - try: - logs = app.storage.archive.get_date_has_logs( - self.account, self.jid, date_) - except PysqliteOperationalError as err: - ErrorDialog(_('Disk Error'), str(err)) - return - - gtk_m = gtk_month(date_.month) - self._ui.calendar.select_month(gtk_m, date_.year) - self._ui.calendar.select_day(date_.day) - - def _load_conversation(self, year, month, day): - """ - Load the conversation between `self.jid` and `self.account` held on the - given date into the history textbuffer. Values for `month` and `day` - are 1-based. - """ - self._conversation_view.clear() - - show_status = self._ui.show_status_checkbutton.get_active() - date = datetime.datetime(year, month, day) - - messages = app.storage.archive.get_messages_for_date( - self.account, self.jid, date) - for msg in messages: - if not show_status and msg.kind in (KindConstant.STATUS, - KindConstant.GCSTATUS): - continue - if not msg.message and msg.kind not in (KindConstant.STATUS, - KindConstant.GCSTATUS): - continue - - kind = 'status' - contact_name = msg.contact_name - if msg.kind in ( - KindConstant.SINGLE_MSG_RECV, KindConstant.CHAT_MSG_RECV): - kind = 'incoming' - contact_name = self._contact.name - elif msg.kind == KindConstant.GC_MSG: - kind = 'incoming' - elif msg.kind in ( - KindConstant.SINGLE_MSG_SENT, KindConstant.CHAT_MSG_SENT): - kind = 'outgoing' - contact_name = app.nicks[self.account] - - self._conversation_view.add_message( - msg.message, - kind, - contact_name, - msg.time, - subject=msg.subject, - additional_data=msg.additional_data, - history=True, - log_line_id=msg.log_line_id) - - def _on_search_complete_history(self, _widget): - self._ui.date_label.get_style_context().remove_class('tagged') - - def _on_search_in_date(self, _widget): - self._ui.date_label.get_style_context().add_class('tagged') - - def _on_search_entry_activate(self, entry): - text = entry.get_text() - - model = self._ui.results_treeview.get_model() - self._clearing_search = True - model.clear() - self._clearing_search = False - - if text == '': - self._ui.results_scrolledwindow.set_visible(False) - return - - self._ui.results_scrolledwindow.set_visible(True) - - # perform search in preselected jids - # jids are preselected with the query_combo - for jid in self._jids_to_search: - account = self._completion_dict[jid][InfoColumn.ACCOUNT] - if account is None: - # We do not know an account. This can only happen if - # the contact is offine, or if we browse a groupchat history. - # The account is not needed, a dummy can be set. - # This may leed to wrong self nick in the displayed history - account = list(app.settings.get_active_accounts())[0] - - date = None - if self._ui.search_in_date.get_active(): - year, month, day = self._ui.calendar.get_date() # integers - month = python_month(month) - date = datetime.datetime(year, month, day) - - show_status = self._ui.show_status_checkbutton.get_active() - - results = app.storage.archive.search_log(account, jid, text, date) - result_found = False - # FIXME: - # add "subject: | message: " in message column if kind is single - # also do we need show at all? (we do not search on subject) - for row in results: - if not show_status and row.kind in (KindConstant.GCSTATUS, - KindConstant.STATUS): - continue - - contact_name = row.contact_name - if not contact_name: - if row.kind == KindConstant.CHAT_MSG_SENT: - contact_name = app.nicks[account] - else: - contact_name = self._completion_dict[jid][InfoColumn.NAME] - - local_time = time.localtime(row.time) - date = time.strftime('%Y-%m-%d', local_time) - - result_found = True - model.append((str(jid), contact_name, date, row.message, - str(row.time), str(row.log_line_id))) - - if result_found: - self._ui.results_treeview.set_cursor(0) - - def _on_results_cursor_changed(self, treeview): - """ - A row was selected, get date from row, and select it in calendar - which results to showing conversation logs for that date - """ - if self._clearing_search: - return - - # get currently selected date - cur_year, cur_month, cur_day = self._ui.calendar.get_date() - cur_month = python_month(cur_month) - model, paths = treeview.get_selection().get_selected_rows() - - if not paths: - return - - path = paths[0] - # make it a tuple (Y, M, D, 0, 0, 0...) - tim = time.strptime(model[path][Column.UNIXTIME], '%Y-%m-%d') - year = tim[0] - gtk_m = tim[1] - month = gtk_month(gtk_m) - day = tim[2] - - # switch to belonging logfile if necessary - log_jid = model[path][Column.LOG_JID] - if log_jid != self.jid: - self._load_history(log_jid, None) - - # avoid rerunning mark days algo if same month and year! - if year != cur_year or gtk_m != cur_month: - self._ui.calendar.select_month(month, year) - - if year != cur_year or gtk_m != cur_month or day != cur_day: - self._ui.calendar.select_day(day) - - self._scroll_to_message_and_highlight(model[path][Column.LOG_LINE_ID]) - - def _scroll_to_message_and_highlight(self, log_line_id): - for row in self._conversation_view.iter_rows(): - row.get_style_context().remove_class( - 'conversation-search-highlight') - - row = self._conversation_view.get_row_by_log_line_id(int(log_line_id)) - if row is not None: - row.get_style_context().add_class('conversation-search-highlight') - # This scrolls the ListBox to the highlighted row - row.grab_focus() - self._ui.results_treeview.grab_focus() - - def _on_log_history(self, switch, *args): - jid = str(self.jid) - oldlog = True - no_log_for = app.settings.get_account_setting( - self.account, 'no_log_for').split() - if jid in no_log_for: - oldlog = False - log = switch.get_active() - if not log and jid not in no_log_for: - no_log_for.append(jid) - if log and jid in no_log_for: - no_log_for.remove(jid) - if oldlog != log: - app.settings.set_account_setting( - self.account, 'no_log_for', ' '.join(no_log_for)) - - def _on_show_status(self, _widget): - # Reload logs - self._on_day_selected(None) - - def _save_state(self): - x_pos, y_pos = self.get_window().get_root_origin() - width, height = self.get_size() - app.settings.set('history_window_x-position', x_pos) - app.settings.set('history_window_y-position', y_pos) - app.settings.set('history_window_width', width) - app.settings.set('history_window_height', height) ===================================== gajim/gtk/main.py ===================================== @@ -116,7 +116,6 @@ def _add_actions2(self): 'change-nickname', 'change-subject', 'escape', - 'browse-history', 'send-file', 'show-contact-info', 'show-emoji-chooser', @@ -141,7 +140,6 @@ def _add_actions2(self): ] disabled_for_emacs = ( - 'browse-history', 'send-file', 'close-tab' ) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/701007c7ff0fb997972b8e4acd76f5e2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/701007c7ff0fb997972b8e4acd76f5e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Remove old Roster code
by Philipp Hörist 28 Apr '21

28 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: c8f9d29f by lovetox at 2021-04-28T11:46:46+02:00 Remove old Roster code - - - - - ac3006ee by lovetox at 2021-04-28T11:56:15+02:00 Move Controls to GTK folder - - - - - 11 changed files: - gajim/gtk/chat_stack.py - + gajim/gtk/controls/__init__.py - gajim/chat_control_base.py → gajim/gtk/controls/base.py - gajim/chat_control.py → gajim/gtk/controls/chat.py - gajim/groupchat_control.py → gajim/gtk/controls/groupchat.py - gajim/privatechat_control.py → gajim/gtk/controls/private.py - gajim/gtk/htmltextview.py - gajim/gtk/message_input.py - gajim/gtk/preferences.py - gajim/gui_interface.py - − gajim/roster_window.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -16,9 +16,9 @@ from gi.repository import Gtk -from gajim.chat_control import ChatControl -from gajim.groupchat_control import GroupchatControl -from gajim.privatechat_control import PrivateChatControl +from gajim.gui.controls.chat import ChatControl +from gajim.gui.controls.groupchat import GroupchatControl +from gajim.gui.controls.private import PrivateChatControl log = logging.getLogger('gajim.gui.chatstack') ===================================== gajim/gtk/controls/__init__.py ===================================== ===================================== gajim/chat_control_base.py → gajim/gtk/controls/base.py ===================================== @@ -91,7 +91,7 @@ ################################################################################ -class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): +class BaseControl(ChatCommandProcessor, CommandTools, EventHelper): """ A base class containing a banner, ConversationView, MessageInputTextView """ @@ -246,7 +246,7 @@ def __init__(self, widget_name, account, jid): self.encryption = self.get_encryption_state() self.conversation_view.encryption_enabled = self.encryption is not None - # PluginSystem: adding GUI extension point for ChatControlBase + # PluginSystem: adding GUI extension point for BaseControl # instance object (also subclasses, eg. ChatControl or GroupchatControl) app.plugin_manager.gui_extension_point('chat_control_base', self) ===================================== gajim/chat_control.py → gajim/gtk/controls/chat.py ===================================== @@ -70,9 +70,9 @@ from gajim.command_system.implementation.hosts import ChatCommands from gajim.command_system.framework import CommandHost # pylint: disable=unused-import -from gajim.chat_control_base import ChatControlBase +from gajim.gui.controls.base import BaseControl -log = logging.getLogger('gajim.chat_control') +log = logging.getLogger('gajim.gui.controls.chat') class JingleObject: @@ -86,7 +86,7 @@ def __init__(self, state, update): ################################################################################ -class ChatControl(ChatControlBase): +class ChatControl(BaseControl): """ A control for standard 1-1 chat """ @@ -98,7 +98,7 @@ class ChatControl(ChatControlBase): COMMAND_HOST = ChatCommands # type: ClassVar[Type[CommandHost]] def __init__(self, account, jid): - ChatControlBase.__init__(self, + BaseControl.__init__(self, 'chat_control', account, jid) @@ -852,7 +852,7 @@ def on_location_eventbox_enter_notify_event(self, _widget, _event): def update_ui(self): # The name banner is drawn here - ChatControlBase.update_ui(self) + BaseControl.update_ui(self) self.update_toolbar() self._update_avatar() self.update_actions() @@ -916,7 +916,7 @@ def send_message(self, if message in ('', None, '\n'): return - ChatControlBase.send_message(self, + BaseControl.send_message(self, message, type_='chat', xhtml=xhtml, @@ -945,7 +945,7 @@ def add_message(self, else: name = self.get_our_nick() - ChatControlBase.add_message(self, + BaseControl.add_message(self, text, kind, name, ===================================== gajim/groupchat_control.py → gajim/gtk/controls/groupchat.py ===================================== @@ -54,7 +54,7 @@ from gajim.common.const import MUCJoinedState from gajim.common.structs import OutgoingMessage -from gajim.chat_control_base import ChatControlBase +from gajim.gui.controls.base import BaseControl from gajim.command_system.implementation.hosts import GroupChatCommands @@ -75,10 +75,10 @@ from gajim.gui.util import open_window from gajim.gui.const import ControlType -log = logging.getLogger('gajim.groupchat_control') +log = logging.getLogger('gajim.gui.controls.groupchat') -class GroupchatControl(ChatControlBase): +class GroupchatControl(BaseControl): _type = ControlType.GROUPCHAT @@ -87,7 +87,7 @@ class GroupchatControl(ChatControlBase): COMMAND_HOST = GroupChatCommands def __init__(self, account, jid): - ChatControlBase.__init__(self, + BaseControl.__init__(self, 'groupchat_control', account, jid) @@ -719,7 +719,7 @@ def add_message(self, # self.check_focus_out_line() - ChatControlBase.add_message(self, + BaseControl.add_message(self, text, kind, contact, @@ -1334,7 +1334,7 @@ def _close_control(self, reason=None): def set_control_active(self, state): self.attention_flag = False - ChatControlBase.set_control_active(self, state) + BaseControl.set_control_active(self, state) def _on_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp): @@ -1363,7 +1363,7 @@ def _jid_not_blocked(self, bare_jid: str) -> bool: return not helpers.jid_is_blocked(self.account, fjid) def _on_message_textview_key_press_event(self, widget, event): - res = ChatControlBase._on_message_textview_key_press_event( + res = BaseControl._on_message_textview_key_press_event( self, widget, event) if res: return True ===================================== gajim/privatechat_control.py → gajim/gtk/controls/private.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import helpers from gajim.common.i18n import _ -from gajim.chat_control import ChatControl +from gajim.gui.controls.chat import ChatControl from gajim.command_system.implementation.hosts import PrivateChatCommands from gajim.gui.dialogs import ErrorDialog ===================================== gajim/gtk/htmltextview.py ===================================== @@ -727,7 +727,7 @@ def __init__(self, account, standalone=False): def _on_destroy(self, *args): # We restore the TextView’s drag destination to avoid a GTK warning - # when closing the control. ChatControlBase.shutdown() calls destroy() + # when closing the control. BaseControl.shutdown() calls destroy() # on the control’s main box, causing GTK to recursively destroy the # child widgets. GTK then tries to set a target list on the TextView, # resulting in a warning because the Widget has no drag destination. ===================================== gajim/gtk/message_input.py ===================================== @@ -98,7 +98,7 @@ def __init__(self): def _on_destroy(self, *args): # We restore the TextView’s drag destination to avoid a GTK warning - # when closing the control. ChatControlBase.shutdown() calls destroy() + # when closing the control. BaseControl.shutdown() calls destroy() # on the control’s main box, causing GTK to recursively destroy the # child widgets. GTK then tries to set a target list on the TextView, # resulting in a warning because the Widget has no drag destination. ===================================== gajim/gtk/preferences.py ===================================== @@ -29,7 +29,7 @@ from gajim.common.multimedia_helpers import AudioOutputManager from gajim.common.multimedia_helpers import VideoInputManager -from gajim.chat_control_base import ChatControlBase +from gajim.gui.controls.base import BaseControl from .const import Setting from .const import SettingKind @@ -395,7 +395,7 @@ def _on_use_speller(value, *args): gspell_lang = Gspell.language_get_default() app.settings.set('speller_language', gspell_lang.get_code()) for ctrl in get_app_window('Preferences').get_all_controls(): - if isinstance(ctrl, ChatControlBase): + if isinstance(ctrl, BaseControl): ctrl.set_speller() ===================================== gajim/gui_interface.py ===================================== @@ -58,8 +58,8 @@ from gajim import gui_menu_builder from gajim.dialog_messages import get_dialog -from gajim.chat_control_base import ChatControlBase -from gajim.groupchat_control import GroupchatControl +from gajim.gui.controls.base import BaseControl +from gajim.gui.controls.groupchat import GroupchatControl from gajim.common import idle from gajim.common.zeroconf import connection_zeroconf @@ -1255,7 +1255,7 @@ def handle_event(self, account, fjid, type_): w.set_active_tab(ctrl) w.window.present() # Using isinstance here because we want to catch all derived types - if isinstance(ctrl, ChatControlBase): + if isinstance(ctrl, BaseControl): ctrl.scroll_to_end() def show_groupchat(self, account, room_jid): ===================================== gajim/roster_window.py deleted ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c16fbd33734f5955430cad87a89b377… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c16fbd33734f5955430cad87a89b377… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 254 commits: Flatpak: Update dependencies
by Philipp Hörist 28 Apr '21

28 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: b8690214 by André Apitzsch at 2021-03-29T12:50:51+02:00 Flatpak: Update dependencies - - - - - 15f73dad by Daniel Brötzmann at 2021-03-30T09:05:46+02:00 Accounts: Add account switch description - - - - - f08f3f0c by lovetox at 2021-04-02T18:51:01+02:00 Fix HtmlTextView test - - - - - 1691af57 by lovetox at 2021-04-09T20:00:19+02:00 Windows: Fix appveyor build - - - - - 2c7f95b5 by Philipp Hörist at 2021-04-21T20:34:11+02:00 Revert "Windows: Add Workaround for #10342" This reverts commit 3334790a15ff4664894f5f19bd60e01760d3f120 - - - - - 5c2b0f53 by lovetox at 2021-04-24T12:23:10+02:00 Remove unused path - - - - - 72f489b4 by lovetox at 2021-04-28T08:15:35+02:00 Windows: Add gssapi dependency Fixes #10540 - - - - - b8a08ebc by lovetox at 2021-04-28T11:40:57+02:00 Start - - - - - d6249a53 by lovetox at 2021-04-28T11:40:57+02:00 Disable CI - - - - - 682ee915 by lovetox at 2021-04-28T11:40:57+02:00 Really disable CI - - - - - f70341f3 by lovetox at 2021-04-28T11:40:58+02:00 Add Workspace settings API - - - - - 3707ff04 by lovetox at 2021-04-28T11:40:58+02:00 Store and Open chats - - - - - ee389c95 by lovetox at 2021-04-28T11:40:58+02:00 Add remove_chat() - - - - - eb9f1880 by lovetox at 2021-04-28T11:40:58+02:00 Account Side Bar - - - - - 30336a77 by lovetox at 2021-04-28T11:40:58+02:00 Add Workspace Side Bar - - - - - b8f82b08 by wurstsalat at 2021-04-28T11:40:58+02:00 ChatList: Add basic elements - - - - - 6134f5dc by wurstsalat at 2021-04-28T11:40:58+02:00 ChatListStack: Add Start Chat - - - - - ea2a293c by wurstsalat at 2021-04-28T11:40:58+02:00 Add basic Sidebar styling - - - - - 918e035e by wurstsalat at 2021-04-28T11:40:58+02:00 Improve styling for Sidebar and ChatList - - - - - a9825932 by lovetox at 2021-04-28T11:40:58+02:00 Store chatlist on remove - - - - - 1e875d11 by lovetox at 2021-04-28T11:40:58+02:00 Add/Remove Workspaces - - - - - a1efb07c by lovetox at 2021-04-28T11:40:58+02:00 Allow to add chats to different workspaces - - - - - 042a00d8 by lovetox at 2021-04-28T11:40:58+02:00 Add transparent backgrounds - - - - - 3084f6b8 by wurstsalat at 2021-04-28T11:40:58+02:00 AccountSideBar: Improve styling - - - - - a3b839d9 by wurstsalat at 2021-04-28T11:40:58+02:00 WorkspaceSidebar: Improve styling - - - - - 270c7cdf by lovetox at 2021-04-28T11:40:58+02:00 Improve left sidebar - - - - - 72174392 by lovetox at 2021-04-28T11:40:58+02:00 css - - - - - ae925e42 by lovetox at 2021-04-28T11:40:58+02:00 Dont fail when account is disabled - - - - - d28dcc38 by lovetox at 2021-04-28T11:40:58+02:00 CSS - - - - - bfe9dc61 by wurstsalat at 2021-04-28T11:40:58+02:00 AvatarSelector: Add Load Image button - - - - - 45d83e93 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 Workspace: Add Workspace edit dialog - - - - - c9f21788 by wurstsalat at 2021-04-28T11:40:58+02:00 Workspace: Add title and editing functionality - - - - - 6c98e1cc by wurstsalat at 2021-04-28T11:40:58+02:00 MainWindow: Add Paned for chat list and chat controls - - - - - e1ccfe01 by lovetox at 2021-04-28T11:40:58+02:00 Store type for open chats - - - - - fd18e7c8 by lovetox at 2021-04-28T11:40:58+02:00 Store workspace dialog settings - - - - - 5a8820c9 by lovetox at 2021-04-28T11:40:58+02:00 Fix adding new Workspace - - - - - ef42cdb2 by lovetox at 2021-04-28T11:40:58+02:00 Fix some selection bugs - - - - - f9f8d860 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatListStack: Wrap in ScrolledWindow - - - - - cce5e35e by lovetox at 2021-04-28T11:40:58+02:00 Move scrolled window into gui xml - - - - - 8705d081 by lovetox at 2021-04-28T11:40:58+02:00 sytle chatlist - - - - - 0c257a78 by wurstsalat at 2021-04-28T11:40:58+02:00 ChatList: Styling - - - - - d730788b by wurstsalat at 2021-04-28T11:40:58+02:00 MainWindow: Styling - - - - - 1fb4fb34 by wurstsalat at 2021-04-28T11:40:58+02:00 Accounts: Add basic account page - - - - - 66a69204 by lovetox at 2021-04-28T11:40:58+02:00 Refactor Groupchats - - - - - e70b3f48 by lovetox at 2021-04-28T11:40:58+02:00 Start Chat: Destroy after joining MUC - - - - - fd050a49 by lovetox at 2021-04-28T11:40:58+02:00 Disable Roster - - - - - db9f4191 by lovetox at 2021-04-28T11:40:58+02:00 Make quit work - - - - - ad256b66 by lovetox at 2021-04-28T11:40:58+02:00 Stuff - - - - - bb6d0944 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Add friendly timestamps - - - - - a0ecc0ba by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Unread counter styling - - - - - 30ed5029 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Group chat avatars and message lines - - - - - 3ca5acda by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 Paned: Improve ChatList resizing - - - - - 3b032d6b by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Use groupchat name, improve ellipsizing - - - - - 1b8f4a8f by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Add group chat nicks - - - - - a46903a3 by lovetox at 2021-04-28T11:40:58+02:00 Remove unread_messages table - - - - - 1a386f31 by lovetox at 2021-04-28T11:40:58+02:00 add unread cache - - - - - 34681ce6 by lovetox at 2021-04-28T11:40:58+02:00 Add notifications - - - - - 7b72145e by lovetox at 2021-04-28T11:40:58+02:00 Fix notifications - - - - - ba67f382 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Move ui to glade file - - - - - 8e6b8ca6 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Add RosterTooltip - - - - - af9d1b80 by lovetox at 2021-04-28T11:40:58+02:00 Move event handling to main - - - - - 1fd482b0 by lovetox at 2021-04-28T11:40:58+02:00 Fix some events - - - - - 766fa420 by lovetox at 2021-04-28T11:40:58+02:00 Reset unread counter - - - - - bca47cf4 by lovetox at 2021-04-28T11:40:58+02:00 Fix more events - - - - - bbb342ce by wurstsalat at 2021-04-28T11:40:58+02:00 WorkspaceSidebar: Add unread counter - - - - - 434a873e by lovetox at 2021-04-28T11:40:58+02:00 Unread count improv - - - - - 555dee5b by lovetox at 2021-04-28T11:40:58+02:00 Add unread count to workspace - - - - - 5c229ebf by lovetox at 2021-04-28T11:40:58+02:00 Dont allow chats to be opened multiple times - - - - - 5c60ee35 by lovetox at 2021-04-28T11:40:58+02:00 Don’t notify on messages from ourself - - - - - f1629cce by lovetox at 2021-04-28T11:40:58+02:00 Use consistent jid attribute - - - - - 0b03e2d5 by lovetox at 2021-04-28T11:40:58+02:00 Fix some events - - - - - 7b26b48b by lovetox at 2021-04-28T11:40:58+02:00 Handle presence - - - - - 1b2fa9e0 by lovetox at 2021-04-28T11:40:58+02:00 Sort with activity - - - - - 707451b9 by lovetox at 2021-04-28T11:40:58+02:00 Save handle position - - - - - b7112359 by lovetox at 2021-04-28T11:40:58+02:00 Connect Menu actions - - - - - 0f111922 by lovetox at 2021-04-28T11:40:58+02:00 Bring back more actions - - - - - fa599e4f by lovetox at 2021-04-28T11:40:58+02:00 Fix transients - - - - - 681ff31d by lovetox at 2021-04-28T11:40:58+02:00 Make Private Chat work - - - - - 01e21872 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Add avatar and name for PMs - - - - - a48d8ea0 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Show indicator for group chats - - - - - 4810c78f by lovetox at 2021-04-28T11:40:58+02:00 New Contacts - - - - - d44baaa8 by wurstsalat at 2021-04-28T11:40:58+02:00 Add Workspace menu - - - - - e91d171f by wurstsalat at 2021-04-28T11:40:58+02:00 WorkspaceSidebar: Add drag and drop - - - - - bbc124e1 by wurstsalat at 2021-04-28T11:40:58+02:00 Add update_workspace method - - - - - aa419467 by wurstsalat at 2021-04-28T11:40:58+02:00 ChatList: Set message nick, process message-sent event - - - - - 4874cfda by wurstsalat at 2021-04-28T11:40:58+02:00 ChatList: Update time, improve close button - - - - - 5ba66327 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Add chatstate icon - - - - - 39804775 by wurstsalat at 2021-04-28T11:40:58+02:00 ChatList: Improve chatstate icon - - - - - 56e94f15 by wurstsalat at 2021-04-28T11:40:58+02:00 ChatList: Add context menu and pinning - - - - - e85b4dae by wurstsalat at 2021-04-28T11:40:58+02:00 ChatList: Add basic list headers - - - - - 76ddf488 by wurstsalat at 2021-04-28T11:40:58+02:00 WorkspaceSidebar: Improve item highlighting - - - - - b402cd8f by wurstsalat at 2021-04-28T11:40:58+02:00 ChatList: Add move to workspace feature - - - - - 0cb4387e by wurstsalat at 2021-04-28T11:40:58+02:00 ChatList: Add placeholder - - - - - cd9db8f0 by wurstsalat at 2021-04-28T11:40:58+02:00 Various improvements - - - - - 82a5688a by wurstsalat at 2021-04-28T11:40:58+02:00 ChatListStack: Fix moving group chats - - - - - 298e62c5 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 Store pinned chats - - - - - 6d4941b0 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Improve sorting - - - - - ea07f8e1 by wurstsalat at 2021-04-28T11:40:58+02:00 WorkspaceDialog: Improvements - - - - - 833769cd by lovetox at 2021-04-28T11:40:58+02:00 Make contacts module work - - - - - 5130b54e by lovetox at 2021-04-28T11:40:58+02:00 further contacts - - - - - d28202c4 by lovetox at 2021-04-28T11:40:58+02:00 Roster: add iter_contacts() - - - - - 8efd45ad by lovetox at 2021-04-28T11:40:58+02:00 Fix receipt processing - - - - - c1ab3ac4 by lovetox at 2021-04-28T11:40:58+02:00 Fix subscription check - - - - - adfaa396 by lovetox at 2021-04-28T11:40:58+02:00 Chatlist: Remove tooltip - - - - - 6abf5005 by lovetox at 2021-04-28T11:40:58+02:00 Destroy roster correctly - - - - - 5e5a3735 by lovetox at 2021-04-28T11:40:58+02:00 Move finalize check to app module - - - - - 23a8512d by lovetox at 2021-04-28T11:40:58+02:00 Settings: Add json encoder/decoder - - - - - 3ad72f44 by lovetox at 2021-04-28T11:40:58+02:00 Fix MUC rejoins - - - - - 1b2650ec by lovetox at 2021-04-28T11:40:58+02:00 Refactor roster request code - - - - - a0420a14 by lovetox at 2021-04-28T11:40:58+02:00 Contacts: Fix access to roster attr - - - - - 31de08be by lovetox at 2021-04-28T11:40:58+02:00 Add room-left signal - - - - - 9e2a17b1 by lovetox at 2021-04-28T11:40:58+02:00 Fix muc user avatar update - - - - - 24bef3d5 by lovetox at 2021-04-28T11:40:58+02:00 Fix private chat - - - - - 97dc2ccb by lovetox at 2021-04-28T11:40:58+02:00 Remove unused imports - - - - - 34315372 by lovetox at 2021-04-28T11:40:58+02:00 Remove unused events and methods - - - - - d8108b5e by lovetox at 2021-04-28T11:40:58+02:00 Fix status selector - - - - - 7f08ae4a by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 Profile: Fix missing client - - - - - 62cc62c2 by lovetox at 2021-04-28T11:40:58+02:00 Refactor Avatar clipping - - - - - 379ef61b by lovetox at 2021-04-28T11:40:58+02:00 Groupchat: Restore got_disconnected() - - - - - efd4c994 by wurstsalat at 2021-04-28T11:40:58+02:00 Workspaces: Fix menu, store moved chats - - - - - da51aecd by wurstsalat at 2021-04-28T11:40:58+02:00 AccountPage: Add basic roster - - - - - 1a59a65b by wurstsalat at 2021-04-28T11:40:58+02:00 Roster: Improvements - - - - - 11b44529 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 Improve AccountPage and Roster - - - - - 4aa95028 by Daniel Brötzmann at 2021-04-28T11:40:58+02:00 ChatList: Improve popover menu - - - - - 332ec086 by lovetox at 2021-04-28T11:40:58+02:00 Fix Filter - - - - - 1e4b91b7 by wurstsalat at 2021-04-28T11:40:58+02:00 Roster: Add actions - - - - - 99d3ba20 by lovetox at 2021-04-28T11:40:58+02:00 AddContact: Refactor - - - - - 5ffb0681 by wurstsalat at 2021-04-28T11:40:58+02:00 Roster: Add filter menu, connect search - - - - - 8239d863 by lovetox at 2021-04-28T11:40:58+02:00 Work on Roster - - - - - 9cd01591 by lovetox at 2021-04-28T11:40:58+02:00 Roster: Add events - - - - - ac368662 by lovetox at 2021-04-28T11:40:58+02:00 Roster: Refactor - - - - - 65e51099 by wurstsalat at 2021-04-28T11:40:58+02:00 Roster: Implement filtering - - - - - df60515d by wurstsalat at 2021-04-28T11:40:58+02:00 Roster: Rename menu handlers - - - - - ac9d6cfe by wurstsalat at 2021-04-28T11:40:58+02:00 Roster: Implement middle mouse click - - - - - 10ccf43f by wurstsalat at 2021-04-28T11:40:58+02:00 Roster: Open chat when activating row - - - - - a039faf8 by lovetox at 2021-04-28T11:40:58+02:00 Dont show empty groups when filtering - - - - - fcb2e5bc by wurstsalat at 2021-04-28T11:40:58+02:00 Roster: Implement drag and drop - - - - - e6599a52 by lovetox at 2021-04-28T11:40:59+02:00 Add high performance option for big rosters - - - - - dce17b5c by lovetox at 2021-04-28T11:40:59+02:00 JSONEncoder/Decoder: handle set - - - - - 87dfc944 by lovetox at 2021-04-28T11:40:59+02:00 Roster: add group methods - - - - - 0b540437 by lovetox at 2021-04-28T11:40:59+02:00 Make dnd functional - - - - - 0441988e by lovetox at 2021-04-28T11:40:59+02:00 Roster: Fix removing contact - - - - - 2cb92d38 by lovetox at 2021-04-28T11:40:59+02:00 Refactor Blocking - - - - - 11625371 by lovetox at 2021-04-28T11:40:59+02:00 Roster: Refactor - - - - - 8abc84ed by lovetox at 2021-04-28T11:40:59+02:00 Roster: Fix reset - - - - - 2a135326 by lovetox at 2021-04-28T11:40:59+02:00 Remove unused import - - - - - 4b84db40 by lovetox at 2021-04-28T11:40:59+02:00 Fix leaving muc - - - - - 01129f2a by lovetox at 2021-04-28T11:40:59+02:00 Add more leak checks - - - - - f9f25c1d by lovetox at 2021-04-28T11:40:59+02:00 Save workspace order - - - - - b03c35ce by lovetox at 2021-04-28T11:40:59+02:00 Fix saving MUC avatar - - - - - bbcc47c3 by lovetox at 2021-04-28T11:40:59+02:00 MUC refactor Get rid of manager - - - - - f01e62dc by lovetox at 2021-04-28T11:40:59+02:00 Add methods for accessing resources - - - - - d8ce24e5 by lovetox at 2021-04-28T11:40:59+02:00 Add get_show_circle() - - - - - 9531c628 by lovetox at 2021-04-28T11:40:59+02:00 Raise cache size - - - - - 74de7068 by wurstsalat at 2021-04-28T11:40:59+02:00 Tooltips: Remove NotificationAreaTooltip - - - - - 704cd49e by wurstsalat at 2021-04-28T11:40:59+02:00 Tooltips: Refactor - - - - - c45f1b10 by wurstsalat at 2021-04-28T11:40:59+02:00 RosterTooltip: Add idle time - - - - - 999055f5 by wurstsalat at 2021-04-28T11:40:59+02:00 RosterTooltip: Remove old idle time remnant - - - - - 2185c56b by wurstsalat at 2021-04-28T11:40:59+02:00 ChatList: Add Start Chat placeholder - - - - - 0f32ff59 by wurstsalat at 2021-04-28T11:40:59+02:00 Tooltips: Reduce icon sizes - - - - - d33d4019 by wurstsalat at 2021-04-28T11:40:59+02:00 ChatList: Increase list header spacing - - - - - 3918c6e1 by Daniel Brötzmann at 2021-04-28T11:40:59+02:00 Main: Use popover menu - - - - - 0f565e95 by Daniel Brötzmann at 2021-04-28T11:40:59+02:00 WorkspaceSidebar: Improve Add button styling - - - - - 58b02bd8 by Daniel Brötzmann at 2021-04-28T11:40:59+02:00 AccountSidebar: Improve icons - - - - - 2a7318f5 by Daniel Brötzmann at 2021-04-28T11:40:59+02:00 Improve style for account identifier bar - - - - - 34953fd3 by Daniel Brötzmann at 2021-04-28T11:40:59+02:00 WorkspaceSidebar: Add name to tooltip - - - - - 5961d1f2 by Daniel Brötzmann at 2021-04-28T11:40:59+02:00 ChatList: Improve headers - - - - - 96dd60af by Daniel Brötzmann at 2021-04-28T11:40:59+02:00 AccountPage: Add avatar and profile button - - - - - 7d9fef2c by Daniel Brötzmann at 2021-04-28T11:40:59+02:00 ChatList: Implement Add to roster menu entry - - - - - 67665d8c by wurstsalat at 2021-04-28T11:40:59+02:00 StatusSelector: Use 'show circles' for icons - - - - - e4a13629 by lovetox at 2021-04-28T11:40:59+02:00 Fix add to contact list - - - - - 10a9e589 by lovetox at 2021-04-28T11:40:59+02:00 Remove module mock - - - - - 6440c7bd by wurstsalat at 2021-04-28T11:40:59+02:00 WorkspaceSidebar: Attempt to fix icon position - - - - - 8ca49175 by lovetox at 2021-04-28T11:40:59+02:00 Fix GC menu - - - - - e9a9f65a by lovetox at 2021-04-28T11:40:59+02:00 add get_groups() - - - - - e47f4ae7 by lovetox at 2021-04-28T11:40:59+02:00 more group functions - - - - - 195212a4 by lovetox at 2021-04-28T11:40:59+02:00 fix rename group - - - - - 8a3b6c4e by Daniel Brötzmann at 2021-04-28T11:40:59+02:00 Rework ContactInfo dialog - - - - - ea9a22f2 by wurstsalat at 2021-04-28T11:40:59+02:00 Fix sending files from ChatControl menu - - - - - c1c1f907 by wurstsalat at 2021-04-28T11:40:59+02:00 ContactInfo: Handle timeout correctly - - - - - 2565f975 by wurstsalat at 2021-04-28T11:40:59+02:00 Chat Controls: Simplify usage of client - - - - - 7e01f701 by wurstsalat at 2021-04-28T11:40:59+02:00 GroupChatInvite: Adapt to new contacts API - - - - - 6b5f8f5b by lovetox at 2021-04-28T11:40:59+02:00 Simplify code - - - - - 53f711ba by lovetox at 2021-04-28T11:40:59+02:00 Get correct path - - - - - 008b9e6e by lovetox at 2021-04-28T11:40:59+02:00 App: Force GC before checking if object is finalized - - - - - 58bac45b by lovetox at 2021-04-28T11:40:59+02:00 Refactor EntityTime - - - - - f87d7f8b by lovetox at 2021-04-28T11:40:59+02:00 Refactor ContactInfo - - - - - 869f02b6 by lovetox at 2021-04-28T11:40:59+02:00 show chat stack page on select=True - - - - - d80cbbb9 by wurstsalat at 2021-04-28T11:40:59+02:00 Add SubscriptionManager - - - - - dbc5c299 by lovetox at 2021-04-28T11:40:59+02:00 Remove obsolete methods - - - - - cd9b5f51 by lovetox at 2021-04-28T11:40:59+02:00 Fix PresenceShow comparison - - - - - 9229d8af by wurstsalat at 2021-04-28T11:40:59+02:00 ContactInfo: Adapt to contacts who are not in roster - - - - - 7a35150c by wurstsalat at 2021-04-28T11:40:59+02:00 NotificationManager: Show unsubscribed event - - - - - 4ce6062c by lovetox at 2021-04-28T11:40:59+02:00 Set allow_reply_func - - - - - 852ed306 by lovetox at 2021-04-28T11:40:59+02:00 Convert JID - - - - - 2eeeb210 by wurstsalat at 2021-04-28T11:40:59+02:00 GroupChatInvitation: Fix accepting invitation - - - - - adee1103 by wurstsalat at 2021-04-28T11:40:59+02:00 AccountPage: Handle muc invite/decline - - - - - c13b7be5 by lovetox at 2021-04-28T11:40:59+02:00 Refactor Presence module - - - - - 0c272c6a by wurstsalat at 2021-04-28T11:40:59+02:00 NotificationManager: Improve display - - - - - 9ba52ea4 by Daniel Brötzmann at 2021-04-28T11:40:59+02:00 CSS: Remove obsolete style - - - - - f41e94bf by wurstsalat at 2021-04-28T11:40:59+02:00 New ConversationView - - - - - 77525283 by wurstsalat at 2021-04-28T11:40:59+02:00 ConversationTextview: Fix vertical size allocation - - - - - 91934ffd by wurstsalat at 2021-04-28T11:40:59+02:00 ConversationView: Remove additional nickname characters - - - - - 6c027aa8 by lovetox at 2021-04-28T11:40:59+02:00 Lower hight of conversation rows - - - - - d93698e5 by wurstsalat at 2021-04-28T11:40:59+02:00 Add new feather-more-horizontal-symbolic icons - - - - - 8321e55c by lovetox at 2021-04-28T11:40:59+02:00 Better padding - - - - - 48e21b38 by wurstsalat at 2021-04-28T11:40:59+02:00 SingleMessageWindow: Rewrite - - - - - d03b1c44 by lovetox at 2021-04-28T11:40:59+02:00 Wrap menu button in eventbox - - - - - 356b8595 by lovetox at 2021-04-28T11:40:59+02:00 add new timestamp setting - - - - - 2dcad988 by lovetox at 2021-04-28T11:40:59+02:00 Group conversation code into own module - - - - - 8874535f by Daniel Brötzmann at 2021-04-28T11:40:59+02:00 SingleMessageWindow: Remove obsolete config values - - - - - bfc6235b by wurstsalat at 2021-04-28T11:40:59+02:00 HistoryWindow: Use ConversationView - - - - - 535d2ccc by lovetox at 2021-04-28T11:40:59+02:00 Refactor scrolling - - - - - 2fa5c991 by lovetox at 2021-04-28T11:40:59+02:00 Add ScrolledView - - - - - 021161bd by lovetox at 2021-04-28T11:40:59+02:00 Fix history mode - - - - - fae69f16 by lovetox at 2021-04-28T11:40:59+02:00 Fix completion state - - - - - b72e6fb6 by lovetox at 2021-04-28T11:40:59+02:00 Improve View sorting - - - - - e9b53cc4 by lovetox at 2021-04-28T11:40:59+02:00 Make read recipes work - - - - - f9a25515 by lovetox at 2021-04-28T11:40:59+02:00 Remove unused imports - - - - - bc061321 by lovetox at 2021-04-28T11:40:59+02:00 Improve read marker - - - - - 0867d7be by lovetox at 2021-04-28T11:40:59+02:00 show info messages - - - - - 15c1823a by lovetox at 2021-04-28T11:40:59+02:00 Fix readmarker breaking merge - - - - - da3c78a1 by wurstsalat at 2021-04-28T11:44:04+02:00 GTK Tests: Use ConversationView for XHTML test - - - - - 035ade7a by wurstsalat at 2021-04-28T11:44:08+02:00 Remove obsolete conversation_textview.py - - - - - e9b93d16 by lovetox at 2021-04-28T11:44:08+02:00 Prevent readmarker from showing until called - - - - - c5e08fe5 by lovetox at 2021-04-28T11:44:08+02:00 Rework Message Row - Add Styling - - - - - 047346c8 by lovetox at 2021-04-28T11:44:08+02:00 Fix Info message - - - - - 1a69e978 by wurstsalat at 2021-04-28T11:44:08+02:00 QuoteWidget: Add styling - - - - - d9c48396 by wurstsalat at 2021-04-28T11:44:08+02:00 PlainWidget: Strip text - - - - - 73dc096d by wurstsalat at 2021-04-28T11:44:08+02:00 Add SearchView - - - - - d788c654 by lovetox at 2021-04-28T11:44:08+02:00 Change Shortcut - - - - - 2fe7b207 by lovetox at 2021-04-28T11:44:08+02:00 Remove MessageWindow - - - - - 9e0a6aa8 by lovetox at 2021-04-28T11:44:08+02:00 Remove Session Code - - - - - 53df35fe by wurstsalat at 2021-04-28T11:44:08+02:00 CodeWidget: Add header and styling - - - - - f65ef447 by lovetox at 2021-04-28T11:44:08+02:00 Refactor Observable - - - - - 50fbc3cb by lovetox at 2021-04-28T11:44:08+02:00 Add SimpleClientState - - - - - 2b34e4db by lovetox at 2021-04-28T11:44:08+02:00 Refactor active/inactive Control state - - - - - f1809dc3 by lovetox at 2021-04-28T11:44:08+02:00 Fix some things - - - - - 091f17b6 by lovetox at 2021-04-28T11:44:08+02:00 Make Correction Work again - - - - - a8c6b685 by lovetox at 2021-04-28T11:44:08+02:00 Handle disconnect and resume-failed inside modules - - - - - 5a3d14fe by wurstsalat at 2021-04-28T11:44:08+02:00 Add Jump to bottom button - - - - - 5f74ed9c by lovetox at 2021-04-28T11:44:08+02:00 Fix Search - - - - - 4f78daa7 by lovetox at 2021-04-28T11:44:08+02:00 Move overlay to glade - - - - - 76ff5342 by lovetox at 2021-04-28T11:44:08+02:00 Add GroupchatState widget - - - - - 01238d57 by lovetox at 2021-04-28T11:44:08+02:00 Fix bugs when joining mucs - - - - - a07f6c1b by wurstsalat at 2021-04-28T11:44:08+02:00 GroupchatState: Add styling - - - - - 180a53e9 by lovetox at 2021-04-28T11:44:08+02:00 Refactor accessing muc data in controls - - - - - 1eb82682 by lovetox at 2021-04-28T11:44:08+02:00 More ChatControl changes - - - - - 4cd373d1 by lovetox at 2021-04-28T11:44:08+02:00 Refactor Add Message - - - - - 6388b4f8 by lovetox at 2021-04-28T11:44:08+02:00 More Control work - - - - - a34ef40d by lovetox at 2021-04-28T11:44:08+02:00 Refactor Main - - - - - a1a80978 by lovetox at 2021-04-28T11:44:08+02:00 Refactor ChatList - - - - - 59a1b6a2 by lovetox at 2021-04-28T11:44:08+02:00 Simplify init - - - - - c16fbd33 by lovetox at 2021-04-28T11:44:08+02:00 Remove unused methods - - - - - 25 changed files: - − .gitlab-ci.yml - appveyor.yml - flatpak/org.gajim.Gajim.yaml - gajim/app_actions.py - gajim/application.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/implementation/middleware.py - gajim/common/app.py - gajim/common/client.py - gajim/common/config.py - gajim/common/configpaths.py - − gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - gajim/common/contacts.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/modules/__init__.py - gajim/common/modules/base.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/caps.py - gajim/common/modules/chat_markers.py - gajim/common/modules/chatstates.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ca8620e0bd57b7575976619b169e0b3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ca8620e0bd57b7575976619b169e0b3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Remove unused methods
by Philipp Hörist 28 Apr '21

28 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: ca8620e0 by lovetox at 2021-04-28T11:40:14+02:00 Remove unused methods - - - - - 2 changed files: - gajim/gtk/main.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -34,8 +34,6 @@ def __init__(self): self.set_title('Gajim') self.set_default_size(1000, 500) - # Compatibility with ChatControl - self.window = self app.window = self self._startup_finished = False @@ -230,21 +228,6 @@ def _set_startup_finished(self): self._startup_finished = True self._chat_page.set_startup_finished() - def get_widget(self, name): - return getattr(self._ui, name) - - def redraw_tab(self, *args): - pass - - def remove_tab(self, *args): - pass - - def show_title(self, *args): - pass - - def get_active_jid(self, *args): - pass - def show_account_page(self, account): self._account_side_bar.activate_account_page(account) self._main_stack.show_account(account) ===================================== gajim/gui_interface.py ===================================== @@ -59,9 +59,7 @@ from gajim.dialog_messages import get_dialog from gajim.chat_control_base import ChatControlBase -from gajim.chat_control import ChatControl from gajim.groupchat_control import GroupchatControl -from gajim.privatechat_control import PrivateChatControl from gajim.common import idle from gajim.common.zeroconf import connection_zeroconf @@ -74,6 +72,7 @@ from gajim.common.structs import MUCData from gajim.common.structs import OutgoingMessage from gajim.common.nec import NetworkEvent +from gajim.common.nec import NetworkEventsController from gajim.common.i18n import _ from gajim.common.client import Client from gajim.common.const import Display @@ -82,7 +81,6 @@ from gajim.common.file_props import FilesProp from gajim.common.connection_handlers_events import InformationEvent -from gajim import roster_window from gajim.common import ged from gajim.common.exceptions import FileError @@ -113,19 +111,94 @@ log = logging.getLogger('gajim.interface') class Interface: + def __init__(self): + app.interface = self + app.thread_interface = ThreadInterface -################################################################################ -### Methods handling events from connection -################################################################################ + self.pass_dialog = {} - def handle_event_db_error(self, unused, error): - #('DB_ERROR', account, error) - if self.db_error_dialog: - return - self.db_error_dialog = ErrorDialog(_('Database Error'), error) - def destroyed(win): - self.db_error_dialog = None - self.db_error_dialog.connect('destroy', destroyed) + self.handlers = {} + self.roster = None + + self.avatar_storage = AvatarStorage() + + # Load CSS files + app.load_css_config() + + for account in app.settings.get_accounts(): + if app.settings.get_account_setting(account, 'is_zeroconf'): + app.ZEROCONF_ACC_NAME = account + break + + app.idlequeue = idlequeue.get_idlequeue() + # resolve and keep current record of resolved hosts + app.socks5queue = socks5.SocksQueue( + app.idlequeue, + self.handle_event_file_rcv_completed, + self.handle_event_file_progress, + self.handle_event_file_error) + app.proxy65_manager = proxy65_manager.Proxy65Manager(app.idlequeue) + + app.nec = NetworkEventsController() + app.notification = Notification() + + self.create_core_handlers_list() + self.register_core_handlers() + + # self.create_zeroconf_default_config() + # if app.settings.get_account_setting(app.ZEROCONF_ACC_NAME, 'active') \ + # and app.is_installed('ZEROCONF'): + # app.connections[app.ZEROCONF_ACC_NAME] = \ + # connection_zeroconf.ConnectionZeroconf(app.ZEROCONF_ACC_NAME) + + for account in app.settings.get_accounts(): + if (not app.settings.get_account_setting(account, 'is_zeroconf') and + app.settings.get_account_setting(account, 'active')): + client = Client(account) + app.connections[account] = client + app.ged.register_event_handler( + 'muc-added', ged.CORE, self._on_muc_added) + + self.instances = {} + + for a in app.connections: + self.instances[a] = {'infos': {}, 'disco': {}, 'gc_config': {}, + 'search': {}, 'sub_request': {}} + app.contacts.add_account(a) + app.groups[a] = {} + app.gc_connected[a] = {} + app.automatic_rooms[a] = {} + app.newly_added[a] = [] + app.to_be_removed[a] = [] + app.nicks[a] = app.settings.get_account_setting(a, 'name') + app.block_signed_in_notifications[a] = True + app.last_message_time[a] = {} + + if sys.platform not in ('win32', 'darwin'): + logind.enable() + music_track.enable() + else: + GLib.timeout_add_seconds(20, self.check_for_updates) + + idle.Monitor.set_interval(app.settings.get('autoawaytime') * 60, + app.settings.get('autoxatime') * 60) + + self.systray_enabled = False + + if not app.is_display(Display.WAYLAND): + from gajim.gui import statusicon + self.systray = statusicon.StatusIcon() + + if sys.platform in ('win32', 'darwin'): + from gajim.gui.emoji_chooser import emoji_chooser + emoji_chooser.load() + + self.last_ftwindow_update = 0 + + self._network_monitor = Gio.NetworkMonitor.get_default() + self._network_monitor.connect('notify::network-available', + self._network_status_changed) + self.network_state = self._network_monitor.get_network_available() @staticmethod def handle_event_information(obj): @@ -992,7 +1065,6 @@ def handle_event_plain_connection(self, event): def create_core_handlers_list(self): self.handlers = { - 'DB_ERROR': [self.handle_event_db_error], 'file-send-error': [self.handle_event_file_send_error], 'client-cert-passphrase': [ self.handle_event_client_cert_passphrase], @@ -1040,10 +1112,6 @@ def register_core_handlers(self): app.ged.register_event_handler(event_name, prio, event_handler) -################################################################################ -### Methods dealing with app.events -################################################################################ - def add_event(self, account, jid, event): """ Add an event to the app.events var @@ -1190,10 +1258,6 @@ def handle_event(self, account, fjid, type_): if isinstance(ctrl, ChatControlBase): ctrl.scroll_to_end() -################################################################################ -### Methods for opening new messages controls -################################################################################ - def show_groupchat(self, account, room_jid): return False minimized_control = self.minimized_controls[account].get(room_jid) @@ -1267,131 +1331,6 @@ def _on_muc_added(event): app.window.add_group_chat(event.account, str(event.jid)) - def new_private_chat(self, gc_contact, account, session=None): - conn = app.connections[account] - if not session and gc_contact.get_full_jid() in conn.sessions: - sessions = [s for s in conn.sessions[gc_contact.get_full_jid()].\ - values() if isinstance(s, ChatControlSession)] - - # look for an existing session with a chat control - for s in sessions: - if s.control: - session = s - break - if not session and sessions: - # there are no sessions with chat controls, just take the first - # one - session = sessions[0] - if not session: - # couldn't find an existing ChatControlSession, just make a new one - session = conn.make_new_session(gc_contact.get_full_jid(), None, - 'pm') - - contact = gc_contact.as_contact() - if not session.control: - message_window = self.msg_win_mgr.get_window( - gc_contact.get_full_jid(), account) - if not message_window: - message_window = self.msg_win_mgr.create_window( - contact, account, ControlType.PRIVATECHAT) - - session.control = PrivateChatControl(message_window, gc_contact, - contact, account, session) - message_window.new_tab(session.control) - - if app.events.get_events(account, gc_contact.get_full_jid()): - # We call this here to avoid race conditions with widget validation - session.control.read_queue() - - return session.control - - def new_chat(self, contact, account, resource=None, session=None): - # Get target window, create a control, and associate it with the window - fjid = contact.jid - if resource: - fjid += '/' + resource - - mw = self.msg_win_mgr.get_window(fjid, account) - if not mw: - mw = self.msg_win_mgr.create_window( - contact, account, ControlType.CHAT, resource) - - chat_control = ChatControl(mw, contact, account, session, resource) - - mw.new_tab(chat_control) - - if app.events.get_events(account, fjid): - # We call this here to avoid race conditions with widget validation - chat_control.read_queue() - - return chat_control - - def new_chat_from_jid(self, account, fjid, message=None): - jid, resource = app.get_room_and_nick_from_fjid(fjid) - contact = app.contacts.get_contact(account, jid, resource) - added_to_roster = False - if not contact: - added_to_roster = True - contact = self.roster.add_to_not_in_the_roster(account, jid, - resource=resource) - - ctrl = self.msg_win_mgr.get_control(fjid, account) - - if not ctrl: - ctrl = self.new_chat(contact, account, - resource=resource) - if app.events.get_events(account, fjid): - ctrl.read_queue() - - if message: - buffer_ = ctrl.msg_textview.get_buffer() - buffer_.set_text(message) - mw = ctrl.parent_win - mw.set_active_tab(ctrl) - # For JEP-0172 - if added_to_roster: - ctrl.user_nick = app.nicks[account] - - return ctrl - - def on_open_chat_window(self, widget, contact, account, resource=None, - session=None): - # Get the window containing the chat - fjid = contact.jid - - if resource: - fjid += '/' + resource - - ctrl = None - - if session: - ctrl = session.control - if not ctrl: - win = self.msg_win_mgr.get_window(fjid, account) - - if win: - ctrl = win.get_control(fjid, account) - - if not ctrl: - ctrl = self.new_chat(contact, account, resource=resource, - session=session) - # last message is long time ago - app.last_message_time[account][ctrl.get_full_jid()] = 0 - - win = ctrl.parent_win - - win.set_active_tab(ctrl) - - if app.connections[account].is_zeroconf and \ - app.connections[account].status == 'offline': - ctrl = win.get_control(fjid, account) - if ctrl: - ctrl.got_disconnected() - -################################################################################ -### Other Methods -################################################################################ - @staticmethod def create_account(account, username, @@ -1875,100 +1814,6 @@ def remote_init(): GLib.timeout_add_seconds(5, remote_init) MainWindow() - def __init__(self): - app.interface = self - app.thread_interface = ThreadInterface - # This is the manager and factory of message windows set by the module - self.msg_win_mgr = None - self.minimized_controls = {} - self.pass_dialog = {} - self.db_error_dialog = None - - self.handlers = {} - self.roster = None - - self.avatar_storage = AvatarStorage() - - # Load CSS files - app.load_css_config() - - for account in app.settings.get_accounts(): - if app.settings.get_account_setting(account, 'is_zeroconf'): - app.ZEROCONF_ACC_NAME = account - break - - app.idlequeue = idlequeue.get_idlequeue() - # resolve and keep current record of resolved hosts - app.socks5queue = socks5.SocksQueue(app.idlequeue, - self.handle_event_file_rcv_completed, - self.handle_event_file_progress, - self.handle_event_file_error) - app.proxy65_manager = proxy65_manager.Proxy65Manager(app.idlequeue) - - # Creating Network Events Controller - from gajim.common import nec - app.nec = nec.NetworkEventsController() - app.notification = Notification() - - self.create_core_handlers_list() - self.register_core_handlers() - - # self.create_zeroconf_default_config() - # if app.settings.get_account_setting(app.ZEROCONF_ACC_NAME, 'active') \ - # and app.is_installed('ZEROCONF'): - # app.connections[app.ZEROCONF_ACC_NAME] = \ - # connection_zeroconf.ConnectionZeroconf(app.ZEROCONF_ACC_NAME) - - for account in app.settings.get_accounts(): - if (not app.settings.get_account_setting(account, 'is_zeroconf') and - app.settings.get_account_setting(account, 'active')): - client = Client(account) - app.connections[account] = client - app.ged.register_event_handler( - 'muc-added', ged.CORE, self._on_muc_added) - - self.instances = {} - - for a in app.connections: - self.instances[a] = {'infos': {}, 'disco': {}, 'gc_config': {}, - 'search': {}, 'sub_request': {}} - self.minimized_controls[a] = {} - app.contacts.add_account(a) - app.groups[a] = {} - app.gc_connected[a] = {} - app.automatic_rooms[a] = {} - app.newly_added[a] = [] - app.to_be_removed[a] = [] - app.nicks[a] = app.settings.get_account_setting(a, 'name') - app.block_signed_in_notifications[a] = True - app.last_message_time[a] = {} - - if sys.platform not in ('win32', 'darwin'): - logind.enable() - music_track.enable() - else: - GLib.timeout_add_seconds(20, self.check_for_updates) - - idle.Monitor.set_interval(app.settings.get('autoawaytime') * 60, - app.settings.get('autoxatime') * 60) - - self.systray_enabled = False - - if not app.is_display(Display.WAYLAND): - from gajim.gui import statusicon - self.systray = statusicon.StatusIcon() - - if sys.platform in ('win32', 'darwin'): - from gajim.gui.emoji_chooser import emoji_chooser - emoji_chooser.load() - - self.last_ftwindow_update = 0 - - self._network_monitor = Gio.NetworkMonitor.get_default() - self._network_monitor.connect('notify::network-available', - self._network_status_changed) - self.network_state = self._network_monitor.get_network_available() - class ThreadInterface: def __init__(self, func, func_args=(), callback=None, callback_args=()): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca8620e0bd57b7575976619b169e0b35… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca8620e0bd57b7575976619b169e0b35… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Simplify init
by Philipp Hörist 28 Apr '21

28 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 9c66534e by lovetox at 2021-04-28T10:39:02+02:00 Simplify init - - - - - 2 changed files: - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -49,7 +49,7 @@ class ChatListStack(Gtk.Stack): (str, str, str)), } - def __init__(self, main_window, search_entry): + def __init__(self, search_entry): Gtk.Stack.__init__(self) self.set_hexpand(True) self.set_vexpand(True) @@ -63,7 +63,7 @@ def __init__(self, main_window, search_entry): self.connect('notify::visible-child-name', self._on_visible_child_name) search_entry.connect('search-changed', self._on_search_changed) - main_window.connect('notify::is-active', self._on_window_active) + app.window.connect('notify::is-active', self._on_window_active) self._add_actions() self.show_all() ===================================== gajim/gtk/chat_page.py ===================================== @@ -59,7 +59,7 @@ def __init__(self): self._search_revealer.add(self._search_view) self._ui.right_grid_overlay.add_overlay(self._search_revealer) - self._chat_list_stack = ChatListStack(app.window, self._ui.search_entry) + self._chat_list_stack = ChatListStack(self._ui.search_entry) self._chat_list_stack.connect('chat-selected', self._on_chat_selected) self._chat_list_stack.connect('chat-unselected', self._on_chat_unselected) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c66534ef6dea56b1dca03264f71bc17… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c66534ef6dea56b1dca03264f71bc17… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Refactor ChatList
by Philipp Hörist 28 Apr '21

28 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: d71682a0 by lovetox at 2021-04-28T10:38:06+02:00 Refactor ChatList - - - - - 3 changed files: - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -44,16 +44,17 @@ class ChatListStack(Gtk.Stack): 'chat-unselected': (GObject.SignalFlags.RUN_LAST, None, ()), + 'chat-removed': (GObject.SignalFlags.RUN_LAST, + None, + (str, str, str)), } - def __init__(self, main_window, ui, chat_stack): + def __init__(self, main_window, search_entry): Gtk.Stack.__init__(self) self.set_hexpand(True) self.set_vexpand(True) self.set_vhomogeneous(False) - self._ui = ui - self._chat_stack = chat_stack self._chat_lists = {} self._last_visible_child_name = 'default' @@ -61,9 +62,7 @@ def __init__(self, main_window, ui, chat_stack): self.add_named(Gtk.Box(), 'default') self.connect('notify::visible-child-name', self._on_visible_child_name) - self._ui.search_entry.connect( - 'search-changed', self._on_search_changed) - + search_entry.connect('search-changed', self._on_search_changed) main_window.connect('notify::is-active', self._on_window_active) self._add_actions() @@ -94,7 +93,6 @@ 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('') @@ -157,8 +155,6 @@ def show_chat_list(self, workspace_id): if current_workspace_id != 'default': self._chat_lists[current_workspace_id].unselect_all() - self._ui.workspace_label.set_text( - app.settings.get_workspace_setting(workspace_id, 'name')) self.set_visible_child_name(workspace_id) def add_chat(self, workspace_id, account, jid, type_, pinned=False): @@ -204,12 +200,7 @@ def remove_chat(self, workspace_id, account, jid): type_ = chat_list.get_chat_type(account, jid) chat_list.remove_chat(account, jid) self.store_open_chats(workspace_id) - - if not self.contains_chat(account, jid): - self._chat_stack.remove_chat(account, jid) - if type_ == 'groupchat': - client = app.get_client(account) - client.get_module('MUC').leave(jid) + self.emit('chat-removed', account, jid, type_) def _find_chat(self, account, jid): for chat_list in self._chat_lists.values(): ===================================== gajim/gtk/chat_page.py ===================================== @@ -59,10 +59,13 @@ def __init__(self): self._search_revealer.add(self._search_view) self._ui.right_grid_overlay.add_overlay(self._search_revealer) - self._chat_list_stack = ChatListStack(self, self._ui, self._chat_stack) + self._chat_list_stack = ChatListStack(app.window, self._ui.search_entry) self._chat_list_stack.connect('chat-selected', self._on_chat_selected) self._chat_list_stack.connect('chat-unselected', self._on_chat_unselected) + self._chat_list_stack.connect('chat-removed', self._on_chat_removed) + self._chat_list_stack.connect('notify::visible-child-name', + self._on_chat_list_changed) self._ui.chat_list_scrolled.add(self._chat_list_stack) self._ui.start_chat_button.connect('clicked', @@ -120,6 +123,10 @@ def _on_button_release(paned, event): def _on_chat_selected(self, _chat_list_stack, workspace_id, account, jid): self._chat_stack.show_chat(account, jid) self._search_view.set_context(account, jid) + + self._ui.workspace_label.set_text( + app.settings.get_workspace_setting(workspace_id, 'name')) + self.emit('chat-selected', workspace_id, account, jid) def _on_chat_unselected(self, _chat_list_stack): @@ -136,6 +143,9 @@ def _on_search_history(self, _action, _param): def _on_search_hide(self, *args): self._search_revealer.hide() + def _on_chat_list_changed(self, *args): + self._ui.search_entry.set_text('') + def process_event(self, event): self._chat_stack.process_event(event) self._chat_list_stack.process_event(event) @@ -219,6 +229,12 @@ def remove_chat(self, account, jid): self._chat_list_stack.remove_chat(workspace_id, account, jid) return + def _on_chat_removed(self, _chat_list, account, jid, type_): + self._chat_stack.remove_chat(account, jid) + if type_ == 'groupchat': + client = app.get_client(account) + client.get_module('MUC').leave(jid) + def get_control(self, account, jid): return self._chat_stack.get_control(account, jid) @@ -230,3 +246,7 @@ def get_active_control(self): def get_controls(self, account=None): return self._chat_stack.get_controls(account) + + def hide_search(self): + if self._search_revealer.get_reveal_child(): + self._search_revealer.hide() ===================================== gajim/gtk/main.py ===================================== @@ -173,8 +173,7 @@ def _on_action(self, action, _param): return res if action == 'escape': - if self._search_revealer.get_reveal_child(): - self._search_revealer.hide() + self._chat_page.hide_search() # if action == 'escape' and app.settings.get('escape_key_closes'): # self.remove_tab(control, self.CLOSE_ESC) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d71682a0e7c4bbf5bb98f5df71a34852… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d71682a0e7c4bbf5bb98f5df71a34852… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Refactor Main
by Philipp Hörist 28 Apr '21

28 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: c9580464 by lovetox at 2021-04-28T09:54:35+02:00 Refactor Main - - - - - 11 changed files: - + gajim/data/gui/chat_paned.ui - gajim/data/gui/main.ui - gajim/gtk/account_page.py - gajim/gtk/account_side_bar.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - + gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/main.py - + gajim/gtk/main_stack.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/gui/chat_paned.ui ===================================== @@ -0,0 +1,197 @@ +<?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> + <property name="position">250</property> + <property name="position-set">True</property> + <child> +  + <object class="GtkGrid" id="middle_grid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> +  + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="row-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" id="workspace_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">Workspace Label</property> + <property name="ellipsize">end</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="workspace_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> + <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">2</property> + </packing> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-left">6</property> + <property name="margin-right">6</property> + <property name="margin-start">6</property> + <property name="margin-end">6</property> + <property name="margin-top">12</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="visible">True</property> + <property name="can-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…</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="start_chat_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Start Chat</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">list-add-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="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <style> + <class name="chatlist-top-bar"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="chat_list_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> + <child> + <placeholder/> + </child> + <style> + <class name="no-border"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <style> + <class name="middle-grid"/> + </style> + </object> + <packing> + <property name="resize">False</property> + <property name="shrink">False</property> + </packing> + </child> + <child> +  + <object class="GtkGrid" id="right_grid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child> + <object class="GtkOverlay" id="right_grid_overlay"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/gui/main.ui ===================================== @@ -2,7 +2,7 @@  <interface> <requires lib="gtk+" version="3.22"/> -  +  <object class="GtkGrid" id="main_grid"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -130,229 +130,6 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <object class="GtkStack" id="main_stack"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkPaned" id="paned"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="position">250</property> - <property name="position-set">True</property> - <child> -  - <object class="GtkGrid" id="middle_grid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="row-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" id="workspace_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label">Workspace Label</property> - <property name="ellipsize">end</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="workspace_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> - <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">2</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</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="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkSearchEntry" id="search_entry"> - <property name="visible">True</property> - <property name="can-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…</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="start_chat_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Start Chat</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">list-add-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="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <style> - <class name="chatlist-top-bar"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="chat_list_scrolled"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="shadow-type">in</property> - <child> - <placeholder/> - </child> - <style> - <class name="no-border"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <style> - <class name="middle-grid"/> - </style> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">False</property> - </packing> - </child> - <child> -  - <object class="GtkGrid" id="right_grid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child> - <object class="GtkOverlay" id="right_grid_overlay"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="resize">True</property> - <property name="shrink">True</property> - </packing> - </child> - </object> - <packing> - <property name="name">chats</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child> <placeholder/> </child> ===================================== gajim/gtk/account_page.py ===================================== @@ -64,7 +64,6 @@ def __init__(self, account): self._ui.roster_menu_button.set_menu_model(roster_menu) self._ui.connect_signals(self) - self.show_all() # pylint: disable=line-too-long self.register_events([ @@ -76,6 +75,7 @@ def __init__(self, account): # pylint: enable=line-too-long self.update() + self.show_all() def _on_edit_profile(self, _button): open_window('ProfileWindow', account=self._account) ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -1,5 +1,17 @@ +# 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/>. -from gi.repository import GLib from gi.repository import Gtk from gajim.common.const import AvatarSize ===================================== gajim/gtk/chat_list.py ===================================== @@ -1,3 +1,17 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + import logging from gi.repository import Gdk ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -1,6 +1,21 @@ +# 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/>. from gi.repository import Gtk from gi.repository import GObject +from gi.repository import Gio +from gi.repository import GLib from gajim.common import app @@ -26,6 +41,9 @@ class ChatListStack(Gtk.Stack): 'chat-selected': (GObject.SignalFlags.RUN_LAST, None, (str, str, str)), + 'chat-unselected': (GObject.SignalFlags.RUN_LAST, + None, + ()), } def __init__(self, main_window, ui, chat_stack): @@ -42,13 +60,29 @@ def __init__(self, main_window, ui, chat_stack): 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) main_window.connect('notify::is-active', self._on_window_active) + self._add_actions() + self.show_all() + + def _add_actions(self): + actions = [ + ('toggle-chat-pinned', 'as', self._toggle_chat_pinned), + ('move-chat-to-workspace', 'as', self._move_chat_to_workspace), + ] + + for action in actions: + action_name, variant, func = action + if variant is not None: + variant = GLib.VariantType.new(variant) + act = Gio.SimpleAction.new(action_name, variant) + act.connect('activate', func) + app.window.add_action(act) + def _on_window_active(self, window, _param): is_active = window.get_property('is-active') if is_active: @@ -108,10 +142,9 @@ def remove_chat_list(self, workspace_id): def _on_row_selected(self, _chat_list, row): if row is None: - self._chat_stack.clear() + self.emit('chat-unselected') return - self._chat_stack.show_chat(row.account, row.jid) if row.is_active: row.reset_unread() self.emit('chat-selected', row.workspace_id, row.account, row.jid) @@ -148,11 +181,24 @@ def store_open_chats(self, workspace_id): app.settings.set_workspace_setting( workspace_id, 'open_chats', open_chats) - def toggle_chat_pinned(self, workspace_id, account, jid): + def _toggle_chat_pinned(self, _action, param): + workspace_id, account, jid = param.unpack() chat_list = self._chat_lists[workspace_id] chat_list.toggle_chat_pinned(account, jid) self.store_open_chats(workspace_id) + def _move_chat_to_workspace(self, _action, param): + new_workspace_id, account, jid = param.unpack() + + current_chatlist = self.get_visible_child() + type_ = current_chatlist.get_chat_type(account, jid) + current_chatlist.remove_chat(account, jid) + + new_chatlist = self.get_chatlist(new_workspace_id) + new_chatlist.add_chat(account, jid, type_) + self.store_open_chats(current_chatlist.workspace_id) + self.store_open_chats(new_workspace_id) + def remove_chat(self, workspace_id, account, jid): chat_list = self._chat_lists[workspace_id] type_ = chat_list.get_chat_type(account, jid) ===================================== gajim/gtk/chat_page.py ===================================== @@ -0,0 +1,232 @@ +# 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/>. + + +from gi.repository import Gtk +from gi.repository import GLib +from gi.repository import Gio +from gi.repository import GObject + +from gajim.common import app +from gajim.common.i18n import _ + +from .util import get_builder +from .chat_list_stack import ChatListStack +from .chat_stack import ChatStack +from .search_view import SearchView + + +WORKSPACE_MENU_DICT = { + 'edit': _('Edit…'), + 'remove': _('Remove'), +} + + +class ChatPage(Gtk.Box): + + __gsignals__ = { + 'chat-selected': (GObject.SignalFlags.RUN_LAST, + None, + (str, str, str)), + } + + def __init__(self): + Gtk.Box.__init__(self) + self._ui = get_builder('chat_paned.ui') + self.add(self._ui.paned) + + self._chat_stack = ChatStack() + self._ui.right_grid_overlay.add(self._chat_stack) + + self._search_view = SearchView() + self._search_view.connect('hide-search', self._on_search_hide) + + self._search_revealer = Gtk.Revealer() + self._search_revealer.set_reveal_child(True) + self._search_revealer.set_halign(Gtk.Align.END) + self._search_revealer.set_no_show_all(True) + self._search_revealer.add(self._search_view) + self._ui.right_grid_overlay.add_overlay(self._search_revealer) + + self._chat_list_stack = ChatListStack(self, self._ui, self._chat_stack) + self._chat_list_stack.connect('chat-selected', self._on_chat_selected) + self._chat_list_stack.connect('chat-unselected', + self._on_chat_unselected) + self._ui.chat_list_scrolled.add(self._chat_list_stack) + + self._ui.start_chat_button.connect('clicked', + self._on_start_chat_clicked) + + self._ui.paned.set_position(app.settings.get('chat_handle_position')) + self._ui.paned.connect('button-release-event', self._on_button_release) + + workspace_menu = Gio.Menu() + for action, label in WORKSPACE_MENU_DICT.items(): + workspace_menu.append(label, f'win.{action.lower()}-workspace') + + self._ui.workspace_menu_button.set_menu_model(workspace_menu) + + self._startup_finished = False + + self._add_actions() + + self.show_all() + + def _add_actions(self): + actions = [ + ('remove-chat', 'as', self._remove_chat), + ('search-history', None, self._on_search_history), + ] + + for action in actions: + action_name, variant, func = action + if variant is not None: + variant = GLib.VariantType.new(variant) + act = Gio.SimpleAction.new(action_name, variant) + act.connect('activate', func) + app.window.add_action(act) + + def set_startup_finished(self): + self._startup_finished = True + + def get_chat_list_stack(self): + return self._chat_list_stack + + def get_chat_stack(self): + return self._chat_stack + + @staticmethod + def _on_start_chat_clicked(_button): + app.app.activate_action('start-chat', GLib.Variant('s', '')) + + @staticmethod + def _on_button_release(paned, event): + if event.window != paned.get_handle_window(): + return + position = paned.get_position() + app.settings.set('chat_handle_position', position) + + def _on_chat_selected(self, _chat_list_stack, workspace_id, account, jid): + self._chat_stack.show_chat(account, jid) + self._search_view.set_context(account, jid) + self.emit('chat-selected', workspace_id, account, jid) + + def _on_chat_unselected(self, _chat_list_stack): + self._chat_stack.clear() + + def _on_search_history(self, _action, _param): + control = self.get_active_control() + if control is not None: + self._search_view.set_context(control.account, control.contact.jid) + self._search_view.clear() + self._search_revealer.show() + self._search_view.set_focus() + + def _on_search_hide(self, *args): + self._search_revealer.hide() + + def process_event(self, event): + self._chat_stack.process_event(event) + self._chat_list_stack.process_event(event) + + def add_chat_list(self, workspace_id): + self._chat_list_stack.add_chat_list(workspace_id) + + def show_workspace_chats(self, workspace_id): + self._chat_list_stack.show_chat_list(workspace_id) + + def update_workspace(self, workspace_id): + name = app.settings.get_workspace_setting(workspace_id, 'name') + self._ui.workspace_label.set_text(name) + + def remove_chat_list(self, workspace_id): + self._chat_list_stack.remove_chat_list(workspace_id) + + def chat_exists(self, account, jid): + return self._chat_list_stack.contains_chat(account, jid) + + def chat_exists_for_workspace(self, workspace_id, account, jid): + return self._chat_list_stack.contains_chat( + account, jid, workspace_id=workspace_id) + + def add_chat_for_workspace(self, + workspace_id, + account, + jid, + type_, + pinned=False, + select=False): + + if self.chat_exists(account, jid): + if select: + self._chat_list_stack.select_chat(account, jid) + return + + if type_ == 'groupchat': + self._chat_stack.add_group_chat(account, jid) + elif type_ == 'pm': + if not self._startup_finished: + # TODO: Currently we cant load private chats at start + # because the Contacts dont exist yet + return + self._chat_stack.add_private_chat(account, jid) + else: + self._chat_stack.add_chat(account, jid) + self._chat_list_stack.add_chat(workspace_id, account, jid, type_, + pinned) + + if self._startup_finished: + if select: + self._chat_list_stack.select_chat(account, jid) + self._chat_list_stack.store_open_chats(workspace_id) + + def load_workspace_chats(self, workspace_id): + open_chats = app.settings.get_workspace_setting(workspace_id, + 'open_chats') + + active_accounts = app.settings.get_active_accounts() + for account, jid, type_, pinned in open_chats: + if account not in active_accounts: + continue + + self.add_chat_for_workspace(workspace_id, + account, + jid, + type_, + pinned=pinned) + + def is_chat_active(self, account, jid): + return self._chat_list_stack.is_chat_active(account, jid) + + def _remove_chat(self, _action, param): + account, jid = param.unpack() + self.remove_chat(account, jid) + + def remove_chat(self, account, jid): + for workspace_id in app.settings.get_workspaces(): + if self.chat_exists_for_workspace(workspace_id, account, jid): + self._chat_list_stack.remove_chat(workspace_id, account, jid) + return + + def get_control(self, account, jid): + return self._chat_stack.get_control(account, jid) + + def get_active_control(self): + chat = self._chat_list_stack.get_selected_chat() + if chat is None: + return None + return self.get_control(chat.account, chat.jid) + + def get_controls(self, account=None): + return self._chat_stack.get_controls(account) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -1,15 +1,25 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. import logging from gi.repository import Gtk -from gajim.common import app from gajim.chat_control import ChatControl from gajim.groupchat_control import GroupchatControl from gajim.privatechat_control import PrivateChatControl -from gajim.common.i18n import _ - log = logging.getLogger('gajim.gui.chatstack') ===================================== gajim/gtk/main.py ===================================== @@ -11,13 +11,10 @@ from gajim.common.i18n import _ from gajim.common.nec import EventHelper -from gajim.gui.account_page import AccountPage from gajim.gui.adhoc import AdHocCommand -from gajim.gui.search_view import SearchView -from gajim.gui.chat_list_stack import ChatListStack -from gajim.gui.chat_stack import ChatStack from gajim.gui.account_side_bar import AccountSideBar from gajim.gui.workspace_side_bar import WorkspaceSideBar +from gajim.gui.main_stack import MainStack from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.util import get_builder @@ -27,11 +24,6 @@ log = logging.getLogger('gajim.gui.main') -WORKSPACE_MENU_DICT = { - 'edit': _('Edit…'), - 'remove': _('Remove'), -} - class MainWindow(Gtk.ApplicationWindow, EventHelper): def __init__(self): @@ -46,8 +38,6 @@ def __init__(self): self.window = self app.window = self - self._active_workspace = None - self._startup_finished = False self._ui = get_builder('main.ui') @@ -57,44 +47,19 @@ def __init__(self): surface = load_icon('org.gajim.Gajim', self, 40) self._ui.app_image.set_from_surface(surface) - self._chat_stack = ChatStack() - self._ui.right_grid_overlay.add(self._chat_stack) - - self._search_view = SearchView() - self._search_view.connect('hide-search', self._on_search_hide) - - self._search_revealer = Gtk.Revealer() - self._search_revealer.set_reveal_child(True) - self._search_revealer.set_halign(Gtk.Align.END) - self._search_revealer.set_no_show_all(True) - self._search_revealer.add(self._search_view) - self._ui.right_grid_overlay.add_overlay(self._search_revealer) + self._main_stack = MainStack() + self._ui.main_grid.add(self._main_stack) - self._chat_list_stack = ChatListStack(self, self._ui, self._chat_stack) - self._chat_list_stack.connect('chat-selected', self._on_chat_selected) - self._ui.chat_list_scrolled.add(self._chat_list_stack) + self._chat_page = self._main_stack.get_chat_page() - self._workspace_side_bar = WorkspaceSideBar(self._chat_list_stack) + self._workspace_side_bar = WorkspaceSideBar(self._chat_page) self._ui.workspace_scrolled.add(self._workspace_side_bar) self._account_side_bar = AccountSideBar() self._ui.account_box.add(self._account_side_bar) - self._account_pages = {} - - workspace_menu = Gio.Menu() - for action, label in WORKSPACE_MENU_DICT.items(): - workspace_menu.append(label, f'win.{action.lower()}-workspace') - - self._ui.workspace_menu_button.set_menu_model(workspace_menu) - - self._ui.start_chat_button.connect( - 'clicked', self._on_start_chat_clicked) self._ui.connect_signals(self) - self._ui.paned.set_position(app.settings.get('chat_handle_position')) - self._ui.paned.connect('button-release-event', self._on_button_release) - self.register_events([ ('presence-received', ged.GUI1, self._on_event), ('caps-update', ged.GUI1, self._on_event), @@ -113,12 +78,10 @@ def __init__(self): ('signed-in', ged.GUI1, self._on_signed_in), ]) - self.show_all() - self._load_chats() - self._add_accounts() self._add_actions() self._add_actions2() + self.show_all() @staticmethod def _on_our_show(event): @@ -131,13 +94,6 @@ def _on_signed_in(event): app.app.set_account_actions_state(event.account, True) app.app.update_app_actions_state() - @staticmethod - def _on_button_release(paned, event): - if event.window != paned.get_handle_window(): - return - position = paned.get_position() - app.settings.set('chat_handle_position', position) - def _add_actions(self): actions = [ ('add-workspace', 's', self._add_workspace), @@ -146,11 +102,7 @@ def _add_actions(self): ('activate-workspace', 's', self._activate_workspace), ('add-chat', 'a{sv}', self._add_chat), ('add-group-chat', 'as', self._add_group_chat), - ('remove-chat', 'as', self._remove_chat), - ('toggle-chat-pinned', 'as', self._toggle_chat_pinned), - ('move-chat-to-workspace', 'as', self._move_chat_to_workspace), ('add-to-roster', 'as', self._add_to_roster), - ('search-history', None, self._on_search_history), ] for action in actions: @@ -275,6 +227,10 @@ def _on_action(self, action, _param): # self.notebook.set_current_page(number - 1) # return + def _set_startup_finished(self): + self._startup_finished = True + self._chat_page.set_startup_finished() + def get_widget(self, name): return getattr(self._ui, name) @@ -290,15 +246,9 @@ def show_title(self, *args): def get_active_jid(self, *args): pass - def get_account_page(self, account): - return self._account_pages[account] - def show_account_page(self, account): self._account_side_bar.activate_account_page(account) - self._ui.main_stack.set_visible_child_name(account) - - def get_workspace_bar(self): - return self._workspace_side_bar + self._main_stack.show_account(account) def get_active_workspace(self): return self._workspace_side_bar.get_active_workspace() @@ -306,10 +256,7 @@ def get_active_workspace(self): def is_chat_active(self, account, jid): if not self.get_property('has-toplevel-focus'): return False - return self._chat_list_stack.is_chat_active(account, jid) - - def show_chats(self): - self._ui.main_stack.set_visible_child_name('chats') + return self._chat_page.is_chat_active(account, jid) def _add_workspace(self, _action, param): workspace_id = param.get_string() @@ -317,20 +264,16 @@ def _add_workspace(self, _action, param): def add_workspace(self, workspace_id): self._workspace_side_bar.add_workspace(workspace_id) - self._chat_list_stack.add_chat_list(workspace_id) - self._workspace_side_bar.activate_workspace(workspace_id) - self._chat_list_stack.show_chat_list(workspace_id) + self._chat_page.add_chat_list(workspace_id) + if self._startup_finished: + self.activate_workspace(workspace_id) self._workspace_side_bar.store_workspace_order() def _edit_workspace(self, _action, _param): workspace_id = self.get_active_workspace() if workspace_id is not None: - self.edit_workspace(workspace_id) - - @staticmethod - def edit_workspace(workspace_id): - open_window('WorkspaceDialog', workspace_id=workspace_id) + open_window('WorkspaceDialog', workspace_id=workspace_id) def _remove_workspace(self, _action, _param): workspace_id = self.get_active_workspace() @@ -346,10 +289,9 @@ def remove_workspace(self, workspace_id): if was_active: new_active_id = self._workspace_side_bar.get_first_workspace() - self._workspace_side_bar.activate_workspace(new_active_id) - self._chat_list_stack.show_chat_list(new_active_id) + self.activate_workspace(new_active_id) - self._chat_list_stack.remove_chat_list(workspace_id) + self._chat_page.remove_chat_list(workspace_id) app.settings.remove_workspace(workspace_id) def _activate_workspace(self, _action, param): @@ -357,138 +299,59 @@ def _activate_workspace(self, _action, param): self.activate_workspace(workspace_id) def activate_workspace(self, workspace_id): - self._ui.main_stack.set_visible_child_name('chats') + self._main_stack.show_chats(workspace_id) self._workspace_side_bar.activate_workspace(workspace_id) - self._chat_list_stack.show_chat_list(workspace_id) def update_workspace(self, workspace_id): - name = app.settings.get_workspace_setting(workspace_id, 'name') - self._ui.workspace_label.set_text(name) - app.interface.avatar_storage.invalidate_cache(workspace_id) + self._chat_page.update_workspace(workspace_id) self._workspace_side_bar.update_avatar(workspace_id) def _add_group_chat(self, _action, param): - account, jid = param.unpack() - self.add_group_chat(account, jid) + self.add_group_chat(**param.unpack()) def add_group_chat(self, account, jid, select=False): - workspace_id = self._workspace_side_bar.get_active_workspace() - self.add_chat_for_workspace(workspace_id, - account, - jid, - 'groupchat', - select=select) + workspace_id = self.get_active_workspace() + self._chat_page.add_chat_for_workspace(workspace_id, + account, + jid, + 'groupchat', + select=select) def _add_chat(self, _action, param): self.add_chat(**param.unpack()) def add_chat(self, account, jid, type_, select=False): - workspace_id = self._workspace_side_bar.get_active_workspace() - self.add_chat_for_workspace(workspace_id, - account, - jid, - type_, - select=select) + workspace_id = self.get_active_workspace() + self._chat_page.add_chat_for_workspace(workspace_id, + account, + jid, + type_, + select=select) def add_private_chat(self, account, jid, select=False): - workspace_id = self._workspace_side_bar.get_active_workspace() - self.add_chat_for_workspace(workspace_id, - account, - jid, - 'pm', - select=select) - - def add_chat_for_workspace(self, - workspace_id, - account, - jid, - type_, - pinned=False, - select=False): - if self.chat_exists(account, jid): - if select: - self._chat_list_stack.select_chat(account, jid) - self.show_chats() - return - - if type_ == 'groupchat': - self._chat_stack.add_group_chat(account, jid) - elif type_ == 'pm': - if not self._startup_finished: - # TODO: Currently we cant load private chats at start - # because the Contacts dont exist yet - return - self._chat_stack.add_private_chat(account, jid) - else: - self._chat_stack.add_chat(account, jid) - self._chat_list_stack.add_chat(workspace_id, account, jid, type_, - pinned) - - if self._startup_finished: - if select: - self._chat_list_stack.select_chat(account, jid) - self.show_chats() - self._chat_list_stack.store_open_chats(workspace_id) - - def _toggle_chat_pinned(self, _action, param): - workspace_id, account, jid = param.unpack() - self.toggle_chat_pinned(workspace_id, account, jid) - - def toggle_chat_pinned(self, workspace_id, account, jid): - self._chat_list_stack.toggle_chat_pinned(workspace_id, account, jid) - - def _move_chat_to_workspace(self, _action, param): - new_workspace_id, account, jid = param.unpack() - self.move_chat_to_workspace(new_workspace_id, account, jid) - - def move_chat_to_workspace(self, new_workspace_id, account, jid): - current_chatlist = self._chat_list_stack.get_visible_child() - type_ = current_chatlist.get_chat_type(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): - account, jid = param.unpack() - self.remove_chat(account, jid) - - def remove_chat(self, account, jid): - for workspace_id in app.settings.get_workspaces(): - if self.chat_exists_for_workspace(workspace_id, account, jid): - self._chat_list_stack.remove_chat(workspace_id, account, jid) - return + workspace_id = self.get_active_workspace() + self._chat_page.add_chat_for_workspace(workspace_id, + account, + jid, + 'pm', + select=select) @staticmethod def _add_to_roster(_action, param): _workspace, account, jid = param.unpack() open_window('AddNewContactWindow', account=account, contact_jid=jid) - def chat_exists(self, account, jid): - return self._chat_list_stack.contains_chat(account, jid) + def get_control(self, *args, **kwargs): + return self._chat_page.get_control(*args, **kwargs) - def chat_exists_for_workspace(self, workspace_id, account, jid): - return self._chat_list_stack.contains_chat( - account, jid, workspace_id=workspace_id) + def get_controls(self, *args, **kwargs): + return self._chat_page.get_controls(*args, **kwargs) - def get_control(self, account, jid): - return self._chat_stack.get_control(account, jid) + def get_active_control(self, *args, **kwargs): + return self._chat_page.get_active_control(*args, **kwargs) - def get_active_control(self): - chat = self._chat_list_stack.get_selected_chat() - if chat is None: - return None - return self.get_control(chat.account, chat.jid) - - def get_controls(self, account=None): - return self._chat_stack.get_controls(account) - - def _add_accounts(self): - for account in list(app.connections.keys()): - account_page = AccountPage(account) - self._account_pages[account] = account_page - self._ui.main_stack.add_named(account_page, account) + def chat_exists(self, *args, **kwargs): + return self._chat_page.chat_exists(*args, **kwargs) @staticmethod def contact_info(account, jid): @@ -512,7 +375,7 @@ def block_contact(self, account, jid): # TODO: Keep "confirm_block" setting? def _block_contact(report=None): client.get_module('Blocking').block([contact.jid], report) - self.remove_chat(account, contact.jid) + self._chat_page.remove_chat(account, contact.jid) ConfirmationDialog( _('Block Contact'), @@ -533,7 +396,7 @@ def remove_contact(self, account, jid): client = app.get_client(account) def _remove_contact(): - self.remove_chat(account, jid) + self._chat_page.remove_chat(account, jid) client.get_module('Roster').delete_item(jid) contact = client.get_module('Contacts').get_contact(jid) @@ -552,45 +415,13 @@ def _remove_contact(): def _load_chats(self): for workspace_id in app.settings.get_workspaces(): - self._workspace_side_bar.add_workspace(workspace_id) - self._chat_list_stack.add_chat_list(workspace_id) - open_chats = app.settings.get_workspace_setting(workspace_id, - 'open_chats') - - active_accounts = app.settings.get_active_accounts() - for account, jid, type_, pinned in open_chats: - if account not in active_accounts: - continue - - self.add_chat_for_workspace(workspace_id, account, jid, type_, - pinned=pinned) - - for workspace_id in app.settings.get_workspaces(): - self._workspace_side_bar.activate_workspace(workspace_id) - self._chat_list_stack.show_chat_list(workspace_id) - break - - self._startup_finished = True - - @staticmethod - def _on_start_chat_clicked(_button): - app.app.activate_action('start-chat', GLib.Variant('s', '')) - - def _on_chat_selected(self, _chat_list_stack, _workspace_id, *args): - control = self.get_active_control() - if control is not None: - self._search_view.set_context(control.account, control.contact.jid) + self.add_workspace(workspace_id) + self._chat_page.load_workspace_chats(workspace_id) - def _on_search_history(self, _action, _param): - control = self.get_active_control() - if control is not None: - self._search_view.set_context(control.account, control.contact.jid) - self._search_view.clear() - self._search_revealer.show() - self._search_view.set_focus() + workspace_id = self._workspace_side_bar.get_first_workspace() + self.activate_workspace(workspace_id) - def _on_search_hide(self, *args): - self._search_revealer.hide() + self._set_startup_finished() def _on_event(self, event): if event.name == 'caps-update': @@ -600,9 +431,6 @@ 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: @@ -617,8 +445,7 @@ def _on_event(self, event): # No chat is open, dont handle any gui events return - self._chat_stack.process_event(event) - self._chat_list_stack.process_event(event) + self._main_stack.process_event(event) def quit(self): accounts = list(app.connections.keys()) ===================================== gajim/gtk/main_stack.py ===================================== @@ -0,0 +1,53 @@ +# 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/>. + +from gi.repository import Gtk + +from gajim.common import app + +from .chat_page import ChatPage +from .account_page import AccountPage + + +class MainStack(Gtk.Stack): + def __init__(self): + Gtk.Stack.__init__(self) + + self._chat_page = ChatPage() + self._chat_page.connect('chat-selected', self._on_chat_selected) + self.add_named(self._chat_page, 'chats') + + for account in list(app.connections.keys()): + account_page = AccountPage(account) + self.add_named(account_page, account) + + def show_chats(self, workspace_id): + self._chat_page.show_workspace_chats(workspace_id) + self.set_visible_child_name('chats') + + def show_account(self, account): + self.set_visible_child_name(account) + + def get_account_page(self, account): + return self.get_child_by_name(account) + + def get_chat_page(self): + return self.get_child_by_name('chats') + + def process_event(self, event): + for page in self.get_children(): + page.process_event(event) + + def _on_chat_selected(self, *args): + self.set_visible_child_name('chats') ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -1,3 +1,16 @@ +# 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/>. from gi.repository import Gdk from gi.repository import Gtk @@ -10,7 +23,7 @@ class WorkspaceSideBar(Gtk.ListBox): - def __init__(self, chat_list_stack): + def __init__(self, chat_page): Gtk.ListBox.__init__(self) self.set_vexpand(True) self.set_valign(Gtk.Align.START) @@ -38,6 +51,7 @@ def __init__(self, chat_list_stack): self.add(AddWorkspace('add')) + chat_list_stack = chat_page.get_chat_list_stack() chat_list_stack.connect('unread-count-changed', self._on_unread_count_changed) chat_list_stack.connect('chat-selected', @@ -286,6 +300,7 @@ def __init__(self, workspace_id): self.update() def update(self): + app.interface.avatar_storage.invalidate_cache(self._workspace_id) scale = self.get_scale_factor() surface = app.interface.avatar_storage.get_workspace_surface( self._workspace_id, AvatarSize.WORKSPACE, scale) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c9580464022079b9a394c79d5c0dfd0d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c9580464022079b9a394c79d5c0dfd0d… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2021