Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] HTTPUpload: Display filename and transfer speed
by Philipp Hörist 14 Apr '19

14 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b32b0f44 by Daniel Brötzmann at 2019-04-14T18:39:44Z HTTPUpload: Display filename and transfer speed Fixes #9661 - - - - - 2 changed files: - gajim/data/gui/httpupload_progress_dialog.ui - gajim/dialogs.py Changes: ===================================== gajim/data/gui/httpupload_progress_dialog.ui ===================================== @@ -2,13 +2,14 @@  <interface> <requires lib="gtk+" version="3.20"/> - <object class="GtkBox" id="box"> + <object class="GtkGrid" id="grid"> <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> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> <child> <object class="GtkImage"> <property name="visible">True</property> @@ -17,40 +18,32 @@ <property name="icon_size">6</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label"> + <object class="GtkLabel" id="file_name_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="label"><placeholder></property> - <style> - <class name="bold"/> - </style> + <property name="label"><file name></property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">2</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> + <property name="left_attach">0</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -61,9 +54,8 @@ <property name="pulse_step">0.10000000149</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="left_attach">0</property> + <property name="top_attach">4</property> </packing> </child> <child> @@ -80,9 +72,23 @@ </style> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="label"><placeholder></property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> </object> ===================================== gajim/dialogs.py ===================================== @@ -32,6 +32,7 @@ from typing import Tuple # pylint: disable=unused-import import os import uuid import logging +import time from gi.repository import Gtk from gi.repository import Gdk @@ -1588,8 +1589,11 @@ class ProgressWindow(Gtk.ApplicationWindow): self.event = file.event self.file = file self._ui = get_builder('httpupload_progress_dialog.ui') + file_name = os.path.basename(file.path) + self._ui.file_name_label.set_text(file_name) + self._start_time = time.time() - self.add(self._ui.box) + self.add(self._ui.grid) self.pulse = GLib.timeout_add(100, self._pulse_progressbar) self.show_all() @@ -1602,12 +1606,13 @@ class ProgressWindow(Gtk.ApplicationWindow): def _on_httpupload_progress(self, obj): if self.file != obj.file: return + if obj.status == 'request': - self._ui.label.set_text(_('Requesting HTTP Upload Slot…')) + self._ui.label.set_text(_('Requesting HTTP File Upload Slot…')) elif obj.status == 'close': self.destroy() elif obj.status == 'upload': - self._ui.label.set_text(_('Uploading file via HTTP File Upload…')) + self._ui.label.set_text(_('Uploading via HTTP File Upload…')) elif obj.status == 'update': self.update_progress(obj.seen, obj.total) elif obj.status == 'encrypt': @@ -1633,9 +1638,17 @@ class ProgressWindow(Gtk.ApplicationWindow): if self.pulse: GLib.source_remove(self.pulse) self.pulse = None - self._ui.progressbar.set_fraction(float(seen) / total) + size_total = round(total / (1024 * 1024), 1) size_progress = round(seen / (1024 * 1024), 1) + + time_now = time.time() + mbytes_sec = round(size_progress / (time_now - self._start_time), 1) + + self._ui.progressbar.set_fraction(float(seen) / total) + self._ui.progress_label.set_text( - _('%(progress)s of %(total)s MiB sent') % \ - {'progress': str(size_progress), 'total': str(size_total)}) + _('%(progress)s of %(total)s MiB sent (%(speed)s MiB/s)') % \ + {'progress': str(size_progress), + 'total': str(size_total), + 'speed': str(mbytes_sec)}) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b32b0f44113a6a6a9bc281517412136c5a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b32b0f44113a6a6a9bc281517412136c5a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add plugin extension point "send-presence"
by Philipp Hörist 14 Apr '19

14 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3312ca6c by Philipp Hörist at 2019-04-14T18:25:55Z Add plugin extension point "send-presence" This lets plugins modify the presence - - - - - 1 changed file: - gajim/common/modules/presence.py Changes: ===================================== gajim/common/modules/presence.py ===================================== @@ -389,6 +389,8 @@ class Presence(BaseModule): if not app.account_is_connected(self._account): return presence = self.get_presence(*args, **kwargs) + app.plugin_manager.extension_point( + 'send-presence', self._account, presence) self._log.debug('Send presence:\n%s', presence) self._con.connection.send(presence) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3312ca6c29f19a27bc9fca19854b07faa0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3312ca6c29f19a27bc9fca19854b07faa0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add PGP Legacy (XEP-0027) module
by Philipp Hörist 14 Apr '19

