Commits December 2021

commits@gajim.org

1 participants
197 discussions

[Git][gajim/gajim][master] MessageInputTextView: Grab focus after clicking avatar in chat
by Daniel Brötzmann (＠wurstsalat) 13 Dec '21

13 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: fc68a804 by wurstsalat at 2021-12-13T22:24:20+01:00 MessageInputTextView: Grab focus after clicking avatar in chat Fixes #10696 - - - - - 2 changed files: - gajim/gtk/controls/base.py - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -754,6 +754,7 @@ def on_mention(self, _widget, name): text = f'{name}{gc_refer_to_nick_char} ' message_buffer = self.msg_textview.get_buffer() message_buffer.insert_at_cursor(text) + GLib.idle_add(self.msg_textview.grab_focus) def _on_message_textview_paste_event(self, _texview): clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -242,6 +242,7 @@ def _get_avatar(self, kind: str, name: str) -> Optional[cairo.Surface]: def _on_avatar_clicked(self, _widget, event, name): if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 1: self.get_parent().on_mention(name) + return Gdk.EVENT_STOP @staticmethod def _on_realize(event_box): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fc68a80408826e89a9af8225a084224a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fc68a80408826e89a9af8225a084224a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageInputTextView: Apply styling for plain blocks only
by Daniel Brötzmann (＠wurstsalat) 13 Dec '21

