Commits September 2020

commits@gajim.org

1 participants
105 discussions

[Git][gajim/gajim][master] 8 commits: Settings: Add more options for action button
by Philipp Hörist 08 Sep '20

08 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3355988c by lovetox at 2020-09-08T08:17:54+02:00 Settings: Add more options for action button - - - - - d1895cf1 by lovetox at 2020-09-08T08:56:54+02:00 Settings: Add set_group_chat_settings() - - - - - 28ec7ab8 by lovetox at 2020-09-08T09:38:26+02:00 Settings: Add support for Account defaults Previously only application default values were possible - - - - - c6e8b299 by lovetox at 2020-09-08T09:50:43+02:00 Settings: Make send_chatstate an account setting - - - - - eaeb31e9 by lovetox at 2020-09-08T13:00:26+02:00 Settings: Add set_contact_settings() - - - - - 841556be by lovetox at 2020-09-08T13:08:13+02:00 Settings: Store settings to disk after deleting a value - - - - - cadaac04 by lovetox at 2020-09-08T13:51:07+02:00 Settings: Fix deleting contact and group chat settings - - - - - b4c10c71 by lovetox at 2020-09-08T16:45:12+02:00 Accounts: Add settings for chatstate - - - - - 4 changed files: - gajim/common/setting_values.py - gajim/common/settings.py - gajim/gtk/accounts.py - gajim/gtk/settings.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -4,7 +4,11 @@ from gajim.common.i18n import _ class _DEFAULT: pass +class _ACCOUNT_DEFAULT: + pass + HAS_APP_DEFAULT = _DEFAULT() +HAS_ACCOUNT_DEFAULT = _ACCOUNT_DEFAULT() # pylint: disable=line-too-long @@ -171,7 +175,6 @@ APP_SETTINGS = { 'show_chatstate_in_roster': True, 'show_chatstate_in_tabs': True, 'show_chatstate_in_banner': True, - 'send_chatstate_default': 'composing_only', 'muclumbus_api_jid': 'rodrigo.de.mucobedo(a)dreckshal.de', 'muclumbus_api_http_uri': 'https://search.jabbercat.org/api/1.0/search', 'muclumbus_api_pref': 'http', @@ -183,7 +186,6 @@ APP_SETTINGS = { 'gc_notify_on_all_messages_public_default': False, 'gc_print_status_default': False, 'gc_print_join_left_default': False, - 'gc_send_chatstate_default': 'composing_only', 'check_for_update': True, 'last_update_check': '', 'always_ask_for_status_message': False, @@ -255,11 +257,13 @@ ACCOUNT_SETTINGS = { 'opened_chat_controls': '', 'recent_groupchats': '', 'filetransfer_preference' : 'httpupload', + 'send_chatstate_default': 'composing_only', + 'gc_send_chatstate_default': 'composing_only', }, 'contact': { 'speller_language': '', - 'send_chatstate': HAS_APP_DEFAULT, + 'send_chatstate': HAS_ACCOUNT_DEFAULT, 'encryption': '', }, @@ -270,7 +274,7 @@ ACCOUNT_SETTINGS = { 'print_join_left': HAS_APP_DEFAULT, 'minimize_on_autojoin': True, 'minimize_on_close': True, - 'send_chatstate': HAS_APP_DEFAULT, + 'send_chatstate': HAS_ACCOUNT_DEFAULT, 'encryption': '', }, } ===================================== gajim/common/settings.py ===================================== @@ -42,6 +42,7 @@ from gajim.common.setting_values import DEFAULT_SOUNDEVENT_SETTINGS from gajim.common.setting_values import STATUS_PRESET_SETTINGS from gajim.common.setting_values import STATUS_PRESET_EXAMPLES from gajim.common.setting_values import HAS_APP_DEFAULT +from gajim.common.setting_values import HAS_ACCOUNT_DEFAULT SETTING_TYPE = Union[bool, int, str, object] @@ -283,7 +284,13 @@ class _Settings: # Migrate deprecated settings value = app_settings.pop('send_chatstate_muc_default', None) if value is not None: - app_settings['gc_send_chatstate_default'] = value + for account in self._account_settings['account']: + self._account_settings[account]['account']['gc_send_chatstate_default'] = value + + value = app_settings.pop('send_chatstate_default', None) + if value is not None: + for account in self._account_settings['account']: + self._account_settings[account]['account']['send_chatstate_default'] = value value = app_settings.pop('print_join_left_default', None) if value is not None: @@ -302,6 +309,9 @@ class _Settings: self._settings['app'] = app_settings self._commit_settings('app') + for account in self._account_settings: + self._commit_account_settings(account) + def _migrate_encryption_settings(self) -> None: # Migrate encryption settings into contact/group chat settings encryption_settings = app.config.get_all_per('encryption') @@ -468,6 +478,7 @@ class _Settings: except KeyError: pass + self._commit_settings('app') self._notify(default, setting) return @@ -579,6 +590,7 @@ class _Settings: except KeyError: pass + self._commit_account_settings(account) self._notify(default, setting, account) return @@ -608,6 +620,14 @@ class _Settings: return self.get_app_setting( f'gc_{setting}_{context}_default') return self.get_app_setting(f'gc_{setting}_default') + + if default is HAS_ACCOUNT_DEFAULT: + if context is not None: + return self.get_account_setting( + account, f'gc_{setting}_{context}_default') + return self.get_account_setting(account, + f'gc_{setting}_default') + return default def set_group_chat_setting(self, @@ -624,11 +644,16 @@ class _Settings: raise ValueError(f'Invalid group chat setting: {setting}') default = ACCOUNT_SETTINGS['group_chat'][setting] - if default is HAS_APP_DEFAULT: + if default in (HAS_APP_DEFAULT, HAS_ACCOUNT_DEFAULT): + + default_store = APP_SETTINGS + if default is HAS_ACCOUNT_DEFAULT: + default_store = ACCOUNT_SETTINGS['account'] + if context is None: - default = APP_SETTINGS[f'gc_{setting}_default'] + default = default_store[f'gc_{setting}_default'] else: - default = APP_SETTINGS[f'gc_{setting}_{context}_default'] + default = default_store[f'gc_{setting}_{context}_default'] if not isinstance(value, type(default)) and value is not None: raise TypeError(f'Invalid type for {setting}: ' @@ -636,10 +661,11 @@ class _Settings: if value is None: try: - del self._account_settings[account]['group_chat'][setting] + del self._account_settings[account]['group_chat'][jid][setting] except KeyError: pass + self._commit_account_settings(account) self._notify(default, setting, account, jid) return @@ -652,6 +678,14 @@ class _Settings: self._commit_account_settings(account) self._notify(value, setting, account, jid) + def set_group_chat_settings(self, + setting: str, + value: SETTING_TYPE) -> None: + + for account in self._account_settings: + for jid in self._account_settings[account]['group_chat']: + self.set_group_chat_setting(account, jid, setting, value) + def get_contact_setting(self, account: str, jid: str, @@ -669,6 +703,10 @@ class _Settings: default = ACCOUNT_SETTINGS['contact'][setting] if default is HAS_APP_DEFAULT: return self.get_app_setting(f'{setting}_default') + + if default is HAS_ACCOUNT_DEFAULT: + return self.get_account_setting(account, f'{setting}_default') + return default def set_contact_setting(self, @@ -684,18 +722,25 @@ class _Settings: 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 default in (HAS_APP_DEFAULT, HAS_ACCOUNT_DEFAULT): + + default_store = APP_SETTINGS + if default is HAS_ACCOUNT_DEFAULT: + default_store = ACCOUNT_SETTINGS['account'] + + default = default_store[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] + del self._account_settings[account]['contact'][jid][setting] except KeyError: pass + self._commit_account_settings(account) self._notify(default, setting, account, jid) return @@ -708,6 +753,14 @@ class _Settings: self._commit_account_settings(account) self._notify(value, setting, account, jid) + def set_contact_settings(self, + setting: str, + value: SETTING_TYPE) -> None: + + for account in self._account_settings: + for jid in self._account_settings[account]['contact']: + self.set_contact_setting(account, jid, setting, value) + def set_soundevent_setting(self, event_name: str, setting: str, ===================================== gajim/gtk/accounts.py ===================================== @@ -655,6 +655,12 @@ class PrivacyPage(GenericSettingPage): def __init__(self, account): + chatstate_entries = { + 'all': _('Enabled'), + 'composing_only': _('Composing Only'), + 'disabled': _('Disabled'), + } + settings = [ Setting(SettingKind.SWITCH, _('Idle Time'), SettingType.ACCOUNT_CONFIG, 'send_idle_time', @@ -679,9 +685,43 @@ class PrivacyPage(GenericSettingPage): SettingType.ACCOUNT_CONFIG, 'answer_receipts', desc=_('Tell your contacts if you received a message')), + Setting(SettingKind.POPOVER, + _('Send Chatstate'), + SettingType.ACCOUNT_CONFIG, + 'send_chatstate_default', + desc=_('Default for chats'), + props={'entries': chatstate_entries, + 'button-text':_('Reset'), + 'button-tooltip': _('Reset all chats to the ' + 'current default value'), + 'button-style': 'destructive-action', + 'button-callback': self._reset_send_chatstate}), + + Setting(SettingKind.POPOVER, + _('Send Chatstate in Group Chats'), + SettingType.ACCOUNT_CONFIG, + 'gc_send_chatstate_default', + desc=_('Default for group chats'), + props={'entries': chatstate_entries, + 'button-text':_('Reset'), + 'button-tooltip': _('Reset all group chats to the ' + 'current default value'), + 'button-style': 'destructive-action', + 'button-callback': self._reset_gc_send_chatstate}), + ] GenericSettingPage.__init__(self, account, settings) + @staticmethod + def _reset_send_chatstate(button): + button.set_sensitive(False) + app.settings.set_contact_settings('send_chatstate', None) + + @staticmethod + def _reset_gc_send_chatstate(button): + button.set_sensitive(False) + app.settings.set_group_chat_settings('send_chatstate', None) + class ConnectionPage(GenericSettingPage): ===================================== gajim/gtk/settings.py ===================================== @@ -277,11 +277,24 @@ class GenericSetting(Gtk.ListBoxRow): def _add_action_button(self, kwargs): icon_name = kwargs.get('button-icon-name') - if icon_name is None: + button_text = kwargs.get('button-text') + tooltip_text = kwargs.get('button-tooltip') or '' + style = kwargs.get('button-style') + + if icon_name is not None: + button = Gtk.Button.new_from_icon_name(icon_name, Gtk.IconSize.MENU) + + elif button_text is not None: + button = Gtk.Button(label=button_text) + + else: return - button = Gtk.Button.new_from_icon_name(icon_name, Gtk.IconSize.MENU) + if style is not None: + button.get_style_context().add_class(style) + button.connect('clicked', kwargs['button-callback']) + button.set_tooltip_text(tooltip_text) self.setting_box.add(button) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5027bbc3e4c6eedbfde6173f84cc13b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5027bbc3e4c6eedbfde6173f84cc13b… You're receiving this email because of your account on dev.gajim.org.

