Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] 2 commits: ChatFilter: Reduce icon size
by Daniel Brötzmann 30 May '21

30 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 84511506 by wurstsalat at 2021-05-30T13:41:04+02:00 ChatFilter: Reduce icon size - - - - - f8e82992 by wurstsalat at 2021-05-30T14:14:39+02:00 Workspaces: Simplify edit and remove - - - - - 5 changed files: - gajim/data/gui/chat_paned.ui - gajim/data/gui/workspace_dialog.ui - gajim/gtk/chat_filter.py - gajim/gtk/chat_page.py - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/data/gui/chat_paned.ui ===================================== @@ -26,16 +26,17 @@ <property name="can-focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkMenuButton" id="workspace_menu_button"> + <object class="GtkButton"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="focus-on-click">False</property> <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Edit workspace…</property> + <signal name="clicked" handler="_on_edit_workspace_clicked" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">open-menu-symbolic</property> + <property name="icon-name">document-edit-symbolic</property> </object> </child> </object> @@ -46,6 +47,22 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkLabel" id="workspace_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">Workspace Label</property> + <property name="ellipsize">end</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <child> <object class="GtkToggleButton" id="filter_bar_toggle"> <property name="visible">True</property> @@ -64,22 +81,6 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="workspace_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label">Workspace Label</property> - <property name="ellipsize">end</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> ===================================== gajim/data/gui/workspace_dialog.ui ===================================== @@ -19,13 +19,46 @@ </packing> </child> <child> - <object class="GtkEntry" id="entry"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="halign">center</property> - <property name="activates-default">True</property> - <property name="xalign">0.5</property> - <signal name="notify::text" handler="_on_text_changed" swapped="no"/> + <property name="can-focus">False</property> + <child type="center"> + <object class="GtkEntry" id="entry"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="halign">center</property> + <property name="activates-default">True</property> + <property name="xalign">0.5</property> + <signal name="notify::text" handler="_on_text_changed" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_workspace_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Remove this workspace</property> + <signal name="clicked" handler="_on_remove_workspace" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">edit-delete-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/chat_filter.py ===================================== @@ -31,6 +31,7 @@ def __init__(self, icons=False): self.set_halign(Gtk.Align.CENTER) toolbar = Gtk.Toolbar() + toolbar.set_icon_size(Gtk.IconSize.MENU) if icons: toolbar.get_style_context().add_class('chat-filter-icons') ===================================== gajim/gtk/chat_page.py ===================================== @@ -28,12 +28,6 @@ from .search_view import SearchView -WORKSPACE_MENU_DICT = { - 'edit': _('Edit…'), - 'remove': _('Remove'), -} - - class ChatPage(Gtk.Box): __gsignals__ = { @@ -46,6 +40,7 @@ def __init__(self): Gtk.Box.__init__(self) self._ui = get_builder('chat_paned.ui') self.add(self._ui.paned) + self._ui.connect_signals(self) self._chat_stack = ChatStack() self._ui.right_grid_overlay.add(self._chat_stack) @@ -81,12 +76,6 @@ 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) - workspace_menu = Gio.Menu() - for action, label in WORKSPACE_MENU_DICT.items(): - workspace_menu.append(label, f'win.{action.lower()}-workspace') - - self._ui.workspace_menu_button.set_menu_model(workspace_menu) - self._startup_finished = False self._add_actions() @@ -132,6 +121,10 @@ def _on_filter_revealer_toggled(self, toggle_button): self._ui.filter_bar_revealer.set_reveal_child(active) self._chat_filter.reset() + @staticmethod + def _on_edit_workspace_clicked(_button): + app.window.lookup_action('edit-workspace').activate() + def _on_chat_selected(self, _chat_list_stack, workspace_id, account, jid): self._chat_stack.show_chat(account, jid) self._search_view.set_context(account, jid) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -51,7 +51,9 @@ def __init__(self, workspace_id=None): color = None avatar_sha = None - if workspace_id is not None: + if workspace_id is None: + self._ui.remove_workspace_button.set_sensitive(False) + else: name = app.settings.get_workspace_setting( workspace_id, 'name') color = app.settings.get_workspace_setting( @@ -73,6 +75,10 @@ def _on_key_press_event(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.destroy() + def _on_remove_workspace(self, _button): + app.window.remove_workspace(self._workspace_id) + self.destroy() + def _on_cancel(self, _button): self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/05be7097ac34505e2832fefb77d98bb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/05be7097ac34505e2832fefb77d98bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Preview: Improve labels
by Daniel Brötzmann 30 May '21

30 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 19c64c47 by wurstsalat at 2021-05-30T13:13:09+02:00 Preview: Improve labels - - - - - 05be7097 by wurstsalat at 2021-05-30T13:17:48+02:00 AudioWidget: Add logging - - - - - 2 changed files: - gajim/data/gui/preview.ui - gajim/gtk/preview_audio.py Changes: ===================================== gajim/data/gui/preview.ui ===================================== @@ -166,10 +166,11 @@ <property name="selectable">True</property> <property name="ellipsize">end</property> <property name="single-line-mode">True</property> - <property name="max-width-chars">20</property> + <property name="max-width-chars">30</property> <property name="xalign">0</property> <style> <class name="dim-label"/> + <class name="small-label"/> </style> </object> <packing> @@ -183,10 +184,11 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="single-line-mode">True</property> - <property name="max-width-chars">20</property> + <property name="max-width-chars">30</property> <property name="xalign">0</property> <style> <class name="dim-label"/> + <class name="small-label"/> </style> </object> <packing> ===================================== gajim/gtk/preview_audio.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/>. +import logging + from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gst @@ -20,6 +22,8 @@ from .util import get_cursor +log = logging.getLogger('gajim.gui.preview_audio') + class AudioWidget(Gtk.Box): def __init__(self, file_path): @@ -66,10 +70,12 @@ def _build_audio_widget(self): def _setup_audio_player(self, file_path): self._playbin = Gst.ElementFactory.make('playbin', 'bin') if self._playbin is None: + log.debug('Could not create GST playbin') return self._playbin.set_property('uri', f'file://{file_path}') state_return = self._playbin.set_state(Gst.State.PAUSED) if state_return == Gst.StateChangeReturn.FAILURE: + log.debug('Could not setup GST playbin') return self._query = Gst.Query.new_position(Gst.Format.TIME) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7439d476fdbfcb30bcbe4b12cb3ff90… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7439d476fdbfcb30bcbe4b12cb3ff90… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: ConversationView: Fix imports
by Daniel Brötzmann 30 May '21

30 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 24cca18a by wurstsalat at 2021-05-30T12:52:49+02:00 ConversationView: Fix imports - - - - - 7439d476 by wurstsalat at 2021-05-30T13:08:39+02:00 BaseControl: Remove unused method - - - - - 2 changed files: - gajim/gtk/controls/base.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -821,7 +821,6 @@ def _on_message_textview_key_press_event(self, textview, event): if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): self.conversation_view.event(event) - self._on_scroll(None, event.keyval) return True if event.get_state() & Gdk.ModifierType.CONTROL_MASK: @@ -868,14 +867,14 @@ def _on_message_textview_key_press_event(self, textview, event): self.last_key_tabs = False if event.keyval == Gdk.KEY_Up: if event_state & Gdk.ModifierType.CONTROL_MASK: - if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+UP + if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+UP self.scroll_messages('up', message_buffer, 'received') else: # Ctrl+UP self.scroll_messages('up', message_buffer, 'sent') return True elif event.keyval == Gdk.KEY_Down: if event_state & Gdk.ModifierType.CONTROL_MASK: - if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+Down + if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+Down self.scroll_messages('down', message_buffer, 'received') else: # Ctrl+Down self.scroll_messages('down', message_buffer, 'sent') ===================================== gajim/gtk/conversation/view.py ===================================== @@ -26,17 +26,16 @@ from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day -from .util import scroll_to_end -from .conversation.rows.read_marker import ReadMarkerRow -from .conversation.rows.scroll_hint import ScrollHintRow -from .conversation.rows.message import MessageRow -from .conversation.rows.info import InfoMessage -from .conversation.rows.date import DateRow -from .conversation.rows.file_transfer import FileTransferRow -from .conversation.rows.muc_subject import MUCSubject -from .conversation.rows.muc_join_left import MUCJoinLeft -from .conversation.rows.muc_user_status import MUCUserStatus - +from .rows.read_marker import ReadMarkerRow +from .rows.scroll_hint import ScrollHintRow +from .rows.message import MessageRow +from .rows.info import InfoMessage +from .rows.date import DateRow +from .rows.file_transfer import FileTransferRow +from .rows.muc_subject import MUCSubject +from .rows.muc_join_left import MUCJoinLeft +from .rows.muc_user_status import MUCUserStatus +from ..util import scroll_to_end log = logging.getLogger('gajim.gui.conversation_view') @@ -115,7 +114,8 @@ def _reset_conversation_view(self): self._row_count = 0 self.clearing = False - def _sort_func(self, row1, row2): + @staticmethod + def _sort_func(row1, row2): if row1.timestamp == row2.timestamp: return 0 return -1 if row1.timestamp < row2.timestamp else 1 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/898eedee2d9f00409d6ecd06d4c6a70… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/898eedee2d9f00409d6ecd06d4c6a70… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] SearchView: Search within active accounts only
by Daniel Brötzmann 29 May '21

