Commits May 2021

commits@gajim.org

1 participants
67 discussions

[Git][gajim/gajim][master] Fix CI
by Philipp Hörist 11 May '21

11 May '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: debab37e by lovetox at 2021-05-11T22:38:43+02:00 Fix CI - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +# type: ignore import logging from gi.repository import Gdk @@ -50,7 +51,6 @@ from .util import get_builder from .util import open_window - log = logging.getLogger('gajim.gui.account_wizard') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/debab37e3721871b16af6b6edbb86d68… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/debab37e3721871b16af6b6edbb86d68… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StartChat: Use ChatFilter widget
by Daniel Brötzmann 08 May '21

08 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6830dec3 by wurstsalat at 2021-05-08T23:42:58+02:00 StartChat: Use ChatFilter widget - - - - - 3 changed files: - gajim/data/gui/start_chat_dialog.ui - + gajim/gtk/chat_filter.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/data/gui/start_chat_dialog.ui ===================================== @@ -176,44 +176,7 @@ <property name="can-focus">False</property> <property name="transition-duration">100</property> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <child> - <object class="GtkToggleButton" id="filter_chats"> - <property name="label" translatable="yes">Chats</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="active">True</property> - <signal name="toggled" handler="_on_filter_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkToggleButton" id="filter_groupchats"> - <property name="label" translatable="yes">Group Chats</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="active">True</property> - <signal name="toggled" handler="_on_filter_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="linked"/> - </style> - </object> + <placeholder/> </child> </object> <packing> ===================================== gajim/gtk/chat_filter.py ===================================== @@ -0,0 +1,58 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import GObject +from gi.repository import Gtk + +from gajim.common.i18n import _ + + +class ChatFilter(Gtk.Box): + + __gsignals__ = { + 'filter-changed': (GObject.SignalFlags.RUN_LAST, + None, + (str, )), + } + + def __init__(self): + Gtk.Box.__init__(self) + self.set_halign(Gtk.Align.CENTER) + + toolbar = Gtk.Toolbar() + + all_button = Gtk.RadioToolButton.new_from_widget(None) + all_button.set_label(_('All')) + all_button.set_name('all') + all_button.connect('clicked', self._on_button_clicked) + toolbar.insert(all_button, 1) + + chats_button = Gtk.RadioToolButton.new_from_widget(all_button) + chats_button.set_label(_('Chats')) + chats_button.set_name('chats') + chats_button.connect('clicked', self._on_button_clicked) + toolbar.insert(chats_button, 2) + + group_chats_button = Gtk.RadioToolButton.new_from_widget(all_button) + group_chats_button.set_label(_('Group Chats')) + group_chats_button.set_name('group_chats') + group_chats_button.connect('clicked', self._on_button_clicked) + toolbar.insert(group_chats_button, 3) + + self.add(toolbar) + self.show_all() + + def _on_button_clicked(self, button): + if button.get_active(): + self.emit('filter-changed', button.get_name()) ===================================== gajim/gtk/start_chat.py ===================================== @@ -34,6 +34,7 @@ from gajim.common.const import MUC_DISCO_ERRORS from gajim.common.modules.util import as_task +from .chat_filter import ChatFilter from .groupchat_info import GroupChatInfoScrolled from .groupchat_nick import NickChooser from .util import get_builder @@ -103,6 +104,12 @@ def __init__(self): self._ui.infobar.set_revealed(app.settings.get('show_help_start_chat')) + self._current_filter = 'all' + self._chat_filter = ChatFilter() + self._chat_filter.connect( + 'filter-changed', self._on_chat_filter_changed) + self._ui.filter_bar_revealer.add(self._chat_filter) + self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._destroy) @@ -287,7 +294,8 @@ def _on_filter_bar_toggled(self, toggle_button): active = toggle_button.get_active() self._ui.filter_bar_revealer.set_reveal_child(active) - def _on_filter_toggled(self, _toggle_button): + def _on_chat_filter_changed(self, _filter, name): + self._current_filter = name self._ui.listbox.invalidate_filter() def _start_new_chat(self, row): @@ -507,11 +515,10 @@ def _filter_func(self, row, _user_data): search_text_list = search_text.split() row_text = row.get_search_text().lower() - show_chats = self._ui.filter_chats.get_active() - show_groupchats = self._ui.filter_groupchats.get_active() - if row.groupchat and not show_groupchats: + if self._current_filter == 'chats' and row.groupchat: return False - if not row.groupchat and not show_chats: + + if self._current_filter == 'group_chats' and not row.groupchat: return False for text in search_text_list: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6830dec35d3daebc19b3ad3842fb6cec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6830dec35d3daebc19b3ad3842fb6cec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update runtime requirements
by Philipp Hörist 08 May '21

