Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Fix license header
by Philipp Hörist 07 Apr '19

07 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 32168c60 by Philipp Hörist at 2019-04-07T15:11:30Z Fix license header - - - - - 1 changed file: - gajim/gtk/adhoc.py Changes: ===================================== gajim/gtk/adhoc.py ===================================== @@ -1,18 +1,16 @@ -# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# This file is part of Gajim. # -# This file is part of the OpenPGP Gajim Plugin. -# -# OpenPGP Gajim Plugin is free software; you can redistribute it and/or modify +# 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. # -# OpenPGP Gajim Plugin is distributed in the hope that it will be useful, +# 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 OpenPGP Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. import logging from enum import IntEnum View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/32168c60f572c800ec4f6fc3bd1f612264… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/32168c60f572c800ec4f6fc3bd1f612264… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused variable
by Philipp Hörist 06 Apr '19

06 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 797a9518 by Philipp Hörist at 2019-04-06T22:27:13Z Remove unused variable - - - - - 1 changed file: - gajim/gtk/discovery.py Changes: ===================================== gajim/gtk/discovery.py ===================================== @@ -1310,7 +1310,6 @@ class ToplevelAgentBrowser(AgentBrowser): if not iter_: return service = model[iter_][0] - node = model[iter_][1] AdHocCommand(self.account, service) def on_register_button_clicked(self, widget=None): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/797a9518ea685e3551c5e3f7d88a184d56… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/797a9518ea685e3551c5e3f7d88a184d56… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add new Ad-Hoc Command dialog
by Philipp Hörist 06 Apr '19

