diff options
| author | wurstsalat <mailtrash@posteo.de> | 2023-04-16 14:45:45 +0300 |
|---|---|---|
| committer | wurstsalat <mailtrash@posteo.de> | 2023-04-16 16:10:03 +0300 |
| commit | 293127faabaa0ef3c3dad6abc4e771690532997e (patch) | |
| tree | 096acb49314eebbe5795a7128dd7751b4968fd6b | |
| parent | e7da059c9392945a14e8e93340a2714fc2a27e1c (diff) | |
cfix: OMEMO: Remove obsolete qr code message
| -rw-r--r-- | gajim/data/gui/omemo_trust_manager.ui | 19 | ||||
| -rw-r--r-- | gajim/gtk/builder.pyi | 5 | ||||
| -rw-r--r-- | gajim/gtk/omemo_trust_manager.py | 2 |
3 files changed, 2 insertions, 24 deletions
diff --git a/gajim/data/gui/omemo_trust_manager.ui b/gajim/data/gui/omemo_trust_manager.ui index 86be1f42f..490df99b7 100644 --- a/gajim/data/gui/omemo_trust_manager.ui +++ b/gajim/data/gui/omemo_trust_manager.ui @@ -91,25 +91,6 @@ <property name="position">3</property> </packing> </child> - <child> - <object class="GtkLabel" id="qr_dependency_missing"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">For verification via QR-Code you have to install <tt>python-qrcode</tt>.</property> - <property name="use-markup">True</property> - <property name="wrap">True</property> - <property name="max-width-chars">42</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> <style> <class name="padding-18"/> </style> diff --git a/gajim/gtk/builder.pyi b/gajim/gtk/builder.pyi index 05f05eeed..f0d2fbabf 100644 --- a/gajim/gtk/builder.pyi +++ b/gajim/gtk/builder.pyi @@ -602,7 +602,6 @@ class OmemoTrustManagerBuilder(Builder): comparing_instructions: Gtk.Label our_fingerprint_2: Gtk.Label qr_code_image: Gtk.Image - qr_dependency_missing: Gtk.Label stack: Gtk.Stack our_fingerprint_1: Gtk.Label qr_menu_button: Gtk.MenuButton @@ -1050,9 +1049,9 @@ def get_builder(file_name: Literal['manage_sounds.ui'], widgets: list[str] = ... @overload def get_builder(file_name: Literal['message_actions_box.ui'], widgets: list[str] = ...) -> MessageActionsBoxBuilder: ... # noqa @overload -def get_builder(file_name: Literal['password_dialog.ui'], widgets: list[str] = ...) -> PasswordDialogBuilder: ... # noqa +def get_builder(file_name: Literal['omemo_trust_manager.ui'], widgets: list[str] = ...) -> OmemoTrustManagerBuilder: ... # noqa @overload -def get_builder(file_name: Literal['omemo_trust_manager.ui'], widgets: list[str] = ...) -> OmemoTrustManagerBuilder: ... #noqa +def get_builder(file_name: Literal['password_dialog.ui'], widgets: list[str] = ...) -> PasswordDialogBuilder: ... # noqa @overload def get_builder(file_name: Literal['pep_config.ui'], widgets: list[str] = ...) -> PepConfigBuilder: ... # noqa @overload diff --git a/gajim/gtk/omemo_trust_manager.py b/gajim/gtk/omemo_trust_manager.py index c2b704397..b51168cba 100644 --- a/gajim/gtk/omemo_trust_manager.py +++ b/gajim/gtk/omemo_trust_manager.py @@ -264,12 +264,10 @@ class OMEMOTrustManager(Gtk.Box, EventHelper): except ImportError: log.exception('Failed to generate QR code') self._ui.qr_code_image.hide() - self._ui.qr_dependency_missing.show() else: pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) self._ui.qr_code_image.set_from_pixbuf(pixbuf) self._ui.qr_code_image.show() - self._ui.qr_dependency_missing.hide() def _on_show_inactive(self, switch: Gtk.Switch, _param: Any) -> None: self._ui.list.invalidate_filter() |