08 May '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 242791e3 by lovetox at 2021-05-08T12:41:22+02:00 Update runtime requirements - - - - - 2 changed files: - README.md - setup.cfg Changes: ===================================== README.md ===================================== @@ -13,6 +13,7 @@ ### Runtime Requirements - python3-keyring - python3-precis-i18n - python3-packaging +- python3-setuptools - gir1.2-soup-2.4 - GLib (>=2.60.0) ===================================== setup.cfg ===================================== @@ -24,6 +24,7 @@ install_requires = keyring nbxmpp>=2.0.1 packaging + setuptools precis-i18n>=1.0.0 pyOpenSSL>=16.2 pycairo>=1.16.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/242791e38fefa25b091da524a39c294c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/242791e38fefa25b091da524a39c294c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: GSSAPI: Catch OSError
by Philipp Hörist 08 May '21

08 May '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: a8edce24 by lovetox at 2021-05-08T12:24:06+02:00 GSSAPI: Catch OSError Error is thrown when Kerberos for Windows is not installed - - - - - 73c4352f by lovetox at 2021-05-08T12:24:38+02:00 Update README.md - - - - - 2 changed files: - README.md - nbxmpp/auth.py Changes: ===================================== README.md ===================================== @@ -13,7 +13,7 @@ ## Optional Runtime Requirements -- python-gssapi (for GSSAPI authentication) +- python-gssapi (for GSSAPI authentication https://pypi.org/project/gssapi/) ## Features ===================================== nbxmpp/auth.py ===================================== @@ -37,7 +37,8 @@ log = logging.getLogger('nbxmpp.auth') try: gssapi = __import__('gssapi') GSSAPI_AVAILABLE = True -except ImportError: +except (ImportError, OSError) as error: + log.warning('GSSAPI not available: %s', error) GSSAPI_AVAILABLE = False View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/6e3bc1655ed7210a9ef86fd… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/6e3bc1655ed7210a9ef86fd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] CodeTextview: Set style scheme depending on Gajim theme
by Daniel Brötzmann 06 May '21

06 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 34aa3837 by wurstsalat at 2021-05-06T22:31:42+02:00 CodeTextview: Set style scheme depending on Gajim theme - - - - - 1 changed file: - gajim/gtk/conversation/code_widget.py Changes: ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -21,6 +21,7 @@ from gi.repository import Gtk from gi.repository import GtkSource +from gajim.common import app from gajim.common.i18n import _ log = logging.getLogger('gajim.gui.conversation.code_widget') @@ -95,6 +96,16 @@ def __init__(self): self.set_bottom_margin(2) self._source_manager = GtkSource.LanguageManager.get_default() + self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() + + if app.css_config.prefer_dark: + style_scheme = self._style_scheme_manager.get_scheme( + 'solarized-dark') + else: + style_scheme = self._style_scheme_manager.get_scheme( + 'solarized-light') + if style_scheme is not None: + self.get_buffer().set_style_scheme(style_scheme) def set_language(self, language_string): if language_string is None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/34aa3837d6a62198bb4f1b1698c3aa22… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/34aa3837d6a62198bb4f1b1698c3aa22… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Profile: Fix privacy switch inital state
by Philipp Hörist 04 May '21

