Commits November 2018

commits@gajim.org

1 participants
84 discussions

[Git][gajim/gajim][master] Enforce min and max version for plugin manifest
by Philipp Hörist 11 Nov '18

11 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 30a20e16 by Philipp Hörist at 2018-11-11T09:21:46Z Enforce min and max version for plugin manifest This reduces problems with old plugins without max version - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -650,6 +650,10 @@ class PluginManager(metaclass=Singleton): min_v = conf.get('info', 'min_gajim_version', fallback=None) max_v = conf.get('info', 'max_gajim_version', fallback=None) + if min_v is None or max_v is None: + log.warning('Plugin without min/max version: %s', elem_name) + continue + gajim_v = gajim.__version__.split('+', 1)[0] gajim_v_cmp = parse_version(gajim_v) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/30a20e16d25b285b5148cd1e5b518a545f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/30a20e16d25b285b5148cd1e5b518a545f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Better determine soundplayer on unix systems
by Philipp Hörist 10 Nov '18

10 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8d95eb9b by Philipp Hörist at 2018-11-10T18:30:12Z Better determine soundplayer on unix systems - sys.platform == 'linux', excludes many other unix systems - use shutil.which() to test if a command is available - - - - - 1f31ab04 by Philipp Hörist at 2018-11-10T18:30:13Z Remove unused code Code is also not cross-platform compatible - - - - - 0d703524 by Philipp Hörist at 2018-11-10T18:30:13Z Dont test if winsound is available Its a standard library which will be always available in our builds - - - - - 5152611a by Philipp Hörist at 2018-11-10T18:30:18Z Try to play sound on all unix systems sys.platform == 'linux' excludeds other unix systems, for example FreeBSD - - - - - a7cc815c by Philipp Hörist at 2018-11-10T18:30:18Z Move imports into function - - - - - 02a9615b by Philipp Hörist at 2018-11-10T18:30:19Z Dont test if precis_i18n is available Its listed as dependency - - - - - e4a9ffe1 by Philipp Hörist at 2018-11-10T18:30:19Z Dont test for sys.platform == 'linux' This excludes other unix systems which was not intended - - - - - 5 changed files: - gajim/common/dbus_support.py - gajim/common/helpers.py - gajim/gui_interface.py - gajim/notify.py - gajim/roster_window.py Changes: ===================================== gajim/common/dbus_support.py ===================================== @@ -36,7 +36,7 @@ try: DBusGMainLoop(set_as_default=True) except ImportError: supported = False - if sys.platform == 'linux': # windows and mac have no dbus + if sys.platform not in ('win32', 'darwin'): print(_('D-Bus python bindings are missing in this computer')) print(_('D-Bus capabilities of Gajim cannot be used')) else: @@ -47,7 +47,7 @@ else: supported = True # does user have D-Bus bindings? except dbus.DBusException: supported = False - if sys.platform == 'linux': # windows and mac have no dbus + if sys.platform not in ('win32', 'darwin'): print(_('D-Bus does not run correctly on this machine')) print(_('D-Bus capabilities of Gajim cannot be used')) except exceptions.SystemBusNotPresent: ===================================== gajim/common/helpers.py ===================================== @@ -40,12 +40,15 @@ import socket import time import logging import json +import shutil from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode from string import Template import nbxmpp +from nbxmpp.stringprepare import nameprep +import precis_i18n.codec # pylint: disable=unused-import from gajim.common import caps_cache from gajim.common import configpaths @@ -54,35 +57,6 @@ from gajim.common.i18n import _ from gajim.common.i18n import ngettext from gajim.common.caps_cache import muc_caps_cache -try: - import precis_i18n.codec # pylint: disable=unused-import - HAS_PRECIS_I18N = True -except ImportError: - HAS_PRECIS_I18N = False - -HAS_SOUND = True -if sys.platform == 'win32': - try: - import winsound # windows-only built-in module for playing wav - except ImportError: - HAS_SOUND = False - print('Gajim is not able to playback sound because' - 'pywin32 is missing', file=sys.stderr) - -elif sys.platform == 'darwin': - try: - from AppKit import NSSound - except ImportError: - HAS_SOUND = False - print('Gajim is not able to playback sound because' - 'pyobjc is missing', file=sys.stderr) - -try: - import wave # posix-only fallback wav playback - import ossaudiodev as oss -except Exception: - pass - log = logging.getLogger('gajim.c.helpers') special_groups = (_('Transports'), _('Not in Roster'), _('Observers'), _('Groupchats')) @@ -180,10 +154,7 @@ def parse_resource(resource): """ if resource: try: - if HAS_PRECIS_I18N: - return resource.encode('Nickname').decode('utf-8') - from nbxmpp.stringprepare import resourceprep - return resourceprep.prepare(resource) + return resource.encode('Nickname').decode('utf-8') except UnicodeError: raise InvalidFormat('Invalid character in resource.') @@ -217,7 +188,6 @@ def prep(user, server, resource): if not server or len(server.encode('utf-8')) > 1023: raise InvalidFormat(_('Server must be between 1 and 1023 bytes')) try: - from nbxmpp.stringprepare import nameprep server = nameprep.prepare(server) except UnicodeError: raise InvalidFormat(_('Invalid character in hostname.')) @@ -228,11 +198,7 @@ def prep(user, server, resource): if not user or len(user.encode('utf-8')) > 1023: raise InvalidFormat(_('Username must be between 1 and 1023 bytes')) try: - if HAS_PRECIS_I18N: - user = user.encode('UsernameCaseMapped').decode('utf-8') - else: - from nbxmpp.stringprepare import nodeprep - user = nodeprep.prepare(user) + user = user.encode('UsernameCaseMapped').decode('utf-8') except UnicodeError: raise InvalidFormat(_('Invalid character in username.')) else: @@ -242,11 +208,7 @@ def prep(user, server, resource): if not resource or len(resource.encode('utf-8')) > 1023: raise InvalidFormat(_('Resource must be between 1 and 1023 bytes')) try: - if HAS_PRECIS_I18N: - resource = resource.encode('OpaqueString').decode('utf-8') - else: - from nbxmpp.stringprepare import resourceprep - resource = resourceprep.prepare(resource) + resource = resource.encode('OpaqueString').decode('utf-8') except UnicodeError: raise InvalidFormat(_('Invalid character in resource.')) else: @@ -444,22 +406,26 @@ def get_uf_chatstate(chatstate): return _('has closed the chat window or tab') return '' -def is_in_path(command, return_abs_path=False): - """ - Return True if 'command' is found in one of the directories in the user's - path. If 'return_abs_path' is True, return the absolute path of the first - found command instead. Return False otherwise and on errors - """ - for directory in os.getenv('PATH').split(os.pathsep): - try: - if command in os.listdir(directory): - if return_abs_path: - return os.path.join(directory, command) - return True - except OSError: - # If the user has non directories in his path - pass - return False +def find_soundplayer(): + if sys.platform in ('win32', 'darwin'): + return + + if app.config.get('soundplayer') != '': + return + + commands = ('aucat', 'paplay', 'aplay', 'play', 'ossplay') + for command in commands: + if shutil.which(command) is not None: + if command == 'paplay': + command += ' -n gajim --property=media.role=event' + elif command in ('aplay', 'play'): + command += ' -q' + elif command == 'ossplay': + command += ' -qq' + elif command == 'aucat': + command += ' -i' + app.config.set('soundplayer', command) + break def exec_command(command, use_shell=False, posix=True): """ @@ -758,38 +724,52 @@ def strip_soundfile_path(file_, dirs=None, abs_=True): return file_ def play_sound_file(path_to_soundfile): - if path_to_soundfile == 'beep': - exec_command('beep') - return path_to_soundfile = check_soundfile_path(path_to_soundfile) if path_to_soundfile is None: return - if sys.platform == 'win32' and HAS_SOUND: + + if sys.platform == 'win32': + import winsound try: winsound.PlaySound(path_to_soundfile, - winsound.SND_FILENAME|winsound.SND_ASYNC) + winsound.SND_FILENAME|winsound.SND_ASYNC) except Exception: log.exception('Sound Playback Error') - elif sys.platform == 'linux': - if app.config.get('soundplayer') == '': - def _oss_play(): - sndfile = wave.open(path_to_soundfile, 'rb') - nc, sw, fr, nf, _comptype, _compname = sndfile.getparams() - dev = oss.open('/dev/dsp', 'w') - dev.setparameters(sw * 8, nc, fr) - dev.write(sndfile.readframes(nf)) - sndfile.close() - dev.close() - app.thread_interface(_oss_play) + + elif sys.platform == 'darwin': + try: + from AppKit import NSSound + except ImportError: + log.exception('Sound Playback Error') return - player = app.config.get('soundplayer') - command = build_command(player, path_to_soundfile) - exec_command(command) - elif sys.platform == 'darwin' and HAS_SOUND: + sound = NSSound.alloc() sound.initWithContentsOfFile_byReference_(path_to_soundfile, True) sound.play() + elif app.config.get('soundplayer') == '': + try: + import wave + import ossaudiodev + except Exception: + log.exception('Sound Playback Error') + return + + def _oss_play(): + sndfile = wave.open(path_to_soundfile, 'rb') + nc, sw, fr, nf, _comptype, _compname = sndfile.getparams() + dev = ossaudiodev.open('/dev/dsp', 'w') + dev.setparameters(sw * 8, nc, fr) + dev.write(sndfile.readframes(nf)) + sndfile.close() + dev.close() + app.thread_interface(_oss_play) + + else: + player = app.config.get('soundplayer') + command = build_command(player, path_to_soundfile) + exec_command(command) + def get_global_show(): maxi = 0 for account in app.connections: ===================================== gajim/gui_interface.py ===================================== @@ -1106,7 +1106,7 @@ class Interface: if connected == invisible_show: return # send currently played music - if (pep_supported and sys.platform == 'linux' and + if (pep_supported and sys.platform not in ('win32', 'darwin') and app.config.get_per('accounts', account, 'publish_tune')): self.enable_music_listener() # enable location listener @@ -2683,7 +2683,7 @@ class Interface: self.remote_ctrl = None # Handle screensaver - if sys.platform == 'linux': + if sys.platform not in ('win32', 'darwin'): logind.enable() screensaver.enable() @@ -2707,19 +2707,7 @@ class Interface: # get transports type from DB app.transport_type = app.logger.get_transports_type() - if app.config.get('soundplayer') == '': - # only on first time Gajim starts - commands = ('paplay', 'aplay', 'play', 'ossplay') - for command in commands: - if helpers.is_in_path(command): - if command == 'paplay': - command += ' -n gajim --property=media.role=event' - if command in ('aplay', 'play'): - command += ' -q' - elif command == 'ossplay': - command += ' -qq' - app.config.set('soundplayer', command) - break + helpers.find_soundplayer() self.last_ftwindow_update = 0 ===================================== gajim/notify.py ===================================== @@ -82,7 +82,7 @@ class Notification: self.daemon_capabilities = ['actions'] # Detect if actions are supported by the notification daemon - if sys.platform == 'linux': + if sys.platform not in ('win32', 'darwin'): def on_proxy_ready(source, res, data=None): try: proxy = Gio.DBusProxy.new_finish(res) ===================================== gajim/roster_window.py ===================================== @@ -4962,7 +4962,7 @@ class RosterWindow: item = Gtk.CheckMenuItem(_('Publish Tune')) pep_submenu.append(item) - if sys.platform != 'linux': + if sys.platform in ('win32', 'darwin'): item.set_sensitive(False) else: activ = app.config.get_per('accounts', account, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ac2a75db489d0812a1dbf0dffd4b3359b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ac2a75db489d0812a1dbf0dffd4b3359b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Flatpak: update dependencies and use pip to install modules
by André 09 Nov '18