29 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 898eedee by wurstsalat at 2021-05-29T11:41:42+02:00 SearchView: Search within active accounts only - - - - - 2 changed files: - gajim/common/storage/archive.py - gajim/gtk/search_view.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -258,6 +258,12 @@ def get_account_id(self, account, type_=JIDConstant.NORMAL_TYPE): jid = app.get_jid_from_account(account) return self.get_jid_id(jid, type_=type_) + def get_active_account_ids(self): + account_ids = [] + for account in app.settings.get_active_accounts(): + account_ids.append(self.get_account_id(account)) + return account_ids + @timeit def get_jid_id(self, jid, kind=None, type_=None): """ @@ -549,15 +555,18 @@ def search_all_logs(self, query): returns a list of namedtuples """ + account_ids = self.get_active_account_ids() kinds = map(str, [KindConstant.STATUS, KindConstant.GCSTATUS]) sql = ''' SELECT account_id, jid_id, contact_name, time, kind, show, message, subject, additional_data, log_line_id FROM logs WHERE message LIKE like(?) + AND account_id IN ({account_ids}) AND kind NOT IN ({kinds}) ORDER BY time DESC, log_line_id - '''.format(kinds=', '.join(kinds)) + '''.format(account_ids=', '.join(map(str, account_ids)), + kinds=', '.join(kinds)) return self._con.execute(sql, (query,)).fetchall() ===================================== gajim/gtk/search_view.py ===================================== @@ -20,6 +20,7 @@ from gi.repository import Gtk from gajim.common import app +from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.i18n import _ @@ -55,12 +56,22 @@ def __init__(self): self._ui.connect_signals(self) self.connect('key-press-event', self._on_key_press) + + app.ged.register_event_handler('account-enabled', + ged.GUI1, + self._on_account_state) + app.ged.register_event_handler('account-disabled', + ged.GUI1, + self._on_account_state) self.show_all() def _on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.emit('hide-search') + def _on_account_state(self, _event): + self.clear() + @staticmethod def _header_func(row, before): if before is None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/898eedee2d9f00409d6ecd06d4c6a700… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/898eedee2d9f00409d6ecd06d4c6a700… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Preview: Improvements
by Daniel Brötzmann 28 May '21

28 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: cecebe00 by wurstsalat at 2021-05-29T00:01:02+02:00 Preview: Improvements - - - - - 3 changed files: - gajim/common/preview.py - gajim/gtk/controls/base.py - gajim/gtk/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -134,11 +134,9 @@ def __init__(self): if GLib.mkdir_with_parents(str(self._thumb_dir), 0o700) != 0: log.error('Failed to create: %s', self._thumb_dir) - def add_session(self, account): + def _get_session(self, account): if account not in self._sessions: self._sessions[account] = self._create_session(account) - - def _get_session(self, account): return self._sessions[account][0] @staticmethod ===================================== gajim/gtk/controls/base.py ===================================== @@ -162,9 +162,6 @@ def __init__(self, widget_name, account, jid): self.conversation_view = ConversationView(self.account, self.contact) self.conversation_view.connect('quote', self.on_quote) - # TODO: Move to account connect/disconnect logic - app.interface.preview_manager.add_session(self.account) - id_ = self.conversation_view.connect( 'key-press-event', self._on_conversation_view_key_press) self.handlers[id_] = self.conversation_view ===================================== gajim/gtk/preview.py ===================================== @@ -102,9 +102,11 @@ def update(self, preview, data): if preview.is_previewable and preview.orig_exists(): self._ui.icon_event_box.hide() + self._ui.image_button.show() self._ui.save_as_button.show() self._ui.open_folder_button.show() else: + self._ui.image_button.hide() self._ui.icon_event_box.show() image.set_property('pixel-size', 64) @@ -114,6 +116,7 @@ def update(self, preview, data): contains_audio_streams(preview.orig_path)): self._ui.save_as_button.show() self._ui.open_folder_button.show() + self._ui.image_button.hide() audio_widget = AudioWidget(preview.orig_path) self._ui.right_box.pack_end(audio_widget, False, True, 0) self._ui.right_box.reorder_child(audio_widget, 1) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cecebe0018f5c674bbbada8390c35387… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cecebe0018f5c674bbbada8390c35387… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Integrate URL Image Preview plugin
by Daniel Brötzmann 28 May '21

28 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 1f94164c by wurstsalat at 2021-05-28T17:24:11+02:00 Integrate URL Image Preview plugin - - - - - 595c373d by wurstsalat at 2021-05-28T17:24:15+02:00 Preferences: Add File Preview settings - - - - - 16 changed files: - gajim/common/app.py - gajim/common/const.py - + gajim/common/preview.py - + gajim/common/preview_helpers.py - gajim/common/setting_values.py - gajim/data/gui/preferences.ui - + gajim/data/gui/preview.ui - + gajim/data/gui/preview_context_menu.ui - gajim/data/style/gajim.css - gajim/gtk/controls/base.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/preferences.py - + gajim/gtk/preview.py - + gajim/gtk/preview_audio.py - gajim/gui_interface.py Changes: ===================================== gajim/common/app.py ===================================== @@ -212,7 +212,9 @@ def detect_dependencies(): try: gi.require_version('Gst', '1.0') + gi.require_version('GstPbutils', '1.0') from gi.repository import Gst + from gi.repository import GstPbutils _dependencies['GST'] = True except Exception: pass ===================================== gajim/common/const.py ===================================== @@ -1127,6 +1127,115 @@ def is_active(self): } +# This is an excerpt of Media Types from +# https://www.iana.org/assignments/media-types/media-types.xhtml +# plus some additions +MIME_TYPES = ( + # application/ + 'application/calendar+json', + 'application/calendar+xml', + 'application/epub+zip', + 'application/json', + 'application/mp4', + 'application/msword', + 'application/octet-stream', + 'application/ogg', + 'application/pdf', + 'application/pgp-encrypted', + 'application/pgp-signature', + 'application/postscript', + 'application/rtf', + 'application/vcard+json', + 'application/vcard+xml', + 'application/vnd.amazon.mobi8-ebook', + 'application/vnd.google-earth.kml+xml', + 'application/vnd.google-earth.kmz', + # Start office + 'application/vnd.ms-access', + 'application/vnd.ms-excel', + 'application/vnd.ms-excel.addin.macroEnabled.12', + 'application/vnd.ms-excel.sheet.binary.macroEnabled.12', + 'application/vnd.ms-excel.sheet.macroEnabled.12', + 'application/vnd.ms-excel.template.macroEnabled.12', + 'application/vnd.ms-powerpoint', + 'application/vnd.ms-powerpoint.addin.macroEnabled.12', + 'application/vnd.ms-powerpoint.presentation.macroEnabled.12', + 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12', + 'application/vnd.ms-powerpoint.template.macroEnabled.12', + 'application/vnd.ms-word.document.macroEnabled.12', + 'application/vnd.ms-word.template.macroEnabled.12', + 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + 'application/vnd.openxmlformats-officedocument.presentationml.slideshow', + 'application/vnd.openxmlformats-officedocument.presentationml.template', + 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', + 'application/vnd.openxmlformats-officedocument.vmlDrawing', + 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', + # End office + 'application/vnd.sqlite3', + 'application/zip', + # audio/* + 'audio/aac', + 'audio/ac3', + 'audio/flac', + 'audio/mp4', + 'audio/mpeg', + 'audio/ogg', + 'audio/opus', + 'audio/wav', + 'audio/x-flac', + 'audio/x-m4a', + 'audio/x-matroska', + # font/* + 'font/ttf', + 'font/woff', + 'font/woff2', + # image/* + 'image/webp', + 'image/avif', + 'image/jxl', + 'image/bmp', + 'image/x-bmp', + 'image/x-ms-bmp', + 'image/gif', + 'image/heic', + 'image/heif', + 'image/jpeg', + 'image/png', + 'image/svg+xml', + 'image/tiff', + 'image/vnd.adobe.photoshop', + 'image/vnd.dwg', + 'image/vnd.dxf', + 'image/vnd.microsoft.icon', + 'image/x-icon', + 'image/x-xcf', + # model/* + 'model/mtl', + 'model/obj', + 'model/stl', + # text/* + 'text/calendar', + 'text/csv', + 'text/markdown', + 'text/rtf', + 'text/vcard', + # video/* + 'video/H264', + 'video/H265', + 'video/mp4', + 'video/mpeg4-generic', + 'video/ogg', + 'video/quicktime', + 'video/vc1', + 'video/VP8', + 'video/webm', + 'video/x-matroska', + 'video/x-msvideo', +) + + TRUST_SYMBOL_DATA = { Trust.UNTRUSTED: ('dialog-error-symbolic', _('Untrusted'), ===================================== gajim/common/preview.py ===================================== @@ -0,0 +1,394 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import logging +import os +from pathlib import Path +from urllib.parse import urlparse + +from gi.repository import GLib +from gi.repository import Soup + +from gajim.common import app +from gajim.common import configpaths +from gajim.common.const import MIME_TYPES +from gajim.common.helpers import load_file_async +from gajim.common.helpers import write_file_async +from gajim.common.helpers import get_tls_error_phrase +from gajim.common.helpers import get_user_proxy +from gajim.common.preview_helpers import aes_decrypt +from gajim.common.preview_helpers import filename_from_uri +from gajim.common.preview_helpers import parse_fragment +from gajim.common.preview_helpers import create_thumbnail +from gajim.common.preview_helpers import split_geo_uri +from gajim.common.preview_helpers import get_previewable_mime_types +from gajim.common.preview_helpers import get_image_paths +from gajim.common.preview_helpers import guess_mime_type +from gajim.common.preview_helpers import pixbuf_from_data + +log = logging.getLogger('gajim.c.preview') + +PREVIEWABLE_MIME_TYPES = get_previewable_mime_types() +mime_types = set(MIME_TYPES) +# Merge both: if it’s a previewable image, it should be allowed +ALLOWED_MIME_TYPES = mime_types.union(PREVIEWABLE_MIME_TYPES) + + +class Preview: + def __init__(self, uri, urlparts, orig_path, thumb_path, size, widget): + self._uri = uri + self._urlparts = urlparts + self._filename = filename_from_uri(uri) + self._widget = widget + + self.account = widget.account + self.orig_path = orig_path + self.thumb_path = thumb_path + self.size = size + + self.thumbnail = None + self.mime_type = None + self.file_size = 0 + + self.key, self.iv = None, None + if self.is_aes_encrypted: + self.key, self.iv = parse_fragment(urlparts.fragment) + + @property + def is_geo_uri(self): + return self._uri.startswith('geo:') + + @property + def is_web_uri(self): + return not self.is_geo_uri + + @property + def is_previewable(self): + return self.mime_type in PREVIEWABLE_MIME_TYPES + + @property + def is_audio(self): + is_allowed = bool(self.mime_type in ALLOWED_MIME_TYPES) + return is_allowed and self.mime_type.startswith('audio/') + + @property + def uri(self): + return self._uri + + @property + def filename(self): + return self._filename + + @property + def request_uri(self): + if self.is_aes_encrypted: + # Remove fragments so we dont transmit it to the server + urlparts = self._urlparts._replace(scheme='https', fragment='') + return urlparts.geturl() + return self._urlparts.geturl() + + @property + def is_aes_encrypted(self): + if self._urlparts is None: + return False + return self._urlparts.scheme == 'aesgcm' + + def thumb_exists(self): + return self.thumb_path.exists() + + def orig_exists(self): + return self.orig_path.exists() + + def create_thumbnail(self, data): + self.thumbnail = create_thumbnail(data, self.size) + if self.thumbnail is None: + log.warning('Creating thumbnail failed for: %s', self.orig_path) + return False + return True + + def update_widget(self, data=None): + self._widget.update(self, data) + + +class PreviewManager: + def __init__(self): + self._sessions = {} + + self._orig_dir = Path(configpaths.get('MY_DATA')) / 'downloads' + self._thumb_dir = Path(configpaths.get('MY_CACHE')) / 'downloads.thumb' + + if GLib.mkdir_with_parents(str(self._orig_dir), 0o700) != 0: + log.error('Failed to create: %s', self._orig_dir) + + if GLib.mkdir_with_parents(str(self._thumb_dir), 0o700) != 0: + log.error('Failed to create: %s', self._thumb_dir) + + def add_session(self, account): + if account not in self._sessions: + self._sessions[account] = self._create_session(account) + + def _get_session(self, account): + return self._sessions[account][0] + + @staticmethod + def _create_session(account): + session = Soup.Session() + session.add_feature_by_type(Soup.ContentSniffer) + session.props.https_aliases = ['aesgcm'] + session.props.ssl_strict = False + + proxy = get_user_proxy(account) + if proxy is None: + resolver = None + else: + resolver = proxy.get_resolver() + + session.props.proxy_resolver = resolver + return session, resolver + + @staticmethod + def _accept_uri(urlparts, uri, additional_data): + try: + oob_url = additional_data['gajim']['oob_url'] + except (KeyError, AttributeError): + oob_url = None + + # geo + if urlparts.scheme == 'geo': + return True + + if not urlparts.netloc: + log.info('No netloc found in URL: %s', uri) + return False + + # aesgcm + if urlparts.scheme == 'aesgcm': + return True + + # http/https + if urlparts.scheme in ('https', 'http'): + if app.settings.get('preview_allow_all_images'): + return True + + if oob_url is None: + log.info('No oob url for: %s', uri) + return False + + if uri != oob_url: + log.info('uri != oob url: %s != %s', uri, oob_url) + return False + return True + + log.info('Unsupported URI scheme: %s', uri) + return False + + def get_previewable(self, text, additional_data): + if len(text.split(' ')) > 1: + # urlparse doesn't recognise spaces as URL delimiter + log.debug('Text is not an uri: %s...', text[:15]) + return False + + uri = text + urlparts = urlparse(uri) + if not self._accept_uri(urlparts, uri, additional_data): + return False + + if uri.startswith('geo:'): + try: + split_geo_uri(uri) + except Exception as err: + log.error(uri) + log.error(err) + return False + + return True + + def create_preview(self, uri, widget): + if uri.startswith('geo:'): + preview = Preview(uri, None, None, None, 96, widget) + preview.update_widget() + return + + preview = self._process_web_uri(uri, widget) + + if not preview.orig_exists(): + self.download_content(preview) + + elif not preview.thumb_exists(): + load_file_async(preview.orig_path, + self._on_orig_load_finished, + preview) + + else: + load_file_async(preview.thumb_path, + self._on_thumb_load_finished, + preview) + + def _process_web_uri(self, uri, widget): + urlparts = urlparse(uri) + size = app.settings.get('preview_size') + orig_path, thumb_path = get_image_paths(uri, + urlparts, + size, + self._orig_dir, + self._thumb_dir) + return Preview(uri, + urlparts, + orig_path, + thumb_path, + size, + widget) + + def _on_orig_load_finished(self, data, error, preview): + if data is None: + log.error('%s: %s', preview.orig_path.name, error) + return + + preview.mime_type = guess_mime_type(preview.orig_path) + preview.file_size = os.path.getsize(preview.orig_path) + if preview.is_previewable: + if preview.create_thumbnail(data): + write_file_async(preview.thumb_path, + preview.thumbnail, + self._on_thumb_write_finished, + preview) + else: + preview.update_widget() + + @staticmethod + def _on_thumb_load_finished(data, error, preview): + if data is None: + log.error('%s: %s', preview.thumb_path.name, error) + return + + preview.thumbnail = data + preview.mime_type = guess_mime_type(preview.orig_path) + preview.file_size = os.path.getsize(preview.orig_path) + + try: + pixbuf = pixbuf_from_data(preview.thumbnail) + except Exception as err: + log.error('Unable to load: %s, %s', + preview.thumb_path.name, + err) + return + preview.update_widget(data=pixbuf) + + def download_content(self, preview, force=False): + if preview.account is None: + # History Window can be opened without account context + # This means we can not apply proxy settings + return + log.info('Start downloading: %s', preview.request_uri) + message = Soup.Message.new('GET', preview.request_uri) + message.connect('starting', self._check_certificate, preview) + message.connect( + 'content-sniffed', self._on_content_sniffed, preview, force) + + session = self._get_session(preview.account) + session.queue_message(message, self._on_finished, preview) + + def _check_certificate(self, message, preview): + _https_used, _tls_certificate, tls_errors = message.get_https_status() + + if not app.settings.get('preview_verify_https'): + return + + if tls_errors: + phrase = get_tls_error_phrase(tls_errors) + log.warning('TLS verification failed: %s', phrase) + session = self._get_session(preview.account) + session.cancel_message(message, Soup.Status.CANCELLED) + return + + def _on_content_sniffed(self, message, type_, _params, preview, force): + file_size = message.props.response_headers.get_content_length() + uri = message.props.uri.to_string(False) + session = self._get_session(preview.account) + preview.mime_type = type_ + preview.file_size = file_size + + if type_ not in ALLOWED_MIME_TYPES: + log.info('Not an allowed content type: %s, %s', type_, uri) + session.cancel_message(message, Soup.Status.CANCELLED) + return + + max_file_size = app.settings.get('preview_max_file_size') + if file_size == 0 or file_size > int(max_file_size): + log.info( + 'File size (%s) too big or unknown (zero) for URL: \'%s\'', + file_size, uri) + if not force: + session.cancel_message(message, Soup.Status.CANCELLED) + + preview.update_widget() + + def _on_finished(self, _session, message, preview): + if message.status_code != Soup.Status.OK: + log.warning('Download failed: %s', preview.request_uri) + log.warning(Soup.Status.get_phrase(message.status_code)) + preview.update_widget() + return + + data = message.props.response_body_data.get_data() + if data is None: + return + + if preview.is_aes_encrypted: + data = aes_decrypt(preview, data) + + if preview.mime_type == 'application/octet-stream': + preview.mime_type = guess_mime_type(preview.orig_path, data) + + write_file_async(preview.orig_path, + data, + self._on_orig_write_finished, + preview) + + if preview.is_previewable: + if preview.create_thumbnail(data): + write_file_async(preview.thumb_path, + preview.thumbnail, + self._on_thumb_write_finished, + preview) + + @staticmethod + def _on_orig_write_finished(_result, error, preview): + if error is not None: + log.error('%s: %s', preview.orig_path.name, error) + return + + log.info('File stored: %s', preview.orig_path.name) + preview.file_size = os.path.getsize(preview.orig_path) + if not preview.is_previewable: + # Don’t update preview if thumb is already displayed, + # but update preview for audio files + preview.update_widget() + + @staticmethod + def _on_thumb_write_finished(_result, error, preview): + if error is not None: + log.error('%s: %s', preview.thumb_path.name, error) + return + + log.info('Thumbnail stored: %s ', preview.thumb_path.name) + + try: + pixbuf = pixbuf_from_data(preview.thumbnail) + except Exception as err: + log.error('Unable to load: %s, %s', + preview.thumb_path.name, + err) + return + preview.update_widget(data=pixbuf) ===================================== gajim/common/preview_helpers.py ===================================== @@ -0,0 +1,378 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import math +import logging +import binascii +import hashlib +import mimetypes +from io import BytesIO +from collections import namedtuple +from pathlib import Path +from urllib.parse import urlparse +from urllib.parse import unquote + +from gi.repository import GdkPixbuf +from gi.repository import GLib +from gi.repository import Gio +from gi.repository import GstPbutils + +from PIL import Image + +from cryptography.hazmat.backends import default_backend +from cryptography.hazmat.primitives.ciphers import Cipher +from cryptography.hazmat.primitives.ciphers import algorithms +from cryptography.hazmat.primitives.ciphers.modes import GCM + +log = logging.getLogger('gajim.c.preview_helpers') + +Coords = namedtuple('Coords', 'location lat lon') + + +def resize_gif(image, output_file, resize_to): + frames, result = extract_and_resize_frames(image, resize_to) + + frames[0].save(output_file, + format='GIF', + optimize=True, + save_all=True, + append_images=frames[1:], + duration=result['duration'], + loop=1000) + + +def analyse_image(image): + ''' + Pre-process pass over the image to determine the mode (full or additive). + Necessary as assessing single frames isn't reliable. Need to know the mode + before processing all frames. + ''' + + result = { + 'size': image.size, + 'mode': 'full', + 'duration': image.info.get('duration', 0) + } + + try: + while True: + if image.tile: + tile = image.tile[0] + update_region = tile[1] + update_region_dimensions = update_region[2:] + if update_region_dimensions != image.size: + result['mode'] = 'partial' + break + image.seek(image.tell() + 1) + except EOFError: + image.seek(0) + return image, result + + +def extract_and_resize_frames(image, resize_to): + image, result = analyse_image(image) + + i = 0 + palette = image.getpalette() + last_frame = image.convert('RGBA') + + frames = [] + + try: + while True: + ''' + If the GIF uses local colour tables, + each frame will have its own palette. + If not, we need to apply the global palette to the new frame. + ''' + if not image.getpalette(): + image.putpalette(palette) + + new_frame = Image.new('RGBA', image.size) + + ''' + Is this file a "partial"-mode GIF where frames update a region + of a different size to the entire image? + If so, we need to construct the new frame by + pasting it on top of the preceding frames. + ''' + if result['mode'] == 'partial': + new_frame.paste(last_frame) + + new_frame.paste(image, (0, 0), image.convert('RGBA')) + + # This method preservs aspect ratio + new_frame.thumbnail(resize_to, Image.ANTIALIAS) + frames.append(new_frame) + + i += 1 + last_frame = new_frame + image.seek(image.tell() + 1) + except EOFError: + pass + + return frames, result + + +def create_thumbnail(data, size): + thumbnail = create_thumbnail_with_pil(data, size) + if thumbnail is not None: + return thumbnail + return create_thumbnail_with_pixbuf(data, size) + + +def create_thumbnail_with_pixbuf(data, size): + loader = GdkPixbuf.PixbufLoader() + try: + loader.write(data) + except GLib.Error as error: + log.warning('making pixbuf failed: %s', error) + return None + + loader.close() + pixbuf = loader.get_pixbuf() + + if size > pixbuf.get_width() and size > pixbuf.get_height(): + return data + + width, height = get_thumbnail_size(pixbuf, size) + thumbnail = pixbuf.scale_simple(width, + height, + GdkPixbuf.InterpType.BILINEAR) + try: + _error, bytes_ = thumbnail.save_to_bufferv('png', [], []) + except GLib.Error as err: + log.warning('Saving pixbuf to buffer failed: %s', err) + return None + return bytes_ + + +def create_thumbnail_with_pil(data, size): + input_file = BytesIO(data) + output_file = BytesIO() + try: + image = Image.open(input_file) + except OSError as error: + log.warning('making pil thumbnail failed: %s', error) + log.warning('fallback to pixbuf') + input_file.close() + output_file.close() + return + + image_width, image_height = image.size + if size > image_width and size > image_height: + image.close() + input_file.close() + output_file.close() + return data + + if image.format == 'GIF' and image.n_frames > 1: + resize_gif(image, output_file, (size, size)) + else: + image.thumbnail((size, size)) + image.save(output_file, + format=image.format, + exif=image.info.get('exif', b''), + optimize=True) + + bytes_ = output_file.getvalue() + + image.close() + input_file.close() + output_file.close() + + return bytes_ + + +def get_thumbnail_size(pixbuf, size): + # Calculates the new thumbnail size while preserving the aspect ratio + image_width = pixbuf.get_width() + image_height = pixbuf.get_height() + + if image_width > image_height: + if image_width > size: + image_height = math.ceil((size / float(image_width) * image_height)) + image_width = int(size) + else: + if image_height > size: + image_width = math.ceil((size / float(image_height) * image_width)) + image_height = int(size) + + return image_width, image_height + + +def pixbuf_from_data(data): + loader = GdkPixbuf.PixbufLoader() + try: + loader.write(data) + loader.close() + except GLib.Error: + # Fallback to Pillow + input_file = BytesIO(data) + image = Image.open(BytesIO(data)).convert('RGBA') + array = GLib.Bytes.new(image.tobytes()) + width, height = image.size + pixbuf = GdkPixbuf.Pixbuf.new_from_bytes(array, + GdkPixbuf.Colorspace.RGB, + True, + 8, + width, + height, + width * 4) + image.close() + input_file.close() + return pixbuf + + return loader.get_pixbuf().apply_embedded_orientation() + + +def parse_fragment(fragment): + if not fragment: + raise ValueError('Invalid fragment') + + fragment = binascii.unhexlify(fragment) + size = len(fragment) + # Clients started out with using a 16 byte IV but long term + # want to swtich to the more performant 12 byte IV + # We have to support both + if size == 48: + key = fragment[16:] + iv = fragment[:16] + elif size == 44: + key = fragment[12:] + iv = fragment[:12] + else: + raise ValueError('Invalid fragment size: %s' % size) + + return key, iv + + +def get_image_paths(uri, urlparts, size, orig_dir, thumb_dir): + path = Path(unquote(urlparts.path)) + web_stem = path.stem + extension = path.suffix + + if len(web_stem) > 90: + # Many Filesystems have a limit on filename length + # Most have 255, some encrypted ones only 143 + # We add around 50 chars for the hash, + # so the filename should not exceed 90 + web_stem = web_stem[:90] + + name_hash = hashlib.sha1(str(uri).encode()).hexdigest() + + orig_filename = '%s_%s%s' % (web_stem, name_hash, extension) + + thumb_filename = '%s_%s_thumb_%s%s' % (web_stem, + name_hash, + size, + extension) + + orig_path = orig_dir / orig_filename + thumb_path = thumb_dir / thumb_filename + return orig_path, thumb_path + + +def split_geo_uri(uri): + # Example: + # geo:37.786971,-122.399677,122.3;CRS=epsg:32718;U=20;mapcolors=abc + # Assumption is all coordinates are CRS=WGS-84 + + # Remove "geo:" + coords = uri[4:] + + # Remove arguments + if ';' in coords: + coords, _ = coords.split(';', maxsplit=1) + + # Split coords + coords = coords.split(',') + if len(coords) not in (2, 3): + raise ValueError('Invalid geo uri: invalid coord count') + + # Remoove coord-c (altitude) + if len(coords) == 3: + coords.pop(2) + + lat, lon = coords + if float(lat) < -90 or float(lat) > 90: + raise ValueError('Invalid geo_uri: invalid latitude %s' % lat) + + if float(lon) < -180 or float(lon) > 180: + raise ValueError('Invalid geo_uri: invalid longitude %s' % lon) + + location = ','.join(coords) + return Coords(location=location, lat=lat, lon=lon) + + +def filename_from_uri(uri): + urlparts = urlparse(unquote(uri)) + path = Path(urlparts.path) + return path.name + + +def aes_decrypt(preview, payload): + # Use AES128 GCM with the given key and iv to decrypt the payload + data = payload[:-16] + tag = payload[-16:] + decryptor = Cipher( + algorithms.AES(preview.key), + GCM(preview.iv, tag=tag), + backend=default_backend()).decryptor() + return decryptor.update(data) + decryptor.finalize() + + +def contains_audio_streams(file_path): + # Check if it is really an audio file + has_audio = False + discoverer = GstPbutils.Discoverer() + try: + info = discoverer.discover_uri(f'file://{file_path}') + has_audio = bool(info.get_audio_streams()) + except GLib.Error as err: + log.error('Error while reading %s: %s', str(file_path), err) + return False + if not has_audio: + log.warning('File does not contain audio stream: %s', str(file_path)) + return has_audio + + +def get_previewable_mime_types(): + previewable_mime_types = set() + for fmt in GdkPixbuf.Pixbuf.get_formats(): + for mime_type in fmt.get_mime_types(): + previewable_mime_types.add(mime_type.lower()) + if Image is not None: + Image.init() + for mime_type in Image.MIME.values(): + previewable_mime_types.add(mime_type.lower()) + return tuple(filter( + lambda mime_type: mime_type.startswith('image'), + previewable_mime_types + )) + + +def guess_mime_type(file_path, data=None): + mime_type, _ = mimetypes.MimeTypes().guess_type(str(file_path)) + if mime_type is None: + # Try to guess MIME type by file name + mime_type, _ = Gio.content_type_guess(str(file_path), data) + log.debug('Guessed MIME type: %s', str(mime_type)) + return mime_type + + +def get_icon_for_mime_type(mime_type): + if mime_type is None: + return Gio.Icon.new_for_string('mail-attachment') + return Gio.content_type_get_icon(mime_type) ===================================== gajim/common/setting_values.py ===================================== @@ -161,6 +161,12 @@ class _ACCOUNT_DEFAULT: 'workspace_order': [], 'chat_handle_position': 350, 'chat_timestamp_format': '%H:%M', + 'preview_size': 300, + 'preview_max_file_size': 10485760, + 'preview_allow_all_images': False, + 'preview_leftclick_action': 'open', + 'preview_verify_https': True, + 'preview_anonymous_muc': False, } ACCOUNT_SETTINGS = { ===================================== gajim/data/gui/preferences.ui ===================================== @@ -170,6 +170,34 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkGrid" id="file_preview"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">File Preview</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <child> <placeholder/> </child> ===================================== gajim/data/gui/preview.ui ===================================== @@ -0,0 +1,254 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkBox" id="preview_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkEventBox" id="icon_event_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">start</property> + <signal name="realize" handler="_on_realize" swapped="no"/> + <child> + <object class="GtkButton" id="icon_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="relief">none</property> + <signal name="button-press-event" handler="_on_button_press_event" swapped="no"/> + <signal name="clicked" handler="_on_content_button_clicked" swapped="no"/> + <child> + <placeholder/> + </child> + <style> + <class name="preview-image-button"/> + </style> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="right_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkBox" id="button_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkEventBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">end</property> + <signal name="realize" handler="_on_realize" swapped="no"/> + <child> + <object class="GtkButton" id="download_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Download</property> + <property name="relief">none</property> + <signal name="clicked" handler="_on_download" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">folder-download-symbolic</property> + </object> + </child> + <style> + <class name="preview-button"/> + <class name="flat"/> + </style> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEventBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">end</property> + <signal name="realize" handler="_on_realize" swapped="no"/> + <child> + <object class="GtkButton" id="save_as_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Save as...</property> + <signal name="clicked" handler="_on_save_as" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">document-save-as-symbolic</property> + </object> + </child> + <style> + <class name="preview-button"/> + <class name="flat"/> + </style> + </object> + </child> + </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> + <child> + <object class="GtkEventBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">end</property> + <signal name="realize" handler="_on_realize" swapped="no"/> + <child> + <object class="GtkButton" id="open_folder_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Open folder</property> + <signal name="clicked" handler="_on_open_folder" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">folder-symbolic</property> + </object> + </child> + <style> + <class name="preview-button"/> + <class name="flat"/> + </style> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="file_name"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="max-width-chars">20</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="file_size"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="single-line-mode">True</property> + <property name="max-width-chars">20</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">4</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="image_event_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <signal name="realize" handler="_on_realize" swapped="no"/> + <child> + <object class="GtkButton" id="image_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="relief">none</property> + <signal name="button-press-event" handler="_on_button_press_event" swapped="no"/> + <signal name="clicked" handler="_on_content_button_clicked" swapped="no"/> + <child> + <placeholder/> + </child> + <style> + <class name="preview-image-button"/> + </style> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="preview-box"/> + </style> + </object> +</interface> ===================================== gajim/data/gui/preview_context_menu.ui ===================================== @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkMenu" id="context_menu"> + <property name="can-focus">False</property> + <child> + <object class="GtkMenuItem" id="download"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">_Download</property> + <property name="use-underline">True</property> + <signal name="activate" handler="_on_download" swapped="no"/> + </object> + </child> + <child> + <object class="GtkMenuItem" id="open"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">_Open</property> + <property name="use-underline">True</property> + <signal name="activate" handler="_on_open" swapped="no"/> + </object> + </child> + <child> + <object class="GtkMenuItem" id="save_as"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">_Save as</property> + <property name="use-underline">True</property> + <signal name="activate" handler="_on_save_as" swapped="no"/> + </object> + </child> + <child> + <object class="GtkMenuItem" id="open_folder"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Open _Folder</property> + <property name="use-underline">True</property> + <signal name="activate" handler="_on_open_folder" swapped="no"/> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="encryption_separator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="copy_link_location"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">_Copy Link</property> + <property name="use-underline">True</property> + <signal name="activate" handler="_on_copy_link_location" swapped="no"/> + </object> + </child> + <child> + <object class="GtkMenuItem" id="open_link_in_browser"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Open Link in _Browser</property> + <property name="use-underline">True</property> + <signal name="activate" handler="_on_open_link_in_browser" swapped="no"/> + </object> + </child> + </object> +</interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -119,6 +119,28 @@ border-radius: 5px; } +.preview-box { + border: 1px solid; + border-color: @borders; + border-radius: 4px; + padding: 10px; + background-color: @theme_unfocused_base_color; +} +.preview-image-button, +.preview-image-button:hover { + padding: 0px; + border: none; + transition: none; + -gtk-icon-effect: none; + -gtk-icon-shadow: none; + background-image: none; + text-shadow: none; + box-shadow: none; +} +.preview-button { + border: 1px solid @borders; +} + .link-button { min-height: 0px; } /* Main Window */ ===================================== gajim/gtk/controls/base.py ===================================== @@ -162,6 +162,9 @@ def __init__(self, widget_name, account, jid): self.conversation_view = ConversationView(self.account, self.contact) self.conversation_view.connect('quote', self.on_quote) + # TODO: Move to account connect/disconnect logic + app.interface.preview_manager.add_session(self.account) + id_ = self.conversation_view.connect( 'key-press-event', self._on_conversation_view_key_press) self.handlers[id_] = self.conversation_view ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -29,6 +29,9 @@ def __init__(self, account): def get_content(self): return self._content + def get_text(self): + return self._content.text + def add_content(self, content): self.clear() self._content = content ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -31,9 +31,9 @@ from .base import BaseRow from .base import MoreMenuButton from ..message_widget import MessageWidget +from ...preview import PreviewWidget from ...util import format_fingerprint - MERGE_TIMEFRAME = timedelta(seconds=120) @@ -74,11 +74,19 @@ def __init__(self, # self.get_style_context().add_class( # 'conversation-mention-highlight') - result = process(text) - self._message_widget = MessageWidget(account) - self._message_widget.add_content(result) + is_previewable = app.interface.preview_manager.get_previewable( + text, additional_data) + if is_previewable: + self._message_widget = PreviewWidget(account) + app.interface.preview_manager.create_preview( + text, self._message_widget) + else: + result = process(text) + self._message_widget = MessageWidget(account) + self._message_widget.add_content(result) self._meta_box = Gtk.Box(spacing=6) + self._meta_box.set_hexpand(True) self._meta_box.pack_start( self.create_name_widget(name, kind, is_groupchat), False, True, 0) timestamp_label = self.create_timestamp_widget(self.timestamp) @@ -122,7 +130,10 @@ def __init__(self, bottom_box = Gtk.Box(spacing=6) bottom_box.add(self._message_widget) - bottom_box.add(MoreMenuButton(self, history_mode=history_mode)) + more_menu_button = MoreMenuButton(self, history_mode=history_mode) + more_menu_button.set_hexpand(True) + more_menu_button.set_halign(Gtk.Align.END) + bottom_box.pack_end(more_menu_button, False, True, 0) self.grid.attach(avatar_placeholder, 0, 0, 1, 2) self.grid.attach(self._meta_box, 1, 0, 1, 1) @@ -143,11 +154,11 @@ def is_mergeable(self, message): def on_copy_message(self, _widget): timestamp = self.timestamp.strftime('%x, %X') clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) - text = self._message_widget.get_content().text + text = self._message_widget.get_text() clip.set_text(f'{timestamp} - {self.name}: {text}', -1) def on_quote_message(self, _widget): - self.get_parent().on_quote(self._message_widget.get_content().text) + self.get_parent().on_quote(self._message_widget.get_text()) def _get_encryption_image(self, additional_data, encryption_enabled=None): details = self._get_encryption_details(additional_data) @@ -207,7 +218,7 @@ def set_displayed(self): self._has_displayed = True def set_correction(self, text, message_id): - self._corrections.append(self._message_widget.get_content().text) + self._corrections.append(self._message_widget.get_text()) result = process(text) self._message_widget.add_content(result) ===================================== gajim/gtk/preferences.py ===================================== @@ -80,6 +80,7 @@ def __init__(self): ('contact_list', ContactList), ('chats', Chats), ('group_chats', GroupChats), + ('file_preview', FilePreview), ('visual_notifications', VisualNotifications), ('sounds', Sounds), ('status_message', StatusMessage), @@ -470,6 +471,63 @@ def _reset_print_status(button): app.settings.set_group_chat_settings('print_status', None) +class FilePreview(PreferenceBox): + def __init__(self, *args): + sizes = { + 262144: '256 KiB', + 524288: '512 KiB', + 1048576: '1 MiB', + 5242880: '5 MiB', + 10485760: '10 MiB', + } + + actions = { + 'open': _('Open'), + 'save_as': _('Save As…'), + 'open_folder': _('Open Folder'), + 'copy_link_location': _('Copy Link Location'), + 'open_link_in_browser': _('Open Link in Browser'), + } + + settings = [ + Setting(SettingKind.SPIN, + _('Preview Size'), + SettingType.CONFIG, + 'preview_size', + desc=_('Size of preview image'), + props={'range_': (100, 1000)}), + + Setting(SettingKind.POPOVER, + _('Allowed File Size'), + SettingType.CONFIG, + 'preview_max_file_size', + desc=_('Maximum file size for preview generation'), + props={'entries': sizes}), + + Setting(SettingKind.SWITCH, + _('Preview all Image URLs'), + SettingType.CONFIG, + 'preview_allow_all_images', + desc=_('Generate preview for any URLs containing images ' + '(may be unsafe)')), + + Setting(SettingKind.POPOVER, + _('Left Click Action'), + SettingType.CONFIG, + 'preview_leftclick_action', + desc=_('Action when left-clicking a preview'), + props={'entries': actions}), + + Setting(SettingKind.SWITCH, + _('HTTPS Verification'), + SettingType.CONFIG, + 'preview_verify_https', + desc=_('Whether to check for a valid certificate')), + ] + + PreferenceBox.__init__(self, settings) + + class VisualNotifications(PreferenceBox): def __init__(self, *args): trayicon_items = { ===================================== gajim/gtk/preview.py ===================================== @@ -0,0 +1,234 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import logging +import shutil +import os +from pathlib import Path + +from gi.repository import Gdk +from gi.repository import GdkPixbuf +from gi.repository import GLib +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.helpers import open_file +from gajim.common.helpers import open_uri +from gajim.common.i18n import _ +from gajim.common.preview_helpers import split_geo_uri +from gajim.common.preview_helpers import contains_audio_streams +from gajim.common.preview_helpers import get_icon_for_mime_type + +from .dialogs import ErrorDialog +from .filechoosers import FileSaveDialog +from .preview_audio import AudioWidget +from .util import get_builder +from .util import get_cursor +from .util import get_monitor_scale_factor +from .util import load_icon + +log = logging.getLogger('gajim.gui.preview') + + +class PreviewWidget(Gtk.Box): + def __init__(self, account): + Gtk.Box.__init__(self) + self.account = account + self._preview = None + + if app.settings.get('use_kib_mib'): + self._units = GLib.FormatSizeFlags.IEC_UNITS + else: + self._units = GLib.FormatSizeFlags.DEFAULT + + self._ui = get_builder('preview.ui') + self._ui.connect_signals(self) + self.add(self._ui.preview_box) + self.show_all() + + def get_text(self): + if self._preview is None: + return '' + return self._preview.uri + + def update(self, preview, data): + self._preview = preview + + if preview.is_geo_uri: + data = load_icon('map', + size=preview.size, + scale=get_monitor_scale_factor(), + pixbuf=True) + + if isinstance(data, GdkPixbuf.PixbufAnimation): + image = Gtk.Image.new_from_animation(data) + self._ui.image_button.set_image(image) + elif isinstance(data, GdkPixbuf.Pixbuf): + image = Gtk.Image.new_from_pixbuf(data) + self._ui.image_button.set_image(image) + else: + icon = get_icon_for_mime_type(preview.mime_type) + image = Gtk.Image.new_from_gicon(icon, Gtk.IconSize.DIALOG) + self._ui.icon_button.set_image(image) + + self._ui.image_button.set_tooltip_text(preview.filename) + + if preview.is_geo_uri: + self._ui.icon_event_box.hide() + self._ui.file_name.set_text(_('Click to view location')) + self._ui.save_as_button.hide() + self._ui.open_folder_button.hide() + self._ui.download_button.hide() + + location = split_geo_uri(preview.uri) + self._ui.file_size.set_text(_('Lat: %s Lon: %s') % ( + location.lat, location.lon)) + self._ui.image_button.set_tooltip_text( + _('Location at Lat: %s Lon: %s') % ( + location.lat, location.lon)) + self._ui.preview_box.set_size_request(160, -1) + return + + if preview.is_previewable and preview.orig_exists(): + self._ui.icon_event_box.hide() + self._ui.save_as_button.show() + self._ui.open_folder_button.show() + else: + self._ui.icon_event_box.show() + image.set_property('pixel-size', 64) + + if preview.orig_exists(): + self._ui.download_button.hide() + if (preview.is_audio and app.is_installed('GST') and + contains_audio_streams(preview.orig_path)): + self._ui.save_as_button.show() + self._ui.open_folder_button.show() + audio_widget = AudioWidget(preview.orig_path) + self._ui.right_box.pack_end(audio_widget, False, True, 0) + self._ui.right_box.reorder_child(audio_widget, 1) + else: + self._ui.save_as_button.hide() + self._ui.open_folder_button.hide() + + file_size_string = _('File size unknown') + if preview.file_size != 0: + file_size_string = GLib.format_size_full( + preview.file_size, self._units) + self._ui.file_size.set_text(file_size_string) + + self._ui.file_name.set_text(preview.filename) + self._ui.file_name.set_tooltip_text(preview.filename) + + def _get_context_menu(self): + def _destroy(menu, _pspec): + visible = menu.get_property('visible') + if not visible: + GLib.idle_add(menu.destroy) + + menu = get_builder('preview_context_menu.ui') + menu.connect_signals(self) + menu.context_menu.connect('notify::visible', _destroy) + + if self._preview.is_aes_encrypted: + menu.open_link_in_browser.hide() + + if self._preview.is_geo_uri: + menu.download.hide() + menu.open_link_in_browser.hide() + menu.save_as.hide() + menu.open_folder.hide() + return menu.context_menu + + if self._preview.orig_exists(): + menu.download.hide() + else: + menu.open.hide() + menu.save_as.hide() + menu.open_folder.hide() + + return menu.context_menu + + def _on_download(self, _menu): + if not self._preview.orig_exists(): + app.interface.preview_manager.download_content( + self._preview, force=True) + + def _on_open(self, _menu): + if self._preview.is_geo_uri: + open_uri(self._preview.uri) + return + + if not self._preview.orig_exists(): + app.interface.preview_manager.download_content( + self._preview, force=True) + return + + open_file(self._preview.orig_path) + + def _on_save_as(self, _menu): + def _on_ok(target_path): + dirname = Path(target_path).parent + if not os.access(dirname, os.W_OK): + ErrorDialog( + _('Directory \'%s\' is not writable') % dirname, + _('You do not have the proper permissions to ' + 'create files in this directory.'), + transient_for=app.app.get_active_window()) + return + shutil.copyfile(str(self._preview.orig_path), target_path) + + if not self._preview.orig_exists(): + app.interface.preview_manager.download_content( + self._preview, force=True) + return + + FileSaveDialog(_on_ok, + path=app.settings.get('last_save_dir'), + file_name=self._preview.filename, + transient_for=app.app.get_active_window()) + + def _on_open_folder(self, _menu): + if not self._preview.orig_exists(): + app.interface.preview_manager.download_content( + self._preview, force=True) + return + open_file(self._preview.orig_path.parent) + + def _on_copy_link_location(self, _menu): + clipboard = Gtk.Clipboard.get_default(Gdk.Display.get_default()) + clipboard.set_text(self._preview.uri, -1) + + def _on_open_link_in_browser(self, _menu): + if self._preview.is_aes_encrypted: + if self._preview.is_geo_uri: + open_uri(self._preview.uri) + return + open_file(self._preview.orig_path) + else: + open_uri(self._preview.uri) + + def _on_content_button_clicked(self, _button): + action = app.settings.get('preview_leftclick_action') + method = getattr(self, '_on_%s' % action) + method(None) + + def _on_button_press_event(self, _button, event): + if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3: + # Right klick + menu = self._get_context_menu() + menu.popup_at_pointer(event) + + @staticmethod + def _on_realize(event_box): + event_box.get_window().set_cursor(get_cursor('pointer')) ===================================== gajim/gtk/preview_audio.py ===================================== @@ -0,0 +1,150 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import GLib +from gi.repository import Gtk +from gi.repository import Gst + +from gajim.common.i18n import _ + +from .util import get_cursor + + +class AudioWidget(Gtk.Box): + def __init__(self, file_path): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL, + spacing=6) + self._playbin = None + self._query = None + self._has_timeout = False + + self._build_audio_widget() + self._setup_audio_player(file_path) + + def _build_audio_widget(self): + play_button = Gtk.Button() + play_button.get_style_context().add_class('flat') + play_button.get_style_context().add_class('preview-button') + play_button.set_tooltip_text(_('Start/stop playback')) + self._play_icon = Gtk.Image.new_from_icon_name( + 'media-playback-start-symbolic', + Gtk.IconSize.BUTTON) + play_button.add(self._play_icon) + play_button.connect('clicked', self._on_play_clicked) + event_box = Gtk.EventBox() + event_box.connect('realize', self._on_realize) + event_box.add(play_button) + self.add(event_box) + + self._seek_bar = Gtk.Scale( + orientation=Gtk.Orientation.HORIZONTAL) + self._seek_bar.set_range(0.0, 1.0) + self._seek_bar.set_size_request(300, -1) + self._seek_bar.set_value_pos(Gtk.PositionType.RIGHT) + self._seek_bar.connect('change-value', self._on_seek) + self._seek_bar.connect( + 'format-value', self._format_audio_timestamp) + event_box = Gtk.EventBox() + event_box.connect('realize', self._on_realize) + event_box.add(self._seek_bar) + self.add(event_box) + + self.connect('destroy', self._on_destroy) + self.show_all() + + def _setup_audio_player(self, file_path): + self._playbin = Gst.ElementFactory.make('playbin', 'bin') + if self._playbin is None: + return + self._playbin.set_property('uri', f'file://{file_path}') + state_return = self._playbin.set_state(Gst.State.PAUSED) + if state_return == Gst.StateChangeReturn.FAILURE: + return + + self._query = Gst.Query.new_position(Gst.Format.TIME) + bus = self._playbin.get_bus() + bus.add_signal_watch() + bus.connect('message', self._on_bus_message) + + def _on_bus_message(self, _bus, message): + if message.type == Gst.MessageType.EOS: + self._set_pause(True) + self._playbin.seek_simple( + Gst.Format.TIME, Gst.SeekFlags.FLUSH, 0) + elif message.type == Gst.MessageType.STATE_CHANGED: + _success, duration = self._playbin.query_duration( + Gst.Format.TIME) + if duration > 0: + self._seek_bar.set_range(0.0, duration) + + is_paused = self._get_paused() + if (duration > 0 and not is_paused and + not self._has_timeout): + GLib.timeout_add(500, self._update_seek_bar) + self._has_timeout = True + + def _on_seek(self, _range, _scroll, value): + self._playbin.seek_simple( + Gst.Format.TIME, Gst.SeekFlags.FLUSH, value) + return False + + def _on_play_clicked(self, _button): + self._set_pause(not self._get_paused()) + + def _on_destroy(self, _widget): + self._playbin.set_state(Gst.State.NULL) + + def _get_paused(self): + _, state, _ = self._playbin.get_state(20) + return state == Gst.State.PAUSED + + def _set_pause(self, paused): + if paused: + self._playbin.set_state(Gst.State.PAUSED) + self._play_icon.set_from_icon_name( + 'media-playback-start-symbolic', + Gtk.IconSize.BUTTON) + else: + self._playbin.set_state(Gst.State.PLAYING) + self._play_icon.set_from_icon_name( + 'media-playback-pause-symbolic', + Gtk.IconSize.BUTTON) + + def _update_seek_bar(self): + if self._get_paused(): + self._has_timeout = False + return False + + if self._playbin.query(self._query): + _fmt, cur_pos = self._query.parse_position() + self._seek_bar.set_value(cur_pos) + return True + + @staticmethod + def _format_audio_timestamp(_widget, ns): + seconds = ns / 1000000000 + minutes = seconds / 60 + hours = minutes / 60 + + i_seconds = int(seconds) + i_minutes = int(minutes) + i_hours = int(hours) + + if i_hours > 0: + return f'{i_hours:d}:{i_minutes:02d}:{i_seconds:02d}' + return f'{i_minutes:d}:{i_seconds:02d}' + + @staticmethod + def _on_realize(event_box): + event_box.get_window().set_cursor(get_cursor('pointer')) ===================================== gajim/gui_interface.py ===================================== @@ -75,6 +75,7 @@ from gajim.common.nec import NetworkEventsController from gajim.common.i18n import _ from gajim.common.client import Client +from gajim.common.preview import PreviewManager from gajim.common.const import Display from gajim.common.const import JingleState @@ -119,6 +120,7 @@ def __init__(self): self.roster = None self.avatar_storage = AvatarStorage() + self.preview_manager = PreviewManager() # Load CSS files app.load_css_config() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fa08195c27a01a2552bec594cae7512… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fa08195c27a01a2552bec594cae7512… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] AdHoc: Don’t expect session id for one stage commands
by Philipp Hörist 27 May '21