04 May '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: b7ca7c20 by lovetox at 2021-05-04T22:38:32+02:00 Profile: Fix privacy switch inital state - - - - - 2 changed files: - gajim/data/gui/profile.ui - gajim/gtk/profile.py Changes: ===================================== gajim/data/gui/profile.ui ===================================== @@ -1,117 +1,116 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkPopover" id="privacy_popover"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> +  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Privacy</property> <style> <class name="bold"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> <property name="width">3</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Contact Infos</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Picture and Name</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">6</property> + <property name="can-focus">False</property> + <property name="margin-bottom">6</property> <property name="label" translatable="yes">Make your profile visible for everyone or just for your contacts.</property> <property name="wrap">True</property> - <property name="max_width_chars">42</property> + <property name="max-width-chars">42</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> <property name="width">3</property> </packing> </child> <child> <object class="GtkSwitch" id="avatar_nick_access"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="halign">start</property> - <property name="active">False</property> <signal name="notify::active" handler="_access_switch_toggled" swapped="no"/> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> + <property name="left-attach">2</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkSwitch" id="vcard_access"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="halign">start</property> - <property name="active">False</property> <signal name="notify::active" handler="_access_switch_toggled" swapped="no"/> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> + <property name="left-attach">2</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="avatar_nick_access_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Everyone</property> + <property name="label" translatable="yes">Contacts</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="vcard_access_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Everyone</property> + <property name="label" translatable="yes">Contacts</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> <style> @@ -122,11 +121,11 @@ </object> <object class="GtkStack" id="profile_stack"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkSpinner" id="spinner"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="active">True</property> </object> <packing> @@ -136,35 +135,35 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkScrolledWindow" id="scrolled"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="overlay_scrolling">False</property> + <property name="can-focus">True</property> + <property name="overlay-scrolling">False</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkBox" id="profile_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkOverlay" id="avatar_overlay"> - <property name="width_request">100</property> - <property name="height_request">100</property> + <property name="width-request">100</property> + <property name="height-request">100</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">center</property> <child> <object class="GtkImage" id="avatar_image"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">avatar-default-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">avatar-default-symbolic</property> <property name="icon_size">6</property> </object> <packing> @@ -173,38 +172,38 @@ </child> <child type="overlay"> <object class="GtkButton" id="remove_avatar_button"> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Remove your profile picture</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Remove your profile picture</property> <property name="halign">start</property> <property name="valign">end</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="_on_remove_avatar" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">user-trash-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">user-trash-symbolic</property> </object> </child> </object> </child> <child type="overlay"> <object class="GtkButton" id="edit_avatar_button"> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Change your profile picture</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Change your profile picture</property> <property name="halign">end</property> <property name="valign">end</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="_on_edit_avatar" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">document-edit-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">document-edit-symbolic</property> </object> </child> </object> @@ -222,14 +221,14 @@ <child> <object class="GtkEntry" id="nickname_entry"> <property name="name">NicknameEntry</property> - <property name="width_request">250</property> + <property name="width-request">250</property> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Enter your nickname. This is how your name is displayed to your contacts.</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Enter your nickname. This is how your name is displayed to your contacts.</property> <property name="halign">center</property> <property name="xalign">0.5</property> - <property name="placeholder_text" translatable="yes">Nickname</property> + <property name="placeholder-text" translatable="yes">Nickname</property> </object> <packing> <property name="expand">False</property> @@ -254,14 +253,14 @@ <child> <object class="GtkActionBar"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkButton" id="cancel_button"> <property name="label" translatable="yes">_Cancel</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> + <property name="can-focus">False</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="use-underline">True</property> <signal name="clicked" handler="_on_cancel_clicked" swapped="no"/> </object> <packing> @@ -270,20 +269,20 @@ </child> <child type="center"> <object class="GtkMenuButton" id="add_entry_button"> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="use_popover">False</property> + <property name="can-focus">False</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="use-popover">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">6</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="can-focus">False</property> + <property name="icon-name">list-add-symbolic</property> </object> <packing> <property name="expand">False</property> @@ -294,7 +293,7 @@ <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Add Entry</property> </object> <packing> @@ -312,39 +311,39 @@ </child> <child> <object class="GtkMenuButton" id="privacy_button"> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Privacy</property> + <property name="can-focus">False</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Privacy</property> <property name="direction">up</property> <property name="popover">privacy_popover</property> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">preferences-system-privacy-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">preferences-system-privacy-symbolic</property> </object> </child> </object> <packing> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkButton" id="save_button"> <property name="label" translatable="yes">_Save</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> + <property name="can-focus">False</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="use-underline">True</property> <signal name="clicked" handler="_on_save_clicked" swapped="no"/> <style> <class name="suggested-action"/> </style> </object> <packing> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> @@ -352,16 +351,16 @@ <object class="GtkButton" id="edit_button"> <property name="label" translatable="yes">_Edit</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> + <property name="can-focus">False</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> <signal name="clicked" handler="_on_edit_clicked" swapped="no"/> <style> <class name="suggested-action"/> </style> </object> <packing> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> @@ -369,7 +368,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> @@ -382,21 +381,21 @@ <child> <object class="GtkBox" id="avatar_selector_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">center</property> <property name="spacing">12</property> <child> <object class="GtkButton"> <property name="label" translatable="yes">Cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <signal name="clicked" handler="_on_cancel_update_avatar" swapped="no"/> </object> <packing> @@ -409,8 +408,8 @@ <object class="GtkButton" id="avatar_update_button"> <property name="label" translatable="yes">Update</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="clicked" handler="_on_update_avatar" swapped="no"/> <style> <class name="suggested-action"/> @@ -426,7 +425,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> ===================================== gajim/gtk/profile.py ===================================== @@ -125,14 +125,14 @@ def _on_access_model_received(self, task): access_model = result == 'open' if namespace == Namespace.VCARD4_PUBSUB: - self._ui.vcard_access.set_active(access_model) + self._set_vcard_access_switch(access_model) else: if self._avatar_nick_public is None: self._avatar_nick_public = access_model else: - self._avatar_nick_public = (self._avatar_nick_public and + self._avatar_nick_public = (self._avatar_nick_public or access_model) - self._ui.avatar_nick_access.set_active(self._avatar_nick_public) + self._set_avatar_nick_access_switch(self._avatar_nick_public) def _on_vcard_received(self, task): try: @@ -324,13 +324,22 @@ def _on_update_avatar(self, _button): self._ui.remove_avatar_button.show() self._ui.profile_stack.set_visible_child_name('profile') - def _access_switch_toggled(self, *args): - avatar_nick_access = self._ui.avatar_nick_access.get_active() - vcard_access = self._ui.vcard_access.get_active() - self._ui.avatar_nick_access_label.set_text( - _('Everyone') if avatar_nick_access else _('Contacts')) + def _set_vcard_access_switch(self, state): + self._ui.vcard_access.set_active(state) self._ui.vcard_access_label.set_text( - _('Everyone') if vcard_access else _('Contacts')) + _('Everyone') if state else _('Contacts')) + + def _set_avatar_nick_access_switch(self, state): + self._ui.avatar_nick_access.set_active(state) + self._ui.avatar_nick_access_label.set_text( + _('Everyone') if state else _('Contacts')) + + def _access_switch_toggled(self, *args): + state = self._ui.vcard_access.get_active() + self._set_vcard_access_switch(state) + + state = self._ui.avatar_nick_access.get_active() + self._set_avatar_nick_access_switch(state) def _on_save_finished(self, task): try: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7ca7c2081d62c6d039f67f2790abf08… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7ca7c2081d62c6d039f67f2790abf08… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AddContact: Fix group selection
by Daniel Brötzmann 04 May '21