14 Apr '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d343e2be by Philipp Hörist at 2019-04-14T10:20:33Z Add PGP Legacy (XEP-0027) module - - - - - 9dc56a27 by Philipp Hörist at 2019-04-14T16:40:22Z Fix wrong enum attr - - - - - 3 changed files: - nbxmpp/dispatcher.py - nbxmpp/modules/signed.py → nbxmpp/modules/pgplegacy.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -50,7 +50,7 @@ from nbxmpp.modules.nickname import Nickname from nbxmpp.modules.delay import Delay from nbxmpp.modules.muc import MUC from nbxmpp.modules.idle import Idle -from nbxmpp.modules.signed import Signed +from nbxmpp.modules.pgplegacy import PGPLegacy from nbxmpp.modules.vcard_avatar import VCardAvatar from nbxmpp.modules.captcha import Captcha from nbxmpp.modules.entity_caps import EntityCaps @@ -187,7 +187,7 @@ class XMPPDispatcher(PlugIn): self._modules['Delay'] = Delay(self._owner) self._modules['Captcha'] = Captcha(self._owner) self._modules['Idle'] = Idle(self._owner) - self._modules['Signed'] = Signed(self._owner) + self._modules['PGPLegacy'] = PGPLegacy(self._owner) self._modules['VCardAvatar'] = VCardAvatar(self._owner) self._modules['EntityCaps'] = EntityCaps(self._owner) self._modules['Blocking'] = Blocking(self._owner) ===================================== nbxmpp/modules/signed.py → nbxmpp/modules/pgplegacy.py ===================================== @@ -18,15 +18,20 @@ import logging from nbxmpp.protocol import NS_SIGNED +from nbxmpp.protocol import NS_ENCRYPTED from nbxmpp.structs import StanzaHandler log = logging.getLogger('nbxmpp.m.signed') -class Signed: +class PGPLegacy: def __init__(self, client): self._client = client self.handlers = [ + StanzaHandler(name='message', + callback=self._process_pgplegacy_message, + ns=NS_ENCRYPTED, + priority=7), StanzaHandler(name='presence', callback=self._process_signed, ns=NS_SIGNED, @@ -40,3 +45,20 @@ class Signed: return properties.signed = signed.getData() + + @staticmethod + def _process_pgplegacy_message(_con, stanza, properties): + pgplegacy = stanza.getTag('x', namespace=NS_ENCRYPTED) + if pgplegacy is None: + log.warning('No x node found') + log.warning(stanza) + return + + data = pgplegacy.getData() + if not data: + log.warning('No data in x node found') + log.warning(stanza) + return + + log.info('Encrypted message received') + properties.pgp_legacy = data ===================================== nbxmpp/structs.py ===================================== @@ -124,7 +124,7 @@ class AdHocCommand(namedtuple('AdHocCommand', 'jid node name sessionid status da @property def is_canceled(self): - return self.status == AdHocStatus.CANCEL + return self.status == AdHocStatus.CANCELED class OMEMOBundle(namedtuple('OMEMOBundle', 'spk spk_signature ik otpks')): @@ -206,6 +206,7 @@ class MessageProperties: self.openpgp = None self.omemo = None self.encrypted = None + self.pgp_legacy = None @property def has_user_delay(self): @@ -223,6 +224,10 @@ class MessageProperties: def is_openpgp(self): return self.openpgp is not None + @property + def is_pgp_legacy(self): + return self.pgp_legacy is not None + @property def is_pubsub(self): return self.pubsub View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/11dffacfefb7db839ab5bdd47… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/11dffacfefb7db839ab5bdd47… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix mypy error
by Philipp Hörist 14 Apr '19

14 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ecdf1526 by Philipp Hörist at 2019-04-14T08:44:08Z Fix mypy error - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -25,6 +25,9 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any # pylint: disable=unused-import +from typing import Dict # pylint: disable=unused-import + import sys import re import os @@ -1523,8 +1526,9 @@ def save_roster_position(window): class Singleton(type): - _instances = {} + _instances = {} # type: Dict[Any, Any] def __call__(cls, *args, **kwargs): if cls not in cls._instances: - cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs) + cls._instances[cls] = super(Singleton, cls).__call__( + *args, **kwargs) return cls._instances[cls] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ecdf1526fb904752ac2284ed463c4a0204… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ecdf1526fb904752ac2284ed463c4a0204… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor Singleton class
by Philipp Hörist 13 Apr '19

