Commits January 2022

commits@gajim.org

1 participants
161 discussions

[Git][gajim/gajim][master] ChatControl: Fix using real jid for adding PM contact
by Daniel Brötzmann (＠wurstsalat) 11 Jan '22

11 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2cc53297 by wurstsalat at 2022-01-11T11:38:14+01:00 ChatControl: Fix using real jid for adding PM contact - - - - - 1 changed file: - gajim/gtk/controls/chat.py Changes: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -286,9 +286,14 @@ def delegate_action(self, action: str) -> int: return Gdk.EVENT_PROPAGATE - def _on_add_to_roster(self, _action, _param): - open_window('AddContact', account=self.account, - jid=self.contact.jid) + def _on_add_to_roster(self, + _action: Gio.SimpleAction, + _param: Optional[GLib.Variant] + ) -> None: + jid = self.contact.jid + if self.type.is_privatechat and self.contact.real_jid is not None: + jid = self.contact.real_jid + open_window('AddContact', account=self.account, jid=jid) def _on_block_contact(self, _action, _param): app.window.block_contact(self.account, self.contact.jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2cc532976506b242a8c57703aac1b0b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2cc532976506b242a8c57703aac1b0b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CI: Freeze pylint version
by Philipp Hörist (＠lovetox) 10 Jan '22

10 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5bf5a18f by lovetox at 2022-01-11T00:39:26+01:00 CI: Freeze pylint version - - - - - 1 changed file: - docker/requirements.txt Changes: ===================================== docker/requirements.txt ===================================== @@ -1,7 +1,7 @@ PyGObject pycairo>=1.20 mypy -pylint +pylint==2.12.2 codespell coverage css-parser View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5bf5a18f80130a1c12b12c75b0dabb4a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5bf5a18f80130a1c12b12c75b0dabb4a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update Dockerfile
by Philipp Hörist (＠lovetox) 10 Jan '22

10 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ca8036e8 by lovetox at 2022-01-11T00:35:44+01:00 Update Dockerfile - - - - - 1 changed file: - docker/Dockerfile Changes: ===================================== docker/Dockerfile ===================================== @@ -8,6 +8,7 @@ RUN apt-get install -y appstream-util RUN apt-get install -y libgirepository1.0-dev RUN apt-get install -y gir1.2-gtk-3.0 RUN apt-get install -y gir1.2-soup-2.4 +RUN apt-get install -y gir1.2-ayatanaappindicator3-0.1 RUN apt-get install -y gettext RUN apt-get install -y nodejs RUN apt-get install -y npm View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca8036e8c1713f1e1b15a9b92b2e4fb8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca8036e8c1713f1e1b15a9b92b2e4fb8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MainStack: Add type annotations
by Philipp Hörist (＠lovetox) 10 Jan '22

10 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6af78dc4 by lovetox at 2022-01-10T23:48:05+01:00 MainStack: Add type annotations - - - - - 3 changed files: - gajim/gtk/app_page.py - gajim/gtk/main_stack.py - pyrightconfig.json Changes: ===================================== gajim/gtk/app_page.py ===================================== @@ -18,6 +18,7 @@ from gi.repository import Gtk from gajim.common import app +from gajim.common.events import ApplicationEvent from gajim.common.helpers import open_uri from gajim.common.i18n import _ @@ -77,7 +78,7 @@ def remove_app_message(self) -> None: self._unread_count -= 1 self.emit('unread-count-changed', self._unread_count) - def process_event(self, event): + def process_event(self, event: ApplicationEvent) -> None: pass ===================================== gajim/gtk/main_stack.py ===================================== @@ -12,19 +12,27 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Union +from typing import cast + from nbxmpp.protocol import JID from gi.repository import Gtk from gajim.common import app from gajim.common.events import ApplicationEvent -from gajim.gtk.chat_list import ChatList from .app_page import AppPage +from .chat_list import ChatList from .chat_page import ChatPage from .account_page import AccountPage +PageT = Union[ChatPage, AccountPage, AppPage] + + class MainStack(Gtk.Stack): def __init__(self) -> None: Gtk.Stack.__init__(self) @@ -82,7 +90,8 @@ def get_chat_page(self) -> ChatPage: def process_event(self, event: ApplicationEvent) -> None: empty_box = self.get_child_by_name('empty') - for page in self.get_children(): + pages = cast(list[PageT], self.get_children()) + for page in pages: if page is empty_box: continue page.process_event(event) ===================================== pyrightconfig.json ===================================== @@ -36,6 +36,7 @@ "gajim/gtk/conversation/rows/scroll_hint.py", "gajim/gtk/conversation/rows/widgets.py", "gajim/gtk/conversation/scrolled.py", + "gajim/gtk/main_stack.py", "gajim/gtk/notification.py", "gajim/gtk/side_bar_switcher.py", "gajim/gtk/status_icon.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6af78dc488474662b51640f38b22ae08… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6af78dc488474662b51640f38b22ae08… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: StatusIcon: Refactor
by Philipp Hörist (＠lovetox) 10 Jan '22

10 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e33d0ba5 by lovetox at 2022-01-10T23:37:17+01:00 StatusIcon: Refactor - Split into multiple backends - Add type annotations - - - - - e104f5a4 by lovetox at 2022-01-10T23:38:36+01:00 Add type annoations - - - - - 7 changed files: - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/notification_manager.py - gajim/gtk/status_icon.py - gajim/gtk/structs.py - gajim/gtk/util.py - pyrightconfig.json Changes: ===================================== gajim/gtk/main.py ===================================== @@ -53,12 +53,14 @@ from .dialogs import ConfirmationCheckDialog from .types import ControlType from .builder import get_builder +from .util import get_key_theme from .util import resize_window from .util import restore_main_window_position from .util import save_main_window_position from .util import open_window from .util import set_urgency_hint from .const import UNLOAD_CHAT_TIME +from .structs import AddChatActionParams log = logging.getLogger('gajim.gui.main') @@ -236,8 +238,7 @@ def _add_actions2(self) -> None: 'close-tab' ) - key_theme = Gtk.Settings.get_default().get_property( - 'gtk-key-theme-name') + key_theme = get_key_theme() for action in actions: if key_theme == 'Emacs' and action in disabled_for_emacs: @@ -370,7 +371,7 @@ def is_chat_active(self, account: str, jid: JID) -> bool: def _add_workspace(self, _action: Gio.SimpleAction, - param: Optional[GLib.Variant]) -> None: + param: GLib.Variant) -> None: workspace_id = param.get_string() if workspace_id is not None: @@ -416,7 +417,7 @@ def remove_workspace(self, workspace_id: str) -> None: def _activate_workspace(self, _action: Gio.SimpleAction, - param: Optional[GLib.Variant]) -> None: + param: GLib.Variant) -> None: workspace_id = param.get_string() if workspace_id is not None: @@ -456,10 +457,10 @@ def add_group_chat(self, account: str, jid: JID, def _add_chat(self, _action: Gio.SimpleAction, - param: Optional[GLib.Variant]) -> None: + param: GLib.Variant) -> None: - account, jid, type_, select = param.unpack() - self.add_chat(account, JID.from_string(jid), type_, select) + params = AddChatActionParams.from_variant(param) + self.add_chat(params.account, params.jid, params.type, params.select) def add_chat(self, account: str, @@ -518,7 +519,7 @@ def select_chat_number(self, number: int) -> None: @staticmethod def _add_to_roster(_action: Gio.SimpleAction, - param: Optional[GLib.Variant]) -> None: + param: GLib.Variant) -> None: _workspace, account, jid = param.unpack() open_window('AddContact', account=account, jid=JID.from_string(jid)) ===================================== gajim/gtk/menus.py ===================================== @@ -40,6 +40,7 @@ from gajim.common.const import URIType from gajim.common.const import URIAction from gajim.common.structs import URI +from gajim.gtk.structs import AddChatActionParams from gajim.gui.structs import ForgetGroupchatActionParams from gajim.gui.structs import RemoveHistoryActionParams @@ -475,19 +476,16 @@ def get_roster_menu(account: str, jid: str, gateway: bool = False) -> Gio.Menu: return menu -def get_subscription_menu(account: str, jid: str) -> Gio.Menu: +def get_subscription_menu(account: str, jid: JID) -> Gio.Menu: menu = Gio.Menu() - action_name = 'win.add-chat' - add_chat = Gio.MenuItem.new(_('Start Chat'), action_name) - dict_ = { - 'account': GLib.Variant('s', account), - 'jid': GLib.Variant('s', str(jid)), - 'type_': GLib.Variant('s', 'contact'), - 'select': GLib.Variant.new_boolean(True), - } - variant_dict = GLib.Variant('a{sv}', dict_) - add_chat.set_action_and_target_value(action_name, variant_dict) + add_chat = Gio.MenuItem.new(_('Start Chat')) + params = AddChatActionParams(account=account, + jid=jid, + type='contact', + select=True) + + add_chat.set_action_and_target_value('win.add-chat', params.to_variant()) menu.append_item(add_chat) menu_items = [ ===================================== gajim/gtk/notification_manager.py ===================================== @@ -299,7 +299,7 @@ def __init__(self, more_button = Gtk.MenuButton() more_button.set_valign(Gtk.Align.CENTER) more_button.add(more_image) - subscription_menu = get_subscription_menu(self._account, str(self.jid)) + subscription_menu = get_subscription_menu(self._account, self.jid) more_button.set_menu_model(subscription_menu) self.grid.attach(more_button, 4, 1, 1, 2) ===================================== gajim/gtk/status_icon.py ===================================== @@ -19,7 +19,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import os +import typing +from typing import Any +from typing import Union + +import sys from gi.repository import Gtk from gi.repository import GLib @@ -28,6 +32,9 @@ from gajim.common import configpaths from gajim.common import ged from gajim.common.i18n import _ +from gajim.common.events import AccountConnected +from gajim.common.events import AccountDisonnected +from gajim.common.events import ShowChanged from gajim.common.helpers import get_global_show from gajim.common.helpers import get_uf_show from gajim.common.ged import EventHelper @@ -38,125 +45,200 @@ from .util import restore_main_window_position from .util import open_window -HAS_INDICATOR = False if app.is_installed('APPINDICATOR'): from gi.repository import AppIndicator3 as appindicator # pylint: disable=ungrouped-imports - HAS_INDICATOR = True + elif app.is_installed('AYATANA_APPINDICATOR'): from gi.repository import AyatanaAppIndicator3 as appindicator # pylint: disable=ungrouped-imports - HAS_INDICATOR = True + +if typing.TYPE_CHECKING: + from gi.repository import AyatanaAppIndicator3 as appindicator -class StatusIcon(EventHelper): - """ - Class for the notification area icon - """ +class StatusIcon: def __init__(self): - EventHelper.__init__(self) + self._backend = None - self._ui = get_builder('systray_context_menu.ui') - self._ui.connect_signals(self) + def connect_unread_changed(self, chat_list_stack: Gtk.Stack) -> None: + # We trigger the signal connection from the main window because it + # is not yet available when initializing StatusIcon + chat_list_stack.connect( + 'unread-count-changed', self._on_unread_count_changed) + + def _on_unread_count_changed(self, + _chat_list_stack: Gtk.Stack, + _workspace_id: str, + _count: int) -> None: + if app.settings.get('trayicon_notification_on_events'): + count = app.window.get_total_unread_count() + self._backend._update_icon(count=count) # type: ignore + + def show_icon(self) -> None: + if self._backend is not None: + self._backend.show_icon() + return + + indicator_installed = (app.is_installed('APPINDICATOR') or + app.is_installed('AYATANA_APPINDICATOR')) + use_indicator = app.settings.get('use_libappindicator') + if indicator_installed and use_indicator: + self._backend = AppIndicator() + else: + self._backend = GtkStatusIcon() + + def hide_icon(self) -> None: + if self._backend is None: + return + self._backend.hide_icon() - self._popup_menus = [] - self._hide_menuitem_added = False - self._status_icon = None - self._use_libappindicator = app.settings.get('use_libappindicator') +class GtkMenuBackend(EventHelper): + def __init__(self): + EventHelper.__init__(self) + self._popup_menus: list[Gtk.Menu] = [] + self._enabled = True + + self._ui = get_builder('systray_context_menu.ui') self._ui.sounds_mute_menuitem.set_active( not app.settings.get('sounds_on')) self._add_status_menu() + self._ui.connect_signals(self) + self.register_events([ ('our-show', ged.GUI1, self._on_our_show), ('account-connected', ged.CORE, self._on_account_state), ('account-disconnected', ged.CORE, self._on_account_state), ]) - def connect_unread_changed(self, chat_list_stack): - # We trigger the signal connection from the main window because it - # is not yet available when initializing StatusIcon - chat_list_stack.connect( - 'unread-count-changed', self._on_unread_count_changed) + def show_icon(self) -> None: + raise NotImplementedError - def _on_our_show(self, _event): - self.update_icon() + def hide_icon(self) -> None: + raise NotImplementedError + + def _update_icon(self, count: int = 0) -> None: + raise NotImplementedError + + def _add_status_menu(self) -> None: + sub_menu = Gtk.Menu() + + for show in ('online', 'away', 'xa', 'dnd'): + uf_show = get_uf_show(show, use_mnemonic=True) + item = Gtk.MenuItem.new_with_mnemonic(uf_show) + sub_menu.append(item) + item.connect('activate', self._on_show, show) - def _on_account_state(self, _event): + sub_menu.append(Gtk.SeparatorMenuItem()) + + uf_show = get_uf_show('offline', use_mnemonic=True) + item = Gtk.MenuItem.new_with_mnemonic(uf_show) + item.connect('activate', self._on_show, 'offline') + sub_menu.append(item) + sub_menu.show_all() + + self._popup_menus.append(sub_menu) + self._ui.status_menu.set_submenu(sub_menu) + + def _on_our_show(self, _event: ShowChanged) -> None: + self._update_icon() + + def _on_account_state(self, + _event: Union[AccountConnected, AccountDisonnected] + ) -> None: account_connected = bool(app.get_number_of_connected_accounts() > 0) self._ui.start_chat_menuitem.set_sensitive(account_connected) + @staticmethod + def _on_new_chat(_widget: Gtk.MenuItem) -> None: + app.app.activate_action('start-chat', GLib.Variant('s', '')) + + @staticmethod + def _on_sounds_mute(widget: Gtk.CheckMenuItem) -> None: + app.settings.set('sounds_on', not widget.get_active()) + + def _on_toggle_window(self, _widget: Gtk.MenuItem) -> None: + # When using Gtk.StatusIcon, app.window will never return True for + # 'has-toplevel-focus' while clicking the menu item + GLib.idle_add(self._on_activate) + + def _on_activate(self, *args: Any) -> None: + if app.window.get_property('has-toplevel-focus'): + save_main_window_position() + app.window.hide() + return + + if not app.window.get_property('visible'): + # Window was minimized + restore_main_window_position() + + if not app.settings.get('main_window_skip_taskbar'): + app.window.set_property('skip-taskbar-hint', False) + app.window.present_with_time(Gtk.get_current_event_time()) + + @staticmethod + def _on_preferences(_widget: Gtk.MenuItem) -> None: + open_window('Preferences') + + @staticmethod + def _on_quit(_widget: Gtk.MenuItem) -> None: + app.window.quit() + + @staticmethod + def _on_show(_widget: Gtk.MenuItem, show: str) -> None: + app.interface.change_status(status=show) + + +class GtkStatusIcon(GtkMenuBackend): + + def __init__(self): + GtkMenuBackend.__init__(self) + self._hide_menuitem_added = False + + self._status_icon = Gtk.StatusIcon() + self._status_icon.connect('activate', self._on_activate) + self._status_icon.connect('popup-menu', self._on_popup_menu) + self._status_icon.connect('size-changed', self._on_size_changed) + + self._update_icon() + def show_icon(self): - if not self._status_icon: - if HAS_INDICATOR and self._use_libappindicator: - self._status_icon = appindicator.Indicator.new( - 'Gajim', - 'dcraven-online', - appindicator.IndicatorCategory.COMMUNICATIONS) - self._status_icon.set_icon_theme_path( - str(configpaths.get('ICONS'))) - self._status_icon.set_attention_icon_full( - 'dcraven-message-new', 'New Message') - self._status_icon.set_status( - appindicator.IndicatorStatus.ACTIVE) - self._status_icon.set_menu(self._ui.systray_context_menu) - self._status_icon.set_secondary_activate_target( - self._ui.toggle_window_menuitem) - else: - self._status_icon = Gtk.StatusIcon() - self._status_icon.connect( - 'activate', self._on_activate) - self._status_icon.connect( - 'popup-menu', self._on_popup_menu) - self._status_icon.connect( - 'size-changed', self.update_icon) - - self.update_icon() - - def hide_icon(self): - if HAS_INDICATOR and self._use_libappindicator: - self._status_icon.set_status(appindicator.IndicatorStatus.PASSIVE) - else: - self._status_icon.set_visible(False) + self._enabled = True + self._status_icon.set_visible(True) + self._update_icon() - def _on_unread_count_changed(self, _chat_list_stack, _workspace_id, _count): - if app.settings.get('trayicon_notification_on_events'): - count = app.window.get_total_unread_count() - self.update_icon(count=count) + def hide_icon(self) -> None: + self._enabled = False + self._status_icon.set_visible(False) - def update_icon(self, *args, count=0): - if not app.interface.systray_enabled: + def _update_icon(self, count: int = 0): + if not self._enabled: return + if app.settings.get('trayicon') == 'always': - if HAS_INDICATOR and self._use_libappindicator: - self._status_icon.set_status( - appindicator.IndicatorStatus.ACTIVE) - else: - self._status_icon.set_visible(True) + self._status_icon.set_visible(True) + if count > 0: - icon_name = 'dcraven-message-new' - if HAS_INDICATOR and self._use_libappindicator: - self._status_icon.set_icon_full(icon_name, _('Pending Event')) - else: - self._status_icon.set_visible(True) - self._status_icon.set_from_icon_name(icon_name) + self._status_icon.set_visible(True) + self._status_icon.set_from_icon_name('dcraven-message-new') return if app.settings.get('trayicon') == 'on_event': - if HAS_INDICATOR and self._use_libappindicator: - self._status_icon.set_status( - appindicator.IndicatorStatus.PASSIVE) - else: - self._status_icon.set_visible(False) + self._status_icon.set_visible(False) show = get_global_show() icon_name = get_icon_name(show) - if HAS_INDICATOR and self._use_libappindicator: - self._status_icon.set_icon_full(icon_name, show) - self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) - else: - self._status_icon.set_from_icon_name(icon_name) + self._status_icon.set_from_icon_name(icon_name) + + def _on_size_changed(self, + _status_icon: Gtk.StatusIcon, + size: int) -> None: + self._update_icon() - def _on_popup_menu(self, _status_icon, button, activate_time): + def _on_popup_menu(self, + _status_icon: Gtk.StatusIcon, + button: int, + activate_time: int) -> None: if button == 1: self._on_activate() elif button == 2: @@ -164,7 +246,7 @@ def _on_popup_menu(self, _status_icon, button, activate_time): elif button == 3: self._build_menu(activate_time) - def _build_menu(self, event_time): + def _build_menu(self, event_time: int) -> None: for menu in self._popup_menus: menu.destroy() @@ -173,11 +255,11 @@ def _build_menu(self, event_time): self._ui.sounds_mute_menuitem.set_active( not app.settings.get('sounds_on')) - if os.name == 'nt': + if sys.platform == 'win32': # Workaround for popup menu on Windows if not self._hide_menuitem_added: self._ui.systray_context_menu.prepend( - Gtk.SeparatorMenuItem.new()) + Gtk.SeparatorMenuItem()) item = Gtk.MenuItem.new_with_label( _('Hide this menu')) self._ui.systray_context_menu.prepend(item) @@ -187,61 +269,50 @@ def _build_menu(self, event_time): self._ui.systray_context_menu.popup( None, None, None, None, 0, event_time) - def _add_status_menu(self): - sub_menu = Gtk.Menu() - for show in ('online', 'away', 'xa', 'dnd'): - uf_show = get_uf_show(show, use_mnemonic=True) - item = Gtk.MenuItem.new_with_mnemonic(uf_show) - sub_menu.append(item) - item.connect('activate', self._on_show, show) - - sub_menu.append(Gtk.SeparatorMenuItem()) - - uf_show = get_uf_show('offline', use_mnemonic=True) - item = Gtk.MenuItem.new_with_mnemonic(uf_show) - item.connect('activate', self._on_show, 'offline') - sub_menu.append(item) - sub_menu.show_all() +class AppIndicator(GtkMenuBackend): - self._popup_menus.append(sub_menu) - self._ui.status_menu.set_submenu(sub_menu) - - @staticmethod - def _on_new_chat(_widget): - app.app.activate_action('start-chat', GLib.Variant('s', '')) - - @staticmethod - def _on_sounds_mute(widget): - app.settings.set('sounds_on', not widget.get_active()) - - def _on_toggle_window(self, *args): - # When using Gtk.StatusIcon, app.window will never return True for - # 'has-toplevel-focus' while clicking the menu item - GLib.idle_add(self._on_activate) + def __init__(self): + GtkMenuBackend.__init__(self) + + self._status_icon = appindicator.Indicator.new( + 'Gajim', + 'dcraven-online', + appindicator.IndicatorCategory.COMMUNICATIONS) + self._status_icon.set_icon_theme_path(str(configpaths.get('ICONS'))) + self._status_icon.set_attention_icon_full('dcraven-message-new', + 'New Message') + self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) + self._status_icon.set_menu(self._ui.systray_context_menu) + self._status_icon.set_secondary_activate_target( + self._ui.toggle_window_menuitem) + + self._update_icon() - @staticmethod - def _on_preferences(_widget): - open_window('Preferences') + def show_icon(self): + self._enabled = True + self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) + self._update_icon() - @staticmethod - def _on_quit(_widget): - app.window.quit() + def hide_icon(self) -> None: + self._enabled = False + self._status_icon.set_status(appindicator.IndicatorStatus.PASSIVE) - def _on_activate(self, *args): - if app.window.get_property('has-toplevel-focus'): - save_main_window_position() - app.window.hide() + def _update_icon(self, count: int = 0) -> None: + if not self._enabled: return - if not app.window.get_property('visible'): - # Window was minimized - restore_main_window_position() + if app.settings.get('trayicon') == 'always': + self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) - if not app.settings.get('main_window_skip_taskbar'): - app.window.set_property('skip-taskbar-hint', False) - app.window.present_with_time(Gtk.get_current_event_time()) + if count > 0: + icon_name = 'dcraven-message-new' + self._status_icon.set_icon_full(icon_name, _('Pending Event')) - @staticmethod - def _on_show(_widget, show): - app.interface.change_status(status=show) + if app.settings.get('trayicon') == 'on_event': + self._status_icon.set_status(appindicator.IndicatorStatus.PASSIVE) + + show = get_global_show() + icon_name = get_icon_name(show) + self._status_icon.set_icon_full(icon_name, show) + self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) ===================================== gajim/gtk/structs.py ===================================== @@ -41,3 +41,11 @@ class RemoveHistoryActionParams(VariantMixin): class ForgetGroupchatActionParams(VariantMixin): account: str jid: JID + + +@dataclass +class AddChatActionParams(VariantMixin): + account: str + jid: JID + type: str + select: bool ===================================== gajim/gtk/util.py ===================================== @@ -894,3 +894,10 @@ def get_style_attribute_with_name(name: str) -> Pango.Attribute: return Pango.attr_family_new('monospace') raise ValueError('unknown attribute %s' % name) + + +def get_key_theme() -> Optional[str]: + settings = Gtk.Settings.get_default() + if settings is None: + return None + return settings.get_property('gtk-key-theme-name') ===================================== pyrightconfig.json ===================================== @@ -38,6 +38,7 @@ "gajim/gtk/conversation/scrolled.py", "gajim/gtk/notification.py", "gajim/gtk/side_bar_switcher.py", + "gajim/gtk/status_icon.py", "gajim/gtk/status_message_selector.py", "gajim/gtk/status_selector.py", ], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2329842328bec2b04a91961e8506a4c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2329842328bec2b04a91961e8506a4c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] BaseControl: Add annotation future import
by Philipp Hörist (＠lovetox) 10 Jan '22

10 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 23298423 by lovetox at 2022-01-10T21:17:18+01:00 BaseControl: Add annotation future import - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -23,6 +23,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Any from typing import Dict from typing import List View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2329842328bec2b04a91961e8506a4c7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2329842328bec2b04a91961e8506a4c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageInput: Disable if we are visitor in a MUC
by Daniel Brötzmann (＠wurstsalat) 10 Jan '22

10 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ff52a454 by wurstsalat at 2022-01-10T19:01:24+01:00 MessageInput: Disable if we are visitor in a MUC - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -875,10 +875,15 @@ def _nec_ping(self, event): elif event.name == 'ping-error': self.add_info_message(event.error) + def _set_message_input_sensitive(self, state: bool) -> None: + self.xml.formattings_button.set_sensitive(state) + self.msg_textview.set_sensitive(state) + self.msg_textview.set_editable(state) + def _set_control_active(self) -> None: - self.xml.formattings_button.set_sensitive(True) - self.msg_textview.set_sensitive(True) - self.msg_textview.set_editable(True) + contact = self.contact.get_self() + if not contact.role.is_visitor: + self._set_message_input_sensitive(True) self.roster.initial_draw() self.conversation_view.update_avatars() @@ -886,9 +891,7 @@ def _set_control_active(self) -> None: self.update_actions() def _set_control_inactive(self) -> None: - self.xml.formattings_button.set_sensitive(False) - self.msg_textview.set_sensitive(False) - self.msg_textview.set_editable(False) + self._set_message_input_sensitive(False) self.roster.enable_sort(False) self.roster.clear() @@ -1013,6 +1016,7 @@ def _on_user_role_changed(self, actor = '' if actor is None else _(' by {actor}').format(actor=actor) if properties.is_muc_self_presence: + self._set_message_input_sensitive(not user_contact.role.is_visitor) message = _('** Your Role has been set to ' '{role}{actor}{reason}').format(role=role, actor=actor, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ff52a454d995eb57357fc7ce9abdb5cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ff52a454d995eb57357fc7ce9abdb5cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MainStack: Typing
by Daniel Brötzmann (＠wurstsalat) 10 Jan '22

10 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d3aeaa78 by wurstsalat at 2022-01-10T17:58:28+01:00 MainStack: Typing - - - - - 1 changed file: - gajim/gtk/main_stack.py Changes: ===================================== gajim/gtk/main_stack.py ===================================== @@ -12,9 +12,13 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from nbxmpp.protocol import JID + from gi.repository import Gtk from gajim.common import app +from gajim.common.events import ApplicationEvent +from gajim.gtk.chat_list import ChatList from .app_page import AppPage from .chat_page import ChatPage @@ -22,7 +26,7 @@ class MainStack(Gtk.Stack): - def __init__(self): + def __init__(self) -> None: Gtk.Stack.__init__(self) self.add_named(Gtk.Box(), 'empty') @@ -52,7 +56,9 @@ def show_app_page(self) -> None: self.set_visible_child_name('app') def get_app_page(self) -> AppPage: - return self.get_child_by_name('app') + app_page = self.get_child_by_name('app') + assert isinstance(app_page, AppPage) + return app_page def show_chats(self, workspace_id: str) -> None: self._chat_page.show_workspace_chats(workspace_id) @@ -65,17 +71,25 @@ def show_account(self, account: str) -> None: self.set_visible_child_name(account) def get_account_page(self, account: str) -> AccountPage: - return self.get_child_by_name(account) + account_page = self.get_child_by_name(account) + assert isinstance(account_page, AccountPage) + return account_page def get_chat_page(self) -> ChatPage: - return self.get_child_by_name('chats') + chat_page = self.get_child_by_name('chats') + assert isinstance(chat_page, ChatPage) + return chat_page - def process_event(self, event): + def process_event(self, event: ApplicationEvent) -> None: empty_box = self.get_child_by_name('empty') for page in self.get_children(): if page is empty_box: continue page.process_event(event) - def _on_chat_selected(self, *args): + def _on_chat_selected(self, + _chat_list: ChatList, + _workspace_id: str, + _account: str, + _jid: JID) -> None: self.set_visible_child_name('chats') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d3aeaa78cb101f02c12ca0a169275b42… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d3aeaa78cb101f02c12ca0a169275b42… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ContactInfo: Refactor filling pages
by Philipp Hörist (＠lovetox) 10 Jan '22

10 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9087e7f0 by lovetox at 2022-01-10T17:53:13+01:00 ContactInfo: Refactor filling pages For GroupchatParticipants only show the information page - - - - - 1 changed file: - gajim/gtk/contact_info.py Changes: ===================================== gajim/gtk/contact_info.py ===================================== @@ -54,7 +54,6 @@ ContactT = Union[BareContact, GroupchatParticipant] -DeviceContactT = Union[ResourceContact, GroupchatParticipant] class Column(IntEnum): @@ -100,11 +99,14 @@ def __init__(self, self._ui.edit_name_button.show() self._load_avatar() - self._fill_information_page() - self._fill_settings_page() - self._fill_device_info() - self._fill_groups_page() - self._fill_note_page() + + self._fill_information_page(self.contact) + + if isinstance(self.contact, BareContact): + self._fill_settings_page(self.contact) + self._fill_device_info(self.contact) + self._fill_groups_page(self.contact) + self._fill_note_page(self.contact) if page is not None: self._switcher.set_row(page) @@ -152,7 +154,7 @@ def _on_destroy(self, _widget: ContactInfo) -> None: self.unregister_events() app.check_finalize(self) - def _fill_information_page(self) -> None: + def _fill_information_page(self, contact: ContactT) -> None: self._vcard_grid = VCardGrid(self.account) self._vcard_grid.set_column_homogeneous(True) self._ui.vcard_box.add(self._vcard_grid) @@ -160,41 +162,41 @@ def _fill_information_page(self) -> None: jid=self.contact.jid, callback=self._on_vcard_received) - jid = str(self.contact.get_address()) + jid = str(contact.get_address()) - self._ui.contact_name_label.set_text(self.contact.name) + self._ui.contact_name_label.set_text(contact.name) self._ui.contact_jid_label.set_text(jid) self._ui.contact_jid_label.set_tooltip_text(jid) - if isinstance(self.contact, GroupchatParticipant): - self._ui.role_label.set_text(get_uf_role(self.contact.role)) + if isinstance(contact, GroupchatParticipant): + self._ui.role_label.set_text(get_uf_role(contact.role)) self._ui.affiliation_label.set_text( - get_uf_affiliation(self.contact.affiliation)) + get_uf_affiliation(contact.affiliation)) self._ui.group_chat_grid.show() self._switcher.set_row_visible('information', True) - def _fill_note_page(self) -> None: - if not self.contact.is_in_roster: + def _fill_note_page(self, contact: BareContact) -> None: + if not contact.is_in_roster: return - note = self._client.get_module('Annotations').get_note(self.contact.jid) + note = self._client.get_module('Annotations').get_note(contact.jid) if note is not None: self._ui.textview_annotation.get_buffer().set_text(note.data) self._switcher.set_row_visible('notes', True) - def _fill_settings_page(self) -> None: - if not isinstance(self.contact, BareContact): + def _fill_settings_page(self, contact: BareContact) -> None: + if not contact.is_in_roster: return - if self.contact.subscription in ('from', 'both'): + if contact.subscription in ('from', 'both'): self._ui.from_subscription_switch.set_state(True) - if self.contact.subscription in ('to', 'both'): + if contact.subscription in ('to', 'both'): self._ui.to_subscription_stack.set_visible_child_name('checkmark') - elif self.contact.ask == 'subscribe': + elif contact.ask == 'subscribe': self._ui.to_subscription_stack.set_visible_child_name('request') self._ui.request_stack.set_visible_child_name('requested') else: @@ -203,52 +205,44 @@ def _fill_settings_page(self) -> None: self._switcher.set_row_visible('settings', True) - def _fill_groups_page(self) -> None: - if not isinstance(self.contact, BareContact): - return - - if not self.contact.is_in_roster: + def _fill_groups_page(self, contact: BareContact) -> None: + if not contact.is_in_roster: return model = self._ui.groups_treeview.get_model() model.set_sort_column_id(Column.GROUP_NAME, Gtk.SortType.ASCENDING) groups = self._client.get_module('Roster').get_groups() for group in groups: - is_in_group = group in self.contact.groups + is_in_group = group in contact.groups model.append([is_in_group, group]) self._switcher.set_row_visible('groups', True) - def _fill_device_info(self) -> None: - if isinstance(self.contact, GroupchatParticipant): - contact = self.contact.get_real_contact() - if contact is None: - return - else: - contact = self.contact - + def _fill_device_info(self, contact: BareContact) -> None: contacts = list(contact.iter_resources()) if not contacts: return - for contact in contacts: - device_grid = DeviceGrid(contact) - self._devices[contact.resource] = device_grid + for resource_contact in contacts: + device_grid = DeviceGrid(resource_contact) + self._devices[resource_contact.resource] = device_grid self._ui.devices_box.add(device_grid.widget) - self._query_device(contact) + self._query_device(resource_contact) self._ui.devices_stack.set_visible_child_name('devices') self._switcher.set_row_visible('devices', True) - def _query_device(self, contact: DeviceContactT) -> None: - jid = contact.get_address() - + def _query_device(self, contact: ResourceContact) -> None: task = self._client.get_module('SoftwareVersion').request_software_version( - jid, callback=self._set_os_info, user_data=jid.resource) + contact.jid, + callback=self._set_os_info, + user_data=contact.resource) self._tasks.append(task) task = self._client.get_module('EntityTime').request_entity_time( - jid, callback=self._set_entity_time, user_data=jid.resource) + contact.jid, + callback=self._set_entity_time, + user_data=contact.resource) self._tasks.append(task) def _on_vcard_received(self, task: Task) -> None: @@ -448,7 +442,7 @@ def _on_group_add_button_clicked(self, _widget: Gtk.Button) -> None: class DeviceGrid: - def __init__(self, contact: DeviceContactT) -> None: + def __init__(self, contact: ResourceContact) -> None: self._contact = contact self._ui = get_builder('contact_info.ui', ['devices_grid']) self._spinner = Gtk.Spinner() @@ -456,7 +450,10 @@ def __init__(self, contact: DeviceContactT) -> None: self._ui.resource_label.set_text(_('Device "%s"') % contact.resource) self._ui.status_value.set_text(get_uf_show(contact.show.value)) - self._set_priority() + + self._ui.priority_value.set_text(str(self._contact.priority)) + self._ui.priority_value.show() + self._ui.priority_label.show() self._ui.resource_box.add(self._spinner) self._ui.devices_grid.show_all() @@ -467,14 +464,6 @@ def __init__(self, contact: DeviceContactT) -> None: def widget(self) -> Gtk.Grid: return self._ui.devices_grid - def _set_priority(self) -> None: - if not isinstance(self._contact, ResourceContact): - return - - self._ui.priority_value.set_text(str(self._contact.priority)) - self._ui.priority_value.show() - self._ui.priority_label.show() - def set_entity_time(self, entity_time: str) -> None: self._ui.time_value.set_text(entity_time) self._ui.time_value.show() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9087e7f0e17419a245ded8e515393ee9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9087e7f0e17419a245ded8e515393ee9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: JID: Add option to coerce to bare jid while parsing
by Philipp Hörist (＠lovetox) 10 Jan '22

10 Jan '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: dcce30a4 by lovetox at 2022-01-10T17:38:58+01:00 JID: Add option to coerce to bare jid while parsing - - - - - 21e8df5c by lovetox at 2022-01-10T17:49:11+01:00 MUC: Force muc user real JIDs to bare Its unspecified if servers need to send a full JID or bare JID here. Further its also unspecified if they need to send all full JIDs of all connected resources. So we implement on what we can actually depend, there needs to be at least a bare JID. - - - - - 2 changed files: - nbxmpp/modules/muc/util.py - nbxmpp/protocol.py Changes: ===================================== nbxmpp/modules/muc/util.py ===================================== @@ -177,7 +177,7 @@ def parse_muc_user(muc_user, is_presence=True): jid = item_dict.get('jid') if jid is not None: try: - jid = JID.from_string(jid) + jid = JID.from_string(jid, force_bare=True) except InvalidJid as error: raise StanzaMalformed('invalid jid %s, %s' % (jid, error)) ===================================== nbxmpp/protocol.py ===================================== @@ -595,7 +595,7 @@ class JID: @classmethod @functools.lru_cache(maxsize=None) - def from_string(cls, jid_string: str) -> JID: + def from_string(cls, jid_string: str, force_bare: bool = False) -> JID: # https://tools.ietf.org/html/rfc7622#section-3.2 # Remove any portion from the first '/' character to the end of the @@ -614,6 +614,11 @@ class JID: else: localpart, domainpart = None, rest + if force_bare: + if localpart is None: + raise LocalpartByteLimit + resourcepart = None + return cls(localpart=localpart, domain=domainpart, resource=resourcepart) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/daf9c92cd6f2a81e491de53… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/daf9c92cd6f2a81e491de53… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
10
11
12
13
14
15
16
17
Older →

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 January 2022