27 May '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 589fd699 by lovetox at 2021-05-27T20:38:15+02:00 AdHoc: Don’t expect session id for one stage commands - - - - - 1 changed file: - nbxmpp/modules/adhoc.py Changes: ===================================== nbxmpp/modules/adhoc.py ===================================== @@ -66,18 +66,18 @@ class AdHoc(BaseModule): yield command_list @iq_request_task - def execute_command(self, command, action=None, dataform=None): + def execute_command(self, cmd, action=None, dataform=None): _task = yield if action is None: action = AdHocAction.EXECUTE - attrs = {'node': command.node, + attrs = {'node': cmd.node, 'xmlns': Namespace.COMMANDS, 'action': action.value} - if command.sessionid is not None: - attrs['sessionid'] = command.sessionid + if cmd.sessionid is not None: + attrs['sessionid'] = cmd.sessionid - response = yield _make_command(command, attrs, dataform) + response = yield _make_command(cmd, attrs, dataform) if response.isError(): raise StanzaError(response) @@ -89,10 +89,6 @@ class AdHoc(BaseModule): if node is None: raise MalformedStanzaError('node attribute missing', response) - sessionid = command.getAttr('sessionid') - if sessionid is None: - raise MalformedStanzaError('sessionid attribute missing', response) - status = command.getAttr('status') if status is None: raise MalformedStanzaError('status attribute missing', response) @@ -103,6 +99,10 @@ class AdHoc(BaseModule): status = AdHocStatus(status) + sessionid = command.getAttr('sessionid') + if sessionid is None and _expect_sessionid(status, cmd.sessionid): + raise MalformedStanzaError('sessionid attribute missing', response) + try: notes = _parse_notes(command) except ValueError as error: @@ -192,3 +192,9 @@ def _parse_actions(command): default = actions[0] return actions, default + + +def _expect_sessionid(status, sent_sessionid): + # Session id should only be expected for multiple stage commands + # or when we initialize the session (set the session attribute) + return status != status.COMPLETED or sent_sessionid is not None View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/589fd69983bac85a6947004e… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/589fd69983bac85a6947004e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StatusIcon: Remove status change remnant
by Daniel Brötzmann 24 May '21

