Commits November 2021

commits@gajim.org

1 participants
101 discussions

[Git][gajim/gajim][mainwindow] Windows Build: Remove obsolete URL Image Preview plugin
by Daniel Brötzmann (＠wurstsalat) 27 Nov '21

27 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 09b4b7e9 by wurstsalat at 2021-11-27T10:49:30+01:00 Windows Build: Remove obsolete URL Image Preview plugin - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -150,10 +150,6 @@ function install_gajim { mkdir "${PACKAGE_DIR}"/gajim/data/plugins 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/plugin_installer.zip - # Install preview plugin - curl -o "${BUILD_ROOT}"/url_image_preview.zip https://ftp.gajim.org/plugins_master_zip/url_image_preview.zip - 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/url_image_preview.zip - # Install omemo plugin curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins_master_zip/omemo.zip 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/omemo.zip View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/09b4b7e9cccc082dd883fea9490bc0fe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/09b4b7e9cccc082dd883fea9490bc0fe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Readme: Update dependencies
by Daniel Brötzmann (＠wurstsalat) 27 Nov '21

27 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6ea1fb71 by wurstsalat at 2021-11-27T01:14:19+01:00 Readme: Update dependencies - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -15,6 +15,7 @@ ### Runtime Requirements - python3-packaging - python3-setuptools - gir1.2-soup-2.4 +- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 gir1.2-gst-plugins-base-1.0, gstreamer1.0-plugins-ugly, gstreamer1.0-libav, and gstreamer1.0-gtk3 for audio and video calls - GLib (>=2.60.0) ### Optional Runtime Requirements @@ -24,7 +25,6 @@ ### Optional Runtime Requirements - gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working -- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 gir1.2-gst-plugins-base-1.0, gstreamer1.0-plugins-ugly, gstreamer1.0-libav, and gstreamer1.0-gtk3 for audio and video calls - gir1.2-gupnpigd-1.0 for better NAT traversing - gir1.2-networkmanager-1.0 for network lose detection - gir1.2-geoclue-2.0 for sharing your location View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ea1fb71f5e23e1b66fb62d08a840d42… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ea1fb71f5e23e1b66fb62d08a840d42… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Dialogs: Typing
by Daniel Brötzmann (＠wurstsalat) 27 Nov '21

27 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6c6146b2 by wurstsalat at 2021-11-27T00:55:34+01:00 Dialogs: Typing - - - - - 5b94336a by wurstsalat at 2021-11-27T01:07:22+01:00 Move CertificateDialog - - - - - 3 changed files: - + gajim/gtk/certificate_dialog.py - gajim/gtk/const.py - gajim/gtk/dialogs.py Changes: ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -0,0 +1,120 @@ +# 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/>. + +from datetime import datetime + +from gi.repository import Gdk +from gi.repository import Gio +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.helpers import convert_gio_to_openssl_cert +from gajim.common.i18n import _ + +from .util import get_builder + + +class CertificateDialog(Gtk.ApplicationWindow): + def __init__(self, + transient_for: Gtk.Window, + account: str, + cert: Gio.TlsCertificate + ) -> None: + Gtk.ApplicationWindow.__init__(self) + self.account = account + self.set_name('CertificateDialog') + self.set_application(app.app) + self.set_show_menubar(False) + self.set_resizable(False) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_title(_('Certificate')) + + self._ui = get_builder('certificate_dialog.ui') + self.add(self._ui.certificate_box) + + self.connect('key-press-event', self._on_key_press) + + self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + + cert = convert_gio_to_openssl_cert(cert) + # Get data for labels and copy button + issuer = cert.get_issuer() + subject = cert.get_subject() + + self._headline = _('Certificate for \n%s') % self.account + self._it_common_name = subject.commonName or '' + self._it_organization = subject.organizationName or '' + self._it_org_unit = subject.organizationalUnitName or '' + it_serial_no = str(cert.get_serial_number()) + it_serial_no_half = int(len(it_serial_no) / 2) + self._it_serial_number = '%s\n%s' % ( + it_serial_no[:it_serial_no_half], + it_serial_no[it_serial_no_half:]) + self._ib_common_name = issuer.commonName or '' + self._ib_organization = issuer.organizationName or '' + self._ib_org_unit = issuer.organizationalUnitName or '' + issued = datetime.strptime(cert.get_notBefore().decode('ascii'), + '%Y%m%d%H%M%SZ') + self._issued = issued.strftime('%c %Z') + expires = datetime.strptime(cert.get_notAfter().decode('ascii'), + '%Y%m%d%H%M%SZ') + self._expires = expires.strftime('%c %Z') + sha1 = cert.digest('sha1').decode('utf-8') + self._sha1 = '%s\n%s' % (sha1[:29], sha1[30:]) + sha256 = cert.digest('sha256').decode('utf-8') + self._sha256 = '%s\n%s\n%s\n%s' % ( + sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) + + # Set labels + self._ui.label_cert_for_account.set_text(self._headline) + self._ui.data_it_common_name.set_text(self._it_common_name) + self._ui.data_it_organization.set_text(self._it_organization) + self._ui.data_it_organizational_unit.set_text(self._it_org_unit) + self._ui.data_it_serial_number.set_text(self._it_serial_number) + self._ui.data_ib_common_name.set_text(self._ib_common_name) + self._ui.data_ib_organization.set_text(self._ib_organization) + self._ui.data_ib_organizational_unit.set_text(self._ib_org_unit) + self._ui.data_issued_on.set_text(self._issued) + self._ui.data_expires_on.set_text(self._expires) + self._ui.data_sha1.set_text(self._sha1) + self._ui.data_sha256.set_text(self._sha256) + + self.set_transient_for(transient_for) + self._ui.connect_signals(self) + self.show_all() + + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def _on_copy_cert_info_button_clicked(self, _widget): + clipboard_text = \ + self._headline + '\n\n' + \ + _('Issued to\n') + \ + _('Common Name (CN): ') + self._it_common_name + '\n' + \ + _('Organization (O): ') + self._it_organization + '\n' + \ + _('Organizational Unit (OU): ') + self._it_org_unit + '\n' + \ + _('Serial Number: ') + self._it_serial_number + '\n\n' + \ + _('Issued by\n') + \ + _('Common Name (CN): ') + self._ib_common_name + '\n' + \ + _('Organization (O): ') + self._ib_organization + '\n' + \ + _('Organizational Unit (OU): ') + self._ib_org_unit + '\n\n' + \ + _('Validity\n') + \ + _('Issued on: ') + self._issued + '\n' + \ + _('Expires on: ') + self._expires + '\n\n' + \ + _('SHA-1:') + '\n' + \ + self._sha1 + '\n' + \ + _('SHA-256:') + '\n' + \ + self._sha256 + '\n' + self._clipboard.set_text(clipboard_text, -1) ===================================== gajim/gtk/const.py ===================================== @@ -129,7 +129,7 @@ def __str__(self): 'SSLErrorDialog': 'gajim.gui.ssl_error_dialog', 'Themes': 'gajim.gui.themes', 'AdvancedConfig': 'gajim.gui.advanced_config', - 'CertificateDialog': 'gajim.gui.dialogs', + 'CertificateDialog': 'gajim.gui.certificate_dialog', 'RemoveAccount': 'gajim.gui.remove_account', 'ChangePassword': 'gajim.gui.change_password', 'PluginsWindow': 'gajim.plugins.gui', ===================================== gajim/gtk/dialogs.py ===================================== @@ -12,18 +12,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 datetime import datetime +from typing import Dict +from typing import List +from typing import Optional + from collections import namedtuple from gi.repository import Gtk -from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import Pango from gajim.common import app from gajim.common.i18n import _ from gajim.common.const import ButtonAction -from gajim.common.helpers import convert_gio_to_openssl_cert from .util import get_builder from .util import get_thumbnail_size @@ -203,100 +204,15 @@ def __init__(self, self.popup() -class CertificateDialog(Gtk.ApplicationWindow): - def __init__(self, transient_for, account, cert): - Gtk.ApplicationWindow.__init__(self) - self.account = account - self.set_name('CertificateDialog') - self.set_application(app.app) - self.set_show_menubar(False) - self.set_resizable(False) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_title(_('Certificate')) - - self._ui = get_builder('certificate_dialog.ui') - self.add(self._ui.certificate_box) - - self.connect('key-press-event', self._on_key_press) - - self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) - - cert = convert_gio_to_openssl_cert(cert) - # Get data for labels and copy button - issuer = cert.get_issuer() - subject = cert.get_subject() - - self._headline = _('Certificate for \n%s') % self.account - self._it_common_name = subject.commonName or '' - self._it_organization = subject.organizationName or '' - self._it_org_unit = subject.organizationalUnitName or '' - it_serial_no = str(cert.get_serial_number()) - it_serial_no_half = int(len(it_serial_no) / 2) - self._it_serial_number = '%s\n%s' % ( - it_serial_no[:it_serial_no_half], - it_serial_no[it_serial_no_half:]) - self._ib_common_name = issuer.commonName or '' - self._ib_organization = issuer.organizationName or '' - self._ib_org_unit = issuer.organizationalUnitName or '' - issued = datetime.strptime(cert.get_notBefore().decode('ascii'), - '%Y%m%d%H%M%SZ') - self._issued = issued.strftime('%c %Z') - expires = datetime.strptime(cert.get_notAfter().decode('ascii'), - '%Y%m%d%H%M%SZ') - self._expires = expires.strftime('%c %Z') - sha1 = cert.digest('sha1').decode('utf-8') - self._sha1 = '%s\n%s' % (sha1[:29], sha1[30:]) - sha256 = cert.digest('sha256').decode('utf-8') - self._sha256 = '%s\n%s\n%s\n%s' % ( - sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) - - # Set labels - self._ui.label_cert_for_account.set_text(self._headline) - self._ui.data_it_common_name.set_text(self._it_common_name) - self._ui.data_it_organization.set_text(self._it_organization) - self._ui.data_it_organizational_unit.set_text(self._it_org_unit) - self._ui.data_it_serial_number.set_text(self._it_serial_number) - self._ui.data_ib_common_name.set_text(self._ib_common_name) - self._ui.data_ib_organization.set_text(self._ib_organization) - self._ui.data_ib_organizational_unit.set_text(self._ib_org_unit) - self._ui.data_issued_on.set_text(self._issued) - self._ui.data_expires_on.set_text(self._expires) - self._ui.data_sha1.set_text(self._sha1) - self._ui.data_sha256.set_text(self._sha256) - - self.set_transient_for(transient_for) - self._ui.connect_signals(self) - self.show_all() - - def _on_key_press(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: - self.destroy() - - def _on_copy_cert_info_button_clicked(self, _widget): - clipboard_text = \ - self._headline + '\n\n' + \ - _('Issued to\n') + \ - _('Common Name (CN): ') + self._it_common_name + '\n' + \ - _('Organization (O): ') + self._it_organization + '\n' + \ - _('Organizational Unit (OU): ') + self._it_org_unit + '\n' + \ - _('Serial Number: ') + self._it_serial_number + '\n\n' + \ - _('Issued by\n') + \ - _('Common Name (CN): ') + self._ib_common_name + '\n' + \ - _('Organization (O): ') + self._ib_organization + '\n' + \ - _('Organizational Unit (OU): ') + self._ib_org_unit + '\n\n' + \ - _('Validity\n') + \ - _('Issued on: ') + self._issued + '\n' + \ - _('Expires on: ') + self._expires + '\n\n' + \ - _('SHA-1:') + '\n' + \ - self._sha1 + '\n' + \ - _('SHA-256:') + '\n' + \ - self._sha256 + '\n' - self._clipboard.set_text(clipboard_text, -1) - - class ConfirmationDialog(Gtk.MessageDialog): - def __init__(self, title, text, sec_text, buttons, - modal=True, transient_for=None): + def __init__(self, + title: str, + text: str, + sec_text: str, + buttons: List[DialogButton], + modal: bool = True, + transient_for: Optional[Gtk.Window] = None + ) -> None: if transient_for is None: transient_for = app.app.get_active_window() Gtk.MessageDialog.__init__(self, @@ -308,7 +224,7 @@ def __init__(self, title, text, sec_text, buttons, self.get_style_context().add_class('confirmation-dialog') - self._buttons = {} + self._buttons: Dict[Gtk.ResponseType, DialogButton] = {} for button in buttons: self._buttons[button.response] = button @@ -323,7 +239,10 @@ def __init__(self, title, text, sec_text, buttons, self.connect('response', self._on_response) - def _on_response(self, _dialog, response): + def _on_response(self, + _dialog: Gtk.MessageDialog, + response: Gtk.ResponseType + ) -> None: if response == Gtk.ResponseType.DELETE_EVENT: # Look if DELETE_EVENT is mapped to another response response = self._buttons.get(response, None) @@ -340,7 +259,7 @@ def _on_response(self, _dialog, response): button.callback(*button.args, **button.kwargs) self.destroy() - def show(self): + def show(self) -> None: self.show_all() @@ -348,8 +267,15 @@ def show(self): class ConfirmationCheckDialog(ConfirmationDialog): - def __init__(self, title, text, sec_text, check_text, - buttons, modal=True, transient_for=None): + def __init__(self, + title: str, + text: str, + sec_text: str, + check_text: str, + buttons: List[DialogButton], + modal: bool = True, + transient_for: Optional[Gtk.Window] = None + ) -> None: ConfirmationDialog.__init__(self, title, text, @@ -371,7 +297,10 @@ def __init__(self, title, text, sec_text, check_text, self.get_content_area().add(self._checkbutton) - def _on_response(self, _dialog, response): + def _on_response(self, + _dialog: Gtk.MessageDialog, + response: Gtk.ResponseType + ) -> None: button = self._buttons.get(response) if button is not None: button.args.insert(0, self._checkbutton.get_active()) @@ -382,8 +311,16 @@ def _on_response(self, _dialog, response): class PastePreviewDialog(ConfirmationCheckDialog): - def __init__(self, title, text, sec_text, check_text, image, - buttons, modal=True, transient_for=None): + def __init__(self, + title: str, + text: str, + sec_text: str, + check_text: str, + image: GdkPixbuf.Pixbuf, + buttons: List[DialogButton], + modal: bool = True, + transient_for: Optional[Gtk.Window] = None + ) -> None: ConfirmationCheckDialog.__init__(self, title, text, @@ -414,8 +351,15 @@ def __init__(self, title, text, sec_text, check_text, image, class InputDialog(ConfirmationDialog): - def __init__(self, title, text, sec_text, buttons, input_str=None, - transient_for=None, modal=True): + def __init__(self, + title: str, + text: str, + sec_text: str, + buttons: List[DialogButton], + input_str: Optional[str] = None, + modal: bool = True, + transient_for: Optional[Gtk.Window] = None, + ) -> None: ConfirmationDialog.__init__(self, title, text, @@ -435,7 +379,10 @@ def __init__(self, title, text, sec_text, buttons, input_str=None, self.get_content_area().add(self._entry) - def _on_response(self, _dialog, response): + def _on_response(self, + _dialog: Gtk.MessageDialog, + response: Gtk.ResponseType + ) -> None: button = self._buttons.get(response) if button is not None: button.args.insert(0, self._entry.get_text()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/770a387d04bd97358bd6b30143f835d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/770a387d04bd97358bd6b30143f835d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] MessageInputTextView: Typing
by Daniel Brötzmann (＠wurstsalat) 26 Nov '21

26 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 770a387d by wurstsalat at 2021-11-27T00:39:03+01:00 MessageInputTextView: Typing - - - - - 1 changed file: - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/message_input.py ===================================== @@ -17,6 +17,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 Optional +from typing import Dict +from typing import List +from typing import Tuple + from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib @@ -27,23 +32,22 @@ from gajim.common import app from gajim.common.regex import LINK_REGEX +from .util import convert_rgba_to_hex from .util import scroll_to_end if app.is_installed('GSPELL'): from gi.repository import Gspell # pylint: disable=ungrouped-imports +UNDO_LIMIT: int = 20 + class MessageInputTextView(Gtk.TextView): """ - Class for the message textview (where user writes new messages) for - chat/groupchat windows + A Gtk.Textview for chat message input """ - UNDO_LIMIT = 20 - def __init__(self): Gtk.TextView.__init__(self) - # set properties self.set_border_width(3) self.set_accepts_tab(True) self.set_editable(True) @@ -57,18 +61,14 @@ def __init__(self): self.drag_dest_unset() - # set undo list - self.undo_list = [] - # needed to know if we undid something - self.undo_pressed = False - - self._last_text = '' + self.undo_list: List[str] = [] + self.undo_pressed: bool = False - self.begin_tags = {} - self.end_tags = {} - self.color_tags = [] - self.fonts_tags = [] - self.other_tags = {} + 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') @@ -80,8 +80,8 @@ def __init__(self): 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) + self.other_tags['underline'].set_property( + 'underline', Pango.Underline.SINGLE) underline = '' self.begin_tags['underline'] = underline self.end_tags['underline'] = '' @@ -120,10 +120,10 @@ def _on_focus_out(self, _widget, _event): self.toggle_speller(False) return False - def insert_text(self, text): + def insert_text(self, text: str) -> None: self.get_buffer().insert_at_cursor(text) - def insert_newline(self): + def insert_newline(self) -> None: buffer_ = self.get_buffer() buffer_.insert_at_cursor('\n') mark = buffer_.get_insert() @@ -131,19 +131,19 @@ def insert_newline(self): if buffer_.get_end_iter().equal(iter_): GLib.idle_add(scroll_to_end, self.get_parent()) - def has_text(self): + def has_text(self) -> bool: buf = self.get_buffer() start, end = buf.get_bounds() text = buf.get_text(start, end, True) return text != '' - def get_text(self): + def get_text(self) -> str: buf = self.get_buffer() start, end = buf.get_bounds() text = self.get_buffer().get_text(start, end, True) return text - def toggle_speller(self, activate): + def toggle_speller(self, activate: bool) -> None: if app.is_installed('GSPELL') and app.settings.get('use_speller'): spell_view = Gspell.TextView.get_from_gtk_text_view(self) spell_view.set_inline_spell_checking(activate) @@ -156,7 +156,7 @@ def _after_paste_clipboard(textview): 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): + def make_clickable_urls(self, text: str) -> str: _buffer = self.get_buffer() start = 0 @@ -173,24 +173,22 @@ def make_clickable_urls(self, text): else: text_before_special_text = '' # we insert normal text - new_text += text_before_special_text + \ - '<a href="'+ url +'">' + url + '</a>' - - index = end # update index + 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 + return new_text # the position after *last* special text - def get_active_tags(self): + 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): + 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 @@ -199,7 +197,7 @@ def get_active_iters(self): start, finish = _buffer.get_bounds() return (start, finish) - def set_tag(self, tag): + 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]): @@ -211,7 +209,7 @@ def set_tag(self, tag): _buffer.remove_tag_by_name('underline', start, finish) _buffer.apply_tag_by_name(tag, start, finish) - def clear_tags(self): + def clear_tags(self) -> None: _buffer = self.get_buffer() start, finish = self.get_active_iters() _buffer.remove_all_tags(start, finish) @@ -224,16 +222,13 @@ def color_set(self, widget, response): color = widget.get_property('rgba') widget.destroy() _buffer = self.get_buffer() - # Create #aabbcc color string from rgba color - color_string = '#%02X%02X%02X' % (round(color.red*255), - round(color.green*255), - round(color.blue*255)) + 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 = '' % color_string + begin = f'' self.begin_tags[tag_name] = begin self.end_tags[tag_name] = '' self.color_tags.append(tag_name) @@ -265,10 +260,9 @@ def font_set(self, widget, response, start, finish): tag_name = 'font' + font if not tag_name in self.fonts_tags: tag_font = _buffer.create_tag(tag_name) - tag_font.set_property('font', family + ' ' + str(size)) - self.begin_tags[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) @@ -287,7 +281,7 @@ def font_set(self, widget, response, start, finish): else: _buffer.remove_tag_by_name('italic', start, finish) - def get_xhtml(self): + def get_xhtml(self) -> Optional[str]: _buffer = self.get_buffer() old = _buffer.get_start_iter() tags = {} @@ -353,11 +347,11 @@ def xhtml_special(text): text += self.end_tags[tag_name] if modified: - wrapped_text = '%s' % self.make_clickable_urls(text) + wrapped_text = f'{self.make_clickable_urls(text)}' return build_xhtml_body(wrapped_text) return None - def replace_emojis(self): + def replace_emojis(self) -> None: theme = app.settings.get('emoticons_theme') if not theme or theme == 'font': return @@ -403,7 +397,7 @@ def insert_emoji(self, codepoint, pixbuf): self.add_child_at_anchor(image, anchor) buffer_.insert_at_cursor(' ') - def clear(self, _widget=None): + def clear(self, *args): """ Clear text in the textview """ @@ -411,13 +405,13 @@ def clear(self, _widget=None): start, end = _buffer.get_bounds() _buffer.delete(start, end) - def save_undo(self, text): + def save_undo(self, text: str) -> None: self.undo_list.append(text) - if len(self.undo_list) > self.UNDO_LIMIT: + if len(self.undo_list) > UNDO_LIMIT: del self.undo_list[0] self.undo_pressed = False - def undo(self, _widget=None): + def undo(self, *args): """ Undo text in the textview """ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/770a387d04bd97358bd6b30143f835dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/770a387d04bd97358bd6b30143f835dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Base: Remove type checking for Gspell for now
by Daniel Brötzmann (＠wurstsalat) 26 Nov '21

26 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9c82c440 by wurstsalat at 2021-11-27T00:10:21+01:00 Base: Remove type checking for Gspell for now - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -664,7 +664,7 @@ def set_speller(self) -> None: spell_checker.connect('notify::language', self.on_language_changed) - def get_speller_language(self) -> Optional[Gspell.Language]: + def get_speller_language(self): lang = self.contact.settings.get('speller_language') if not lang: # use the default one View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c82c44073fcf1de74324ed344839419… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c82c44073fcf1de74324ed344839419… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Uninstaller: Wait for user to quit Gajim
by Daniel Brötzmann (＠wurstsalat) 26 Nov '21

26 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6578e504 by wurstsalat at 2021-11-26T17:29:39+01:00 Uninstaller: Wait for user to quit Gajim - - - - - 1 changed file: - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim.nsi ===================================== @@ -70,8 +70,7 @@ LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "Creates a shortcut for Gajim on LangString DESC_SecAutostart ${LANG_ENGLISH} "Starts Gajim automatically when starting Windows." LangString DESC_SecURI ${LANG_ENGLISH} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed. Uninstall it?" -LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\n\ - Please quit Gajim and restart the uninstaller." +LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\nPlease quit Gajim and retry." ; French LangString NAME_Emoticons ${LANG_FRENCH} "Emoticônes" @@ -87,8 +86,7 @@ LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pou LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." LangString DESC_SecURI ${LANG_FRENCH} "Permet à Gajim d’ouvrir les liens xmpp (par exemple le lien vers un salon sur un site web)." LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" -LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\n\ - Fermez-le et redémarrez le désinstallateur." +LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\nPlease quit Gajim and retry." ; German LangString NAME_Emoticons ${LANG_GERMAN} "Emojis" @@ -104,8 +102,7 @@ LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Erstellt ein Icon für Gajim auf LangString DESC_SecAutostart ${LANG_GERMAN} "Startet Gajim automatisch zusammen mit Windows." LangString DESC_SecURI ${LANG_GERMAN} "Ermöglicht Gajim das Öffnen von xmpp-Links (z.B. verlinkter Gruppenchat auf einer Website)." LangString STR_Installed ${LANG_GERMAN} "Gajim ist anscheinend bereits installiert. Wollen Sie Gajim deinstallieren?" -LangString STR_Running ${LANG_GERMAN} "Gajim läuft zurzeit.$\n\ - Bitte beenden Sie Gajim und starten Sie das Setup erneut." +LangString STR_Running ${LANG_GERMAN} "Gajim läuft zurzeit.$\nBitte beenden Sie Gajim und versuchen es erneut." ; Italian LangString NAME_Emoticons ${LANG_ITALIAN} "Emoticons" @@ -121,8 +118,7 @@ LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." LangString DESC_SecURI ${LANG_ITALIAN} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" -LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\n\ - Close it and restart uninstaller." +LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\nPlease quit Gajim and retry." ; Russian LangString NAME_Emoticons ${LANG_RUSSIAN} "Смайлики" @@ -138,8 +134,7 @@ LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Если отмечено, на LangString DESC_SecAutostart ${LANG_RUSSIAN} "Если отмечено, Gajim будет автоматически запускаться при загрузке Windows." LangString DESC_SecURI ${LANG_RUSSIAN} "Позволяет Gajim открывать xmpp-ссылки, например, адреса конференций на веб-странице." LangString STR_Installed ${LANG_RUSSIAN} "Похоже, Gajim уже установлен. Деинсталлировать установленную версию?" -LangString STR_Running ${LANG_RUSSIAN} "Похоже, Gajim уже запущен.$\n\ - Закройте его и запустите деинсталлятор снова." +LangString STR_Running ${LANG_RUSSIAN} "Похоже, Gajim уже запущен.$\nPlease quit Gajim and retry." ; Hebrew LangString NAME_Emoticons ${LANG_HEBREW} "רגשונים" @@ -155,8 +150,7 @@ LangString DESC_SecDesktopIcon ${LANG_HEBREW} "במידה ונקבעת, קיצו LangString DESC_SecAutostart ${LANG_HEBREW} "במידה ונקבעת, Gajim יופעל אוטומטית כאשר Windows מתחיל." LangString DESC_SecURI ${LANG_HEBREW} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." LangString STR_Installed ${LANG_HEBREW} "כפי הנראה, Gajim כבר מותקן. להסיר אותו?" -LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצת כעת.$\n\ - אנא צא מן Gajim ואתחל את מסיר ההתקנה." +LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצת כעת.$\nPlease quit Gajim and retry." Section "Gajim" SecGajim SectionIn RO @@ -244,10 +238,18 @@ SectionEnd Function un.onInit ; Check that Gajim is not running before uninstalling FindWindow $0 "gdkWindowToplevel" "Gajim" - StrCmp $0 0 Remove - MessageBox MB_ICONSTOP|MB_OK $(STR_Running) - Quit -Remove: + StrCmp $0 0 StartUninstall + IfSilent ForceQuitGajim + MessageBox MB_ICONEXCLAMATION|MB_RETRYCANCEL $(STR_Running) IDCANCEL Cancel IDRETRY -3 + +Cancel: + Abort + +ForceQuitGajim: + ExecWait "TaskKill /IM gajim.exe /F" + !insertmacro MUI_UNGETLANGUAGE + +StartUninstall: !insertmacro MUI_UNGETLANGUAGE FunctionEnd @@ -291,5 +293,5 @@ Quit: Quit ReallyNotInstalled: - !insertmacro MUI_LANGDLL_DISPLAY + !insertmacro MUI_LANGDLL_DISPLAY ; Open the language selection window FunctionEnd View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6578e50485eb6d946441e68118c99622… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6578e50485eb6d946441e68118c99622… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Windows build: Add gstreamer deps
by Daniel Brötzmann (＠wurstsalat) 26 Nov '21

26 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 52f6fa94 by wurstsalat at 2021-11-26T13:15:02+01:00 Windows build: Add gstreamer deps - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -79,6 +79,10 @@ function install_deps { build_pacman --noconfirm -S mingw-w64-"${ARCH}"-python \ mingw-w64-"${ARCH}"-python-gobject \ mingw-w64-"${ARCH}"-gtksourceview4 \ + mingw-w64-"${ARCH}"-gstreamer \ + mingw-w64-"${ARCH}"-gst-plugins-base \ + mingw-w64-"${ARCH}"-gst-libav \ + mingw-w64-"${ARCH}"-gst-python \ mingw-w64-"${ARCH}"-python-pip \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ mingw-w64-"${ARCH}"-libwebp \ @@ -221,13 +225,12 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/share/gdb rm -Rf "${MINGW_ROOT}"/share/libcaca rm -Rf "${MINGW_ROOT}"/share/gettext - rm -Rf "${MINGW_ROOT}"/share/gst-plugins-base rm -Rf "${MINGW_ROOT}"/share/gtk-3.0 rm -Rf "${MINGW_ROOT}"/share/nghttp2 rm -Rf "${MINGW_ROOT}"/share/fontconfig rm -Rf "${MINGW_ROOT}"/share/gettext-* - rm -Rf "${MINGW_ROOT}"/share/gstreamer-1.0 rm -Rf "${MINGW_ROOT}"/share/terminfo + rm -Rf "${MINGW_ROOT}"/share/OGRE find "${MINGW_ROOT}"/share/glib-2.0 -type f ! \ -name "*.compiled" -exec rm -f {} \; @@ -251,12 +254,8 @@ function cleanup_install { rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstdvdread.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstopenal.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstopenexr.dll - rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstopenh264.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstresindvd.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstassrender.dll - rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstx265.dll - rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstwebp.dll - rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstopengl.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstmxf.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstfaac.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstschro.dll View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52f6fa940e794ca55548fcaa67c2799a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52f6fa940e794ca55548fcaa67c2799a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] BaseControl: Remove obsolete method
by Daniel Brötzmann (＠wurstsalat) 25 Nov '21

25 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 80e6f63f by wurstsalat at 2021-11-25T23:31:36+01:00 BaseControl: Remove obsolete method - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1320,12 +1320,6 @@ def _style_changed(self, *args): def update_text_tags(self): self.conversation_view.update_text_tags() - @staticmethod - def clear(tv): - buffer_ = tv.get_buffer() - start, end = buffer_.get_bounds() - buffer_.delete(start, end) - def set_control_active(self, state: bool) -> None: if state: self.set_emoticon_popover() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80e6f63fa22c0fbe89d1ad5b920b2ba0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80e6f63fa22c0fbe89d1ad5b920b2ba0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 5 commits: Use Direction Enum for selection next chat
by Daniel Brötzmann (＠wurstsalat) 25 Nov '21

25 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 97a5b223 by wurstsalat at 2021-11-25T21:00:17+01:00 Use Direction Enum for selection next chat - - - - - 6282556e by wurstsalat at 2021-11-25T23:27:48+01:00 BaseControl: Typing - - - - - cf5bf121 by wurstsalat at 2021-11-25T23:28:01+01:00 ChatControl: Typing - - - - - d7d25700 by wurstsalat at 2021-11-25T23:28:19+01:00 PrivateChatControl: Typring - - - - - 0615dbff by wurstsalat at 2021-11-25T23:28:45+01:00 GroupchatControl: Typing - - - - - 7 changed files: - gajim/common/const.py - gajim/gtk/chat_list.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/controls/private.py - gajim/gtk/main.py Changes: ===================================== gajim/common/const.py ===================================== @@ -186,6 +186,11 @@ class Trust(IntEnum): VERIFIED = 3 +class Direction(IntEnum): + NEXT = 0 + PREV = 1 + + class Display(Enum): X11 = 'X11Display' WAYLAND = 'GdkWaylandDisplay' ===================================== gajim/gtk/chat_list.py ===================================== @@ -30,6 +30,7 @@ from gajim.common import app from gajim.common import ged from gajim.common.const import AvatarSize +from gajim.common.const import Direction from gajim.common.const import KindConstant from gajim.common.const import RowHeaderType from gajim.common.i18n import _ @@ -224,10 +225,9 @@ def select_chat(self, account: str, jid: JID) -> None: row = self._chats[(account, jid)] self.select_row(row) - def select_next_chat(self, forwards: bool, + def select_next_chat(self, direction: Direction, unread_first: bool = False) -> None: # Selects the next chat, but prioritizes chats with unread messages. - # Direction is forwards (True) or backwards (False) row = self.get_selected_chat() if row is None: row = self.get_row_at_index(0) @@ -243,7 +243,7 @@ def select_next_chat(self, forwards: bool, # Loop until finding a chat with unread count or completing a cycle while True: - if forwards: + if direction == Direction.NEXT: index += 1 if index >= len(self.get_children()): index = 0 @@ -266,12 +266,12 @@ def select_next_chat(self, forwards: bool, return index = row.get_index() - if forwards: + if direction == Direction.NEXT: next_row = self.get_row_at_index(index + 1) else: next_row = self.get_row_at_index(index - 1) if next_row is None: - if forwards: + if direction == Direction.NEXT: next_row = self.get_row_at_index(0) else: last = len(self.get_children()) - 1 ===================================== gajim/gtk/controls/base.py ===================================== @@ -23,6 +23,9 @@ # 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 os @@ -31,13 +34,16 @@ import uuid import tempfile -from nbxmpp.const import Chatstate - from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import Gio +from nbxmpp import JID +from nbxmpp.const import Chatstate +from nbxmpp.modules.security_labels import Displaymarking + from gajim.common import app from gajim.common import helpers from gajim.common import ged @@ -48,6 +54,7 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_retraction_text from gajim.common.const import KindConstant +from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import guess_simple_file_type from gajim.common.structs import OutgoingMessage @@ -103,13 +110,13 @@ class BaseControl(ChatCommandProcessor, CommandTools, EventHelper): _type = None # type: ControlType - def __init__(self, widget_name, account, jid): + def __init__(self, widget_name: str, account: str, jid: JID) -> None: EventHelper.__init__(self) # Undo needs this variable to know if space has been pressed. # Initialize it to True so empty textview is saved in undo list - self.space_pressed = True + self.space_pressed: bool = True - self.handlers = {} + self.handlers: Dict[str, Any] = {} self.account = account @@ -122,7 +129,7 @@ def __init__(self, widget_name, account, jid): # control_id is a unique id for the control, # its used as action name for actions that belong to a control - self.control_id = str(uuid.uuid4()) + self.control_id: str = str(uuid.uuid4()) self.session = None self.xml = get_builder(f'{widget_name}.ui') @@ -131,8 +138,8 @@ def __init__(self, widget_name, account, jid): self._account_badge = AccountBadge(self.account) self.xml.account_badge_box.add(self._account_badge) - show = len(app.settings.get_active_accounts()) > 1 - self.xml.account_badge_box.set_visible(show) + show_account_badge = len(app.settings.get_active_accounts()) > 1 + self.xml.account_badge_box.set_visible(show_account_badge) # Drag and drop self.xml.overlay.add_overlay(self.xml.drop_area) @@ -214,30 +221,32 @@ def __init__(self, widget_name, account, jid): self.xml.hbox.pack_start(self.msg_scrolledwindow, True, True, 0) # the following vars are used to keep history of user's messages - self.sent_history = [] - self.sent_history_pos = 0 - self.received_history = [] - self.received_history_pos = 0 - self.orig_msg = None + self.sent_history: List[str] = [] + self.sent_history_pos: int = 0 + self.received_history: List[str] = [] + self.received_history_pos: int = 0 + self.orig_msg: Optional[str] = None - # For XEP-0333 - self.last_msg_id = None + # XEP-0333 Chat Markers + self.last_msg_id: Optional[str] = None - self.correcting = False - self.last_sent_msg = None + # XEP-0308 Message Correction + self.correcting: bool = False + self.last_sent_msg: Optional[str] = None self.set_emoticon_popover() # Attach speller self.set_speller() - # For XEP-0172 + # XEP-0172 User Nickname + # TODO: self.user_nick = None - self.command_hits = [] - self.last_key_tabs = False + self.command_hits: List[str] = [] + self.last_key_tabs: bool = False - self.sendmessage = True + self.sendmessage: bool = True self._client.get_module('Chatstate').set_active(self.contact) @@ -263,11 +272,17 @@ def __init__(self, widget_name, account, jid): def _connect_contact_signals(self): raise NotImplementedError - def _process_jingle_av_event(self): + def _process_jingle_av_event(self, *args): raise NotImplementedError - def _get_action(self, name): - return app.window.lookup_action(name + self.control_id) + def get_our_nick(self): + raise NotImplementedError + + def room_name(self): + raise NotImplementedError + + def _get_action(self, name: str) -> Gio.Action: + return app.window.lookup_action(f'{name}{self.control_id}') def process_event(self, event): if event.account != self.account: @@ -341,22 +356,22 @@ def _on_conversation_view_key_press(self, _listbox, event): return Gdk.EVENT_STOP @property - def type(self): + def type(self) -> ControlType: return self._type @property - def is_chat(self): + def is_chat(self) -> bool: return self._type.is_chat @property - def is_privatechat(self): + def is_privatechat(self) -> bool: return self._type.is_privatechat @property - def is_groupchat(self): + def is_groupchat(self) -> bool: return self._type.is_groupchat - def safe_shutdown(self): + def safe_shutdown(self) -> bool: """ Called to check if control can be closed without losing data. returns True if control can be closed safely else False @@ -378,7 +393,7 @@ def allow_shutdown(self, method, on_response_yes, on_response_no): def focus(self): raise NotImplementedError - def draw_banner(self): + def draw_banner(self) -> None: """ Draw the fat line at the top of the window that houses the icon, jid, etc @@ -387,7 +402,7 @@ def draw_banner(self): """ self.draw_banner_text() - def update_toolbar(self): + def update_toolbar(self) -> None: """ update state of buttons in toolbar """ @@ -395,18 +410,18 @@ def update_toolbar(self): app.plugin_manager.gui_extension_point( 'chat_control_base_update_toolbar', self) - def draw_banner_text(self): + def draw_banner_text(self) -> None: """ Derived types SHOULD implement this """ - def update_ui(self): + def update_ui(self) -> None: """ Derived types SHOULD implement this """ self.draw_banner() - def repaint_themed_widgets(self): + def repaint_themed_widgets(self) -> None: """ Derived types MAY implement this """ @@ -453,7 +468,7 @@ def remove_session(self, session): def _nec_ping(self, obj): raise NotImplementedError - def setup_seclabel(self): + def setup_seclabel(self) -> None: self.xml.label_selector.hide() self.xml.label_selector.set_no_show_all(True) lb = Gtk.ListStore(str) @@ -502,7 +517,7 @@ def delegate_action(self, action): return Gdk.EVENT_STOP if action == 'delete-line': - self.clear(self.msg_textview) + self.msg_textview.clear() return Gdk.EVENT_STOP if action == 'show-emoji-chooser': @@ -514,7 +529,7 @@ def delegate_action(self, action): return Gdk.EVENT_PROPAGATE - def add_actions(self): + def add_actions(self) -> None: action = Gio.SimpleAction.new_stateful( f'set-encryption-{self.control_id}', GLib.VariantType.new('s'), @@ -535,7 +550,7 @@ def add_actions(self): action.set_enabled(False) app.window.add_action(action) - def remove_actions(self): + def remove_actions(self) -> None: actions = [ 'send-message-', 'set-encryption-', @@ -547,7 +562,7 @@ def remove_actions(self): for action in actions: app.window.remove_action(f'{action}{self.control_id}') - def mark_as_read(self, send_marker=True): + def mark_as_read(self, send_marker: bool = True) -> None: self._jump_to_end_button.reset_unread_count() if send_marker: @@ -576,7 +591,7 @@ def change_encryption(self, action, param): self.set_encryption_menu_icon() self.set_lock_image() - def set_lock_image(self): + def set_lock_image(self) -> None: encryption_state = {'visible': self.encryption is not None, 'enc_type': self.encryption, 'authenticated': False} @@ -621,7 +636,7 @@ def get_encryption_state(self): return None return state - def set_encryption_menu_icon(self): + def set_encryption_menu_icon(self) -> None: image = self.xml.encryption_menu.get_image() if image is None: image = Gtk.Image() @@ -633,7 +648,7 @@ def set_encryption_menu_icon(self): image.set_from_icon_name('channel-secure-symbolic', Gtk.IconSize.MENU) - def set_speller(self): + def set_speller(self) -> None: if (not app.is_installed('GSPELL') or not app.settings.get('use_speller')): return @@ -649,7 +664,7 @@ def set_speller(self): spell_checker.connect('notify::language', self.on_language_changed) - def get_speller_language(self): + def get_speller_language(self) -> Optional[Gspell.Language]: lang = self.contact.settings.get('speller_language') if not lang: # use the default one @@ -665,7 +680,7 @@ def on_language_changed(self, checker, _param): gspell_lang = checker.get_language() self.contact.settings.set('speller_language', gspell_lang.get_code()) - def shutdown(self): + def shutdown(self) -> None: # remove_gui_extension_point() is called on shutdown, but also when # a plugin is getting disabled. Plugins don’t know the difference. # Plugins might want to remove their widgets on @@ -763,17 +778,24 @@ def _on_message_textview_paste_event(self, _texview): callback=self._paste_event_confirmed, args=[image])]).show() - def _paste_event_confirmed(self, is_checked, image): + def _paste_event_confirmed(self, + is_checked: bool, + image: Optional[GdkPixbuf.Pixbuf] + ) -> None: if is_checked: app.settings.set('confirm_paste_image', False) dir_ = tempfile.gettempdir() path = os.path.join(dir_, f'{uuid.uuid4()}.png') + if image is None: + self.add_info_message(_('Error: Could not process image')) + return + image.savev(path, 'png', [], []) self._start_filetransfer(path) - def _get_pref_ft_method(self): + def _get_pref_ft_method(self) -> Optional[str]: ft_pref = app.settings.get_account_setting(self.account, 'filetransfer_preference') httpupload = app.window.lookup_action( @@ -1006,12 +1028,13 @@ def _on_send_message(self, *args): self.send_message(message, xhtml=xhtml) def send_message(self, - message, - type_='chat', - resource=None, - xhtml=None, - process_commands=True, - attention=False): + message: str, + type_: str = 'chat', + resource: Optional[str] = None, + xhtml: Optional[str] = None, + process_commands: bool = True, + attention: bool = False + ) -> None: """ Send the given message to the active tab. Doesn't return None if error """ @@ -1023,6 +1046,7 @@ def send_message(self, label = self.get_seclabel() + correct_id: Optional[str] = None if self.correcting and self.last_sent_msg: correct_id = self.last_sent_msg else: @@ -1073,7 +1097,7 @@ def _on_message_tv_buffer_changed(self, textbuffer): self._client.get_module('Chatstate').set_chatstate( self.contact, Chatstate.COMPOSING) - def save_message(self, message, msg_type): + def save_message(self, message: str, msg_type: str) -> None: # save the message, so user can scroll though the list with key up/down if msg_type == 'sent': history = self.sent_history @@ -1099,10 +1123,10 @@ def save_message(self, message, msg_type): else: self.received_history_pos = pos - def add_info_message(self, text): + def add_info_message(self, text: str) -> None: self.conversation_view.add_info_message(text) - def add_file_transfer(self, transfer): + def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: self.conversation_view.add_file_transfer(transfer) def add_jingle_file_transfer(self, event): @@ -1118,16 +1142,17 @@ def add_call_message(self, event): self.conversation_view.add_call_message(event=event) def add_message(self, - text, - kind, - name, - tim, - notify, - displaymarking=None, - msg_log_id=None, - message_id=None, - stanza_id=None, - additional_data=None): + text: str, + kind: str, + name: str, + tim: float, + notify: bool, + displaymarking: Optional[Displaymarking] = None, + msg_log_id: Optional[str] = None, + message_id: Optional[str] = None, + stanza_id: Optional[str] =None, + additional_data: Optional[AdditionalDataDict] = None + ) -> None: if additional_data is None: additional_data = AdditionalDataDict() @@ -1174,8 +1199,12 @@ def add_message(self, if chat_active and self._scrolled_view.get_autoscroll(): app.window.mark_as_read(self.account, self.contact.jid) - def _notify(self, name: str, text: str, tim: Optional[int], - additional_data: AdditionalDataDict) -> None: + def _notify(self, + name: str, + text: str, + tim: Optional[float], + additional_data: AdditionalDataDict + ) -> None: if app.window.is_chat_active(self.account, self.contact.jid): if self._scrolled_view.get_autoscroll(): return @@ -1192,6 +1221,7 @@ def _notify(self, name: str, text: str, tim: Optional[int], _icon, file_type = guess_simple_file_type(text) text = f'{file_type} ({file_name})' + sound: Optional[str] = None if self.is_chat: msg_type = 'chat-message' sound = 'first_message_received' @@ -1205,6 +1235,7 @@ def _notify(self, name: str, text: str, tim: Optional[int], sound = 'muc_message_highlight' else: sound = 'muc_message_received' + if not self.contact.can_notify(): sound = None @@ -1234,7 +1265,7 @@ def _notify(self, name: str, text: str, tim: Optional[int], text=text, sound=sound)) - def toggle_emoticons(self): + def toggle_emoticons(self) -> None: """ Hide show emoticons_button """ @@ -1245,7 +1276,7 @@ def toggle_emoticons(self): self.xml.emoticons_button.set_no_show_all(True) self.xml.emoticons_button.hide() - def set_emoticon_popover(self): + def set_emoticon_popover(self) -> None: if not app.settings.get('emoticons_theme'): return @@ -1295,7 +1326,7 @@ def clear(tv): start, end = buffer_.get_bounds() buffer_.delete(start, end) - def set_control_active(self, state): + def set_control_active(self, state: bool) -> None: if state: self.set_emoticon_popover() @@ -1309,19 +1340,19 @@ def set_control_active(self, state): self._client.get_module('Chatstate').set_chatstate( self.contact, Chatstate.INACTIVE) - def reset_view(self): + def reset_view(self) -> None: self.conversation_view.clear() - def get_autoscroll(self): + def get_autoscroll(self) -> bool: return self._scrolled_view.get_autoscroll() - def scroll_to_end(self, force=False): + def scroll_to_end(self, force: bool = False) -> None: # Clear view and reload conversation self.conversation_view.clear() self._scrolled_view.reset() self.conversation_view.scroll_to_end(force) - def scroll_to_message(self, log_line_id, timestamp): + def scroll_to_message(self, log_line_id: str, timestamp: float) -> None: row = self.conversation_view.get_row_by_log_line_id(log_line_id) if row is None: # Clear view and reload conversation around timestamp @@ -1338,7 +1369,11 @@ def scroll_to_message(self, log_line_id, timestamp): log_line_id) GLib.idle_add(self.conversation_view.unlock) - def fetch_n_lines_history(self, _scrolled, before, n_lines): + def fetch_n_lines_history(self, + _scrolled: Gtk.ScrolledWindow, + before: bool, + n_lines: int + ) -> None: if self.conversation_view.locked: return @@ -1436,13 +1471,17 @@ def add_messages(self, messages): marker=msg.marker, error=msg.error) - def has_focus(self): + def has_focus(self) -> bool: if app.window.get_property('has-toplevel-focus'): if self == app.window.get_active_control(): return True return False - def scroll_messages(self, direction, msg_buf, msg_type): + def scroll_messages(self, + direction: str, + msg_buf: Gtk.TextBuffer, + msg_type: str, + ) -> None: if msg_type == 'sent': history = self.sent_history pos = self.sent_history_pos @@ -1490,7 +1529,7 @@ def scroll_messages(self, direction, msg_buf, msg_type): message = '> %s\n' % message.replace('\n', '\n> ') msg_buf.set_text(message) - def update_account_badge(self): + def update_account_badge(self) -> None: show = len(app.settings.get_active_accounts()) > 1 self.xml.account_badge_box.set_visible(show) ===================================== gajim/gtk/controls/chat.py ===================================== @@ -25,6 +25,7 @@ from typing import ClassVar # pylint: disable=unused-import from typing import Type # pylint: disable=unused-import +from typing import Optional import time import logging @@ -34,8 +35,10 @@ from gi.repository import GLib from gi.repository import Gdk -from nbxmpp.namespaces import Namespace +from nbxmpp import JID from nbxmpp.const import Chatstate +from nbxmpp.modules.security_labels import Displaymarking +from nbxmpp.namespaces import Namespace from gajim.common import app from gajim.common import helpers @@ -80,14 +83,17 @@ class ChatControl(BaseControl): # processed with this command host. COMMAND_HOST = ChatCommands # type: ClassVar[Type[CommandHost]] - def __init__(self, account, jid): + def __init__(self, account: str, jid: JID) -> None: BaseControl.__init__(self, 'chat_control', account, jid) - self.last_recv_message_id = None - self.last_recv_message_marks = None + self.sendmessage: bool = True + + # XEP-0308 Message Correction + self.correcting: bool = False + self.last_sent_msg: Optional[str] = None self.toggle_emoticons() @@ -147,7 +153,7 @@ def __init__(self, account, jid): app.plugin_manager.gui_extension_point('chat_control', self) self.update_actions() - def _connect_contact_signals(self): + def _connect_contact_signals(self) -> None: self.contact.multi_connect({ 'presence-update': self._on_presence_update, 'chatstate-update': self._on_chatstate_update, @@ -157,10 +163,10 @@ def _connect_contact_signals(self): }) @property - def jid(self): + def jid(self) -> JID: return self.contact.jid - def add_actions(self): + def add_actions(self) -> None: super().add_actions() actions = [ ('invite-contacts-', self._on_invite_contacts), @@ -194,7 +200,7 @@ def add_actions(self): act.connect('change-state', self._on_send_marker) app.window.add_action(act) - def update_actions(self): + def update_actions(self) -> None: online = app.account_is_connected(self.account) if self.type.is_chat: @@ -254,7 +260,7 @@ def update_actions(self): # Information self._get_action('information-').set_enabled(online) - def remove_actions(self): + def remove_actions(self) -> None: super().remove_actions() actions = [ 'invite-contacts-', @@ -268,7 +274,7 @@ def remove_actions(self): for action in actions: app.window.remove_action(f'{action}{self.control_id}') - def focus(self): + def focus(self) -> None: self.msg_textview.grab_focus() def delegate_action(self, action): @@ -307,7 +313,7 @@ def _on_send_marker(self, action, param): action.set_state(param) self.contact.settings.set('send_marker', param.get_boolean()) - def _update_toolbar(self): + def _update_toolbar(self) -> None: # Formatting # TODO: find out what encryption allows for xhtml and which not if self.contact.supports(Namespace.XHTML_IM): @@ -319,13 +325,13 @@ def _update_toolbar(self): self.xml.formattings_button.set_tooltip_text( _('This contact does not support HTML')) - def update_all_pep_types(self): + def update_all_pep_types(self) -> None: self._update_pep(PEPEventType.LOCATION) self._update_pep(PEPEventType.MOOD) self._update_pep(PEPEventType.ACTIVITY) self._update_pep(PEPEventType.TUNE) - def _update_pep(self, type_): + def _update_pep(self, type_: PEPEventType) -> None: return # TODO image = self._get_pep_widget(type_) @@ -351,7 +357,7 @@ def _update_pep(self, type_): image.set_tooltip_markup(formated_text) image.show() - def _get_pep_widget(self, type_): + def _get_pep_widget(self, type_: PEPEventType) -> Optional[Gtk.Image]: if type_ == PEPEventType.MOOD: return self.xml.mood_image if type_ == PEPEventType.ACTIVITY: @@ -488,7 +494,7 @@ def _nec_ping(self, event): self.add_info_message(event.error) # Jingle AV calls - def _on_start_call(self): + def _on_start_call(self) -> None: self._call_widget.start_call() def _process_jingle_av_event(self, event): @@ -527,14 +533,14 @@ def on_location_eventbox_enter_notify_event(self, _widget, _event): cursor = get_cursor('pointer') app.window.get_window().set_cursor(cursor) - def update_ui(self): + def update_ui(self) -> None: # The name banner is drawn here BaseControl.update_ui(self) self.update_toolbar() self._update_avatar() self.update_actions() - def draw_banner_text(self): + def draw_banner_text(self) -> None: """ Draws the chat banner's text (e.g. name, chat state) in the top of the chat window @@ -572,10 +578,11 @@ def draw_banner_text(self): self.xml.banner_name_label.set_tooltip_text(label_tooltip) def send_message(self, - message, - xhtml=None, - process_commands=True, - attention=False): + message: str, + xhtml: Optional[str] = None, + process_commands: bool = True, + attention: bool = False + ) -> None: """ Send a message to contact """ @@ -598,19 +605,20 @@ def send_message(self, process_commands=process_commands, attention=attention) - def get_our_nick(self): + def get_our_nick(self) -> str: return app.nicks[self.account] def add_message(self, - text, - kind, - tim=None, - displaymarking=None, - msg_log_id=None, - stanza_id=None, - message_id=None, - additional_data=None, - notify=True): + text: str, + kind: str, + tim: Optional[float] = None, + displaymarking: Optional[Displaymarking] = None, + msg_log_id: Optional[str] = None, + stanza_id: Optional[str] = None, + message_id: Optional[str] = None, + additional_data: Optional[AdditionalDataDict] = None, + notify: bool = True + ) -> None: if additional_data is None: additional_data = AdditionalDataDict() @@ -632,7 +640,7 @@ def add_message(self, stanza_id=stanza_id, additional_data=additional_data) - def shutdown(self): + def shutdown(self) -> None: # PluginSystem: removing GUI extension points connected with ChatControl # instance object app.plugin_manager.remove_gui_extension_point('chat_control', self) @@ -682,7 +690,7 @@ def allow_shutdown(self, _method, on_yes, on_no): def _on_avatar_update(self, _contact, _signal_name): self._update_avatar() - def _update_avatar(self): + def _update_avatar(self) -> None: scale = app.window.get_scale_factor() surface = self.contact.get_avatar(AvatarSize.CHAT, scale) self.xml.avatar_image.set_from_surface(surface) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -24,15 +24,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 Any +from typing import List +from typing import Optional + import time import logging +from nbxmpp import JID from nbxmpp.namespaces import Namespace from nbxmpp.protocol import InvalidJid from nbxmpp.protocol import validate_resourcepart from nbxmpp.const import StatusCode from nbxmpp.const import Affiliation from nbxmpp.errors import StanzaError +from nbxmpp.modules.security_labels import Displaymarking from nbxmpp.modules.vcard_temp import VCard from gi.repository import Gtk @@ -46,6 +52,7 @@ from gajim.common import app from gajim.common import ged from gajim.common import helpers +from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import event_filter from gajim.common.helpers import to_user_string from gajim.common.const import AvatarSize @@ -86,7 +93,7 @@ class GroupchatControl(BaseControl): # will be processed with this command host. COMMAND_HOST = GroupChatCommands - def __init__(self, account, jid): + def __init__(self, account: str, jid: JID) -> None: BaseControl.__init__(self, 'groupchat_control', account, @@ -95,23 +102,27 @@ def __init__(self, account, jid): self._client.connect_signal('state-changed', self._on_client_state_changed) - self.is_anonymous = True + self.is_anonymous: bool = True self.toggle_emoticons() - self.room_jid = str(self.contact.jid) + self.room_jid: str = str(self.contact.jid) # Stores nickname we want to kick - self._kick_nick = None + self._kick_nick: Optional[str] = None # Stores nickname we want to ban - self._ban_jid = None + self._ban_jid: Optional[str] = None # Last sent message text - self.last_sent_txt = '' + self.last_sent_txt: str = '' # Attribute, encryption plugins use to signal the message can be sent - self.sendmessage = False + self.sendmessage: bool = False + + # XEP-0308 Message Correction + self.correcting: bool = False + self.last_sent_msg: Optional[str] = None self.roster = GroupchatRoster(self.account, self.room_jid, self) self.xml.roster_revealer.add(self.roster) @@ -126,13 +137,13 @@ def __init__(self, account, jid): # muc attention flag (when we are mentioned in a muc) # if True, the room has mentioned us - self.attention_flag = False + self.attention_flag: bool = False # sorted list of nicks who mentioned us (last at the end) - self.attention_list = [] - self.nick_hits = [] - self.__nick_completion = None - self.last_key_tabs = False + self.attention_list: List[str] = [] + self.nick_hits: List[str] = [] + self.__nick_completion: Optional[NickCompletionGenerator] = None + self.last_key_tabs: bool = False self.setup_seclabel() @@ -158,7 +169,7 @@ def __init__(self, account, jid): self._update_avatar() # Holds CaptchaRequest widget - self._captcha_request = None + self._captcha_request: Optional[DataFormWidget] = None # MUC Info self._subject_data = None @@ -166,7 +177,7 @@ def __init__(self, account, jid): self.xml.info_box.add(self._muc_info_box) # Groupchat settings - self._groupchat_settings_box = None + self._groupchat_settings_box: Optional[GroupChatSettings] = None # Groupchat invite self.xml.quick_invite_button.set_action_name( @@ -211,7 +222,7 @@ def __init__(self, account, jid): # instance object app.plugin_manager.gui_extension_point('groupchat_control', self) - def _connect_contact_signals(self): + def _connect_contact_signals(self) -> None: self.contact.multi_connect({ 'state-changed': self._on_muc_state_changed, 'avatar-update': self._on_avatar_update, @@ -260,7 +271,7 @@ def _nick_completion(self): return self.__nick_completion @property - def subject(self): + def subject(self) -> str: if self._subject_data is None: return '' return self._subject_data.subject @@ -269,7 +280,7 @@ def subject(self): def disco_info(self): return app.storage.cache.get_last_disco_info(self.contact.jid) - def add_actions(self): + def add_actions(self) -> None: super().add_actions() actions = [ ('groupchat-settings-', None, self._on_groupchat_settings), @@ -368,7 +379,7 @@ def update_actions(self, *args): self._get_action('kick-').set_enabled(joined) - def remove_actions(self): + def remove_actions(self) -> None: super().remove_actions() actions = [ 'groupchat-settings-', @@ -398,7 +409,7 @@ def is_irc(self) -> bool: return False return self.disco_info.is_irc - def _is_subject_change_allowed(self): + def _is_subject_change_allowed(self) -> Optional[Any]: contact = self.contact.get_self() if contact is None: return False @@ -410,7 +421,7 @@ def _is_subject_change_allowed(self): return False return self.disco_info.muc_subjectmod or False - def _show_page(self, name): + def _show_page(self, name: str) -> None: transition = Gtk.StackTransitionType.SLIDE_DOWN if name == 'groupchat': transition = Gtk.StackTransitionType.SLIDE_UP @@ -422,7 +433,7 @@ def _show_page(self, name): self.xml.info_close_button.grab_focus() self.xml.stack.set_visible_child_full(name, transition) - def _get_current_page(self): + def _get_current_page(self) -> str: return self.xml.stack.get_visible_child_name() def _on_muc_disco_update(self, _event): @@ -624,11 +635,11 @@ def _on_roster_row_activated(self, _roster, nick): def _on_avatar_update(self, _contact, _signal_name): self._update_avatar() - def _update_avatar(self): + def _update_avatar(self) -> None: surface = self.contact.get_avatar(AvatarSize.CHAT, self.scale_factor) self.xml.avatar_image.set_from_surface(surface) - def draw_banner_text(self): + def draw_banner_text(self) -> None: """ Draw the text in the fat line at the top of the window that houses the room jid @@ -702,14 +713,15 @@ def _on_gc_message_received(self, event): self._client.get_own_jid().bare) def add_message(self, - text, - contact='', - tim=None, - displaymarking=None, - message_id=None, - stanza_id=None, - additional_data=None, - notify=True): + text: str, + contact: str = '', + tim: Optional[float] = None, + displaymarking: Optional[Displaymarking] = None, + message_id: Optional[str] = None, + stanza_id: Optional[str] = None, + additional_data: Optional[AdditionalDataDict] = None, + notify: bool = True + ) -> None: if contact == self.contact.nickname: kind = 'outgoing' @@ -809,7 +821,7 @@ def _nec_ping(self, event): elif event.name == 'ping-error': self.add_info_message(event.error) - def _set_control_active(self): + def _set_control_active(self) -> None: self.xml.formattings_button.set_sensitive(True) self.msg_textview.set_sensitive(True) self.msg_textview.set_editable(True) @@ -822,7 +834,7 @@ def _set_control_active(self): self.update_actions() - def _set_control_inactive(self): + def _set_control_inactive(self) -> None: self.xml.formattings_button.set_sensitive(False) self.msg_textview.set_sensitive(False) self.msg_textview.set_editable(False) @@ -834,7 +846,7 @@ def _set_control_inactive(self): self.update_actions() - def rejoin(self): + def rejoin(self) -> None: self._client.get_module('MUC').join(self.room_jid) # def send_pm(self, nick, message=None): @@ -1115,7 +1127,11 @@ def _on_message_sent(self, event): self.msg_textview.get_style_context().remove_class( 'gajim-msg-correcting') - def send_message(self, message, xhtml=None, process_commands=True): + def send_message(self, + message: str, + xhtml: Optional[str] = None, + process_commands: bool = True + ) -> None: """ Call this function to send our message """ @@ -1182,7 +1198,7 @@ def shutdown(self, reason=None): super(GroupchatControl, self).shutdown() app.check_finalize(self) - def safe_shutdown(self): + def safe_shutdown(self) -> bool: # whether to ask for confirmation before closing muc if app.settings.get('confirm_close_muc') and self.contact.is_joined: return False @@ -1219,12 +1235,12 @@ def on_cancel(is_checked): on_yes(self) - def _close_control(self): + def _close_control(self) -> None: app.window.activate_action( 'remove-chat', GLib.Variant('as', [self.account, str(self.room_jid)])) - def set_control_active(self, state): + def set_control_active(self, state: bool) -> None: self.attention_flag = False BaseControl.set_control_active(self, state) @@ -1396,7 +1412,7 @@ def delegate_action(self, action): return Gdk.EVENT_PROPAGATE - def focus(self): + def focus(self) -> None: page_name = self._get_current_page() if page_name == 'groupchat': self.msg_textview.grab_focus() @@ -1547,7 +1563,7 @@ def _on_room_captcha_error(self, _contact, _signal_name, error): self.xml.captcha_error_label.set_text(error_text) self._show_page('captcha-error') - def _remove_captcha_request(self): + def _remove_captcha_request(self) -> None: if self._captcha_request is None: return if self._captcha_request in self.xml.captcha_box.get_children(): ===================================== gajim/gtk/controls/private.py ===================================== @@ -24,6 +24,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 Optional + +from nbxmpp import JID + from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ @@ -43,7 +47,7 @@ class PrivateChatControl(ChatControl): # will be processed with this command host. COMMAND_HOST = PrivateChatCommands - def __init__(self, account, jid): + def __init__(self, account: str, jid: JID) -> None: self._client = app.get_client(account) self._room_contact = self._client.get_module('Contacts').get_contact( jid.bare) @@ -53,7 +57,7 @@ def __init__(self, account, jid): # self.register_events([ # ('update-gc-avatar', ged.GUI1, self._on_update_gc_avatar), - def _connect_contact_signals(self): + def _connect_contact_signals(self) -> None: self.contact.multi_connect({ 'user-avatar-update': self._on_user_avatar_update, 'user-joined': self._on_user_joined, @@ -68,10 +72,10 @@ def _connect_contact_signals(self): }) @property - def room_name(self): + def room_name(self) -> str: return self._room_contact.name - def get_our_nick(self): + def get_our_nick(self) -> str: muc_data = self._client.get_module('MUC').get_muc_data( self._room_contact.jid) return muc_data.nick @@ -136,8 +140,12 @@ def _on_room_joined(self, *args): return self.got_connected() - def send_message(self, message, xhtml=None, process_commands=True, - attention=False): + def send_message(self, + message: str, + xhtml: Optional[str] = None, + process_commands: bool = True, + attention: bool = False + ) -> None: """ Call this method to send the message """ @@ -161,7 +169,7 @@ def send_message(self, message, xhtml=None, process_commands=True, process_commands=process_commands, attention=attention) - def update_ui(self): + def update_ui(self) -> None: ChatControl.update_ui(self) def _on_user_avatar_update(self, *args): ===================================== gajim/gtk/main.py ===================================== @@ -14,6 +14,7 @@ from gajim.common import app from gajim.common import ged from gajim.common.const import Display +from gajim.common.const import Direction from gajim.common.helpers import ask_for_status_message from gajim.common.i18n import _ from gajim.common.nec import EventHelper @@ -260,19 +261,19 @@ def _on_action(self, action, _param): # return None if action == 'switch-next-tab': - self.select_next_chat(True) + self.select_next_chat(Direction.NEXT) return None if action == 'switch-prev-tab': - self.select_next_chat(False) + self.select_next_chat(Direction.PREV) return None if action == 'switch-next-unread-tab-right': - self.select_next_chat(True, unread_first=True) + self.select_next_chat(Direction.NEXT, unread_first=True) return None if action == 'switch-next-unread-tab-left': - self.select_next_chat(False, unread_first=True) + self.select_next_chat(Direction.PREV, unread_first=True) return None if action.startswith('switch-tab-'): @@ -443,12 +444,12 @@ def select_chat(self, account: str, jid: JID) -> None: self._main_stack.show_chat_page() self._chat_page.select_chat(account, jid) - def select_next_chat(self, forwards: bool, + def select_next_chat(self, direction: Direction, unread_first: bool = False) -> None: chat_list_stack = self._chat_page.get_chat_list_stack() chat_list = chat_list_stack.get_current_chat_list() if chat_list is not None: - chat_list.select_next_chat(forwards, unread_first) + chat_list.select_next_chat(direction, unread_first) def select_chat_number(self, number: int) -> None: chat_list_stack = self._chat_page.get_chat_list_stack() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/54a0f28d7a42bf787a457e4662723f4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/54a0f28d7a42bf787a457e4662723f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 4 commits: ResourceSelector: Typing
by Daniel Brötzmann (＠wurstsalat) 24 Nov '21

24 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: c5b8ab15 by wurstsalat at 2021-11-24T23:07:15+01:00 ResourceSelector: Typing - - - - - 76e4a3b8 by wurstsalat at 2021-11-24T23:12:15+01:00 WorkspaceDialog: Typing - - - - - abde6bfa by wurstsalat at 2021-11-24T23:24:32+01:00 AvatarSelector: Typing - - - - - 54a0f28d by wurstsalat at 2021-11-24T23:45:13+01:00 Chat Controls: Use f-strings - - - - - 6 changed files: - gajim/gtk/avatar_selector.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/controls/private.py - gajim/gtk/resource_selector.py - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -15,6 +15,9 @@ # 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 Tuple + import os import logging from enum import IntEnum @@ -60,7 +63,7 @@ class Range(IntEnum): class AvatarSelector(Gtk.Box): - def __init__(self): + def __init__(self) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) self.get_style_context().add_class('padding-18') @@ -99,7 +102,7 @@ def __init__(self): self.show_all() - def prepare_crop_area(self, path): + def prepare_crop_area(self, path: str) -> None: pixbuf = self._get_pixbuf_from_path(path) self._crop_area.set_pixbuf(pixbuf) self._load_button.hide() @@ -127,7 +130,7 @@ def _on_drag_data_received(self, _widget, _context, _x_coord, _y_coord, self.prepare_crop_area(path) @staticmethod - def _get_pixbuf_from_path(path): + def _get_pixbuf_from_path(path: str) -> Optional[GdkPixbuf.Pixbuf]: try: pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) return pixbuf @@ -135,11 +138,12 @@ def _get_pixbuf_from_path(path): log.error('Unable to load file %s: %s', path, str(err)) return None - def get_prepared(self): + def get_prepared(self) -> bool: return bool(self._crop_area.get_pixbuf()) @staticmethod - def _scale_for_publish(pixbuf): + def _scale_for_publish(pixbuf: GdkPixbuf.Pixbuf + ) -> Tuple[GdkPixbuf.Pixbuf, int, int]: width = pixbuf.get_width() height = pixbuf.get_height() if width > AvatarSize.PUBLISH or height > AvatarSize.PUBLISH: @@ -150,7 +154,7 @@ def _scale_for_publish(pixbuf): GdkPixbuf.InterpType.BILINEAR) return pixbuf, width, height - def get_avatar_surface(self): + def get_avatar_surface(self) -> Optional[Tuple[cairo.Surface, int, int]]: pixbuf = self._crop_area.get_pixbuf() if pixbuf is None: return None @@ -159,7 +163,7 @@ def get_avatar_surface(self): return Gdk.cairo_surface_create_from_pixbuf( scaled, self.get_scale_factor()), width, height - def get_avatar_bytes(self): + def get_avatar_bytes(self) -> Tuple[bool, Optional[bytes], int, int]: pixbuf = self._crop_area.get_pixbuf() if pixbuf is None: return False, None, 0, 0 @@ -170,7 +174,7 @@ def get_avatar_bytes(self): class CropArea(Gtk.DrawingArea): - def __init__(self): + def __init__(self) -> None: Gtk.DrawingArea.__init__(self) self.set_no_show_all(True) self.add_events( @@ -204,7 +208,7 @@ def __init__(self): self.connect('button-release-event', self._on_button_release) self.connect('motion-notify-event', self._on_motion_notify) - def set_min_size(self, width, height): + def set_min_size(self, width: int, height: int) -> None: self._base_width = width self._base_height = height self.set_size_request(self._base_width, self._base_height) @@ -212,13 +216,13 @@ def set_min_size(self, width, height): if self._aspect > 0: self._aspect = self._base_width / self._base_height - def set_contstrain_aspect(self, constrain): + def set_contstrain_aspect(self, constrain: bool) -> None: if constrain: self._aspect = self._base_width / self._base_height else: self._aspect = -1 - def set_pixbuf(self, pixbuf): + def set_pixbuf(self, pixbuf: GdkPixbuf.Pixbuf) -> None: if pixbuf: self._browse_pixbuf = pixbuf width = pixbuf.get_width() @@ -240,7 +244,7 @@ def set_pixbuf(self, pixbuf): self.queue_draw() - def get_pixbuf(self): + def get_pixbuf(self) -> Optional[GdkPixbuf.Pixbuf]: if self._browse_pixbuf is None: return None @@ -408,14 +412,10 @@ def _on_motion_notify(self, _widget, event): top += delta_y bottom += delta_y - if left < 0: - left = 0 - if top < 0: - top = 0 - if right > pb_width: - right = pb_width - if bottom > pb_height: - bottom = pb_height + left = max(left, 0) + top = max(top, 0) + right = min(right, pb_width) + bottom = min(bottom, pb_height) adj_width = int(right - left + 1) adj_height = int(bottom - top + 1) @@ -519,14 +519,10 @@ def _on_motion_notify(self, _widget, event): width = right - left + 1 height = bottom - top + 1 if self._aspect < 0: - if left < 0: - left = 0 - if top < 0: - top = 0 - if right > pb_width: - right = pb_width - if bottom > pb_height: - bottom = pb_height + left = max(left, 0) + top = max(top, 0) + right = min(right, pb_width) + bottom = min(bottom, pb_height) width = right - left + 1 height = bottom - top + 1 ===================================== gajim/gtk/controls/chat.py ===================================== @@ -717,7 +717,7 @@ def _on_presence_received(self, event): if not app.settings.get('print_status_in_chats'): return - status = '- %s' % event.status if event.status else '' + status = f'- {event.status}' if event.status else '' status_line = _('%(name)s is now %(show)s %(status)s') % { 'name': name, 'show': uf_show, 'status': status} self.add_info_message(status_line) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -138,7 +138,7 @@ def __init__(self, account, jid): # Send file self.xml.sendfile_button.set_action_name( - 'win.send-file-%s' % self.control_id) + f'win.send-file-{self.control_id}') # Encryption self.set_lock_image() @@ -170,7 +170,7 @@ def __init__(self, account, jid): # Groupchat invite self.xml.quick_invite_button.set_action_name( - 'win.invite-%s' % self.control_id) + f'win.invite-{self.control_id}') self._invite_box = GroupChatInvite(self.room_jid) self.xml.invite_grid.attach(self._invite_box, 0, 0, 1, 1) @@ -912,7 +912,7 @@ def _on_user_affiliation_changed(self, affiliation = helpers.get_uf_affiliation(user_contact.affiliation) nick = user_contact.name reason = properties.muc_user.reason - reason = '' if reason is None else ': {reason}'.format(reason=reason) + reason = '' if reason is None else f': {reason}' actor = properties.muc_user.actor # Group Chat: You have been kicked by Alice @@ -943,7 +943,7 @@ def _on_user_role_changed(self, role = helpers.get_uf_role(user_contact.role) nick = user_contact.name reason = properties.muc_user.reason - reason = '' if reason is None else ': {reason}'.format(reason=reason) + reason = '' if reason is None else f': {reason}' actor = properties.muc_user.actor # Group Chat: You have been kicked by Alice @@ -968,7 +968,7 @@ def _on_room_kicked(self, _contact, _signal_name, properties): status_codes = properties.muc_status_codes or [] reason = properties.muc_user.reason - reason = '' if reason is None else ': {reason}'.format(reason=reason) + reason = '' if reason is None else f': {reason}' actor = properties.muc_user.actor # Group Chat: You have been kicked by Alice @@ -1021,7 +1021,7 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties): nick = user_contact.name reason = properties.muc_user.reason - reason = '' if reason is None else ': {reason}'.format(reason=reason) + reason = '' if reason is None else f': {reason}' actor = properties.muc_user.actor # Group Chat: You have been kicked by Alice @@ -1086,13 +1086,13 @@ def _on_room_creation_failed(self, _contact, _signal_name, properties): def _on_room_presence_error(self, _contact, _signal_name, properties): error_message = to_user_string(properties.error) - self.add_info_message('Error: %s' % error_message) + self.add_info_message(_('Error: %s') % error_message) def _on_room_destroyed(self, _contact, _signal_name, properties): destroyed = properties.muc_destroyed reason = destroyed.reason - reason = '' if reason is None else ': %s' % reason + reason = '' if reason is None else f': {reason}' message = _('Group chat has been destroyed') self.add_info_message(message) @@ -1364,7 +1364,7 @@ def delegate_action(self, action): return res if action == 'change-nickname': - control_action = '%s-%s' % (action, self.control_id) + control_action = f'{action}-{self.control_id}' app.window.lookup_action(control_action).activate() return Gdk.EVENT_STOP @@ -1385,13 +1385,13 @@ def delegate_action(self, action): return Gdk.EVENT_STOP if action == 'change-subject': - control_action = '%s-%s' % (action, self.control_id) + control_action = f'{action}-{self.control_id}' app.window.lookup_action(control_action).activate() return Gdk.EVENT_STOP if action == 'show-contact-info': app.window.lookup_action( - 'information-%s' % self.control_id).activate() + f'information-{self.control_id}').activate() return Gdk.EVENT_STOP return Gdk.EVENT_PROPAGATE ===================================== gajim/gtk/controls/private.py ===================================== @@ -102,7 +102,7 @@ def _on_user_status_show_changed(self, properties): nick = properties.muc_nickname status = properties.status - status = '' if status is None else ' - %s' % status + status = '' if status is None else f' - {status}' show = helpers.get_uf_show(properties.show.value) if not self._room_contact.settings.get('print_status'): ===================================== gajim/gtk/resource_selector.py ===================================== @@ -12,14 +12,24 @@ # 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 List +from typing import Optional +from typing import Tuple + import locale import logging from gi.repository import GObject from gi.repository import Gtk +from nbxmpp import JID +from nbxmpp.namespaces import _Namespaces +from nbxmpp.structs import DiscoInfo + from gajim.common import app from gajim.common.i18n import _ +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.contacts import ResourceContact log = logging.getLogger('gajim.gui.resource_selector') @@ -33,7 +43,8 @@ class ResourceSelector(Gtk.ScrolledWindow): (bool, )), } - def __init__(self, contact, constraints=None): + def __init__(self, contact: BareContact, + constraints: List[_Namespaces] = None) -> None: Gtk.ScrolledWindow.__init__(self) self.set_shadow_type(Gtk.ShadowType.IN) self.set_size_request(-1, 200) @@ -65,7 +76,7 @@ def _on_row_selected(self, _listbox, row): state = bool(row is not None) self.emit('selection-changed', state) - def _set_placeholder(self): + def _set_placeholder(self) -> None: image = Gtk.Image.new_from_icon_name( 'dialog-warning-symbolic', Gtk.IconSize.DND) label = Gtk.Label(label=_('No devices online')) @@ -77,7 +88,7 @@ def _set_placeholder(self): box.show_all() self._listbox.set_placeholder(box) - def _add_entries(self): + def _add_entries(self) -> None: for resource in self._contact.iter_resources(): self._listbox.add(ResourceRow(resource, self._constraints)) @@ -86,12 +97,13 @@ def _on_update(self, _contact, _signal_name): self._listbox.remove(child) self._add_entries() - def get_jid(self): + def get_jid(self) -> JID: return self._listbox.get_selected_row().jid class ResourceRow(Gtk.ListBoxRow): - def __init__(self, resource_contact, constraints): + def __init__(self, resource_contact: ResourceContact, + constraints: List[_Namespaces]) -> None: Gtk.ListBoxRow.__init__(self) self.jid = resource_contact.jid @@ -131,8 +143,9 @@ def __init__(self, resource_contact, constraints): self.show_all() @staticmethod - def _get_client_identity(disco_info): + def _get_client_identity(disco_info: DiscoInfo + ) -> Tuple[Optional[str], Optional[str]]: for identity in disco_info.identities: if identity.category == 'client': return identity.name, identity.type - return None, None + return None, None ===================================== gajim/gtk/workspace_dialog.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 Gtk from gi.repository import Gdk @@ -30,7 +32,7 @@ class WorkspaceDialog(Gtk.ApplicationWindow): - def __init__(self, workspace_id=None): + def __init__(self, workspace_id: str = None) -> None: Gtk.ApplicationWindow.__init__(self) self.set_name('WorkspaceDialog') self.set_application(app.app) @@ -49,9 +51,9 @@ def __init__(self, workspace_id=None): self._avatar_selector.set_size_request(200, 200) self._ui.image_box.add(self._avatar_selector) - name = _('My Workspace') - color = None - self._avatar_sha = None + name: str = _('My Workspace') + color: Optional[str] = None + self._avatar_sha: Optional[str] = None if workspace_id is None: self._ui.remove_workspace_button.set_sensitive(False) @@ -125,7 +127,7 @@ def _on_image_switch_toggled(self, switch, *args): self._avatar_sha = None self._update_avatar() - def _update_avatar(self): + def _update_avatar(self) -> None: name = self._ui.entry.get_text() rgba = self._ui.color_chooser.get_rgba() scale = self.get_scale_factor() @@ -142,7 +144,7 @@ def _update_avatar(self): scale) self._ui.preview.set_from_surface(surface) - def _get_avatar_data(self): + def _get_avatar_data(self) -> Optional[bytes]: if not self._avatar_selector.get_prepared(): return None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/813ba5a8bdc17ba934961574c9a93e8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/813ba5a8bdc17ba934961574c9a93e8… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2021