06 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ed011da5 by Philipp Hörist at 2019-04-06T22:06:56Z Add new Ad-Hoc Command dialog - - - - - 7 changed files: - gajim/common/modules/adhoc_commands.py - gajim/data/style/gajim.css - gajim/groupchat_control.py - + gajim/gtk/adhoc.py - − gajim/gtk/adhoc_commands.py - gajim/gtk/discovery.py - gajim/roster_window.py Changes: ===================================== gajim/common/modules/adhoc_commands.py ===================================== @@ -296,6 +296,13 @@ class LeaveGroupchatsCommand(AdHocCommand): class AdHocCommands(BaseModule): + + _nbxmpp_extends = 'AdHoc' + _nbxmpp_methods = [ + 'request_command_list', + 'execute_command', + ] + def __init__(self, con): BaseModule.__init__(self, con) @@ -469,38 +476,6 @@ class AdHocCommands(BaseModule): raise nbxmpp.NodeProcessed - def request_command_list(self, jid): - """ - Request the command list. - """ - self._log.info('Request Command List: %s', jid) - query = nbxmpp.Iq(typ='get', to=jid, queryNS=nbxmpp.NS_DISCO_ITEMS) - query.setQuerynode(nbxmpp.NS_COMMANDS) - - self._con.connection.SendAndCallForResponse( - query, self._command_list_received) - - def _command_list_received(self, stanza): - if not nbxmpp.isResultNode(stanza): - self._log.info('Error: %s', stanza.getError()) - - app.nec.push_incoming_event( - AdHocCommandError(None, conn=self._con, - error=stanza.getError())) - return - - items = stanza.getQueryPayload() - commandlist = [] - if items: - commandlist = [ - (t.getAttr('node'), t.getAttr('name')) for t in items - ] - - self._log.info('Received: %s', commandlist) - app.nec.push_incoming_event( - AdHocCommandListReceived( - None, conn=self._con, commandlist=commandlist)) - def send_command(self, jid, node, session_id, form, action='execute'): """ @@ -563,10 +538,6 @@ class AdHocCommandError(NetworkIncomingEvent): name = 'adhoc-command-error' -class AdHocCommandListReceived(NetworkIncomingEvent): - name = 'adhoc-command-list' - - class AdHocCommandActionResponse(NetworkIncomingEvent): name = 'adhoc-command-action-response' ===================================== gajim/data/style/gajim.css ===================================== @@ -244,10 +244,15 @@ button.flat.link { padding: 0; border: 0; } /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} .data-form-title { font-size: 16px; font-weight: bold; } -.data-form-widget grid { margin: 18px; } +.data-form-widget grid { margin: 0px 18px 18px 18px; } .data-form-widget treeview { padding: 5px; } .data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } .data-form-widget textview { padding: 5px; } /*Image Preview*/ .preview-image { box-shadow: 0px 0px 3px 0px alpha(@theme_text_color, 0.2); } + + +/* Treeview */ +.adhoc-treeview { padding: 5px; } +.adhoc-scrolled { border: 1px solid; border-color:@unfocused_borders; } ===================================== gajim/groupchat_control.py ===================================== @@ -79,7 +79,7 @@ from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.tooltips import GCTooltip from gajim.gtk.groupchat_config import GroupchatConfig -from gajim.gtk.adhoc_commands import CommandWindow +from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.dataform import DataFormWidget from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_icon_name @@ -735,7 +735,7 @@ class GroupchatControl(ChatControlBase): """ Execute AdHoc commands on the current room """ - CommandWindow(self.account, self.room_jid) + AdHocCommand(self.account, self.room_jid) def _on_upload_avatar(self, action, param): def _on_accept(filename): @@ -2815,7 +2815,7 @@ class GroupchatControl(ChatControlBase): def _on_execute_command_occupant(self, widget, nick): jid = self.room_jid + '/' + nick - CommandWindow(self.account, jid) + AdHocCommand(self.account, jid) def on_row_activated(self, widget, path): """ ===================================== gajim/gtk/adhoc.py ===================================== @@ -0,0 +1,461 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of the OpenPGP Gajim Plugin. +# +# OpenPGP Gajim Plugin 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. +# +# OpenPGP Gajim Plugin 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 OpenPGP Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. + +import logging +from enum import IntEnum + +from gi.repository import Gtk +from nbxmpp.util import is_error_result +from nbxmpp.const import AdHocAction + +from gajim.common import app +from gajim.common.i18n import _ + +from gajim.common.modules import dataforms + +from gajim.gtk.dataform import DataFormWidget +from gajim.gtk.util import ensure_not_destroyed +from gajim.gtk.util import find_widget +from gajim.gtk.util import MultiLineLabel + +log = logging.getLogger('gajim.gtk.adhoc') + + +class Page(IntEnum): + REQUEST = 0 + EXECUTE = 1 + COMMANDS = 2 + STAGE = 3 + COMPLETED = 4 + ERROR = 5 + + +class AdHocCommand(Gtk.Assistant): + def __init__(self, account, jid=None): + Gtk.Assistant.__init__(self) + + self._con = app.connections[account] + self._account = account + self._destroyed = False + + self.set_application(app.app) + self.set_resizable(True) + self.set_position(Gtk.WindowPosition.CENTER) + + self.set_default_size(600, 400) + self.get_style_context().add_class('dialog-margin') + + self._add_page(Request()) + self._add_page(ExecuteCommand()) + self._add_page(Commands()) + self._add_page(Stage()) + self._add_page(Completed()) + self._add_page(Error()) + + self.connect('prepare', self._on_page_change) + self.connect('cancel', self._on_cancel) + self.connect('close', self._on_cancel) + self.connect('destroy', self._on_destroy) + + self._remove_sidebar() + + self._buttons = {} + self._add_custom_buttons() + + self.show() + self._con.get_module('AdHocCommands').request_command_list( + jid, callback=self._received_command_list) + + def _add_custom_buttons(self): + action_area = find_widget('action_area', self) + for button in list(action_area.get_children()): + self.remove_action_widget(button) + + cancel = Gtk.Button(label=_('Cancel')) + cancel.connect('clicked', self._abort) + cancel.get_style_context().add_class('destructive-action') + self._buttons['cancel'] = cancel + self.add_action_widget(cancel) + + complete = Gtk.Button(label=_('Finish')) + complete.action = AdHocAction.COMPLETE + complete.connect('clicked', self._execute_action) + self._buttons['complete'] = complete + self.add_action_widget(complete) + + commands = Gtk.Button(label=_('Commands')) + commands.connect('clicked', + lambda *args: self.set_current_page(Page.COMMANDS)) + self._buttons['commands'] = commands + self.add_action_widget(commands) + + next_ = Gtk.Button(label=_('Next')) + next_.action = AdHocAction.NEXT + next_.connect('clicked', self._execute_action) + self._buttons['next'] = next_ + self.add_action_widget(next_) + + prev = Gtk.Button(label=_('Previous')) + prev.action = AdHocAction.PREV + prev.connect('clicked', self._execute_action) + self._buttons['prev'] = prev + self.add_action_widget(prev) + + execute = Gtk.Button(label=_('Execute')) + execute.action = AdHocAction.EXECUTE + execute.get_style_context().add_class('suggested-action') + execute.connect('clicked', self._execute_action) + self._buttons['execute'] = execute + self.add_action_widget(execute) + + def _set_button_visibility(self, page): + for button in self._buttons.values(): + button.hide() + + if page == Page.COMMANDS: + self._buttons['execute'].show() + + elif page == Page.STAGE: + self._buttons['cancel'].show() + stage_page = self.get_nth_page(page) + if not stage_page.actions: + self._buttons['complete'].show() + else: + for action in stage_page.actions: + button = self._buttons.get(action.value) + if button is not None: + button.show() + + elif page in (Page.ERROR, Page.COMPLETED): + self._buttons['commands'].show() + + def _add_page(self, page): + self.append_page(page) + self.set_page_type(page, page.type_) + self.set_page_title(page, page.title) + self.set_page_complete(page, page.complete) + + def execute_action(self): + self._execute_action(self._buttons['execute']) + + def _execute_action(self, button): + action = button.action + current_page = self.get_current_page() + dataform = None + if action == AdHocAction.EXECUTE: + command = self.get_nth_page(current_page).get_selected_command() + else: + command, dataform = self.get_nth_page(current_page).stage_data + if action == AdHocAction.PREV: + dataform = None + + self.set_current_page(Page.EXECUTE) + if current_page == Page.STAGE: + self.get_nth_page(current_page).clear() + self._con.get_module('AdHocCommands').execute_command( + command, + action=action, + dataform=dataform, + callback=self._received_stage) + + def _abort(self, *args): + if self.get_current_page() == Page.STAGE: + command = self.get_nth_page(Page.STAGE).stage_data[0] + self._con.get_module('AdHocCommands').execute_command( + command, AdHocAction.CANCEL) + self.set_current_page(Page.COMMANDS) + + @ensure_not_destroyed + def _received_command_list(self, commands): + if is_error_result(commands): + self.set_current_page(Page.ERROR) + return + self.get_nth_page(Page.COMMANDS).add_commands(commands) + self.set_current_page(Page.COMMANDS) + + @ensure_not_destroyed + def _received_stage(self, stage): + if is_error_result(stage): + self.get_nth_page(Page.ERROR).set_text(str(stage)) + self.set_current_page(Page.ERROR) + return + + page = Page.STAGE + if stage.is_completed: + page = Page.COMPLETED + + stage_page = self.get_nth_page(page) + stage_page.process_stage(stage) + self.set_current_page(page) + + def set_stage_complete(self, is_valid): + self._buttons['next'].set_sensitive(is_valid) + self._buttons['complete'].set_sensitive(is_valid) + + def _remove_sidebar(self): + main_box = self.get_children()[0] + sidebar = main_box.get_children()[0] + main_box.remove(sidebar) + + def _on_page_change(self, _assistant, _page): + self._set_button_visibility(self.get_current_page()) + + def _on_error(self, error_text): + log.info('Show Error page') + page = self.get_nth_page(Page.ERROR) + page.set_text(error_text) + self.set_current_page(Page.ERROR) + + def _on_cancel(self, _widget): + self.destroy() + + def _on_destroy(self, *args): + self._destroyed = True + + +class Request(Gtk.Box): + + type_ = Gtk.AssistantPageType.CUSTOM + title = _('Request Command List') + complete = False + + def __init__(self): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_spacing(18) + spinner = Gtk.Spinner() + self.pack_start(spinner, True, True, 0) + spinner.start() + self.show_all() + + +class ExecuteCommand(Request): + + type_ = Gtk.AssistantPageType.CUSTOM + title = _('Executing…') + complete = False + + +class Commands(Gtk.Box): + + type_ = Gtk.AssistantPageType.CUSTOM + title = _('Command List') + complete = True + + def __init__(self): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_spacing(18) + self._commands = {} + self._scrolled = Gtk.ScrolledWindow() + self._scrolled.get_style_context().add_class('adhoc-scrolled') + self._scrolled.set_max_content_height(400) + self._scrolled.set_max_content_width(400) + self._scrolled.set_policy(Gtk.PolicyType.NEVER, + Gtk.PolicyType.AUTOMATIC) + self._treeview = Gtk.TreeView() + self._treeview.get_style_context().add_class('adhoc-treeview') + self._store = Gtk.ListStore(str, str) + self._treeview.set_model(self._store) + column = Gtk.TreeViewColumn(_('Commands')) + column.set_expand(True) + self._treeview.append_column(column) + renderer = Gtk.CellRendererText() + column.pack_start(renderer, True) + column.add_attribute(renderer, 'text', 0) + + self._treeview.connect('row-activated', self._on_row_activate) + self._treeview.set_search_equal_func(self._search_func) + + self._scrolled.add(self._treeview) + self.pack_start(self._scrolled, True, True, 0) + self.show_all() + + def _search_func(self, model, column, search_text, iter_): + return search_text.lower() not in model[iter_][0].lower() + + def _on_row_activate(self, tree_view, path, column): + self.get_toplevel().execute_action() + + def add_commands(self, commands): + self._store.clear() + self._commands = {} + for command in commands: + key = '%s:%s' % (command.jid, command.node) + self._commands[key] = command + self._store.append((command.name, key)) + + def get_selected_command(self): + model, treeiter = self._treeview.get_selection().get_selected() + key = model[treeiter][1] + return self._commands[key] + + +class Stage(Gtk.Box): + + type_ = Gtk.AssistantPageType.CUSTOM + title = _('Settings') + complete = True + + def __init__(self): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_spacing(18) + self._dataform_widget = None + self._notes = [] + self._last_stage_data = None + self.show_all() + + @property + def stage_data(self): + return self._last_stage_data, self._dataform_widget.get_submit_form() + + @property + def actions(self): + return self._last_stage_data.actions + + def clear(self): + self._show_form(None) + self._show_notes(None) + self._last_stage_data = None + + def process_stage(self, stage_data): + self._last_stage_data = stage_data + self._show_notes(stage_data.notes) + self._show_form(stage_data.data) + + def _show_form(self, form): + if self._dataform_widget is not None: + self.remove(self._dataform_widget) + self._dataform_widget.destroy() + if form is None: + return + form = dataforms.extend_form(node=form) + self._dataform_widget = DataFormWidget(form) + self._dataform_widget.connect('is-valid', self._on_is_valid) + self._dataform_widget.validate() + self._dataform_widget.show_all() + self.add(self._dataform_widget) + + def _show_notes(self, notes): + for note in self._notes: + self.remove(note) + self._notes = [] + + if notes is None: + return + + for note in notes: + label = Gtk.Label(label=note.text) + label.show() + self._notes.append(label) + self.add(label) + + def _on_is_valid(self, _widget, is_valid): + self.get_toplevel().set_stage_complete(is_valid) + + +class Completed(Gtk.Box): + + type_ = Gtk.AssistantPageType.CUSTOM + title = _('Finished') + complete = True + + def __init__(self): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_spacing(12) + self._notes = [] + self._dataform_widget = None + + icon = Gtk.Image.new_from_icon_name('object-select-symbolic', + Gtk.IconSize.DIALOG) + icon.get_style_context().add_class('success-color') + icon.show() + + label = Gtk.Label(label='Finished') + label.show() + + self._icon_text = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) + self._icon_text.set_spacing(12) + self._icon_text.set_halign(Gtk.Align.CENTER) + self._icon_text.add(icon) + self._icon_text.add(label) + self.add(self._icon_text) + + self.show_all() + + def process_stage(self, stage_data): + self._show_notes(stage_data.notes) + self._show_form(stage_data.data) + self._show_icon_text(stage_data.data is None) + + def _show_icon_text(self, show): + if show: + self.set_valign(Gtk.Align.CENTER) + self._icon_text.show_all() + else: + self.set_valign(Gtk.Align.FILL) + self._icon_text.hide() + + def _show_form(self, form): + if self._dataform_widget is not None: + self.remove(self._dataform_widget) + self._dataform_widget.destroy() + if form is None: + return + + form = dataforms.extend_form(node=form) + + self._dataform_widget = DataFormWidget( + form, options={'read-only': True}) + self._dataform_widget.show_all() + self.add(self._dataform_widget) + + def _show_notes(self, notes): + for note in self._notes: + self.remove(note) + self._notes = [] + + for note in notes: + label = MultiLineLabel(label=note.text) + label.set_justify(Gtk.Justification.CENTER) + label.show() + self._notes.append(label) + self.add(label) + + +class Error(Gtk.Box): + + type_ = Gtk.AssistantPageType.CUSTOM + title = _('Execution failed') + complete = True + + def __init__(self): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_spacing(12) + self.set_homogeneous(True) + + icon = Gtk.Image.new_from_icon_name('dialog-error-symbolic', + Gtk.IconSize.DIALOG) + icon.get_style_context().add_class('error-color') + icon.set_valign(Gtk.Align.END) + self._label = Gtk.Label() + self._label.get_style_context().add_class('bold16') + self._label.set_valign(Gtk.Align.START) + + self.add(icon) + self.add(self._label) + self.show_all() + + def set_text(self, text): + self._label.set_text(text) ===================================== gajim/gtk/adhoc_commands.py deleted ===================================== @@ -1,557 +0,0 @@ -# Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -# Stephan Erb <steve-e AT h3c.de> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -# FIXME: think if we need caching command list. it may be wrong if there will -# be entities that often change the list, it may be slow to fetch it every time - -from gi.repository import Gtk -import nbxmpp - -from gajim.common import app -from gajim.common.i18n import _ -from gajim.common.modules import dataforms -from gajim.common import ged - -from gajim import dataforms_widget - -from gajim.gtk.dialogs import HigDialog -from gajim.gtk.util import get_builder - - -class CommandWindow: - """ - Class for a window for single ad-hoc commands session - - Note, that there might be more than one for one account/jid pair in one - moment. - - TODO: Maybe put this window into MessageWindow? consider this when it will - be possible to manage more than one window of one. - TODO: Account/jid pair in MessageWindowMgr. - TODO: GTK 2.10 has a special wizard-widget, consider using it... - """ - - def __init__(self, account, jid, commandnode=None): - """ - Create new window - """ - - # an account object - self._con = app.connections[account] - self.jid = jid - self.commandnode = commandnode - self.data_form_widget = None - self.stage_finish_cb = None - self.stage_back_button_cb = None - self.stage_forward_button_cb = None - self.stage_execute_button_cb = None - self.stage_finish_button_cb = None - self.stage_close_button_cb = None - self.stage_restart_button_cb = None - self.stage_window_delete_cb = None - - # retrieving widgets from xml - self.xml = get_builder('adhoc_commands_window.ui') - self.window = self.xml.get_object('adhoc_commands_window') - self.window.connect('delete-event', - self.on_adhoc_commands_window_delete_event) - for name in ('restart_button', 'back_button', 'forward_button', - 'execute_button', 'finish_button', 'close_button', 'stages_notebook', - 'retrieving_commands_stage_vbox', 'retrieving_commands_spinner', - 'command_list_stage_vbox', 'command_treeview', - 'sending_form_stage_vbox', 'sending_form_spinner', - 'notes_label', 'no_commands_stage_vbox', - 'error_stage_vbox', 'error_description_label'): - setattr(self, name, self.xml.get_object(name)) - - self.command_store = Gtk.ListStore(str, str) - self.command_treeview.set_model(self.command_store) - renderer = Gtk.CellRendererText() - column = Gtk.TreeViewColumn("Command", renderer, text=0) - self.command_treeview.append_column(column) - - app.ged.register_event_handler( - 'adhoc-command-error', ged.CORE, self._on_command_error) - app.ged.register_event_handler( - 'adhoc-command-list', ged.CORE, self._on_command_list) - app.ged.register_event_handler('adhoc-command-action-response', - ged.CORE, - self._on_action_response) - - self.initiate() - - def initiate(self): - - self.commandlist = None # a list of (commandname, commanddescription) - - # command's data - self.sessionid = None - self.dataform = None - self.allow_stage3_close = False - - # creating data forms widget - if self.data_form_widget: - self.sending_form_stage_vbox.remove(self.data_form_widget) - self.data_form_widget.destroy() - self.data_form_widget = dataforms_widget.DataFormWidget() - self.data_form_widget.show() - self.sending_form_stage_vbox.pack_start(self.data_form_widget, True, True, 0) - - if self.commandnode: - # Execute command - self.stage3() - else: - # setting initial stage - self.stage1() - - # displaying the window - self.window.set_title(_('Ad-hoc Commands - Gajim')) - self.xml.connect_signals(self) - self.window.show_all() - - self.restart_button.set_sensitive(False) - - # These functions are set up by appropriate stageX methods. - def stage_finish(self, *anything): - if self.stage_finish_cb: - self.stage_finish_cb(*anything) - - # Widget callbacks... - def on_back_button_clicked(self, *anything): - if self.stage_back_button_cb: - return self.stage_back_button_cb(*anything) - return False - - def on_forward_button_clicked(self, *anything): - if self.stage_forward_button_cb: - return self.stage_forward_button_cb(*anything) - return False - - def on_execute_button_clicked(self, *anything): - if self.stage_execute_button_cb: - return self.stage_execute_button_cb(*anything) - return False - - def on_finish_button_clicked(self, *anything): - if self.stage_finish_button_cb: - return self.stage_finish_button_cb(*anything) - return False - - def on_close_button_clicked(self, *anything): - if self.stage_close_button_cb: - return self.stage_close_button_cb(*anything) - return False - - def on_restart_button_clicked(self, *anything): - if self.stage_restart_button_cb: - return self.stage_restart_button_cb(*anything) - return False - - def on_adhoc_commands_window_destroy(self, *anything): - app.ged.remove_event_handler( - 'adhoc-command-error', ged.CORE, self._on_command_error) - app.ged.remove_event_handler( - 'adhoc-command-list', ged.CORE, self._on_command_list) - app.ged.remove_event_handler('adhoc-command-action-response', - ged.CORE, - self._on_action_response) - - def on_adhoc_commands_window_delete_event(self, *anything): - if self.stage_window_delete_cb: - return self.stage_window_delete_cb(self.window) - return False - - def __del__(self): - print('Object has been deleted.') - -# stage 1: waiting for command list - def stage1(self): - """ - Prepare the first stage. Request command list, set appropriate state of - widgets - """ - # close old stage... - self.stage_finish() - - # show the stage - self.stages_notebook.set_current_page( - self.stages_notebook.page_num( - self.retrieving_commands_stage_vbox)) - - # set widgets' state - self.close_button.set_sensitive(True) - self.back_button.set_sensitive(False) - self.forward_button.set_sensitive(False) - self.execute_button.set_sensitive(False) - self.finish_button.set_sensitive(False) - - # request command list - self._con.get_module('AdHocCommands').request_command_list(self.jid) - self.retrieving_commands_spinner.start() - - # setup the callbacks - self.stage_finish_cb = self.stage1_finish - self.stage_close_button_cb = self.stage1_close_button_clicked - self.stage_restart_button_cb = self.stage1_restart_button_clicked - self.stage_window_delete_cb = \ - self.stage1_adhoc_commands_window_delete_event - - def stage1_finish(self): - self.retrieving_commands_spinner.stop() - - def stage1_close_button_clicked(self, widget): - # cancelling in this stage is not critical, so we don't - # show any popups to user - self.stage_finish() - self.window.destroy() - - def stage1_restart_button_clicked(self, widget): - self.stage_finish() - self.restart() - - def stage1_adhoc_commands_window_delete_event(self, widget): - self.stage1_finish() - return True - -# stage 2: choosing the command to execute - def stage2(self): - """ - Populate the command list - """ - # close old stage - self.stage_finish() - - assert self.commandlist - - self.stages_notebook.set_current_page( - self.stages_notebook.page_num(self.command_list_stage_vbox)) - - self.close_button.set_sensitive(True) - self.back_button.set_sensitive(False) - self.forward_button.set_sensitive(True) - self.execute_button.set_sensitive(False) - self.finish_button.set_sensitive(False) - - # build the commands list - self.command_store.clear() - for (commandnode, commandname) in self.commandlist: - self.command_store.append([commandname, commandnode]) - self.command_treeview.get_selection().select_iter(self.command_store.get_iter_first()) - - self.stage_finish_cb = self.stage2_finish - self.stage_close_button_cb = self.stage2_close_button_clicked - self.stage_restart_button_cb = self.stage2_restart_button_clicked - self.stage_forward_button_cb = self.stage2_forward_button_clicked - self.stage_window_delete_cb = None - - def stage2_finish(self): - """ - Save selected command to self.commandnode - """ - model, treeiter = self.command_treeview.get_selection().get_selected() - self.commandnode = model[treeiter][1] - - def stage2_close_button_clicked(self, widget): - self.stage_finish() - self.window.destroy() - - def stage2_restart_button_clicked(self, widget): - self.stage_finish() - self.restart() - - def stage2_forward_button_clicked(self, widget): - self.stage3() - - def on_check_commands_1_button_clicked(self, widget): - self.stage1() - -# stage 3: command invocation - def stage3(self): - # close old stage - self.stage_finish() - - self.form_status = None - - self.stages_notebook.set_current_page( - self.stages_notebook.page_num( - self.sending_form_stage_vbox)) - - self.restart_button.set_sensitive(True) - self.close_button.set_sensitive(True) - self.back_button.set_sensitive(False) - self.forward_button.set_sensitive(False) - self.execute_button.set_sensitive(False) - self.finish_button.set_sensitive(False) - - self.stage3_submit_form() - - self.stage_finish_cb = None - self.stage_back_button_cb = self.stage3_back_button_clicked - self.stage_forward_button_cb = self.stage3_forward_button_clicked - self.stage_execute_button_cb = self.stage3_execute_button_clicked - self.stage_finish_button_cb = self.stage3_finish_button_clicked - self.stage_close_button_cb = self.stage3_close_button_clicked - self.stage_restart_button_cb = self.stage3_restart_button_clicked - self.stage_window_delete_cb = self.stage3_close_button_clicked - - def stage3_can_close(self, cb): - if self.form_status == 'completed': - cb() - return - - def on_yes(button): - self._con.get_module('AdHocCommands').send_cancel( - self.jid, self.commandnode, self.sessionid) - dialog.destroy() - cb() - - dialog = HigDialog(self.window, Gtk.MessageType.WARNING, - Gtk.ButtonsType.YES_NO, _('Cancel confirmation'), - _('You are in process of executing command. Do you really want to ' - 'cancel it?'), on_response_yes=on_yes) - dialog.popup() - - def stage3_close_button_clicked(self, widget): - """ - We are in the middle of executing command. Ask user if he really want to - cancel the process, then cancel it - """ - # this works also as a handler for window_delete_event, so we have to - # return appropriate values - if self.allow_stage3_close: - return False - - def on_ok(): - self.allow_stage3_close = True - self.window.destroy() - - self.stage3_can_close(on_ok) - - return True # Block event, don't close window - - def stage3_restart_button_clicked(self, widget): - def on_ok(): - self.restart() - - self.stage3_can_close(on_ok) - - def stage3_back_button_clicked(self, widget): - self.stage3_submit_form('prev') - - def stage3_forward_button_clicked(self, widget): - self.stage3_submit_form('next') - - def stage3_execute_button_clicked(self, widget): - self.stage3_submit_form('execute') - - def stage3_finish_button_clicked(self, widget): - self.stage3_submit_form('complete') - - def stage3_submit_form(self, action='execute'): - self.data_form_widget.set_sensitive(False) - - if self.data_form_widget.get_data_form(): - df = self.data_form_widget.get_data_form() - if not df.is_valid(): - app.interface.raise_dialog( - 'invalid-form', transient_for=self.window) - self.data_form_widget.set_sensitive(True) - return - self.data_form_widget.data_form.type_ = 'submit' - else: - self.data_form_widget.hide() - - self.close_button.set_sensitive(True) - self.back_button.set_sensitive(False) - self.forward_button.set_sensitive(False) - self.execute_button.set_sensitive(False) - self.finish_button.set_sensitive(False) - - self.sending_form_spinner.start() - self._con.get_module('AdHocCommands').send_command( - self.jid, self.commandnode, self.sessionid, - self.data_form_widget.data_form, action) - - def stage3_next_form(self, command): - if not isinstance(command, nbxmpp.Node): - self.stage5(error=_('Service sent malformed data'), senderror=True) - return - - self.sending_form_spinner.stop() - - if not self.sessionid: - self.sessionid = command.getAttr('sessionid') - elif self.sessionid != command.getAttr('sessionid'): - self.stage5(error=_('Service changed the session identifier.'), - senderror=True) - return - - self.form_status = command.getAttr('status') - - self.commandnode = command.getAttr('node') - if command.getTag('x'): - self.dataform = dataforms.extend_form(node=command.getTag('x')) - - self.data_form_widget.set_sensitive(True) - try: - self.data_form_widget.selectable = True - self.data_form_widget.data_form = self.dataform - except dataforms.Error: - self.stage5(error=_('Service sent malformed data'), - senderror=True) - return - self.data_form_widget.show() - if self.data_form_widget.title: - self.window.set_title(_('%s - Ad-hoc Commands - Gajim') % \ - self.data_form_widget.title) - else: - self.data_form_widget.hide() - - actions = command.getTag('actions') - if actions: - # actions, actions, actions... - self.close_button.set_sensitive(True) - self.back_button.set_sensitive(actions.getTag('prev') is not None) - self.forward_button.set_sensitive( - actions.getTag('next') is not None) - self.execute_button.set_sensitive(True) - self.finish_button.set_sensitive(actions.getTag('complete') is not \ - None) - else: - self.close_button.set_sensitive(True) - self.back_button.set_sensitive(False) - self.forward_button.set_sensitive(False) - self.execute_button.set_sensitive(True) - self.finish_button.set_sensitive(False) - - if self.form_status == 'completed': - self.close_button.set_sensitive(True) - self.back_button.hide() - self.forward_button.hide() - self.execute_button.hide() - self.finish_button.hide() - self.close_button.show() - self.stage_window_delete_cb = self.stage3_close_button_clicked - - note = command.getTag('note') - if note: - self.notes_label.set_text(note.getData()) - self.notes_label.set_no_show_all(False) - self.notes_label.show() - else: - self.notes_label.set_no_show_all(True) - self.notes_label.hide() - - def restart(self): - self.commandnode = None - self.initiate() - -# stage 4: no commands are exposed - def stage4(self): - """ - Display the message. Wait for user to close the window - """ - # close old stage - self.stage_finish() - - self.stages_notebook.set_current_page( - self.stages_notebook.page_num(self.no_commands_stage_vbox)) - - self.close_button.set_sensitive(True) - self.back_button.set_sensitive(False) - self.forward_button.set_sensitive(False) - self.execute_button.set_sensitive(False) - self.finish_button.set_sensitive(False) - - self.stage_finish_cb = None - self.stage_close_button_cb = self.stage4_close_button_clicked - self.stage_restart_button_cb = self.stage4_restart_button_clicked - self.stage_window_delete_cb = None - - def stage4_close_button_clicked(self, widget): - self.window.destroy() - - def stage4_restart_button_clicked(self, widget): - self.restart() - - def on_check_commands_2_button_clicked(self, widget): - self.stage1() - -# stage 5: an error has occurred - def stage5(self, error=None, errorid=None, senderror=False): - """ - Display the error message. Wait for user to close the window - """ - # FIXME: sending error to responder - # close old stage - self.stage_finish() - - assert errorid or error - - if errorid: - # we've got error code, display appropriate message - try: - errorname = nbxmpp.NS_STANZAS + ' ' + str(errorid) - errordesc = nbxmpp.ERRORS[errorname][2] - error = errordesc - del errorname, errordesc - except KeyError: # when stanza doesn't have error description - error = _('Service returned an error.') - elif error: - # we've got error message - pass - else: - # we don't know what's that, bailing out - assert False - - self.stages_notebook.set_current_page( - self.stages_notebook.page_num(self.error_stage_vbox)) - - self.close_button.set_sensitive(True) - self.back_button.hide() - self.forward_button.hide() - self.execute_button.hide() - self.finish_button.hide() - - self.error_description_label.set_text(error) - - self.stage_finish_cb = None - self.stage_close_button_cb = self.stage5_close_button_clicked - self.stage_restart_button_cb = self.stage5_restart_button_clicked - self.stage_window_delete_cb = None - - def stage5_close_button_clicked(self, widget): - self.window.destroy() - - def stage5_restart_button_clicked(self, widget): - self.restart() - - def _on_command_error(self, obj): - self.stage5(errorid=obj.error) - - def _on_command_list(self, obj): - self.commandlist = obj.commandlist - if not self.commandlist: - self.stage4() - else: - self.stage2() - - def _on_action_response(self, obj): - self.stage3_next_form(obj.command) ===================================== gajim/gtk/discovery.py ===================================== @@ -59,7 +59,7 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.discovery_search import SearchWindow -from gajim.gtk.adhoc_commands import CommandWindow +from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.util import icon_exists from gajim.gtk.util import get_builder @@ -1311,7 +1311,7 @@ class ToplevelAgentBrowser(AgentBrowser): return service = model[iter_][0] node = model[iter_][1] - CommandWindow(self.account, service, commandnode=node) + AdHocCommand(self.account, service) def on_register_button_clicked(self, widget=None): """ ===================================== gajim/roster_window.py ===================================== @@ -84,7 +84,7 @@ from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.accounts import AccountsWindow from gajim.gtk.tooltips import RosterTooltip -from gajim.gtk.adhoc_commands import CommandWindow +from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window @@ -3635,7 +3635,7 @@ class RosterWindow: jid = contact.jid if resource is not None: jid = jid + '/' + resource - CommandWindow(account, jid) + AdHocCommand(account, jid) def on_roster_window_focus_in_event(self, widget, event): # roster received focus, so if we had urgency REMOVE IT View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ed011da59e9cfd692cbaea59c1103706c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ed011da59e9cfd692cbaea59c1103706c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add option to make DataFormWidget read-only
by Philipp Hörist 06 Apr '19

