Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Add plugin-added/plugin-removed events
by Philipp Hörist 01 Jan '20

01 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 290efab3 by Philipp Hörist at 2020-01-01T08:43:43Z Add plugin-added/plugin-removed events This is useful as the PluginInstaller plugin does not need to manually add/remove plugins inside the PluginWindow anymore - - - - - e726b1bb by Philipp Hörist at 2020-01-01T08:47:15Z PluginWindow: Remove log calls when entering a method This clutters the logs and is rarely useful - - - - - 82b6cd66 by Philipp Hörist at 2020-01-01T08:48:55Z PluginWindow: add get_notebook() So plugins can access the notebook more easily - - - - - 2 changed files: - gajim/plugins/gui.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/gui.py ===================================== @@ -31,10 +31,11 @@ from gi.repository import Gdk from gajim.common import app from gajim.common import configpaths +from gajim.common import ged from gajim.common.exceptions import PluginsystemError from gajim.common.helpers import open_uri +from gajim.common.nec import EventHelper -from gajim.plugins.helpers import log_calls from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.plugins_i18n import _ @@ -55,12 +56,11 @@ class Column(IntEnum): ICON = 4 -class PluginsWindow: - '''Class for Plugins window''' +class PluginsWindow(EventHelper): - @log_calls('PluginsWindow') def __init__(self): - '''Initialize Plugins window''' + EventHelper.__init__(self) + builder = get_builder('plugins_window.ui') self.window = builder.get_object('plugins_window') self.window.set_transient_for(app.interface.roster.window) @@ -126,13 +126,21 @@ class PluginsWindow: # Adding GUI extension point for Plugins that want to hook the Plugin Window app.plugin_manager.gui_extension_point('plugin_window', self) + self.register_events([ + ('plugin-removed', ged.GUI1, self._on_plugin_removed), + ('plugin-added', ged.GUI1, self._on_plugin_added), + ]) + self.window.show_all() + def get_notebook(self): + # Used by plugins + return self.plugins_notebook + def on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: self.window.destroy() - @log_calls('PluginsWindow') def installed_plugins_treeview_selection_changed(self, treeview_selection): model, iter_ = treeview_selection.get_selected() if iter_: @@ -174,7 +182,6 @@ class PluginsWindow: self.uninstall_plugin_button.set_property('sensitive', False) self.configure_plugin_button.set_property('sensitive', False) - @log_calls('PluginsWindow') def fill_installed_plugins_model(self): pm = app.plugin_manager self.installed_plugins_model.clear() @@ -193,7 +200,6 @@ class PluginsWindow: icon = GdkPixbuf.Pixbuf.new_from_file_at_size(icon_file, 16, 16) return icon - @log_calls('PluginsWindow') def installed_plugins_toggled_cb(self, cell, path): is_active = self.installed_plugins_model[path][Column.ACTIVE] plugin = self.installed_plugins_model[path][Column.PLUGIN] @@ -210,13 +216,12 @@ class PluginsWindow: self.installed_plugins_model[path][Column.ACTIVE] = not is_active - @log_calls('PluginsWindow') def on_plugins_window_destroy(self, widget): '''Close window''' + self.unregister_events() app.plugin_manager.remove_gui_extension_point('plugin_window', self) del app.interface.instances['plugins'] - @log_calls('PluginsWindow') def on_configure_plugin_button_clicked(self, widget): selection = self.installed_plugins_treeview.get_selection() model, iter_ = selection.get_selected() @@ -234,7 +239,6 @@ class PluginsWindow: # XXX: maybe throw exception here? pass - @log_calls('PluginsWindow') def on_uninstall_plugin_button_clicked(self, widget): selection = self.installed_plugins_treeview.get_selection() model, iter_ = selection.get_selected() @@ -246,9 +250,21 @@ class PluginsWindow: WarningDialog(_('Unable to properly remove the plugin'), str(e), self.window) return - model.remove(iter_) - @log_calls('PluginsWindow') + def _on_plugin_removed(self, event): + for row in self.installed_plugins_model: + if row[Column.PLUGIN] == event.plugin: + self.installed_plugins_model.remove(row.iter) + break + + def _on_plugin_added(self, event): + icon = self.get_plugin_icon(event.plugin) + self.installed_plugins_model.append([event.plugin, + event.plugin.name, + False, + event.plugin.activatable, + icon]) + def on_install_plugin_button_clicked(self, widget): if app.is_flatpak(): open_uri('https://dev.gajim.org/gajim/gajim/wikis/help/flathub') @@ -267,21 +283,6 @@ class PluginsWindow: if not plugin: show_warn_dialog() return - model = self.installed_plugins_model - - for _index, row in enumerate(model): - if plugin == row[Column.PLUGIN]: - model.remove(row.iter) - break - - iter_ = model.append([ - plugin, - plugin.name, - False, - plugin.activatable, - self.get_plugin_icon(plugin)]) - sel = self.installed_plugins_treeview.get_selection() - sel.select_iter(iter_) NewConfirmationDialog( _('Overwrite Plugin?'), @@ -307,18 +308,11 @@ class PluginsWindow: if not plugin: show_warn_dialog() return - model = self.installed_plugins_model - iter_ = model.append([plugin, plugin.name, False, - plugin.activatable, self.get_plugin_icon(plugin)]) - sel = self.installed_plugins_treeview.get_selection() - sel.select_iter(iter_) ArchiveChooserDialog(_try_install, transient_for=self.window) class GajimPluginConfigDialog(Gtk.Dialog): - - @log_calls('GajimPluginConfigDialog') def __init__(self, plugin, **kwargs): Gtk.Dialog.__init__(self, title='%s %s'%(plugin.name, _('Configuration')), **kwargs) @@ -337,7 +331,6 @@ class GajimPluginConfigDialog(Gtk.Dialog): def on_close_button_clicked(self, widget): self.hide() - @log_calls('GajimPluginConfigDialog') def run(self, parent=None): self.set_transient_for(parent) self.on_run() ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -36,6 +36,7 @@ from gajim.common import app from gajim.common import nec from gajim.common import configpaths from gajim.common import modules +from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.exceptions import PluginsystemError from gajim.common.helpers import Singleton @@ -192,6 +193,8 @@ class PluginManager(metaclass=Singleton): self.plugins.append(plugin) plugin.active = False + app.nec.push_incoming_event( + NetworkEvent('plugin-added', plugin=plugin)) else: log.info('Not loading plugin %s v%s from module %s ' '(identified by short name: %s). Plugin already loaded.', @@ -798,11 +801,16 @@ class PluginManager(metaclass=Singleton): ''' Deactivate and remove plugin from `plugins` list ''' - if plugin: - self.remove_plugin(plugin) - self.delete_plugin_files(plugin.__path__) - if self._plugin_has_entry_in_global_config(plugin): - self._remove_plugin_entry_in_global_config(plugin) + if not plugin: + return + + self.remove_plugin(plugin) + self.delete_plugin_files(plugin.__path__) + if self._plugin_has_entry_in_global_config(plugin): + self._remove_plugin_entry_in_global_config(plugin) + + app.nec.push_incoming_event( + NetworkEvent('plugin-removed', plugin=plugin)) def get_plugin_by_path(self, plugin_dir): for plugin in self.plugins: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c3485caf074e0c2e8c15b1542fcf10868… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c3485caf074e0c2e8c15b1542fcf10868… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Pass data to the callback when calling write_all_async()
by Philipp Hörist 29 Dec '19