13 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d8beb018 by Philipp Hörist at 2019-04-13T23:58:45Z Refactor Singleton class - - - - - 3 changed files: - gajim/common/helpers.py - gajim/plugins/helpers.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1520,3 +1520,11 @@ def save_roster_position(window): log.debug('Save roster position: %s %s', x_pos, y_pos) app.config.set('roster_x-position', x_pos) app.config.set('roster_y-position', y_pos) + + +class Singleton(type): + _instances = {} + def __call__(cls, *args, **kwargs): + if cls not in cls._instances: + cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs) + return cls._instances[cls] ===================================== gajim/plugins/helpers.py ===================================== @@ -21,7 +21,7 @@ Helper code related to plug-ins management system. :license: GPL ''' -__all__ = ['log', 'log_calls', 'Singleton'] +__all__ = ['log', 'log_calls'] from typing import List @@ -115,26 +115,6 @@ class log_calls: return wrapper -class Singleton(type): - ''' - Singleton metaclass. - ''' - def __init__(cls, name, bases, dic): - super(Singleton, cls).__init__(name, bases, dic) - cls.instance = None - - def __call__(cls, *args, **kwargs): - if cls.instance is None: - cls.instance = super(Singleton, cls).__call__(*args, **kwargs) - #log.debug('%(classname)s - new instance created'%{ - #'classname' : cls.__name__}) - else: - pass - #log.debug('%(classname)s - returning already existing instance'%{ - #'classname' : cls.__name__}) - - return cls.instance - def get_builder(file_name: str, widgets: List[str] = None) -> Builder: return Builder(file_name, ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -38,9 +38,10 @@ from gajim.common import configpaths from gajim.common import modules from gajim.common.i18n import _ from gajim.common.exceptions import PluginsystemError +from gajim.common.helpers import Singleton from gajim.plugins import plugins_i18n -from gajim.plugins.helpers import log, log_calls, Singleton +from gajim.plugins.helpers import log, log_calls from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.gajimplugin import GajimPlugin, GajimPluginException @@ -73,8 +74,6 @@ class PluginManager(metaclass=Singleton): 'destructors' (classes that register GUI extension points) ''' - __metaclass__ = Singleton - #@log_calls('PluginManager') def __init__(self): self.plugins = [] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d8beb0183c51ea3286412b80ca28a58790… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d8beb0183c51ea3286412b80ca28a58790… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] XMLConsole: Add Paste Last Input button
by Philipp Hörist 11 Apr '19

