Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] ChatControlBase: Properly handle ENTER key if send_on_ctrl_enter is active
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: cbc7e8be by Andrey Gursky at 2020-09-06T10:36:55+02:00 ChatControlBase: Properly handle ENTER key if send_on_ctrl_enter is active Fixes #10258 - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -894,6 +894,10 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if not app.settings.get('send_on_ctrl_enter'): textview.insert_newline() return True + else: + if app.settings.get('send_on_ctrl_enter'): + textview.insert_newline() + return True if not app.account_is_available(self.account): # we are not connected View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cbc7e8be076eb1200518af8cb8318aff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cbc7e8be076eb1200518af8cb8318aff… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] DOAP: Add XEP-0106
by Philipp Hörist 05 Sep '20

05 Sep '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 36aef2b6 by wurstsalat at 2020-08-29T19:41:27+02:00 DOAP: Add XEP-0106 - - - - - 1 changed file: - python-nbxmpp.doap Changes: ===================================== python-nbxmpp.doap ===================================== @@ -158,6 +158,13 @@ <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0106.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.1.1</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0107.html" /> View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/36aef2b65f653ed657e2706b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/36aef2b65f653ed657e2706b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Group Chat: Add Retry button for MUCs we failed to join
by Philipp Hörist 05 Sep '20

05 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8a128eaf by Daniel Brötzmann at 2020-09-05T17:57:01+02:00 Group Chat: Add Retry button for MUCs we failed to join - - - - - 2 changed files: - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -137,8 +137,8 @@ <child> <object class="GtkBox" id="groupchat_control_vbox"> <property name="can_focus">True</property> - <property name="margin_left">7</property> - <property name="margin_right">7</property> + <property name="margin_start">7</property> + <property name="margin_end">7</property> <property name="margin_top">5</property> <property name="margin_bottom">7</property> <property name="spacing">3</property> @@ -147,7 +147,7 @@ <property name="width_request">0</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">4</property> + <property name="margin_end">4</property> <property name="hexpand">True</property> <property name="orientation">vertical</property> <child> @@ -1049,7 +1049,7 @@ <property name="spacing">6</property> <child> <object class="GtkButton" id="remove_bookmark_button"> - <property name="label" translatable="yes">_Leave Group Chat</property> + <property name="label" translatable="yes">_Forget Group Chat</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1068,6 +1068,21 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkButton" id="retry_button"> + <property name="label" translatable="yes">_Retry</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_retry_join_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <child> <object class="GtkButton" id="close_button"> <property name="label" translatable="yes">_Close</property> @@ -1083,7 +1098,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> ===================================== gajim/groupchat_control.py ===================================== @@ -2150,6 +2150,10 @@ class GroupchatControl(ChatControlBase): con.get_module('Bookmarks').remove(self.room_jid) self._close_control() + def _on_retry_join_clicked(self, _button=None): + app.connections[self.account].get_module('MUC').join(self._muc_data) + self._show_page('progress') + def _on_page_cancel_clicked(self, _button=None): self._show_page('groupchat') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8a128eafcc2658190d97960bfa51db8e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8a128eafcc2658190d97960bfa51db8e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 05 Sep '20

05 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 56a68a26 by lovetox at 2020-09-05T17:30:06+02:00 Remove unused import - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -55,7 +55,6 @@ from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.message_input import MessageInputTextView -from gajim.gtk import util from gajim.gtk.util import at_the_end from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/56a68a26bd5856b6f1a0ce217ac566f6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/56a68a26bd5856b6f1a0ce217ac566f6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControlBase: Refactor handling ENTER key press
by Philipp Hörist 05 Sep '20

