Daniel Brötzmann pushed to branch master at gajim / gajim

Commits: 755ab990 by wurstsalat at 2022-01-26T20:38:46+01:00 MessageInput: Typing

- - - - - db1ce5ad by wurstsalat at 2022-01-26T20:49:53+01:00 PEPConfig: Typing

- - - - - d0075c4e by wurstsalat at 2022-01-26T20:53:55+01:00 MamPreferences: Typing

- - - - - 4ad0530c by wurstsalat at 2022-01-26T21:15:30+01:00 AdvancedConfig: Typing

- - - - - fda036d5 by wurstsalat at 2022-01-26T21:16:54+01:00 Update pyrightconfig

- - - - -

5 changed files:

- gajim/gtk/advanced_config.py - gajim/gtk/mam_preferences.py - gajim/gtk/message_input.py - gajim/gtk/pep_config.py - pyrightconfig.json

Changes:

===================================== gajim/gtk/advanced_config.py ===================================== @@ -83,8 +83,8 @@ def __init__(self) -> None: col = Gtk.TreeViewColumn(Q_('?config:Preference Name'), renderer_text, text=0) treeview.insert_column(col, -1) - col.props.expand = True - col.props.sizing = Gtk.TreeViewColumnSizing.FIXED + col.set_expand(True) + col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) col.set_resizable(True)

self.renderer_text = Gtk.CellRendererText() @@ -95,14 +95,14 @@ def __init__(self) -> None: treeview.insert_column(col, -1) col.set_cell_data_func(self.renderer_text, self._value_column_data_callback) - col.props.expand = True - col.props.sizing = Gtk.TreeViewColumnSizing.FIXED + col.set_expand(True) + col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) col.set_resizable(True)

renderer_text = Gtk.CellRendererText() col = Gtk.TreeViewColumn(Q_('?config:Type'), renderer_text, text=2) treeview.insert_column(col, -1) - col.props.sizing = Gtk.TreeViewColumnSizing.FIXED + col.set_sizing(Gtk.TreeViewColumnSizing.FIXED)

treeview.set_model(self.modelfilter)

@@ -149,6 +149,7 @@ def _on_treeview_row_activated(self, _column: Gtk.TreeViewColumn ) -> None: modelpath = self.modelfilter.convert_path_to_child_path(path) + assert modelpath modelrow = self.model[modelpath] setting = modelrow[Column.NAME]

@@ -166,8 +167,9 @@ def _on_config_edited(self, path: str, text: str ) -> None: - path = Gtk.TreePath.new_from_string(path) - modelpath = self.modelfilter.convert_path_to_child_path(path) + treepath = Gtk.TreePath.new_from_string(path) + modelpath = self.modelfilter.convert_path_to_child_path(treepath) + assert modelpath modelrow = self.model[modelpath] setting = modelrow[Column.NAME]

@@ -194,7 +196,7 @@ def _on_reset_button_clicked(self, button: Gtk.Button) -> None: app.settings.set(setting, default) button.set_sensitive(False)

- def _fill_model(self, parent=None) -> None: + def _fill_model(self) -> None: for category, settings in ADVANCED_SETTINGS.items(): if category != 'app': continue @@ -215,7 +217,7 @@ def _fill_model(self, parent=None) -> None: else: raise ValueError

- self.model.append(parent, [setting, value, type_]) + self.model.append(None, [setting, value, type_])

def _visible_func(self, model: Gtk.TreeModel,

===================================== gajim/gtk/mam_preferences.py ===================================== @@ -82,10 +82,10 @@ def _mam_prefs_received(self, task: Task) -> None: self._ui.default_combo.set_active_id(result.default) self._ui.preferences_store.clear() for jid in result.always: - self._ui.preferences_store.append((str(jid), True)) + self._ui.preferences_store.append([str(jid), True])

for jid in result.never: - self._ui.preferences_store.append((str(jid), False)) + self._ui.preferences_store.append([str(jid), False])

def _mam_prefs_saved(self, task: Task) -> None: try:

===================================== gajim/gtk/message_input.py ===================================== @@ -94,6 +94,7 @@ def _on_focus_in(self, ) -> bool: self.toggle_speller(True) scrolled = self.get_parent() + assert scrolled scrolled.get_style_context().add_class('message-input-focus') return False

@@ -102,6 +103,7 @@ def _on_focus_out(self, _event: Gdk.EventFocus ) -> bool: scrolled = self.get_parent() + assert scrolled scrolled.get_style_context().remove_class('message-input-focus') if not self.has_text(): self.toggle_speller(False) @@ -225,7 +227,8 @@ def _replace(anchor: Gtk.TextChildAnchor) -> None: image = anchor.get_widgets()[0] if hasattr(image, 'codepoint'): # found emoji - self._replace_char_at_iter(iter_, image.codepoint) + codepoint = getattr(image, 'codepoint') + self._replace_char_at_iter(iter_, codepoint) image.destroy()

iter_ = self.get_buffer().get_start_iter() @@ -258,7 +261,7 @@ def insert_emoji(self, codepoint: str, pixbuf: GdkPixbuf.Pixbuf) -> None: else: anchor = buf.create_child_anchor(insert_iter) image = Gtk.Image.new_from_pixbuf(pixbuf) - image.codepoint = codepoint + setattr(image, 'codepoint', codepoint) image.show() self.add_child_at_anchor(image, anchor) buf.insert_at_cursor(' ')

===================================== gajim/gtk/pep_config.py ===================================== @@ -16,7 +16,9 @@

from gi.repository import Gdk from gi.repository import Gtk + from nbxmpp.errors import StanzaError +from nbxmpp.task import Task

from gajim.common import app from gajim.common.i18n import _ @@ -32,7 +34,7 @@

class PEPConfig(Gtk.ApplicationWindow): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -47,21 +49,23 @@ def __init__(self, account):

self.account = account self.set_title(_('PEP Service Configuration (%s)') % self.account) - self._con = app.connections[self.account] + self._client = app.get_client(account)

self._init_services() self._ui.services_treeview.get_selection().connect( 'changed', self._on_services_selection_changed)

self.show_all() - self.connect('key-press-event', self._on_key_press_event) + self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self)

