Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim] Pushed new tag gajim-1.1.3
by Philipp Hörist 23 Apr '19

23 Apr '19

Philipp Hörist pushed new tag gajim-1.1.3 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim-1.1.3 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] prepare 1.1.3 release
by Yann Leboulanger 23 Apr '19

23 Apr '19

Yann Leboulanger pushed to branch gajim_1.1 at gajim / gajim Commits: 257f7848 by Yann Leboulanger at 2019-04-23T19:25:11Z prepare 1.1.3 release - - - - - 3 changed files: - ChangeLog - data/org.gajim.Gajim.appdata.xml.in - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,4 +1,4 @@ -Gajim 1.1.3 (TBA) +Gajim 1.1.3 (24 April 2019) New ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -101,6 +101,7 @@ <content_attribute id="money-gambling">none</content_attribute> </content_rating> <releases> + <release version="1.1.3" date="2019-04-23" /> <release version="1.1.2" date="2019-01-15" /> <release version="1.1.1" date="2018-12-23" /> <release version="1.1.0" date="2018-11-06" /> ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.1.2" +__version__ = "1.1.3" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/257f784804d81afcafe996d4d96b0e93c1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/257f784804d81afcafe996d4d96b0e93c1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] update translations
by Yann Leboulanger 23 Apr '19

23 Apr '19

Yann Leboulanger pushed to branch gajim_1.1 at gajim / gajim Commits: b6b56a28 by Yann Leboulanger at 2019-04-23T19:23:51Z update translations - - - - - 1 changed file: - po/be.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b6b56a282e667b605891b2da19d4708e6a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b6b56a282e667b605891b2da19d4708e6a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: zeroconf_bonjour: switch from DNSServiceQueryRecord to DNSServiceGetAddrInfo for IPv6 compatibility
by Philipp Hörist 23 Apr '19

23 Apr '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: da04f7fe by Sebastiaan Lokhorst at 2019-04-23T15:09:44Z zeroconf_bonjour: switch from DNSServiceQueryRecord to DNSServiceGetAddrInfo for IPv6 compatibility - - - - - 97877294 by Philipp Hörist at 2019-04-23T15:09:44Z Update ChangeLog - - - - - 2 changed files: - ChangeLog - gajim/common/zeroconf/zeroconf_bonjour.py Changes: ===================================== ChangeLog ===================================== @@ -16,6 +16,7 @@ Gajim 1.1.3 (TBA) * #9633 Fix an error while sending a file * #9637 Restore window size correctly on wayland * #9660 GPG Agent setting is ignored + * #9645 Make zeroconf IPV6 compatible * Improve dark theme colors * Fix access to GnuPG keys * Use UUID4 item ids for pubsub posts ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== @@ -17,7 +17,6 @@ import logging import select -import socket import re from gajim.common.i18n import _ @@ -157,16 +156,16 @@ class Zeroconf: self.queried.append(True) - def query_record_callback(self, sdRef, flags, interfaceIndex, errorCode, - hosttarget, rrtype, rrclass, rdata, ttl): + def getaddrinfo_callback(self, sdRef, flags, interfaceIndex, errorCode, + hosttarget, address, ttl): if errorCode != pybonjour.kDNSServiceErr_NoError: - log.error('Error in query_record_callback: %s', str(errorCode)) + log.error('Error in getaddrinfo_callback: %s', str(errorCode)) return fullname, port, txtRecord = self.resolved_contacts[hosttarget] txt = pybonjour.TXTRecord.parse(txtRecord) - ip = socket.inet_ntoa(rdata) + ip = address[1] name, bare_name, protocol, domain = self._parse_name(fullname) @@ -207,20 +206,18 @@ class Zeroconf: self.resolved_contacts[hosttarget] = (fullname, port, txtRecord) try: - query_sdRef = None - query_sdRef = \ - pybonjour.DNSServiceQueryRecord( + getaddrinfo_sdRef = \ + pybonjour.DNSServiceGetAddrInfo( interfaceIndex=interfaceIndex, - fullname=hosttarget, - rrtype=pybonjour.kDNSServiceType_A, - callBack=self.query_record_callback) + hostname=hosttarget, + callBack=self.getaddrinfo_callback) while not self.queried: - ready = select.select([query_sdRef], [], [], resolve_timeout) - if query_sdRef not in ready[0]: - log.warning('Query record timed out') + ready = select.select([getaddrinfo_sdRef], [], [], resolve_timeout) + if getaddrinfo_sdRef not in ready[0]: + log.warning('GetAddrInfo timed out') break - pybonjour.DNSServiceProcessResult(query_sdRef) + pybonjour.DNSServiceProcessResult(getaddrinfo_sdRef) else: self.queried.pop() @@ -231,8 +228,8 @@ class Zeroconf: self.error_CB(_('Error while adding service. %s') % error) finally: - if query_sdRef: - query_sdRef.close() + if getaddrinfo_sdRef: + getaddrinfo_sdRef.close() self.resolved.append(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ff9afe194eea8a554131ee676200fc7c6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ff9afe194eea8a554131ee676200fc7c6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Make dialog scrollable
by Philipp Hörist 22 Apr '19

