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

Commits: f2fc8c9b by wurstsalat at 2022-02-01T18:44:24+01:00 Settings: Add missing comma for BoolSettings

- - - - - 82467226 by wurstsalat at 2022-02-01T18:44:45+01:00 Preview: Typing

- - - - -

2 changed files:

- gajim/common/setting_values.py - gajim/gtk/preview.py

Changes:

===================================== gajim/common/setting_values.py ===================================== @@ -59,7 +59,7 @@ class _ACCOUNT_DEFAULT: 'notify_on_file_complete', 'positive_184_ack', 'preview_allow_all_images', - 'preview_anonymous_muc' + 'preview_anonymous_muc', 'preview_verify_https', 'print_status_in_chats', 'quit_on_main_window_x_button',

===================================== gajim/gtk/preview.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see http://www.gnu.org/licenses/.

+from typing import Any from typing import Optional

import logging @@ -147,7 +148,7 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._ui.file_name.set_tooltip_text(preview.filename)

def _get_context_menu(self) -> Gtk.Menu: - def _destroy(menu, _pspec): + def _destroy(menu: Gtk.Menu, _pspec: Any) -> None: visible = menu.get_property('visible') if not visible: GLib.idle_add(menu.destroy) @@ -156,6 +157,7 @@ def _destroy(menu, _pspec): menu.connect_signals(self) menu.context_menu.connect('notify::visible', _destroy)

+ assert self._preview if self._preview.is_aes_encrypted: menu.open_link_in_browser.hide()

@@ -195,6 +197,7 @@ def _on_open(self, _menu: Gtk.Menu) -> None: self._preview, force=True) return

+ assert self._preview.orig_path open_file(self._preview.orig_path)

def _on_save_as(self, _menu: Gtk.Menu) -> None: @@ -233,21 +236,26 @@ def _on_ok(target: str) -> None: transient_for=app.app.get_active_window())

def _on_open_folder(self, _menu: Gtk.Menu) -> None: + assert self._preview if not self._preview.orig_exists(): app.interface.preview_manager.download_content( self._preview, force=True) return + assert self._preview.orig_path open_file(self._preview.orig_path.parent)

def _on_copy_link_location(self, _menu: Gtk.Menu) -> None: clipboard = Gtk.Clipboard.get_default(Gdk.Display.get_default()) + assert self._preview clipboard.set_text(self._preview.uri, -1)

def _on_open_link_in_browser(self, _menu: Gtk.Menu) -> None: + assert self._preview if self._preview.is_aes_encrypted: if self._preview.is_geo_uri: open_uri(self._preview.uri) return + assert self._preview.orig_path open_file(self._preview.orig_path) else: open_uri(self._preview.uri) @@ -268,4 +276,6 @@ def _on_button_press_event(self,

@staticmethod def _on_realize(event_box: Gtk.EventBox) -> None: - event_box.get_window().set_cursor(get_cursor('pointer')) + window = event_box.get_window() + assert window + window.set_cursor(get_cursor('pointer'))

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