29 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c3485caf by Philipp Hörist at 2019-12-29T20:12:53Z Pass data to the callback when calling write_all_async() - Fix indentation - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1745,10 +1745,10 @@ class Observable: def write_file_async(path, data, callback, user_data=None): file = Gio.File.new_for_path(str(path)) file.create_async(Gio.FileCreateFlags.PRIVATE, - GLib.PRIORITY_DEFAULT, - None, - _on_file_created, - (callback, data, user_data)) + GLib.PRIORITY_DEFAULT, + None, + _on_file_created, + (callback, data, user_data)) def _on_file_created(file, result, user_data): callback, data, user_data = user_data @@ -1756,16 +1756,18 @@ def _on_file_created(file, result, user_data): outputstream = file.create_finish(result) except GLib.Error as error: callback(False, error, user_data) - return + # Pass data as user_data to the callback, because + # write_all_async() takes not reference to the data + # and python gc collects it before the data are written outputstream.write_all_async(data, GLib.PRIORITY_DEFAULT, None, _on_write_finished, - (callback, user_data)) + (callback, data, user_data)) def _on_write_finished(outputstream, result, user_data): - callback, user_data = user_data + callback, _data, user_data = user_data try: successful, _bytes_written = outputstream.write_all_finish(result) except GLib.Error as error: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c3485caf074e0c2e8c15b1542fcf108680… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c3485caf074e0c2e8c15b1542fcf108680… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused import
by Philipp Hörist 29 Dec '19