05 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d238d691 by lovetox at 2020-09-05T17:25:34+02:00 ChatControlBase: Refactor handling ENTER key press - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/gtk/message_input.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -795,7 +795,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): ft = app.interface.instances['file_transfers'] ft.send_file(self.account, self.contact, path) - def _on_message_textview_key_press_event(self, widget, event): + def _on_message_textview_key_press_event(self, textview, event): if event.keyval == Gdk.KEY_space: self.space_pressed = True @@ -805,7 +805,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): # If the space key has been pressed and now it hasn't, # we save the buffer into the undo list. But be careful we're not # pressing Control again (as in ctrl+z) - _buffer = widget.get_buffer() + _buffer = textview.get_buffer() start_iter, end_iter = _buffer.get_bounds() self.msg_textview.save_undo(_buffer.get_text(start_iter, end_iter, @@ -884,34 +884,29 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): else: # Ctrl+Down self.scroll_messages('down', message_buffer, 'sent') return True - elif event.keyval == Gdk.KEY_Return or \ - event.keyval == Gdk.KEY_KP_Enter: # ENTER - message_textview = widget - message_buffer = message_textview.get_buffer() - message_textview.replace_emojis() - start_iter, end_iter = message_buffer.get_bounds() - message = message_buffer.get_text(start_iter, end_iter, False) - xhtml = self.msg_textview.get_xhtml() + elif (event.keyval == Gdk.KEY_Return or + event.keyval == Gdk.KEY_KP_Enter): # ENTER if event_state & Gdk.ModifierType.SHIFT_MASK: - send_message = False - else: - is_ctrl_enter = bool(event_state & Gdk.ModifierType.CONTROL_MASK) - send_message = is_ctrl_enter == app.settings.get('send_on_ctrl_enter') + textview.insert_newline() + return True + + if event_state & Gdk.ModifierType.CONTROL_MASK: + if not app.settings.get('send_on_ctrl_enter'): + textview.insert_newline() + return True - if send_message and not app.account_is_available(self.account): + if not app.account_is_available(self.account): # we are not connected app.interface.raise_dialog('not-connected-while-sending') - elif send_message: - self.send_message(message, xhtml=xhtml) - else: - message_buffer.insert_at_cursor('\n') - mark = message_buffer.get_insert() - iter_ = message_buffer.get_iter_at_mark(mark) - if message_buffer.get_end_iter().equal(iter_): - GLib.idle_add(util.scroll_to_end, self.msg_scrolledwindow) + return True + textview.replace_emojis() + message = textview.get_text() + xhtml = textview.get_xhtml() + self.send_message(message, xhtml=xhtml) return True + elif event.keyval == Gdk.KEY_z: # CTRL+z if event_state & Gdk.ModifierType.CONTROL_MASK: self.msg_textview.undo() ===================================== gajim/gtk/message_input.py ===================================== @@ -122,6 +122,14 @@ class MessageInputTextView(Gtk.TextView): def insert_text(self, text): self.get_buffer().insert_at_cursor(text) + def insert_newline(self): + buffer_ = self.get_buffer() + buffer_.insert_at_cursor('\n') + mark = buffer_.get_insert() + iter_ = buffer_.get_iter_at_mark(mark) + if buffer_.get_end_iter().equal(iter_): + GLib.idle_add(scroll_to_end, self.get_parent()) + def has_text(self): buf = self.get_buffer() start, end = buf.get_bounds() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d238d691427732062a4c7a7eed17b88d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d238d691427732062a4c7a7eed17b88d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove print statement
by Philipp Hörist 05 Sep '20

