Commits

commits@gajim.org

17632 discussions

[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

[Git][gajim/gajim][master] 2 commits: HistoryManager: Fix #10682
by Daniel Brötzmann (＠wurstsalat) 24 Nov '21

24 Nov '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6015434b by wurstsalat at 2021-11-24T22:23:46+01:00 HistoryManager: Fix #10682 - - - - - 868a9f21 by wurstsalat at 2021-11-24T22:45:15+01:00 HistoryManager: Typing, Linting - - - - - 1 changed file: - gajim/history_manager.py Changes: ===================================== gajim/history_manager.py ===================================== @@ -25,6 +25,8 @@ # that abstracts db connections and helpers on it # the same can be said for history.py +from typing import List + import os import sys import time @@ -57,7 +59,7 @@ from gajim.common.const import ShowConstant -def is_standalone(): +def is_standalone() -> bool: # Determine if we are in standalone mode if Gio.Application.get_default() is None: return True @@ -66,7 +68,7 @@ def is_standalone(): return False -def init_gtk(): +def init_gtk() -> None: gajim.gui.init('gtk') from gajim.gui import exception exception.init() @@ -92,7 +94,8 @@ def init_gtk(): _('Options:') + \ '\n -h, --help ' + \ _('Show this help message and exit') + \ - '\n -c, --config-path ' + _('Choose folder for logfile') + '\n') + '\n -c, --config-path ' + _('Choose folder for logfile') + \ + '\n') sys.exit() elif o in ('-c', '--config-path'): configpaths.set_config_root(a) @@ -123,7 +126,7 @@ class Column(IntEnum): class HistoryManager: - def __init__(self): + def __init__(self) -> None: log_db_path = configpaths.get('LOG_DB') if not log_db_path.exists(): ErrorDialog(_('Cannot find history logs database'), @@ -134,7 +137,8 @@ def __init__(self): Gtk.Window.set_default_icon_list(get_app_icon_list( self._ui.history_manager_window)) - self.jids_already_in = [] # holds jids that we already have in DB + # holds jids that we already have in DB + self.jids_already_in: List[str] = [] self.AT_LEAST_ONE_DELETION_DONE = False self.con = sqlite3.connect( @@ -154,10 +158,11 @@ def __init__(self): self._ui.connect_signals(self) - def _init_jids_listview(self): + def _init_jids_listview(self) -> None: self.jids_liststore = Gtk.ListStore(str, str) # jid, jid_id self._ui.jids_listview.set_model(self.jids_liststore) - self._ui.jids_listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) + self._ui.jids_listview.get_selection().set_mode( + Gtk.SelectionMode.MULTIPLE) renderer_text = Gtk.CellRendererText() # holds jid col = Gtk.TreeViewColumn(_('XMPP Address'), renderer_text, text=0) @@ -166,21 +171,24 @@ def _init_jids_listview(self): self._ui.jids_listview.get_selection().connect('changed', self.on_jids_listview_selection_changed) - def _init_logs_listview(self): + def _init_logs_listview(self) -> None: # log_line_id(HIDDEN), jid_id(HIDDEN), time, message, subject, nickname self.logs_liststore = Gtk.ListStore(str, str, str, str, str, str) self._ui.logs_listview.set_model(self.logs_liststore) - self._ui.logs_listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) + self._ui.logs_listview.get_selection().set_mode( + Gtk.SelectionMode.MULTIPLE) renderer_text = Gtk.CellRendererText() # holds time - col = Gtk.TreeViewColumn(_('Date'), renderer_text, text=Column.UNIXTIME) + col = Gtk.TreeViewColumn( + _('Date'), renderer_text, text=Column.UNIXTIME) # user can click this header and sort col.set_sort_column_id(Column.UNIXTIME) col.set_resizable(True) self._ui.logs_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds nickname - col = Gtk.TreeViewColumn(_('Nickname'), renderer_text, text=Column.NICKNAME) + col = Gtk.TreeViewColumn( + _('Nickname'), renderer_text, text=Column.NICKNAME) # user can click this header and sort col.set_sort_column_id(Column.NICKNAME) col.set_resizable(True) @@ -191,7 +199,8 @@ def _init_logs_listview(self): renderer_text = Gtk.CellRendererText() # holds message renderer_text.set_property('width_chars', 60) renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) - col = Gtk.TreeViewColumn(_('Message'), renderer_text, markup=Column.MESSAGE) + col = Gtk.TreeViewColumn( + _('Message'), renderer_text, markup=Column.MESSAGE) # user can click this header and sort col.set_sort_column_id(Column.MESSAGE) col.set_resizable(True) @@ -199,7 +208,8 @@ def _init_logs_listview(self): self._ui.logs_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds subject - col = Gtk.TreeViewColumn(_('Subject'), renderer_text, text=Column.SUBJECT) + col = Gtk.TreeViewColumn( + _('Subject'), renderer_text, text=Column.SUBJECT) # user can click this header and sort col.set_sort_column_id(Column.SUBJECT) col.set_resizable(True) @@ -207,11 +217,12 @@ def _init_logs_listview(self): self.subject_col_for_logs = col self._ui.logs_listview.append_column(col) - def _init_search_results_listview(self): + def _init_search_results_listview(self) -> None: # log_line_id (HIDDEN), jid, time, message, subject, nickname - self.search_results_liststore = Gtk.ListStore(int, str, str, str, str, - str) - self._ui.search_results_listview.set_model(self.search_results_liststore) + self.search_results_liststore = Gtk.ListStore( + int, str, str, str, str, str) + self._ui.search_results_listview.set_model( + self.search_results_liststore) renderer_text = Gtk.CellRendererText() # holds JID (who said this) col = Gtk.TreeViewColumn(_('XMPP Address'), renderer_text, text=1) @@ -221,7 +232,8 @@ def _init_search_results_listview(self): self._ui.search_results_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds time - col = Gtk.TreeViewColumn(_('Date'), renderer_text, text=Column.UNIXTIME) + col = Gtk.TreeViewColumn( + _('Date'), renderer_text, text=Column.UNIXTIME) # user can click this header and sort col.set_sort_column_id(Column.UNIXTIME) col.set_resizable(True) @@ -230,27 +242,30 @@ def _init_search_results_listview(self): renderer_text = Gtk.CellRendererText() # holds message renderer_text.set_property('width_chars', 60) renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) - col = Gtk.TreeViewColumn(_('Message'), renderer_text, text=Column.MESSAGE) + col = Gtk.TreeViewColumn( + _('Message'), renderer_text, text=Column.MESSAGE) # user can click this header and sort col.set_sort_column_id(Column.MESSAGE) col.set_resizable(True) self._ui.search_results_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds subject - col = Gtk.TreeViewColumn(_('Subject'), renderer_text, text=Column.SUBJECT) + col = Gtk.TreeViewColumn( + _('Subject'), renderer_text, text=Column.SUBJECT) # user can click this header and sort col.set_sort_column_id(Column.SUBJECT) col.set_resizable(True) self._ui.search_results_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds nickname - col = Gtk.TreeViewColumn(_('Nickname'), renderer_text, text=Column.NICKNAME) + col = Gtk.TreeViewColumn( + _('Nickname'), renderer_text, text=Column.NICKNAME) # user can click this header and sort col.set_sort_column_id(Column.NICKNAME) col.set_resizable(True) self._ui.search_results_listview.append_column(col) - def on_history_manager_window_delete_event(self, widget, event): + def on_history_manager_window_delete_event(self, _widget, _event): if not self.AT_LEAST_ONE_DELETION_DONE: if is_standalone(): Gtk.main_quit() @@ -278,7 +293,7 @@ def _on_no(): text=_('_Cleanup'), callback=_on_yes)]).show() - def _fill_jids_listview(self): + def _fill_jids_listview(self) -> None: # get those jids that have at least one entry in logs self.cur.execute('SELECT jid, jid_id FROM jids WHERE jid_id IN (' 'SELECT distinct logs.jid_id FROM logs) ORDER BY jid') @@ -288,9 +303,9 @@ def _fill_jids_listview(self): self.jids_already_in.append(row[0]) # jid self.jids_liststore.append([row[0], str(row[1])]) # jid, jid_id - def on_jids_listview_selection_changed(self, widget, data=None): - liststore, list_of_paths = self._ui.jids_listview.get_selection()\ - .get_selected_rows() + def on_jids_listview_selection_changed(self, _widget): + selection = self._ui.jids_listview.get_selection() + liststore, list_of_paths = selection.get_selected_rows() self.logs_liststore.clear() if not list_of_paths: @@ -311,7 +326,7 @@ def on_jids_listview_selection_changed(self, widget, data=None): jid = liststore[path][0] # jid self._fill_logs_listview(jid) - def _get_jid_id(self, jid): + def _get_jid_id(self, jid: str) -> str: """ jids table has jid and jid_id logs table has log_id, jid_id, contact_name, time, kind, show, message @@ -327,7 +342,7 @@ def _get_jid_id(self, jid): jid_id = self.cur.fetchone()[0] return str(jid_id) - def _get_jid_from_jid_id(self, jid_id): + def _get_jid_from_jid_id(self, jid_id: str) -> str: """ jids table has jid and jid_id @@ -337,7 +352,7 @@ def _get_jid_from_jid_id(self, jid_id): jid = self.cur.fetchone()[0] return jid - 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 @@ -355,7 +370,7 @@ def _jid_is_from_pm(self, jid): return False return True - def _jid_is_room_type(self, jid): + def _jid_is_room_type(self, jid: str) -> bool: """ Return True/False if given id is room type or not eg. if it is room """ @@ -363,7 +378,7 @@ def _jid_is_room_type(self, jid): row = self.cur.fetchone() return row[0] == JIDConstant.ROOM_TYPE - def _fill_logs_listview(self, jid): + def _fill_logs_listview(self, jid: str) -> None: """ Fill the listview with all messages that user sent to or received from JID @@ -424,13 +439,13 @@ def _fill_logs_listview(self, jid): message_ = '<span' if color: - message_ += ' foreground="%s"' % convert_rgb_to_hex(color) - message_ += '>%s</span>' % GLib.markup_escape_text(message) + message_ += f' foreground="{convert_rgb_to_hex(color)}"' + message_ += f'>{GLib.markup_escape_text(message)}</span>' self.logs_liststore.append( (str(log_line_id), str(jid_id), time_, message_, subject, nickname)) - def _fill_search_results_listview(self, text): + def _fill_search_results_listview(self, text: str) -> None: """ Ask db and fill listview with results that match text """ @@ -461,7 +476,7 @@ def _fill_search_results_listview(self, text): self.search_results_liststore.append((log_line_id, jid, time_, message, subject, nickname)) - def on_logs_listview_key_press_event(self, widget, event): + def on_logs_listview_key_press_event(self, _widget, event): liststore, list_of_paths = self._ui.logs_listview.get_selection()\ .get_selected_rows() if event.keyval == Gdk.KEY_Delete: @@ -480,17 +495,17 @@ def on_listview_button_press_event(self, widget, event): event.button, event.time) return True - def on_export_menuitem_activate(self, widget): + def on_export_menuitem_activate(self, _widget): FileSaveDialog(self._on_export, transient_for=self._ui.history_manager_window, modal=True) - def _on_export(self, filename): - liststore, list_of_paths = self._ui.jids_listview.get_selection()\ - .get_selected_rows() + def _on_export(self, filename: str) -> None: + selection = self._ui.jids_listview.get_selection() + liststore, list_of_paths = selection.get_selected_rows() self._export_jids_logs_to_file(liststore, list_of_paths, filename) - def on_delete_menuitem_activate(self, widget, listview): + def on_delete_menuitem_activate(self, _widget, listview): widget_name = Gtk.Buildable.get_name(listview) liststore, list_of_paths = listview.get_selection().get_selected_rows() if widget_name == 'jids_listview': @@ -500,7 +515,7 @@ def on_delete_menuitem_activate(self, widget, listview): else: # Huh ? We don't know this widget return - def on_jids_listview_key_press_event(self, widget, event): + def on_jids_listview_key_press_event(self, _widget, event): liststore, list_of_paths = self._ui.jids_listview.get_selection()\ .get_selected_rows() if event.keyval == Gdk.KEY_Delete: @@ -530,30 +545,31 @@ def _export_jids_logs_to_file(self, liststore, list_of_paths, path_to_file): # AT THIS TIME FIRST EXECUTE IS LOST! WTH!!!!! results = self.cur.fetchall() #print results[0] - file_ = open(path_to_file, 'w', encoding='utf-8') - for row in results: - # in store: time, kind, message, contact_name FROM logs - # in text: JID or You or nickname (if it's gc_msg), time, message - time_, kind, message, nickname = row - if kind in (KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV): - who = self._get_jid_from_jid_id(jid_id) - elif kind in (KindConstant.SINGLE_MSG_SENT, - KindConstant.CHAT_MSG_SENT): - who = _('You') - elif kind == KindConstant.GC_MSG: - who = nickname - else: # status or gc_status. do not save - #print kind - continue + with open(path_to_file, 'w', encoding='utf-8') as file_: + for row in results: + # in store: time, kind, message, contact_name FROM logs + # in text: JID or You or nickname (if it's gc_msg), time, + # message + time_, kind, message, nickname = row + if kind in (KindConstant.SINGLE_MSG_RECV, + KindConstant.CHAT_MSG_RECV): + who = self._get_jid_from_jid_id(jid_id) + elif kind in (KindConstant.SINGLE_MSG_SENT, + KindConstant.CHAT_MSG_SENT): + who = _('You') + elif kind == KindConstant.GC_MSG: + who = nickname + else: # status or gc_status. do not save + #print kind + continue - try: - time_ = time.strftime('%c', time.localtime(float(time_))) - except ValueError: - pass + try: + time_ = time.strftime('%c', time.localtime(float(time_))) + except ValueError: + pass - file_.write(_('%(who)s on %(time)s said: %(message)s\n') % { - 'who': who, 'time': time_, 'message': message}) + file_.write(_('%(who)s on %(time)s said: %(message)s\n') % { + 'who': who, 'time': time_, 'message': message}) def _delete_jid_logs(self, liststore, list_of_paths): paths_len = len(list_of_paths) @@ -564,7 +580,8 @@ def on_ok(): # delete all rows from db that match jid_id list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(Gtk.TreeRowReference.new(liststore, path)) + list_of_rowrefs.append(Gtk.TreeRowReference.new( + liststore, path)) for rowref in list_of_rowrefs: path = rowref.get_path() @@ -609,7 +626,8 @@ def on_ok(): # delete rows from db that match log_line_id list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(Gtk.TreeRowReference.new(liststore, path)) + list_of_rowrefs.append(Gtk.TreeRowReference.new( + liststore, path)) for rowref in list_of_rowrefs: path = rowref.get_path() @@ -638,7 +656,7 @@ def on_ok(): callback=on_ok)], transient_for=self._ui.history_manager_window).show() - def on_search_db_button_clicked(self, widget): + def on_search_db_button_clicked(self, _widget): text = self._ui.search_entry.get_text() if not text: return @@ -649,7 +667,7 @@ def on_search_db_button_clicked(self, widget): self._fill_search_results_listview(text) - def on_search_results_listview_row_activated(self, widget, path, column): + def on_search_results_listview_row_activated(self, _widget, path, _column): # get log_line_id, jid_id from row we double clicked log_line_id = str(self.search_results_liststore[path][0]) jid = self.search_results_liststore[path][1] @@ -677,12 +695,15 @@ def on_search_results_listview_row_activated(self, widget, path, column): break iter_ = self.logs_liststore.iter_next(iter_) + if iter_ is None: + return + path = self.logs_liststore.get_path(iter_) self._ui.logs_listview.scroll_to_cell(path) self._ui.logs_listview.get_selection().select_path(path) -def main(): +def main() -> None: if sys.platform != 'win32': if os.geteuid() == 0: sys.exit("You must not launch gajim as root, it is insecure.") View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f9eedc129c93d07ba5d2e7de827e61c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f9eedc129c93d07ba5d2e7de827e61c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 4 commits: CodeWidget: Fix missing imports
by Daniel Brötzmann (＠wurstsalat) 24 Nov '21

24 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 530a4902 by wurstsalat at 2021-11-24T21:51:41+01:00 CodeWidget: Fix missing imports - - - - - c15e3e8a by wurstsalat at 2021-11-24T22:11:02+01:00 Types: Prevent circular imports - - - - - bbf649fc by wurstsalat at 2021-11-24T22:11:02+01:00 MessageRow: Fix unknown type - - - - - 813ba5a8 by wurstsalat at 2021-11-24T22:14:40+01:00 QuoteWidget: Remove typing - - - - - 4 changed files: - gajim/gtk/conversation/code_widget.py - gajim/gtk/conversation/quote_widget.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/types.py Changes: ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -12,11 +12,13 @@ # 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 Tuple +from typing import Optional + import logging import gi gi.require_version('GtkSource', '4') -from gi.repository import GObject from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GtkSource @@ -76,7 +78,7 @@ def add_content(self, block): self._textview.print_code(code) @staticmethod - def _prepare_code(text: str) -> Tuple[str, str]: + def _prepare_code(text: str) -> Tuple[str, Optional[str]]: code_start = text.partition('\n')[0] lang = None if len(code_start) > 3: ===================================== gajim/gtk/conversation/quote_widget.py ===================================== @@ -12,12 +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 .message_widget import MessageWidget - class QuoteWidget(Gtk.Box): def __init__(self, account: str) -> None: @@ -32,9 +28,9 @@ def __init__(self, account: str) -> None: self._account = account - self._message_widget: Optional[MessageWidget] = None + self._message_widget = None - def attach_message_widget(self, message_widget: MessageWidget) -> None: + def attach_message_widget(self, message_widget): # Purpose of this method is to prevent circular imports if self._message_widget is not None: raise ValueError( ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -247,10 +247,10 @@ def _on_avatar_clicked(self, _widget, event, name): def _on_realize(event_box): event_box.get_window().set_cursor(get_cursor('pointer')) - def is_same_sender(self, message: MessageRow) -> bool: + def is_same_sender(self, message): return message.name == self.name - def is_same_encryption(self, message: MessageRow) -> bool: + def is_same_encryption(self, message): message_details = self._get_encryption_details(message.additional_data) own_details = self._get_encryption_details(self.additional_data) if message_details is None and own_details is None: ===================================== gajim/gtk/types.py ===================================== @@ -15,41 +15,43 @@ # Types for typechecking from typing import Union +from typing import TYPE_CHECKING -from .controls.chat import ChatControl -from .controls.private import PrivateChatControl -from .controls.groupchat import GroupchatControl -from .conversation.rows.call import CallRow -from .conversation.rows.command_output import CommandOutputRow -from .conversation.rows.date import DateRow -from .conversation.rows.file_transfer_jingle import FileTransferJingleRow -from .conversation.rows.file_transfer import FileTransferRow -from .conversation.rows.info import InfoMessage -from .conversation.rows.message import MessageRow -from .conversation.rows.muc_join_left import MUCJoinLeft -from .conversation.rows.muc_subject import MUCSubject -from .conversation.rows.muc_user_status import MUCUserStatus -from .conversation.rows.read_marker import ReadMarkerRow -from .conversation.rows.scroll_hint import ScrollHintRow +if TYPE_CHECKING: + from .controls.chat import ChatControl + from .controls.private import PrivateChatControl + from .controls.groupchat import GroupchatControl + from .conversation.rows.call import CallRow + from .conversation.rows.command_output import CommandOutputRow + from .conversation.rows.date import DateRow + from .conversation.rows.file_transfer_jingle import FileTransferJingleRow + from .conversation.rows.file_transfer import FileTransferRow + from .conversation.rows.info import InfoMessage + from .conversation.rows.message import MessageRow + from .conversation.rows.muc_join_left import MUCJoinLeft + from .conversation.rows.muc_subject import MUCSubject + from .conversation.rows.muc_user_status import MUCUserStatus + from .conversation.rows.read_marker import ReadMarkerRow + from .conversation.rows.scroll_hint import ScrollHintRow ConversationRowType = Union[ - CallRow, - CommandOutputRow, - DateRow, - FileTransferJingleRow, - FileTransferRow, - InfoMessage, - MessageRow, - MUCJoinLeft, - MUCSubject, - MUCUserStatus, - ReadMarkerRow, - ScrollHintRow + 'CallRow', + 'CommandOutputRow', + 'DateRow', + 'FileTransferJingleRow', + 'FileTransferRow', + 'InfoMessage', + 'MessageRow', + 'MUCJoinLeft', + 'MUCSubject', + 'MUCUserStatus', + 'ReadMarkerRow', + 'ScrollHintRow' ] ControlType = Union [ - ChatControl, - PrivateChatControl, - GroupchatControl + 'ChatControl', + 'PrivateChatControl', + 'GroupchatControl' ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1cd0e8ab9e064928f151efca79651a5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1cd0e8ab9e064928f151efca79651a5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Helpers: Fix missing import + linting
by Daniel Brötzmann (＠wurstsalat) 24 Nov '21

24 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 1cd0e8ab by wurstsalat at 2021-11-24T21:46:04+01:00 Helpers: Fix missing import + linting - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -67,7 +67,7 @@ from nbxmpp.const import ConnectionProtocol from nbxmpp.const import ConnectionType from nbxmpp.const import Affiliation -from nbxmpp.const import Role +from nbxmpp.errors import StanzaError from nbxmpp.structs import ProxyData from nbxmpp.protocol import JID from nbxmpp.protocol import InvalidJid @@ -376,7 +376,7 @@ def exec_command(command, use_shell=False, posix=True): is executed. """ if use_shell: - subprocess.Popen('%s &' % command, shell=True).wait() + subprocess.Popen(f'{command} &', shell=True).wait() else: args = shlex.split(command, posix=posix) process = subprocess.Popen(args) @@ -386,7 +386,7 @@ def build_command(executable, parameter): # we add to the parameter (can hold path with spaces) # "" so we have good parsing from shell parameter = parameter.replace('"', '\\"') # but first escape " - command = '%s "%s"' % (executable, parameter) + command = f'{executable} "{parameter}"' return command def get_file_path_from_dnd_dropped_uri(uri): @@ -630,8 +630,8 @@ def get_auth_sha(sid, initiator, target): """ Return sha of sid + initiator + target used for proxy auth """ - return hashlib.sha1(("%s%s%s" % (sid, initiator, target)).encode('utf-8')).\ - hexdigest() + return hashlib.sha1( + (f'{sid}{initiator}{target}').encode('utf-8')).hexdigest() def remove_invalid_xml_chars(string_): if string_: @@ -744,8 +744,9 @@ def get_subscription_request_msg(account: Optional[str] = None) -> str: message = _('I would like to add you to my contact list.') if account is None: return message - - message = app.settings.get_account_setting(account, 'subscription_request_msg') + + message = app.settings.get_account_setting( + account, 'subscription_request_msg') if message: return message @@ -928,7 +929,7 @@ def func_wrapper(self, event, *args, **kwargs): if getattr(event, attr1) != getattr(self, attr2): return None except AttributeError: - if getattr(event, attr1) != getattr(self, '_%s' % attr2): + if getattr(event, attr1) != getattr(self, f'_{attr2}'): return None return func(self, event, *args, **kwargs) @@ -1167,7 +1168,7 @@ def to_user_string(error: StanzaError) -> str: condition = error.condition if error.app_condition is not None: - return '%s (%s)' % (condition, error.app_condition) + return f'{condition} ({error.app_condition})' return condition View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1cd0e8ab9e064928f151efca79651a52… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1cd0e8ab9e064928f151efca79651a52… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 8 commits: ScrolledView: Typing
by Daniel Brötzmann (＠wurstsalat) 23 Nov '21

23 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: fcd3a2e9 by wurstsalat at 2021-11-23T20:05:24+01:00 ScrolledView: Typing - - - - - c3c40271 by wurstsalat at 2021-11-23T21:24:26+01:00 Types: Add ConversationRowType - - - - - 1f3948db by wurstsalat at 2021-11-23T22:50:42+01:00 Conversation Rows: Typing - - - - - 5e95fe18 by wurstsalat at 2021-11-23T22:50:45+01:00 ConversationView: Typing - - - - - f0d73b49 by wurstsalat at 2021-11-23T22:50:45+01:00 Conversation Widgets: Typing - - - - - def5a560 by wurstsalat at 2021-11-23T22:58:20+01:00 Chat Controls: Use ControlType for typing - - - - - e38d1fde by wurstsalat at 2021-11-23T23:04:15+01:00 AccountPage: Typing - - - - - a75088ca by wurstsalat at 2021-11-23T23:04:28+01:00 AccountSideBar: Typing - - - - - 25 changed files: - gajim/common/helpers.py - gajim/gtk/account_page.py - gajim/gtk/account_side_bar.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/conversation/code_widget.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/quote_widget.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/call.py - gajim/gtk/conversation/rows/command_output.py - gajim/gtk/conversation/rows/date.py - gajim/gtk/conversation/rows/file_transfer.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/muc_join_left.py - gajim/gtk/conversation/rows/muc_subject.py - gajim/gtk/conversation/rows/muc_user_status.py - gajim/gtk/conversation/rows/read_marker.py - gajim/gtk/conversation/rows/scroll_hint.py - gajim/gtk/conversation/scrolled.py - gajim/gtk/conversation/view.py - gajim/gtk/main.py - gajim/gtk/types.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1160,7 +1160,7 @@ def validate_jid(jid, type_=None): raise ValueError('Not a %s JID' % type_) -def to_user_string(error): +def to_user_string(error: StanzaError) -> str: text = error.get_text(get_rfc5646_lang()) if text: return text @@ -1420,7 +1420,7 @@ def get_muc_context(jid): return 'public' -def get_start_of_day(date_time): +def get_start_of_day(date_time: datetime) -> datetime: return date_time.replace(hour=0, minute=0, second=0, ===================================== gajim/gtk/account_page.py ===================================== @@ -35,7 +35,7 @@ class AccountPage(Gtk.Box, EventHelper): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.Box.__init__(self) EventHelper.__init__(self) @@ -101,10 +101,10 @@ def _on_button_release(paned, event): position = paned.get_position() app.settings.set('chat_handle_position', position) - def get_roster(self): + def get_roster(self) -> Roster: return self._roster - def update(self): + def update(self) -> None: account_label = app.settings.get_account_setting( self._account, 'account_label') self._ui.account_label.set_text(account_label) ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -12,6 +12,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 List +from typing import Optional + from gi.repository import Gtk from gajim.common.const import AvatarSize @@ -20,7 +23,7 @@ class AccountSideBar(Gtk.ListBox): - def __init__(self): + def __init__(self) -> None: Gtk.ListBox.__init__(self) self.set_vexpand(True) self.set_valign(Gtk.Align.END) @@ -28,14 +31,14 @@ def __init__(self): self.get_style_context().add_class('account-sidebar') self.connect('row-activated', self._on_row_activated) - self._accounts = list(app.connections.keys()) + self._accounts: List[str] = list(app.connections.keys()) for account in self._accounts: self.add_account(account) - def add_account(self, account): + def add_account(self, account: str) -> None: self.add(Account(account)) - def remove_account(self, account): + def remove_account(self, account: str) -> None: for row in self.get_children(): if row.account == account: row.destroy() @@ -45,7 +48,7 @@ def remove_account(self, account): def _on_row_activated(_listbox, row): app.window.show_account_page(row.account) - def activate_account_page(self, account): + def activate_account_page(self, account: str) -> None: row = self.get_selected_row() if row is not None and row.account == account: return @@ -54,12 +57,12 @@ def activate_account_page(self, account): class Account(Gtk.ListBoxRow): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ListBoxRow.__init__(self) self.get_style_context().add_class('account-sidebar-item') self.account = account - self._account_class = None + self._account_class: Optional[str] = None selection_bar = Gtk.Box() selection_bar.set_size_request(6, -1) @@ -83,7 +86,7 @@ def __init__(self, account): self.add(account_box) self.show_all() - def _update_account_color(self): + def _update_account_color(self) -> None: context = self._account_color_bar.get_style_context() if self._account_class is not None: context.remove_class(self._account_class) @@ -91,12 +94,12 @@ def _update_account_color(self): self._account_class = app.css_config.get_dynamic_class(self.account) context.add_class(self._account_class) - def update(self): + def update(self) -> None: self._update_account_color() class AccountAvatar(Gtk.Image): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.Image.__init__(self) self._account = account @@ -115,7 +118,7 @@ def _on_presence_update(self, _contact, _signal_name): def _on_avatar_update(self, _contact, _signal_name): self._update_image() - def _update_image(self): + def _update_image(self) -> None: surface = self._contact.get_avatar(AvatarSize.ACCOUNT_SIDE_BAR, self.get_scale_factor(), style='round-corners') ===================================== gajim/gtk/chat_page.py ===================================== @@ -24,13 +24,13 @@ from gajim.common import app -from .controls.base import BaseControl from .util import get_builder from .chat_filter import ChatFilter from .chat_list import ChatList from .chat_list_stack import ChatListStack from .chat_stack import ChatStack from .search_view import SearchView +from .types import ControlType class ChatPage(Gtk.Box): @@ -82,7 +82,7 @@ def __init__(self): self._ui.paned.set_position(app.settings.get('chat_handle_position')) self._ui.paned.connect('button-release-event', self._on_button_release) - self._currently_loaded_control: Optional[BaseControl] = None + self._currently_loaded_control: Optional[ControlType] = None self._startup_finished: bool = False self._add_actions() @@ -275,20 +275,20 @@ def remove_chats_for_account(self, account: str) -> None: self._chat_list_stack.remove_chats_for_account(account) self._chat_stack.remove_chats_for_account(account) - def get_control(self, account: str, jid: JID) -> Optional[BaseControl]: + def get_control(self, account: str, jid: JID) -> Optional[ControlType]: return self._chat_stack.get_control(account, jid) - def get_active_control(self) -> Optional[BaseControl]: + def get_active_control(self) -> Optional[ControlType]: chat = self._chat_list_stack.get_selected_chat() if chat is None: return None return self.get_control(chat.account, chat.jid) - def get_currently_loaded_control(self) -> Optional[BaseControl]: + def get_currently_loaded_control(self) -> Optional[ControlType]: return self._currently_loaded_control def get_controls(self, account: Optional[str] - ) -> Generator[BaseControl, None, None]: + ) -> Generator[ControlType, None, None]: return self._chat_stack.get_controls(account) def hide_search(self) -> bool: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -27,11 +27,11 @@ from gajim.common import ged from gajim.common.i18n import _ -from .controls.base import BaseControl from .controls.chat import ChatControl from .controls.groupchat import GroupchatControl from .controls.private import PrivateChatControl +from .types import ControlType from .util import EventHelper log = logging.getLogger('gajim.gui.chatstack') @@ -53,17 +53,17 @@ def __init__(self): ]) self.show_all() - self._controls: Dict[Tuple[str, JID], BaseControl] = {} - self._active_control: Optional[BaseControl] = None + self._controls: Dict[Tuple[str, JID], ControlType] = {} + self._active_control: Optional[ControlType] = None - def get_control(self, account: str, jid: JID) -> Optional[BaseControl]: + def get_control(self, account: str, jid: JID) -> Optional[ControlType]: try: return self._controls[(account, jid)] except KeyError: return None def get_controls(self, account: Optional[str] - ) -> Generator[BaseControl, None, None]: + ) -> Generator[ControlType, None, None]: if account is None: for control in self._controls.values(): yield control ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -28,7 +28,7 @@ class CodeWidget(Gtk.Box): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) self.set_vexpand(True) self.get_style_context().add_class('code-widget') @@ -76,7 +76,7 @@ def add_content(self, block): self._textview.print_code(code) @staticmethod - def _prepare_code(text): + def _prepare_code(text: str) -> Tuple[str, str]: code_start = text.partition('\n')[0] lang = None if len(code_start) > 3: @@ -87,7 +87,7 @@ def _prepare_code(text): class CodeTextview(GtkSource.View): - def __init__(self): + def __init__(self) -> None: GtkSource.View.__init__(self) self.set_editable(False) self.set_cursor_visible(False) @@ -107,7 +107,7 @@ def __init__(self): if style_scheme is not None: self.get_buffer().set_style_scheme(style_scheme) - def set_language(self, language_string): + def set_language(self, language_string: Optional[str]) -> None: if language_string is None: lang = self._source_manager.get_language('python3') else: @@ -116,12 +116,12 @@ def set_language(self, language_string): self.get_buffer().set_language(lang) return lang.get_name() - def get_code(self): + def get_code(self) -> str: buffer_ = self.get_buffer() start, end = buffer_.get_bounds() return buffer_.get_text(start, end, False) - def print_code(self, code): + def print_code(self, code: str) -> None: self.set_show_line_numbers(True) buffer_ = self.get_buffer() buffer_.insert(buffer_.get_start_iter(), code) ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -20,7 +20,7 @@ class MessageWidget(Gtk.Box): - def __init__(self, account, selectable=True): + def __init__(self, account: str, selectable: bool = True) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) self._account = account self._selectable = selectable @@ -59,7 +59,7 @@ def add_content(self, content): self.show_all() - def clear(self): + def clear(self) -> None: self.foreach(self.remove) def update_text_tags(self, *args): ===================================== gajim/gtk/conversation/quote_widget.py ===================================== @@ -12,12 +12,15 @@ # 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 .message_widget import MessageWidget + class QuoteWidget(Gtk.Box): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.Box.__init__(self) self.set_vexpand(True) self.get_style_context().add_class('conversation-quote') @@ -29,11 +32,12 @@ def __init__(self, account): self._account = account - self._message_widget = None + self._message_widget: Optional[MessageWidget] = None - def attach_message_widget(self, message_widget): + def attach_message_widget(self, message_widget: MessageWidget) -> None: # Purpose of this method is to prevent circular imports if self._message_widget is not None: - raise ValueError('QuoteWidget already has a MessageWidget attached') + raise ValueError( + 'QuoteWidget already has a MessageWidget attached') self._message_widget = message_widget self.add(message_widget) ===================================== gajim/gtk/conversation/rows/base.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 datetime import datetime from gi.repository import GLib @@ -27,18 +29,18 @@ class BaseRow(Gtk.ListBoxRow): - def __init__(self, account, widget=None): + def __init__(self, account: str, widget: Optional[str] = None) -> None: Gtk.ListBoxRow.__init__(self) self._account = account self._client = app.get_client(account) - self.type = '' - self.timestamp = None - self.kind = None - self.name = None - self.message_id = None - self.log_line_id = None - self.text = '' - self._merged = False + self.type: str = '' + self.timestamp: datetime = datetime.fromtimestamp(0) + self.kind: Optional[str] = None + self.name: Optional[str] = None + self.message_id: Optional[str] = None + self.log_line_id: Optional[str] = None + self.text: str = '' + self._merged: bool = False self.get_style_context().add_class('conversation-row') @@ -53,10 +55,10 @@ def __init__(self, account, widget=None): self.label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) @property - def is_merged(self): + def is_merged(self) -> bool: return self._merged - def update_text_tags(self): + def update_text_tags(self) -> None: pass @staticmethod ===================================== gajim/gtk/conversation/rows/call.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 + import time from datetime import datetime @@ -21,6 +23,7 @@ from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.i18n import _ +from gajim.common.jingle_session import JingleSession from .widgets import SimpleLabel from .base import BaseRow @@ -46,7 +49,8 @@ def __init__(self, account, contact, event=None, db_message=None): self._contact = contact self._event = event self._db_message = db_message - self._session = None + + self._session: Optional[JingleSession] = None if is_from_db: sid = db_message.additional_data.get_value('gajim', 'sid') @@ -70,7 +74,7 @@ def __init__(self, account, contact, event=None, db_message=None): self.show_all() - def update(self): + def update(self) -> None: if self._event is None and self._session is None: return @@ -90,7 +94,7 @@ def _on_accept(self, button): else: self.get_parent().accept_call(self._session) - def _on_decline(self, button): + def _on_decline(self, _button): if self._event is not None: session = self._client.get_module('Jingle').get_jingle_session( self._event.fjid, self._event.sid) @@ -99,7 +103,7 @@ def _on_decline(self, button): self.get_parent().decline_call(self._session) self._session = None - def _add_history_call_widget(self): + def _add_history_call_widget(self) -> None: if self._db_message is not None: if self._db_message.kind == KindConstant.CALL_INCOMING: contact = self._contact @@ -141,7 +145,7 @@ def _add_history_call_widget(self): self.grid.attach(content_box, 1, 1, 1, 1) self.show_all() - def _add_incoming_call_widget(self): + def _add_incoming_call_widget(self) -> None: self._call_box = Gtk.Box( orientation=Gtk.Orientation.VERTICAL, spacing=6) self._call_box.set_size_request(350, -1) ===================================== gajim/gtk/conversation/rows/command_output.py ===================================== @@ -25,7 +25,7 @@ class CommandOutputRow(BaseRow): - def __init__(self, account, text, is_error): + def __init__(self, account: str, text: str, is_error: bool) -> None: BaseRow.__init__(self, account) self.type = 'command_output' ===================================== gajim/gtk/conversation/rows/date.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from datetime import datetime from gi.repository import Gtk @@ -19,7 +20,7 @@ class DateRow(BaseRow): - def __init__(self, account, timestamp): + def __init__(self, account: str, timestamp: datetime) -> None: BaseRow.__init__(self, account, widget='label') self.set_selectable(False) ===================================== gajim/gtk/conversation/rows/file_transfer.py ===================================== @@ -21,6 +21,7 @@ from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.i18n import _ +from gajim.common.modules.httpupload import HTTPFileTransfer from .base import BaseRow @@ -31,7 +32,7 @@ class FileTransferRow(BaseRow, EventHelper): - def __init__(self, account, transfer): + def __init__(self, account: str, transfer: HTTPFileTransfer) -> None: BaseRow.__init__(self, account) EventHelper.__init__(self) @@ -40,7 +41,7 @@ def __init__(self, account, transfer): self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp - self._destroyed = False + self._destroyed: bool = False if app.settings.get('use_kib_mib'): self._units = GLib.FormatSizeFlags.IEC_UNITS ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.py ===================================== @@ -24,6 +24,7 @@ from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import KindConstant +from gajim.common.file_props import FileProp from gajim.common.file_props import FilesProp from gajim.common.helpers import open_file from gajim.common.i18n import _ @@ -130,7 +131,7 @@ def __init__(self, account, contact, event=None, db_message=None): app.ged.register_event_handler('jingle-ft-cancelled-received', ged.GUI1, self.process_event) # pylint: enable=line-too-long - def _reconstruct_transfer(self): + def _reconstruct_transfer(self) -> None: self._show_file_infos() if self._file_props is None: self._ui.transfer_action.set_text(_('File Transfer')) @@ -154,7 +155,7 @@ def _reconstruct_transfer(self): self._ui.transfer_action.set_text(_('File Offered…')) - def _display_transfer_info(self, event_name): + def _display_transfer_info(self, event_name: str) -> None: if event_name == 'file-request-sent': self._ui.action_stack.set_visible_child_name('progress') self._ui.progress_label.set_text(_('Waiting…')) @@ -162,7 +163,7 @@ def _display_transfer_info(self, event_name): self._ui.transfer_action.set_text(_('File Offered…')) self._show_file_infos() - def _show_file_infos(self): + def _show_file_infos(self) -> None: if self._file_props is None: self._ui.file_name.hide() self._ui.file_description.hide() @@ -227,7 +228,7 @@ def process_event(self, event): elif event.name == 'file-progress': self._update_progress(event.file_props) - def _update_progress(self, file_props): + def _update_progress(self, file_props: FileProp) -> None: self._ui.action_stack.set_visible_child_name('progress') self._ui.transfer_action.set_text(_('Transferring File…')) @@ -267,7 +268,7 @@ def _update_progress(self, file_props): self._ui.progress_bar.set_fraction(progress) - def _show_error(self, file_props): + def _show_error(self, file_props: FileProp) -> None: self._ui.action_stack.set_visible_child_name('error') self._ui.transfer_action.set_text(_('File Transfer Stopped')) if file_props.error == -1: @@ -280,7 +281,7 @@ def _show_error(self, file_props): else: self._ui.error_label.set_text(_('An error occurred')) - def _show_completed(self): + def _show_completed(self) -> None: self._ui.action_stack.set_visible_child_name('complete') self._ui.transfer_action.set_text(_('File Transfer Completed')) ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -25,7 +25,7 @@ class InfoMessage(BaseRow): - def __init__(self, account, text): + def __init__(self, account: str, text: str) -> None: BaseRow.__init__(self, account) self.type = 'info' ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -12,6 +12,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 Union + from datetime import datetime from datetime import timedelta @@ -19,15 +22,25 @@ from gi.repository import GLib from gi.repository import Gtk +import cairo + +from nbxmpp.errors import StanzaError +from nbxmpp.modules.security_labels import Displaymarking + from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.const import TRUST_SYMBOL_DATA +from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_muc_context from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.styling import process +from gajim.common.styling import ParsingResult from gajim.common.i18n import _ from gajim.common.i18n import Q_ @@ -37,28 +50,32 @@ from ...dialogs import InputDialog from ...dialogs import DialogButton from ...preview import PreviewWidget +from ...types import ConversationRowType from ...util import format_fingerprint from ...util import get_cursor MERGE_TIMEFRAME = timedelta(seconds=120) +# TODO: +ContactType = Union[BareContact, GroupchatContact, GroupchatParticipant] + class MessageRow(BaseRow): def __init__(self, - account, - contact, - message_id, - stanza_id, - timestamp, - kind, - name, - text, - additional_data=None, - display_marking=None, - marker=None, - error=None, - encryption_enabled=False, - log_line_id=None): + account: str, + contact: ContactType, + message_id: Optional[str], + stanza_id: Optional[str], + timestamp: float, + kind: str, + name: str, + text: str, + additional_data: Optional[AdditionalDataDict] = None, + display_marking: Optional[Displaymarking] = None, + marker: Optional[str] = None, + error: Optional[StanzaError] = None, + encryption_enabled: bool =False, + log_line_id: Optional[str] = None) -> None: BaseRow.__init__(self, account) self.type = 'chat' @@ -73,12 +90,13 @@ def __init__(self, self.additional_data = additional_data self._contact = contact - self._is_groupchat = False + + self._is_groupchat: bool = False if contact is not None and contact.is_groupchat: self._is_groupchat = True - self._has_receipt = marker == 'received' - self._has_displayed = marker == 'displayed' + self._has_receipt: bool = marker == 'received' + self._has_displayed: bool = marker == 'displayed' # Keep original text for message correction self._original_text: str = text @@ -192,10 +210,10 @@ def __init__(self, self.show_all() - def update_text_tags(self): + def update_text_tags(self) -> None: self._message_widget.update_text_tags() - def _check_for_highlight(self, content): + def _check_for_highlight(self, content: ParsingResult) -> None: needs_highlight = message_needs_highlight( content.text, self._contact.nickname, @@ -204,7 +222,7 @@ def _check_for_highlight(self, content): self.get_style_context().add_class( 'gajim-mention-highlight') - def _get_avatar(self, kind, name): + def _get_avatar(self, kind: str, name: str) -> Optional[cairo.Surface]: if self._contact is None: return None @@ -229,10 +247,10 @@ def _on_avatar_clicked(self, _widget, event, name): def _on_realize(event_box): event_box.get_window().set_cursor(get_cursor('pointer')) - def is_same_sender(self, message): + def is_same_sender(self, message: MessageRow) -> bool: return message.name == self.name - def is_same_encryption(self, message): + def is_same_encryption(self, message: MessageRow) -> bool: message_details = self._get_encryption_details(message.additional_data) own_details = self._get_encryption_details(self.additional_data) if message_details is None and own_details is None: @@ -245,7 +263,7 @@ def is_same_encryption(self, message): return True return False - def is_mergeable(self, message): + def is_mergeable(self, message: ConversationRowType) -> bool: if message.type != self.type: return False if not self.is_same_sender(message): ===================================== gajim/gtk/conversation/rows/muc_join_left.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 + import time from datetime import datetime @@ -25,7 +27,9 @@ class MUCJoinLeft(BaseRow): - def __init__(self, type_, account, nick, reason=None, error=False): + def __init__(self, type_: str, account: str, nick: str, + reason: Optional[str] = None, + error: bool = False): BaseRow.__init__(self, account) self.type = type_ @@ -64,8 +68,9 @@ def __init__(self, type_, account, nick, reason=None, error=False): self.show_all() @staticmethod - def _make_left_message(nick, reason, error): - reason = '' if reason is None else ': {reason}'.format(reason=reason) + def _make_left_message(nick: str, reason: Optional[str], + error: bool) -> str: + reason = '' if reason is None else f': {reason}' if error: # Group Chat: User was kicked because of an server error: reason @@ -78,5 +83,5 @@ def _make_left_message(nick, reason, error): return message @staticmethod - def _make_join_message(nick): + def _make_join_message(nick: str) -> str: return _('%s has joined') % nick ===================================== gajim/gtk/conversation/rows/muc_subject.py ===================================== @@ -15,7 +15,6 @@ import time from datetime import datetime -from gi.repository import GLib from gi.repository import Gtk from gajim.common.const import AvatarSize @@ -30,7 +29,7 @@ class MUCSubject(BaseRow): type = 'muc-subject' - def __init__(self, account, text, nick, date): + def __init__(self, account: str, text: str, nick: str, date: str) -> None: BaseRow.__init__(self, account) timestamp = time.time() ===================================== gajim/gtk/conversation/rows/muc_user_status.py ===================================== @@ -17,9 +17,10 @@ from gi.repository import Gtk +from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.i18n import _ from gajim.common.const import AvatarSize -from gajim.common import helpers +from gajim.common.helpers import get_uf_show from gajim.common.styling import process from .widgets import SimpleLabel @@ -31,7 +32,8 @@ class MUCUserStatus(BaseRow): - def __init__(self, account, user_contact, is_self): + def __init__(self, account: str, user_contact: GroupchatParticipant, + is_self: bool) -> None: BaseRow.__init__(self, account) self.type = 'muc-user-status' @@ -73,9 +75,10 @@ def __init__(self, account, user_contact, is_self): self.show_all() @staticmethod - def _make_show_text(user_contact, is_self): + def _make_show_text(user_contact: GroupchatParticipant, + is_self: bool) -> str: nick = user_contact.name - show = helpers.get_uf_show(user_contact.show.value) + show = get_uf_show(user_contact.show.value) if is_self: message = _('You are now {show}').format(show=show) ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -43,7 +43,7 @@ def _on_nickname_update(self, contact, _signal_name): text = _('%s has read up to this point') % contact.name self.label.set_text(text) - def set_timestamp(self, timestamp): + def set_timestamp(self, timestamp: datetime) -> None: if timestamp < self._last_incoming_timestamp: return @@ -53,6 +53,6 @@ def set_timestamp(self, timestamp): self.set_no_show_all(False) self.show_all() - def set_last_incoming_timestamp(self, timestamp): + def set_last_incoming_timestamp(self, timestamp: datetime) -> None: if timestamp > self._last_incoming_timestamp: self._last_incoming_timestamp = timestamp ===================================== gajim/gtk/conversation/rows/scroll_hint.py ===================================== @@ -22,7 +22,7 @@ class ScrollHintRow(BaseRow): - def __init__(self, account): + def __init__(self, account: str) -> None: BaseRow.__init__(self, account, widget='label') self.set_selectable(False) self.set_activatable(False) @@ -40,7 +40,7 @@ def __init__(self, account): self.set_history_complete(False) - def set_history_complete(self, complete): + def set_history_complete(self, complete: bool) -> None: if complete: self.label.set_text(_('There is no more history')) else: ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -12,9 +12,13 @@ # 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 GObject +from .view import ConversationView + class ScrolledView(Gtk.ScrolledWindow): @@ -52,24 +56,24 @@ def __init__(self, *args, **kwargs): # horizontally under certain conditions (applies to GroupchatControl) self.get_hscrollbar().hide() - self._current_upper = 0 - self._autoscroll = True - self._request_history_at_upper = None - self._upper_complete = False - self._lower_complete = False - self._requesting = None + self._current_upper: int = 0 + self._autoscroll: bool = True + self._request_history_at_upper: Optional[float] = None + self._upper_complete: bool = False + self._lower_complete: bool = False + self._requesting: Optional[str] = None vadjustment = self.get_vadjustment() vadjustment.connect('notify::upper', self._on_adj_upper_changed) vadjustment.connect('notify::value', self._on_adj_value_changed) - def get_autoscroll(self): + def get_autoscroll(self) -> bool: return self._autoscroll - def get_view(self): + def get_view(self) -> ConversationView: return self.get_child().get_child() - def reset(self): + def reset(self) -> None: self._current_upper = 0 self._request_history_at_upper = None self._upper_complete = False @@ -77,14 +81,14 @@ def reset(self): self._requesting = None self.set_history_complete(True, False) - def set_history_complete(self, before, complete): + def set_history_complete(self, before: bool, complete: bool) -> None: if before: self._upper_complete = complete self.get_view().set_history_complete(complete) else: self._lower_complete = complete - def get_lower_complete(self): + def get_lower_complete(self) -> bool: return self._lower_complete def _on_adj_upper_changed(self, adj, *args): ===================================== gajim/gtk/conversation/view.py ===================================== @@ -12,20 +12,31 @@ # 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 Set from typing import Optional +from typing import Generator import logging import time +from datetime import datetime from datetime import timedelta from gi.repository import GLib from gi.repository import GObject from gi.repository import Gtk +from nbxmpp.errors import StanzaError +from nbxmpp.modules.security_labels import Displaymarking + from gajim.common import app +from gajim.common.client import Client +from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day +from gajim.common.modules.contacts import GroupchatParticipant +from gajim.common.modules.httpupload import HTTPFileTransfer from .rows.read_marker import ReadMarkerRow from .rows.scroll_hint import ScrollHintRow @@ -39,6 +50,8 @@ from .rows.muc_subject import MUCSubject from .rows.muc_join_left import MUCJoinLeft from .rows.muc_user_status import MUCUserStatus + +from ..types import ConversationRowType from ..util import scroll_to_end log = logging.getLogger('gajim.gui.conversation_view') @@ -75,24 +88,24 @@ def __init__(self, account, contact): self.set_sort_func(self._sort_func) self.set_filter_func(self._filter_func) self._account = account - self._client = None + self._client: Optional[Client] = None if account is not None: self._client = app.get_client(account) self._contact = contact - self.encryption_enabled = False - self.autoscroll = True - self.locked = False + self.encryption_enabled: bool = False + self.autoscroll: bool = True + self.locked: bool = False # Keeps track of the number of rows shown in ConversationView - self._row_count = 0 - self._max_row_count = 100 + self._row_count: int = 0 + self._max_row_count: int = 100 # Keeps track of date rows we have added to the list - self._active_date_rows = set() + self._active_date_rows: Set[datetime] = set() # message_id -> row mapping - self._message_id_row_map = {} + self._message_id_row_map: Dict[str, MessageRow] = {} app.settings.connect_signal('print_join_left', self._on_contact_setting_changed, @@ -111,31 +124,31 @@ def __init__(self, account, contact): self._scroll_hint_row = ScrollHintRow(self._account) self.add(self._scroll_hint_row) - def lock(self): + def lock(self) -> None: self.locked = True - def unlock(self): + def unlock(self) -> None: self.locked = False - def clear(self): + def clear(self) -> None: for row in self.get_children()[2:]: if row.type == 'read_marker': continue self.remove(row) self._reset_conversation_view() - def _reset_conversation_view(self): + def _reset_conversation_view(self) -> None: self._row_count = 0 self._active_date_rows = set() self._message_id_row_map = {} - def get_first_message_row(self): + def get_first_message_row(self) -> Optional[MessageRow]: for row in self.get_children(): if isinstance(row, MessageRow): return row return None - def get_last_message_row(self): + def get_last_message_row(self) -> Optional[MessageRow]: children = self.get_children() children.reverse() for row in children: @@ -143,7 +156,7 @@ def get_last_message_row(self): return row return None - def set_history_complete(self, complete): + def set_history_complete(self, complete: bool) -> None: self._scroll_hint_row.set_history_complete(complete) @staticmethod @@ -160,11 +173,12 @@ def _filter_func(self, row): return True - def add_muc_subject(self, text, nick, date): + def add_muc_subject(self, text: str, nick: str, date: str) -> None: subject = MUCSubject(self._account, text, nick, date) self._insert_message(subject) - def add_muc_user_left(self, nick, reason, error=False): + def add_muc_user_left(self, nick: str, reason: str, + error: bool = False) -> None: join_left = MUCJoinLeft('muc-user-left', self._account, nick, @@ -172,21 +186,22 @@ def add_muc_user_left(self, nick, reason, error=False): error=error) self._insert_message(join_left) - def add_muc_user_joined(self, nick): + def add_muc_user_joined(self, nick: str) -> None: join_left = MUCJoinLeft('muc-user-joined', self._account, nick) self._insert_message(join_left) - def add_muc_user_status(self, user_contact, is_self): + def add_muc_user_status(self, user_contact: GroupchatParticipant, + is_self: bool) -> None: user_status = MUCUserStatus(self._account, user_contact, is_self) self._insert_message(user_status) - def add_info_message(self, text): + def add_info_message(self, text: str) -> None: message = InfoMessage(self._account, text) self._insert_message(message) - def add_file_transfer(self, transfer): + def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: transfer_row = FileTransferRow(self._account, transfer) self._insert_message(transfer_row) @@ -200,22 +215,22 @@ def add_call_message(self, event=None, db_message=None): self._account, self._contact, event=event, db_message=db_message) self._insert_message(call_row) - def add_command_output(self, text, is_error): + def add_command_output(self, text: str, is_error: bool) -> None: command_output_row = CommandOutputRow(self._account, text, is_error) self._insert_message(command_output_row) def add_message(self, - text, - kind, - name, - timestamp, - log_line_id=None, - message_id=None, - stanza_id=None, - display_marking=None, - additional_data=None, - marker=None, - error=None): + text: str, + kind: str, + name: str, + timestamp: float, + log_line_id: Optional[str] = None, + message_id: Optional[str] = None, + stanza_id: Optional[str] = None, + display_marking: Optional[Displaymarking] = None, + additional_data: Optional[AdditionalDataDict] = None, + marker: Optional[str] = None, + error: Optional[StanzaError] = None) -> None: if not timestamp: timestamp = time.time() @@ -237,17 +252,19 @@ def add_message(self, log_line_id=log_line_id) if message.type == 'chat': - self._message_id_row_map[message_id] = message + if message_id is not None: + self._message_id_row_map[message_id] = message if kind == 'incoming': self._read_marker_row.set_last_incoming_timestamp( message.timestamp) - if marker is not None and marker == 'displayed': + if (marker is not None and marker == 'displayed' + and message_id is not None): self.set_read_marker(message_id) self._insert_message(message) - def _insert_message(self, message): + def _insert_message(self, message: MessageRow) -> None: self.add(message) self._add_date_row(message.timestamp) self._check_for_merge(message) @@ -258,7 +275,7 @@ def _insert_message(self, message): GLib.idle_add(message.queue_resize) - def _add_date_row(self, timestamp): + def _add_date_row(self, timestamp: datetime) -> None: start_of_day = get_start_of_day(timestamp) if start_of_day in self._active_date_rows: return @@ -276,7 +293,7 @@ def _add_date_row(self, timestamp): row.set_merged(False) - def _check_for_merge(self, message): + def _check_for_merge(self, message: ConversationRowType) -> None: if message.type != 'chat': return @@ -290,7 +307,7 @@ def _check_for_merge(self, message): if message.is_mergeable(ancestor): message.set_merged(True) - def _find_ancestor(self, message): + def _find_ancestor(self, message: MessageRow) -> Optional[MessageRow]: index = message.get_index() while index != 0: index -= 1 @@ -311,7 +328,7 @@ def _find_ancestor(self, message): return row return None - def _update_descendants(self, message): + def _update_descendants(self, message: MessageRow) -> None: index = message.get_index() while True: index += 1 @@ -334,7 +351,7 @@ def _update_descendants(self, message): self._update_descendants(row) return - def reduce_message_count(self, before): + def reduce_message_count(self, before: bool) -> bool: success = False row_count = len(self.get_children()) while row_count > self._max_row_count: @@ -349,7 +366,7 @@ def reduce_message_count(self, before): return success - def _reduce_messages_before(self): + def _reduce_messages_before(self) -> bool: success = False # We want to keep relevant DateRows when removing rows @@ -375,11 +392,11 @@ def _reduce_messages_before(self): return success - def _reduce_messages_after(self): + def _reduce_messages_after(self) -> None: row = self.get_row_at_index(len(self.get_children()) - 1) self.remove(row) - def scroll_to_message_and_highlight(self, log_line_id): + def scroll_to_message_and_highlight(self, log_line_id: str) -> None: highlight_row = None for row in self.get_children(): row.get_style_context().remove_class( @@ -393,10 +410,10 @@ def scroll_to_message_and_highlight(self, log_line_id): # This scrolls the ListBox to the highlighted row highlight_row.grab_focus() - def _get_row_by_message_id(self, id_): + def _get_row_by_message_id(self, id_: str) -> Optional[MessageRow]: return self._message_id_row_map.get(id_) - def get_row_by_log_line_id(self, log_line_id): + def get_row_by_log_line_id(self, log_line_id: str) -> Optional[MessageRow]: for row in self.get_children(): if row.log_line_id == log_line_id: return row @@ -410,16 +427,16 @@ def get_row_by_stanza_id(self, stanza_id: str) -> Optional[MessageRow]: return row return None - def iter_rows(self): + def iter_rows(self) -> Generator[ConversationRowType, None, None]: for row in self.get_children(): yield row - def update_call_rows(self): + def update_call_rows(self) -> None: for row in self.get_children(): if row.type == 'call': row.update() - def set_read_marker(self, id_): + def set_read_marker(self, id_: str) -> None: if id_ is None: return @@ -435,16 +452,16 @@ def set_read_marker(self, id_): self._read_marker_row.set_timestamp(timestamp) - def update_avatars(self): + def update_avatars(self) -> None: for row in self.get_children(): if row.type == 'chat': row.update_avatar() - def update_text_tags(self): + def update_text_tags(self) -> None: for row in self.get_children(): row.update_text_tags() - def scroll_to_end(self, force=False): + def scroll_to_end(self, force: bool = False) -> None: if self.autoscroll or force: GLib.idle_add(scroll_to_end, self.get_parent().get_parent()) @@ -459,21 +476,21 @@ def show_message_retraction(self, stanza_id: str, text: str) -> None: if message_row is not None: message_row.set_retracted(text) - def show_receipt(self, id_): + def show_receipt(self, id_: str) -> None: message_row = self._get_row_by_message_id(id_) if message_row is not None: message_row.set_receipt() - def show_error(self, id_, error): + def show_error(self, id_: str, error: StanzaError) -> None: message_row = self._get_row_by_message_id(id_) if message_row is not None: message_row.set_error(to_user_string(error)) message_row.set_merged(False) - def on_quote(self, text): + def on_quote(self, text: str) -> None: self.emit('quote', text) - def on_mention(self, name): + def on_mention(self, name: str) -> None: self.emit('mention', name) def accept_call(self, event): ===================================== gajim/gtk/main.py ===================================== @@ -19,7 +19,6 @@ from gajim.common.nec import EventHelper from gajim.common.modules.bytestream import is_transfer_active -from .controls.base import BaseControl from .adhoc import AdHocCommand from .account_side_bar import AccountSideBar from .app_side_bar import AppSideBar @@ -30,6 +29,7 @@ from .dialogs import DialogButton from .dialogs import ConfirmationDialog from .dialogs import ConfirmationCheckDialog +from .types import ControlType from .util import get_builder from .util import resize_window from .util import restore_main_window_position @@ -470,17 +470,17 @@ def add_app_message(self, category: str, message: Optional[str] = None) -> None: self._app_page.add_app_message(category, message) - def get_control(self, account: str, jid: JID) -> Optional[BaseControl]: + def get_control(self, account: str, jid: JID) -> Optional[ControlType]: return self._chat_page.get_control(account, jid) def get_controls(self, account: Optional[str] = None - ) -> Generator[BaseControl, None, None]: + ) -> Generator[ControlType, None, None]: return self._chat_page.get_controls(account) - def get_active_control(self) -> Optional[BaseControl]: + def get_active_control(self) -> Optional[ControlType]: return self._chat_page.get_active_control() - def get_currently_loaded_control(self) -> Optional[BaseControl]: + def get_currently_loaded_control(self) -> Optional[ControlType]: return self._chat_page.get_currently_loaded_control() def chat_exists(self, account: str, jid: JID) -> bool: ===================================== gajim/gtk/types.py ===================================== @@ -13,3 +13,43 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. # Types for typechecking + +from typing import Union + +from .controls.chat import ChatControl +from .controls.private import PrivateChatControl +from .controls.groupchat import GroupchatControl +from .conversation.rows.call import CallRow +from .conversation.rows.command_output import CommandOutputRow +from .conversation.rows.date import DateRow +from .conversation.rows.file_transfer_jingle import FileTransferJingleRow +from .conversation.rows.file_transfer import FileTransferRow +from .conversation.rows.info import InfoMessage +from .conversation.rows.message import MessageRow +from .conversation.rows.muc_join_left import MUCJoinLeft +from .conversation.rows.muc_subject import MUCSubject +from .conversation.rows.muc_user_status import MUCUserStatus +from .conversation.rows.read_marker import ReadMarkerRow +from .conversation.rows.scroll_hint import ScrollHintRow + + +ConversationRowType = Union[ + CallRow, + CommandOutputRow, + DateRow, + FileTransferJingleRow, + FileTransferRow, + InfoMessage, + MessageRow, + MUCJoinLeft, + MUCSubject, + MUCUserStatus, + ReadMarkerRow, + ScrollHintRow +] + +ControlType = Union [ + ChatControl, + PrivateChatControl, + GroupchatControl +] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/14fa1c30663200665f5b3487add1b31… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/14fa1c30663200665f5b3487add1b31… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupChatControl: Add management page
by Daniel Brötzmann (＠wurstsalat) 22 Nov '21

22 Nov '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: dac7c137 by Daniel Brötzmann at 2021-11-22T22:30:28+01:00 GroupChatControl: Add management page - - - - - f9eedc12 by Daniel Brötzmann at 2021-11-22T22:38:28+01:00 GroupChatControl: Add avatar selector page - - - - - 3 changed files: - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -123,6 +123,91 @@ </object> </child> </object> + <object class="GtkPopover" id="manage_popover"> + <property name="can_focus">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="manage_change_subject_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_on_change_subject" swapped="no"/> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Change Subject…</property> + </object> + </child> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="manage_advanced_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_on_configure_room" swapped="no"/> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Advanced Settings…</property> + </object> + </child> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="manage_destroy_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_on_destroy_room" swapped="no"/> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Destroy…</property> + </object> + </child> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="padding-6"/> + </style> + </object> + </child> + </object> <object class="GtkBox" id="groupchat_control_hbox"> <property name="can_focus">True</property> <child> @@ -2082,6 +2167,327 @@ <property name="position">14</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">12</property> + <property name="label" translatable="yes">Manage This Chat</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkOverlay"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <child> + <object class="GtkImage" id="avatar_button_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_end">6</property> + <property name="margin_bottom">6</property> + <property name="pixel_size">100</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="index">-1</property> + </packing> + </child> + <child type="overlay"> + <object class="GtkButton" id="avatar_select_button"> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="halign">end</property> + <property name="valign">end</property> + <signal name="clicked" handler="_on_change_avatar" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">document-edit-symbolic</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkEntry" id="muc_description_entry"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="muc_name_entry"> + <property name="width_request">250</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Name</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Description</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkMenuButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="margin_top">12</property> + <property name="direction">up</property> + <property name="popover">manage_popover</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">More…</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">18</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="manage_save_button"> + <property name="label" translatable="yes">Save</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="sensitive">False</property> + <signal name="clicked" handler="_on_manage_save_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <style> + <class name="padding-18"/> + </style> + </object> + <packing> + <property name="name">muc-manage</property> + <property name="position">15</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid" id="avatar_selector_grid"> + <property name="name">settings_grid</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="border_width">18</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="margin_top">6</property> + <property name="spacing">12</property> + <child type="center"> + <object class="GtkButton" id="avatar_update_button"> + <property name="label" translatable="yes">Update</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_on_avatar_update_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Select File…</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <signal name="clicked" handler="_on_avatar_select_file_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Update Avatar</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">avatar-selector</property> + <property name="position">16</property> + </packing> + </child> </object> <packing> <property name="index">-1</property> ===================================== gajim/groupchat_control.py ===================================== @@ -69,6 +69,7 @@ from gajim.gui.filechoosers import AvatarChooserDialog from gajim.gui.groupchat_config import GroupchatConfig from gajim.gui.adhoc import AdHocCommand +from gajim.gui.avatar_selector import AvatarSelector from gajim.gui.dataform import DataFormWidget from gajim.gui.groupchat_info import GroupChatInfoScrolled from gajim.gui.groupchat_invite import GroupChatInvite @@ -179,6 +180,10 @@ def __init__(self, parent_win, contact, muc_data, acct): # Groupchat settings self._groupchat_settings_box = None + # Holds the room’s config form, which is requested when managing + # the room + self._room_config_form = None + # Groupchat invite self.xml.quick_invite_button.set_action_name( 'win.invite-%s' % self.control_id) @@ -187,6 +192,11 @@ def __init__(self, parent_win, contact, muc_data, acct): self.xml.invite_grid.attach(self._invite_box, 0, 0, 1, 1) self._invite_box.connect('listbox-changed', self._on_invite_ready) + # Avatar selector + self._avatar_selector = AvatarSelector() + self._avatar_selector.set_size_request(400, 400) + self.xml.avatar_selector_grid.attach(self._avatar_selector, 0, 1, 1, 1) + self.control_menu = gui_menu_builder.get_groupchat_menu(self.control_id, self.account, self.room_jid) @@ -275,14 +285,11 @@ def add_actions(self): super().add_actions() actions = [ ('groupchat-settings-', None, self._on_groupchat_settings), + ('groupchat-manage-', None, self._on_groupchat_manage), ('rename-groupchat-', None, self._on_rename_groupchat), - ('change-subject-', None, self._on_change_subject), ('change-nickname-', None, self._on_change_nick), ('disconnect-', None, self._on_disconnect), - ('destroy-', None, self._on_destroy_room), - ('configure-', None, self._on_configure_room), ('request-voice-', None, self._on_request_voice), - ('upload-avatar-', None, self._on_upload_avatar), ('information-', None, self._on_information), ('invite-', None, self._on_invite), ('contact-information-', 's', self._on_contact_information), @@ -309,22 +316,8 @@ def update_actions(self, *args): self.account, self.room_jid, self.nick) con = app.connections[self.account] - # Destroy Room - self._get_action('destroy-').set_enabled(self.is_connected and - contact.affiliation.is_owner) - - # Configure Room - self._get_action('configure-').set_enabled( - self.is_connected and contact.affiliation in (Affiliation.ADMIN, - Affiliation.OWNER)) - - self._get_action('request-voice-').set_enabled(self.is_connected and - contact.role.is_visitor) - - # Change Subject - subject_change = self._is_subject_change_allowed() - self._get_action('change-subject-').set_enabled(self.is_connected and - subject_change) + self._get_action('request-voice-').set_enabled( + self.is_connected and contact.role.is_visitor) # Change Nick self._get_action('change-nickname-').set_enabled(self.is_connected) @@ -354,14 +347,31 @@ def update_actions(self, *args): tooltip_text = _('No File Transfer available') self.xml.sendfile_button.set_tooltip_text(tooltip_text) - # Upload Avatar + # Manage chat + self._get_action('groupchat-manage-').set_enabled( + self.is_connected and contact.affiliation in (Affiliation.ADMIN, + Affiliation.OWNER)) + vcard_support = False if self.disco_info is not None: vcard_support = self.disco_info.supports(Namespace.VCARD) - self._get_action('upload-avatar-').set_enabled( - self.is_connected and - vcard_support and - contact.affiliation.is_owner) + self.xml.muc_name_entry.set_text(self.disco_info.muc_name or '') + self.xml.muc_description_entry.set_text( + self.disco_info.muc_description or '') + + if (self.is_connected and vcard_support and + contact.affiliation.is_owner): + self.xml.avatar_select_button.show() + + self.xml.manage_change_subject_button.set_sensitive( + self.is_connected and self._is_subject_change_allowed()) + + self.xml.manage_advanced_button.set_sensitive( + self.is_connected and contact.affiliation in (Affiliation.ADMIN, + Affiliation.OWNER)) + + self.xml.manage_destroy_button.set_sensitive( + self.is_connected and contact.affiliation.is_owner) self._get_action('contact-information-').set_enabled(self.is_connected) @@ -375,14 +385,11 @@ def remove_actions(self): super().remove_actions() actions = [ 'groupchat-settings-', + 'groupchat-manage-', 'rename-groupchat-', - 'change-subject-', 'change-nickname-', 'disconnect-', - 'destroy-', - 'configure-', 'request-voice-', - 'upload-avatar-', 'information-', 'invite-', 'contact-information-', @@ -477,6 +484,36 @@ def _on_groupchat_settings(self, _action, _param): self.xml.settings_scrolled_box.add(self._groupchat_settings_box) self._show_page('muc-settings') + def _on_groupchat_manage(self, _action, _param): + surface = app.interface.avatar_storage.get_muc_surface( + self.account, + self.contact.jid, + AvatarSize.GROUP_INFO, + self.scale_factor) + self.xml.avatar_button_image.set_from_surface(surface) + + self._show_page('muc-manage') + self.xml.manage_save_button.grab_default() + + contact = app.contacts.get_gc_contact( + self.account, self.room_jid, self.nick) + if contact.affiliation.is_owner: + con = app.connections[self.account] + con.get_module('MUC').request_config( + self.room_jid, callback=self._on_manage_form_received) + + def _on_manage_form_received(self, task): + try: + result = task.finish() + except StanzaError as error: + log.info(error) + return + + self.xml.muc_name_entry.set_sensitive(True) + self.xml.muc_description_entry.set_sensitive(True) + self.xml.manage_save_button.set_sensitive(True) + self._room_config_form = result.form + def _on_invite(self, _action, _param): self._invite_box.load_contacts() self._show_page('invite') @@ -497,7 +534,7 @@ def invite(self, contact_jid): _('%s has been invited to this group chat') % contact_jid, message_id=message_id) - def _on_destroy_room(self, _action, _param): + def _on_destroy_room(self, _button): self.xml.destroy_reason_entry.grab_focus() self.xml.destroy_button.grab_default() self._show_page('destroy') @@ -528,7 +565,9 @@ def _on_destroy_confirm(self, _button): con.get_module('MUC').destroy(self.room_jid, reason, jid) self._show_page('groupchat') - def _on_configure_room(self, _action, _param): + def _on_configure_room(self, _button): + self.xml.manage_popover.popdown() + win = get_app_window('GroupchatConfig', self.account, self.room_jid) if win is not None: win.present() @@ -567,22 +606,23 @@ def _on_execute_command(self, _action, param): jid += '/' + nick AdHocCommand(self.account, jid) - def _on_upload_avatar(self, _action, _param): - def _on_accept(filename): - data, sha = app.interface.avatar_storage.prepare_for_publish( - filename) - if sha is None: - self.add_info_message(_('Loading avatar failed')) - return + def _on_change_avatar(self, _button): + def _on_accept(path): + self._avatar_selector.prepare_crop_area(path) + self.xml.avatar_update_button.set_sensitive( + self._avatar_selector.get_prepared()) + self._show_page('avatar-selector') + self.xml.avatar_update_button.grab_default() - vcard = VCard() - vcard.set_avatar(data, 'image/png') + AvatarChooserDialog(_on_accept, + transient_for=self.parent_win.window, + modal=True) - con = app.connections[self.account] - con.get_module('VCardTemp').set_vcard( - vcard, - jid=self.room_jid, - callback=self._on_upload_avatar_result) + def _on_avatar_select_file_clicked(self, _button): + def _on_accept(path): + self._avatar_selector.prepare_crop_area(path) + self.xml.avatar_update_button.set_sensitive( + self._avatar_selector.get_prepared()) AvatarChooserDialog(_on_accept, transient_for=self.parent_win.window, @@ -597,6 +637,27 @@ def _on_upload_avatar_result(self, task): else: self.add_info_message(_('Avatar upload successful')) + def _on_avatar_update_clicked(self, _button): + success, data, _, _ = self._avatar_selector.get_avatar_bytes() + if not success: + self.add_info_message(_('Loading avatar failed')) + return + + sha = app.interface.avatar_storage.save_avatar(data) + if sha is None: + self.add_info_message(_('Loading avatar failed')) + return + + vcard = VCard() + vcard.set_avatar(data, 'image/png') + + client = app.get_client(self.account) + client.get_module('VCardTemp').set_vcard( + vcard, + jid=self.room_jid, + callback=self._on_upload_avatar_result) + self._show_page('groupchat') + def _on_contact_information(self, _action, param): nick = param.get_string() gc_contact = app.contacts.get_gc_contact(self.account, @@ -744,7 +805,6 @@ def _update_avatar(self): self.contact.jid, AvatarSize.CHAT, self.scale_factor) - self.xml.avatar_image.set_from_surface(surface) def draw_banner_text(self): @@ -755,7 +815,7 @@ def draw_banner_text(self): self.xml.banner_name_label.set_text(self.room_name) @event_filter(['jid=room_jid']) - def _on_update_room_avatar(self, event): + def _on_update_room_avatar(self, _event): self._update_avatar() @event_filter(['account']) @@ -2004,8 +2064,27 @@ def _on_rename_clicked(self, _button): self.room_jid, name=new_name) self._show_page('groupchat') - def _on_change_subject(self, _action, _param): - if self._get_current_page() != 'groupchat': + def _on_manage_save_clicked(self, _button): + if self._room_config_form is not None: + name = self.xml.muc_name_entry.get_text() + desc = self.xml.muc_description_entry.get_text() + try: + name_field = self._room_config_form['muc#roomconfig_roomname'] + desc_field = self._room_config_form['muc#roomconfig_roomdesc'] + except KeyError: + pass + else: + name_field.value = name + desc_field.value = desc + + con = app.connections[self.account] + con.get_module('MUC').set_config( + self.room_jid, self._room_config_form) + + self._show_page('groupchat') + + def _on_change_subject(self, _button): + if self._get_current_page() not in ('groupchat', 'muc-manage'): return self.xml.subject_textview.get_buffer().set_text(self.subject) self.xml.subject_textview.grab_focus() ===================================== gajim/gui_menu_builder.py ===================================== @@ -575,13 +575,8 @@ def get_groupchat_menu(control_id, account, jid): groupchat_menu = [ ('win.information-', _('Information')), ('win.groupchat-settings-', _('Settings…')), - (_('Manage Group Chat'), [ - ('win.rename-groupchat-', _('Rename…')), - ('win.change-subject-', _('Change Subject…')), - ('win.upload-avatar-', _('Upload Avatar…')), - ('win.configure-', _('Configure…')), - ('win.destroy-', _('Destroy…')), - ]), + ('win.groupchat-manage-', _('Manage…')), + ('win.rename-groupchat-', _('Rename Chat…')), ('win.change-nickname-', _('Change Nickname…')), ('win.request-voice-', _('Request Voice')), ('win.execute-command-', _('Execute Command…')), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/73decf08d20d08e4f8de0b82ef939d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/73decf08d20d08e4f8de0b82ef939d3… You're receiving this email because of your account on dev.gajim.org.

1 0

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