11 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d83f7255 by Daniel Brötzmann at 2019-04-11T17:54:24Z XMLConsole: Add Paste Last Input button - - - - - 2 changed files: - gajim/data/gui/xml_console_window.ui - gajim/gtk/xml_console.py Changes: ===================================== gajim/data/gui/xml_console_window.ui ===================================== @@ -39,7 +39,7 @@ <property name="can_focus">True</property> <property name="shadow_type">in</property> <child> - <object class="GtkTextView" id="input"> + <object class="GtkTextView" id="input_entry"> <property name="visible">True</property> <property name="can_focus">True</property> </object> ===================================== gajim/gtk/xml_console.py ===================================== @@ -50,51 +50,51 @@ class XMLConsoleWindow(Gtk.Window): self.incoming = True self.outgoing = True self.filter_dialog = None + self.last_stanza = None - glade_objects = ['textview', 'input', 'scrolled_input', 'headerbar', - 'scrolled', 'actionbar', 'paned', 'box', 'menubutton'] - self.builder = get_builder('xml_console_window.ui') - for obj in glade_objects: - setattr(self, obj, self.builder.get_object(obj)) - - self.set_titlebar(self.headerbar) + self._ui = get_builder('xml_console_window.ui') + self.set_titlebar(self._ui.headerbar) jid = app.get_jid_from_account(account) - self.headerbar.set_subtitle(jid) + self._ui.headerbar.set_subtitle(jid) self.set_default_size(600, 600) - self.add(self.box) + self.add(self._ui.box) - self.paned.set_position(self.paned.get_property('max-position')) + self._ui.paned.set_position(self._ui.paned.get_property('max-position')) button = get_image_button( 'edit-clear-all-symbolic', _('Clear')) button.connect('clicked', self.on_clear) - self.actionbar.pack_start(button) + self._ui.actionbar.pack_start(button) button = get_image_button( 'applications-system-symbolic', _('Filter')) button.connect('clicked', self.on_filter_options) - self.actionbar.pack_start(button) + self._ui.actionbar.pack_start(button) button = get_image_button( 'document-edit-symbolic', _('XML Input'), toggle=True) button.connect('toggled', self.on_input) - self.actionbar.pack_start(button) + self._ui.actionbar.pack_start(button) + + button = get_image_button('insert-text-symbolic', _('Paste Last Input')) + button.connect('clicked', self.on_paste_last) + self._ui.actionbar.pack_start(button) - button = get_image_button('emblem-ok-symbolic', _('Send')) + button = get_image_button('mail-send-symbolic', _('Send')) button.connect('clicked', self.on_send) - self.actionbar.pack_end(button) + self._ui.actionbar.pack_end(button) - self.actionbar.pack_start(self.menubutton) + self._ui.actionbar.pack_start(self._ui.menubutton) self.create_tags() self.show_all() - self.scrolled_input.hide() - self.menubutton.hide() + self._ui.scrolled_input.hide() + self._ui.menubutton.hide() self.connect("destroy", self.on_destroy) self.connect('key_press_event', self.on_key_press_event) - self.builder.connect_signals(self) + self._ui.connect_signals(self) app.ged.register_event_handler( 'stanza-received', ged.GUI1, self._nec_stanza_received) @@ -102,7 +102,7 @@ class XMLConsoleWindow(Gtk.Window): 'stanza-sent', ged.GUI1, self._nec_stanza_sent) def create_tags(self): - buffer_ = self.textview.get_buffer() + buffer_ = self._ui.textview.get_buffer() in_color = app.css_config.get_value( '.gajim-incoming-nickname', StyleAttr.COLOR) out_color = app.css_config.get_value( @@ -144,9 +144,9 @@ class XMLConsoleWindow(Gtk.Window): '</iq>') if input_text is not None: - buffer_ = self.input.get_buffer() + buffer_ = self._ui.input_entry.get_buffer() buffer_.set_text(input_text) - self.input.grab_focus() + self._ui.input_entry.grab_focus() def on_send(self, *args): if app.connections[self.account].connected <= 1: @@ -156,7 +156,7 @@ class XMLConsoleWindow(Gtk.Window): _('Please make sure you are connected with "%s".') % self.account) return - buffer_ = self.input.get_buffer() + buffer_ = self._ui.input_entry.get_buffer() begin_iter, end_iter = buffer_.get_bounds() stanza = buffer_.get_text(begin_iter, end_iter, True) if stanza: @@ -168,16 +168,23 @@ class XMLConsoleWindow(Gtk.Window): ErrorDialog(_('Invalid Node'), str(error)) return app.connections[self.account].connection.send(node) + self.last_stanza = stanza buffer_.set_text('') + def on_paste_last(self, button): + buffer_ = self._ui.input_entry.get_buffer() + if buffer_ is not None and self.last_stanza is not None: + buffer_.set_text(self.last_stanza) + self._ui.input_entry.grab_focus() + def on_input(self, button, *args): if button.get_active(): - self.paned.get_child2().show() - self.menubutton.show() - self.input.grab_focus() + self._ui.paned.get_child2().show() + self._ui.menubutton.show() + self._ui.input_entry.grab_focus() else: - self.paned.get_child2().hide() - self.menubutton.hide() + self._ui.paned.get_child2().hide() + self._ui.menubutton.hide() def on_filter_options(self, *args): if self.filter_dialog: @@ -215,7 +222,7 @@ class XMLConsoleWindow(Gtk.Window): self.filter_dialog = None def on_clear(self, *args): - self.textview.get_buffer().set_text('') + self._ui.textview.get_buffer().set_text('') def on_destroy(self, *args): del app.interface.instances[self.account]['xml_console'] @@ -230,7 +237,7 @@ class XMLConsoleWindow(Gtk.Window): def on_option(self, value, data): setattr(self, data, value) value = not value - table = self.textview.get_buffer().get_tag_table() + table = self._ui.textview.get_buffer().get_tag_table() tag = table.lookup(data) if data in ('incoming', 'outgoing'): if value: @@ -256,9 +263,9 @@ class XMLConsoleWindow(Gtk.Window): if not stanza: return - at_the_end = util.at_the_end(self.scrolled) + at_the_end = util.at_the_end(self._ui.scrolled) - buffer_ = self.textview.get_buffer() + buffer_ = self._ui.textview.get_buffer() end_iter = buffer_.get_end_iter() type_ = kind @@ -278,4 +285,4 @@ class XMLConsoleWindow(Gtk.Window): buffer_.insert_with_tags_by_name(end_iter, stanza, type_, kind) if at_the_end: - GLib.idle_add(util.scroll_to_end, self.scrolled) + GLib.idle_add(util.scroll_to_end, self._ui.scrolled) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d83f725578298c1140cefaefea253041a2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d83f725578298c1140cefaefea253041a2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Bookmarks: Dont unselect all bookmarks after clicking Remove
by Philipp Hörist 11 Apr '19

