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

Commits: e3a18449 by wurstsalat at 2022-01-22T13:29:19+01:00 ContactInfo: Don't make VCardGrid columns homogeneous

- - - - - b4cbb26d by wurstsalat at 2022-01-22T13:44:01+01:00 ContactInfo: Typing

- - - - - 6e3046cd by wurstsalat at 2022-01-22T13:45:05+01:00 Update pyrightconfig

- - - - -

3 changed files:

- gajim/common/structs.py - gajim/gtk/contact_info.py - pyrightconfig.json

Changes:

===================================== gajim/common/structs.py ===================================== @@ -200,7 +200,7 @@ def msg_iq(self, value: Any) -> None:

@dataclass(frozen=True) class PresenceData: - show: str + show: PresenceShow status: str priority: int idle_time: Optional[float]

===================================== gajim/gtk/contact_info.py ===================================== @@ -137,7 +137,7 @@ def _on_key_press(self, _widget: ContactInfo, event: Gdk.EventKey) -> None:

def _on_stack_child_changed(self, _widget: Gtk.Stack, - pspec: GObject.ParamSpec) -> None: + _pspec: GObject.ParamSpec) -> None:

name = self._ui.main_stack.get_visible_child_name() self._ui.header_revealer.set_reveal_child(name != 'information') @@ -158,7 +158,6 @@ def _on_destroy(self, _widget: ContactInfo) -> 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) self._client.get_module('VCard4').request_vcard( jid=self.contact.jid, @@ -236,7 +235,8 @@ def _fill_device_info(self, contact: BareContact) -> None: self._switcher.set_row_visible('devices', True)

def _query_device(self, contact: ResourceContact) -> None: - task = self._client.get_module('SoftwareVersion').request_software_version( + software_module = self._client.get_module('SoftwareVersion') + task = software_module.request_software_version( contact.jid, callback=self._set_os_info, user_data=contact.resource) @@ -485,7 +485,7 @@ def set_entity_time(self, entity_time: Optional[str]) -> None:

def set_software(self, software: Optional[SoftwareVersionResult]) -> None: if software is not None: - software_string = '%s %s' % (software.name, software.version) + software_string = f'{software.name} {software.version}' self._ui.software_value.set_text(software_string) self._ui.software_value.show() self._ui.software_label.show()

===================================== pyrightconfig.json ===================================== @@ -31,6 +31,7 @@ "gajim/gtk/chat_list_stack.py", "gajim/gtk/chat_page.py", "gajim/gtk/const.py", + "gajim/gtk/contact_info.py", "gajim/gtk/contacts_flowbox.py", "gajim/gtk/conversation/code_widget.py", "gajim/gtk/conversation/jump_to_end_button.py",

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