05 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a8ee4a71 by lovetox at 2020-09-05T00:32:08+02:00 Remove print statement - - - - - 86767c0f by lovetox at 2020-09-05T16:40:35+02:00 Settings: Bind sensitive state to setting signal - - - - - 4 changed files: - gajim/common/settings.py - gajim/gtk/accounts.py - gajim/gtk/const.py - gajim/gtk/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -93,7 +93,6 @@ class _Settings: for handler in list(handlers): func = handler() if func is None or func.__self__ is object_: - print('remove handler', handler) handlers.remove(handler) def _notify(self, value, setting, account=None, jid=None): ===================================== gajim/gtk/accounts.py ===================================== @@ -610,6 +610,8 @@ class GeneralPage(GenericSettingPage): desc=_('Recognize your account by color')), Setting(SettingKind.LOGIN, _('Login'), SettingType.DIALOG, + bind='anonymous_auth', + inverted=True, props={'dialog': LoginDialog}), Setting(SettingKind.ACTION, _('Import Contacts'), @@ -800,12 +802,15 @@ class PriorityDialog(SettingsDialog): settings = [ Setting(SettingKind.SWITCH, _('Adjust to status'), - SettingType.ACCOUNT_CONFIG, 'adjust_priority_with_status', - 'adjust'), + SettingType.ACCOUNT_CONFIG, + 'adjust_priority_with_status'), Setting(SettingKind.SPIN, _('Priority'), - SettingType.ACCOUNT_CONFIG, 'priority', - enabledif=('adjust', False), props={'range_': range_}), + SettingType.ACCOUNT_CONFIG, + 'priority', + bind='adjust_priority_with_status', + inverted=True, + props={'range_': range_}), ] SettingsDialog.__init__(self, parent, _('Priority'), @@ -830,19 +835,19 @@ class CutstomHostnameDialog(SettingsDialog): settings = [ Setting(SettingKind.SWITCH, _('Enable'), SettingType.ACCOUNT_CONFIG, - 'use_custom_host', name='custom'), + 'use_custom_host'), Setting(SettingKind.ENTRY, _('Hostname'), SettingType.ACCOUNT_CONFIG, 'custom_host', - enabledif=('custom', True)), + bind='use_custom_host'), Setting(SettingKind.ENTRY, _('Port'), SettingType.ACCOUNT_CONFIG, 'custom_port', - enabledif=('custom', True)), + bind='use_custom_host'), Setting(SettingKind.COMBO, _('Type'), SettingType.ACCOUNT_CONFIG, 'custom_type', - enabledif=('custom', True), + bind='use_custom_host', props={'combo_items': type_values}), ] @@ -871,11 +876,11 @@ class LoginDialog(SettingsDialog): settings = [ Setting(SettingKind.ENTRY, _('Password'), - SettingType.ACCOUNT_CONFIG, 'password', name='password', - enabledif=('savepass', True)), + SettingType.ACCOUNT_CONFIG, 'password', + bind='savepass'), Setting(SettingKind.SWITCH, _('Save Password'), - SettingType.ACCOUNT_CONFIG, 'savepass', name='savepass'), + SettingType.ACCOUNT_CONFIG, 'savepass'), Setting(SettingKind.CHANGEPASSWORD, _('Change Password'), SettingType.DIALOG, callback=self.on_password_change, ===================================== gajim/gtk/const.py ===================================== @@ -22,7 +22,7 @@ from enum import unique Filter = namedtuple('Filter', 'name pattern default') Setting = namedtuple('Setting', 'kind label type value name callback data desc ' - 'enabledif enabled_func props') + 'bind inverted enabled_func props') Setting.__new__.__defaults__ = (None,) * len(Setting._fields) # type: ignore @unique ===================================== gajim/gtk/settings.py ===================================== @@ -17,7 +17,6 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import Gdk -from gi.repository import GObject from gi.repository import Pango from gajim.common import app @@ -114,7 +113,7 @@ class SettingsBox(Gtk.ListBox): self.account, *setting[1:-1], **setting.props) else: listitem = self.map[setting.kind](self.account, *setting[1:-1]) - listitem.connect('notify::setting-value', self.on_setting_changed) + if setting.name is not None: self.named_settings[setting.name] = listitem self.add(listitem) @@ -123,28 +122,23 @@ class SettingsBox(Gtk.ListBox): return self.named_settings[name] def update_states(self): - values = [] - values.append((None, None)) - for row in self.get_children(): - name = row.name - if name is None: - continue - value = row.get_property('setting-value') - values.append((name, value)) - - for name, value in values: - for row in self.get_children(): - row.update_activatable(name, value) - - def on_setting_changed(self, widget, *args): - value = widget.get_property('setting-value') for row in self.get_children(): - row.update_activatable(widget.name, value) + row.update_activatable() class GenericSetting(Gtk.ListBoxRow): - def __init__(self, account, label, type_, value, - name, callback, data, desc, enabledif, enabled_func): + def __init__(self, + account, + label, + type_, + value, + name, + callback, + data, + desc, + bind, + inverted, + enabled_func): Gtk.ListBoxRow.__init__(self) self._grid = Gtk.Grid() self._grid.set_size_request(-1, 30) @@ -157,7 +151,8 @@ class GenericSetting(Gtk.ListBoxRow): self.label = label self.account = account self.name = name - self.enabledif = enabledif + self.bind = bind + self.inverted = inverted self.enabled_func = enabled_func self.setting_value = self.get_value() @@ -193,16 +188,26 @@ class GenericSetting(Gtk.ListBoxRow): self._grid.add(self.setting_box) self.add(self._grid) - def do_get_property(self, prop): - if prop.name == 'setting-value': - return self.setting_value - raise AttributeError('unknown property %s' % prop.name) + self.connect('destroy', self._on_destroy) + self._bind_sensitive_state() - def do_set_property(self, prop, value): - if prop.name == 'setting-value': - self.setting_value = value - else: - raise AttributeError('unknown property %s' % prop.name) + def _bind_sensitive_state(self): + if self.bind is None: + return + + app.settings.connect_signal(self.bind, + self._on_setting_changed, + account=self.account) + + value = app.settings.get_account_setting(self.account, self.bind) + if self.inverted: + value = not value + self.set_sensitive(value) + + def _on_setting_changed(self, value, *args): + if self.inverted: + value = not value + self.set_sensitive(value) def get_value(self): return self.__get_value(self.type_, self.value, self.account) @@ -249,8 +254,6 @@ class GenericSetting(Gtk.ListBoxRow): if self.callback is not None: self.callback(state, self.data) - self.set_property('setting-value', state) - @staticmethod def set_no_log_for(account, state): no_log = app.settings.get_account_setting(account, 'no_log_for').split() @@ -265,25 +268,20 @@ class GenericSetting(Gtk.ListBoxRow): def on_row_activated(self): raise NotImplementedError - def update_activatable(self, name, value): - enabled_func_value = True - if self.enabled_func is not None: - enabled_func_value = self.enabled_func() + def update_activatable(self): + if self.enabled_func is None: + return - enabledif_value = True - if self.enabledif is not None and self.enabledif[0] == name: - enabledif_value = (name, value) == self.enabledif + enabled_func_value = self.enabled_func() + self.set_activatable(enabled_func_value) + self.set_sensitive(enabled_func_value) - self.set_activatable(enabled_func_value and enabledif_value) - self.set_sensitive(enabled_func_value and enabledif_value) + def _on_destroy(self, *args): + if self.bind is not None: + app.settings.disconnect_signals(self) class SwitchSetting(GenericSetting): - - __gproperties__ = { - "setting-value": (bool, 'Switch Value', '', False, - GObject.ParamFlags.READWRITE),} - def __init__(self, *args): GenericSetting.__init__(self, *args) @@ -327,11 +325,6 @@ class SwitchSetting(GenericSetting): class EntrySetting(GenericSetting): - - __gproperties__ = { - "setting-value": (str, 'Entry Value', '', '', - GObject.ParamFlags.READWRITE),} - def __init__(self, *args): GenericSetting.__init__(self, *args) @@ -358,12 +351,6 @@ class EntrySetting(GenericSetting): class ColorSetting(GenericSetting): - - __gproperties__ = { - "setting-value": (str, 'Color Value', '', '', - GObject.ParamFlags.READWRITE), - } - def __init__(self, *args): GenericSetting.__init__(self, *args) @@ -389,11 +376,6 @@ class ColorSetting(GenericSetting): class DialogSetting(GenericSetting): - - __gproperties__ = { - "setting-value": (str, 'Dummy', '', '', - GObject.ParamFlags.READWRITE),} - def __init__(self, *args, dialog): GenericSetting.__init__(self, *args) self.dialog = dialog @@ -422,11 +404,6 @@ class DialogSetting(GenericSetting): class SpinSetting(GenericSetting): - - __gproperties__ = { - "setting-value": (int, 'Priority', '', -128, 127, 0, - GObject.ParamFlags.READWRITE),} - def __init__(self, *args, range_): GenericSetting.__init__(self, *args) @@ -460,11 +437,6 @@ class SpinSetting(GenericSetting): class FileChooserSetting(GenericSetting): - - __gproperties__ = { - "setting-value": (str, 'Certificate Path', '', '', - GObject.ParamFlags.READWRITE),} - def __init__(self, *args, filefilter): GenericSetting.__init__(self, *args) @@ -510,11 +482,6 @@ class FileChooserSetting(GenericSetting): class CallbackSetting(GenericSetting): - - __gproperties__ = { - "setting-value": (str, 'Dummy', '', '', - GObject.ParamFlags.READWRITE),} - def __init__(self, *args, callback): GenericSetting.__init__(self, *args) self.callback = callback @@ -525,11 +492,6 @@ class CallbackSetting(GenericSetting): class ActionSetting(GenericSetting): - - __gproperties__ = { - "setting-value": (str, 'Dummy', '', '', - GObject.ParamFlags.READWRITE),} - def __init__(self, *args, account): GenericSetting.__init__(self, *args) action_name = '%s%s' % (account, self.value) @@ -556,18 +518,8 @@ class LoginSetting(DialogSetting): jid = app.get_jid_from_account(self.account) return jid - def update_activatable(self, name, value): - super().update_activatable(name, value) - anonym = app.settings.get_account_setting(self.account, 'anonymous_auth') - self.set_activatable(not anonym) - class PopoverSetting(GenericSetting): - - __gproperties__ = { - "setting-value": (str, 'Dummy', '', '', - GObject.ParamFlags.READWRITE),} - def __init__(self, *args, entries): GenericSetting.__init__(self, *args) @@ -650,11 +602,6 @@ class PopoverRow(Gtk.ListBoxRow): class ComboSetting(GenericSetting): - - __gproperties__ = { - "setting-value": (str, 'Proxy', '', '', - GObject.ParamFlags.READWRITE),} - def __init__(self, *args, combo_items): GenericSetting.__init__(self, *args) @@ -683,11 +630,6 @@ class ComboSetting(GenericSetting): class ProxyComboSetting(GenericSetting): - - __gproperties__ = { - "setting-value": (str, 'Proxy', '', '', - GObject.ParamFlags.READWRITE),} - def __init__(self, *args): GenericSetting.__init__(self, *args) @@ -756,7 +698,8 @@ class CutstomHostnameSetting(DialogSetting): DialogSetting.__init__(self, *args, **kwargs) def get_setting_value(self): - custom = app.settings.get_account_setting(self.account, 'use_custom_host') + custom = app.settings.get_account_setting(self.account, + 'use_custom_host') return Q_('?switch:On') if custom else Q_('?switch:Off') @@ -768,7 +711,7 @@ class ChangePasswordSetting(DialogSetting): parent.destroy() open_window('ChangePassword', account=self.account) - def update_activatable(self, name, value): + def update_activatable(self): activatable = False if self.account in app.connections: con = app.connections[self.account] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f328789220f19abde2d9b201cec2481… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f328789220f19abde2d9b201cec2481… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Add new value as a argument to signal callbacks
by Philipp Hörist 04 Sep '20

