Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
15539cba by wurstsalat at 2022-03-16T11:27:13+01:00
XMLConsole: Typing
- - - - -
40b417bd by wurstsalat at 2022-03-16T11:27:27+01:00
Update pyrightconfig
- - - - -
2 changed files:
- gajim/gtk/xml_console.py
- pyrightconfig.json
Changes:
=====================================
gajim/gtk/xml_console.py
=====================================
@@ -54,7 +54,7 @@ def __init__(self) -> None:
self.set_show_menubar(False)
self.set_name('XMLConsoleWindow')
- self.selected_account: Optional[str] = None
+ self.selected_account = 'AllAccounts'
self._selected_send_account: Optional[str] = None
self.presence = True
self.message = True
@@ -98,7 +98,7 @@ def __init__(self) -> None:
self.show_all()
- self.connect('key_press_event', self._on_key_press)
+ self.connect('key-press-event', self._on_key_press)
self.connect('destroy', self._on_destroy)
self._ui.connect_signals(self)
@@ -130,8 +130,10 @@ def _on_value_change(self, combo: Gtk.ComboBox) -> None:
self._selected_send_account = combo.get_active_id()
def _set_titlebar(self) -> None:
- if self.selected_account is None:
+ if self.selected_account == 'AllAccounts':
title = _('All Accounts')
+ elif self.selected_account == 'AccountWizard':
+ title = _('Account Wizard')
else:
title = app.get_jid_from_account(self.selected_account)
self._ui.headerbar.set_subtitle(title)
@@ -154,14 +156,14 @@ def _on_key_press(self, _widget: Gtk.Widget, event:
Gdk.EventKey) -> None:
self._ui.search_revealer.set_reveal_child(False)
return
self.destroy()
- if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and
+ if (event.state & Gdk.ModifierType.CONTROL_MASK and
event.keyval == Gdk.KEY_Return or
event.keyval == Gdk.KEY_KP_Enter):
self._on_send()
- if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and
+ if (event.state & Gdk.ModifierType.CONTROL_MASK and
event.keyval == Gdk.KEY_Up):
self._on_paste_last()
- if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and
+ if (event.state & Gdk.ModifierType.CONTROL_MASK and
event.keyval == Gdk.KEY_f):
self._ui.search_toggle.set_active(
not self._ui.search_revealer.get_child_revealed())
@@ -233,7 +235,8 @@ def _on_send(self, *args: Any) -> None:
node = nbxmpp.Protocol(node=stanza,
attrs={'xmlns': 'jabber:client'})
client = app.get_client(self._selected_send_account)
- client.connection.send(node)
+ assert isinstance(node, nbxmpp.Protocol)
+ client.connection.send_stanza(node)
self.last_stanza = stanza
buffer_.set_text('')
@@ -327,7 +330,7 @@ def _on_filter_options(self, _button: Gtk.Button) -> None:
return
combo_accounts = self._get_accounts()
- combo_accounts.insert(0, (None, _('All Accounts')))
+ combo_accounts.insert(0, ('AllAccounts', _('All Accounts')))
settings = [
Setting(SettingKind.COMBO, _('Account'),
@@ -357,9 +360,11 @@ def _on_filter_options(self, _button: Gtk.Button) -> None:
callback=self._on_setting, data='outgoing'),
]
- self.filter_dialog = SettingsDialog(self, _('Filter'),
+ self.filter_dialog = SettingsDialog(self,
+ _('Filter'),
Gtk.DialogFlags.DESTROY_WITH_PARENT,
- settings, self.selected_account)
+ settings,
+ self.selected_account or
'AllAccounts')
self.filter_dialog.connect('destroy', self._on_filter_destroyed)
def _on_filter_destroyed(self, _widget: Gtk.Widget) -> None:
@@ -387,13 +392,13 @@ def _on_setting(self, value: bool, data: str) -> None:
tag.set_property('invisible', value)
def _nec_stanza_received(self, event: StanzaReceived):
- if self.selected_account is not None:
+ if self.selected_account != 'AllAccounts':
if event.account != self.selected_account:
return
self._print_stanza(event, 'incoming')
def _nec_stanza_sent(self, event: StanzaSent):
- if self.selected_account is not None:
+ if self.selected_account != 'AllAccounts':
if event.account != self.selected_account:
return
self._print_stanza(event, 'outgoing')
=====================================
pyrightconfig.json
=====================================
@@ -87,5 +87,6 @@
"gajim/gtk/util.py",
"gajim/gtk/video_preview.py",
"gajim/gtk/workspace_dialog.py",
+ "gajim/gtk/xml_console.py"
],
}
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/79d5eccb02dbbb31a2785465a39ba403bbee4b13...40b417bd8dc21692db68cf580254200c4a6a2893
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/79d5eccb02dbbb31a2785465a39ba403bbee4b13...40b417bd8dc21692db68cf580254200c4a6a2893
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