29 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 54513a17 by Philipp Hörist at 2019-12-29T16:09:48Z Remove unused import - - - - - 587cec9e by Philipp Hörist at 2019-12-29T16:12:24Z FileTransfer: Add annotation - - - - - 2 changed files: - gajim/common/filetransfer.py - gajim/gtk/filetransfer_progress.py Changes: ===================================== gajim/common/filetransfer.py ===================================== @@ -12,13 +12,14 @@ # 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 gajim.common.helpers import Observable from gajim.common.const import FTState class FileTransfer(Observable): - _state_descriptions = {} + _state_descriptions = {} # type: Dict[FTState, str] def __init__(self, account, cancel_func=None): Observable.__init__(self) ===================================== gajim/gtk/filetransfer_progress.py ===================================== @@ -12,7 +12,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import os import time from gi.repository import Gtk View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3d07622ec77506e9aafda2200254c82b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3d07622ec77506e9aafda2200254c82b9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor FileTransfer
by Philipp Hörist 29 Dec '19

29 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3d07622e by Philipp Hörist at 2019-12-29T11:54:45Z Refactor FileTransfer FileTransferProgress - Make it more generic, so it fits downloads and uploads FileTransfer - Add DECRYPTING state - Move state descriptions into FileTransfer - Add cancel() method - Add filename property - - - - - 6 changed files: - gajim/common/const.py - gajim/common/filetransfer.py - gajim/common/modules/httpupload.py - gajim/data/gui/httpupload_progress_dialog.ui → gajim/data/gui/filetransfer_progress.ui - gajim/gtk/http_upload_progress.py → gajim/gtk/filetransfer_progress.py - gajim/gui_interface.py Changes: ===================================== gajim/common/const.py ===================================== @@ -833,7 +833,8 @@ GIO_TLS_ERRORS = { class FTState(Enum): PREPARING = 'prepare' - ENCRYPTING = 'encrypt' + ENCRYPTING = 'encrypting' + DECRYPTING = 'decrypting' STARTED = 'started' IN_PROGRESS = 'progress' FINISHED = 'finished' @@ -847,6 +848,10 @@ class FTState(Enum): def is_encrypting(self): return self == FTState.ENCRYPTING + @property + def is_decrypting(self): + return self == FTState.DECRYPTING + @property def is_started(self): return self == FTState.STARTED ===================================== gajim/common/filetransfer.py ===================================== @@ -17,10 +17,14 @@ from gajim.common.helpers import Observable from gajim.common.const import FTState class FileTransfer(Observable): - def __init__(self, account): + + _state_descriptions = {} + + def __init__(self, account, cancel_func=None): Observable.__init__(self) self._account = account + self._cancel_func = cancel_func self._seen = 0 self.size = 0 @@ -42,6 +46,17 @@ class FileTransfer(Observable): return False return self._seen >= self.size + @property + def filename(self): + raise NotImplementedError + + def cancel(self): + if self._cancel_func is not None: + self._cancel_func(self) + + def get_state_description(self): + return self._state_descriptions.get(self._state, '') + def set_preparing(self): self._state = FTState.PREPARING self.notify('state-changed', FTState.PREPARING) @@ -50,6 +65,10 @@ class FileTransfer(Observable): self._state = FTState.ENCRYPTING self.notify('state-changed', FTState.ENCRYPTING) + def set_decrypting(self): + self._state = FTState.DECRYPTING + self.notify('state-changed', FTState.DECRYPTING) + def set_started(self): self._state = FTState.STARTED self.notify('state-changed', FTState.STARTED) ===================================== gajim/common/modules/httpupload.py ===================================== @@ -30,6 +30,7 @@ from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ from gajim.common.helpers import get_tls_error_phrase +from gajim.common.const import FTState from gajim.common.filetransfer import FileTransfer from gajim.common.modules.base import BaseModule from gajim.common.connection_handlers_events import InformationEvent @@ -129,9 +130,10 @@ class HTTPUpload(BaseModule): self._log.info("Detected MIME type of file: %s", mime) try: - transfer = HTTPFileTransfer(path, + transfer = HTTPFileTransfer(self._account, + self._cancel_upload, + path, contact, - self._account, mime, encryption, groupchat) @@ -148,7 +150,7 @@ class HTTPUpload(BaseModule): else: self._request_slot(transfer) - def cancel_upload(self, transfer): + def _cancel_upload(self, transfer): message = self._queued_messages.get(id(transfer)) if message is None: return @@ -164,7 +166,7 @@ class HTTPUpload(BaseModule): self._log.info('Sending request for slot') self._nbxmpp('HTTPUpload').request_slot( jid=self.component, - filename=os.path.basename(transfer.path), + filename=transfer.filename, size=transfer.size, content_type=transfer.mime, callback=self._received_slot, @@ -302,14 +304,22 @@ class HTTPUpload(BaseModule): class HTTPFileTransfer(FileTransfer): + + _state_descriptions = { + FTState.ENCRYPTING: _('Encrypting file…'), + FTState.PREPARING: _('Requesting HTTP File Upload Slot…'), + FTState.STARTED: _('Uploading via HTTP File Upload…'), + } + def __init__(self, + account, + cancel_func, path, contact, - account, mime, encryption, groupchat): - FileTransfer.__init__(self, account) + FileTransfer.__init__(self, account, cancel_func=cancel_func) self._path = path self._encryption = encryption @@ -346,18 +356,22 @@ class HTTPFileTransfer(FileTransfer): def headers(self): return self._headers + @property + def path(self): + return self._path + def get_transformed_uri(self): if self._uri_transform_func is not None: return self._uri_transform_func(self.get_uri) return self.get_uri - @property - def path(self): - return self._path - def set_uri_transform_func(self, func): self._uri_transform_func = func + @property + def filename(self): + return os.path.basename(self._path) + def set_error(self, text=''): self._close() super().set_error(text) ===================================== gajim/data/gui/httpupload_progress_dialog.ui → gajim/data/gui/filetransfer_progress.ui ===================================== @@ -168,15 +168,15 @@ </packing> </child> <child> - <object class="GtkButton" id="cancel_upload_button"> - <property name="label" translatable="yes">_Cancel Upload</property> + <object class="GtkButton" id="cancel_button"> + <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">center</property> <property name="margin_top">12</property> <property name="use_underline">True</property> - <signal name="clicked" handler="_on_cancel_upload_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_cancel_button_clicked" swapped="no"/> <style> <class name="destructive-action"/> </style> ===================================== gajim/gtk/http_upload_progress.py → gajim/gtk/filetransfer_progress.py ===================================== @@ -25,18 +25,17 @@ from gajim.gtk.util import get_builder from gajim.gtk.util import EventHelper -class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): +class FileTransferProgress(Gtk.ApplicationWindow, EventHelper): def __init__(self, transfer): Gtk.ApplicationWindow.__init__(self) EventHelper.__init__(self) - self.set_name('HTTPUploadProgressWindow') + self.set_name('FileTransferProgress') self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('File Transfer')) self._destroyed = False - self._con = app.connections[transfer.account] self._transfer = transfer self._transfer.connect('state-changed', self._on_transfer_state_change) self._transfer.connect('progress', self._on_transfer_progress) @@ -48,8 +47,8 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self._start_time = time.time() - self._ui = get_builder('httpupload_progress_dialog.ui') - self._ui.file_name_label.set_text(os.path.basename(transfer.path)) + self._ui = get_builder('filetransfer_progress.ui') + self._ui.file_name_label.set_text(transfer.filename) self.add(self._ui.box) self._pulse = GLib.timeout_add(100, self._pulse_progressbar) @@ -58,31 +57,27 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) - def _on_transfer_state_change(self, _transfer, _signal_name, state): - if state.is_preparing: - self._ui.label.set_text(_('Requesting HTTP File Upload Slot…')) - - elif state.is_finished or state.is_error: + def _on_transfer_state_change(self, transfer, _signal_name, state): + if state.is_finished or state.is_error: self.destroy() + return - elif state.is_started: - self._ui.label.set_text(_('Uploading via HTTP File Upload…')) - - elif state.is_encrypting: - self._ui.label.set_text(_('Encrypting file…')) + description = transfer.get_state_description() + if description: + self._ui.label.set_text(description) def _pulse_progressbar(self): self._ui.progressbar.pulse() return True - def _on_cancel_upload_button_clicked(self, _widget): + def _on_cancel_button_clicked(self, _widget): self.destroy() def _on_destroy(self, *args): - self._con.get_module('HTTPUpload').cancel_upload(self._transfer) - self._destroyed = True + self._transfer.cancel() self._transfer.disconnect(self) self._transfer = None + self._destroyed = True if self._pulse is not None: GLib.source_remove(self._pulse) ===================================== gajim/gui_interface.py ===================================== @@ -102,7 +102,7 @@ from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data from gajim.gtk.filetransfer import FileTransfersWindow -from gajim.gtk.http_upload_progress import HTTPUploadProgressWindow +from gajim.gtk.filetransfer_progress import FileTransferProgress from gajim.gtk.roster_item_exchange import RosterItemExchangeWindow from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray @@ -858,7 +858,7 @@ class Interface: @staticmethod def show_httpupload_progress(transfer): - HTTPUploadProgressWindow(transfer) + FileTransferProgress(transfer) def send_httpupload(self, chat_control): accept_cb = partial(self.on_file_dialog_ok, chat_control) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3d07622ec77506e9aafda2200254c82b9c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3d07622ec77506e9aafda2200254c82b9c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageInput: Set min height for vertical scrollbar
by Philipp Hörist 27 Dec '19

27 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 068274fe by Philipp Hörist at 2019-12-27T22:11:19Z MessageInput: Set min height for vertical scrollbar Fixes #9574, #8980 - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/data/style/gajim.css Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1567,22 +1567,6 @@ class ScrolledWindow(Gtk.ScrolledWindow): self.get_style_context().add_class('scrolled-no-border') self.get_style_context().add_class('no-scroll-indicator') self.get_style_context().add_class('scrollbar-style') + self.get_style_context().add_class('one-line-scrollbar') self.set_shadow_type(Gtk.ShadowType.IN) - - def do_get_preferred_height(self): - min_height, natural_height = Gtk.ScrolledWindow.do_get_preferred_height(self) - # Gtk Bug: If policy is set to Automatic, the ScrolledWindow - # has a min size of around 46-82 depending on the System. Because - # we want it smaller, we set policy NEVER if the height is < 90 - # so the ScrolledWindow will shrink to around 26 (1 line height). - # Once it gets over 90 its no problem to restore the policy. - if natural_height < 90: - GLib.idle_add(self.set_policy, - Gtk.PolicyType.AUTOMATIC, - Gtk.PolicyType.NEVER) - else: - GLib.idle_add(self.set_policy, - Gtk.PolicyType.AUTOMATIC, - Gtk.PolicyType.AUTOMATIC) - - return min_height, natural_height + self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) ===================================== gajim/data/style/gajim.css ===================================== @@ -21,6 +21,7 @@ .scrollbar-style scrollbar trough {background-color:@theme_base_color; } .scrollbar-style scrollbar {border:none; } .scrollbar-style slider {min-width: 3px; background-color: #a0a3a4} +.one-line-scrollbar scrollbar.vertical slider { min-height: 20px; } .actionbar-no-border box {border: none} .actionbar-no-border button { View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/068274feed324433a12313a97c4eeff52a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/068274feed324433a12313a97c4eeff52a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make open_file() work with Path objects
by Philipp Hörist 27 Dec '19

27 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 162ca259 by Philipp Hörist at 2019-12-27T16:59:32Z Make open_file() work with Path objects - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1587,6 +1587,8 @@ def open_file(path): if os.name == 'nt': os.startfile(path) else: + # Call str() to make it work with pathlib.Path + path = str(path) if not path.startswith('file://'): path = 'file://' + path Gio.AppInfo.launch_default_for_uri(path) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/162ca25902ab756af861e06f0253868228… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/162ca25902ab756af861e06f0253868228… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ConversationTextview: Add nickname tag
by Philipp Hörist 26 Dec '19

26 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 91bb8c33 by Philipp Hörist at 2019-12-26T23:29:33Z ConversationTextview: Add nickname tag This makes it easier for plugins to detect the nickname - - - - - 85e0e0da by Philipp Hörist at 2019-12-26T23:30:15Z MessageInput: Add insert_text() For convenience - - - - - 2 changed files: - gajim/conversation_textview.py - gajim/gtk/message_input.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -272,6 +272,9 @@ class ConversationTextview(GObject.GObject): textview_icon = buffer_.create_tag('textview-icon') textview_icon.set_property('rise', Pango.units_from_double(-2.45)) + # To help plugins easily identify the nickname + buffer_.create_tag('nickname') + tag = buffer_.create_tag('time_sometimes') tag.set_property('foreground', 'darkgrey') #Pango.SCALE_SMALL @@ -1227,6 +1230,7 @@ class ConversationTextview(GObject.GObject): if other_tags_for_name: name_tags = other_tags_for_name[:] # create a new list name_tags.append(kind) + name_tags.append('nickname') for tag in name_tags: if tag.startswith('muc_nickname_color_'): ===================================== gajim/gtk/message_input.py ===================================== @@ -117,6 +117,9 @@ class MessageInputTextView(Gtk.TextView): self.emit('text-changed', self.get_buffer()) self._last_text = text + def insert_text(self, text): + self.get_buffer().insert_at_cursor(text) + def has_text(self): buf = self.get_buffer() start, end = buf.get_bounds() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/209cd3c866c37384703f70c2401080fc0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/209cd3c866c37384703f70c2401080fc0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Icons: Add map icon
by Philipp Hörist 26 Dec '19

26 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 209cd3c8 by Philipp Hörist at 2019-12-26T20:41:28Z Icons: Add map icon - - - - - 2 changed files: - + gajim/data/icons/hicolor/96x96/categories/map.png - + gajim/data/icons/hicolor/scalable/categories/map.svg Changes: ===================================== gajim/data/icons/hicolor/96x96/categories/map.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/96x96/categories/map.png differ ===================================== gajim/data/icons/hicolor/scalable/categories/map.svg ===================================== @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="Layer_1" + x="0px" + y="0px" + viewBox="0 0 495 495" + style="enable-background:new 0 0 495 495;" + xml:space="preserve" + sodipodi:docname="map.svg" + inkscape:export-filename="C:\msys64\home\Philipp\gajim-master\gajim\data\icons\hicolor\street-map-svgrepo-com.svg.png" + inkscape:export-xdpi="18.618181" + inkscape:export-ydpi="18.618181" + inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata + id="metadata81"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + id="defs79" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1056" + id="namedview77" + showgrid="false" + inkscape:zoom="0.47676768" + inkscape:cx="146.82203" + inkscape:cy="247.5" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="Layer_1" /><g + id="g44"><path + style="fill:#FFCD00;" + d="M330,0v70c10.62,0,20.79,1.954,30.179,5.512L412.29,23.4l44.044,12.524l-62.643,62.643 c13.502,15.111,21.724,35.035,21.724,56.847c0,14.551-3.798,28.913-10.84,41.56L495,287.4V46.92L330,0z" + id="path2" /><polygon + style="fill:#FFCD00;" + points="330,382.256 330,410.257 382.852,463.109 495,495 495,343.968 431.644,280.612 " + id="polygon4" /><polygon + style="fill:#FFCD00;" + points="330,325.688 403.36,252.328 380.332,229.3 330,292.581 " + id="polygon6" /><polygon + style="fill:#FFDA44;" + points="316,396.257 330,410.257 330,382.256 " + id="polygon8" /><polygon + style="fill:#FFDA44;" + points="244.06,380.885 164.99,459.956 164.99,495 319.099,451.18 315.405,452.23 " + id="polygon10" /><polygon + style="fill:#FFDA44;" + points="272.266,219.993 206.001,286.258 287.716,367.972 330,325.688 330,292.581 " + id="polygon12" /><polygon + style="fill:#FFDA44;" + points="204.107,231.584 172.068,199.545 164.99,206.624 164.99,270.7 " + id="polygon14" /><polygon + style="fill:#FFDA44;" + points="215.776,352.601 177.717,314.542 164.99,327.269 164.99,403.388 " + id="polygon16" /><path + style="fill:#FFDA44;" + d="M164.99,98.084v37.814l67.401,67.401l17.743-17.743c-3.627-9.595-5.549-19.819-5.549-30.141 C244.585,108.313,282.898,70,330,70V0L191.048,39.51l45.435-12.919L164.99,98.084z" + id="path18" /><polygon + style="fill:#FFCD00;" + points="164.99,206.624 0,371.615 0,435.69 164.99,270.7 " + id="polygon20" /><polygon + style="fill:#FFCD00;" + points="164.99,327.269 34.397,457.862 93.662,474.716 164.99,403.388 " + id="polygon22" /><polygon + style="fill:#FFCD00;" + points="117.799,145.276 0,263.074 0,315.047 143.784,171.261 " + id="polygon24" /><polygon + style="fill:#FFCD00;" + points="137.705,487.241 129.651,484.95 164.99,495 164.99,459.956 " + id="polygon26" /><polygon + style="fill:#FFCD00;" + points="146.083,116.991 164.99,135.899 164.99,98.084 " + id="polygon28" /><polygon + style="fill:#FFCD00;" + points="0,0 0,206.506 160.782,45.723 " + id="polygon30" /><path + style="fill:#FFE477;" + d="M397.019,208.32l-16.687,20.98l23.028,23.028L287.716,367.972l-81.715-81.715l66.265-66.265 l-9.253-11.633c-5.47-6.916-9.79-14.633-12.879-22.803L232.391,203.3l-86.308-86.308l18.907-18.907l71.493-71.493L191.048,39.51 L164.99,46.92l-4.208-1.197L0,206.506v56.568l117.799-117.799l25.985,25.985L0,315.047v56.569l164.99-164.992l7.078-7.078 l32.039,32.039L0,435.69v12.39l34.397,9.782L164.99,327.269l12.727-12.727l38.059,38.059l-50.786,50.786l-71.328,71.328 l35.988,10.234l8.055,2.291l27.285-27.285l79.07-79.071l71.345,71.344l3.694-1.05l10.901-3.1l52.853,15.029L316,396.257 l115.644-115.644L495,343.968V287.4l-90.425-90.425C402.367,200.939,399.849,204.74,397.019,208.32z" + id="path32" /><path + style="fill:#FFE477;" + d="M393.691,98.568l62.643-62.643L412.29,23.4l-52.111,52.111 C373.144,80.425,384.612,88.406,393.691,98.568z" + id="path34" /><path + style="fill:#CD2A00;" + d="M330,123.573c17.553,0,31.842,14.281,31.842,31.842c0,17.553-14.289,31.842-31.842,31.842v105.324 l50.332-63.281l16.687-20.98c2.831-3.58,5.349-7.38,7.556-11.345c7.042-12.647,10.84-27.008,10.84-41.56 c0-21.813-8.222-41.736-21.724-56.847c-9.079-10.161-20.547-18.143-33.512-23.056C350.79,71.954,340.62,70,330,70V123.573z" + id="path36" /><path + style="fill:#D8D7DA;" + d="M361.842,155.415c0-17.561-14.289-31.842-31.842-31.842v63.683 C347.553,187.257,361.842,172.968,361.842,155.415z" + id="path38" /><path + style="fill:#FF3501;" + d="M244.585,155.415c0,10.322,1.922,20.546,5.549,30.141c3.089,8.171,7.409,15.887,12.879,22.803 l9.253,11.633L330,292.581V187.257c-17.561,0-31.842-14.289-31.842-31.842c0-17.561,14.281-31.842,31.842-31.842V70 C282.898,70,244.585,108.313,244.585,155.415z" + id="path40" /><path + style="fill:#FFFFFF;" + d="M330,123.573c-17.561,0-31.842,14.281-31.842,31.842c0,17.553,14.281,31.842,31.842,31.842V123.573z " + id="path42" /></g><g + id="g46" /><g + id="g48" /><g + id="g50" /><g + id="g52" /><g + id="g54" /><g + id="g56" /><g + id="g58" /><g + id="g60" /><g + id="g62" /><g + id="g64" /><g + id="g66" /><g + id="g68" /><g + id="g70" /><g + id="g72" /><g + id="g74" /></svg> \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/209cd3c866c37384703f70c2401080fc0b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/209cd3c866c37384703f70c2401080fc0b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add async read/write file helpers
by Philipp Hörist 26 Dec '19

26 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e638b523 by Philipp Hörist at 2019-12-26T19:31:40Z Add async read/write file helpers - - - - - e17ad155 by Philipp Hörist at 2019-12-26T20:31:38Z PluginManager: Call disconnect handler when removing extension point Previously we called the disconnect handler only when a plugin was deactivated. - - - - - 2 changed files: - gajim/common/helpers.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1738,3 +1738,51 @@ class Observable: self._callbacks[signal_name].remove(func) continue func()(self, signal_name, *args, **kwargs) + + +def write_file_async(path, data, callback, user_data=None): + file = Gio.File.new_for_path(str(path)) + file.create_async(Gio.FileCreateFlags.PRIVATE, + GLib.PRIORITY_DEFAULT, + None, + _on_file_created, + (callback, data, user_data)) + +def _on_file_created(file, result, user_data): + callback, data, user_data = user_data + try: + outputstream = file.create_finish(result) + except GLib.Error as error: + callback(False, error, user_data) + return + + outputstream.write_all_async(data, + GLib.PRIORITY_DEFAULT, + None, + _on_write_finished, + (callback, user_data)) + +def _on_write_finished(outputstream, result, user_data): + callback, user_data = user_data + try: + successful, _bytes_written = outputstream.write_all_finish(result) + except GLib.Error as error: + callback(False, error, user_data) + else: + callback(successful, None, user_data) + + +def load_file_async(path, callback, user_data=None): + file = Gio.File.new_for_path(str(path)) + file.load_contents_async(None, + _on_load_finished, + (callback, user_data)) + +def _on_load_finished(file, result, user_data): + callback, user_data = user_data + try: + _successful, contents, _etag = file.load_contents_finish(result) + except GLib.Error as error: + callback(None, error, user_data) + else: + callback(contents, None, user_data) ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -328,6 +328,13 @@ class PluginManager(metaclass=Singleton): self.gui_extension_points[gui_extpoint_name].remove( ext_point) + if gui_extpoint_name not in self.gui_extension_points_handlers: + return + + for handlers in self.gui_extension_points_handlers[gui_extpoint_name]: + disconnect_handler = handlers[1] + if disconnect_handler is not None: + disconnect_handler(args[0]) @log_calls('PluginManager') def _add_gui_extension_point_call_to_list(self, gui_extpoint_name, *args): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d4b9b823b6b0ec2c46c051d28a2d63ad5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d4b9b823b6b0ec2c46c051d28a2d63ad5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HTTPUpload: Add missing argument
by Philipp Hörist 23 Dec '19

23 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d4b9b823 by Philipp Hörist at 2019-12-23T22:41:49Z HTTPUpload: Add missing argument - - - - - 1 changed file: - gajim/common/modules/httpupload.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -240,7 +240,7 @@ class HTTPUpload(BaseModule): if tls_errors: phrase = get_tls_error_phrase(tls_errors) - self._log.warning('TLS verification failed: %s') + self._log.warning('TLS verification failed: %s', phrase) self._session.cancel_message(message, Soup.Status.CANCELLED) self._raise_information_event('httpupload-error', phrase) return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d4b9b823b6b0ec2c46c051d28a2d63ad5d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d4b9b823b6b0ec2c46c051d28a2d63ad5d… 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