22 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 185d249e by Philipp Hörist at 2019-04-22T13:58:03Z ServerInfo: Make dialog scrollable - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== @@ -20,6 +20,7 @@ import nbxmpp from nbxmpp.util import is_error_result from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import Pango from gajim.common import app from gajim.common import ged @@ -39,7 +40,8 @@ class ServerInfoDialog(Gtk.Dialog): self.account = account self._destroyed = False self.set_transient_for(app.interface.roster.window) - self.set_resizable(False) + self.set_resizable(True) + self.set_size_request(300, 500) grid = Gtk.Grid() grid.set_name('ServerInfoGrid') @@ -65,7 +67,11 @@ class ServerInfoDialog(Gtk.Dialog): clipboard_button.connect('clicked', self.on_clipboard_button_clicked) box = self.get_content_area() - box.pack_start(grid, True, True, 0) + scrolled = Gtk.ScrolledWindow() + scrolled.set_max_content_height(500) + scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) + scrolled.add(grid) + box.pack_start(scrolled, True, True, 0) box.pack_start(clipboard_button, False, True, 0) box.set_property('margin', 12) box.set_spacing(18) @@ -274,15 +280,17 @@ class ServerInfoItem(Gtk.Grid): def __init__(self, info): super().__init__() self.tooltip = info.tooltip - self.set_hexpand(True) self.insert_column(0) - self.set_column_homogeneous(True) self.info = Gtk.Label(label=info.name) self.info.set_halign(Gtk.Align.START) - self.info.set_hexpand(True) + self.info.set_xalign(0) + self.info.set_size_request(160, -1) self.value = Gtk.Label(label=info.value) self.value.set_halign(Gtk.Align.START) + self.value.set_ellipsize(Pango.EllipsizeMode.END) + self.value.set_width_chars(20) + self.value.set_xalign(0) self.value.set_hexpand(True) self.value.set_selectable(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/185d249e0f93d92f85fce9da66d0f950c7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/185d249e0f93d92f85fce9da66d0f950c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove some useless settings
by Philipp Hörist 22 Apr '19

22 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 30997fa1 by Philipp Hörist at 2019-04-22T13:36:28Z Remove some useless settings - - - - - 6 changed files: - gajim/common/config.py - gajim/common/connection.py - gajim/common/modules/carbons.py - gajim/gtk/accounts.py - gajim/gtk/server_info.py - gajim/gui_interface.py Changes: ===================================== gajim/common/config.py ===================================== @@ -319,7 +319,6 @@ class Config: 'autoconnect': [opt_bool, False, '', True], 'autoconnect_as': [opt_str, 'online', _('Status used to autoconnect as. Can be online, chat, away, xa, dnd, invisible. NOTE: this option is used only if restore_last_status is disabled'), True], 'restore_last_status': [opt_bool, False, _('If enabled, restore the last status that was used.')], - 'autoreconnect': [opt_bool, True], 'autoauth': [opt_bool, False, _('If true, Contacts requesting authorization will be automatically accepted.')], 'active': [opt_bool, True, _('If False, this account will be disabled and will not appear in roster window.'), True], 'proxy': [opt_str, '', '', True], @@ -339,7 +338,6 @@ class Config: 'custom_host': [opt_str, '', '', True], 'sync_with_global_status': [opt_bool, False, ], 'no_log_for': [opt_str, '', _('Space separated list of JIDs for which you do not want to store logs. You can also add account name to log nothing for this account.')], - 'sync_logs_with_server': [opt_bool, True, _('On startup, Gajim will download logs stored on server, provided the server supports XEP-0313')], 'allow_no_log_for': [opt_str, '', _('Space separated list of JIDs for which you accept to not log conversations if he does not want to.')], 'attached_gpg_keys': [opt_str, ''], 'keep_alives_enabled': [opt_bool, True, _('Whitespace sent after inactivity')], @@ -383,7 +381,6 @@ class Config: 'send_idle_time': [opt_bool, True], 'roster_version': [opt_str, ''], 'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add')], - 'enable_message_carbons': [opt_bool, True, _('If enabled and if server supports this feature, Gajim will receive messages sent and received by other resources.')], 'ft_send_local_ips': [opt_bool, True, _('If enabled, Gajim will send your local IPs so your contact can connect to your machine to transfer files.')], 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which chat window will be re-opened on next startup.')], 'recent_groupchats': [opt_str, ''], ===================================== gajim/common/connection.py ===================================== @@ -586,10 +586,6 @@ class Connection(CommonConnection, ConnectionHandlers): # Clear disconnect handlers self.connection.disconnect_handlers = [] - if reconnect: - reconnect = app.config.get_per( - 'accounts', self.name, 'autoreconnect') - log.info('Disconnect %s, reconnect: %s', self.name, reconnect) if reconnect: ===================================== gajim/common/modules/carbons.py ===================================== @@ -16,7 +16,6 @@ import nbxmpp -from gajim.common import app from gajim.common.modules.base import BaseModule @@ -33,14 +32,11 @@ class Carbons(BaseModule): self.supported = True self._log.info('Discovered carbons: %s', from_) - if app.config.get_per('accounts', self._account, - 'enable_message_carbons'): - iq = nbxmpp.Iq('set') - iq.setTag('enable', namespace=nbxmpp.NS_CARBONS) - self._log.info('Activate') - self._con.connection.send(iq) - else: - self._log.warning('Carbons deactivated (user setting)') + iq = nbxmpp.Iq('set') + iq.setTag('enable', namespace=nbxmpp.NS_CARBONS) + self._log.info('Activate') + self._con.connection.send(iq) + def get_instance(*args, **kwargs): ===================================== gajim/gtk/accounts.py ===================================== @@ -753,29 +753,15 @@ class GeneralPage(GenericSettingPage): Setting(SettingKind.SWITCH, _('Connect on startup'), SettingType.ACCOUNT_CONFIG, 'autoconnect'), - Setting(SettingKind.SWITCH, _('Reconnect when connection is lost'), - SettingType.ACCOUNT_CONFIG, 'autoreconnect'), - Setting(SettingKind.SWITCH, _('Save conversations for all contacts'), SettingType.ACCOUNT_CONFIG, 'no_log_for', desc=_('Store conversations on the harddrive')), - Setting(SettingKind.SWITCH, _('Server Message Archive'), - SettingType.ACCOUNT_CONFIG, 'sync_logs_with_server', - desc=_('Messages get stored on the server. ' - 'The archive is used to sync messages ' - 'between multiple devices. (XEP-0313)')), - Setting(SettingKind.SWITCH, _('Global Status'), SettingType.ACCOUNT_CONFIG, 'sync_with_global_status', desc=_('Synchronise the status of all accounts')), - Setting(SettingKind.SWITCH, _('Message Carbons'), - SettingType.ACCOUNT_CONFIG, 'enable_message_carbons', - desc=_('All your other online devices get copies ' - 'of sent and received messages. XEP-0280')), - Setting(SettingKind.SWITCH, _('Use file transfer proxies'), SettingType.ACCOUNT_CONFIG, 'use_ft_proxies'), ] ===================================== gajim/gtk/server_info.py ===================================== @@ -160,11 +160,6 @@ class ServerInfoDialog(Gtk.Dialog): Feature = namedtuple('Feature', ['name', 'available', 'tooltip', 'enabled']) - carbons_enabled = app.config.get_per('accounts', self.account, - 'enable_message_carbons') - mam_enabled = app.config.get_per('accounts', self.account, - 'sync_logs_with_server') - return [ Feature('XEP-0016: Privacy Lists', con.get_module('PrivacyLists').supported, '', None), @@ -185,11 +180,10 @@ class ServerInfoDialog(Gtk.Dialog): nbxmpp.NS_SECLABEL, None), Feature('XEP-0280: Message Carbons', con.get_module('Carbons').supported, - nbxmpp.NS_CARBONS, carbons_enabled), + nbxmpp.NS_CARBONS, None), Feature('XEP-0313: Message Archive Management', con.get_module('MAM').archiving_namespace, - con.get_module('MAM').archiving_namespace, - mam_enabled), + con.get_module('MAM').archiving_namespace, None), Feature('XEP-0363: HTTP File Upload', con.get_module('HTTPUpload').available, con.get_module('HTTPUpload').httpupload_namespace, None), ===================================== gajim/gui_interface.py ===================================== @@ -935,8 +935,7 @@ class Interface: # Else disable autoaway app.sleeper_state[account] = 'off' - if obj.conn.get_module('MAM').available and app.config.get_per('accounts', - account, 'sync_logs_with_server'): + if obj.conn.get_module('MAM').available: obj.conn.get_module('MAM').request_archive_on_signin() invisible_show = app.SHOW_LIST.index('invisible') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/30997fa1e4f4d5c656a991857f6353c07a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/30997fa1e4f4d5c656a991857f6353c07a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Tune: Iterate correctly over dict
by Philipp Hörist 22 Apr '19

22 Apr '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c79e3fa2 by Philipp Hörist at 2019-04-22T13:00:45Z Tune: Iterate correctly over dict Fixes #75 - - - - - 1 changed file: - nbxmpp/modules/tune.py Changes: ===================================== nbxmpp/modules/tune.py ===================================== @@ -67,7 +67,7 @@ class Tune: return item data = data._asdict() - for tag, value in data: + for tag, value in data.items(): if value is not None: item.addChild(tag, payload=value) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c79e3fa26fabf42633ce899ae1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c79e3fa26fabf42633ce899ae1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework Accounts Window
by Philipp Hörist 22 Apr '19