13 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 66a706f6 by wurstsalat at 2021-12-13T22:16:53+01:00 MessageInputTextView: Apply styling for plain blocks only - - - - - 1 changed file: - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/message_input.py ===================================== @@ -108,10 +108,11 @@ def _on_text_changed(self, buffer_): result = process(text) for block in result.blocks: - for span in block.spans: - start_iter = buffer_.get_iter_at_offset(span.start) - end_iter = buffer_.get_iter_at_offset(span.end) - buffer_.apply_tag_by_name(span.name, start_iter, end_iter) + if block.name == 'plain': + for span in block.spans: + start_iter = buffer_.get_iter_at_offset(span.start) + end_iter = buffer_.get_iter_at_offset(span.end) + buffer_.apply_tag_by_name(span.name, start_iter, end_iter) def insert_text(self, text: str) -> None: self.get_buffer().insert_at_cursor(text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/66a706f67a790d42228a30a4f2e83db9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/66a706f67a790d42228a30a4f2e83db9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Control: Remove XHTML remnants
by Daniel Brötzmann (＠wurstsalat) 13 Dec '21

13 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1a338a2c by wurstsalat at 2021-12-13T21:28:13+01:00 Control: Remove XHTML remnants - - - - - 3 changed files: - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/controls/private.py Changes: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -545,7 +545,6 @@ def draw_banner_text(self) -> None: def send_message(self, message: str, - xhtml: Optional[str] = None, process_commands: bool = True, attention: bool = False ) -> None: @@ -567,7 +566,6 @@ def send_message(self, BaseControl.send_message(self, message, type_='chat', - xhtml=xhtml, process_commands=process_commands, attention=attention) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -1182,7 +1182,6 @@ def _on_message_sent(self, event): def send_message(self, message: str, - xhtml: Optional[str] = None, process_commands: bool = True ) -> None: """ @@ -1225,7 +1224,6 @@ def send_message(self, label=label, chatstate=chatstate, correct_id=correct_id) - message_.additional_data.set_value('gajim', 'xhtml', xhtml) self._client.send_message(message_) self.msg_textview.get_buffer().set_text('') ===================================== gajim/gtk/controls/private.py ===================================== @@ -24,8 +24,6 @@ # 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 Optional - from nbxmpp import JID from gajim.common import app @@ -142,7 +140,6 @@ def _on_room_joined(self, *args): def send_message(self, message: str, - xhtml: Optional[str] = None, process_commands: bool = True, attention: bool = False ) -> None: @@ -165,7 +162,6 @@ def send_message(self, return ChatControl.send_message(self, message, - xhtml=xhtml, process_commands=process_commands, attention=attention) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1a338a2c89a55c45caf4cfa0117fc20d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1a338a2c89a55c45caf4cfa0117fc20d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: MessageInputTextView: Remove XHTML formatting actions, add markup actions
by Daniel Brötzmann (＠wurstsalat) 13 Dec '21

13 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 165dda84 by wurstsalat at 2021-12-13T20:44:58+01:00 MessageInputTextView: Remove XHTML formatting actions, add markup actions - - - - - e9c0416a by wurstsalat at 2021-12-13T20:53:17+01:00 MessageInputTextView: Remove XHTML code around sending XHTML - - - - - 14704ff1 by wurstsalat at 2021-12-13T21:22:38+01:00 MessageInputTextView: Add real-time markup parsing - - - - - 6 changed files: - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/message_input.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -51,75 +51,30 @@ <property name="visible">True</property> <property name="can-focus">False</property> <child> - <object class="GtkCheckMenuItem" id="bold"> + <object class="GtkMenuItem" id="bold"> <property name="name">bold</property> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Bold</property> - <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> </object> </child> <child> - <object class="GtkCheckMenuItem" id="italic"> + <object class="GtkMenuItem" id="italic"> <property name="name">italic</property> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Italic</property> - <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> </object> </child> <child> - <object class="GtkCheckMenuItem" id="underline"> - <property name="name">underline</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Underline</property> - <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="strike"> + <object class="GtkMenuItem" id="strike"> <property name="name">strike</property> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Strike</property> - <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="color"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Color</property> - <signal name="activate" handler="on_color_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="font"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Font</property> - <signal name="activate" handler="on_font_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="clear_formatting"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Clear formatting</property> - <signal name="activate" handler="on_clear_formatting_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> </object> </child> </object> @@ -400,12 +355,12 @@ <property name="can-focus">True</property> <property name="focus-on-click">False</property> <property name="receives-default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has-tooltip">True</property> + <property name="tooltip-text" translatable="yes">Format your message…</property> <property name="relief">none</property> <property name="popup">formattings_menu</property> + <property name="direction">up</property> <child> - <object class="GtkImage" id="image10"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="icon-name">format-text-bold-symbolic</property> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -51,75 +51,30 @@ <property name="visible">True</property> <property name="can-focus">False</property> <child> - <object class="GtkCheckMenuItem" id="bold"> + <object class="GtkMenuItem" id="bold"> <property name="name">bold</property> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Bold</property> - <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> </object> </child> <child> - <object class="GtkCheckMenuItem" id="italic"> + <object class="GtkMenuItem" id="italic"> <property name="name">italic</property> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Italic</property> - <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> </object> </child> <child> - <object class="GtkCheckMenuItem" id="underline"> - <property name="name">underline</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Underline</property> - <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="strike"> + <object class="GtkMenuItem" id="strike"> <property name="name">strike</property> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Strike</property> - <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="color"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Color</property> - <signal name="activate" handler="on_color_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="font"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Font</property> - <signal name="activate" handler="on_font_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="clear_formatting"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Clear formatting</property> - <signal name="activate" handler="on_clear_formatting_menuitem_activate" swapped="no"/> + <signal name="activate" handler="_on_formatting_menuitem_activate" swapped="no"/> </object> </child> </object> @@ -584,14 +539,13 @@ <child> <object class="GtkMenuButton" id="formattings_button"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can-focus">True</property> <property name="focus-on-click">False</property> <property name="receives-default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has-tooltip">True</property> + <property name="tooltip-text" translatable="yes">Format your message</property> <property name="relief">none</property> <property name="popup">formattings_menu</property> + <property name="direction">up</property> <child> <object class="GtkImage"> <property name="visible">True</property> ===================================== gajim/gtk/controls/base.py ===================================== @@ -1024,14 +1024,12 @@ def get_our_nick(self) -> str: def _on_send_message(self, *args): self.msg_textview.replace_emojis() message = self.msg_textview.get_text() - xhtml = self.msg_textview.get_xhtml() - self.send_message(message, xhtml=xhtml) + self.send_message(message) def send_message(self, message: str, type_: str = 'chat', resource: Optional[str] = None, - xhtml: Optional[str] = None, process_commands: bool = True, attention: bool = False ) -> None: @@ -1065,8 +1063,7 @@ def send_message(self, label=label, control=self, attention=attention, - correct_id=correct_id, - xhtml=xhtml) + correct_id=correct_id) self._client.send_message(message_) @@ -1076,9 +1073,7 @@ def send_message(self, # Be sure to send user nickname only once according to JEP-0172 self.user_nick = None - # Clear msg input - message_buffer = self.msg_textview.get_buffer() - message_buffer.set_text('') # clear message buffer (and tv of course) + self.msg_textview.clear() def _on_message_tv_buffer_changed(self, textbuffer): has_text = self.msg_textview.has_text() @@ -1303,25 +1298,11 @@ def _on_emoticon_button_clicked(self, _widget): self.msg_textview.emit('insert-emoji') self.xml.emoticons_button.set_property('active', False) - def on_color_menuitem_activate(self, _widget): - color_dialog = Gtk.ColorChooserDialog(None, app.window) - color_dialog.set_use_alpha(False) - color_dialog.connect('response', self.msg_textview.color_set) - color_dialog.show_all() - - def on_font_menuitem_activate(self, _widget): - font_dialog = Gtk.FontChooserDialog(None, app.window) - start, finish = self.msg_textview.get_active_iters() - font_dialog.connect( - 'response', self.msg_textview.font_set, start, finish) - font_dialog.show_all() - - def on_formatting_menuitem_activate(self, widget): - tag = widget.get_name() - self.msg_textview.set_tag(tag) - - def on_clear_formatting_menuitem_activate(self, _widget): - self.msg_textview.clear_tags() + def _on_formatting_menuitem_activate(self, + menu_item: Gtk.CheckMenuItem + ) -> None: + formatting = menu_item.get_name() + self.msg_textview.apply_formatting(formatting) def _style_changed(self, *args): self.update_text_tags() ===================================== gajim/gtk/controls/chat.py ===================================== @@ -307,18 +307,6 @@ def _on_send_marker(self, action, param): action.set_state(param) self.contact.settings.set('send_marker', param.get_boolean()) - def _update_toolbar(self) -> None: - # Formatting - # TODO: find out what encryption allows for xhtml and which not - if self.contact.supports(Namespace.XHTML_IM): - self.xml.formattings_button.set_sensitive(True) - self.xml.formattings_button.set_tooltip_text(_( - 'Show a list of formattings')) - else: - self.xml.formattings_button.set_sensitive(False) - self.xml.formattings_button.set_tooltip_text( - _('This contact does not support HTML')) - def update_all_pep_types(self) -> None: self._update_pep(PEPEventType.LOCATION) self._update_pep(PEPEventType.TUNE) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -883,9 +883,6 @@ def _set_control_active(self) -> None: self.msg_textview.set_editable(True) self.roster.initial_draw() - - self.xml.formattings_button.set_sensitive(True) - self.conversation_view.update_avatars() self.update_actions() ===================================== gajim/gtk/message_input.py ===================================== @@ -17,7 +17,6 @@ # 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 Optional from typing import Dict from typing import List from typing import Tuple @@ -27,12 +26,9 @@ from gi.repository import GLib from gi.repository import Pango -from nbxmpp.modules.misc import build_xhtml_body - from gajim.common import app -from gajim.common.regex import LINK_REGEX +from gajim.common.styling import process -from .util import convert_rgba_to_hex from .util import scroll_to_end if app.is_installed('GSPELL'): @@ -40,14 +36,20 @@ UNDO_LIMIT: int = 20 +FORMAT_CHARS: Dict[str, str] = { + 'bold': '*', + 'italic': '_', + 'strike': '~', + 'pre': '`', +} + class MessageInputTextView(Gtk.TextView): """ A Gtk.Textview for chat message input """ - def __init__(self): + def __init__(self) -> None: Gtk.TextView.__init__(self) - self.set_border_width(3) self.set_accepts_tab(True) self.set_editable(True) @@ -61,36 +63,15 @@ def __init__(self): self.drag_dest_unset() - self.undo_list: List[str] = [] + self._undo_list: List[str] = [] self.undo_pressed: bool = False - self.begin_tags: Dict[str, str] = {} - self.end_tags: Dict[str, str] = {} - self.color_tags: List[str] = [] - self.fonts_tags: List[str] = [] - self.other_tags: Dict[str, Gtk.TextTag] = {} - - buffer_ = self.get_buffer() - self.other_tags['bold'] = buffer_.create_tag('bold') - self.other_tags['bold'].set_property('weight', Pango.Weight.BOLD) - self.begin_tags['bold'] = '' - self.end_tags['bold'] = '' - self.other_tags['italic'] = buffer_.create_tag('italic') - self.other_tags['italic'].set_property('style', Pango.Style.ITALIC) - self.begin_tags['italic'] = '' - self.end_tags['italic'] = '' - self.other_tags['underline'] = buffer_.create_tag('underline') - self.other_tags['underline'].set_property( - 'underline', Pango.Underline.SINGLE) - underline = '' - self.begin_tags['underline'] = underline - self.end_tags['underline'] = '' - self.other_tags['strike'] = buffer_.create_tag('strike') - self.other_tags['strike'].set_property('strikethrough', True) - strike = '' - self.begin_tags['strike'] = strike - self.end_tags['strike'] = '' + self.get_buffer().create_tag('strong', weight=Pango.Weight.BOLD) + self.get_buffer().create_tag('emphasis', style=Pango.Style.ITALIC) + self.get_buffer().create_tag('strike', strikethrough=True) + self.get_buffer().create_tag('pre', family='monospace') + self.get_buffer().connect('changed', self._on_text_changed) self.connect_after('paste-clipboard', self._after_paste_clipboard) self.connect('focus-in-event', self._on_focus_in) self.connect('focus-out-event', self._on_focus_out) @@ -120,6 +101,18 @@ def _on_focus_out(self, _widget, _event): self.toggle_speller(False) return False + def _on_text_changed(self, buffer_): + text = self.get_text() + if not text: + return + + result = process(text) + for block in result.blocks: + for span in block.spans: + start_iter = buffer_.get_iter_at_offset(span.start) + end_iter = buffer_.get_iter_at_offset(span.end) + buffer_.apply_tag_by_name(span.name, start_iter, end_iter) + def insert_text(self, text: str) -> None: self.get_buffer().insert_at_cursor(text) @@ -149,229 +142,86 @@ def toggle_speller(self, activate: bool) -> None: spell_view.set_inline_spell_checking(activate) @staticmethod - def _after_paste_clipboard(textview): + def _after_paste_clipboard(textview: Gtk.TextView) -> None: buffer_ = textview.get_buffer() mark = buffer_.get_insert() iter_ = buffer_.get_iter_at_mark(mark) if iter_.get_offset() == buffer_.get_end_iter().get_offset(): GLib.idle_add(scroll_to_end, textview.get_parent()) - def make_clickable_urls(self, text: str) -> str: - _buffer = self.get_buffer() - - start = 0 - end = 0 - index = 0 - - new_text = '' - iterator = LINK_REGEX.finditer(text) - for match in iterator: - start, end = match.span() - url = text[start:end] - if start != 0: - text_before_special_text = text[index:start] - else: - text_before_special_text = '' - # we insert normal text - new_text += f'{text_before_special_text}<a href="{url}">{url}</a>' - index = end # update index - - if end < len(text): - new_text += text[end:] - - return new_text # the position after *last* special text - - def get_active_tags(self) -> List[str]: - start = self.get_active_iters()[0] - active_tags = [] - for tag in start.get_tags(): - active_tags.append(tag.get_property('name')) - return active_tags - - def get_active_iters(self) -> Tuple[Gtk.TextIter, Gtk.TextIter]: + def _get_active_iters(self) -> Tuple[Gtk.TextIter, Gtk.TextIter]: _buffer = self.get_buffer() return_val = _buffer.get_selection_bounds() - if return_val: # if sth was selected - start, finish = return_val[0], return_val[1] + if return_val: # if something is selected + start, end = return_val[0], return_val[1] else: - start, finish = _buffer.get_bounds() - return (start, finish) + start, end = _buffer.get_bounds() + return (start, end) - def set_tag(self, tag: str) -> None: - _buffer = self.get_buffer() - start, finish = self.get_active_iters() - if start.has_tag(self.other_tags[tag]): - _buffer.remove_tag_by_name(tag, start, finish) - else: - if tag == 'underline': - _buffer.remove_tag_by_name('strike', start, finish) - elif tag == 'strike': - _buffer.remove_tag_by_name('underline', start, finish) - _buffer.apply_tag_by_name(tag, start, finish) + def apply_formatting(self, formatting: str) -> None: + format_char = FORMAT_CHARS[formatting] - def clear_tags(self) -> None: _buffer = self.get_buffer() - start, finish = self.get_active_iters() - _buffer.remove_all_tags(start, finish) - - def color_set(self, widget, response): - if response in (-6, -4): - widget.destroy() + start, end = self._get_active_iters() + start_offset = start.get_offset() + end_offset = end.get_offset() + + text = _buffer.get_text(start, end, True) + if text.startswith(format_char) and text.endswith(format_char): + # (Selected) text begins and ends with formatting chars + # -> remove them + _buffer.delete( + start, + _buffer.get_iter_at_offset(start_offset + 1)) + _buffer.delete( + _buffer.get_iter_at_offset(end_offset - 2), + _buffer.get_iter_at_offset(end_offset - 1)) return - color = widget.get_property('rgba') - widget.destroy() - _buffer = self.get_buffer() - - color_string = convert_rgba_to_hex(color) - tag_name = 'color' + color_string - if not tag_name in self.color_tags: - tag_color = _buffer.create_tag(tag_name) - tag_color.set_property('foreground', color_string) - begin = f'' - self.begin_tags[tag_name] = begin - self.end_tags[tag_name] = '' - self.color_tags.append(tag_name) - - start, finish = self.get_active_iters() - - for tag in self.color_tags: - _buffer.remove_tag_by_name(tag, start, finish) - - _buffer.apply_tag_by_name(tag_name, start, finish) - - def font_set(self, widget, response, start, finish): - if response in (-6, -4): - widget.destroy() + ext_start = _buffer.get_iter_at_offset(start_offset - 1) + ext_end = _buffer.get_iter_at_offset(end_offset + 1) + ext_text = _buffer.get_text(ext_start, ext_end, True) + if ext_text.startswith(format_char) and ext_text.endswith(format_char): + # (Selected) text is surrounded by formatting chars -> remove them + _buffer.delete( + ext_start, + _buffer.get_iter_at_offset(start_offset)) + _buffer.delete( + _buffer.get_iter_at_offset(end_offset - 1), + _buffer.get_iter_at_offset(end_offset)) return - font = widget.get_font() - font_desc = widget.get_font_desc() - family = font_desc.get_family() - size = font_desc.get_size() - size = size / Pango.SCALE - weight = font_desc.get_weight() - style = font_desc.get_style() - - widget.destroy() - - _buffer = self.get_buffer() - - tag_name = 'font' + font - if not tag_name in self.fonts_tags: - tag_font = _buffer.create_tag(tag_name) - tag_font.set_property('font', f'{family} {size}') - beg = f'' - self.begin_tags[tag_name] = beg - self.end_tags[tag_name] = '' - self.fonts_tags.append(tag_name) - - for tag in self.fonts_tags: - _buffer.remove_tag_by_name(tag, start, finish) - - _buffer.apply_tag_by_name(tag_name, start, finish) - - if weight == Pango.Weight.BOLD: - _buffer.apply_tag_by_name('bold', start, finish) - else: - _buffer.remove_tag_by_name('bold', start, finish) - - if style == Pango.Style.ITALIC: - _buffer.apply_tag_by_name('italic', start, finish) - else: - _buffer.remove_tag_by_name('italic', start, finish) - - def get_xhtml(self) -> Optional[str]: - _buffer = self.get_buffer() - old = _buffer.get_start_iter() - tags = {} - tags['bold'] = False - iter_ = _buffer.get_start_iter() - old = _buffer.get_start_iter() - text = '' - modified = False - - def xhtml_special(text): - text = text.replace('<', '<') - text = text.replace('>', '>') - text = text.replace('&', '&') - text = text.replace('\n', ' ') - return text - - for tag in iter_.get_toggled_tags(True): - tag_name = tag.get_property('name') - if tag_name not in self.begin_tags: - continue - text += self.begin_tags[tag_name] - modified = True - while (iter_.forward_to_tag_toggle(None) and not iter_.is_end()): - text += xhtml_special(_buffer.get_text(old, iter_, True)) - old.forward_to_tag_toggle(None) - new_tags, old_tags, end_tags = [], [], [] - for tag in iter_.get_toggled_tags(True): - tag_name = tag.get_property('name') - if tag_name not in self.begin_tags: - continue - new_tags.append(tag_name) - modified = True - - for tag in iter_.get_tags(): - tag_name = tag.get_property('name') - if (tag_name not in self.begin_tags or - tag_name not in self.end_tags): - continue - if tag_name not in new_tags: - old_tags.append(tag_name) - - for tag in iter_.get_toggled_tags(False): - tag_name = tag.get_property('name') - if tag_name not in self.end_tags: - continue - end_tags.append(tag_name) - - for tag in old_tags: - text += self.end_tags[tag] - for tag in end_tags: - text += self.end_tags[tag] - for tag in new_tags: - text += self.begin_tags[tag] - for tag in old_tags: - text += self.begin_tags[tag] - - buffer_text = _buffer.get_text(old, _buffer.get_end_iter(), True) - text += xhtml_special(buffer_text) - for tag in iter_.get_toggled_tags(False): - tag_name = tag.get_property('name') - if tag_name not in self.end_tags: - continue - text += self.end_tags[tag_name] - - if modified: - wrapped_text = f'{self.make_clickable_urls(text)}' - return build_xhtml_body(wrapped_text) - return None + # No formatting chars found at start/end or surrounding -> add them + _buffer.insert(start, format_char, -1) + _buffer.insert( + _buffer.get_iter_at_offset(end_offset + 1), + format_char, + -1) + _buffer.select_range( + _buffer.get_iter_at_offset(start_offset), + _buffer.get_iter_at_offset(end_offset + 2)) def replace_emojis(self) -> None: theme = app.settings.get('emoticons_theme') if not theme or theme == 'font': return - def replace(anchor): + def _replace(anchor): if anchor is None: return image = anchor.get_widgets()[0] if hasattr(image, 'codepoint'): # found emoji - self.replace_char_at_iter(iter_, image.codepoint) + self._replace_char_at_iter(iter_, image.codepoint) image.destroy() iter_ = self.get_buffer().get_start_iter() - replace(iter_.get_child_anchor()) + _replace(iter_.get_child_anchor()) while iter_.forward_char(): - replace(iter_.get_child_anchor()) + _replace(iter_.get_child_anchor()) - def replace_char_at_iter(self, iter_, new_char): + def _replace_char_at_iter(self, iter_, new_char): buffer_ = self.get_buffer() iter_2 = iter_.copy() iter_2.forward_char() @@ -398,24 +248,18 @@ def insert_emoji(self, codepoint, pixbuf): buffer_.insert_at_cursor(' ') def clear(self, *args): - """ - Clear text in the textview - """ _buffer = self.get_buffer() start, end = _buffer.get_bounds() _buffer.delete(start, end) def save_undo(self, text: str) -> None: - self.undo_list.append(text) - if len(self.undo_list) > UNDO_LIMIT: - del self.undo_list[0] + self._undo_list.append(text) + if len(self._undo_list) > UNDO_LIMIT: + del self._undo_list[0] self.undo_pressed = False def undo(self, *args): - """ - Undo text in the textview - """ _buffer = self.get_buffer() - if self.undo_list: - _buffer.set_text(self.undo_list.pop()) + if self._undo_list: + _buffer.set_text(self._undo_list.pop()) self.undo_pressed = True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ee113209fcae27e6eb613bcf96bf05e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ee113209fcae27e6eb613bcf96bf05e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Helpers: Fix allow_showing_notification
by Daniel Brötzmann (＠wurstsalat) 12 Dec '21

12 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ee113209 by wurstsalat at 2021-12-12T23:46:08+01:00 Helpers: Fix allow_showing_notification - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -697,7 +697,8 @@ def allow_showing_notification(account: str) -> bool: return False if app.settings.get('show_notifications_away'): return True - if app.account_is_available(account): + client = app.get_client(account) + if client.status == 'online': return True return False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ee113209fcae27e6eb613bcf96bf05eb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ee113209fcae27e6eb613bcf96bf05eb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preview: Catch error when saving PIL image fails
by Daniel Brötzmann (＠wurstsalat) 12 Dec '21

12 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ef7284fe by wurstsalat at 2021-12-12T22:51:53+01:00 Preview: Catch error when saving PIL image fails Fixes #10721 - - - - - 1 changed file: - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -204,11 +204,16 @@ def create_thumbnail_with_pil(data: bytes, size: int) -> Optional[bytes]: if image.format == 'GIF' and image.n_frames > 1: resize_gif(image, output_file, (size, size)) else: - image.thumbnail((size, size)) - image.save(output_file, - format=image.format, - exif=image.info.get('exif', b''), - optimize=True) + try: + image.thumbnail((size, size)) + image.save( + output_file, + format=image.format, + exif=image.info.get('exif', b''), + optimize=True) + except OSError as error: + log.warning('saving pil thumbnail failed: %s', error) + return None bytes_ = output_file.getvalue() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ef7284fe4b38af16191d2a92d2a37014… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ef7284fe4b38af16191d2a92d2a37014… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix chat actions
by Daniel Brötzmann (＠wurstsalat) 12 Dec '21

12 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 55eed202 by wurstsalat at 2021-12-12T20:28:42+01:00 Fix chat actions - - - - - 4 changed files: - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -506,7 +506,7 @@ def _sec_labels_received(self, event): self.xml.label_selector.set_no_show_all(False) self.xml.label_selector.show_all() - def delegate_action(self, action): + def delegate_action(self, action: str) -> int: if action == 'clear-chat': self.conversation_view.clear() self._scrolled_view.reset() ===================================== gajim/gtk/controls/chat.py ===================================== @@ -271,7 +271,7 @@ def remove_actions(self) -> None: def focus(self) -> None: self.msg_textview.grab_focus() - def delegate_action(self, action): + def delegate_action(self, action: str) -> int: res = super().delegate_action(action) if res == Gdk.EVENT_STOP: return res ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -1431,7 +1431,7 @@ def _on_message_textview_key_press_event(self, widget, event): self.last_key_tabs = False return None - def delegate_action(self, action): + def delegate_action(self, action: str) -> int: res = super().delegate_action(action) if res == Gdk.EVENT_STOP: return res ===================================== gajim/gtk/main.py ===================================== @@ -253,7 +253,7 @@ def _on_action(self, action_name = action.get_name() - res = control.delegate_action(action) + res = control.delegate_action(action_name) if res != Gdk.EVENT_PROPAGATE: return res View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/55eed20241965a14680da3696c048ffe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/55eed20241965a14680da3696c048ffe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Remove obsolete Account module
by Daniel Brötzmann (＠wurstsalat) 12 Dec '21

12 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f80a1658 by wurstsalat at 2021-12-12T19:32:40+01:00 Remove obsolete Account module - - - - - 1a7295d1 by wurstsalat at 2021-12-12T19:41:37+01:00 FileTransfer: Typing - - - - - 668381a6 by wurstsalat at 2021-12-12T19:51:08+01:00 AppPage: Typing - - - - - 3 changed files: - − gajim/common/account.py - gajim/common/filetransfer.py - gajim/gtk/app_page.py Changes: ===================================== gajim/common/account.py deleted ===================================== @@ -1,32 +0,0 @@ -# Copyright (C) 2009 Stephan Erb <steve-e AT h3c.de> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - - -class Account: - - def __init__(self, name, contacts, gc_contacts): - self.name = name - self.contacts = contacts - self.gc_contacts = gc_contacts - - def change_contact_jid(self, old_jid, new_jid): - self.contacts.change_contact_jid(old_jid, new_jid) - - def __repr__(self): - return self.name - - def __hash__(self): - return hash(self.name) ===================================== gajim/common/filetransfer.py ===================================== @@ -13,40 +13,41 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Dict +from typing import Optional from gajim.common.helpers import Observable from gajim.common.const import FTState class FileTransfer(Observable): - _state_descriptions = {} # type: Dict[FTState, str] + _state_descriptions: Dict[FTState, str] = {} - def __init__(self, account): + def __init__(self, account: str) -> None: Observable.__init__(self) self._account = account - self._seen = 0 - self.size = 0 + self._seen: int = 0 + self.size: int = 0 - self._state = None - self._error_text = '' - self._error_domain = None + self._state: Optional[FTState] = None + self._error_text: str = '' + self._error_domain: Optional[str] = None @property - def account(self): + def account(self) -> str: return self._account @property - def state(self): + def state(self) -> Optional[FTState]: return self._state @property - def seen(self): + def seen(self) -> int: return self._seen @property - def is_complete(self): + def is_complete(self) -> bool: if self.size == 0: return False return self._seen >= self.size @@ -56,55 +57,55 @@ def filename(self): raise NotImplementedError @property - def error_text(self): + def error_text(self) -> str: return self._error_text @property - def error_domain(self): + def error_domain(self) -> Optional[str]: return self._error_domain - def get_state_description(self): + def get_state_description(self) -> str: return self._state_descriptions.get(self._state, '') - def set_preparing(self): + def set_preparing(self) -> None: self._state = FTState.PREPARING self.notify('state-changed', FTState.PREPARING) - def set_encrypting(self): + def set_encrypting(self) -> None: self._state = FTState.ENCRYPTING self.notify('state-changed', FTState.ENCRYPTING) - def set_decrypting(self): + def set_decrypting(self) -> None: self._state = FTState.DECRYPTING self.notify('state-changed', FTState.DECRYPTING) - def set_started(self): + def set_started(self) -> None: self._state = FTState.STARTED self.notify('state-changed', FTState.STARTED) - def set_error(self, domain, text=''): + def set_error(self, domain: str, text: str = '') -> None: self._error_text = text self._error_domain = domain self._state = FTState.ERROR self.notify('state-changed', FTState.ERROR) self.disconnect_signals() - def set_cancelled(self): + def set_cancelled(self) -> None: self._state = FTState.CANCELLED self.notify('state-changed', FTState.CANCELLED) self.disconnect_signals() - def set_in_progress(self): + def set_in_progress(self) -> None: self._state = FTState.IN_PROGRESS self.notify('state-changed', FTState.IN_PROGRESS) - def set_finished(self): + def set_finished(self) -> None: self._state = FTState.FINISHED self.notify('state-changed', FTState.FINISHED) self.disconnect_signals() - def update_progress(self): + def update_progress(self) -> None: self.notify('progress') - def cancel(self): + def cancel(self) -> None: self.notify('cancel') ===================================== gajim/gtk/app_page.py ===================================== @@ -12,6 +12,8 @@ # 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 Optional + from gi.repository import GObject from gi.repository import Gtk @@ -32,12 +34,12 @@ class AppPage(Gtk.Box): (int, )), } - def __init__(self): + def __init__(self) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=18) self.get_style_context().add_class('app-page') - self._unread_count = 0 + self._unread_count: int = 0 status_header = Gtk.Label(label=_('Status')) status_header.get_style_context().add_class('large-header') @@ -65,13 +67,13 @@ def __init__(self): self.show_all() - def add_app_message(self, category, message): + def add_app_message(self, category: str, message: Optional[str]) -> None: self._app_message_listbox.add_app_message(category, message) self._unread_count += 1 self.emit('unread-count-changed', self._unread_count) - def remove_app_message(self): + def remove_app_message(self) -> None: self._unread_count -= 1 self.emit('unread-count-changed', self._unread_count) @@ -80,7 +82,7 @@ def process_event(self, event): class AppMessageListBox(Gtk.ListBox): - def __init__(self): + def __init__(self) -> None: Gtk.ListBox.__init__(self) self.set_selection_mode(Gtk.SelectionMode.NONE) self.set_halign(Gtk.Align.CENTER) @@ -94,17 +96,17 @@ def __init__(self): self.show_all() - def add_app_message(self, category, message): + def add_app_message(self, category: str, message: Optional[str]) -> None: row = AppMessageRow(category, message) self.add(row) - def remove_app_message(self, row): + def remove_app_message(self, row: Gtk.ListBoxRow) -> None: self.remove(row) self.get_parent().remove_app_message() class AppMessageRow(Gtk.ListBoxRow): - def __init__(self, category, message=None): + def __init__(self, category: str, message: Optional[str] = None) -> None: Gtk.ListBoxRow.__init__(self) self._ui = get_builder('app_page.ui') @@ -119,17 +121,17 @@ def __init__(self, category, message=None): self._ui.connect_signals(self) self.show_all() - def _on_check_clicked(self, _button): + def _on_check_clicked(self, _button: Gtk.Button) -> None: app.interface.get_latest_release() self.get_parent().remove_app_message(self) - def _on_dismiss_check_clicked(self, _button): + def _on_dismiss_check_clicked(self, _button: Gtk.Button) -> None: app.settings.set('check_for_update', False) self.get_parent().remove_app_message(self) - def _on_visit_website_clicked(self, _button): + def _on_visit_website_clicked(self, _button: Gtk.Button) -> None: open_uri('https://gajim.org/download') self.get_parent().remove_app_message(self) - def _on_dismiss_update_clicked(self, _button): + def _on_dismiss_update_clicked(self, _button: Gtk.Button) -> None: self.get_parent().remove_app_message(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3cf9543c86ab5e9df4996da634ee7b0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3cf9543c86ab5e9df4996da634ee7b0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 8 commits: ChatFilter: Typing
by Daniel Brötzmann (＠wurstsalat) 12 Dec '21

12 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2dd4d29c by wurstsalat at 2021-12-12T18:44:28+01:00 ChatFilter: Typing - - - - - 21c104d9 by wurstsalat at 2021-12-12T18:45:07+01:00 Features: Typing, simplify code - - - - - ee952abe by wurstsalat at 2021-12-12T18:45:35+01:00 GroupchatInfo: Typing - - - - - 83eb5f6c by wurstsalat at 2021-12-12T18:45:48+01:00 GroupchatNick: Typing - - - - - 13d23b16 by wurstsalat at 2021-12-12T18:46:00+01:00 SearchView: Typing - - - - - 1dabf2e9 by wurstsalat at 2021-12-12T18:46:17+01:00 Dialogs: Typing - - - - - b2db91ee by wurstsalat at 2021-12-12T18:46:43+01:00 Notification: Typing - - - - - 3cf9543c by wurstsalat at 2021-12-12T19:27:54+01:00 Archive: Typing - - - - - 8 changed files: - gajim/common/storage/archive.py - gajim/gtk/chat_filter.py - gajim/gtk/dialogs.py - gajim/gtk/features.py - gajim/gtk/groupchat_info.py - gajim/gtk/groupchat_nick.py - gajim/gtk/notification.py - gajim/gtk/search_view.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -21,6 +21,10 @@ # 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 List +from typing import Optional + import time import datetime import calendar @@ -125,7 +129,7 @@ def _namedtuple_factory(self, cursor, row): named_row = named_row._replace(account=jid) return named_row - def _migrate(self): + def _migrate(self) -> None: user_version = self.user_version if user_version == 0: # All migrations from 0.16.9 until 1.0.0 @@ -183,7 +187,7 @@ def dispatch(event, error): app.ged.raise_event(event, None, str(error)) @staticmethod - def _get_timeout(): + def _get_timeout() -> int: """ returns the timeout in epoch """ @@ -195,11 +199,11 @@ def _get_timeout(): return timeout @staticmethod - def _like(search_str): - return '%{}%'.format(search_str) + def _like(search_str: str) -> str: + return f'%{search_str}%' @timeit - def _get_jid_ids_from_db(self): + def _get_jid_ids_from_db(self) -> None: """ Load all jid/jid_id tuples into a dict for faster access """ @@ -215,7 +219,7 @@ def get_jid_from_id(self, jid_id): def get_jids_in_db(self): return self._jid_ids.keys() - def jid_is_from_pm(self, jid): + def jid_is_from_pm(self, jid: str) -> bool: """ If jid is gajim@conf/nkour it's likely a pm one, how we know gajim@conf is not a normal guy and nkour is not his resource? we ask if gajim@conf @@ -230,7 +234,7 @@ def jid_is_from_pm(self, jid): # it's not a full jid, so it's not a pm one return False - def jid_is_room_jid(self, jid): + def jid_is_room_jid(self, jid: str) -> bool: """ Return True if it's a room jid, False if it's not, None if we don't know """ @@ -239,18 +243,25 @@ def jid_is_room_jid(self, jid): return None return jid_.type == JIDConstant.ROOM_TYPE - def get_account_id(self, account, type_=JIDConstant.NORMAL_TYPE): + def get_account_id(self, + account: str, + type_: JIDConstant = JIDConstant.NORMAL_TYPE + ) -> int: jid = app.get_jid_from_account(account) return self.get_jid_id(jid, type_=type_) - def get_active_account_ids(self): + def get_active_account_ids(self) -> List[int]: account_ids = [] for account in app.settings.get_active_accounts(): account_ids.append(self.get_account_id(account)) return account_ids @timeit - def get_jid_id(self, jid, kind=None, type_=None): + def get_jid_id(self, + jid: JID, + kind: Optional[KindConstant] = None, + type_: Optional[JIDConstant] = None + ) -> int: """ Get the jid id from a jid. In case the jid id is not found create a new one. @@ -291,7 +302,8 @@ def get_jid_id(self, jid, kind=None, type_=None): return lastrowid @staticmethod - def convert_show_values_to_db_api_values(show): + def convert_show_values_to_db_api_values(show: Optional[str] + ) -> Optional[ShowConstant]: """ Convert from string style to constant ints for db """ @@ -315,8 +327,13 @@ def convert_show_values_to_db_api_values(show): return None @timeit - def get_conversation_before_after(self, account, jid, before, timestamp, - n_lines): + def get_conversation_before_after(self, + account: str, + jid: JID, + before: bool, + timestamp: float, + n_lines: int + ) -> List[namedtuple]: """ Load n_lines lines of conversation with jid before or after timestamp @@ -359,8 +376,13 @@ def get_conversation_before_after(self, account, jid, before, timestamp, tuple(jids) + (timestamp, n_lines)).fetchall() @timeit - def get_conversation_muc_before_after(self, account, jid, before, - timestamp, n_lines): + def get_conversation_muc_before_after(self, + _account: str, + jid: JID, + before: bool, + timestamp: float, + n_lines: int + ) -> List[namedtuple]: """ Load n_lines lines of conversation with jid before or after timestamp @@ -401,7 +423,10 @@ def get_conversation_muc_before_after(self, account, jid, before, tuple(jids) + (timestamp, n_lines)).fetchall() @timeit - def get_last_conversation_line(self, account, jid): + def get_last_conversation_line(self, + account: str, + jid: JID + ) -> List[namedtuple]: """ Load the last line of a conversation with jid for account. Loads messages, but no status messages or error messages. @@ -433,7 +458,11 @@ def get_last_conversation_line(self, account, jid): return self._con.execute(sql, tuple(jids)).fetchone() @timeit - def get_conversation_around(self, account, jid, timestamp): + def get_conversation_around(self, + account: str, + jid: JID, + timestamp: float + ) -> List[namedtuple]: """ Load all lines of conversation with jid around a specific timestamp @@ -561,8 +590,14 @@ def get_messages_for_date(self, account, jid, date): tuple(jids) + (date_ts, delta_ts)).fetchall() @timeit - def search_log(self, account, jid, query, from_users=None, before=None, - after=None): + def search_log(self, + _account: str, + jid: JID, + query: str, + from_users: Optional[List[str]] = None, + before: Optional[datetime.datetime] = None, + after: Optional[datetime.datetime] = None + ) -> List[namedtuple]: """ Search the conversation log for messages containing the `query` string. @@ -626,7 +661,12 @@ def search_log(self, account, jid, query, from_users=None, before=None, query, users, after_ts, before_ts)).fetchall() @timeit - def search_all_logs(self, query, from_users=None, before=None, after=None): + def search_all_logs(self, + query: str, + from_users: Optional[List[str]] = None, + before: Optional[datetime.datetime] = None, + after: Optional[datetime.datetime] = None + ) -> List[namedtuple]: """ Search all conversation logs for messages containing the `query` string. @@ -682,7 +722,7 @@ def search_all_logs(self, query, from_users=None, before=None, after=None): sql, (query, users, after_ts, before_ts)).fetchall() @timeit - def get_days_with_logs(self, account, jid, year, month): + def get_days_with_logs(self, _account, jid, year, month): """ Request the days in a month where we received messages for a given `jid`. @@ -723,7 +763,7 @@ def get_days_with_logs(self, account, jid, year, month): (date + delta).timestamp())).fetchall() @timeit - def get_last_date_that_has_logs(self, account, jid): + def get_last_date_that_has_logs(self, _account, jid): """ Get the timestamp of the last message we received for the jid. @@ -750,7 +790,7 @@ def get_last_date_that_has_logs(self, account, jid): return self._con.execute(sql, tuple(jids)).fetchone().time @timeit - def get_first_date_that_has_logs(self, account, jid): + def get_first_date_that_has_logs(self, _account, jid): """ Get the timestamp of the first message we received for the jid. @@ -777,7 +817,7 @@ def get_first_date_that_has_logs(self, account, jid): return self._con.execute(sql, tuple(jids)).fetchone().time @timeit - def get_date_has_logs(self, account, jid, date): + def get_date_has_logs(self, _account, jid, date): """ Get single timestamp of a message we received for the jid in the time range of one day. @@ -809,8 +849,13 @@ def get_date_has_logs(self, account, jid, date): sql, tuple(jids) + (start, end)).fetchone() @timeit - def deduplicate_muc_message(self, account, jid, resource, - timestamp, message_id): + def deduplicate_muc_message(self, + account: str, + jid: str, + resource: str, + timestamp: float, + message_id: str + ) -> bool: """ Check if a message is already in the `logs` table @@ -857,8 +902,13 @@ def deduplicate_muc_message(self, account, jid, resource, return False @timeit - def find_stanza_id(self, account, archive_jid, stanza_id, origin_id=None, - groupchat=False): + def find_stanza_id(self, + account: str, + archive_jid: str, + stanza_id: str, + origin_id: Optional[str] = None, + groupchat: bool = False + ) -> bool: """ Checks if a stanza-id is already in the `logs` table @@ -916,7 +966,8 @@ def find_stanza_id(self, account, archive_jid, stanza_id, origin_id=None, if result is not None: log.info('Found duplicated message, stanza-id: %s, origin-id: %s, ' - 'archive-jid: %s, account: %s', stanza_id, origin_id, archive_jid, account_id) + 'archive-jid: %s, account: %s', stanza_id, origin_id, + archive_jid, account_id) return True return False @@ -1043,7 +1094,11 @@ def update_additional_data(self, sql, (serialized_dict, stanza_id, account_id, KindConstant.GC_MSG)) - def insert_jid(self, jid, kind=None, type_=JIDConstant.NORMAL_TYPE): + def insert_jid(self, + jid: str, + kind: Optional[KindConstant] = None, + type_: JIDConstant = JIDConstant.NORMAL_TYPE + ) -> int: """ Insert a new jid into the `jids` table. This is an alias of get_jid_id() for better readablility. @@ -1057,7 +1112,13 @@ def insert_jid(self, jid, kind=None, type_=JIDConstant.NORMAL_TYPE): return self.get_jid_id(jid, kind, type_) @timeit - def insert_into_logs(self, account, jid, time_, kind, **kwargs): + def insert_into_logs(self, + account: str, + jid: str, + time_: float, + kind: KindConstant, + **kwargs: Any + ) -> int: """ Insert a new message into the `logs` table @@ -1100,7 +1161,12 @@ def insert_into_logs(self, account, jid, time_, kind, **kwargs): return lastrowid @timeit - def set_message_error(self, account_jid, jid, message_id, error): + def set_message_error(self, + account_jid: str, + jid: JID, + message_id: str, + error: str + ) -> None: """ Update the corresponding message with the error @@ -1129,7 +1195,12 @@ def set_message_error(self, account_jid, jid, message_id, error): self._delayed_commit() @timeit - def set_marker(self, account_jid, jid, message_id, state): + def set_marker(self, + account_jid: str, + jid: str, + message_id: str, + state: str + ) -> None: """ Update the marker state of the corresponding message @@ -1234,8 +1305,11 @@ def reset_archive_infos(self, jid): log.info('Reset message archive info: %s', jid) self._delayed_commit() - def remove_chat_history(self, account: str, jid: str, - groupchat: bool = False) -> None: + def remove_chat_history(self, + account: str, + jid: str, + groupchat: bool = False + ) -> None: """ Remove chat history for a specific chat. If it's a group chat, remove last MAM ID as well. @@ -1255,7 +1329,7 @@ def remove_chat_history(self, account: str, jid: str, self._delayed_commit() log.info('Removed chat history for: %s', jid) - def _cleanup_chat_history(self): + def _cleanup_chat_history(self) -> None: """ Remove messages from account where messages are older than max_age """ ===================================== gajim/gtk/chat_filter.py ===================================== @@ -26,7 +26,7 @@ class ChatFilter(Gtk.Box): (str, )), } - def __init__(self, icons=False): + def __init__(self, icons: bool = False) -> None: Gtk.Box.__init__(self) self.set_halign(Gtk.Align.CENTER) @@ -69,10 +69,10 @@ def __init__(self, icons=False): self.add(toolbar) self.show_all() - def _on_button_clicked(self, button): + def _on_button_clicked(self, button: Gtk.Button) -> None: if button.get_active(): self.emit('filter-changed', button.get_name()) - def reset(self): + def reset(self) -> None: self._all_button.set_active(True) self.emit('filter-changed', 'all') ===================================== gajim/gtk/dialogs.py ===================================== @@ -149,7 +149,11 @@ class WarningDialog(HigDialog): HIG compliant warning dialog """ - def __init__(self, pritext, sectext='', transient_for=None): + def __init__(self, + pritext: str, + sectext: str = '', + transient_for: Optional[Gtk.Window] = None + ) -> None: if transient_for is None: transient_for = app.app.get_active_window() HigDialog.__init__(self, @@ -167,7 +171,11 @@ class InformationDialog(HigDialog): HIG compliant info dialog """ - def __init__(self, pritext, sectext='', transient_for=None): + def __init__(self, + pritext: str, + sectext: str = '', + transient_for: Optional[Gtk.Window] = None + ) -> None: if transient_for is None: transient_for = app.app.get_active_window() HigDialog.__init__(self, ===================================== gajim/gtk/features.py ===================================== @@ -19,9 +19,11 @@ # 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 NamedTuple +from typing import List + import os import sys -from collections import namedtuple from gi.repository import Gtk from gi.repository import Gdk @@ -30,8 +32,17 @@ from gajim.common.i18n import _ +class Feature(NamedTuple): + name: str + available: bool + tooltip: str + dependency_u: str + dependency_w: str + enabled: bool + + class Features(Gtk.ApplicationWindow): - def __init__(self): + def __init__(self) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -64,24 +75,21 @@ def __init__(self): self.show_all() - def _on_key_press(self, _widget, event): + def _on_key_press(self, + _widget: Gtk.Widget, + event: Gdk.EventButton) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _add_feature(self, feature): + def _add_feature(self, feature: Feature) -> None: item = FeatureItem(feature) self.feature_listbox.add(item) - item.get_parent().set_tooltip_text(item.tooltip) - def _get_features(self): - Feature = namedtuple('Feature', - ['name', 'available', 'tooltip', - 'dependency_u', 'dependency_w', 'enabled']) - - notification_sounds_available = ( + def _get_features(self) -> List[Feature]: + notification_sounds_available: bool = ( app.is_installed('GSOUND') or sys.platform in ('win32', 'darwin')) - notification_sounds_enabled = app.settings.get('sounds_on') - spell_check_enabled = app.settings.get('use_speller') + notification_sounds_enabled: bool = app.settings.get('sounds_on') + spell_check_enabled: bool = app.settings.get('use_speller') auto_status = [app.settings.get('autoaway'), app.settings.get('autoxa')] auto_status_enabled = bool(any(auto_status)) @@ -156,77 +164,67 @@ def _get_features(self): ] @staticmethod - def _some_keyring_available(): + def _some_keyring_available() -> bool: from gajim.common import passwords return passwords.KEYRING_AVAILABLE @staticmethod - def _idle_available(): + def _idle_available() -> bool: from gajim.common import idle return idle.Monitor.is_available() class FeatureItem(Gtk.Grid): - def __init__(self, feature): - super().__init__() + def __init__(self, feature: Feature) -> None: + Gtk.Grid.__init__(self) self.set_column_spacing(12) - self.tooltip = feature.tooltip - self.feature_dependency_u_text = feature.dependency_u - self.feature_dependency_w_text = feature.dependency_w + feature_label = Gtk.Label(label=feature.name) + feature_label.set_halign(Gtk.Align.START) + self._box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) + self._box.pack_start(feature_label, True, True, 0) + self._box.set_tooltip_text(feature.tooltip) - self.box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) - self.feature_label = Gtk.Label(label=feature.name) - self.feature_label.set_halign(Gtk.Align.START) - self.box.pack_start(self.feature_label, True, True, 0) + feature_dependency = Gtk.Label(label=feature.dependency_u) + feature_dependency.get_style_context().add_class('dim-label') - self.feature_dependency_u = Gtk.Label(label=feature.dependency_u) - self.feature_dependency_u.get_style_context().add_class('dim-label') - self.feature_dependency_w = Gtk.Label(label=feature.dependency_w) - self.feature_dependency_w.get_style_context().add_class('dim-label') + if os.name == 'nt': + feature_dependency.set_label(feature.dependency_w) + else: + feature_dependency.set_label(feature.dependency_u) if not feature.available: - self.feature_dependency_u.set_halign(Gtk.Align.START) - self.feature_dependency_u.set_xalign(0.0) - self.feature_dependency_u.set_yalign(0.0) - self.feature_dependency_u.set_line_wrap(True) - self.feature_dependency_u.set_max_width_chars(50) - self.feature_dependency_u.set_selectable(True) - self.feature_dependency_w.set_halign(Gtk.Align.START) - self.feature_dependency_w.set_xalign(0.0) - self.feature_dependency_w.set_yalign(0.0) - self.feature_dependency_w.set_line_wrap(True) - self.feature_dependency_w.set_max_width_chars(50) - self.feature_dependency_w.set_selectable(True) - - if os.name == 'nt': - self.box.pack_start(self.feature_dependency_w, True, True, 0) - else: - self.box.pack_start(self.feature_dependency_u, True, True, 0) - - self.icon = Gtk.Image() - self.label_disabled = Gtk.Label(label=_('Disabled in Preferences')) - self.label_disabled.get_style_context().add_class('dim-label') - self.set_feature(feature.available, feature.enabled) - - self.add(self.icon) - self.add(self.box) - - def set_feature(self, available, enabled): - self.icon.get_style_context().remove_class('error-color') - self.icon.get_style_context().remove_class('warning-color') - self.icon.get_style_context().remove_class('success-color') + feature_dependency.set_halign(Gtk.Align.START) + feature_dependency.set_xalign(0.0) + feature_dependency.set_yalign(0.0) + feature_dependency.set_line_wrap(True) + feature_dependency.set_max_width_chars(50) + feature_dependency.set_selectable(True) + self._box.pack_start(feature_dependency, True, True, 0) + + self._icon = Gtk.Image() + self._label_disabled = Gtk.Label(label=_('Disabled in Preferences')) + self._label_disabled.get_style_context().add_class('dim-label') + self._set_feature(feature.available, feature.enabled) + + self.add(self._icon) + self.add(self._box) + + def _set_feature(self, available: bool, enabled: bool) -> None: + self._icon.get_style_context().remove_class('error-color') + self._icon.get_style_context().remove_class('warning-color') + self._icon.get_style_context().remove_class('success-color') if not available: - self.icon.set_from_icon_name('window-close-symbolic', - Gtk.IconSize.MENU) - self.icon.get_style_context().add_class('error-color') + self._icon.set_from_icon_name( + 'window-close-symbolic', Gtk.IconSize.MENU) + self._icon.get_style_context().add_class('error-color') elif enabled is False: - self.icon.set_from_icon_name('dialog-warning-symbolic', - Gtk.IconSize.MENU) - self.box.pack_start(self.label_disabled, True, True, 0) - self.icon.get_style_context().add_class('warning-color') + self._icon.set_from_icon_name( + 'dialog-warning-symbolic', Gtk.IconSize.MENU) + self._box.pack_start(self._label_disabled, True, True, 0) + self._icon.get_style_context().add_class('warning-color') else: - self.icon.set_from_icon_name('emblem-ok-symbolic', - Gtk.IconSize.MENU) - self.icon.get_style_context().add_class('success-color') + self._icon.set_from_icon_name( + 'emblem-ok-symbolic', Gtk.IconSize.MENU) + self._icon.get_style_context().add_class('success-color') ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -12,13 +12,20 @@ # 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 Dict +from typing import List +from typing import Optional + import time from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gtk +from nbxmpp import JID from nbxmpp.namespaces import Namespace +from nbxmpp.structs import DiscoInfo from gajim.common import app from gajim.common.i18n import _ @@ -97,7 +104,10 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): - def __init__(self, account=None, options=None): + def __init__(self, + account: Optional[str] = None, + options: Optional[Dict[str, Any]] = None + ) -> None: Gtk.ScrolledWindow.__init__(self) if options is None: options = {} @@ -116,23 +126,26 @@ def __init__(self, account=None, options=None): Gtk.PolicyType.AUTOMATIC) self._account = account - self._info = None + self._info: Optional[DiscoInfo] = None self._ui = get_builder('groupchat_info_scrolled.ui') self.add(self._ui.info_grid) self._ui.connect_signals(self) self.show_all() - def get_account(self): + def get_account(self) -> str: return self._account - def set_account(self, account): + def set_account(self, account: str) -> None: self._account = account - def get_jid(self): + def get_jid(self) -> Optional[JID]: return self._info.jid - def set_author(self, author, epoch_timestamp=None): + def set_author(self, + author: Optional[str], + epoch_timestamp: Optional[float] = None + ) -> None: has_author = bool(author) if has_author and epoch_timestamp is not None: time_ = time.strftime('%c', time.localtime(epoch_timestamp)) @@ -142,14 +155,14 @@ def set_author(self, author, epoch_timestamp=None): self._ui.author.set_visible(has_author) self._ui.author_label.set_visible(has_author) - def set_subject(self, subject): + def set_subject(self, subject: str) -> None: has_subject = bool(subject) subject = GLib.markup_escape_text(subject or '') self._ui.subject.set_markup(make_href_markup(subject)) self._ui.subject.set_visible(has_subject) self._ui.subject_label.set_visible(has_subject) - def set_from_disco_info(self, info): + def set_from_disco_info(self, info: DiscoInfo) -> None: self._info = info # Set name if self._account is None: @@ -219,7 +232,7 @@ def set_from_disco_info(self, info): self._add_features(info.features) - def _add_features(self, features): + def _add_features(self, features: List[str]) -> None: grid = self._ui.info_grid for row in range(30, 9, -1): # Remove everything from row 30 to 10 @@ -244,7 +257,7 @@ def _add_features(self, features): row += 1 grid.show_all() - def _on_copy_address(self, _button): + def _on_copy_address(self, _button: Gtk.Button) -> None: clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) clipboard.set_text(f'xmpp:{self._info.jid}?join', -1) @@ -265,7 +278,7 @@ def _on_activate_subject_link(_label, uri): return Gdk.EVENT_STOP @staticmethod - def _get_feature_icon(icon, tooltip): + def _get_feature_icon(icon, tooltip: str) -> Gtk.Image: image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) image.set_valign(Gtk.Align.CENTER) image.set_halign(Gtk.Align.END) @@ -273,13 +286,13 @@ def _get_feature_icon(icon, tooltip): return image @staticmethod - def _get_feature_label(text): + def _get_feature_label(text: str) -> Gtk.Label: label = Gtk.Label(label=text, use_markup=True) label.set_halign(Gtk.Align.START) label.set_valign(Gtk.Align.START) return label - def _get_contact_button(self, contact): + def _get_contact_button(self, contact: str) -> Gtk.Button: button = Gtk.LinkButton.new(contact) button.set_halign(Gtk.Align.START) button.get_style_context().add_class('link-button') ===================================== gajim/gtk/groupchat_nick.py ===================================== @@ -21,7 +21,7 @@ class NickChooser(Gtk.MenuButton): - def __init__(self): + def __init__(self) -> None: Gtk.MenuButton.__init__(self) self._ui = get_builder('groupchat_nick_chooser.ui') self.add(self._ui.button_content) @@ -34,24 +34,24 @@ def __init__(self): self._ui.entry.connect('changed', self._on_nickname_changed) self._ui.apply_button.connect('clicked', self._on_apply_nickname) - def get_text(self): + def get_text(self) -> str: return self._ui.entry.get_text() - def set_text(self, text): + def set_text(self, text: str) -> None: self._ui.entry.set_text(text) self._ui.label.set_text(text) - def _on_nickname_button_toggled(self, _widget): + def _on_nickname_button_toggled(self, _widget: Gtk.MenuButton) -> None: self._ui.entry.grab_focus() - def _on_nickname_changed(self, entry): + def _on_nickname_changed(self, entry: Gtk.Entry) -> None: try: validate_resourcepart(entry.get_text()) self._ui.apply_button.set_sensitive(True) except InvalidJid: self._ui.apply_button.set_sensitive(False) - def _on_apply_nickname(self, _button): + def _on_apply_nickname(self, _button: Gtk.Button) -> None: nickname = self._ui.entry.get_text() self._ui.popover.popdown() self._ui.label.set_text(nickname) ===================================== gajim/gtk/notification.py ===================================== @@ -24,13 +24,19 @@ # 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 Dict +from typing import Optional +from typing import Tuple + import sys import logging from gi.repository import GLib from gi.repository import Gio from gi.repository import Gdk +from gi.repository import GdkPixbuf from gi.repository import Gtk +from gi.repository import GObject from gajim.common import app from gajim.common import ged @@ -49,7 +55,7 @@ log = logging.getLogger('gajim.gui.notification') -NOTIFICATION_ICONS = { +NOTIFICATION_ICONS: Dict[str, str] = { 'incoming-message': 'gajim-chat_msg_recv', 'group-chat-invitation': 'gajim-gc_invitation', 'incoming-call': 'call-start-symbolic', @@ -64,9 +70,9 @@ class Notification(EventHelper): """ Handle notifications """ - def __init__(self): + def __init__(self) -> None: EventHelper.__init__(self) - self._dbus_available = False + self._dbus_available: bool = False self._daemon_capabilities = ['actions'] self._win32_active_popup = None @@ -79,7 +85,7 @@ def __init__(self): ('connection-lost', ged.GUI2, self._on_connection_lost) ]) - def _detect_dbus_caps(self): + def _detect_dbus_caps(self) -> None: if sys.platform in ('win32', 'darwin'): return @@ -87,7 +93,10 @@ def _detect_dbus_caps(self): self._dbus_available = True return - def on_proxy_ready(_source, res, _data=None): + def on_proxy_ready(_source: GObject.Object, + res: Gio.AsyncResult, + _data: Optional[object] = None + ) -> None: try: proxy = Gio.DBusProxy.new_finish(res) self._daemon_capabilities = proxy.GetCapabilities() @@ -177,14 +186,15 @@ def _on_connection_lost(self, event): icon_name='gajim-connection_lost') def _issue_notification(self, - notif_type, - account, - jid, - notif_detail='', - title='', - text='', - icon_name=None, - timeout=-1): + notif_type: str, + account: str, + jid: Optional[str], + notif_detail: str = '', + title: str = '', + text: str = '', + icon_name: Optional[str] = None, + timeout: int = -1 + ) -> None: """ Notify a user of an event using GNotification and GApplication under Linux, Use PopupNotificationWindow under Windows @@ -263,7 +273,9 @@ def _issue_notification(self, app.app.send_notification(notif_id, notification) @staticmethod - def _get_avatar_for_notification(account, jid): + def _get_avatar_for_notification(account: str, + jid: str + ) -> GdkPixbuf.Pixbuf: scale = get_monitor_scale_factor() client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) @@ -286,14 +298,15 @@ def _make_id(*args): class PopupNotification(Gtk.Window): def __init__(self, - notif_type, - account, - jid, - notif_detail, - title, - text, - icon_name, - timeout): + notif_type: str, + account: str, + jid: Optional[str], + notif_detail: str, + title: str, + text: str, + icon_name: str, + timeout: int + ) -> None: Gtk.Window.__init__(self) self.set_type_hint(Gdk.WindowTypeHint.NOTIFICATION) self.set_focus_on_map(False) @@ -301,7 +314,7 @@ def __init__(self, self.set_skip_taskbar_hint(True) self.set_decorated(False) - self._timeout_id = None + self._timeout_id: Optional[int] = None self._account = account self._jid = jid self._notif_type = notif_type @@ -334,11 +347,9 @@ def __init__(self, add_css_to_widget(self._ui.color_bar, bar_class) self._ui.color_bar.get_style_context().add_class('popup-bar') - if title is None: - title = '' self._ui.event_type_label.set_markup(title) - if text is None: + if not text: client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) text = contact.name @@ -357,7 +368,7 @@ def __init__(self, self._timeout_id = GLib.timeout_add_seconds(timeout, self.destroy) @staticmethod - def _get_window_pos(): + def _get_window_pos() -> Tuple[int, int]: pos_x = app.settings.get('notification_position_x') screen_w, screen_h = get_total_screen_geometry() if pos_x < 0: @@ -367,10 +378,13 @@ def _get_window_pos(): pos_y = screen_h - 95 - 80 + pos_y + 1 return pos_x, pos_y - def _on_close_button_clicked(self, _widget): + def _on_close_button_clicked(self, _button: Gtk.Button) -> None: self.destroy() - def _on_button_press(self, _widget, event): + def _on_button_press(self, + _widget: Gtk.Widget, + event: Gdk.EventButton + ) -> None: if event.button == 1: app.interface.handle_event( self._account, self._jid, self._notif_type) ===================================== gajim/gtk/search_view.py ===================================== @@ -11,13 +11,21 @@ # # 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 Dict +from typing import List +from typing import Optional +from typing import Tuple + import datetime import logging import time import re +from collections import namedtuple from gi.repository import GObject from gi.repository import Gtk +import cairo from nbxmpp import JID @@ -43,14 +51,14 @@ class SearchView(Gtk.Box): ()), } - def __init__(self): + def __init__(self) -> None: Gtk.Box.__init__(self) self.set_size_request(300, -1) - self._account = None - self._jid = None - self._results = [] - self._scope = None + self._account: Optional[str] = None + self._jid: Optional[JID] = None + self._results: List[str] = [] + self._scope: Optional[str] = None self._ui = get_builder('search_view.ui') self._ui.results_listbox.set_header_func(self._header_func) @@ -86,19 +94,19 @@ def _header_func(row, before): else: row.set_header(None) - def _on_hide_clicked(self, _button): + def _on_hide_clicked(self, _button: Gtk.Button) -> None: self.emit('hide-search') - def clear(self): + def clear(self) -> None: self._ui.search_entry.set_text('') self._clear_results() - def _clear_results(self): + def _clear_results(self) -> None: for row in self._ui.results_listbox.get_children(): self._ui.results_listbox.remove(row) row.destroy() - def _on_search(self, entry): + def _on_search(self, entry: Gtk.Entry) -> None: self._clear_results() self._ui.date_hint.hide() text = entry.get_text() @@ -162,15 +170,20 @@ def _on_search(self, entry): if has_filters is not None: filetypes = [] for filetype in has_filters: - filetypes.append(FILE_CATEGORIES.get(filetype, filetype)) - - filetypes = self._flatten(filetypes) + types = FILE_CATEGORIES.get(filetype) + if types is None: + filetypes.append(filetype) + else: + for type_ in types: + filetypes.append(type_) self._filter_results_for_files(filetypes) self._add_counter() self._add_results() - def _filter_results_for_files(self, filetypes): + def _filter_results_for_files(self, + filetypes: List[str] + ) -> None: if 'file' in filetypes: results = [] for result in self._results: @@ -189,7 +202,9 @@ def _filter_results_for_files(self, filetypes): self._results = results @staticmethod - def _strip_filters(text, filter_name): + def _strip_filters(text: str, + filter_name: str + ) -> Tuple[str, Optional[List[str]]]: filters = [] start = 0 new_text = '' @@ -201,23 +216,12 @@ def _strip_filters(text, filter_name): new_text += text[start:] return new_text, filters or None - @staticmethod - def _flatten(to_flatten): - nlist = [] - for element in to_flatten: - if isinstance(element, list): - for sub_element in element: - nlist.append(sub_element) - else: - nlist.append(element) - return nlist - - def _add_counter(self): + def _add_counter(self) -> None: results_count = len(self._results) if results_count: self._ui.results_listbox.add(CounterRow(results_count)) - def _add_results(self): + def _add_results(self) -> None: accounts = self._get_accounts() for msg in self._results[:25]: if self._scope == 'everywhere': @@ -231,14 +235,17 @@ def _add_results(self): self._ui.results_listbox.add(result_row) self._results = self._results[25:] - def _on_edge_reached(self, _scrolledwin, pos): + def _on_edge_reached(self, + _scrolledwin: Gtk.ScrolledWindow, + pos: Gtk.PositionType + ) -> None: if pos != Gtk.PositionType.BOTTOM: return self._add_results() @staticmethod - def _get_accounts(): + def _get_accounts() -> Dict[str, str]: accounts = {} for account in app.settings.get_accounts(): account_id = app.storage.archive.get_account_id(account) @@ -246,7 +253,7 @@ def _get_accounts(): return accounts @staticmethod - def _on_row_activated(_listbox, row): + def _on_row_activated(_listbox: Gtk.ListBox, row: Gtk.ListBoxRow) -> None: if row.type == 'counter': return @@ -264,17 +271,17 @@ def _on_row_activated(_listbox, row): if control is not None: control.scroll_to_message(row.log_line_id, row.timestamp) - def set_focus(self): + def set_focus(self) -> None: self._ui.search_entry.grab_focus() - def set_context(self, account, jid): + def set_context(self, account: str, jid: JID) -> None: self._account = account self._jid = jid self._ui.search_checkbutton.set_active(jid is None) class RowHeader(Gtk.Box): - def __init__(self, account, jid, timestamp): + def __init__(self, account: str, jid: JID, timestamp: float) -> None: Gtk.Box.__init__(self) self.set_hexpand(True) @@ -293,11 +300,11 @@ def __init__(self, account, jid, timestamp): class CounterRow(Gtk.ListBoxRow): - def __init__(self, count): + def __init__(self, count: int) -> None: Gtk.ListBoxRow.__init__(self) - self.type = 'counter' - self.jid = '' - self.time = 0 + self.type: str = 'counter' + self.jid = None + self.time: float = 0.0 self.get_style_context().add_class('search-view-counter') if count == 1: @@ -310,7 +317,7 @@ def __init__(self, count): class ResultRow(Gtk.ListBoxRow): - def __init__(self, msg, account, jid): + def __init__(self, msg: namedtuple, account: str, jid: JID) -> None: Gtk.ListBoxRow.__init__(self) self.account = account self.jid = jid @@ -359,7 +366,10 @@ def __init__(self, msg, account, jid): self.show_all() - def _get_avatar(self, kind, name): + def _get_avatar(self, + kind: str, + name: str + ) -> Optional[cairo.ImageSurface]: scale = self.get_scale_factor() if self.contact.is_groupchat: contact = self.contact.get_resource(name) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b12b9b5f7e809cd1fede08759325733… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b12b9b5f7e809cd1fede08759325733… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preview: Load truncated images
by Daniel Brötzmann (＠wurstsalat) 11 Dec '21

11 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b12b9b5f by wurstsalat at 2021-12-11T23:46:13+01:00 Preview: Load truncated images Fixes #10700 - - - - - 1 changed file: - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -34,6 +34,7 @@ from gi.repository import GstPbutils from PIL import Image +from PIL import ImageFile from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.ciphers import Cipher @@ -44,6 +45,8 @@ log = logging.getLogger('gajim.c.preview_helpers') +ImageFile.LOAD_TRUNCATED_IMAGES = True + class Coords(NamedTuple): location: str View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b12b9b5f7e809cd1fede087593257336… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b12b9b5f7e809cd1fede087593257336… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
20
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2021