1 0

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

07 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5027bbc3 by lovetox at 2020-09-08T00:34:17+02:00 Remove unused code - - - - - 1 changed file: - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtkgui_helpers.py ===================================== @@ -146,46 +146,6 @@ def scale_pixbuf_from_data(data, size): pixbuf = get_pixbuf_from_data(data) return scale_pixbuf(pixbuf, size) - -def create_combobox(value_list, selected_value=None): - """ - Value_list is [(label1, value1)] - """ - liststore = Gtk.ListStore(str, str) - combobox = Gtk.ComboBox.new_with_model(liststore) - cell = Gtk.CellRendererText() - combobox.pack_start(cell, True) - combobox.add_attribute(cell, 'text', 0) - i = -1 - for value in value_list: - liststore.append(value) - if selected_value == value[1]: - i = value_list.index(value) - if i > -1: - combobox.set_active(i) - combobox.show_all() - return combobox - -def create_list_multi(value_list, selected_values=None): - """ - Value_list is [(label1, value1)] - """ - liststore = Gtk.ListStore(str, str) - treeview = Gtk.TreeView.new_with_model(liststore) - treeview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) - treeview.set_headers_visible(False) - col = Gtk.TreeViewColumn() - treeview.append_column(col) - cell = Gtk.CellRendererText() - col.pack_start(cell, True) - col.set_attributes(cell, text=0) - for value in value_list: - iter_ = liststore.append(value) - if value[1] in selected_values: - treeview.get_selection().select_iter(iter_) - treeview.show_all() - return treeview - def label_set_autowrap(widget): """ Make labels automatically re-wrap if their containers are resized. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5027bbc3e4c6eedbfde6173f84cc13bc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5027bbc3e4c6eedbfde6173f84cc13bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add some type hints for some dialogs
by Philipp Hörist 07 Sep '20

07 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 10b29765 by lovetox at 2020-09-08T00:29:48+02:00 Add some type hints for some dialogs This helps the Window Manager decide how to display the window - - - - - 4 changed files: - gajim/gtk/groupchat_join.py - gajim/gtk/proxies.py - gajim/gtk/server_info.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -38,6 +38,7 @@ class GroupchatJoin(Gtk.ApplicationWindow): self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('Join Group Chat')) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self._destroyed = False self.account = account ===================================== gajim/gtk/proxies.py ===================================== @@ -31,6 +31,7 @@ class ManageProxies(Gtk.ApplicationWindow): self.set_default_size(500, -1) self.set_show_menubar(False) self.set_title(_('Manage Proxies')) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self._ui = get_builder('manage_proxies.ui') self.add(self._ui.box) ===================================== gajim/gtk/server_info.py ===================================== @@ -46,6 +46,7 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): self.set_default_size(400, 600) self.set_show_menubar(False) self.set_title(_('Server Info')) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.account = account self._destroyed = False ===================================== gajim/gtk/start_chat.py ===================================== @@ -53,6 +53,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('Start / Join Chat')) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.set_default_size(-1, 400) self.ready_to_destroy = False self._parameter_form = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/10b29765d5da2db5f51f4fce544b2bcb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/10b29765d5da2db5f51f4fce544b2bcb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PopoverSetting: Use instance attribute
by Philipp Hörist 07 Sep '20

07 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 47a8f53f by lovetox at 2020-09-07T20:11:15+02:00 PopoverSetting: Use instance attribute - - - - - 1 changed file: - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/settings.py ===================================== @@ -572,8 +572,8 @@ class PopoverSetting(GenericSetting): self._add_action_button(kwargs) - self._current_label.set_text(entries.get(self.setting_value, - self._default_text or '')) + text = self._entries.get(self.setting_value, self._default_text or '') + self._current_label.set_text(text) self._bind_label() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47a8f53f6687d69e0c351a7ebe726a5a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47a8f53f6687d69e0c351a7ebe726a5a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PopoverSetting: Use connect_signals() instead of bind_signal()
by Philipp Hörist 07 Sep '20

07 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 99413d12 by lovetox at 2020-09-07T20:06:13+02:00 PopoverSetting: Use connect_signals() instead of bind_signal() This is a more flexible approach - - - - - 1 changed file: - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/settings.py ===================================== @@ -187,7 +187,6 @@ class GenericSetting(Gtk.ListBoxRow): self._grid.add(self.setting_box) self.add(self._grid) - self.connect('destroy', self._on_destroy) self._bind_sensitive_state() def _bind_sensitive_state(self): @@ -285,10 +284,6 @@ class GenericSetting(Gtk.ListBoxRow): button.connect('clicked', kwargs['button-callback']) self.setting_box.add(button) - def _on_destroy(self, *args): - if self.bind is not None: - app.settings.disconnect_signals(self) - class SwitchSetting(GenericSetting): def __init__(self, *args, **kwargs): @@ -534,8 +529,7 @@ class PopoverSetting(GenericSetting): def __init__(self, *args, entries, **kwargs): GenericSetting.__init__(self, *args) - if isinstance(entries, list): - entries = {key: key for key in entries} + self._entries = self._convert_to_dict(entries) box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=12) @@ -555,7 +549,7 @@ class PopoverSetting(GenericSetting): self._menu_listbox = Gtk.ListBox() self._menu_listbox.set_selection_mode(Gtk.SelectionMode.NONE) - self._add_menu_entries(entries) + self._add_menu_entries() self._menu_listbox.connect('row-activated', self._on_menu_row_activated) @@ -583,26 +577,36 @@ class PopoverSetting(GenericSetting): self._bind_label() + self.connect('destroy', self._on_destroy) + self.show_all() + @staticmethod + def _convert_to_dict(entries): + if isinstance(entries, list): + entries = {key: key for key in entries} + return entries + def _bind_label(self): if self.type_ not in (SettingType.CONFIG, SettingType.ACCOUNT_CONFIG): return - app.settings.bind_signal(self.value, - self._current_label, - 'set_text', - account=self.account, - default_text=self._default_text) + app.settings.connect_signal(self.value, + self._on_setting_changed, + account=self.account) - def _add_menu_entries(self, entries): - if isinstance(entries, list): - entries = {key: key for key in entries} + def _on_setting_changed(self, value, *args): + text = self._entries.get(value) + if text is None: + text = self._default_text or '' + + self._current_label.set_text(text) + def _add_menu_entries(self): if self._default_text is not None: self._menu_listbox.add(PopoverRow(self._default_text, '')) - for value, label in entries.items(): + for value, label in self._entries.items(): self._menu_listbox.add(PopoverRow(label, value)) self._menu_listbox.show_all() @@ -617,8 +621,12 @@ class PopoverSetting(GenericSetting): self._popover.popup() def update_entries(self, entries): + self._entries = self._convert_to_dict(entries) self._menu_listbox.foreach(self._menu_listbox.remove) - self._add_menu_entries(entries) + self._add_menu_entries() + + def _on_destroy(self, *args): + app.settings.disconnect_signals(self) class PopoverRow(Gtk.ListBoxRow): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/99413d12c1be2ac46fcc41c6c0008e7e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/99413d12c1be2ac46fcc41c6c0008e7e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Increase spacing
by Philipp Hörist 07 Sep '20

07 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 49099b18 by lovetox at 2020-09-07T18:45:04+02:00 Settings: Increase spacing - - - - - 1 changed file: - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/settings.py ===================================== @@ -180,7 +180,7 @@ class GenericSetting(Gtk.ListBoxRow): self._grid.add(description_box) - self.setting_box = Gtk.Box(spacing=6) + self.setting_box = Gtk.Box(spacing=12) self.setting_box.set_size_request(200, -1) self.setting_box.set_valign(Gtk.Align.CENTER) self.setting_box.set_name('GenericSettingBox') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49099b184e384b599a755eca7e2cf23b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49099b184e384b599a755eca7e2cf23b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Settings: Add default_text argument for bind_signal()
by Philipp Hörist 07 Sep '20

07 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 782602e5 by lovetox at 2020-09-07T17:46:25+02:00 Settings: Add default_text argument for bind_signal() default_text is returned if the value of the setting is an empty string - - - - - 43ea1969 by lovetox at 2020-09-07T17:47:35+02:00 Settings: Reset proxy setting if it is deleted - - - - - 837ade88 by lovetox at 2020-09-07T18:09:18+02:00 PopoverSetting: Use default_text argument - - - - - fa8bab81 by lovetox at 2020-09-07T18:10:11+02:00 Accounts: Use default_text argument for proxy setting - - - - - 3 changed files: - gajim/common/settings.py - gajim/gtk/accounts.py - gajim/gtk/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -104,14 +104,15 @@ class _Settings: func_name, account=None, jid=None, - inverted=False): + inverted=False, + default_text=None): callbacks = self._callbacks[(setting, account, jid)] func = getattr(widget, func_name) - callbacks.append((func, inverted)) + callbacks.append((func, inverted, default_text)) def _on_destroy(*args): - callbacks.remove((func, inverted)) + callbacks.remove((func, inverted, default_text)) widget.connect('destroy', _on_destroy) @@ -121,10 +122,13 @@ class _Settings: callbacks = self._callbacks[(setting, account, jid)] for func in list(callbacks): if isinstance(func, tuple): - func, inverted = func - if inverted: + func, inverted, default_text = func + if isinstance(value, bool) and inverted: value = not value + if value == '' and default_text is not None: + value = default_text + try: func(value) except Exception: @@ -825,6 +829,13 @@ class _Settings: del self._settings['proxies'][proxy_name] self._commit_settings('proxies') + if self.get_app_setting('global_proxy') == proxy_name: + self.set_app_setting('global_proxy', None) + + for account in self._account_settings: + if self.get_account_setting(account, 'proxy') == proxy_name: + self.set_account_setting(account, 'proxy', None) + Settings = _Settings() ===================================== gajim/gtk/accounts.py ===================================== @@ -693,6 +693,7 @@ class ConnectionPage(GenericSettingPage): Setting(SettingKind.POPOVER, _('Proxy'), SettingType.ACCOUNT_CONFIG, 'proxy', name='proxy', props={'entries': self._get_proxies(), + 'default-text': _('No Proxy'), 'button-icon-name': 'preferences-system-symbolic', 'button-callback': self._on_proxy_edit}), @@ -720,10 +721,7 @@ class ConnectionPage(GenericSettingPage): @staticmethod def _get_proxies(): - proxies = {'': _('No Proxy')} - for proxy in app.settings.get_proxies(): - proxies[proxy] = proxy - return proxies + return {proxy: proxy for proxy in app.settings.get_proxies()} @staticmethod def _on_proxy_edit(*args): ===================================== gajim/gtk/settings.py ===================================== @@ -542,6 +542,8 @@ class PopoverSetting(GenericSetting): box.set_halign(Gtk.Align.END) box.set_hexpand(True) + self._default_text = kwargs.get('default-text') + self._current_label = Gtk.Label() self._current_label.set_valign(Gtk.Align.CENTER) image = Gtk.Image.new_from_icon_name('pan-down-symbolic', @@ -576,7 +578,8 @@ class PopoverSetting(GenericSetting): self._add_action_button(kwargs) - self._current_label.set_text(entries.get(self.setting_value, '')) + self._current_label.set_text(entries.get(self.setting_value, + self._default_text or '')) self._bind_label() @@ -588,12 +591,17 @@ class PopoverSetting(GenericSetting): app.settings.bind_signal(self.value, self._current_label, - 'set_text') + 'set_text', + account=self.account, + default_text=self._default_text) def _add_menu_entries(self, entries): if isinstance(entries, list): entries = {key: key for key in entries} + if self._default_text is not None: + self._menu_listbox.add(PopoverRow(self._default_text, '')) + for value, label in entries.items(): self._menu_listbox.add(PopoverRow(label, value)) @@ -601,7 +609,6 @@ class PopoverSetting(GenericSetting): def _on_menu_row_activated(self, listbox, row): listbox.unselect_all() - self._current_label.set_text(row.label) self._popover.popdown() self.set_value(row.value) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2e1252c4154f581e790bf4440ead030… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2e1252c4154f581e790bf4440ead030… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Settings: Add action button to Popover and Switch settings
by Philipp Hörist 07 Sep '20

07 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a3d92681 by lovetox at 2020-09-07T15:01:16+02:00 Settings: Add action button to Popover and Switch settings - - - - - 2e1252c4 by lovetox at 2020-09-07T15:01:16+02:00 Accounts: Replace ProxyComboSetting with PopoverSetting - - - - - 3 changed files: - gajim/gtk/accounts.py - gajim/gtk/const.py - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -212,7 +212,7 @@ class Settings(Gtk.ScrolledWindow): for page in self._pages[account]: if page.name != 'connection': continue - page.listbox.get_setting('proxy').update_values() + page.update_proxy_entries() class AccountMenu(Gtk.Box): @@ -690,8 +690,11 @@ class ConnectionPage(GenericSettingPage): def __init__(self, account): settings = [ - Setting(SettingKind.PROXY, _('Proxy'), - SettingType.ACCOUNT_CONFIG, 'proxy', name='proxy'), + Setting(SettingKind.POPOVER, _('Proxy'), + SettingType.ACCOUNT_CONFIG, 'proxy', name='proxy', + props={'entries': self._get_proxies(), + 'button-icon-name': 'preferences-system-symbolic', + 'button-callback': self._on_proxy_edit}), Setting(SettingKind.HOSTNAME, _('Hostname'), SettingType.DIALOG, desc=_('Manually set the hostname for the server'), @@ -715,6 +718,20 @@ class ConnectionPage(GenericSettingPage): ] GenericSettingPage.__init__(self, account, settings) + @staticmethod + def _get_proxies(): + proxies = {'': _('No Proxy')} + for proxy in app.settings.get_proxies(): + proxies[proxy] = proxy + return proxies + + @staticmethod + def _on_proxy_edit(*args): + open_window('ManageProxies') + + def update_proxy_entries(self): + self.listbox.get_setting('proxy').update_entries(self._get_proxies()) + class AdvancedPage(GenericSettingPage): ===================================== gajim/gtk/const.py ===================================== @@ -51,7 +51,6 @@ class SettingKind(IntEnum): LOGIN = 4 DIALOG = 5 CALLBACK = 6 - PROXY = 7 HOSTNAME = 8 PRIORITY = 9 FILECHOOSER = 10 ===================================== gajim/gtk/settings.py ===================================== @@ -88,7 +88,6 @@ class SettingsBox(Gtk.ListBox): SettingKind.LOGIN: LoginSetting, SettingKind.FILECHOOSER: FileChooserSetting, SettingKind.CALLBACK: CallbackSetting, - SettingKind.PROXY: ProxyComboSetting, SettingKind.PRIORITY: PrioritySetting, SettingKind.HOSTNAME: CutstomHostnameSetting, SettingKind.CHANGEPASSWORD: ChangePasswordSetting, @@ -277,13 +276,22 @@ class GenericSetting(Gtk.ListBoxRow): self.set_activatable(enabled_func_value) self.set_sensitive(enabled_func_value) + def _add_action_button(self, kwargs): + icon_name = kwargs.get('button-icon-name') + if icon_name is None: + return + + button = Gtk.Button.new_from_icon_name(icon_name, Gtk.IconSize.MENU) + button.connect('clicked', kwargs['button-callback']) + self.setting_box.add(button) + def _on_destroy(self, *args): if self.bind is not None: app.settings.disconnect_signals(self) class SwitchSetting(GenericSetting): - def __init__(self, *args): + def __init__(self, *args, **kwargs): GenericSetting.__init__(self, *args) self.switch = Gtk.Switch() @@ -309,6 +317,8 @@ class SwitchSetting(GenericSetting): box.add(self.switch) self.setting_box.add(box) + self._add_action_button(kwargs) + self.show_all() def on_row_activated(self): @@ -521,7 +531,7 @@ class LoginSetting(DialogSetting): class PopoverSetting(GenericSetting): - def __init__(self, *args, entries): + def __init__(self, *args, entries, **kwargs): GenericSetting.__init__(self, *args) if isinstance(entries, list): @@ -530,6 +540,7 @@ class PopoverSetting(GenericSetting): box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=12) box.set_halign(Gtk.Align.END) + box.set_hexpand(True) self._current_label = Gtk.Label() self._current_label.set_valign(Gtk.Align.CENTER) @@ -561,7 +572,9 @@ class PopoverSetting(GenericSetting): self._popover.set_position(Gtk.PositionType.BOTTOM) self._popover.add(scrolled_window) - self.setting_box.pack_end(box, True, True, 0) + self.setting_box.add(box) + + self._add_action_button(kwargs) self._current_label.set_text(entries.get(self.setting_value, '')) @@ -640,56 +653,6 @@ class ComboSetting(GenericSetting): pass -class ProxyComboSetting(GenericSetting): - def __init__(self, *args): - GenericSetting.__init__(self, *args) - - self.combo = MaxWidthComboBoxText() - self.combo.set_valign(Gtk.Align.CENTER) - - self._signal_id = None - self.update_values() - - button = get_image_button( - 'preferences-system-symbolic', _('Manage Proxies')) - button.set_action_name('app.manage-proxies') - button.set_valign(Gtk.Align.CENTER) - - self.setting_box.pack_start(self.combo, True, True, 0) - self.setting_box.pack_start(button, False, True, 0) - self.show_all() - - def _block_signal(self, state): - if state: - if self._signal_id is None: - return - self.combo.disconnect(self._signal_id) - else: - self._signal_id = self.combo.connect('changed', - self.on_value_change) - self.combo.emit('changed') - - def update_values(self): - self._block_signal(True) - proxies = app.settings.get_proxies() - proxies.insert(0, _('No Proxy')) - self.combo.remove_all() - for index, value in enumerate(proxies): - self.combo.insert_text(-1, value) - if value == self.setting_value or index == 0: - self.combo.set_active(index) - self._block_signal(False) - - def on_value_change(self, combo): - if combo.get_active() == 0: - self.set_value('') - else: - self.set_value(combo.get_active_text()) - - def on_row_activated(self): - pass - - class PrioritySetting(DialogSetting): def __init__(self, *args, **kwargs): DialogSetting.__init__(self, *args, **kwargs) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c92c369a698b18aa6509e122058e0cd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c92c369a698b18aa6509e122058e0cd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControl: Add Send Message button
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c92c369a by Daniel Brötzmann at 2020-09-07T00:23:49+02:00 ChatControl: Add Send Message button - - - - - 6 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/setting_values.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -312,6 +312,11 @@ class ChatControl(ChatControlBase): win.lookup_action('toggle-video-' + self.control_id).set_enabled( online and self.jingle['video'].available) + # Send message + has_text = self.msg_textview.has_text() + win.lookup_action( + f'send-message-{self.control_id}').set_enabled(online and has_text) + # Send file (HTTP File Upload) httpupload = win.lookup_action( 'send-file-httpupload-' + self.control_id) ===================================== gajim/chat_control_base.py ===================================== @@ -192,6 +192,16 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.msg_textview.connect('text-changed', self._on_message_tv_buffer_changed) + # Send message button + self.xml.send_message_button.set_action_name( + 'win.send-message-%s' % self.control_id) + self.xml.send_message_button.set_visible( + app.settings.get('show_send_message_button')) + app.settings.bind_signal( + 'show_send_message_button', + self.xml.send_message_button, + 'set_visible') + self.msg_scrolledwindow = ScrolledWindow() self.msg_scrolledwindow.add(self.msg_textview) @@ -513,6 +523,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.parent_win.window.add_action(action) actions = { + 'send-message-%s': self._on_send_message, 'send-file-%s': self._on_send_file, 'send-file-httpupload-%s': self._on_send_file, 'send-file-jingle-%s': self._on_send_file, @@ -526,6 +537,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): def remove_actions(self): actions = [ + 'send-message-', 'set-encryption-', 'send-file-', 'send-file-httpupload-', @@ -911,10 +923,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): app.interface.raise_dialog('not-connected-while-sending') return True - textview.replace_emojis() - message = textview.get_text() - xhtml = textview.get_xhtml() - self.send_message(message, xhtml=xhtml) + self._on_send_message() return True elif event.keyval == Gdk.KEY_z: # CTRL+z @@ -963,6 +972,12 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): label = labels[lname] return label + def _on_send_message(self, *args): + self.msg_textview.replace_emojis() + message = self.msg_textview.get_text() + xhtml = self.msg_textview.get_xhtml() + self.send_message(message, xhtml=xhtml) + def send_message(self, message, type_='chat', @@ -1029,6 +1044,10 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.contact, self.msg_textview.has_text()) def _on_message_tv_buffer_changed(self, textview, textbuffer): + has_text = self.msg_textview.has_text() + self.parent_win.window.lookup_action( + 'send-message-' + self.control_id).set_enabled(has_text) + if textbuffer.get_char_count() and self.encryption: app.plugin_manager.extension_point( 'typing' + self.encryption, self) ===================================== gajim/common/setting_values.py ===================================== @@ -187,6 +187,7 @@ APP_SETTINGS = { 'check_for_update': True, 'last_update_check': '', 'always_ask_for_status_message': False, + 'show_send_message_button': False, } ACCOUNT_SETTINGS = { ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment1"> @@ -982,6 +982,32 @@ microphone-sensitivity-high-symbolic</property> <property name="position">7</property> </packing> </child> + <child> + <object class="GtkButton" id="send_message_button"> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Send Message</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">document-send</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">8</property> + </packing> + </child> <child> <placeholder/> </child> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -301,20 +301,21 @@ <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkMenuButton" id="settings_menu"> + <object class="GtkButton" id="quick_invite_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="relief">none</property> + <property name="tooltip_text" translatable="yes">Invite Contacts…</property> <child> <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">open-menu-symbolic</property> + <property name="icon_name">list-add-symbolic</property> </object> </child> <style> <class name="chatcontrol-actionbar-button"/> + <class name="flat"/> </style> </object> <packing> @@ -325,28 +326,27 @@ </packing> </child> <child> - <object class="GtkButton" id="quick_invite_button"> + <object class="GtkMenuButton" id="settings_menu"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Invite Contacts…</property> + <property name="relief">none</property> <child> <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> + <property name="icon_name">open-menu-symbolic</property> </object> </child> <style> <class name="chatcontrol-actionbar-button"/> - <class name="flat"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="pack_type">end</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -374,7 +374,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -395,7 +395,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> @@ -420,7 +420,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -447,6 +447,32 @@ <property name="position">5</property> </packing> </child> + <child> + <object class="GtkButton" id="send_message_button"> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Send Message</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">document-send</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">6</property> + </packing> + </child> <child> <object class="GtkMenuButton" id="formattings_button"> <property name="visible">True</property> @@ -473,12 +499,9 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> - <child> - <placeholder/> - </child> <child> <object class="GtkComboBox" id="label_selector"> <property name="visible">True</property> @@ -491,6 +514,9 @@ <property name="position">8</property> </packing> </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/groupchat_control.py ===================================== @@ -393,6 +393,11 @@ class GroupchatControl(ChatControlBase): # Execute command self._get_action('execute-command-').set_enabled(self.is_connected) + # Send message + has_text = self.msg_textview.has_text() + self._get_action('send-message-').set_enabled( + self.is_connected and has_text) + # Send file (HTTP File Upload) httpupload = self._get_action( 'send-file-httpupload-') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c92c369a698b18aa6509e122058e0cd5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c92c369a698b18aa6509e122058e0cd5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Themes: Store setting after renaming theme
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4cbd71d3 by lovetox at 2020-09-06T21:54:13+02:00 Themes: Store setting after renaming theme - - - - - eb1737a4 by lovetox at 2020-09-06T21:55:43+02:00 PopoverSettings: Bind current label to setting - - - - - 2 changed files: - gajim/gtk/settings.py - gajim/gtk/themes.py Changes: ===================================== gajim/gtk/settings.py ===================================== @@ -565,8 +565,18 @@ class PopoverSetting(GenericSetting): self._current_label.set_text(entries.get(self.setting_value, '')) + self._bind_label() + self.show_all() + def _bind_label(self): + if self.type_ not in (SettingType.CONFIG, SettingType.ACCOUNT_CONFIG): + return + + app.settings.bind_signal(self.value, + self._current_label, + 'set_text') + def _add_menu_entries(self, entries): if isinstance(entries, list): entries = {key: key for key in entries} ===================================== gajim/gtk/themes.py ===================================== @@ -239,6 +239,7 @@ class Themes(Gtk.ApplicationWindow): if result is False: return + app.settings.set('roster_theme', new_name) self._ui.theme_store.set_value(iter_, Column.THEME, new_name) def _select_theme_row(self, iter_): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3e0bdbf8a4a52dde0ccfdd8192817ba… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3e0bdbf8a4a52dde0ccfdd8192817ba… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
5
6
7
8
9
10
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2020