04 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: af8c524c by wurstsalat at 2021-05-04T21:56:18+02:00 AddContact: Fix group selection - - - - - 7 changed files: - gajim/app_actions.py - gajim/gtk/add_contact.py - gajim/gtk/const.py - gajim/gtk/controls/chat.py - gajim/gtk/main.py - gajim/gtk/notification_manager.py - gajim/remote_control.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -30,9 +30,10 @@ # General Actions + def on_add_contact_jid(_action, param): - contact_jid = param.get_string() - open_window('AddNewContactWindow', account=None, contact_jid=contact_jid) + jid = param.get_string() + open_window('AddContact', account=None, jid=jid) # Application Menu Actions @@ -107,10 +108,8 @@ def on_create_gc(_action, param): def on_add_contact(_action, param): - account, contact_jid = param.get_strv() - if not contact_jid: - contact_jid = None - open_window('AddNewContactWindow', account=account, contact_jid=contact_jid) + account, jid = param.get_strv() + open_window('AddContact', account=account, jid=jid or None) def on_single_message(_action, param): ===================================== gajim/gtk/add_contact.py ===================================== @@ -27,16 +27,17 @@ from .util import open_window -class AddNewContactWindow(Gtk.ApplicationWindow, EventHelper): +class AddContact(Gtk.ApplicationWindow, EventHelper): uid_labels = {'jabber': _('XMPP Address'), 'gadu-gadu': _('GG Number'), 'icq': _('ICQ Number')} - def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): + def __init__(self, account=None, jid=None, nick=None, group=None): Gtk.ApplicationWindow.__init__(self) EventHelper.__init__(self) self.set_application(app.app) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_resizable(False) @@ -45,10 +46,11 @@ def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): self.connect_after('key-press-event', self._on_key_press) self.account = account + self._group = group self.adding_jid = False - if contact_jid is not None: - contact_jid = app.get_jid_without_resource(str(contact_jid)) + if jid is not None: + jid = app.get_jid_without_resource(str(jid)) # fill accounts with active accounts accounts = app.get_enabled_accounts_with_labels() @@ -119,16 +121,16 @@ def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): self._ui.protocol_combobox.set_active(0) self._ui.auto_authorize_checkbutton.show() - if contact_jid: + if jid: self.jid_escaped = True - type_ = app.get_transport_name_from_jid(contact_jid) + type_ = app.get_transport_name_from_jid(jid) if not type_: type_ = 'jabber' if type_ == 'jabber': - self._ui.uid_entry.set_text(contact_jid) + self._ui.uid_entry.set_text(jid) transport = None else: - uid, transport = app.get_name_and_server_from_jid(contact_jid) + uid, transport = app.get_name_and_server_from_jid(jid) self._ui.uid_entry.set_text(uid.replace('%', '@', 1)) self._ui.show_contact_info_button.set_sensitive(True) @@ -155,24 +157,14 @@ def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): break iter_ = model.iter_next(iter_) i += 1 - if user_nick: - self._ui.nickname_entry.set_text(user_nick) + if nick: + self._ui.nickname_entry.set_text(nick) self._ui.nickname_entry.grab_focus() else: self.jid_escaped = False self._ui.uid_entry.grab_focus() - group_names = [] - for acct in accounts: - for g in app.groups[acct[0]].keys(): - if g not in helpers.special_groups and g not in group_names: - group_names.append(g) - group_names.sort() - i = 0 - for g in group_names: - self._ui.group_comboboxentry.append_text(g) - if group == g: - self._ui.group_comboboxentry.set_active(i) - i += 1 + + self._update_groups() if len(accounts) > 1: liststore = self._ui.account_combobox.get_model() @@ -201,6 +193,16 @@ def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): ('presence-received', ged.GUI1, self._nec_presence_received), ]) + def _update_groups(self): + self._ui.group_comboboxentry.get_model().clear() + index = 0 + client = app.get_client(self.account) + for item in client.get_module('Roster').get_groups(): + self._ui.group_comboboxentry.append_text(item) + if item == self._group: + self._ui.group_comboboxentry.set_active(index) + index += 1 + def on_uid_entry_changed(self, widget): is_empty = bool(not self._ui.uid_entry.get_text() == '') self._ui.show_contact_info_button.set_sensitive(is_empty) @@ -339,6 +341,7 @@ def on_account_combobox_changed(self, widget): message_buffer = self._ui.message_textview.get_buffer() message_buffer.set_text(helpers.get_subscription_request_msg(account)) self.account = account + self._update_groups() def on_protocol_jid_combobox_changed(self, widget): model = widget.get_model() ===================================== gajim/gtk/const.py ===================================== @@ -109,7 +109,7 @@ def __str__(self): 'Preferences': 'gajim.gui.preferences', 'CreateGroupchatWindow': 'gajim.gui.groupchat_creation', 'StartChatDialog': 'gajim.gui.start_chat', - 'AddNewContactWindow': 'gajim.gui.add_contact', + 'AddContact': 'gajim.gui.add_contact', 'SingleMessageWindow': 'gajim.gui.single_message', 'Bookmarks': 'gajim.gui.bookmarks', 'AccountWizard': 'gajim.gui.account_wizard', ===================================== gajim/gtk/controls/chat.py ===================================== @@ -59,13 +59,13 @@ from gajim.gui.gstreamer import create_gtk_widget from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog -from gajim.gui.add_contact import AddNewContactWindow from gajim.gui.util import get_cursor from gajim.gui.util import format_mood from gajim.gui.util import format_activity from gajim.gui.util import format_tune from gajim.gui.util import format_location from gajim.gui.util import get_activity_icon_name +from gajim.gui.util import open_window from gajim.gui.const import ControlType from gajim.command_system.implementation.hosts import ChatCommands @@ -355,7 +355,8 @@ def delegate_action(self, action): return Gdk.EVENT_PROPAGATE def _on_add_to_roster(self, _action, _param): - AddNewContactWindow(self.account, self.contact.jid) + open_window('AddContact', account=self.account, + jid=self.contact.jid) def _on_block_contact(self, _action, _param): app.window.block_contact(self.account, self.contact.jid) ===================================== gajim/gtk/main.py ===================================== @@ -332,7 +332,7 @@ def add_private_chat(self, account, jid, select=False): @staticmethod def _add_to_roster(_action, param): _workspace, account, jid = param.unpack() - open_window('AddNewContactWindow', account=account, contact_jid=jid) + open_window('AddContact', account=account, jid=jid) def get_control(self, *args, **kwargs): return self._chat_page.get_control(*args, **kwargs) ===================================== gajim/gtk/notification_manager.py ===================================== @@ -23,7 +23,6 @@ from gajim.gui_menu_builder import get_subscription_menu -from .add_contact import AddNewContactWindow from .util import open_window @@ -102,7 +101,8 @@ def _on_subscription_accept(self, _action, param): self._client.get_module('Presence').subscribed(jid) contact = self._client.get_module('Contacts').get_contact(jid) if not contact.is_in_roster: - AddNewContactWindow(self._account, jid, contact.name) + open_window('AddContact', account=self._account, + jid=jid, nick=contact.name) self._listbox.remove(row) def _on_subscription_block(self, _action, param): ===================================== gajim/remote_control.py ===================================== @@ -33,7 +33,7 @@ from gajim.common import helpers from gajim.common.structs import OutgoingMessage -from gajim.gui.add_contact import AddNewContactWindow +from gajim.gui.add_contact import AddContact log = logging.getLogger('gajim.remote_control') @@ -729,13 +729,13 @@ def add_contact(self, jid, account): if account: if app.account_is_available(account): # if given account is active, use it - AddNewContactWindow(account=account, contact_jid=jid) + AddContact(account=account, jid=jid) else: # wrong account return False else: # if account is not given, show account combobox - AddNewContactWindow(account=None, contact_jid=jid) + AddContact(account=None, jid=jid) return True def remove_contact(self, jid, account): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af8c524c1094b4a67e2e98a015268f04… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af8c524c1094b4a67e2e98a015268f04… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 4 commits: Improve conversation widgets style
by Daniel Brötzmann 04 May '21