09 Nov '18

André pushed to branch master at gajim / gajim Commits: 09cded2f by André Apitzsch at 2018-11-09T22:16:31Z Flatpak: update dependencies and use pip to install modules - - - - - ac2a75db by André Apitzsch at 2018-11-09T22:21:57Z Flatpak: use X11 access only if a X11 session is running Requires flatpak 1.0 or newer - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -8,7 +8,7 @@ desktop-file-name-prefix: '(Nightly) ' finish-args: - --share=ipc - --share=network - - --socket=x11 + - --socket=fallback-x11 - --socket=wayland - --socket=pulseaudio - --system-talk-name=org.freedesktop.GeoClue2 @@ -33,10 +33,6 @@ add-extensions: no-autodownload: true autodelete: true -build-options: - cflags: -O2 -g - cxxflags: -O2 -g - cleanup: - '/bin/easy*' - /include @@ -54,7 +50,7 @@ modules: - name: python3-pycparser buildsystem: simple build-commands: - - python3 setup.py install --prefix=/app + - pip3 install --prefix=/app . sources: - type: archive url: https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7… @@ -63,7 +59,7 @@ modules: - name: python3-cffi buildsystem: simple build-commands: - - python3 setup.py install --prefix=/app + - pip3 install --prefix=/app . sources: - type: archive url: https://files.pythonhosted.org/packages/e7/a7/4cd50e57cc6f436f1cc3a7e8fa700… @@ -88,11 +84,9 @@ modules: sha256: 156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e - name: python3-cryptography - ensure-writable: - - easy-install.pth buildsystem: simple build-commands: - - python3 setup.py install --prefix=/app + - pip3 install --prefix=/app . sources: - type: archive url: https://files.pythonhosted.org/packages/22/21/233e38f74188db94e8451ef638575… @@ -146,13 +140,13 @@ modules: - name: python3-keyring buildsystem: simple build-commands: - - pip3 install --prefix=/app keyring-15.1.0-py2.py3-none-any.whl + - pip3 install --prefix=/app keyring-16.0.2-py2.py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/6c/3f/7a3f780dfa9ee5708507090ce15d6… - sha256: 16dddc3edaeb2703aaf5588a0b488b62f162e26f1877b6faf3a3db4b7712df61 + url: https://files.pythonhosted.org/packages/5f/cb/dc7b2215cd82b77e7b8b48abd8989… + sha256: 2a5cf5e596cbf8b66b98b8df2c214adfe21e6e18baa82006b2c482bd0c4be94c - name: python3-cssutils buildsystem: simple @@ -185,7 +179,7 @@ modules: - name: python3-nbxmpp buildsystem: simple build-commands: - - python3 setup.py install --prefix=/app + - pip3 install --prefix=/app . sources: - type: archive url: https://files.pythonhosted.org/packages/24/54/23a475a0d7d3664ea21b14ce90724… View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/62cfd7293a5bfe06e2d564acf2a4e192f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/62cfd7293a5bfe06e2d564acf2a4e192f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 62cfd729 by Philipp Hörist at 2018-11-07T22:49:29Z Remove unused import - - - - - 1 changed file: - gajim/gtk/tooltips.py Changes: ===================================== gajim/gtk/tooltips.py ===================================== @@ -30,7 +30,6 @@ import logging from datetime import datetime from gi.repository import Gtk -from gi.repository import Gdk from gi.repository import GLib from gi.repository import Pango View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/62cfd7293a5bfe06e2d564acf2a4e192f4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/62cfd7293a5bfe06e2d564acf2a4e192f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Do not use own window for RosterTooltip
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4534f3db by Philipp Hörist at 2018-11-07T22:44:16Z Do not use own window for RosterTooltip - - - - - 2 changed files: - gajim/gtk/tooltips.py - gajim/roster_window.py Changes: ===================================== gajim/gtk/tooltips.py ===================================== @@ -258,9 +258,8 @@ class GCTooltip(): affiliation = formatted % (color, affiliation) return affiliation -class RosterTooltip(Gtk.Window, StatusTable): - def __init__(self, parent): - Gtk.Window.__init__(self, type=Gtk.WindowType.POPUP, transient_for=parent) +class RosterTooltip(StatusTable): + def __init__(self): StatusTable.__init__(self) self.create_table() self.account = None @@ -269,17 +268,9 @@ class RosterTooltip(Gtk.Window, StatusTable): self.prim_contact = None self.last_widget = None self.num_resources = 0 - self.set_title('tooltip') - self.set_border_width(3) - self.set_resizable(False) - self.set_name('gtk-tooltips') - self.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) self._ui = get_builder('tooltip_roster_contact.ui') - self.add(self._ui.tooltip_grid) - self._ui.tooltip_grid.show() - def clear_tooltip(self): """ Hide all Elements of the Tooltip Grid @@ -290,8 +281,17 @@ class RosterTooltip(Gtk.Window, StatusTable): if status_table: status_table.destroy() self.create_table() + self.row = None + + def get_tooltip(self, row, connected_contacts, account, typ): + if self.row == row: + return True, self._ui.tooltip_grid + + self._populate_grid(connected_contacts, account, typ) + self.row = row + return False, self._ui.tooltip_grid - def populate(self, contacts, account, typ): + def _populate_grid(self, contacts, account, typ): """ Populate the Tooltip Grid with data of from the contact """ @@ -447,7 +447,7 @@ class RosterTooltip(Gtk.Window, StatusTable): self._set_idle_time(contact) # Avatar - scale = self.get_scale_factor() + scale = self._ui.tooltip_grid.get_scale_factor() surface = app.contacts.get_avatar( account, self.prim_contact.jid, AvatarSize.TOOLTIP, scale) if surface is None: ===================================== gajim/roster_window.py ===================================== @@ -5563,12 +5563,14 @@ class RosterWindow: renderer.set_property(self.renderers_propertys[renderer][0], self.renderers_propertys[renderer][1]) - def query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): + def query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): try: row = widget.get_path_at_pos(x_pos, y_pos)[0] except TypeError: + self._roster_tooltip.clear_tooltip() return False if not row: + self._roster_tooltip.clear_tooltip() return False iter_ = None @@ -5576,6 +5578,7 @@ class RosterWindow: model = widget.get_model() iter_ = model.get_iter(row) except Exception: + self._roster_tooltip.clear_tooltip() return False typ = model[iter_][Column.TYPE] @@ -5586,9 +5589,9 @@ class RosterWindow: if typ in ('contact', 'self_contact'): contacts = app.contacts.get_contacts(account, jid) - for c in contacts: - if c.show not in ('offline', 'error'): - connected_contacts.append(c) + for contact in contacts: + if contact.show not in ('offline', 'error'): + connected_contacts.append(contact) if not connected_contacts: # no connected contacts, show the offline one connected_contacts = contacts @@ -5597,19 +5600,10 @@ class RosterWindow: elif typ != 'account': return False - if self.current_tooltip != row: - # If the row changes we hide the current tooltip - self.current_tooltip = row - return False - - tooltip = widget.get_tooltip_window() - - if tooltip.row == row: - # We already populated the window with the row data - return True - tooltip.row = row - tooltip.populate(connected_contacts, account, typ) - return True + value, widget = self._roster_tooltip.get_tooltip( + row, connected_contacts, account, typ) + tooltip.set_custom(widget) + return value def add_actions(self): action = Gio.SimpleAction.new_stateful( @@ -5842,8 +5836,7 @@ class RosterWindow: self.collapsed_rows = app.config.get('collapsed_rows').split('\t') self.tree.set_has_tooltip(True) - self.tree.set_tooltip_window(RosterTooltip(self.window)) - self.current_tooltip = None + self._roster_tooltip = RosterTooltip() self.tree.connect('query-tooltip', self.query_tooltip) # Workaround: For strange reasons signal is behaving like row-changed self._toggeling_row = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4534f3dbac3bb4bcfa54f8b19d5c3fde18… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4534f3dbac3bb4bcfa54f8b19d5c3fde18… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update look on GCTooltip and RosterTooltip
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 13c82ae7 by Daniel Brötzmann at 2018-11-07T22:07:26Z Update look on GCTooltip and RosterTooltip - - - - - 3 changed files: - gajim/data/gui/tooltip_gc_contact.ui - gajim/data/gui/tooltip_roster_contact.ui - gajim/gtk/tooltips.py Changes: ===================================== gajim/data/gui/tooltip_gc_contact.ui ===================================== @@ -1,95 +1,55 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkGrid" id="tooltip_grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">5</property> + <property name="column_spacing">6</property> <child> - <object class="GtkLabel" id="nick"> + <object class="GtkImage" id="avatar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="stock">gtk-missing-image</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">2</property> + <property name="height">6</property> </packing> </child> <child> - <object class="GtkLabel" id="status"> + <object class="GtkLabel" id="jid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="valign">start</property> - <property name="wrap">True</property> - <property name="wrap_mode">word-char</property> - <property name="max_width_chars">40</property> + <property name="hexpand">True</property> <attributes> - <attribute name="style" value="italic"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">2</property> </packing> </child> <child> - <object class="GtkLabel" id="jid_label"> + <object class="GtkLabel" id="nick"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="label" translatable="yes">Jabber ID:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkImage" id="avatar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> + <property name="ellipsize">end</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + <style> + <class name="large-header"/> + </style> </object> <packing> - <property name="left_attach">2</property> + <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="height">7</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="resource_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Resource:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="affiliation"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - <property name="width">2</property> </packing> </child> <child> @@ -100,9 +60,8 @@ <property name="valign">start</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> + <property name="left_attach">1</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -113,17 +72,23 @@ <property name="vexpand">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - <property name="width">2</property> + <property name="left_attach">1</property> + <property name="top_attach">5</property> </packing> </child> <child> - <object class="GtkLabel" id="resource"> + <object class="GtkLabel" id="status"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="hexpand">True</property> + <property name="valign">start</property> + <property name="wrap">True</property> + <property name="wrap_mode">word-char</property> + <property name="max_width_chars">25</property> + <property name="xalign">0</property> + <attributes> + <attribute name="style" value="italic"/> + </attributes> </object> <packing> <property name="left_attach">1</property> @@ -131,18 +96,15 @@ </packing> </child> <child> - <object class="GtkLabel" id="jid"> + <object class="GtkLabel" id="affiliation"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="hexpand">True</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="valign">start</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="top_attach">2</property> </packing> </child> </object> ===================================== gajim/data/gui/tooltip_roster_contact.ui ===================================== @@ -1,56 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkGrid" id="tooltip_grid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="column_spacing">5</property> - <child> - <object class="GtkLabel" id="name"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="jid_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Jabber ID:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkImage" id="avatar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="height">13</property> - </packing> - </child> + <property name="border_width">6</property> + <property name="row_spacing">3</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="resource_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Resource:</property> </object> @@ -59,19 +22,6 @@ <property name="top_attach">5</property> </packing> </child> - <child> - <object class="GtkLabel" id="user_show"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> <child> <object class="GtkLabel" id="resource"> <property name="visible">True</property> @@ -98,29 +48,14 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="status_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Status:</property> - <property name="wrap">True</property> - <property name="max_width_chars">40</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="idle_since_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Idle since:</property> </object> @@ -146,7 +81,7 @@ <object class="GtkLabel" id="mood_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Mood:</property> </object> @@ -159,7 +94,7 @@ <object class="GtkLabel" id="activity_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Activity:</property> <property name="lines">2</property> @@ -173,7 +108,7 @@ <object class="GtkLabel" id="tune_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Tune:</property> </object> @@ -186,7 +121,7 @@ <object class="GtkLabel" id="location_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Location:</property> </object> @@ -212,6 +147,7 @@ <object class="GtkLabel" id="activity"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> <property name="hexpand">True</property> </object> @@ -250,7 +186,7 @@ <object class="GtkLabel" id="pgp_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">OpenPGP:</property> </object> @@ -276,7 +212,7 @@ <object class="GtkLabel" id="sub_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Subscription:</property> </object> @@ -304,20 +240,62 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="hexpand">True</property> <property name="wrap">True</property> - <property name="max_width_chars">30</property> + <property name="wrap_mode">word-char</property> + <property name="max_width_chars">25</property> + <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> </attributes> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="name"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_markup">True</property> + <property name="ellipsize">end</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="user_show"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="vexpand">True</property> + </object> <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> </packing> </child> <child> - <placeholder/> + <object class="GtkImage" id="avatar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="height">5</property> + </packing> </child> <child> <placeholder/> ===================================== gajim/gtk/tooltips.py ===================================== @@ -61,14 +61,14 @@ class StatusTable: def create_table(self): self.table = Gtk.Grid() self.table.insert_column(0) - self.table.set_property('column-spacing', 2) + self.table.set_property('column-spacing', 3) def add_text_row(self, text, col_inc=0): self.table.insert_row(self.current_row) self.text_label = Gtk.Label() self.text_label.set_line_wrap(True) self.text_label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) - self.text_label.set_max_width_chars(35) + self.text_label.set_max_width_chars(25) self.text_label.set_halign(Gtk.Align.START) self.text_label.set_valign(Gtk.Align.START) self.text_label.set_selectable(False) @@ -212,12 +212,6 @@ class GCTooltip(): if contact.jid.strip(): self._ui.jid.set_text(contact.jid) self._ui.jid.show() - self._ui.jid_label.show() - # Resource - if hasattr(contact, 'resource') and contact.resource.strip(): - self._ui.resource.set_text(contact.resource) - self._ui.resource.show() - self._ui.resource_label.show() # Affiliation if contact.affiliation != 'none': @@ -292,7 +286,7 @@ class RosterTooltip(Gtk.Window, StatusTable): """ for child in self._ui.tooltip_grid.get_children(): child.hide() - status_table = self._ui.tooltip_grid.get_child_at(0, 3) + status_table = self._ui.tooltip_grid.get_child_at(1, 3) if status_table: status_table.destroy() self.create_table() @@ -313,7 +307,7 @@ class RosterTooltip(Gtk.Window, StatusTable): accounts = helpers.get_notification_icon_tooltip_dict() self.spacer_label = '' self.fill_table_with_accounts(accounts) - self._ui.tooltip_grid.attach(self.table, 0, 3, 2, 1) + self._ui.tooltip_grid.attach(self.table, 1, 3, 2, 1) self.table.show_all() return @@ -381,7 +375,6 @@ class RosterTooltip(Gtk.Window, StatusTable): else: contacts_dict[priority] = [contact] if self.num_resources > 1: - self._ui.status_label.show() transport = app.get_transport_name_from_jid(self.prim_contact.jid) if transport == 'jabber': transport = None @@ -406,7 +399,7 @@ class RosterTooltip(Gtk.Window, StatusTable): if add_text: self.add_text_row(acontact.status, 2) - self._ui.tooltip_grid.attach(self.table, 0, 3, 2, 1) + self._ui.tooltip_grid.attach(self.table, 1, 3, 2, 1) self.table.show_all() else: # only one resource @@ -415,7 +408,6 @@ class RosterTooltip(Gtk.Window, StatusTable): if status: self._ui.status.set_text(status) self._ui.status.show() - self._ui.status_label.show() # PEP Info self._append_pep_info(contact) @@ -423,7 +415,6 @@ class RosterTooltip(Gtk.Window, StatusTable): # JID self._ui.jid.set_text(self.prim_contact.jid) self._ui.jid.show() - self._ui.jid_label.show() # contact has only one resource if self.num_resources == 1 and contact.resource: @@ -468,12 +459,12 @@ class RosterTooltip(Gtk.Window, StatusTable): 'roster_tooltip_populate', self, contacts, self._ui.tooltip_grid) # Sets the Widget that is at the bottom to expand. - # This is needed in case the Picture takes more Space then the Labels + # This is needed in case the Picture takes more Space than the Labels i = 1 while i < 15: - if self._ui.tooltip_grid.get_child_at(0, i): - if self._ui.tooltip_grid.get_child_at(0, i).get_visible(): - self.last_widget = self._ui.tooltip_grid.get_child_at(0, i) + if self._ui.tooltip_grid.get_child_at(1, i): + if self._ui.tooltip_grid.get_child_at(1, i).get_visible(): + self.last_widget = self._ui.tooltip_grid.get_child_at(1, i) i += 1 self.last_widget.set_vexpand(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/13c82ae777a2ce8bd20543fa04b9d061c2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/13c82ae777a2ce8bd20543fa04b9d061c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update History Manager GUI
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd7e3218 by Daniel Brötzmann at 2018-11-07T21:52:23Z Update History Manager GUI - - - - - 2 changed files: - gajim/data/gui/history_manager.ui - gajim/history_manager.py Changes: ===================================== gajim/data/gui/history_manager.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkMenu" id="context_menu"> <property name="can_focus">False</property> <child> @@ -22,34 +22,33 @@ </object> </child> </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-find</property> - </object> <object class="GtkWindow" id="history_manager_window"> + <property name="width_request">1000</property> + <property name="height_request">500</property> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="title" translatable="yes">Gajim History Logs Manager</property> <property name="window_position">center</property> - <property name="default_width">650</property> + <property name="default_width">1000</property> <property name="default_height">500</property> <signal name="delete-event" handler="on_history_manager_window_delete_event" swapped="no"/> <child> <placeholder/> </child> <child> - <object class="GtkBox" id="vbox"> + <object class="GtkBox"> <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="spacing">12</property> <child> - <object class="GtkPaned" id="hpaned"> + <object class="GtkPaned"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="position">200</property> + <property name="position">250</property> <child> <object class="GtkScrolledWindow" id="jids_scrolledwindow"> + <property name="width_request">250</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="shadow_type">in</property> @@ -72,13 +71,13 @@ </packing> </child> <child> - <object class="GtkBox" id="vbox1"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="welcome_vbox"> - <property name="width_request">300</property> + <object class="GtkBox" id="welcome_box"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">20</property> @@ -89,9 +88,12 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="label" translatable="yes"><big><b>Welcome to Gajim History Logs Manager</b></big></property> + <property name="label" translatable="yes">Gajim History Logs Manager</property> <property name="use_markup">True</property> + <property name="xalign">0.5</property> + <style> + <class name="large-header"/> + </style> </object> <packing> <property name="expand">False</property> @@ -103,11 +105,11 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> <property name="label" translatable="yes">This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead. Use this program to delete or export logs. You can select logs from the left and/or search database from below.</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -119,11 +121,11 @@ Use this program to delete or export logs. You can select logs from the left and <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> <property name="label" translatable="yes"><b>WARNING:</b> If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with.</property> <property name="use_markup">True</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -142,6 +144,7 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene <object class="GtkScrolledWindow" id="logs_scrolledwindow"> <property name="can_focus">True</property> <property name="no_show_all">True</property> + <property name="margin_left">6</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="logs_listview"> @@ -167,6 +170,7 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene <object class="GtkScrolledWindow" id="search_results_scrolledwindow"> <property name="can_focus">True</property> <property name="no_show_all">True</property> + <property name="margin_left">6</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="search_results_listview"> @@ -201,15 +205,16 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene </packing> </child> <child> - <object class="GtkBox" id="hbox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkEntry" id="search_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> + <property name="placeholder_text" translatable="yes">Search database...</property> </object> <packing> <property name="expand">True</property> @@ -219,20 +224,26 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene </child> <child> <object class="GtkButton" id="search_db_button"> - <property name="label" translatable="yes">_Search Database</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <property name="image">image1</property> + <property name="tooltip_text" translatable="yes">Search in database</property> <property name="use_underline">True</property> <property name="image_position">bottom</property> <signal name="clicked" handler="on_search_db_button_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">edit-find-symbolic</property> + </object> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> ===================================== gajim/history_manager.py ===================================== @@ -41,6 +41,7 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gio +from gi.repository import Pango from gajim.common import app from gajim.common import i18n @@ -109,18 +110,9 @@ class HistoryManager: '%s does not exist.' % log_db_path) sys.exit() - xml = get_builder('history_manager.ui') - self.window = xml.get_object('history_manager_window') - Gtk.Window.set_default_icon_list(get_app_icon_list(self.window)) - - self.jids_listview = xml.get_object('jids_listview') - self.logs_listview = xml.get_object('logs_listview') - self.search_results_listview = xml.get_object('search_results_listview') - self.search_entry = xml.get_object('search_entry') - self.logs_scrolledwindow = xml.get_object('logs_scrolledwindow') - self.search_results_scrolledwindow = xml.get_object( - 'search_results_scrolledwindow') - self.welcome_vbox = xml.get_object('welcome_vbox') + self._ui = get_builder('history_manager.ui') + Gtk.Window.set_default_icon_list(get_app_icon_list( + self._ui.history_manager_window)) self.jids_already_in = [] # holds jids that we already have in DB self.AT_LEAST_ONE_DELETION_DONE = False @@ -136,36 +128,36 @@ class HistoryManager: self._fill_jids_listview() - self.search_entry.grab_focus() + self._ui.search_entry.grab_focus() - self.window.show_all() + self._ui.history_manager_window.show_all() - xml.connect_signals(self) + self._ui.connect_signals(self) def _init_jids_listview(self): self.jids_liststore = Gtk.ListStore(str, str) # jid, jid_id - self.jids_listview.set_model(self.jids_liststore) - self.jids_listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) + self._ui.jids_listview.set_model(self.jids_liststore) + self._ui.jids_listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) renderer_text = Gtk.CellRendererText() # holds jid col = Gtk.TreeViewColumn(_('JID'), renderer_text, text=0) - self.jids_listview.append_column(col) + self._ui.jids_listview.append_column(col) - self.jids_listview.get_selection().connect('changed', + self._ui.jids_listview.get_selection().connect('changed', self.on_jids_listview_selection_changed) def _init_logs_listview(self): # log_line_id(HIDDEN), jid_id(HIDDEN), time, message, subject, nickname self.logs_liststore = Gtk.ListStore(str, str, str, str, str, str) - self.logs_listview.set_model(self.logs_liststore) - self.logs_listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) + self._ui.logs_listview.set_model(self.logs_liststore) + self._ui.logs_listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) renderer_text = Gtk.CellRendererText() # holds time col = Gtk.TreeViewColumn(_('Date'), renderer_text, text=Column.UNIXTIME) # user can click this header and sort col.set_sort_column_id(Column.UNIXTIME) col.set_resizable(True) - self.logs_listview.append_column(col) + self._ui.logs_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds nickname col = Gtk.TreeViewColumn(_('Nickname'), renderer_text, text=Column.NICKNAME) @@ -174,61 +166,69 @@ class HistoryManager: col.set_resizable(True) col.set_visible(False) self.nickname_col_for_logs = col - self.logs_listview.append_column(col) + self._ui.logs_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds message + renderer_text.set_property('width_chars', 60) + renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) col = Gtk.TreeViewColumn(_('Message'), renderer_text, markup=Column.MESSAGE) # user can click this header and sort col.set_sort_column_id(Column.MESSAGE) col.set_resizable(True) self.message_col_for_logs = col - self.logs_listview.append_column(col) + self._ui.logs_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds subject col = Gtk.TreeViewColumn(_('Subject'), renderer_text, text=Column.SUBJECT) - col.set_sort_column_id(Column.SUBJECT) # user can click this header and sort + # user can click this header and sort + col.set_sort_column_id(Column.SUBJECT) col.set_resizable(True) col.set_visible(False) self.subject_col_for_logs = col - self.logs_listview.append_column(col) + self._ui.logs_listview.append_column(col) def _init_search_results_listview(self): # log_line_id (HIDDEN), jid, time, message, subject, nickname self.search_results_liststore = Gtk.ListStore(int, str, str, str, str, str) - self.search_results_listview.set_model(self.search_results_liststore) + self._ui.search_results_listview.set_model(self.search_results_liststore) renderer_text = Gtk.CellRendererText() # holds JID (who said this) col = Gtk.TreeViewColumn(_('JID'), renderer_text, text=1) - col.set_sort_column_id(1) # user can click this header and sort + # user can click this header and sort + col.set_sort_column_id(1) col.set_resizable(True) - self.search_results_listview.append_column(col) + self._ui.search_results_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds time col = Gtk.TreeViewColumn(_('Date'), renderer_text, text=Column.UNIXTIME) # user can click this header and sort col.set_sort_column_id(Column.UNIXTIME) col.set_resizable(True) - self.search_results_listview.append_column(col) + self._ui.search_results_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds message + renderer_text.set_property('width_chars', 60) + renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) col = Gtk.TreeViewColumn(_('Message'), renderer_text, text=Column.MESSAGE) - col.set_sort_column_id(Column.MESSAGE) # user can click this header and sort + # user can click this header and sort + col.set_sort_column_id(Column.MESSAGE) col.set_resizable(True) - self.search_results_listview.append_column(col) + self._ui.search_results_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds subject col = Gtk.TreeViewColumn(_('Subject'), renderer_text, text=Column.SUBJECT) - col.set_sort_column_id(Column.SUBJECT) # user can click this header and sort + # user can click this header and sort + col.set_sort_column_id(Column.SUBJECT) col.set_resizable(True) - self.search_results_listview.append_column(col) + self._ui.search_results_listview.append_column(col) renderer_text = Gtk.CellRendererText() # holds nickname col = Gtk.TreeViewColumn(_('Nickname'), renderer_text, text=Column.NICKNAME) # user can click this header and sort col.set_sort_column_id(Column.NICKNAME) col.set_resizable(True) - self.search_results_listview.append_column(col) + self._ui.search_results_listview.append_column(col) def on_history_manager_window_delete_event(self, widget, event): if not self.AT_LEAST_ONE_DELETION_DONE: @@ -269,16 +269,16 @@ class HistoryManager: self.jids_liststore.append([row[0], str(row[1])]) # jid, jid_id def on_jids_listview_selection_changed(self, widget, data=None): - liststore, list_of_paths = self.jids_listview.get_selection()\ + liststore, list_of_paths = self._ui.jids_listview.get_selection()\ .get_selected_rows() self.logs_liststore.clear() if not list_of_paths: return - self.welcome_vbox.hide() - self.search_results_scrolledwindow.hide() - self.logs_scrolledwindow.show() + self._ui.welcome_box.hide() + self._ui.search_results_scrolledwindow.hide() + self._ui.logs_scrolledwindow.show() list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) @@ -440,31 +440,31 @@ class HistoryManager: message, subject, nickname)) def on_logs_listview_key_press_event(self, widget, event): - liststore, list_of_paths = self.logs_listview.get_selection()\ + liststore, list_of_paths = self._ui.logs_listview.get_selection()\ .get_selected_rows() if event.keyval == Gdk.KEY_Delete: self._delete_logs(liststore, list_of_paths) def on_listview_button_press_event(self, widget, event): if event.button == 3: # right click - xml = get_builder('history_manager.ui', ['context_menu']) + _ui = get_builder('history_manager.ui', ['context_menu']) if Gtk.Buildable.get_name(widget) != 'jids_listview': - xml.get_object('export_menuitem').hide() - xml.get_object('delete_menuitem').connect('activate', + _ui.export_menuitem.hide() + _ui.delete_menuitem.connect('activate', self.on_delete_menuitem_activate, widget) - xml.connect_signals(self) - xml.get_object('context_menu').popup(None, None, None, None, + _ui.connect_signals(self) + _ui.context_menu.popup(None, None, None, None, event.button, event.time) return True def on_export_menuitem_activate(self, widget): FileSaveDialog(self._on_export, - transient_for=self.window, + transient_for=self._ui.history_manager_window, modal=True) def _on_export(self, filename): - liststore, list_of_paths = self.jids_listview.get_selection()\ + liststore, list_of_paths = self._ui.jids_listview.get_selection()\ .get_selected_rows() self._export_jids_logs_to_file(liststore, list_of_paths, filename) @@ -479,7 +479,7 @@ class HistoryManager: return def on_jids_listview_key_press_event(self, widget, event): - liststore, list_of_paths = self.jids_listview.get_selection()\ + liststore, list_of_paths = self._ui.jids_listview.get_selection()\ .get_selected_rows() if event.keyval == Gdk.KEY_Delete: self._delete_jid_logs(liststore, list_of_paths) @@ -580,7 +580,7 @@ class HistoryManager: dialog.set_markup(pri_text) ok_button = dialog.get_children()[0].get_children()[1].get_children()[0] ok_button.grab_focus() - dialog.set_transient_for(self.window) + dialog.set_transient_for(self._ui.history_manager_window) def _delete_logs(self, liststore, list_of_paths): paths_len = len(list_of_paths) @@ -613,21 +613,21 @@ class HistoryManager: 'Do you really want to delete the selected message?', 'Do you really want to delete the selected messages?', paths_len) dialog = ConfirmationDialog(pri_text, - _('This is an irreversible operation.'), on_response_ok=(on_ok, + _('This can not be undone.'), on_response_ok=(on_ok, liststore, list_of_paths)) dialog.set_title(_('Deletion Confirmation')) ok_button = dialog.get_children()[0].get_children()[1].get_children()[0] ok_button.grab_focus() - dialog.set_transient_for(self.window) + dialog.set_transient_for(self._ui.history_manager_window) def on_search_db_button_clicked(self, widget): - text = self.search_entry.get_text() + text = self._ui.search_entry.get_text() if not text: return - self.welcome_vbox.hide() - self.logs_scrolledwindow.hide() - self.search_results_scrolledwindow.show() + self._ui.welcome_box.hide() + self._ui.logs_scrolledwindow.hide() + self._ui.search_results_scrolledwindow.show() self._fill_search_results_listview(text) @@ -650,7 +650,7 @@ class HistoryManager: return path = self.jids_liststore.get_path(iter_) - self.jids_listview.set_cursor(path) + self._ui.jids_listview.set_cursor(path) iter_ = self.logs_liststore.get_iter_first() while iter_: @@ -660,8 +660,8 @@ class HistoryManager: iter_ = self.logs_liststore.iter_next(iter_) path = self.logs_liststore.get_path(iter_) - self.logs_listview.scroll_to_cell(path) - self.logs_listview.get_selection().select_path(path) + self._ui.logs_listview.scroll_to_cell(path) + self._ui.logs_listview.get_selection().select_path(path) def main(): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd7e32187d5717b05375720b64423be7da… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd7e32187d5717b05375720b64423be7da… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Test: Remove unused xmpp_mocks
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fd97d642 by André Apitzsch at 2018-11-07T21:36:54Z Test: Remove unused xmpp_mocks - - - - - 2 changed files: - test/integration/test_resolver.py - − test/lib/xmpp_mocks.py Changes: ===================================== test/integration/test_resolver.py ===================================== @@ -10,7 +10,6 @@ from gi.repository import GLib from gajim.common import resolver from gajim_mocks import * -from xmpp_mocks import IdleQueueThread NONSENSE_NAME = 'sfsdfsdfsdf.sdfs.fsd' JABBERCZ_TXT_NAME = '_xmppconnect.jabber.cz' ===================================== test/lib/xmpp_mocks.py deleted ===================================== @@ -1,94 +0,0 @@ -''' -Module with dummy classes for unit testing of XMPP and related code. -''' - -import threading, time - -from mock import Mock - -from nbxmpp import idlequeue - -IDLEQUEUE_INTERVAL = 0.2 # polling interval. 200ms is used in Gajim as default -IDLEMOCK_TIMEOUT = 30 # how long we wait for an event - -class IdleQueueThread(threading.Thread): - ''' - Thread for regular processing of idlequeue. - ''' - def __init__(self): - self.iq = idlequeue.IdleQueue() - self.stop = threading.Event() # Event to stop the thread main loop. - self.stop.clear() - threading.Thread.__init__(self) - - def run(self): - while not self.stop.isSet(): - self.iq.process() - time.sleep(IDLEQUEUE_INTERVAL) - - def stop_thread(self): - self.stop.set() - - -class IdleMock: - ''' - Serves as template for testing objects that are normally controlled by GUI. - Allows to wait for asynchronous callbacks with wait() method. - ''' - def __init__(self): - self._event = threading.Event() - self._event.clear() - - def wait(self): - ''' - Block until some callback sets the event and clearing the event - subsequently. - Returns True if event was set, False on timeout - ''' - self._event.wait(IDLEMOCK_TIMEOUT) - if self._event.isSet(): - self._event.clear() - return True - else: - return False - - def set_event(self): - self._event.set() - -class MockConnection(IdleMock, Mock): - ''' - Class simulating Connection class from gajim/common/connection.py - - It is derived from Mock in order to avoid defining all methods - from real Connection that are called from NBClient or Dispatcher - ( _event_dispatcher for example) - ''' - - def __init__(self, *args): - self.connect_succeeded = True - IdleMock.__init__(self) - Mock.__init__(self, *args) - - def on_connect(self, success, *args): - ''' - Method called after connecting - after receiving <stream:features> - from server (NOT after TLS stream restart) or connect failure - ''' - self.connect_succeeded = success - self.set_event() - - - def on_auth(self, con, auth): - ''' - Method called after authentication, regardless of the result. - - :Parameters: - con : NonBlockingClient - reference to authenticated object - auth : string - type of authetication in case of success ('old_auth', 'sasl') or - None in case of auth failure - ''' - self.auth_connection = con - self.auth = auth - self.set_event() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fd97d64205b2772c850b7e3cdc47def6b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fd97d64205b2772c850b7e3cdc47def6b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: ManageProxies GUI update
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d106c0d3 by Daniel Brötzmann at 2018-11-07T16:07:24Z ManageProxies GUI update - - - - - 43f07c19 by Daniel Brötzmann at 2018-11-07T16:07:24Z Merge destroy handlers, connect ESC key, remove transient - - - - - 56f948f5 by Daniel Brötzmann at 2018-11-07T16:07:24Z Remove unnecessary .destroy - - - - - 02f16d53 by Daniel Brötzmann at 2018-11-07T20:22:25Z Remove None from list, rename None to No Proxy in combobox - - - - - 5 changed files: - gajim/app_actions.py - gajim/data/gui/manage_proxies_window.ui - gajim/gtk/preferences.py - gajim/gtk/proxies.py - gajim/options_dialog.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -251,8 +251,7 @@ def on_manage_proxies(action, param): if 'manage_proxies' in app.interface.instances: app.interface.instances['manage_proxies'].window.present() else: - app.interface.instances['manage_proxies'] = \ - ManageProxies(interface.roster.window) + app.interface.instances['manage_proxies'] = ManageProxies() # Admin Actions ===================================== gajim/data/gui/manage_proxies_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkListStore" id="liststore1"> <columns>  @@ -20,385 +20,93 @@ </data> </object> <object class="GtkWindow" id="manage_proxies_window"> + <property name="width_request">500</property> + <property name="height_request">440</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">18</property> <property name="title" translatable="yes">Manage Proxy Profiles</property> - <property name="resizable">False</property> <property name="window_position">center-on-parent</property> + <property name="default_width">500</property> + <property name="default_height">440</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_manage_proxies_window_destroy" swapped="no"/> + <signal name="destroy" handler="_on_destroy" swapped="no"/> + <signal name="key-press-event" handler="_on_key_press" swapped="no"/> <child> - <object class="GtkBox" id="vbox87"> + <placeholder/> + </child> + <child> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkBox" id="hbox2966"> + <object class="GtkBox"> + <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="vbox89"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow38"> + <object class="GtkTreeView" id="proxies_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="proxies_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <signal name="cursor-changed" handler="on_proxies_treeview_cursor_changed" swapped="no"/> - <signal name="key-press-event" handler="on_proxies_treeview_key_press_event" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox21"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">center</property> - <child> - <object class="GtkButton" id="add_proxy_button"> - <property name="label">gtk-add</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_add_proxy_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="remove_proxy_button"> - <property name="label">gtk-remove</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_remove_proxy_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> + <property name="headers_visible">False</property> + <signal name="cursor-changed" handler="on_proxies_treeview_cursor_changed" swapped="no"/> + <signal name="key-press-event" handler="on_proxies_treeview_key_press_event" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="vbox90"> + <object class="GtkToolbar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> <child> - <object class="GtkFrame" id="frame34"> + <object class="GtkToolButton" id="add_proxy_button"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="border_width">6</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="label320"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Name:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label321"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Type:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyname_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyname_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="proxytype_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> - <signal name="changed" handler="on_proxytype_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label319"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Properties</b></property> - <property name="use_markup">True</property> - </object> - </child> + <property name="tooltip_text" translatable="yes">Add Proxy</property> + <property name="use_underline">True</property> + <property name="icon_name">list-add-symbolic</property> + <signal name="clicked" handler="on_add_proxy_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkFrame" id="frame23"> + <object class="GtkToolButton" id="remove_proxy_button"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkGrid" id="proxy_table"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="border_width">6</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="boshuri_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_BOSH URL:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="boshuri_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_boshuri_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label135"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Proxy _Host:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="boshuseproxy_checkbutton"> - <property name="label" translatable="yes">Use HTTP prox_y</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_boshuseproxy_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label136"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Proxy _Port:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="useauth_checkbutton"> - <property name="label" translatable="yes">Use proxy auth_entication</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_useauth_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label253"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Username:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label254"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Pass_word:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyhost_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyhost_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyport_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyport_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyuser_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyuser_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxypass_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - <signal name="changed" handler="on_proxypass_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label216"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Settings</b></property> - <property name="use_markup">True</property> - </object> - </child> + <property name="tooltip_text" translatable="yes">Remove Proxy</property> + <property name="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="on_remove_proxy_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> + <style> + <class name="inline-toolbar"/> + </style> </object> <packing> <property name="expand">False</property> @@ -414,28 +122,313 @@ </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox22"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">6</property> - <property name="spacing">12</property> - <property name="layout_style">end</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> + <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Properties</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Name</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Type</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyname_entry"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_proxyname_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="proxytype_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">6</property> + <property name="model">liststore1</property> + <signal name="changed" handler="on_proxytype_combobox_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> + <child> + <object class="GtkGrid" id="proxy_table"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="boshuri_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_BOSH URL</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="boshuri_entry"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_boshuri_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="boshuseproxy_checkbutton"> + <property name="label" translatable="yes">Use HTTP prox_y</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_boshuseproxy_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Proxy _Host</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyhost_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_proxyhost_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Proxy _Port</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyport_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_proxyport_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Username</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="useauth_checkbutton"> + <property name="label" translatable="yes">Use proxy auth_entication</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_useauth_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyuser_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_proxyuser_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Pass_word</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxypass_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <signal name="changed" handler="on_proxypass_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Settings</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/preferences.py ===================================== @@ -492,14 +492,14 @@ class Preferences(Gtk.ApplicationWindow): return val def on_checkbutton_toggled(self, widget, config_name, - change_sensitivity_widgets=None): + change_sensitivity_widgets=None): app.config.set(config_name, widget.get_active()) if change_sensitivity_widgets: for w in change_sensitivity_widgets: w.set_sensitive(widget.get_active()) def on_per_account_checkbutton_toggled(self, widget, config_name, - change_sensitivity_widgets=None): + change_sensitivity_widgets=None): for account in app.connections: app.config.set_per('accounts', account, config_name, widget.get_active()) @@ -1014,8 +1014,10 @@ class Preferences(Gtk.ApplicationWindow): # Proxies def on_proxies_combobox_changed(self, widget): active = widget.get_active() + if active == -1: + return proxy = widget.get_model()[active][0] - if proxy == _('None'): + if proxy == _('No Proxy'): proxy = '' app.config.set('global_proxy', proxy) @@ -1023,20 +1025,22 @@ class Preferences(Gtk.ApplicationWindow): if 'manage_proxies' in app.interface.instances: app.interface.instances['manage_proxies'].window.present() else: - app.interface.instances['manage_proxies'] = ManageProxies(self) + app.interface.instances['manage_proxies'] = ManageProxies() def update_proxy_list(self): our_proxy = app.config.get('global_proxy') if not our_proxy: - our_proxy = _('None') + our_proxy = _('No Proxy') model = self._ui.proxies_combobox.get_model() model.clear() proxies = app.config.get_per('proxies') - proxies.insert(0, _('None')) + proxies.insert(0, _('No Proxy')) for index, proxy in enumerate(proxies): model.append([proxy]) if our_proxy == proxy: self._ui.proxies_combobox.set_active(index) + if not our_proxy in proxies: + self._ui.proxies_combobox.set_active(0) # Log status changes of contacts def on_log_show_changes_checkbutton_toggled(self, widget): ===================================== gajim/gtk/proxies.py ===================================== @@ -12,46 +12,50 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import Gtk from gajim.common import app -from gajim.common.i18n import _ from gajim.gtk.util import get_builder class ManageProxies: - def __init__(self, transient_for=None): + def __init__(self): self._ui = get_builder('manage_proxies_window.ui') self.window = self._ui.manage_proxies_window - self.window.set_transient_for(transient_for) + self.window.set_transient_for(app.app.get_active_window()) self.init_list() self.block_signal = False self._ui.connect_signals(self) self.window.show_all() + # hide the BOSH fields by default self.show_bosh_fields() + self._ui.boshuri_entry.hide() + self._ui.boshuri_label.hide() + self._ui.boshuseproxy_checkbutton.hide() def show_bosh_fields(self, show=True): if show: self._ui.boshuri_entry.show() self._ui.boshuri_label.show() self._ui.boshuseproxy_checkbutton.show() + act = self._ui.boshuseproxy_checkbutton.get_active() + self._ui.proxyhost_entry.set_sensitive(act) + self._ui.proxyport_entry.set_sensitive(act) else: - cb = self._ui.boshuseproxy_checkbutton - cb.hide() - cb.set_active(True) - self.on_boshuseproxy_checkbutton_toggled(cb) + self._ui.boshuseproxy_checkbutton.hide() + self._ui.boshuseproxy_checkbutton.set_active(True) + self.on_boshuseproxy_checkbutton_toggled( + self._ui.boshuseproxy_checkbutton) self._ui.boshuri_entry.hide() self._ui.boshuri_label.hide() def fill_proxies_treeview(self): model = self._ui.proxies_treeview.get_model() model.clear() - iter_ = model.append() - model.set(iter_, 0, _('None')) for proxy in app.config.get_per('proxies'): iter_ = model.append() model.set(iter_, 0, proxy) @@ -70,12 +74,6 @@ class ManageProxies: self.fill_proxies_treeview() self._ui.proxytype_combobox.set_active(0) - def on_manage_proxies_window_destroy(self, _widget): - window = app.get_app_window('AccountsWindow') - if window is not None: - window.update_proxy_list() - del app.interface.instances['manage_proxies'] - def on_add_proxy_button_clicked(self, _widget): model = self._ui.proxies_treeview.get_model() proxies = app.config.get_per('proxies') @@ -102,9 +100,6 @@ class ManageProxies: self.on_proxies_treeview_cursor_changed(self._ui.proxies_treeview) self.block_signal = False - def on_close_button_clicked(self, _widget): - self.window.destroy() - def on_useauth_checkbutton_toggled(self, widget): if self.block_signal: return @@ -149,37 +144,43 @@ class ManageProxies: proxy = model[iter_][0] self._ui.proxyname_entry.set_text(proxy) - if proxy == _('None'): # special proxy None - self.show_bosh_fields(False) - self._ui.proxyname_entry.set_editable(False) - self._ui.remove_proxy_button.set_sensitive(False) - self._ui.proxytype_combobox.set_sensitive(False) - self._ui.proxy_table.set_sensitive(False) - else: - proxytype = app.config.get_per('proxies', proxy, 'type') - - self.show_bosh_fields(proxytype == 'bosh') - - self._ui.proxyname_entry.set_editable(True) - self._ui.remove_proxy_button.set_sensitive(True) - self._ui.proxytype_combobox.set_sensitive(True) - self._ui.proxy_table.set_sensitive(True) - self._ui.proxyhost_entry.set_text( - app.config.get_per('proxies', proxy, 'host')) - self._ui.proxyport_entry.set_text( - str(app.config.get_per('proxies', proxy, 'port'))) - self._ui.proxyuser_entry.set_text( - app.config.get_per('proxies', proxy, 'user')) - self._ui.proxypass_entry.set_text( - app.config.get_per('proxies', proxy, 'pass')) - self._ui.boshuri_entry.set_text( - app.config.get_per('proxies', proxy, 'bosh_uri')) - types = ['http', 'socks5', 'bosh'] - self._ui.proxytype_combobox.set_active(types.index(proxytype)) - self._ui.boshuseproxy_checkbutton.set_active( - app.config.get_per('proxies', proxy, 'bosh_useproxy')) - self._ui.useauth_checkbutton.set_active( - app.config.get_per('proxies', proxy, 'useauth')) + proxytype = app.config.get_per('proxies', proxy, 'type') + + self.show_bosh_fields(proxytype == 'bosh') + + self._ui.proxyname_entry.set_editable(True) + self._ui.proxyname_entry.set_sensitive(True) + self._ui.remove_proxy_button.set_sensitive(True) + self._ui.proxytype_combobox.set_sensitive(True) + self._ui.proxy_table.set_sensitive(True) + + self._ui.boshuri_entry.set_text( + app.config.get_per('proxies', proxy, 'bosh_uri')) + self._ui.boshuseproxy_checkbutton.set_active( + app.config.get_per('proxies', proxy, 'bosh_useproxy')) + if proxytype == 'bosh': + act = self._ui.boshuseproxy_checkbutton.get_active() + self._ui.proxyhost_entry.set_sensitive(act) + self._ui.proxyport_entry.set_sensitive(act) + + self._ui.proxyhost_entry.set_text( + app.config.get_per('proxies', proxy, 'host')) + self._ui.proxyport_entry.set_text( + str(app.config.get_per('proxies', proxy, 'port'))) + self._ui.proxyuser_entry.set_text( + app.config.get_per('proxies', proxy, 'user')) + self._ui.proxypass_entry.set_text( + app.config.get_per('proxies', proxy, 'pass')) + + types = ['http', 'socks5', 'bosh'] + self._ui.proxytype_combobox.set_active(types.index(proxytype)) + + self._ui.useauth_checkbutton.set_active( + app.config.get_per('proxies', proxy, 'useauth')) + act = self._ui.useauth_checkbutton.get_active() + self._ui.proxyuser_entry.set_sensitive(act) + self._ui.proxypass_entry.set_sensitive(act) + self.block_signal = False def on_proxies_treeview_key_press_event(self, widget, event): @@ -217,6 +218,13 @@ class ManageProxies: proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'type', types[type_]) + def on_boshuri_entry_changed(self, widget): + if self.block_signal: + return + value = widget.get_text() + proxy = self._ui.proxyname_entry.get_text() + app.config.set_per('proxies', proxy, 'bosh_uri', value) + def on_proxyhost_entry_changed(self, widget): if self.block_signal: return @@ -238,16 +246,22 @@ class ManageProxies: proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'user', value) - def on_boshuri_entry_changed(self, widget): - if self.block_signal: - return - value = widget.get_text() - proxy = self._ui.proxyname_entry.get_text() - app.config.set_per('proxies', proxy, 'bosh_uri', value) - def on_proxypass_entry_changed(self, widget): if self.block_signal: return value = widget.get_text() proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'pass', value) + + def _on_key_press(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + + def _on_destroy(self, *args): + window_pref = app.get_app_window('Preferences') + window_accounts = app.get_app_window('AccountsWindow') + if window_pref is not None: + window_pref.update_proxy_list() + if window_accounts is not None: + window_accounts.update_proxy_list() + del app.interface.instances['manage_proxies'] ===================================== gajim/options_dialog.py ===================================== @@ -492,7 +492,7 @@ class ProxyComboOption(GenericOption): def update_values(self): proxies = app.config.get_per('proxies') - proxies.insert(0, _('None')) + proxies.insert(0, _('No Proxy')) self.combo.remove_all() for index, value in enumerate(proxies): self.combo.insert_text(-1, value) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ea2f76f24e0144e1f7503c5d58b42591d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ea2f76f24e0144e1f7503c5d58b42591d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.1.0
by Yann Leboulanger 06 Nov '18

06 Nov '18

Yann Leboulanger pushed new tag gajim-1.1.0 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim-1.1.0 You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2018