22 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b306a7e0 by Philipp Hörist at 2019-04-22T10:48:01Z Rework Accounts Window - Every account row has now a submenu - Moved Remove, Back and Pages into the submenu - - - - - 5 changed files: - gajim/common/app.py - − gajim/data/gui/accounts_window.ui - gajim/data/style/gajim.css - gajim/gtk/accounts.py - gajim/gtk/settings.py Changes: ===================================== gajim/common/app.py ===================================== @@ -409,6 +409,16 @@ def get_connected_accounts(): account_list.append(account) return account_list +def get_accounts_sorted(): + ''' + Get all accounts alphabetically sorted with Local first + ''' + account_list = config.get_per('accounts') + account_list.sort(key=str.lower) + account_list.remove('Local') + account_list.insert(0, 'Local') + return account_list + def get_enabled_accounts_with_labels(exclude_local=True, connected_only=False, private_storage_only=False): """ ===================================== gajim/data/gui/accounts_window.ui deleted ===================================== @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.18"/> - <object class="GtkBox" id="box"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="max_content_height">400</property> - <property name="propagate_natural_height">True</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkListBox" id="account_list"> - <property name="name">OptionsBox1</property> - <property name="width_request">170</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">False</property> - <property name="vexpand">True</property> - <signal name="row-activated" handler="on_row_activated" swapped="no"/> - <style> - <class name="account-list"/> - </style> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkStack" id="stack"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="hhomogeneous">False</property> - <property name="vhomogeneous">False</property> - <signal name="notify::visible-child-name" handler="on_child_visible" swapped="no"/> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> -</interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -84,11 +84,11 @@ popover#EmoticonPopover { padding: 5px; background-color: @theme_unfocused_base_ #FeaturesInfoGrid > list > row.activatable:active { box-shadow: none; } /* SettingsBox */ -#SettingsBox > row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } -#SettingsBox > row:last-child { border-bottom: 0px} -#SettingsBox > row.activatable:active { box-shadow: none; } -#SettingsBox > row { padding: 10px 20px 10px 10px; } -#SettingsBox > row:not(.activatable) label { color: @insensitive_fg_color } +.settings-box > row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } +.settings-box > row:last-child { border-bottom: 0px} +.settings-box > row.activatable:active { box-shadow: none; } +.settings-box > row { padding: 10px 20px 10px 10px; } +.settings-box > row:not(.activatable) label { color: @insensitive_fg_color } /* GenericSetting */ #SubDescription { color: @insensitive_fg_color; font-size: small;} @@ -119,13 +119,15 @@ list.settings > row > box { .PreferencesStack { background-color: @theme_bg_color; } /* Accounts Window */ -#AccountsWindow > box > stack { padding:30px 30px 30px 30px;} -#AccountsWindow scrolledwindow {border: none;} -#AccountsWindow stack list {border: 1px solid; border-color: @borders;} - -#AccountsWindow > box > box { border-right: 1px solid; border-color: @borders; } - -.account-list > row { padding: 20px 20px 20px 10px; } +.accounts-menu { border-right: 1px solid; border-color: @borders;} +.accounts-settings-border {border: 1px solid; border-color: @borders;} +.accounts-settings stack > box { margin:30px; } +.accounts-label-row { + padding-top: 10px; + padding-bottom: 10px; + font-size: 18px; + font-weight: bold; + color: @insensitive_fg_color;} /* StartChatListBox */ #StartChatListBox > row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } @@ -214,6 +216,7 @@ list.settings > row > box { .status-away { color: #ff8533;} .status-dnd { color: #e62e00;} .status-online { color: #66bf10;} +.insensitive-fg-color {color: @insensitive_fg_color;} /* Padding/Margins */ .margin-top6 { margin-top: 6px; } ===================================== gajim/gtk/accounts.py ===================================== @@ -12,16 +12,20 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from functools import partial +import sys +import locale +import logging +from collections import defaultdict from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib +from gi.repository import Pango +from gi.repository import GObject from gajim.common import app from gajim.common import passwords from gajim.common import helpers -from gajim.common import ged from gajim.common.i18n import _ from gajim.common.connection import Connection from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf @@ -37,13 +41,15 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog -from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_builder from gajim.gtk.const import Setting from gajim.gtk.const import SettingKind from gajim.gtk.const import SettingType +log = logging.getLogger('gajim.gtk.accounts') + + class AccountsWindow(Gtk.ApplicationWindow): def __init__(self): Gtk.ApplicationWindow.__init__(self) @@ -52,101 +58,62 @@ class AccountsWindow(Gtk.ApplicationWindow): self.set_show_menubar(False) self.set_name('AccountsWindow') self.set_default_size(700, 550) - self.set_resizable(False) + self.set_resizable(True) self.set_title(_('Accounts')) - self.need_relogin = {} - - self._ui = get_builder('accounts_window.ui') + self._need_relogin = {} + self._accounts = {} - self._ui.account_list.add(Preferences(self)) - account_item = AddAccount() - self._ui.account_list.add(account_item) - account_item.set_activatable() + self._menu = AccountMenu() + self._settings = Settings() - accounts = app.config.get_per('accounts') - accounts.sort() - for account in accounts: - self.need_relogin[account] = self.get_relogin_settings(account) - account_item = Account(account, self) - self._ui.account_list.add(account_item) - account_item.set_activatable() + box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) + box.add(self._menu) + box.add(self._settings) + self.add(box) - self.add(self._ui.box) - self._ui.connect_signals(self) + for account in app.get_accounts_sorted(): + self.add_account(account, inital=True) - self.connect('destroy', self.on_destroy) - self.connect('key-press-event', self.on_key_press) + self._menu.connect('menu-activated', self._on_menu_activated) + self.connect('destroy', self._on_destroy) + self.connect('key-press-event', self._on_key_press) - self._activate_preferences_page() self.show_all() - app.ged.register_event_handler( - 'our-show', ged.GUI2, self._nec_our_status) - - @property - def stack(self): - return self._ui.stack - - def _nec_our_status(self, event): - self.update_accounts() - - def _activate_preferences_page(self): - row = self._ui.account_list.get_row_at_index(0) - self._ui.account_list.select_row(row) - self._ui.account_list.emit('row-activated', row) + def _on_menu_activated(self, _listbox, account, name): + if name == 'back': + self._settings.set_page('add-account') + self._check_relogin() + elif name == 'remove': + self.on_remove_account(account) + else: + self._settings.set_page(name) - def on_key_press(self, widget, event): + def _on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.destroy() - def on_destroy(self, *args): - self.check_relogin() - app.ged.remove_event_handler( - 'our-show', ged.GUI2, self._nec_our_status) + def _on_destroy(self, *args): + self._check_relogin() - def on_child_visible(self, stack, *args): - page = stack.get_visible_child_name() - if page is None: - return - if page == 'account': - self.check_relogin() - - def update_accounts(self): - for row in self._ui.account_list.get_children(): - row.get_child().update() - - @staticmethod - def on_row_activated(listbox, row): - row.get_child().on_row_activated() - - def remove_all_pages(self): - for page in self._ui.stack.get_children(): - self._ui.stack.remove(page) - - def set_page(self, page, name): - self.remove_all_pages() - self._ui.stack.add_named(page, name) - page.update() - page.show_all() - self._ui.stack.set_visible_child(page) + def update_account_label(self, account): + self._accounts[account].update_account_label() def update_proxy_list(self): - page = self._ui.stack.get_child_by_name('connection') - if page is None: - return - page.listbox.get_setting('proxy').update_values() + for account in self._accounts: + self._settings.update_proxy_list(account) - def check_relogin(self): - for account in self.need_relogin: - settings = self.get_relogin_settings(account) + def _check_relogin(self): + for account in self._need_relogin: + settings = self._get_relogin_settings(account) active = app.config.get_per('accounts', account, 'active') - if settings != self.need_relogin[account]: - self.need_relogin[account] = settings + if settings != self._need_relogin[account]: + self._need_relogin[account] = settings if active: - self.relog(account) + self._relog(account) break - def relog(self, account): + def _relog(self, account): if app.connections[account].connected == 0: return @@ -179,7 +146,7 @@ class AccountsWindow(Gtk.ApplicationWindow): on_response_yes=lambda *args: relog(account)) @staticmethod - def get_relogin_settings(account): + def _get_relogin_settings(account): if account == app.ZEROCONF_ACC_NAME: settings = ['zeroconf_first_name', 'zeroconf_last_name', 'zeroconf_jabber_id', 'zeroconf_email'] @@ -192,7 +159,7 @@ class AccountsWindow(Gtk.ApplicationWindow): values.append(app.config.get_per('accounts', account, setting)) return values - def on_remove_account(self, button, account): + def on_remove_account(self, account): if app.events.get_events(account): app.interface.raise_dialog('unread-events-on-remove-account') return @@ -234,27 +201,21 @@ class AccountsWindow(Gtk.ApplicationWindow): remove(account) def remove_account(self, account): - for row in self._ui.account_list.get_children(): - if row.get_child().account == account: - self._ui.account_list.remove(row) - del self.need_relogin[account] - break - self._activate_preferences_page() + del self._need_relogin[account] + self._accounts[account].remove() - def add_account(self, account): - account_item = Account(account, self) - self._ui.account_list.add(account_item) - account_item.set_activatable() - self._ui.account_list.show_all() - self._ui.stack.show_all() - self.need_relogin[account] = self.get_relogin_settings(account) + def add_account(self, account, inital=False): + self._need_relogin[account] = self._get_relogin_settings(account) + self._accounts[account] = Account(account, self._menu, self._settings) + if not inital: + self._accounts[account].show() def select_account(self, account): - for row in self._ui.account_list.get_children(): - if row.get_child().account == account: - self._ui.account_list.select_row(row) - self._ui.account_list.emit('row-activated', row) - break + try: + self._accounts[account].select() + except KeyError: + log.warning('select_account() failed, account %s not found', + account) @staticmethod def enable_account(account): @@ -332,209 +293,350 @@ class AccountsWindow(Gtk.ApplicationWindow): gui_menu_builder.build_accounts_menu() -class AddAccount(Gtk.Box): +class Settings(Gtk.ScrolledWindow): def __init__(self): - Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL, - spacing=12) + Gtk.ScrolledWindow.__init__(self) + self.set_hexpand(True) + self.set_vexpand(True) + self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) + self._stack = Gtk.Stack() + self._stack.set_transition_type(Gtk.StackTransitionType.CROSSFADE) + self._stack.add_named(AddNewAccountPage(), 'add-account') + self.get_style_context().add_class('accounts-settings') + + self.add(self._stack) + self._page_signal_ids = {} + self._pages = defaultdict(list) + + def add_page(self, page): + self._pages[page.account].append(page) + self._stack.add_named(page, '%s-%s' % (page.account, page.name)) + self._page_signal_ids[page] = page.connect_signal(self._stack) + + def set_page(self, name): + self._stack.set_visible_child_name(name) - self.account = None + def remove_account(self, account): + for page in self._pages[account]: + signal_id = self._page_signal_ids[page] + del self._page_signal_ids[page] + self._stack.disconnect(signal_id) + self._stack.remove(page) + page.destroy() + del self._pages[account] - self.label = Gtk.Label(label=_('Add Account…')) - self.label.set_halign(Gtk.Align.START) - self.label.set_hexpand(True) + def update_proxy_list(self, account): + for page in self._pages[account]: + if page.name != 'connection': + continue + page.listbox.get_setting('proxy').update_values() - self.image = Gtk.Image.new_from_icon_name( - 'list-add-symbolic', Gtk.IconSize.MENU) - self.add(self.image) - self.add(self.label) +class AccountMenu(Gtk.Box): - def set_activatable(self): - self.get_parent().set_selectable(False) + __gsignals__ = { + 'menu-activated': (GObject.SignalFlags.RUN_FIRST, None, (str, str)), + } - def on_row_activated(self): - app.app.activate_action('add-account') + def __init__(self): + Gtk.Box.__init__(self) + self.set_hexpand(False) + self.set_size_request(160, -1) - def update(self): - pass + self.get_style_context().add_class('accounts-menu') + self._stack = Gtk.Stack() + self._stack.set_transition_type(Gtk.StackTransitionType.SLIDE_LEFT) -class Preferences(Gtk.Box): - def __init__(self, parent): - Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL, - spacing=12) + self._accounts_listbox = Gtk.ListBox() + self._accounts_listbox.set_sort_func(self._sort_func) + self._accounts_listbox.get_style_context().add_class('settings-box') + self._accounts_listbox.connect('row-activated', + self._on_account_row_activated) - self.settings = PreferencesPage() - self.parent = parent - self.account = None + scrolled = Gtk.ScrolledWindow() + scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) + scrolled.add(self._accounts_listbox) + self._stack.add_named(scrolled, 'accounts') + self.add(self._stack) - self.label = Gtk.Label(label=_('Preferences')) - self.label.set_halign(Gtk.Align.START) - self.label.set_hexpand(True) + @staticmethod + def _sort_func(row1, row2): + if row1.label == 'Local': + return -1 + return locale.strcoll(row1.label.lower(), row2.label.lower()) + + def add_account(self, row): + self._accounts_listbox.add(row) + sub_menu = AccountSubMenu(row.account) + self._stack.add_named(sub_menu, '%s-menu' % row.account) + + sub_menu.connect('row-activated', self._on_sub_menu_row_activated) + + def remove_account(self, row): + if self._stack.get_visible_child_name() != 'accounts': + # activate 'back' button + self._stack.get_visible_child().get_row_at_index(1).emit('activate') + self._accounts_listbox.remove(row) + sub_menu = self._stack.get_child_by_name('%s-menu' % row.account) + self._stack.remove(sub_menu) + row.destroy() + sub_menu.destroy() + + def _on_account_row_activated(self, _listbox, row): + self._stack.set_visible_child_name('%s-menu' % row.account) + self._stack.get_visible_child().get_row_at_index(2).emit('activate') + + def _on_sub_menu_row_activated(self, listbox, row): + if row.name == 'back': + self._stack.set_visible_child_full( + 'accounts', Gtk.StackTransitionType.OVER_RIGHT) + + if row.name in ('back', 'remove'): + self.emit('menu-activated', listbox.account, row.name) + + else: + self.emit('menu-activated', + listbox.account, + '%s-%s' % (listbox.account, row.name)) - self.image = Gtk.Image.new_from_icon_name( - 'system-run-symbolic', Gtk.IconSize.MENU) + def update_account_label(self, account): + self._accounts_listbox.invalidate_sort() + sub_menu = self._stack.get_child_by_name('%s-menu' % account) + sub_menu.update() - self.add(self.image) - self.add(self.label) - def set_activatable(self): - pass +class AccountSubMenu(Gtk.ListBox): + + __gsignals__ = { + 'update': (GObject.SignalFlags.RUN_FIRST, None, (str,)) + } + + def __init__(self, account): + Gtk.ListBox.__init__(self) + self.set_vexpand(True) + self.set_hexpand(True) + self.get_style_context().add_class('settings-box') - def on_row_activated(self): - self.settings.update_states() - self.parent.set_page(self.settings, 'pref') + self._account = account + + self.add(AccountLabelMenuItem(self, self._account)) + self.add(BackMenuItem()) + self.add(PageMenuItem('general', _('General'))) + if account != 'Local': + self.add(PageMenuItem('privacy', _('Privacy'))) + self.add(PageMenuItem('connection', _('Connection'))) + self.add(RemoveMenuItem()) + + @property + def account(self): + return self._account def update(self): - pass + self.emit('update', self._account) -class Account(Gtk.Box): - def __init__(self, account, parent): - Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL, - spacing=12) - self.account = account - if account == app.ZEROCONF_ACC_NAME: - self.settings = ZeroConfPage(account, parent) - else: - self.settings = AccountPage(account, parent) - self.parent = parent +class MenuItem(Gtk.ListBoxRow): + def __init__(self, name): + Gtk.ListBoxRow.__init__(self) + self._name = name + self._box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, + spacing=12) + self._label = Gtk.Label() - self.label = Gtk.Label(label=app.get_account_label(account)) - self.label.set_halign(Gtk.Align.START) - self.label.set_hexpand(True) + self.add(self._box) - self.image = Gtk.Image() - self._update_image() + @property + def name(self): + return self._name - self.add(self.image) - self.add(self.label) - def set_activatable(self): - if self.account == app.ZEROCONF_ACC_NAME: - zeroconf = app.is_installed('ZEROCONF') - self.get_parent().set_activatable(zeroconf) - self.get_parent().set_sensitive(zeroconf) - if not zeroconf: - self.get_parent().set_tooltip_text( - _('Please check if Avahi or Bonjour is installed.')) +class RemoveMenuItem(MenuItem): + def __init__(self): + super().__init__('remove') + self._label.set_text(_('Remove')) + image = Gtk.Image.new_from_icon_name('user-trash-symbolic', + Gtk.IconSize.MENU) - def on_row_activated(self): - self.settings.update_states() - self.parent.set_page(self.settings, 'account') + self.set_selectable(False) + image.get_style_context().add_class('error-color') - def update(self): - self.label.set_text(app.get_account_label(self.account)) - self._update_image() + self._box.add(image) + self._box.add(self._label) - def _update_image(self): - show = helpers.get_current_show(self.account) - icon = get_icon_name(show) - self.image.set_from_icon_name(icon, Gtk.IconSize.MENU) +class AccountLabelMenuItem(MenuItem): + def __init__(self, parent, account): + super().__init__('account-label') + self._update_account_label(parent, account) -class GenericSettingPage(Gtk.Box): - def __init__(self, account, parent, settings): - Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) - self.account = account - self.parent = parent + self.set_selectable(False) + self.set_sensitive(False) + self.set_activatable(False) - button = Gtk.Button.new_from_icon_name( - 'go-previous-symbolic', Gtk.IconSize.MENU) - button.set_halign(Gtk.Align.START) - button.connect('clicked', self._on_back_button) - if not isinstance(self, (AccountPage, PreferencesPage, ZeroConfPage)): - self.pack_start(button, False, True, 0) + image = Gtk.Image.new_from_icon_name('avatar-default-symbolic', + Gtk.IconSize.MENU) + image.get_style_context().add_class('insensitive-fg-color') - self.listbox = SettingsBox(account) - self.listbox.set_selection_mode(Gtk.SelectionMode.NONE) - self.listbox.set_vexpand(False) - self.listbox.set_valign(Gtk.Align.END) + self._label.get_style_context().add_class('accounts-label-row') + self._label.set_ellipsize(Pango.EllipsizeMode.END) + self._label.set_xalign(0) - for setting in settings: - self.listbox.add_setting(setting) - self.listbox.update_states() + self._box.add(image) + self._box.add(self._label) - self.pack_end(self.listbox, True, True, 0) + parent.connect('update', self._update_account_label) - self.listbox.connect('row-activated', self.on_row_activated) + def _update_account_label(self, _listbox, account): + account_label = app.get_account_label(account) + self._label.set_text(account_label) - def _on_back_button(self, *args): - account_window = self.get_toplevel() - child = account_window.stack.get_visible_child() - account_window.remove_all_pages() - account_window.stack.add_named(child.parent, 'account') - account_window.stack.set_visible_child_name('account') - def update_states(self): - self.listbox.update_states() +class BackMenuItem(MenuItem): + def __init__(self): + super().__init__('back') + self.set_selectable(False) - def on_row_activated(self, listbox, row): - row.on_row_activated() + self._label.set_text(_('Back')) - def set_entry_text(self, toggle, update=False): - account_label = app.get_account_label(self.account) - if update: - self.entry.set_text(account_label) - return - if toggle.get_active(): - self.entry.set_sensitive(True) - self.entry.grab_focus() + image = Gtk.Image.new_from_icon_name('go-previous-symbolic', + Gtk.IconSize.MENU) + image.get_style_context().add_class('insensitive-fg-color') + + self._box.add(image) + self._box.add(self._label) + + +class PageMenuItem(MenuItem): + def __init__(self, name, label): + super().__init__(name) + + if name == 'general': + icon = 'preferences-system-symbolic' + elif name == 'privacy': + icon = 'preferences-system-privacy-symbolic' + elif name == 'connection': + icon = 'preferences-system-network-symbolic' else: - self.entry.set_sensitive(False) - value = self.entry.get_text() - if not value: - value = account_label - app.config.set_per('accounts', self.account, - 'account_label', value or self.account) - if app.config.get_per('accounts', self.account, 'active'): - app.interface.roster.draw_account(self.account) - gui_menu_builder.build_accounts_menu() + icon = 'dialog-error-symbolic' - def update(self): - pass + image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) + self._label.set_text(label) + + self._box.add(image) + self._box.add(self._label) + + +class Account: + def __init__(self, account, menu, settings): + self._account = account + self._menu = menu + self._settings = settings + + if account == app.ZEROCONF_ACC_NAME: + self._settings.add_page(ZeroConfPage(account)) + else: + self._settings.add_page(GeneralPage(account)) + self._settings.add_page(ConnectionPage(account)) + self._settings.add_page(PrivacyPage(account)) + + self._account_row = AccountRow(account) + self._menu.add_account(self._account_row) + + def select(self): + self._account_row.emit('activate') + + def show(self): + self._menu.show_all() + self._settings.show_all() + self.select() + + def remove(self): + self._menu.remove_account(self._account_row) + self._settings.remove_account(self._account) + + def update_account_label(self): + self._account_row.update_account_label() + self._menu.update_account_label(self._account) + + @property + def menu(self): + return self._menu - def set_page(self, settings, name): - settings.update_states() - self.get_toplevel().set_page(settings, name) + @property + def account(self): + return self._account + + @property + def settings(self): + return self._account + + +class AccountRow(Gtk.ListBoxRow): + def __init__(self, account): + Gtk.ListBoxRow.__init__(self) + self.set_selectable(False) + + box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=12) + + self._account = account + + self._label = Gtk.Label(label=app.get_account_label(account)) + self._label.set_halign(Gtk.Align.START) + self._label.set_hexpand(True) + self._label.set_ellipsize(Pango.EllipsizeMode.END) + self._label.set_xalign(0) + self._label.set_width_chars(18) + + next_icon = Gtk.Image.new_from_icon_name('go-next-symbolic', + Gtk.IconSize.MENU) + next_icon.get_style_context().add_class('insensitive-fg-color') - def _add_top_buttons(self, parent): - # This adds the Account enable switch and the back button - box = Gtk.Box() - box.set_hexpand(True) - box.set_halign(Gtk.Align.FILL) switch = Gtk.Switch() - switch.set_active(app.config.get_per('accounts', self.account, 'active')) + switch.set_active( + app.config.get_per('accounts', self._account, 'active')) switch.set_vexpand(False) - switch.set_valign(Gtk.Align.CENTER) - switch.set_halign(Gtk.Align.END) - if self.account == app.ZEROCONF_ACC_NAME and not app.is_installed('ZEROCONF'): - switch.set_sensitive(False) + + if (self._account == app.ZEROCONF_ACC_NAME and + not app.is_installed('ZEROCONF')): switch.set_active(False) + self.set_activatable(False) + self.set_sensitive(False) + if sys.platform in ('win32', 'darwin'): + tooltip = _('Please check if Bonjour is installed.') + else: + tooltip = _('Please check if Avahi is installed.') + self.set_tooltip_text(tooltip) - switch.connect('state-set', self._on_enable_switch, self.account) - box.pack_start(switch, False, False, 0) - if self.account != app.ZEROCONF_ACC_NAME: - button = Gtk.Button(label=_('Remove')) - button.connect( - 'clicked', parent.on_remove_account, self.account) - button.get_style_context().add_class('destructive-action') - button.set_halign(Gtk.Align.END) - switch.set_vexpand(False) - box.pack_end(button, False, False, 0) - self.pack_start(box, True, True, 0) + switch.connect('state-set', self._on_enable_switch, self._account) + + box.add(switch) + box.add(self._label) + box.add(next_icon) + self.add(box) + + @property + def account(self): + return self._account + + @property + def label(self): + return self._label.get_text() + + def update_account_label(self): + self._label.set_text(app.get_account_label(self._account)) def _on_enable_switch(self, switch, state, account): def _disable(): app.connections[account].change_status('offline', 'offline') app.connections[account].disconnect(reconnect=False) - self.parent.disable_account(account) + self.get_toplevel().disable_account(account) app.config.set_per('accounts', account, 'active', False) switch.set_state(state) old_state = app.config.get_per('accounts', account, 'active') if old_state == state: - return + return Gdk.EVENT_PROPAGATE if (account in app.connections and app.connections[account].connected > 0): @@ -549,38 +651,89 @@ class GenericSettingPage(Gtk.Box): DialogButton.make('Remove', text=_('Disable Account'), callback=_disable)], - transient_for=self.parent).show() + transient_for=self.get_toplevel()).show() return Gdk.EVENT_STOP if state: - self.parent.enable_account(account) + self.get_toplevel().enable_account(account) else: - self.parent.disable_account(account) + self.get_toplevel().disable_account(account) app.config.set_per('accounts', account, 'active', state) + return Gdk.EVENT_PROPAGATE + -class PreferencesPage(GenericSettingPage): +class AddNewAccountPage(Gtk.Box): def __init__(self): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self.set_vexpand(True) + self.set_hexpand(True) + button = Gtk.Button(label='Add Account') + button.get_style_context().add_class('suggested-action') + button.set_action_name('app.add-account') + button.set_halign(Gtk.Align.CENTER) + button.set_valign(Gtk.Align.CENTER) + self.add(button) - settings = [ - Setting(SettingKind.SWITCH, _('Merge Accounts'), - SettingType.ACTION, 'merge'), - ] - GenericSettingPage.__init__(self, None, None, settings) +class GenericSettingPage(Gtk.Box): + def __init__(self, account, settings): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) + self.set_valign(Gtk.Align.START) + self.set_vexpand(True) + self.account = account + + self.listbox = SettingsBox(account) + self.listbox.get_style_context().add_class('accounts-settings-border') + self.listbox.set_selection_mode(Gtk.SelectionMode.NONE) + self.listbox.set_vexpand(False) + self.listbox.set_valign(Gtk.Align.END) + + for setting in settings: + self.listbox.add_setting(setting) + self.listbox.update_states() + self.pack_end(self.listbox, True, True, 0) -class AccountPage(GenericSettingPage): - def __init__(self, account, parent=None): + self.listbox.connect('row-activated', self.on_row_activated) - general = partial( - self.set_page, GeneralPage(account, self), 'general') + def connect_signal(self, stack): + return stack.connect('notify::visible-child', + self._on_visible_child_changed) - connection = partial( - self.set_page, ConnectionPage(account, self), 'connection') + def _on_visible_child_changed(self, stack, param): + if self == stack.get_visible_child(): + self.listbox.update_states() - privacy = partial( - self.set_page, PrivacyPage(account, self), 'privacy') + @staticmethod + def on_row_activated(_listbox, row): + row.on_row_activated() + + def set_entry_text(self, toggle, update=False): + account_label = app.get_account_label(self.account) + if update: + self.entry.set_text(account_label) + return + if toggle.get_active(): + self.entry.set_sensitive(True) + self.entry.grab_focus() + else: + self.entry.set_sensitive(False) + value = self.entry.get_text() + if not value: + value = account_label + app.config.set_per('accounts', self.account, + 'account_label', value or self.account) + if app.config.get_per('accounts', self.account, 'active'): + app.interface.roster.draw_account(self.account) + gui_menu_builder.build_accounts_menu() + + +class GeneralPage(GenericSettingPage): + + name = 'general' + + def __init__(self, account): settings = [ Setting(SettingKind.ENTRY, _('Label'), @@ -590,43 +743,21 @@ class AccountPage(GenericSettingPage): Setting(SettingKind.LOGIN, _('Login'), SettingType.DIALOG, props={'dialog': LoginDialog}), - Setting(SettingKind.ACTION, _('Profile'), SettingType.ACTION, - '-profile', props={'action_args': account}), - - Setting(SettingKind.CALLBACK, _('General'), - name='general', props={'callback': general}), - - Setting(SettingKind.CALLBACK, _('Privacy'), - name='privacy', props={'callback': privacy}), - - Setting(SettingKind.CALLBACK, _('Connection'), - name='connection', props={'callback': connection}), - - Setting(SettingKind.ACTION, _('Import Contacts'), SettingType.ACTION, - '-import-contacts', props={'action_args': account}), + Setting(SettingKind.ACTION, _('Import Contacts'), + SettingType.ACTION, '-import-contacts', + props={'account': account}), Setting(SettingKind.DIALOG, _('Client Certificate'), SettingType.DIALOG, props={'dialog': CertificateDialog}), - ] - - GenericSettingPage.__init__(self, account, parent, settings) - self._add_top_buttons(parent) - - def _on_account_name_change(self, account_name, *args): - self.parent.update_accounts() - - -class GeneralPage(GenericSettingPage): - def __init__(self, account, parent=None): - settings = [ Setting(SettingKind.SWITCH, _('Connect on startup'), SettingType.ACCOUNT_CONFIG, 'autoconnect'), Setting(SettingKind.SWITCH, _('Reconnect when connection is lost'), SettingType.ACCOUNT_CONFIG, 'autoreconnect'), - Setting(SettingKind.SWITCH, _('Save conversations for all contacts'), + Setting(SettingKind.SWITCH, + _('Save conversations for all contacts'), SettingType.ACCOUNT_CONFIG, 'no_log_for', desc=_('Store conversations on the harddrive')), @@ -647,12 +778,18 @@ class GeneralPage(GenericSettingPage): Setting(SettingKind.SWITCH, _('Use file transfer proxies'), SettingType.ACCOUNT_CONFIG, 'use_ft_proxies'), - ] - GenericSettingPage.__init__(self, account, parent, settings) + ] + GenericSettingPage.__init__(self, account, settings) + + def _on_account_name_change(self, *args): + self.get_toplevel().update_account_label(self.account) class PrivacyPage(GenericSettingPage): - def __init__(self, account, parent=None): + + name = 'privacy' + + def __init__(self, account): settings = [ Setting(SettingKind.SWITCH, _('Idle Time'), @@ -675,11 +812,14 @@ class PrivacyPage(GenericSettingPage): 'Roster')), ] - GenericSettingPage.__init__(self, account, parent, settings) + GenericSettingPage.__init__(self, account, settings) class ConnectionPage(GenericSettingPage): - def __init__(self, account, parent=None): + + name = 'connection' + + def __init__(self, account): settings = [ Setting(SettingKind.SWITCH, 'HTTP_PROXY', @@ -707,21 +847,26 @@ class ConnectionPage(GenericSettingPage): SettingType.DIALOG, props={'dialog': PriorityDialog}), ] - GenericSettingPage.__init__(self, account, parent, settings) + GenericSettingPage.__init__(self, account, settings) class ZeroConfPage(GenericSettingPage): - def __init__(self, account, parent=None): + + name = 'general' + + def __init__(self, account): settings = [ Setting(SettingKind.DIALOG, _('Profile'), - SettingType.DIALOG, props={'dialog': ZeroconfProfileDialog}), + SettingType.DIALOG, + props={'dialog': ZeroconfProfileDialog}), Setting(SettingKind.SWITCH, _('Connect on startup'), SettingType.ACCOUNT_CONFIG, 'autoconnect', desc=_('Use environment variable')), - Setting(SettingKind.SWITCH, _('Save conversations for all contacts'), + Setting(SettingKind.SWITCH, + _('Save conversations for all contacts'), SettingType.ACCOUNT_CONFIG, 'no_log_for', desc=_('Store conversations on the harddrive')), @@ -730,8 +875,7 @@ class ZeroConfPage(GenericSettingPage): desc=_('Synchronize the status of all accounts')), ] - GenericSettingPage.__init__(self, account, parent, settings) - self._add_top_buttons(None) + GenericSettingPage.__init__(self, account, settings) class ZeroconfProfileDialog(SettingsDialog): @@ -752,7 +896,7 @@ class ZeroconfProfileDialog(SettingsDialog): ] SettingsDialog.__init__(self, parent, _('Profile'), - Gtk.DialogFlags.MODAL, settings, account) + Gtk.DialogFlags.MODAL, settings, account) class PriorityDialog(SettingsDialog): @@ -775,7 +919,7 @@ class PriorityDialog(SettingsDialog): ] SettingsDialog.__init__(self, parent, _('Priority'), - Gtk.DialogFlags.MODAL, settings, account) + Gtk.DialogFlags.MODAL, settings, account) self.connect('destroy', self.on_destroy) @@ -793,7 +937,8 @@ class CutstomHostnameDialog(SettingsDialog): settings = [ Setting(SettingKind.SWITCH, _('Enable'), - SettingType.ACCOUNT_CONFIG, 'use_custom_host', name='custom'), + SettingType.ACCOUNT_CONFIG, + 'use_custom_host', name='custom'), Setting(SettingKind.ENTRY, _('Hostname'), SettingType.ACCOUNT_CONFIG, 'custom_host', @@ -805,13 +950,13 @@ class CutstomHostnameDialog(SettingsDialog): ] SettingsDialog.__init__(self, parent, _('Connection Settings'), - Gtk.DialogFlags.MODAL, settings, account) + Gtk.DialogFlags.MODAL, settings, account) class CertificateDialog(SettingsDialog): def __init__(self, account, parent): - Settings = [ + settings = [ Setting(SettingKind.FILECHOOSER, _('Client Certificate'), SettingType.ACCOUNT_CONFIG, 'client_cert', props={'filefilter': (_('PKCS12 Files'), '*.p12')}), @@ -821,7 +966,7 @@ class CertificateDialog(SettingsDialog): ] SettingsDialog.__init__(self, parent, _('Certificate Settings'), - Gtk.DialogFlags.MODAL, Settings, account) + Gtk.DialogFlags.MODAL, settings, account) class LoginDialog(SettingsDialog): @@ -841,11 +986,11 @@ class LoginDialog(SettingsDialog): ] SettingsDialog.__init__(self, parent, _('Login Settings'), - Gtk.DialogFlags.MODAL, settings, account) + Gtk.DialogFlags.MODAL, settings, account) self.connect('destroy', self.on_destroy) - def on_password_change(self, new_password, data): + def on_password_change(self, new_password, _data): passwords.save_password(self.account, new_password) def on_destroy(self, *args): @@ -860,11 +1005,11 @@ class RemoveAccountWindow: then remove the account given """ - def on_remove_account_window_destroy(self, widget): + def on_remove_account_window_destroy(self, _widget): if self.account in app.interface.instances: del app.interface.instances[self.account]['remove_account'] - def on_cancel_button_clicked(self, widget): + def on_cancel_button_clicked(self, _widget): self._ui.remove_account_window.destroy() def __init__(self, account): @@ -872,43 +1017,45 @@ class RemoveAccountWindow: self._ui = get_builder('remove_account_window.ui') active_window = app.app.get_active_window() self._ui.remove_account_window.set_transient_for(active_window) - self._ui.remove_account_window.set_title(_('Removing account %s') % self.account) + self._ui.remove_account_window.set_title( + _('Removing account %s') % self.account) self._ui.connect_signals(self) self._ui.remove_account_window.show_all() - def on_remove_button_clicked(self, widget): + def on_remove_button_clicked(self, _widget): def remove(): if self.account in app.connections and \ app.connections[self.account].connected and \ not self._ui.remove_and_unregister_radiobutton.get_active(): - # change status to offline only if we will not remove this JID from - # server + # change status to offline only if we will not + # remove this JID from server app.connections[self.account].change_status('offline', 'offline') if self._ui.remove_and_unregister_radiobutton.get_active(): if not self.account in app.connections: ErrorDialog( _('Account is disabled'), _('To unregister from a server, the account must be ' - 'enabled.'), + 'enabled.'), transient_for=self._ui.remove_account_window) return if not app.connections[self.account].password: - def on_ok(passphrase, checked): + def on_ok(passphrase, _checked): if passphrase == -1: - # We don't remove account cause we canceled pw window + # We don't remove account cause we + # canceled pw window return app.connections[self.account].password = passphrase app.connections[self.account].unregister_account( - self._on_remove_success) + self._on_remove_success) PassphraseDialog( - _('Password required'), - _('Enter your password for account %s') % self.account, - _('Save password'), ok_handler=on_ok, - transient_for=self._ui.remove_account_window) + _('Password required'), + _('Enter your password for account %s') % self.account, + _('Save password'), ok_handler=on_ok, + transient_for=self._ui.remove_account_window) return app.connections[self.account].unregister_account( - self._on_remove_success) + self._on_remove_success) else: self._on_remove_success(True) @@ -931,12 +1078,12 @@ class RemoveAccountWindow: # Error message is send by connect_and_auth() if not res: ConfirmationDialogDoubleRadio( - _('Connection to server %s failed') % self.account, - _('What would you like to do?'), - _('Remove only from Gajim'), - _('Don\'t remove anything. I\'ll try again later'), - on_response_ok=self.on_remove_response_ok, is_modal=False, - transient_for=self._ui.remove_account_window) + _('Connection to server %s failed') % self.account, + _('What would you like to do?'), + _('Remove only from Gajim'), + _('Don\'t remove anything. I\'ll try again later'), + on_response_ok=self.on_remove_response_ok, is_modal=False, + transient_for=self._ui.remove_account_window) return # Close all opened windows app.interface.roster.close_all(self.account, force=True) ===================================== gajim/gtk/settings.py ===================================== @@ -81,7 +81,7 @@ class SettingsDialog(Gtk.ApplicationWindow): class SettingsBox(Gtk.ListBox): def __init__(self, account, extend=None): Gtk.ListBox.__init__(self) - self.set_name('SettingsBox') + self.get_style_context().add_class('settings-box') self.account = account self.named_settings = {} @@ -179,7 +179,7 @@ class GenericSetting(Gtk.ListBoxRow): description.set_xalign(0) description.set_line_wrap(True) description.set_line_wrap_mode(Pango.WrapMode.WORD) - description.set_max_width_chars(40) + description.set_max_width_chars(50) description_box.add(description) self._grid.add(description_box) @@ -474,10 +474,11 @@ class ActionSetting(GenericSetting): "setting-value": (str, 'Dummy', '', '', GObject.ParamFlags.READWRITE),} - def __init__(self, *args, action_args): + def __init__(self, *args, account): GenericSetting.__init__(self, *args) - self.action = gtkgui_helpers.get_action(self.setting_value) - self.variant = GLib.Variant.new_string(action_args) + action_name = '%s%s' % (account, self.value) + self.action = gtkgui_helpers.get_action(action_name) + self.variant = GLib.Variant.new_string(account) self.on_enable() self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b306a7e05fa91369c088e8a81575b82796… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b306a7e05fa91369c088e8a81575b82796… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix undefined var error
by Philipp Hörist 20 Apr '19