04 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: f3287892 by lovetox at 2020-09-04T22:55:04+02:00 Settings: Add new value as a argument to signal callbacks - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -96,7 +96,7 @@ class _Settings: print('remove handler', handler) handlers.remove(handler) - def _notify(self, setting, account=None, jid=None): + def _notify(self, value, setting, account=None, jid=None): log.info('Signal: %s changed', setting) callbacks = self._callbacks[(setting, account, jid)] @@ -105,7 +105,7 @@ class _Settings: callbacks.remove(func) continue try: - func()(setting, account, jid) + func()(value, setting, account, jid) except Exception: log.exception('Error while executing signal callback') @@ -418,24 +418,24 @@ class _Settings: if setting not in APP_SETTINGS: raise ValueError(f'Invalid app setting: {setting}') + default = APP_SETTINGS[setting] + if not isinstance(value, type(default)) and value is not None: + raise TypeError(f'Invalid type for {setting}: ' + f'{value} {type(value)}') + if value is None: try: del self._settings['app'][setting] except KeyError: pass - self._notify(setting) + self._notify(default, setting) return - default = APP_SETTINGS[setting] - if not isinstance(value, type(default)): - raise TypeError(f'Invalid type for {setting}: ' - f'{value} {type(value)}') - self._settings['app'][setting] = value self._commit_settings('app') - self._notify(setting) + self._notify(value, setting) set = set_app_setting @@ -529,22 +529,24 @@ class _Settings: if setting not in ACCOUNT_SETTINGS['account']: raise ValueError(f'Invalid account setting: {setting}') + default = ACCOUNT_SETTINGS['account'][setting] + if not isinstance(value, type(default)) and value is not None: + raise TypeError(f'Invalid type for {setting}: ' + f'{value} {type(value)}') + if value is None: try: del self._account_settings[account]['account'][setting] except KeyError: pass - return - default = ACCOUNT_SETTINGS['account'][setting] - if not isinstance(value, type(default)): - raise TypeError(f'Invalid type for {setting}: ' - f'{value} {type(value)}') + self._notify(default, setting, account) + return self._account_settings[account]['account'][setting] = value self._commit_account_settings(account) - self._notify(setting, account) + self._notify(value, setting, account) def get_group_chat_setting(self, account: str, @@ -582,13 +584,6 @@ class _Settings: if setting not in ACCOUNT_SETTINGS['group_chat']: raise ValueError(f'Invalid group chat setting: {setting}') - if value is None: - try: - del self._account_settings[account]['group_chat'][setting] - except KeyError: - pass - return - default = ACCOUNT_SETTINGS['group_chat'][setting] if default is HAS_APP_DEFAULT: if context is None: @@ -596,10 +591,19 @@ class _Settings: else: default = APP_SETTINGS[f'gc_{setting}_{context}_default'] - if not isinstance(value, type(default)): + if not isinstance(value, type(default)) and value is not None: raise TypeError(f'Invalid type for {setting}: ' f'{value} {type(value)}') + if value is None: + try: + del self._account_settings[account]['group_chat'][setting] + except KeyError: + pass + + self._notify(default, setting, account, jid) + return + group_chat_settings = self._account_settings[account]['group_chat'] if jid not in group_chat_settings: group_chat_settings[jid] = {setting: value} @@ -607,7 +611,7 @@ class _Settings: group_chat_settings[jid][setting] = value self._commit_account_settings(account) - self._notify(setting, account, jid) + self._notify(value, setting, account, jid) def get_contact_setting(self, account: str, @@ -640,19 +644,21 @@ class _Settings: if setting not in ACCOUNT_SETTINGS['contact']: raise ValueError(f'Invalid contact setting: {setting}') + default = ACCOUNT_SETTINGS['contact'][setting] + if default is HAS_APP_DEFAULT: + default = APP_SETTINGS[f'{setting}_default'] + if not isinstance(value, type(default)) and value is not None: + raise TypeError(f'Invalid type for {setting}: ' + f'{value} {type(value)}') + if value is None: try: del self._account_settings[account]['contact'][setting] except KeyError: pass - return - default = ACCOUNT_SETTINGS['contact'][setting] - if default is HAS_APP_DEFAULT: - default = APP_SETTINGS[f'{setting}_default'] - if not isinstance(value, type(default)): - raise TypeError(f'Invalid type for {setting}: ' - f'{value} {type(value)}') + self._notify(default, setting, account, jid) + return contact_settings = self._account_settings[account]['contact'] if jid not in contact_settings: @@ -661,7 +667,7 @@ class _Settings: contact_settings[jid][setting] = value self._commit_account_settings(account) - self._notify(setting, account, jid) + self._notify(value, setting, account, jid) def set_soundevent_setting(self, event_name: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f328789220f19abde2d9b201cec24811… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f328789220f19abde2d9b201cec24811… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Add hints for translators
by Philipp Hörist 04 Sep '20

04 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 57782930 by lovetox at 2020-09-04T19:29:56+02:00 Settings: Add hints for translators - - - - - 1 changed file: - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/settings.py ===================================== @@ -757,7 +757,7 @@ class CutstomHostnameSetting(DialogSetting): def get_setting_value(self): custom = app.settings.get_account_setting(self.account, 'use_custom_host') - return _('On') if custom else _('Off') + return Q_('?switch:On') if custom else Q_('?switch:Off') class ChangePasswordSetting(DialogSetting): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/57782930d8294a7c274a4f1621409ba0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/57782930d8294a7c274a4f1621409ba0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Chatstates: Don’t play message-sent sound when sending chatstate
by Philipp Hörist 04 Sep '20

04 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: b7bb36fb by lovetox at 2020-09-04T12:48:15+02:00 Chatstates: Don’t play message-sent sound when sending chatstate Fixes #10245 - - - - - 3 changed files: - gajim/common/modules/chatstates.py - gajim/common/structs.py - gajim/gui_interface.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -317,7 +317,8 @@ class Chatstate(BaseModule): contact=contact, message=None, type_=type_, - chatstate=chatstate) + chatstate=chatstate, + play_sound=False) self._con.send_message(message) ===================================== gajim/common/structs.py ===================================== @@ -63,7 +63,8 @@ class OutgoingMessage: correct_id=None, oob_url=None, xhtml=None, - nodes=None): + nodes=None, + play_sound=True): if type_ not in ('chat', 'groupchat', 'normal', 'headline'): raise ValueError('Unknown message type: %s' % type_) @@ -108,6 +109,7 @@ class OutgoingMessage: self.additional_data.set_value('gajim', 'xhtml', xhtml) self.nodes = nodes + self.play_sound = play_sound self.timestamp = None self.message_id = None ===================================== gajim/gui_interface.py ===================================== @@ -245,9 +245,9 @@ class Interface: @staticmethod def handle_event_msgsent(obj): - # ('MSGSENT', account, (jid, msg)) - # Do not play sound if it is a standalone chatstate message (eg no msg) - # or if it is a message to more than one recipient + if not obj.play_sound: + return + enabled = app.settings.get_soundevent_settings('message_sent')['enabled'] if enabled: if isinstance(obj.jid, list) and len(obj.jid) > 1: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7bb36fbdc38e69e113aac6f06f03ab1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7bb36fbdc38e69e113aac6f06f03ab1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControl: Update actions when receiving caps
by Philipp Hörist 03 Sep '20

03 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 91086f37 by lovetox at 2020-09-03T23:41:17+02:00 ChatControl: Update actions when receiving caps - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -839,6 +839,7 @@ class ChatControl(ChatControlBase): ChatControlBase.update_ui(self) self.update_toolbar() self._update_avatar() + self.update_actions() def draw_banner_text(self): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/91086f377784a395445ac6fae8509188… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/91086f377784a395445ac6fae8509188… 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