11 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7b329e96 by Daniel Brötzmann at 2019-04-11T17:39:44Z Bookmarks: Dont unselect all bookmarks after clicking Remove - - - - - 1e47cfaa by Daniel Brötzmann at 2019-04-11T17:39:52Z Bookmarks: Adapt to _ui scheme - - - - - a717ec93 by Daniel Brötzmann at 2019-04-11T17:39:56Z Bookmarks: Add tooltips, connect mnemonics, rename autojoin - - - - - 2 changed files: - gajim/data/gui/manage_bookmarks_window.ui - gajim/gtk/bookmarks.py Changes: ===================================== gajim/data/gui/manage_bookmarks_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.18"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkListStore" id="liststore1"> <columns>  @@ -22,10 +22,7 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> + <property name="border_width">18</property> <property name="spacing">18</property> <child> <object class="GtkBox"> @@ -68,6 +65,7 @@ <object class="GtkToolButton" id="add_bookmark_button"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Add Bookmark</property> <property name="use_underline">True</property> <property name="icon_name">list-add-symbolic</property> <signal name="clicked" handler="on_add_bookmark_button_clicked" swapped="no"/> @@ -81,6 +79,7 @@ <object class="GtkToolButton" id="remove_bookmark_button"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Remove Bookmark</property> <property name="use_underline">True</property> <property name="icon_name">list-remove-symbolic</property> <signal name="clicked" handler="on_remove_bookmark_button_clicked" swapped="no"/> @@ -117,16 +116,16 @@ <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">6</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="label325"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Name</property> + <property name="label" translatable="yes">N_ame</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">title_entry</property> <property name="xalign">0</property> <style> <class name="dim-label"/> @@ -153,13 +152,14 @@ </packing> </child> <child> - <object class="GtkLabel" id="label317"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> <property name="margin_top">12</property> <property name="label" translatable="yes">_Server</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">server_entry</property> <property name="xalign">0</property> <style> <class name="dim-label"/> @@ -184,13 +184,14 @@ </packing> </child> <child> - <object class="GtkLabel" id="label315"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> <property name="margin_top">12</property> <property name="label" translatable="yes">_Nickname</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">nick_entry</property> <property name="xalign">0</property> <style> <class name="dim-label"/> @@ -215,12 +216,13 @@ </packing> </child> <child> - <object class="GtkLabel" id="label316"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Roo_m</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">room_entry</property> <property name="xalign">0</property> <style> <class name="dim-label"/> @@ -244,12 +246,13 @@ </packing> </child> <child> - <object class="GtkLabel" id="label318"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">_Password</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">pass_entry</property> <property name="xalign">0</property> <style> <class name="dim-label"/> @@ -301,7 +304,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Auto Join</property> + <property name="label" translatable="yes">_Join Automatically</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">autojoin_checkbutton</property> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/bookmarks.py ===================================== @@ -38,9 +38,9 @@ class Row(IntEnum): class ManageBookmarksWindow: def __init__(self): - self.xml = get_builder('manage_bookmarks_window.ui') - self.window = self.xml.get_object('manage_bookmarks_window') - self.window.set_transient_for(app.interface.roster.window) + self._ui = get_builder('manage_bookmarks_window.ui') + self._ui.manage_bookmarks_window.set_transient_for( + app.interface.roster.window) self.ignore_events = False @@ -67,37 +67,27 @@ class ManageBookmarksWindow: bookmark.nick, bookmark.name]) - self.view = self.xml.get_object('bookmarks_treeview') - self.view.set_model(self.treestore) - self.view.expand_all() + self._ui.bookmarks_treeview.set_model(self.treestore) + self._ui.bookmarks_treeview.expand_all() renderer = Gtk.CellRendererText() column = Gtk.TreeViewColumn('Bookmarks', renderer, text=Row.LABEL) - self.view.append_column(column) + self._ui.bookmarks_treeview.append_column(column) - self.selection = self.view.get_selection() + self.selection = self._ui.bookmarks_treeview.get_selection() self.selection.connect('changed', self.bookmark_selected) # Prepare input fields - self.title_entry = self.xml.get_object('title_entry') - self.title_entry.connect('changed', self.on_title_entry_changed) - self.nick_entry = self.xml.get_object('nick_entry') - self.nick_entry.connect('changed', self.on_nick_entry_changed) - self.server_entry = self.xml.get_object('server_entry') - self.server_entry.connect( + self._ui.title_entry.connect('changed', self.on_title_entry_changed) + self._ui.nick_entry.connect('changed', self.on_nick_entry_changed) + self._ui.server_entry.connect( 'focus-out-event', self.on_server_entry_focus_out) - self.room_entry = self.xml.get_object('room_entry') - self.room_entry_changed_id = self.room_entry.connect( + self.room_entry_changed_id = self._ui.room_entry.connect( 'changed', self.on_room_entry_changed) - self.pass_entry = self.xml.get_object('pass_entry') - self.pass_entry.connect('changed', self.on_pass_entry_changed) - self.autojoin_checkbutton = self.xml.get_object('autojoin_checkbutton') - self.settings_box = self.xml.get_object('settings_box') - self.remove_bookmark_button = self.xml.get_object( - 'remove_bookmark_button') - - self.xml.connect_signals(self) - self.window.show_all() + self._ui.pass_entry.connect('changed', self.on_pass_entry_changed) + + self._ui.connect_signals(self) + self._ui.manage_bookmarks_window.show_all() # select root iter first_iter = self.treestore.get_iter_first() if first_iter: @@ -105,7 +95,7 @@ class ManageBookmarksWindow: def on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: - self.window.destroy() + self._ui.manage_bookmarks_window.destroy() def on_add_bookmark_button_clicked(self, widget): """ @@ -132,8 +122,8 @@ class ManageBookmarksWindow: iter_ = self.treestore.append(add_to, [ account, label, '@', False, '', nick, label]) - self.view.expand_row(model.get_path(add_to), True) - self.view.set_cursor(model.get_path(iter_)) + self._ui.bookmarks_treeview.expand_row(model.get_path(add_to), True) + self._ui.bookmarks_treeview.set_cursor(model.get_path(iter_)) def on_remove_bookmark_button_clicked(self, widget): """ @@ -149,10 +139,9 @@ class ManageBookmarksWindow: self.ignore_events = True model.remove(iter_) - self.selection.unselect_all() self.clear_fields() - self.set_sensitive_all(False) self.ignore_events = False + self.bookmark_selected(self.selection) def check_valid_bookmark(self): """ @@ -164,8 +153,8 @@ class ManageBookmarksWindow: # Account data can't be changed return - server = self.server_entry.get_text() - room = self.room_entry.get_text() + server = self._ui.server_entry.get_text() + room = self._ui.room_entry.get_text() if server == '' or room == '': ErrorDialog( @@ -203,10 +192,10 @@ class ManageBookmarksWindow: bookmarks.append(bookmark) con.get_module('Bookmarks').bookmarks = bookmarks con.get_module('Bookmarks').store_bookmarks() - self.window.destroy() + self._ui.manage_bookmarks_window.destroy() def on_cancel_button_clicked(self, widget): - self.window.destroy() + self._ui.manage_bookmarks_window.destroy() def bookmark_selected(self, selection): """ @@ -230,7 +219,7 @@ class ManageBookmarksWindow: return # Fill in the data for childs - self.title_entry.set_text(model[iter_][Row.ROOM_NAME]) + self._ui.title_entry.set_text(model[iter_][Row.ROOM_NAME]) room_jid = model[iter_][Row.ROOM_JID] room_jid_s = room_jid.split('@') if len(room_jid_s) == 1: @@ -238,12 +227,12 @@ class ManageBookmarksWindow: server = room_jid else: (room, server) = room_jid_s - self.room_entry.handler_block(self.room_entry_changed_id) - self.room_entry.set_text(room) - self.room_entry.handler_unblock(self.room_entry_changed_id) - self.server_entry.set_text(server) + self._ui.room_entry.handler_block(self.room_entry_changed_id) + self._ui.room_entry.set_text(room) + self._ui.room_entry.handler_unblock(self.room_entry_changed_id) + self._ui.server_entry.set_text(server) - self.autojoin_checkbutton.set_active(model[iter_][Row.AUTOJOIN]) + self._ui.autojoin_checkbutton.set_active(model[iter_][Row.AUTOJOIN]) # sensitive only if auto join is checked if model[iter_][Row.PASSWORD] is not None: @@ -252,14 +241,14 @@ class ManageBookmarksWindow: password = None if password: - self.pass_entry.set_text(password) + self._ui.pass_entry.set_text(password) else: - self.pass_entry.set_text('') + self._ui.pass_entry.set_text('') nick = model[iter_][Row.NICK] if nick: - self.nick_entry.set_text(nick) + self._ui.nick_entry.set_text(nick) else: - self.nick_entry.set_text('') + self._ui.nick_entry.set_text('') def on_title_entry_changed(self, widget): if self.ignore_events: @@ -268,22 +257,22 @@ class ManageBookmarksWindow: if iter_: # After removing a bookmark, we got nothing selected if model.iter_parent(iter_): # Don't clear the title field for account nodes - model[iter_][Row.ROOM_NAME] = self.title_entry.get_text() + model[iter_][Row.ROOM_NAME] = self._ui.title_entry.get_text() def on_nick_entry_changed(self, widget): if self.ignore_events: return (model, iter_) = self.selection.get_selected() if iter_: - nick = self.nick_entry.get_text() + nick = self._ui.nick_entry.get_text() try: nick = helpers.parse_resource(nick) except helpers.InvalidFormat: ErrorDialog( _('Invalid nickname'), _('Character not allowed'), - transient_for=self.window) - self.nick_entry.set_text(model[iter_][Row.NICK]) + transient_for=self._ui.manage_bookmarks_window) + self._ui.nick_entry.set_text(model[iter_][Row.NICK]) return True model[iter_][Row.NICK] = nick @@ -300,10 +289,10 @@ class ManageBookmarksWindow: ErrorDialog( _('Invalid server'), _('Character not allowed'), - transient_for=self.window) + transient_for=self._ui.manage_bookmarks_window) widget.set_text(server.replace('@', '')) - room = self.room_entry.get_text().strip() + room = self._ui.room_entry.get_text().strip() if not room: return room_jid = room + '@' + server.strip() @@ -313,8 +302,9 @@ class ManageBookmarksWindow: ErrorDialog( _('Invalid server'), _('Character not allowed'), - transient_for=self.window) - self.server_entry.set_text(model[iter_][Row.ROOM_JID].split('@')[1]) + transient_for=self._ui.manage_bookmarks_window) + self._ui.server_entry.set_text( + model[iter_][Row.ROOM_JID].split('@')[1]) return True model[iter_][Row.ROOM_JID] = room_jid @@ -331,9 +321,9 @@ class ManageBookmarksWindow: room, server = room.split('@', 1) widget.set_text(room) if server: - self.server_entry.set_text(server) - self.server_entry.grab_focus() - server = self.server_entry.get_text().strip() + self._ui.server_entry.set_text(server) + self._ui.server_entry.grab_focus() + server = self._ui.server_entry.get_text().strip() if not server: return room_jid = room.strip() + '@' + server @@ -343,7 +333,7 @@ class ManageBookmarksWindow: ErrorDialog( _('Invalid room'), _('Character not allowed'), - transient_for=self.window) + transient_for=self._ui.manage_bookmarks_window) return True model[iter_][Row.ROOM_JID] = room_jid @@ -352,27 +342,27 @@ class ManageBookmarksWindow: return (model, iter_) = self.selection.get_selected() if iter_: - model[iter_][Row.PASSWORD] = self.pass_entry.get_text() + model[iter_][Row.PASSWORD] = self._ui.pass_entry.get_text() def on_autojoin_checkbutton_toggled(self, widget, *args): if self.ignore_events: return (model, iter_) = self.selection.get_selected() if iter_: - model[iter_][Row.AUTOJOIN] = self.autojoin_checkbutton.get_active() + model[iter_][Row.AUTOJOIN] = self._ui.autojoin_checkbutton.get_active() def clear_fields(self): widgets = [ - self.title_entry, self.nick_entry, self.room_entry, - self.server_entry, self.pass_entry] + self._ui.title_entry, self._ui.nick_entry, self._ui.room_entry, + self._ui.server_entry, self._ui.pass_entry] for field in widgets: field.set_text('') - self.autojoin_checkbutton.set_active(False) + self._ui.autojoin_checkbutton.set_active(False) def set_sensitive_all(self, sensitive): widgets = [ - self.title_entry, self.nick_entry, self.room_entry, - self.server_entry, self.pass_entry, self.settings_box, - self.remove_bookmark_button] + self._ui.title_entry, self._ui.nick_entry, self._ui.room_entry, + self._ui.server_entry, self._ui.pass_entry, self._ui.settings_box, + self._ui.remove_bookmark_button] for field in widgets: field.set_sensitive(sensitive) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0dbcac4efebfa76db9bf2c4c68bf95859… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0dbcac4efebfa76db9bf2c4c68bf95859… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Connect gpg agent action correctly
by Philipp Hörist 09 Apr '19

