Philipp Hörist pushed to branch master at gajim / gajim
Commits:
8e99da67 by lovetox at 2021-12-28T00:59:02+01:00
PlainWidget: Fix type errors
- Remove some unused code
- - - - -
2 changed files:
- gajim/gtk/conversation/plain_widget.py
- gajim/gui_menu_builder.py
Changes:
=====================================
gajim/gtk/conversation/plain_widget.py
=====================================
@@ -181,8 +181,10 @@ def _create_url_tags(self) -> None:
def update_text_tags(self) -> None:
tag_table = self.get_buffer().get_tag_table()
url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR)
- for tag in URI_TAGS:
- tag_table.lookup(tag).set_property('foreground', url_color)
+ for tag_name in URI_TAGS:
+ tag = tag_table.lookup(tag_name)
+ assert tag is not None
+ tag.set_property('foreground', url_color)
def clear(self) -> None:
buffer_ = self.get_buffer()
@@ -250,22 +252,15 @@ def _query_tooltip(self,
_keyboard_mode: bool,
tooltip: Gtk.Tooltip
) -> bool:
+
window = widget.get_window(Gtk.TextWindowType.TEXT)
+ assert window is not None
x_pos, y_pos = self.window_to_buffer_coords(
Gtk.TextWindowType.TEXT, x_pos, y_pos)
iter_ = self.get_iter_at_position(x_pos, y_pos)[1]
for tag in iter_.get_tags():
tag_name = tag.get_property('name')
- if getattr(tag, 'is_anchor', False):
- text = getattr(tag, 'title', False)
- if text:
- if len(text) > 50:
- text = reduce_chars_newlines(text, 47, 1)
- tooltip.set_text(text)
- window.set_cursor(get_cursor('pointer'))
- self._cursor_changed = True
- return True
if tag_name in URI_TAGS:
window.set_cursor(get_cursor('pointer'))
self._cursor_changed = True
@@ -292,9 +287,7 @@ def _on_button_press(self, _widget: Any, event:
Gdk.EventButton) -> bool:
Gtk.TextWindowType.TEXT,
int(event.x),
int(event.y))
- iter_ = self.get_iter_at_location(x_pos, y_pos)
- if isinstance(iter_, tuple):
- iter_ = iter_[1]
+ _, iter_ = self.get_iter_at_location(x_pos, y_pos)
tags = iter_.get_tags()
if tags:
=====================================
gajim/gui_menu_builder.py
=====================================
@@ -286,7 +286,7 @@ def get_encryption_menu(control_id: str,
return menu
-def get_conv_action_context_menu(account: str, selected_text: str) -> Gtk.Menu:
+def get_conv_action_context_menu(account: str, selected_text: str) ->
Gtk.MenuItem:
selected_text_short = reduce_chars_newlines(selected_text, 10, 1)
action_menu_item = Gtk.MenuItem.new_with_mnemonic(
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/8e99da675e8ee7b90d80ec5bd9e714344f0c914f
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/8e99da675e8ee7b90d80ec5bd9e714344f0c914f
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