24 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: fa08195c by wurstsalat at 2021-05-24T19:05:41+02:00 StatusIcon: Remove status change remnant - - - - - 1 changed file: - gajim/gtk/status_icon.py Changes: ===================================== gajim/gtk/status_icon.py ===================================== @@ -59,7 +59,6 @@ def __init__(self): self._popup_menus = [] self._hide_menuitem_added = False - self._status_change_item = None self._status_icon = None self._ui.sounds_mute_menuitem.set_active( @@ -78,7 +77,6 @@ def _on_our_show(self, _event): def _on_account_state(self, _event): account_connected = bool(app.get_number_of_connected_accounts() > 0) self._ui.start_chat_menuitem.set_sensitive(account_connected) - self._status_change_item.set_sensitive(account_connected) def show_icon(self): if not self._status_icon: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fa08195c27a01a2552bec594cae75129… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fa08195c27a01a2552bec594cae75129… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Set default icon for windows
by Daniel Brötzmann 24 May '21

24 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 0a99fb17 by wurstsalat at 2021-05-24T18:56:41+02:00 Set default icon for windows - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -32,7 +32,7 @@ def __init__(self): self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_title('Gajim') - self.set_icon_name('org.gajim.Gajim') + self.set_default_icon_name('org.gajim.Gajim') self.set_default_size(1000, 500) app.window = self View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a99fb176c96ed5b6ad993101a0b9e80… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a99fb176c96ed5b6ad993101a0b9e80… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Set icon for main window
by Daniel Brötzmann 24 May '21

24 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: c6e820bd by wurstsalat at 2021-05-24T18:33:02+02:00 Set icon for main window - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -32,6 +32,7 @@ def __init__(self): self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_title('Gajim') + self.set_icon_name('org.gajim.Gajim') self.set_default_size(1000, 500) app.window = self View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c6e820bdd39cb50fe3de153f40a3bb8d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c6e820bdd39cb50fe3de153f40a3bb8d… 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