09 Apr '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: a7466406 by Philipp Hörist at 2019-04-09T20:28:35Z Connect gpg agent action correctly Fixes #9660 - - - - - 9e0fb541 by Philipp Hörist at 2019-04-09T20:30:31Z Update ChangeLog - - - - - 2 changed files: - ChangeLog - gajim/application.py Changes: ===================================== ChangeLog ===================================== @@ -15,6 +15,7 @@ Gajim 1.1.3 (TBA) * #9622 Fix an error while quitting Gajim * #9633 Fix an error while sending a file * #9637 Restore window size correctly on wayland + * #9660 GPG Agent setting is ignored * Improve dark theme colors * Fix access to GnuPG keys * Use UUID4 item ids for pubsub posts ===================================== gajim/application.py ===================================== @@ -379,6 +379,7 @@ class GajimApplication(Gtk.Application): act = Gio.SimpleAction.new_stateful( 'agent', None, GLib.Variant.new_boolean(app.config.get('use_gpg_agent'))) + act.connect('change-state', app_actions.on_use_pgp_agent) self.add_action(act) # General Actions View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/27e2786bccbdfd16183ff1910baf7bfbb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/27e2786bccbdfd16183ff1910baf7bfbb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Connect gpg agent action correctly
by Philipp Hörist 09 Apr '19