- def _on_key_press_event(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy()

- def _on_services_selection_changed(self, _selection): + def _on_services_selection_changed(self, + _selection: Gtk.TreeSelection + ) -> None: self._ui.configure_button.set_sensitive(True) self._ui.delete_button.set_sensitive(True)

@@ -79,11 +83,11 @@ def _init_services(self): col.pack_start(cellrenderer_text, True) col.add_attribute(cellrenderer_text, 'text', 0)

- jid = self._con.get_own_jid().bare - self._con.get_module('Discovery').disco_items( + jid = self._client.get_own_jid().bare + self._client.get_module('Discovery').disco_items( jid, callback=self._items_received)

- def _items_received(self, task): + def _items_received(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -95,7 +99,7 @@ def _items_received(self, task): if item.jid == jid and item.node is not None: self.treestore.append([item.node])

- def _on_node_delete(self, task): + def _on_node_delete(self, task: Task) -> None: node = task.get_user_data()

try: @@ -104,10 +108,12 @@ def _on_node_delete(self, task): WarningDialog( _('PEP node was not removed'), _('PEP node %(node)s was not removed:\n%(message)s') % { - 'node': node, 'message': error}) + 'node': node, + 'message': error}) return

model = self._ui.services_treeview.get_model() + assert isinstance(model, Gtk.ListStore) iter_ = model.get_iter_first() while iter_: if model[iter_][0] == node: @@ -115,35 +121,37 @@ def _on_node_delete(self, task): break iter_ = model.iter_next(iter_)

- def _on_delete_button_clicked(self, _widget): + def _on_delete_button_clicked(self, _widget: Gtk.Button) -> None: selection = self._ui.services_treeview.get_selection() if not selection: return model, iter_ = selection.get_selected() + assert isinstance(model, Gtk.ListStore) + assert iter_ node = model[iter_][0]

- con = app.connections[self.account] - con.get_module('PubSub').delete(node, - callback=self._on_node_delete, - user_data=node) + self._client.get_module('PubSub').delete( + node, + callback=self._on_node_delete, + user_data=node)

- def _on_configure_button_clicked(self, _widget): + def _on_configure_button_clicked(self, _button: Gtk.Button) -> None: selection = self._ui.services_treeview.get_selection() if not selection: return model, iter_ = selection.get_selected() + assert isinstance(model, Gtk.ListStore) + assert iter_ node = model[iter_][0]

- con = app.connections[self.account] - con.get_module('PubSub').get_node_configuration( + self._client.get_module('PubSub').get_node_configuration( node, callback=self._nec_pep_config_received)

def _on_config_submit(self, form, node): - con = app.connections[self.account] - con.get_module('PubSub').set_node_configuration(node, form) + self._client.get_module('PubSub').set_node_configuration(node, form)

- def _nec_pep_config_received(self, task): + def _nec_pep_config_received(self, task: Task) -> None: try: result = task.finish() except Exception:

===================================== pyrightconfig.json ===================================== @@ -50,7 +50,9 @@ "gajim/gtk/groupchat_state.py", "gajim/gtk/main.py", "gajim/gtk/main_stack.py", + "gajim/gtk/mam_preferences.py", "gajim/gtk/manage_sounds.py", + "gajim/gtk/message_input.py", "gajim/gtk/notification.py", "gajim/gtk/password_dialog.py", "gajim/gtk/preview_audio.py",

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ba90f881a750e9d77c9e291f09d1dc4c...