20 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8c03d372 by Philipp Hörist at 2019-04-20T18:18:54Z Fix undefined var error - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -392,7 +392,7 @@ class GroupchatControl(ChatControlBase): default_muc_chatstate = app.config.get('send_chatstate_muc_default') chatstate = app.config.get_per( - 'rooms', self.contact.jid, 'send_chatstate', default_chatstate) + 'rooms', self.contact.jid, 'send_chatstate', default_muc_chatstate) act = Gio.SimpleAction.new_stateful( 'send-chatstate-' + self.control_id, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8c03d3721790cae4c12b15bbeccc01089a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8c03d3721790cae4c12b15bbeccc01089a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add default chatstate setting
by Philipp Hörist 20 Apr '19

20 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 657050ad by Philipp Hörist at 2019-04-20T17:54:48Z Add default chatstate setting - - - - - 6 changed files: - gajim/chat_control.py - gajim/common/config.py - gajim/common/modules/chatstates.py - gajim/groupchat_control.py - gajim/gtk/const.py - gajim/gtk/settings.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -289,8 +289,9 @@ class ChatControl(ChatControlBase): self.video_action.connect('change-state', self._on_video) self.parent_win.window.add_action(self.video_action) + default_chatstate = app.config.get('send_chatstate_default') chatstate = app.config.get_per( - 'contacts', self.contact.jid, 'send_chatstate', 'composing_only') + 'contacts', self.contact.jid, 'send_chatstate', default_chatstate) act = Gio.SimpleAction.new_stateful( 'send-chatstate-' + self.control_id, ===================================== gajim/common/config.py ===================================== @@ -292,6 +292,8 @@ class Config: 'show_chatstate_in_roster': [opt_bool, True, _('If the contact row is colored according to the current chatstate of the contact')], 'show_chatstate_in_tabs': [opt_bool, True, _('If the tab is colored according to the current chatstate of the contact')], 'show_chatstate_in_banner': [opt_bool, True, _('Shows a text in the banner that describes the current chatstate of the contact')], + 'send_chatstate_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled')], + 'send_chatstate_muc_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: all, composing_only, disabled')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { @@ -617,6 +619,20 @@ class Config: del opt[1][name][subname] self._timeout_save() + def del_all_per(self, typename, subname): + # Deletes all settings per typename + # Example: Delete `account_label` for all accounts + if typename not in self.__options_per_key: + raise ValueError('typename %s does not exist' % typename) + + opt = self.__options_per_key[typename] + for name in opt[1]: + try: + del opt[1][name][subname] + except KeyError: + pass + self._timeout_save() + def set_per(self, optname, key, subname, value): # per_group_of_option if optname not in self.__options_per_key: return ===================================== gajim/common/modules/chatstates.py ===================================== @@ -356,10 +356,12 @@ class Chatstate(BaseModule): @staticmethod def _get_chatstate_setting(contact): if contact.is_groupchat(): + default = app.config.get('send_chatstate_muc_default') return app.config.get_per( - 'rooms', contact.jid, 'send_chatstate', 'composing_only') + 'rooms', contact.jid, 'send_chatstate', default) + default = app.config.get('send_chatstate_default') return app.config.get_per( - 'contacts', contact.jid, 'send_chatstate', 'composing_only') + 'contacts', contact.jid, 'send_chatstate', default) def remove_delay_timeout(self, contact): timeout = self._delay_timeout_ids.get(contact.jid) ===================================== gajim/groupchat_control.py ===================================== @@ -390,8 +390,9 @@ class GroupchatControl(ChatControlBase): act.connect('change-state', self._on_minimize_on_autojoin) self.parent_win.window.add_action(act) + default_muc_chatstate = app.config.get('send_chatstate_muc_default') chatstate = app.config.get_per( - 'rooms', self.contact.jid, 'send_chatstate', 'composing_only') + 'rooms', self.contact.jid, 'send_chatstate', default_chatstate) act = Gio.SimpleAction.new_stateful( 'send-chatstate-' + self.control_id, ===================================== gajim/gtk/const.py ===================================== @@ -56,6 +56,7 @@ class SettingKind(IntEnum): FILECHOOSER = 10 CHANGEPASSWORD = 11 COMBO = 12 + CHATSTATE_COMBO = 13 @unique ===================================== gajim/gtk/settings.py ===================================== @@ -99,6 +99,7 @@ class SettingsBox(Gtk.ListBox): SettingKind.HOSTNAME: CutstomHostnameSetting, SettingKind.CHANGEPASSWORD: ChangePasswordSetting, SettingKind.COMBO: ComboSetting, + SettingKind.CHATSTATE_COMBO: ChatstateComboSetting, } if extend is not None: @@ -535,6 +536,15 @@ class ComboSetting(GenericSetting): self.set_value(combo.get_active_id()) +class ChatstateComboSetting(ComboSetting): + def on_value_change(self, combo): + self.set_value(combo.get_active_id()) + if 'muc' in self.value: + app.config.del_all_per('rooms', 'send_chatstate') + else: + app.config.del_all_per('contacts', 'send_chatstate') + + class ProxyComboSetting(GenericSetting): __gproperties__ = { View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/657050ad52ba95859a60bd9c07c4178d51… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/657050ad52ba95859a60bd9c07c4178d51… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits