Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: fix: ChatFunctionPage: React to connection changes
by Daniel Brötzmann (＠wurstsalat) 12 Oct '22

12 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 37b77137 by wurstsalat at 2022-10-12T22:53:36+02:00 fix: ChatFunctionPage: React to connection changes Fixes #11206 - - - - - ce4c8c87 by wurstsalat at 2022-10-12T22:56:35+02:00 refactor: ChatFunctionPage: Use FunctionMode Enum - - - - - 2 changed files: - gajim/gtk/chat_function_page.py - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -16,6 +16,8 @@ from typing import Optional +from enum import Enum + from gi.repository import GObject from gi.repository import Gtk from gi.repository import Pango @@ -25,15 +27,28 @@ from nbxmpp.protocol import validate_resourcepart from gajim.common import app -from gajim.common.client import Client +from gajim.common import types +from gajim.common.const import SimpleClientState from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact -from gajim.common.types import ChatContactT from .dataform import DataFormWidget from .groupchat_inviter import GroupChatInviter +class FunctionMode(Enum): + INVITE = 'invite' + CHANGE_NICKNAME = 'change-nickname' + KICK = 'kick' + BAN = 'ban' + PASSWORD_REQUEST = 'password-request' + CAPTCHA_REQUEST = 'captcha-request' + CAPTCHA_ERROR = 'captcha-error' + JOIN_FAILED = 'join-failed' + CREATION_FAILED = 'creation-failed' + CONFIG_FAILED = 'config-failed' + + class ChatFunctionPage(Gtk.Box): __gsignals__ = { @@ -49,9 +64,11 @@ def __init__(self) -> None: self.set_valign(Gtk.Align.CENTER) self.get_style_context().add_class('padding-18') - self._client: Optional[Client] = None - self._contact: Optional[ChatContactT] = None - self._mode: Optional[str] = None + self._client: Optional[types.Client] = None + self._contact: Optional[types.ChatContactT] = None + self._mode: Optional[FunctionMode] = None + self._data: Optional[str] = None + self._ready_state = True self._widget: Optional[Gtk.Widget] = None @@ -87,22 +104,22 @@ def __init__(self) -> None: def process_escape(self) -> None: close_control = self._mode in ( - 'join-failed', - 'creation-failed', - 'config-failed', - 'captcha-error') + FunctionMode.JOIN_FAILED, + FunctionMode.CREATION_FAILED, + FunctionMode.CONFIG_FAILED, + FunctionMode.CAPTCHA_ERROR) self.emit('finish', close_control) - def _clear(self) -> None: + def _reset(self) -> None: + if self._client is not None: + self._client.disconnect_all_from_obj(self) + for child in self._content_box.get_children(): child.destroy() - def set_mode(self, - contact: ChatContactT, - mode: str, - data: Optional[str] = None - ) -> None: - self._clear() + if self._widget is not None: + self._widget.destroy() + self._confirm_button.get_style_context().remove_class( 'destructive-action') self._confirm_button.get_style_context().remove_class( @@ -110,18 +127,30 @@ def set_mode(self, self._confirm_button.set_sensitive(False) self._confirm_button.grab_default() + self._forget_button.set_sensitive(True) self._forget_button.hide() + self._ready_state = True + + def set_mode(self, + contact: types.ChatContactT, + mode: FunctionMode, + data: Optional[str] = None + ) -> None: + + self._reset() + self._contact = contact - self._heading.set_text(self._contact.name) self._client = app.get_client(contact.account) + self._client.connect_signal( + 'state-changed', self._on_client_state_changed) + self._mode = mode self._data = data - if self._widget is not None: - self._widget.destroy() + self._heading.set_text(self._contact.name) - if mode == 'invite': + if mode == FunctionMode.INVITE: self._confirm_button.set_label(_('Invite')) self._confirm_button.get_style_context().add_class( 'suggested-action') @@ -130,35 +159,35 @@ def set_mode(self, self._widget.connect('listbox-changed', self._on_ready) self._widget.load_contacts() - elif mode == 'change-nickname': + elif mode == FunctionMode.CHANGE_NICKNAME: self._confirm_button.set_label(_('Change')) self._confirm_button.get_style_context().add_class( 'suggested-action') self._widget = InputWidget(self._contact, mode) self._widget.connect('changed', self._on_ready) - elif mode == 'kick': + elif mode == FunctionMode.KICK: self._confirm_button.set_label(_('Kick')) self._confirm_button.set_sensitive(True) self._confirm_button.get_style_context().add_class( 'destructive-action') self._widget = InputWidget(self._contact, mode, data) - elif mode == 'ban': + elif mode == FunctionMode.BAN: self._confirm_button.set_label(_('Ban')) self._confirm_button.set_sensitive(True) self._confirm_button.get_style_context().add_class( 'destructive-action') self._widget = InputWidget(self._contact, mode, data) - elif mode == 'password-request': + elif mode == FunctionMode.PASSWORD_REQUEST: self._confirm_button.set_label(_('Join')) self._confirm_button.get_style_context().add_class( 'suggested-action') self._widget = InputWidget(self._contact, mode) self._widget.connect('changed', self._on_ready) - elif mode == 'captcha-request': + elif mode == FunctionMode.CAPTCHA_REQUEST: self._confirm_button.set_label(_('Join')) self._confirm_button.get_style_context().add_class( 'suggested-action') @@ -172,23 +201,25 @@ def set_mode(self, self._widget.show_all() self._widget.connect('is-valid', self._on_ready) - elif mode == 'captcha-error': + elif mode == FunctionMode.CAPTCHA_ERROR: self._confirm_button.set_label(_('Try Again')) self._confirm_button.set_sensitive(True) self._confirm_button.get_style_context().add_class( 'suggested-action') self._widget = ErrorWidget(error_text=data) - elif mode in ('join-failed', 'creation-failed', 'config-failed'): + elif mode in (FunctionMode.JOIN_FAILED, + FunctionMode.CREATION_FAILED, + FunctionMode.CONFIG_FAILED): self._confirm_button.set_label(_('Try Again')) self._confirm_button.set_sensitive(True) self._confirm_button.get_style_context().add_class( 'suggested-action') - if mode == 'join-failed': + if mode == FunctionMode.JOIN_FAILED: is_bookmark = self._client.get_module('Bookmarks').is_bookmark( self._contact.jid) self._forget_button.set_visible(is_bookmark) - self._widget = ErrorWidget(error_mode=mode, error_text=data) + self._widget = ErrorWidget(mode=mode, error_text=data) assert self._widget is not None self._content_box.add(self._widget) @@ -197,64 +228,76 @@ def set_mode(self, elif isinstance(self._widget, DataFormWidget): self._widget.focus_first_entry() + def _on_client_state_changed(self, + _client: types.Client, + _signal_name: str, + _state: SimpleClientState + ) -> None: + + self._update_button_state() + def _on_ready(self, _widget: Gtk.Widget, state: bool ) -> None: - self._confirm_button.set_sensitive(state) + + self._ready_state = state + self._update_button_state() + + def _update_button_state(self) -> None: + assert self._contact is not None + if app.account_is_connected(self._contact.account): + self._confirm_button.set_sensitive(self._ready_state) + self._forget_button.set_sensitive(True) + return + + self._confirm_button.set_sensitive(False) + self._forget_button.set_sensitive(False) def _on_confirm_clicked(self, _button: Gtk.Button) -> None: - if self._mode == 'invite': + assert self._client is not None + assert self._contact is not None + + if self._mode == FunctionMode.INVITE: assert isinstance(self._widget, GroupChatInviter) invitees = self._widget.get_invitees() for jid in invitees: self._invite(JID.from_string(jid)) - elif self._mode == 'change-nickname': + elif self._mode == FunctionMode.CHANGE_NICKNAME: assert isinstance(self._widget, InputWidget) nickname = self._widget.get_text() - assert self._client is not None - assert self._contact is not None self._client.get_module('MUC').change_nick( self._contact.jid, nickname) - elif self._mode == 'kick': + elif self._mode == FunctionMode.KICK: assert isinstance(self._widget, InputWidget) reason = self._widget.get_text() - assert self._client is not None - assert self._contact is not None self._client.get_module('MUC').set_role( self._contact.jid, self._data, 'none', reason) - elif self._mode == 'ban': + elif self._mode == FunctionMode.BAN: assert isinstance(self._widget, InputWidget) reason = self._widget.get_text() - assert self._client is not None - assert self._contact is not None self._client.get_module('MUC').set_affiliation( self._contact.jid, {self._data: {'affiliation': 'outcast', 'reason': reason}}) - elif self._mode == 'password-request': + elif self._mode == FunctionMode.PASSWORD_REQUEST: assert isinstance(self._widget, InputWidget) password = self._widget.get_text() - assert self._client is not None - assert self._contact is not None self._client.get_module('MUC').set_password( self._contact.jid, password) self._client.get_module('MUC').join(self._contact.jid) - elif self._mode == 'captcha-request': + elif self._mode == FunctionMode.CAPTCHA_REQUEST: assert isinstance(self._widget, DataFormWidget) form_node = self._widget.get_submit_form() - assert self._client is not None - assert self._contact is not None self._client.get_module('MUC').send_captcha( self._contact.jid, form_node) - elif self._mode in ('join-failed', 'captcha-error'): - assert self._client is not None - assert self._contact is not None + elif self._mode in (FunctionMode.JOIN_FAILED, + FunctionMode.CAPTCHA_ERROR): self._client.get_module('MUC').join(self._contact.jid) self.emit('finish', False) @@ -263,27 +306,29 @@ def _on_cancel_clicked(self, _button: Gtk.Button) -> None: assert self._client is not None assert self._contact is not None - if self._mode == 'captcha-request': - self._client.get_module('MUC').cancel_captcha( - self._contact.jid) - self.emit('finish', True) - return + connected = app.account_is_connected(self._contact.account) + close_control = False - if self._mode == 'password-request': - self._client.get_module('MUC').cancel_password_request( - self._contact.jid) - self.emit('finish', True) - return + if self._mode == FunctionMode.CAPTCHA_REQUEST: + if connected: + self._client.get_module('MUC').cancel_captcha( + self._contact.jid) + close_control = True - if self._mode in ( - 'join-failed', - 'creation-failed', - 'config-failed', - 'captcha-error'): - self.emit('finish', True) - return + elif self._mode == FunctionMode.PASSWORD_REQUEST: + if connected: + self._client.get_module('MUC').cancel_password_request( + self._contact.jid) + close_control = True - self.emit('finish', False) + elif self._mode in ( + FunctionMode.JOIN_FAILED, + FunctionMode.CREATION_FAILED, + FunctionMode.CONFIG_FAILED, + FunctionMode.CAPTCHA_ERROR): + close_control = True + + self.emit('finish', close_control) def _on_forget_clicked(self, _button: Gtk.Button) -> None: assert self._client is not None @@ -310,10 +355,11 @@ class InputWidget(Gtk.Box): } def __init__(self, - contact: ChatContactT, - mode: str, + contact: types.ChatContactT, + mode: FunctionMode, data: Optional[str] = None ) -> None: + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) @@ -336,21 +382,21 @@ def __init__(self, self._entry.connect('changed', self._on_entry_changed) self.add(self._entry) - if mode == 'change-nickname': + if mode == FunctionMode.CHANGE_NICKNAME: heading_label.set_text(_('Change Nickname')) sub_label.set_text(_('Enter your new nickname')) assert isinstance(self._contact, GroupchatContact) self._entry.set_text(self._contact.nickname or '') - elif mode == 'kick': + elif mode == FunctionMode.KICK: heading_label.set_text(_('Kick %s') % data) sub_label.set_text(_('Reason (optional)')) - elif mode == 'ban': + elif mode == FunctionMode.BAN: heading_label.set_text(_('Ban %s') % data) sub_label.set_text(_('Reason (optional)')) - elif mode == 'password-request': + elif mode == FunctionMode.PASSWORD_REQUEST: heading_label.set_text(_('Password Required')) sub_label.set_text(_('Enter a password to join this chat')) self._entry.set_input_purpose(Gtk.InputPurpose.PASSWORD) @@ -365,7 +411,7 @@ def _on_destroy(self, _widget: InputWidget) -> None: def _on_entry_changed(self, entry: Gtk.Entry) -> None: text = entry.get_text() - if self._mode == 'change-nickname': + if self._mode == FunctionMode.CHANGE_NICKNAME: assert isinstance(self._contact, GroupchatContact) if not text or text == self._contact.nickname: self.emit('changed', False) @@ -387,9 +433,10 @@ def get_text(self) -> str: class ErrorWidget(Gtk.Box): def __init__(self, - error_mode: Optional[str] = None, + mode: Optional[FunctionMode] = None, error_text: Optional[str] = None ) -> None: + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) @@ -400,11 +447,11 @@ def __init__(self, heading = Gtk.Label() heading.get_style_context().add_class('bold16') heading_text = _('An Error Occurred') - if error_mode == 'join-failed': + if mode == FunctionMode.JOIN_FAILED: heading_text = _('Failed to Join Group Chat') - elif error_mode == 'creation-failed': + elif mode == FunctionMode.CREATION_FAILED: heading_text = _('Failed to Create Group Chat') - elif error_mode == 'config-failed': + elif mode == FunctionMode.CONFIG_FAILED: heading_text = _('Failed to Configure Group Chat') heading.set_text(heading_text) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -46,6 +46,7 @@ from .chat_banner import ChatBanner from .chat_function_page import ChatFunctionPage +from .chat_function_page import FunctionMode from .const import TARGET_TYPE_URI_LIST from .control import ChatControl from .message_actions_box import MessageActionsBox @@ -219,21 +220,25 @@ def show_chat(self, account: str, jid: JID) -> None: str(self._current_contact.jid)) if muc_data is not None: if muc_data.state.is_captcha_request: - self._show_chat_function_page('captcha-request') + self._show_chat_function_page(FunctionMode.CAPTCHA_REQUEST) return if muc_data.state.is_password_request: - self._show_chat_function_page('password-request') + self._show_chat_function_page(FunctionMode.PASSWORD_REQUEST) return if not muc_data.state.is_joined: if muc_data.error == 'captcha-failed': self._show_chat_function_page( - 'captcha-error', muc_data.error_text) + FunctionMode.CAPTCHA_ERROR, muc_data.error_text) return - if muc_data.error in ('join-failed', 'creation-failed'): + if muc_data.error == 'join-failed': self._show_chat_function_page( - muc_data.error, muc_data.error_text) + FunctionMode.JOIN_FAILED, muc_data.error_text) + return + if muc_data.error == 'creation-failed': + self._show_chat_function_page( + FunctionMode.CREATION_FAILED, muc_data.error_text) return self.set_transition_type(Gtk.StackTransitionType.NONE) @@ -254,47 +259,53 @@ def _on_room_password_required(self, _signal_name: str, _properties: MessageProperties ) -> None: - self._show_chat_function_page('password-request') + + self._show_chat_function_page(FunctionMode.PASSWORD_REQUEST) def _on_room_captcha_challenge(self, contact: GroupchatContact, _signal_name: str, - properties: MessageProperties + _properties: MessageProperties ) -> None: - self._show_chat_function_page('captcha-request') + + self._show_chat_function_page(FunctionMode.CAPTCHA_REQUEST) def _on_room_captcha_error(self, _contact: GroupchatContact, _signal_name: str, error: StanzaError ) -> None: + error_text = helpers.to_user_string(error) - self._show_chat_function_page('captcha-error', error_text) + self._show_chat_function_page(FunctionMode.CAPTCHA_ERROR, error_text) def _on_room_creation_failed(self, _contact: GroupchatContact, _signal_name: str, properties: MessageProperties ) -> None: + assert properties.error is not None error_text = helpers.to_user_string(properties.error) - self._show_chat_function_page('creation-failed', error_text) + self._show_chat_function_page(FunctionMode.CREATION_FAILED, error_text) def _on_room_join_failed(self, _contact: GroupchatContact, _signal_name: str, error: StanzaError ) -> None: + self._show_chat_function_page( - 'join-failed', helpers.to_user_string(error)) + FunctionMode.JOIN_FAILED, helpers.to_user_string(error)) def _on_room_config_failed(self, _contact: GroupchatContact, _signal_name: str, error: StanzaError ) -> None: + self._show_chat_function_page( - 'config-failed', helpers.to_user_string(error)) + FunctionMode.CONFIG_FAILED, helpers.to_user_string(error)) def _on_muc_state_changed(self, contact: GroupchatContact, @@ -587,10 +598,10 @@ def _on_action(self, 'ContactInfo', account=account, contact=resource_contact) elif action_name == 'muc-invite': - self._show_chat_function_page('invite') + self._show_chat_function_page(FunctionMode.INVITE) elif action_name == 'muc-change-nickname': - self._show_chat_function_page('change-nickname') + self._show_chat_function_page(FunctionMode.CHANGE_NICKNAME) elif action_name == 'muc-execute-command': nick = None @@ -605,12 +616,12 @@ def _on_action(self, elif action_name == 'muc-kick': assert param is not None kick_nick = param.get_string() - self._show_chat_function_page('kick', data=kick_nick) + self._show_chat_function_page(FunctionMode.KICK, data=kick_nick) elif action_name == 'muc-ban': assert param is not None ban_jid = param.get_string() - self._show_chat_function_page('ban', data=ban_jid) + self._show_chat_function_page(FunctionMode.BAN, data=ban_jid) elif action_name == 'muc-change-role': assert param is not None @@ -666,12 +677,13 @@ def _on_drag_motion(self, return True def _show_chat_function_page(self, - function: str, + function_mode: FunctionMode, data: Optional[str] = None ) -> None: + assert self._current_contact is not None self._chat_function_page.set_mode( - self._current_contact, function, data) + self._current_contact, function_mode, data) self.set_transition_type(Gtk.StackTransitionType.SLIDE_UP_DOWN) self.set_visible_child_name('function') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/545119ca0c348aa1f06143c77367c3a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/545119ca0c348aa1f06143c77367c3a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] perf: GroupchatRoster: Don’t load roster when its hidden
by Philipp Hörist (＠lovetox) 12 Oct '22

12 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 545119ca by Philipp Hörist at 2022-10-12T19:19:49+02:00 perf: GroupchatRoster: Don’t load roster when its hidden - - - - - 2 changed files: - gajim/data/gui/groupchat_roster.ui - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/data/gui/groupchat_roster.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkTreeStore" id="participant_store"> @@ -22,7 +22,6 @@ <object class="GtkTreeView" id="roster_treeview"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="model">participant_store</property> <property name="headers-visible">False</property> <property name="expander-column">expander</property> <property name="search-column">1</property> @@ -30,6 +29,9 @@ <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/> <signal name="query-tooltip" handler="_query_tooltip" swapped="no"/> <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> <child> <object class="GtkTreeViewColumn" id="contact_column"> <property name="sizing">fixed</property> ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -114,6 +114,8 @@ def __init__(self) -> None: self.set_reveal_child( not app.settings.get('hide_groupchat_occupants_list')) + self.connect('notify::reveal-child', self._on_reveal) + def _hide_roster(self, hide_roster: bool, *args: Any) -> None: transition = Gtk.RevealerTransitionType.SLIDE_RIGHT if not hide_roster: @@ -123,10 +125,17 @@ def _hide_roster(self, hide_roster: bool, *args: Any) -> None: self.set_transition_type(transition) self.set_reveal_child(not hide_roster) + def _on_reveal(self, revealer: Gtk.Revealer, param: Any) -> None: + if revealer.get_reveal_child(): + self._load_roster() + else: + self._unload_roster() + def clear(self) -> None: - log.info('Clear') if self._contact is None: return + + log.info('Clear') self._unload_roster() self._contact.disconnect_signal(self, 'state-changed') self._contact = None @@ -485,6 +494,9 @@ def enable_sort(self, enable: bool) -> None: self._store.set_sort_column_id(column, Gtk.SortType.ASCENDING) def _load_roster(self) -> None: + if not self.get_reveal_child(): + return + log.info('Load Roster') assert self._contact is not None self._contact.multi_connect({ @@ -505,6 +517,9 @@ def _load_roster(self) -> None: self._roster.expand_all() def _unload_roster(self) -> None: + if self._roster.get_model() is None: + return + log.info('Unload Roster') assert self._contact is not None self._contact.multi_disconnect(self, CONTACT_SIGNALS) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/545119ca0c348aa1f06143c77367c3a3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/545119ca0c348aa1f06143c77367c3a3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Set user-agent for session
by Daniel Brötzmann (＠wurstsalat) 12 Oct '22

12 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 665d350e by wurstsalat at 2022-10-12T12:51:13+02:00 fix: Preview: Set user-agent for session Fixes #11205 - - - - - 1 changed file: - gajim/common/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -208,6 +208,7 @@ def _create_session(account: str) -> tuple[ session.add_feature_by_type(Soup.ContentSniffer) session.props.https_aliases = ['aesgcm'] session.props.ssl_strict = False + session.props.user_agent = f'Gajim {app.version}' proxy = get_account_proxy(account) if proxy is None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/665d350efac1123cc72ba02f6d1a77de… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/665d350efac1123cc72ba02f6d1a77de… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][workspace-mark-as-read] 27 commits: cfix: DND: Un-highlight rows correctly, transfer source workspace
by Daniel Brötzmann (＠wurstsalat) 11 Oct '22

11 Oct '22

Daniel Brötzmann pushed to branch workspace-mark-as-read at gajim / gajim Commits: 167ea289 by wurstsalat at 2022-10-09T11:25:40+02:00 cfix: DND: Un-highlight rows correctly, transfer source workspace - - - - - c1e41f53 by wurstsalat at 2022-10-09T12:02:17+02:00 cfix: Preview: Try to create GdKPixbuf loader with fixed mime-type This fixes mime-type detection problems for HEIF images on some systems - - - - - 61fec3e4 by wurstsalat at 2022-10-09T12:11:48+02:00 cfix: AccountPage: React to avatar changes - - - - - bec58992 by Philipp Hörist at 2022-10-09T13:20:05+02:00 refactor: Remove usage of get_number_of_accounts() - - - - - 23d5b164 by Philipp Hörist at 2022-10-09T13:20:05+02:00 refactor: MAM: Use only timezone aware datetime objects - - - - - f12cf65e by Philipp Hörist at 2022-10-09T13:38:51+02:00 fix: Don’t fail when disabling accounts Fixes #11199 - - - - - daabc910 by Philipp Hörist at 2022-10-09T14:58:09+02:00 refactor: Remove usage of utc* datetime methods datetime.utcnow() datetime.utcfromtimestamp() These methods are discouraged according to pythons documentation - - - - - 6ca265f1 by wurstsalat at 2022-10-09T16:27:45+02:00 fix: SearchView: Limit displayed results to account_id of contact - - - - - 659ef014 by Philipp Hörist at 2022-10-09T19:32:26+02:00 refactor: Archive: Simplify setting earliest timestamp - - - - - f2b86948 by Philipp Hörist at 2022-10-09T19:32:26+02:00 refactor: Rows: Add DateTimeLabel - - - - - 6d677406 by Philipp Hörist at 2022-10-09T19:42:41+02:00 refactor: Rows: Add NicknameLabel - - - - - a1681cd0 by Philipp Hörist at 2022-10-09T19:44:14+02:00 cfix: DateTimeLabel: Use set_text() Otherwise it will parse markup - - - - - 4166e403 by Philipp Hörist at 2022-10-09T20:08:35+02:00 refactor: Move MessageIcons into widget module - - - - - 48f48849 by Philipp Hörist at 2022-10-09T20:14:00+02:00 refactor: Move widget settings into MoreMenuButton - - - - - fdc424f5 by Philipp Hörist at 2022-10-09T21:50:11+02:00 refactor: Add AvatarBox Move code related to the avatar image into its own widget - - - - - 2c55d99f by Philipp Hörist at 2022-10-09T23:11:13+02:00 ci: Flatpak: Remove not allowed folder cleanup This is disallowed by flatpaks manifest lint tool - - - - - 26805837 by Philipp Hörist at 2022-10-10T20:17:13+02:00 change: Remove setting to hide the chat banner As we place important functionality like hiding the groupchat roster in the banner, hiding it is not an option anymore - - - - - 63e5f254 by Philipp Hörist at 2022-10-10T20:22:12+02:00 change: Remove confirm_paste_image setting Pasting a image in the chat should always be confirmed. - - - - - ca13e02e by wurstsalat at 2022-10-10T20:22:21+02:00 change: Preferences: Move show_chatstate_in_banner to ACE settings - - - - - 59e6de35 by Philipp Hörist at 2022-10-10T22:01:37+02:00 imprv: Avatar: Follow modernxmpps suggestions for color generation Single Chat: Bare JID Private Group Chat: Bare JID Public Group Chat: Resource - - - - - 46f6ef16 by wurstsalat at 2022-10-10T22:59:25+02:00 change: Preferences: Reorder "Chat" settings and add a "General" section - - - - - 49b5591e by wurstsalat at 2022-10-10T22:59:25+02:00 change: Preferences: Add escape_key_closes to "Chat" section - - - - - e7f6f674 by wurstsalat at 2022-10-10T23:07:14+02:00 cq: Emoji data: Add hint about emoji data sources - - - - - 3bc2f39b by wurstsalat at 2022-10-11T11:34:18+02:00 perf: Emoji completion: Abort early if max menu entry count reached - - - - - e0f92946 by mesonium at 2022-10-11T19:07:52+00:00 imprv: ACE: Enable reset button only for changed values - - - - - 073de0f6 by Philipp Hörist at 2022-10-11T21:25:04+02:00 cq: ACE: Remove whitespace - - - - - 99d3a677 by wurstsalat at 2022-10-11T23:05:55+02:00 imprv: Workspaces: Add 'Mark as read' menu item Fixes #11198 - - - - - 30 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/app.py - gajim/common/dbus/location.py - gajim/common/modules/mam.py - gajim/common/preview.py - gajim/common/preview_helpers.py - gajim/common/setting_values.py - gajim/common/storage/archive.py - gajim/data/gui/preferences.ui - gajim/gtk/account_page.py - gajim/gtk/account_side_bar.py - gajim/gtk/advanced_config.py - gajim/gtk/avatar.py - gajim/gtk/chat_action_processor.py - gajim/gtk/chat_banner.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_row.py - gajim/gtk/const.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/call.py - gajim/gtk/conversation/rows/command_output.py - gajim/gtk/conversation/rows/file_transfer.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/muc_join_left.py - gajim/gtk/conversation/rows/muc_subject.py - gajim/gtk/conversation/rows/user_status.py - gajim/gtk/conversation/rows/widgets.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/42ff773d6516c2b07416ab0caa1a329… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/42ff773d6516c2b07416ab0caa1a329… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: ACE: Remove whitespace
by Philipp Hörist (＠lovetox) 11 Oct '22