06 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 06848eae by Philipp Hörist at 2019-04-06T21:20:30Z Add option to make DataFormWidget read-only - - - - - 2 changed files: - gajim/gtk/dataform.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -22,6 +22,8 @@ from gajim.gtkgui_helpers import scale_pixbuf_from_data from gajim.common import app from gajim.common.i18n import _ +from gajim.gtk.util import MultiLineLabel + class DataFormWidget(Gtk.ScrolledWindow): @@ -32,6 +34,7 @@ class DataFormWidget(Gtk.ScrolledWindow): self.set_hexpand(True) self.set_vexpand(True) self.get_style_context().add_class('data-form-widget') + self.set_overlay_scrolling(False) self._form_node = form_node @@ -91,7 +94,7 @@ class FormGrid(Gtk.Grid): if form_node.title is not None: self.title = form_node.title self._add_row(Title(form_node.title)) - if form_node.instructions is not None: + if form_node.instructions: self.instructions = form_node.instructions self._add_row(Instructions(form_node.instructions)) @@ -194,6 +197,7 @@ class Field: self._field = field self._form_grid = form_grid self._validate_source_id = None + self._read_only = options.get('read-only', False) self._label = Gtk.Label(label=field.label) self._label.set_single_line_mode(False) @@ -213,6 +217,10 @@ class Field: self._warning_box.set_size_request(16, -1) self._warning_box.add(self._warning_image) + @property + def read_only(self): + return self._read_only + def add(self, form_grid, row_number): form_grid.attach(self._label, 0, row_number, 1, 1) form_grid.attach_next_to(self._widget, @@ -262,9 +270,14 @@ class BooleanField(Field): def __init__(self, field, form_grid, options): Field.__init__(self, field, form_grid, options) - self._widget = Gtk.CheckButton() - self._widget.set_active(field.value) - self._widget.connect('toggled', self._toggled) + if self.read_only: + label = _('Yes') if field.value else _('No') + self._widget = Gtk.Label(label=label) + self._widget.set_xalign(0) + else: + self._widget = Gtk.CheckButton() + self._widget.set_active(field.value) + self._widget.connect('toggled', self._toggled) def _toggled(self, _widget): self._field.value = self._widget.get_active() @@ -465,9 +478,13 @@ class TextSingleField(Field): def __init__(self, field, form_grid, options): Field.__init__(self, field, form_grid, options) - self._widget = Gtk.Entry() - self._widget.set_text(field.value) - self._widget.connect('changed', self._changed) + if self.read_only: + self._widget = Gtk.Label(label=field.value) + self._widget.set_xalign(0) + else: + self._widget = Gtk.Entry() + self._widget.set_text(field.value) + self._widget.connect('changed', self._changed) def _changed(self, _widget): self._field.value = self._widget.get_text() @@ -498,10 +515,16 @@ class TextMultiField(Field): self._widget.set_min_content_height(100) self._widget.set_max_content_height(300) - self._textview = Gtk.TextView() - self._textview.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) - self._textview.get_buffer().set_text(field.value) - self._textview.get_buffer().connect('changed', self._changed) + if self.read_only: + self._textview = MultiLineLabel(label=field.value) + self._textview.set_selectable(True) + self._textview.set_xalign(0) + self._textview.set_yalign(0) + else: + self._textview = Gtk.TextView() + self._textview.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) + self._textview.get_buffer().set_text(field.value) + self._textview.get_buffer().connect('changed', self._changed) self._widget.add(self._textview) ===================================== gajim/gtk/util.py ===================================== @@ -31,6 +31,7 @@ from functools import wraps from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib +from gi.repository import Pango import cairo from gajim.common import app @@ -606,3 +607,19 @@ def format_fingerprint(fingerprint): buf += '{0} '.format(fingerprint[w:w + wordsize]) buf = textwrap.fill(buf, width=36) return buf.rstrip().upper() + + +def find_widget(name, container): + for child in container.get_children(): + if Gtk.Buildable.get_name(child) == name: + return child + if isinstance(child, Gtk.Box): + return find_widget(name, child) + + +class MultiLineLabel(Gtk.Label): + def __init__(self, *args, **kwargs): + Gtk.Label.__init__(self, *args, **kwargs) + self.set_line_wrap(True) + self.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) + self.set_single_line_mode(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/06848eaeafd142c4a4bdc28af1e22c708c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/06848eaeafd142c4a4bdc28af1e22c708c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add Discovery (XEP-0030) module
by Philipp Hörist 06 Apr '19

06 Apr '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: cf7f0625 by Philipp Hörist at 2019-04-06T21:25:37Z Add Discovery (XEP-0030) module - - - - - 11dffacf by Philipp Hörist at 2019-04-06T21:26:47Z Add Ad-Hoc Commands (XEP-0050) module - - - - - 5 changed files: - nbxmpp/const.py - nbxmpp/dispatcher.py - + nbxmpp/modules/adhoc.py - + nbxmpp/modules/discovery.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -296,6 +296,26 @@ class AnonymityMode(Enum): NONE = 'none' +class AdHocStatus(Enum): + EXECUTING = 'executing' + COMPLETED = 'completed' + CANCELED = 'canceled' + + +class AdHocAction(Enum): + EXECUTE = 'execute' + CANCEL = 'cancel' + PREV = 'prev' + NEXT = 'next' + COMPLETE = 'complete' + + +class AdHocNoteType(Enum): + INFO = 'info' + WARN = 'warn' + ERROR = 'error' + + MOODS = [ 'afraid', 'amazed', ===================================== nbxmpp/dispatcher.py ===================================== @@ -67,6 +67,7 @@ from nbxmpp.modules.omemo import OMEMO from nbxmpp.modules.annotations import Annotations from nbxmpp.modules.muclumbus import Muclumbus from nbxmpp.modules.software_version import SoftwareVersion +from nbxmpp.modules.adhoc import AdHoc from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -202,6 +203,7 @@ class XMPPDispatcher(PlugIn): self._modules['Annotations'] = Annotations(self._owner) self._modules['Muclumbus'] = Muclumbus(self._owner) self._modules['SoftwareVersion'] = SoftwareVersion(self._owner) + self._modules['AdHoc'] = AdHoc(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/adhoc.py ===================================== @@ -0,0 +1,125 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program 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; either version 3 +# of the License, or (at your option) any later version. +# +# This program 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 this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_COMMANDS +from nbxmpp.protocol import NS_DISCO_ITEMS +from nbxmpp.protocol import NS_DATA +from nbxmpp.protocol import Iq +from nbxmpp.protocol import isResultNode +from nbxmpp.protocol import Node +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.util import raise_error +from nbxmpp.structs import AdHocCommand +from nbxmpp.structs import AdHocCommandNote +from nbxmpp.const import AdHocStatus +from nbxmpp.const import AdHocAction +from nbxmpp.const import AdHocNoteType +from nbxmpp.modules.discovery import get_disco_request + + +log = logging.getLogger('nbxmpp.m.adhoc') + + +class AdHoc: + def __init__(self, client): + self._client = client + self.handlers = [] + + @call_on_response('_command_list_received') + def request_command_list(self, jid=None): + if jid is None: + jid = self._client.get_bound_jid().getBare() + return get_disco_request(NS_DISCO_ITEMS, jid, node=NS_COMMANDS) + + @callback + def _command_list_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + payload = stanza.getQueryPayload() + if not payload: + return raise_error(log.warning, stanza, 'stanza-malformed') + + command_list = [] + for item in payload: + if item.getName() != 'item': + continue + try: + command_list.append(AdHocCommand(**item.getAttrs())) + except Exception as error: + log.warning(error) + return raise_error(log.warning, stanza, 'stanza-malformed') + + return command_list + + @call_on_response('_command_result_received') + def execute_command(self, command, action=None, dataform=None): + if action is None: + action = AdHocAction.EXECUTE + attrs = {'node': command.node, + 'xmlns': NS_COMMANDS, + 'action': action.value} + if command.sessionid is not None: + attrs['sessionid'] = command.sessionid + + command_node = Node('command', attrs=attrs) + if dataform is not None: + command_node.addChild(node=dataform) + iq = Iq('set', to=command.jid) + iq.addChild(node=command_node) + return iq + + @callback + def _command_result_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + command = stanza.getTag('command', namespace=NS_COMMANDS) + if command is None: + return raise_error(log.warning, stanza, 'stanza-malformed') + + attrs = command.getAttrs() + notes = [] + actions = [] + try: + for note in command.getTags('note'): + type_ = note.getAttr('type') + if type_ is not None: + type_ = AdHocNoteType(note.getAttr('type')) + notes.append(AdHocCommandNote(text=note.getData(), + type=type_)) + + actions_ = command.getTag('actions') + if actions_ is not None: + for action in actions_.getChildren(): + actions.append(AdHocAction(action.getName())) + + return AdHocCommand( + jid=str(stanza.getFrom()), + name=None, + node=attrs['node'], + sessionid=attrs.get('sessionid'), + status=AdHocStatus(attrs['status']), + data=command.getTag('x', namespace=NS_DATA), + actions=actions, + notes=notes) + except Exception as error: + log.warning(error) + return raise_error(log.warning, stanza, 'stanza-malformed') ===================================== nbxmpp/modules/discovery.py ===================================== @@ -0,0 +1,30 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program 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; either version 3 +# of the License, or (at your option) any later version. +# +# This program 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 this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import Iq + + +log = logging.getLogger('nbxmpp.m.discovery') + + +def get_disco_request(namespace, jid, node=None): + iq = Iq('get', to=jid, queryNS=namespace) + if node is not None: + iq.getQuery().setAttr('node', node) + return iq ===================================== nbxmpp/structs.py ===================================== @@ -29,6 +29,7 @@ from nbxmpp.const import StatusCode from nbxmpp.const import PresenceType from nbxmpp.const import Error from nbxmpp.const import LOCATION_DATA +from nbxmpp.const import AdHocStatus StanzaHandler = namedtuple('StanzaHandler', 'name callback typ ns xmlns system priority') @@ -106,6 +107,25 @@ MuclumbusItem = namedtuple('MuclumbusItem', 'jid name nusers description languag SoftwareVersionResult = namedtuple('SoftwareVersionResult', 'name version os') +AdHocCommandNote = namedtuple('AdHocCommandNote', 'text type') + +class AdHocCommand(namedtuple('AdHocCommand', 'jid node name sessionid status data actions notes')): + + __slots__ = [] + + def __new__(cls, jid, node, name, sessionid=None, status=None, + data=None, actions=None, notes=None): + return super(AdHocCommand, cls).__new__(cls, jid, node, name, sessionid, + status, data, actions, notes) + + @property + def is_completed(self): + return self.status == AdHocStatus.COMPLETED + + @property + def is_canceled(self): + return self.status == AdHocStatus.CANCEL + class OMEMOBundle(namedtuple('OMEMOBundle', 'spk spk_signature ik otpks')): def pick_prekey(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/79330a5079d4f9c85d98c9028… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/79330a5079d4f9c85d98c9028… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Windows: Fix version comparison
by Philipp Hörist 06 Apr '19

06 Apr '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 72b8c0ab by Philipp Hörist at 2019-04-06T07:34:31Z Windows: Fix version comparison Fixes #9643 - - - - - 5f562fb0 by Philipp Hörist at 2019-04-06T07:34:50Z Iterate safely over dict Fixes #9633 - - - - - 1 changed file: - gajim/common/socks5.py Changes: ===================================== gajim/common/socks5.py ===================================== @@ -23,7 +23,7 @@ import struct import hashlib import os import time -import platform +import sys import logging from errno import EWOULDBLOCK from errno import ENOBUFS @@ -296,7 +296,7 @@ class SocksQueue: def activate_proxy(self, idx): if not self.isHashInSockObjs(self.senders, idx): return - for key in self.senders: + for key in list(self.senders): if idx in key: sender = self.senders[key] if sender.file_props.type_ != 's': @@ -1436,7 +1436,7 @@ class Socks5Listener(IdleObject): # Under windows Vista, we need that to listen on ipv6 AND ipv4 # Doesn't work under windows XP if os.name == 'nt': - if int(platform.win32_ver()[0]) >= 6: # Win Vista + + if sys.getwindowsversion().major >= 6: # Win Vista + # 47 is socket.IPPROTO_IPV6 # 27 is socket.IPV6_V6ONLY under windows, but not defined ... self._serv.setsockopt(41, 27, 0) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/80f37bb3fa963770ed547fd7574c6dbdb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/80f37bb3fa963770ed547fd7574c6dbdb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix import
by Philipp Hörist 05 Apr '19

05 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ac6eae89 by Philipp Hörist at 2019-04-05T20:56:13Z Fix import - - - - - 1 changed file: - gajim/common/socks5.py Changes: ===================================== gajim/common/socks5.py ===================================== @@ -23,7 +23,7 @@ import struct import hashlib import os import time -import platform +import sys import logging from errno import EWOULDBLOCK from errno import ENOBUFS View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ac6eae8965b8829a08de7c9084f1265fea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ac6eae8965b8829a08de7c9084f1265fea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Windows: Fix version comparison
by Philipp Hörist 05 Apr '19

05 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0b9aeb01 by Philipp Hörist at 2019-04-05T19:49:49Z Windows: Fix version comparison Fixes #9643 - - - - - f1642e53 by Philipp Hörist at 2019-04-05T19:57:18Z Iterate safely over dict Fixes #9633 - - - - - 1 changed file: - gajim/common/socks5.py Changes: ===================================== gajim/common/socks5.py ===================================== @@ -296,7 +296,7 @@ class SocksQueue: def activate_proxy(self, idx): if not self.isHashInSockObjs(self.senders, idx): return - for key in self.senders: + for key in list(self.senders): if idx in key: sender = self.senders[key] if sender.file_props.type_ != 's': @@ -1436,7 +1436,7 @@ class Socks5Listener(IdleObject): # Under windows Vista, we need that to listen on ipv6 AND ipv4 # Doesn't work under windows XP if os.name == 'nt': - if int(platform.win32_ver()[0]) >= 6: # Win Vista + + if sys.getwindowsversion().major >= 6: # Win Vista + # 47 is socket.IPPROTO_IPV6 # 27 is socket.IPV6_V6ONLY under windows, but not defined ... self._serv.setsockopt(41, 27, 0) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/03cc3379d5e70a8aa4ea9a7bc04f5c534… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/03cc3379d5e70a8aa4ea9a7bc04f5c534… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CertificateDialog: Dont fail on None values
by Philipp Hörist 05 Apr '19

05 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 03cc3379 by Philipp Hörist at 2019-04-05T19:38:32Z CertificateDialog: Dont fail on None values Some attributes of the certificate can yield None - - - - - 1 changed file: - gajim/gtk/dialogs.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -901,21 +901,23 @@ class CertificateDialog(Gtk.ApplicationWindow): self._ui.label_cert_for_account.set_text( _('Certificate for account\n%s') % account) - self._ui.data_it_common_name.set_text(subject.commonName) - self._ui.data_it_organization.set_text(subject.organizationName) + self._ui.data_it_common_name.set_text(subject.commonName or '') + self._ui.data_it_organization.set_text(subject.organizationName or '') self._ui.data_it_organizational_unit.set_text( - subject.organizationalUnitName) + subject.organizationalUnitName or '') self._ui.data_it_serial_number.set_text(str(cert.get_serial_number())) - self._ui.data_ib_common_name.set_text(issuer.commonName) - self._ui.data_ib_organization.set_text(issuer.organizationName) + self._ui.data_ib_common_name.set_text(issuer.commonName or '') + self._ui.data_ib_organization.set_text(issuer.organizationName or '') self._ui.data_ib_organizational_unit.set_text( - issuer.organizationalUnitName) + issuer.organizationalUnitName or '') - issued = datetime.strptime(cert.get_notBefore().decode('ascii'), '%Y%m%d%H%M%SZ') + issued = datetime.strptime(cert.get_notBefore().decode('ascii'), + '%Y%m%d%H%M%SZ') issued = issued.strftime('%B %d, %Y, %H:%M:%S %z') self._ui.data_issued_on.set_text(issued) - expires = datetime.strptime(cert.get_notAfter().decode('ascii'), '%Y%m%d%H%M%SZ') + expires = datetime.strptime(cert.get_notAfter().decode('ascii'), + '%Y%m%d%H%M%SZ') expires = expires.strftime('%B %d, %Y, %H:%M:%S %z') self._ui.data_expires_on.set_text(expires) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/03cc3379d5e70a8aa4ea9a7bc04f5c5348… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/03cc3379d5e70a8aa4ea9a7bc04f5c5348… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 3 commits: Rework HTTPUpload dialog
by Philipp Hörist 05 Apr '19