09 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0dbcac4e by Philipp Hörist at 2019-04-09T20:26:03Z Connect gpg agent action correctly Fixes #9660 - - - - - 1 changed file: - gajim/application.py Changes: ===================================== gajim/application.py ===================================== @@ -391,6 +391,7 @@ class GajimApplication(Gtk.Application): act = Gio.SimpleAction.new_stateful( 'agent', None, GLib.Variant.new_boolean(app.config.get('use_gpg_agent'))) + act.connect('change-state', app_actions.on_use_pgp_agent) self.add_action(act) # General Actions View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0dbcac4efebfa76db9bf2c4c68bf95859d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0dbcac4efebfa76db9bf2c4c68bf95859d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add profile button to add contact dialog
by Philipp Hörist 09 Apr '19

09 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: de790f5e by Daniel Brötzmann at 2019-04-09T19:53:34Z Add profile button to add contact dialog This lets the user query the VCard of the contact before adding - - - - - 2 changed files: - gajim/data/gui/add_new_contact_window.ui - gajim/gtk/add_contact.py Changes: ===================================== gajim/data/gui/add_new_contact_window.ui ===================================== @@ -16,6 +16,11 @@ <column type="gchararray"/> </columns> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">user-info-symbolic</property> + </object> <object class="GtkTextBuffer" id="message_textbuffer"> <property name="text" translatable="yes">I would like to add you to my contact list.</property> <signal name="end-user-action" handler="on_message_textbuffer_changed" swapped="no"/> @@ -144,6 +149,7 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> + <property name="width">2</property> </packing> </child> <child> @@ -163,6 +169,7 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">4</property> + <property name="width">2</property> </packing> </child> <child> @@ -254,6 +261,7 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> + <property name="width">2</property> </packing> </child> <child> @@ -275,6 +283,22 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="show_contact_info_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Query Contact Info</property> + <property name="image">image1</property> + <signal name="clicked" handler="on_show_contact_info_button_clicked" swapped="no"/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> </packing> </child> </object> ===================================== gajim/gtk/add_contact.py ===================================== @@ -15,6 +15,7 @@ from gi.repository import Gdk from gi.repository import Gtk +from gajim import vcard from gajim.common import app from gajim.common import ged from gajim.common import helpers @@ -58,8 +59,9 @@ class AddNewContactWindow(Gtk.ApplicationWindow): self.xml.connect_signals(self) for w in ('account_combobox', 'account_label', 'prompt_label', - 'uid_label', 'uid_entry', 'protocol_combobox', - 'protocol_jid_combobox', 'protocol_label', 'nickname_entry', + 'uid_label', 'uid_entry', 'show_contact_info_button', + 'protocol_combobox', 'protocol_jid_combobox', + 'protocol_label', 'nickname_entry', 'message_scrolledwindow', 'save_message_checkbutton', 'register_hbox', 'add_button', 'message_textview', 'connected_label', 'group_comboboxentry', @@ -68,6 +70,7 @@ class AddNewContactWindow(Gtk.ApplicationWindow): self.__dict__[w] = self.xml.get_object(w) self.subscription_table = [self.uid_label, self.uid_entry, + self.show_contact_info_button, self.nickname_label, self.nickname_entry, self.group_label, self.group_comboboxentry] @@ -191,6 +194,7 @@ class AddNewContactWindow(Gtk.ApplicationWindow): self.account)) message_buffer.set_text(msg) + self.uid_entry.connect('changed', self.on_uid_entry_changed) self.show_all() app.ged.register_event_handler('gateway-prompt-received', ged.GUI1, @@ -204,6 +208,26 @@ class AddNewContactWindow(Gtk.ApplicationWindow): app.ged.remove_event_handler('gateway-prompt-received', ged.GUI1, self._nec_gateway_prompt_received) + def on_uid_entry_changed(self, widget): + is_empty = bool(not self.uid_entry.get_text() == '') + self.show_contact_info_button.set_sensitive(is_empty) + + def on_show_contact_info_button_clicked(self, widget): + """ + Ask for vCard + """ + jid = self.uid_entry.get_text().strip() + + if jid in app.interface.instances[self.account]['infos']: + app.interface.instances[self.account]['infos'][jid].window.present() + else: + contact = app.contacts.create_contact(jid=jid, account=self.account) + app.interface.instances[self.account]['infos'][jid] = \ + vcard.VcardWindow(contact, self.account) + # Remove xmpp page + app.interface.instances[self.account]['infos'][jid].xml.\ + get_object('information_notebook').remove_page(0) + def on_register_button_clicked(self, widget): model = self.protocol_jid_combobox.get_model() row = self.protocol_jid_combobox.get_active() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/de790f5e4cd9573ea0b13cbbb95e6a5135… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/de790f5e4cd9573ea0b13cbbb95e6a5135… 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