04 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 8a1392a6 by Daniel Brötzmann at 2021-05-04T09:34:47+02:00 Improve conversation widgets style - - - - - 60dbba44 by Daniel Brötzmann at 2021-05-04T09:36:48+02:00 ChatPlaceholderBox: Dim Gajim icon - - - - - d99cd7c4 by Daniel Brötzmann at 2021-05-04T09:42:03+02:00 GroupchatState: Improve styling - - - - - 8d25a0f6 by Daniel Brötzmann at 2021-05-04T09:54:25+02:00 MUCUserStatus: Add styling for status message - - - - - 4 changed files: - gajim/data/gui/groupchat_state.ui - gajim/data/style/gajim.css - gajim/gtk/chat_stack.py - gajim/gtk/conversation/rows/muc_user_status.py Changes: ===================================== gajim/data/gui/groupchat_state.ui ===================================== @@ -55,10 +55,10 @@ <property name="can-focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkLabel"> + <object class="GtkSpinner"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Joining…</property> + <property name="active">True</property> </object> <packing> <property name="expand">False</property> @@ -67,10 +67,10 @@ </packing> </child> <child> - <object class="GtkSpinner"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="active">True</property> + <property name="label" translatable="yes">Joining…</property> </object> <packing> <property name="expand">False</property> @@ -106,10 +106,9 @@ <property name="can-focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkLabel"> + <object class="GtkSpinner"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Fetching messages…</property> </object> <packing> <property name="expand">False</property> @@ -118,9 +117,10 @@ </packing> </child> <child> - <object class="GtkSpinner"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="label" translatable="yes">Fetching messages…</property> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -95,10 +95,14 @@ .code-widget { border: 1px solid @borders; border-radius: 4px; + margin-top: 6px; + margin-bottom: 6px; } .code-widget-header { background-color: alpha(@insensitive_fg_color, 0.4); padding: 0 6px; + border-top-left-radius: 3px; + border-top-right-radius: 3px; } .code-widget-header label { font-size: small; @@ -576,15 +580,15 @@ infobar.error > revealer > box { #GroupchatConfig treeview { padding: 5px; } .groupchat-state box { - background-color: alpha(rgb(70, 70, 70), 0.8); + background-color: alpha(rgb(70, 70, 70), 0.9); padding: 12px; border-radius: 6px; } .groupchat-state box > label { - color: @theme_base_color; + color: @theme_text_color; } .groupchat-state box > spinner { - color: @theme_base_color; + color: @theme_text_color; } /* Popover Treeview */ @@ -781,11 +785,12 @@ messagedialog.confirmation-dialog > box { margin-top: 18px; } .conversation-quote { padding-bottom: 6px; } -.conversation-quote textview text { +.conversation-quote textview text, +.conversation-quote label { color: alpha(@theme_text_color, 0.6); } .conversation-quote-bar { - background-color: @unfocused_borders; + background-color: alpha(@theme_text_color, 0.2); } .conversation-more-button { padding-top: 0px; ===================================== gajim/gtk/chat_stack.py ===================================== @@ -124,7 +124,9 @@ def __init__(self): 100, self.get_scale_factor(), 0) - self.add(Gtk.Image.new_from_pixbuf(pixbuf)) + image = Gtk.Image.new_from_pixbuf(pixbuf) + image.get_style_context().add_class('dim-label') + self.add(image) label = Gtk.Label(label=_('Start a Chat')) label.get_style_context().add_class('dim-label') ===================================== gajim/gtk/conversation/rows/muc_user_status.py ===================================== @@ -60,6 +60,7 @@ def __init__(self, account, user_contact, is_self): if user_contact.status is not None: result = process(user_contact.status) message_widget = MessageWidget(account) + message_widget.get_style_context().add_class('gajim-status-message') message_widget.add_content(result) self.grid.attach(message_widget, 2, 1, 1, 1) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d4bf2ee3d102d6b464cfcf85e53701a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d4bf2ee3d102d6b464cfcf85e53701a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Fix STUN Server label
by Daniel Brötzmann 04 May '21

04 May '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 022275e8 by Daniel Brötzmann at 2021-05-04T08:52:47+02:00 Preferences: Fix STUN Server label - - - - - 1 changed file: - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -796,7 +796,7 @@ def __init__(self, *args): settings = [ Setting(SettingKind.USE_STUN_SERVER, - _('Use Stun Server'), + _('Use STUN Server'), SettingType.DIALOG, desc=_('Helps to establish calls through firewalls'), props={'dialog': StunServerDialog}), @@ -812,7 +812,7 @@ def __init__(self, account, parent): settings = [ Setting(SettingKind.SWITCH, - _('Use Stun Server'), + _('Use STUN Server'), SettingType.CONFIG, 'use_stun_server'), @@ -823,7 +823,7 @@ def __init__(self, account, parent): bind='use_stun_server') ] - SettingsDialog.__init__(self, parent, _('Auto Away Settings'), + SettingsDialog.__init__(self, parent, _('STUN Server Settings'), Gtk.DialogFlags.MODAL, settings, account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/022275e8362bd648350aad423143188f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/022275e8362bd648350aad423143188f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] AdHoc: Cancel action is always possible
by Philipp Hörist 03 May '21

03 May '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6e3bc165 by lovetox at 2021-05-03T22:52:55+02:00 AdHoc: Cancel action is always possible - - - - - 1 changed file: - nbxmpp/modules/adhoc.py Changes: ===================================== nbxmpp/modules/adhoc.py ===================================== @@ -150,12 +150,15 @@ def _parse_notes(command): def _parse_actions(command): + if command.getAttr('status') != 'executing': + return [], None + actions_node = command.getTag('actions') if actions_node is None: # If there is no <actions/> element, # the user-agent can use a single-stage dialog or view. # The action "execute" is equivalent to the action "complete". - return [AdHocAction.COMPLETE], AdHocAction.COMPLETE + return [AdHocAction.CANCEL, AdHocAction.COMPLETE], AdHocAction.COMPLETE actions = [] for action in actions_node.getChildren(): @@ -167,6 +170,9 @@ def _parse_actions(command): if not actions: raise ValueError('actions element without actions') + # The action "cancel" is always allowed. + actions.append(AdHocAction.CANCEL) + default = actions_node.getAttr('execute') if default is None: # If the "execute" attribute is absent, it defaults to "next". View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6e3bc1655ed7210a9ef86fdb… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6e3bc1655ed7210a9ef86fdb… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2021