05 Apr '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: e01e552f by Daniel Brötzmann at 2019-04-05T19:19:31Z Rework HTTPUpload dialog - - - - - cb4e60c4 by Philipp Hörist at 2019-04-05T19:27:39Z Dont send invalid presence show value - - - - - 80f37bb3 by Philipp Hörist at 2019-04-05T19:28:46Z Windows: Dont override format region settings - - - - - 4 changed files: - gajim/common/i18n.py - gajim/common/modules/presence.py - gajim/data/gui/httpupload_progress_dialog.ui - gajim/dialogs.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -158,8 +158,9 @@ try: if os.name == 'nt': # Set the env var on Windows because gettext.find() uses it to # find the translation - os.environ['LANG'] = LANG - print('Found default language: %s' % LANG) + # Use LANGUAGE instead of LANG, LANG sets LC_ALL and thus + # doesn't retain other region settings like LC_TIME + os.environ['LANGUAGE'] = LANG except Exception as error: print('Failed to determine default language', file=sys.stderr) import traceback ===================================== gajim/common/modules/presence.py ===================================== @@ -175,6 +175,10 @@ class Presence: def get_presence(self, to=None, typ=None, priority=None, show=None, status=None, nick=None, caps=True, sign=None, idle_time=None): + if show not in ('chat', 'away', 'xa', 'dnd'): + # Gajim sometimes passes invalid show values here + # until this is fixed this is a workaround + show = None presence = nbxmpp.Presence(to, typ, priority, show, status) if nick is not None: nick_tag = presence.setTag('nick', namespace=nbxmpp.NS_NICK) ===================================== gajim/data/gui/httpupload_progress_dialog.ui ===================================== @@ -1,29 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.14"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkBox" id="box"> + <property name="width_request">300</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">8</property> - <property name="bottom_padding">4</property> - <property name="left_padding">8</property> - <property name="right_padding">8</property> - <child> - <object class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <attributes> - <attribute name="weight" value="bold"/> - <attribute name="variant" value="normal"/> - </attributes> - </object> - </child> + <property name="icon_name">document-send-symbolic</property> + <property name="icon_size">6</property> </object> <packing> <property name="expand">False</property> @@ -32,21 +23,14 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">4</property> - <property name="bottom_padding">4</property> - <property name="left_padding">8</property> - <property name="right_padding">8</property> - <child> - <object class="GtkProgressBar" id="progressbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pulse_step">0.10000000149</property> - <property name="show_text">True</property> - </object> - </child> + <property name="margin_top">6</property> + <property name="label"><placeholder></property> + <style> + <class name="bold"/> + </style> </object> <packing> <property name="expand">False</property> @@ -54,5 +38,52 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkLabel" id="progress_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><progress></property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkProgressBar" id="progressbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="pulse_step">0.10000000149</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel_upload_button"> + <property name="label" translatable="yes">Cancel Upload</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">6</property> + <signal name="clicked" handler="on_cancel_upload_button_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> </object> </interface> ===================================== gajim/dialogs.py ===================================== @@ -55,6 +55,7 @@ from gajim.common.exceptions import GajimGeneralException # Compat with Gajim 1.0.3 for plugins from gajim.gtk.dialogs import * from gajim.gtk.add_contact import AddNewContactWindow +from gajim.gtk.util import get_builder log = logging.getLogger('gajim.dialogs') @@ -1733,22 +1734,18 @@ class ProgressWindow(Gtk.ApplicationWindow): self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('File Transfer')) - self.set_default_size(250, -1) self.event = file.event self.file = file - self.xml = gtkgui_helpers.get_gtk_builder( - 'httpupload_progress_dialog.ui') - - self.label = self.xml.get_object('label') - self.progressbar = self.xml.get_object('progressbar') + self._ui = get_builder('httpupload_progress_dialog.ui') - self.add(self.xml.get_object('box')) + self.add(self._ui.box) self.pulse = GLib.timeout_add(100, self._pulse_progressbar) self.show_all() self.connect('destroy', self._on_destroy) + self._ui.connect_signals(self) app.ged.register_event_handler('httpupload-progress', ged.CORE, self._on_httpupload_progress) @@ -1756,20 +1753,23 @@ class ProgressWindow(Gtk.ApplicationWindow): if self.file != obj.file: return if obj.status == 'request': - self.label.set_text(_('Requesting HTTP Upload Slot…')) + self._ui.label.set_text(_('Requesting HTTP Upload Slot…')) elif obj.status == 'close': self.destroy() elif obj.status == 'upload': - self.label.set_text(_('Uploading file via HTTP File Upload…')) + self._ui.label.set_text(_('Uploading file via HTTP File Upload…')) elif obj.status == 'update': self.update_progress(obj.seen, obj.total) elif obj.status == 'encrypt': - self.label.set_text(_('Encrypting file…')) + self._ui.label.set_text(_('Encrypting file…')) def _pulse_progressbar(self): - self.progressbar.pulse() + self._ui.progressbar.pulse() return True + def on_cancel_upload_button_clicked(self, widget): + self.destroy() + def _on_destroy(self, *args): self.event.set() if self.pulse: @@ -1783,6 +1783,9 @@ class ProgressWindow(Gtk.ApplicationWindow): if self.pulse: GLib.source_remove(self.pulse) self.pulse = None - pct = (float(seen) / total) * 100.0 - self.progressbar.set_fraction(float(seen) / total) - self.progressbar.set_text(str(int(pct)) + "%") + self._ui.progressbar.set_fraction(float(seen) / total) + size_total = round(total / (1024 * 1024), 1) + size_progress = round(seen / (1024 * 1024), 1) + self._ui.progress_label.set_text( + _('%(progress)s of %(total)s MiB sent') % \ + {'progress': str(size_progress), 'total': str(size_total)}) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/366b3df235cdb1cdd54dc909ea5c2900a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/366b3df235cdb1cdd54dc909ea5c2900a… 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