11 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 073de0f6 by Philipp Hörist at 2022-10-11T21:25:04+02:00 cq: ACE: Remove whitespace - - - - - 1 changed file: - gajim/gtk/advanced_config.py Changes: ===================================== gajim/gtk/advanced_config.py ===================================== @@ -207,7 +207,7 @@ def _on_config_edited(self, modelrow[Column.IS_DEFAULT] = bool(value == default) self._ui.reset_button.set_sensitive(value != default) - + def _on_reset_button_clicked(self, button: Gtk.Button) -> None: model, iter_ = self.treeview.get_selection().get_selected() if not iter_: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/073de0f68010449deb8891663212cada… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/073de0f68010449deb8891663212cada… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ACE: Enable reset button only for changed values
by Philipp Hörist (＠lovetox) 11 Oct '22

11 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e0f92946 by mesonium at 2022-10-11T19:07:52+00:00 imprv: ACE: Enable reset button only for changed values - - - - - 1 changed file: - gajim/gtk/advanced_config.py Changes: ===================================== gajim/gtk/advanced_config.py ===================================== @@ -160,7 +160,7 @@ def _on_treeview_selection_changed(self, desc = ADVANCED_SETTINGS['app'][setting] self._ui.description.set_text(desc or Q_('?config description:None')) - self._ui.reset_button.set_sensitive(True) + self._ui.reset_button.set_sensitive(not model[iter_][Column.IS_DEFAULT]) def _on_treeview_row_activated(self, _treeview: Gtk.TreeView, @@ -183,6 +183,8 @@ def _on_treeview_row_activated(self, modelrow[Column.VALUE] = column_value modelrow[Column.IS_DEFAULT] = bool(setting_value == default) + self._ui.reset_button.set_sensitive(setting_value != default) + def _on_config_edited(self, _cell: Gtk.CellRendererText, path: str, @@ -204,6 +206,8 @@ def _on_config_edited(self, modelrow[Column.VALUE] = text modelrow[Column.IS_DEFAULT] = bool(value == default) + self._ui.reset_button.set_sensitive(value != default) + def _on_reset_button_clicked(self, button: Gtk.Button) -> None: model, iter_ = self.treeview.get_selection().get_selected() if not iter_: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e0f92946b21a0a21a470bf0415cef965… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e0f92946b21a0a21a470bf0415cef965… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] perf: Emoji completion: Abort early if max menu entry count reached
by Daniel Brötzmann (＠wurstsalat) 11 Oct '22

11 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3bc2f39b by wurstsalat at 2022-10-11T11:34:18+02:00 perf: Emoji completion: Abort early if max menu entry count reached - - - - - 1 changed file: - gajim/gtk/chat_action_processor.py Changes: ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -230,7 +230,7 @@ def _update_emoji_menu(self, if not shortcode.startswith(action_text[1:]): continue if menu_entry_count >= MAX_ENTRIES: - continue + break action_data = GLib.Variant('s', codepoint) menu_item = Gio.MenuItem() menu_item.set_label(f'{codepoint} {shortcode}') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3bc2f39babc8a71c9ce83bd4a0ac48a6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3bc2f39babc8a71c9ce83bd4a0ac48a6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch avatar-color-fix
by Daniel Brötzmann (＠wurstsalat) 11 Oct '22

11 Oct '22

Daniel Brötzmann deleted branch avatar-color-fix at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Emoji data: Add hint about emoji data sources
by Daniel Brötzmann (＠wurstsalat) 10 Oct '22

10 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e7f6f674 by wurstsalat at 2022-10-10T23:07:14+02:00 cq: Emoji data: Add hint about emoji data sources - - - - - 1 changed file: - gajim/gtk/emoji_data_gtk.py Changes: ===================================== gajim/gtk/emoji_data_gtk.py ===================================== @@ -66,6 +66,8 @@ def get_emoji_data() -> dict[str, str]: def load_emoji_data() -> dict[str, str]: + # Sources of emoji data can be found at: + # https://gitlab.gnome.org/GNOME/gtk/-/tree/main/gtk/emoji # Location of emoji data resource changed in GTK >= 3.24.30 if V(get_gtk_version()) >= V('3.24.30'): emoji_data_resource = '/org/gtk/libgtk/emoji/en.data' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e7f6f67450cc2f0174036210a384a20d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e7f6f67450cc2f0174036210a384a20d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: change: Preferences: Reorder "Chat" settings and add a "General" section
by Daniel Brötzmann (＠wurstsalat) 10 Oct '22

10 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 46f6ef16 by wurstsalat at 2022-10-10T22:59:25+02:00 change: Preferences: Reorder "Chat" settings and add a "General" section - - - - - 49b5591e by wurstsalat at 2022-10-10T22:59:25+02:00 change: Preferences: Add escape_key_closes to "Chat" section - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/data/gui/preferences.ui - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -651,7 +651,7 @@ class WorkspaceSettings(TypedDict): 'account in the Accounts window. BE CAREFUL, when you are logged ' 'in with a negative priority, you will NOT receive any message ' 'from your server.'), - 'escape_key_closes': _('If enabled, pressing Esc closes a tab/window.'), + 'escape_key_closes': _('Close a chat by pressing the Escape key'), 'file_transfers_port': '', 'ft_add_hosts_to_send': _( 'List of send hosts (comma separated) in ' ===================================== gajim/data/gui/preferences.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/>  @@ -114,6 +114,59 @@ <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">24</property> + <child> +  + <object class="GtkGrid" id="general"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="row-spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">General</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left-attach">0</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> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child>  <object class="GtkGrid" id="chats"> @@ -164,7 +217,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -217,7 +270,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -270,7 +323,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> ===================================== gajim/gtk/preferences.py ===================================== @@ -86,6 +86,7 @@ def __init__(self) -> None: prefs: list[tuple[str, Type[PreferenceBox]]] = [ ('window_behaviour', WindowBehaviour), ('plugins', Plugins), + ('general', General), ('chats', Chats), ('group_chats', GroupChats), ('file_preview', FilePreview), @@ -259,7 +260,7 @@ def __init__(self, *args: Any) -> None: PreferenceBox.__init__(self, settings) -class Chats(PreferenceBox): +class General(PreferenceBox): def __init__(self, *args: Any) -> None: speller_desc = None @@ -268,41 +269,29 @@ def __init__(self, *args: Any) -> None: settings = [ Setting(SettingKind.SWITCH, - _('Spell Checking'), - SettingType.CONFIG, - 'use_speller', - desc=speller_desc, - enabled_func=self._speller_available), - - Setting(SettingKind.SWITCH, - _('Message Receipts (✔)'), + _('Close with Escape'), SettingType.CONFIG, - 'positive_184_ack', - desc=_('Add a checkmark to received messages')), - - # Setting(SettingKind.SWITCH, - # _('XHTML Formatting'), - # SettingType.CONFIG, - # 'show_xhtml', - # desc=_('Render XHTML styles (colors, etc.) of incoming ' - # 'messages')), + 'escape_key_closes', + desc=_('Close a chat by pressing the Escape key')), Setting(SettingKind.SWITCH, _('Show Send Message Button'), SettingType.CONFIG, 'show_send_message_button', callback=self._on_show_send_message_button), + + Setting(SettingKind.SWITCH, + _('Spell Checking'), + SettingType.CONFIG, + 'use_speller', + desc=speller_desc, + enabled_func=self._speller_available), + Setting(SettingKind.SWITCH, _('Emoji Shortcodes'), SettingType.CONFIG, 'enable_emoji_shortcodes', desc=_('Show suggestions for shortcodes, e.g. :+1:')), - Setting(SettingKind.SWITCH, - _('Show Status Changes'), - SettingType.CONFIG, - 'print_status_in_chats', - desc=_('For example: "Julia is now online"')), - ] PreferenceBox.__init__(self, settings) @@ -318,6 +307,27 @@ def _on_show_send_message_button(show_button: bool, *args: Any) -> None: app.settings.set('send_on_ctrl_enter', show_button) +class Chats(PreferenceBox): + def __init__(self, *args: Any) -> None: + + settings = [ + Setting(SettingKind.SWITCH, + _('Message Receipts (✔)'), + SettingType.CONFIG, + 'positive_184_ack', + desc=_('Add a checkmark to received messages')), + + Setting(SettingKind.SWITCH, + _('Show Status Changes'), + SettingType.CONFIG, + 'print_status_in_chats', + desc=_('For example: "Julia is now online"')), + + ] + + PreferenceBox.__init__(self, settings) + + class GroupChats(PreferenceBox): def __init__(self, *args: Any) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59e6de350b04cf07516483dcaba76e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59e6de350b04cf07516483dcaba76e6… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits