Commits July 2019

commits@gajim.org

1 participants
52 discussions

[Git][gajim/gajim][master] MUC: Add possibility to override default config
by Philipp Hörist 02 Jul '19

02 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ee22d83 by Philipp Hörist at 2019-07-02T19:53:32Z MUC: Add possibility to override default config - - - - - 3 changed files: - gajim/common/modules/muc.py - gajim/common/structs.py - gajim/gui_interface.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -130,11 +130,12 @@ class MUC(BaseModule): def get_mucs_with_state(self, states): return [muc for muc in self._muc_data.values() if muc.state in states] - def join(self, room_jid, nick, password, rejoin=False): + def join(self, room_jid, nick, password, rejoin=False, config=None): if not app.account_is_connected(self._account): return - self._muc_data[room_jid] = MUCData(room_jid, nick, password, rejoin) + self._muc_data[room_jid] = MUCData(room_jid, nick, + password, rejoin, config) self._con.get_module('Discovery').disco_muc( room_jid, partial(self._join, room_jid)) @@ -182,16 +183,19 @@ class MUC(BaseModule): return self._log.info('Configure room: %s', result.jid) - self._apply_config(result.form) + + muc = self._get_muc_data(result.jid) + self._apply_config(result.form, muc.config) self.set_config(result.jid, result.form, callback=self._on_config_result) @staticmethod def _apply_config(form, config=None): - if config is None: - config = get_default_muc_config() - for var, value in config.items(): + default_config = get_default_muc_config() + if config is not None: + default_config.update(config) + for var, value in default_config.items(): try: field = form[var] except KeyError: ===================================== gajim/common/structs.py ===================================== @@ -24,11 +24,12 @@ CapsIdentity = namedtuple('CapsIdentity', 'category type name lang') class MUCData: - def __init__(self, room_jid, nick, password, rejoin): + def __init__(self, room_jid, nick, password, rejoin, config=None): self._room_jid = room_jid self._nick = nick self._password = password self._rejoin = rejoin + self._config = config self._state = MUCJoinedState.NOT_JOINED @property @@ -62,3 +63,7 @@ class MUCData: @rejoin.setter def rejoin(self, value): self._rejoin = value + + @property + def config(self): + return self._config ===================================== gajim/gui_interface.py ===================================== @@ -1568,7 +1568,7 @@ class Interface: ################################################################################ def join_gc_room(self, account, room_jid, nick, password, minimize=False, - is_continued=False): + is_continued=False, config=None): """ Join the room immediately """ @@ -1628,7 +1628,7 @@ class Interface: # Connect app.connections[account].get_module('MUC').join( - room_jid, nick, password) + room_jid, nick, password, config=config) if password: app.gc_passwords[room_jid] = password View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ee22d832e73d71ff41d75f8a26881101b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ee22d832e73d71ff41d75f8a26881101b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove usage of convert_bytes
by Philipp Hörist 01 Jul '19

01 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5e20799d by Daniel Brötzmann at 2019-07-01T20:42:08Z Remove usage of convert_bytes - - - - - 6f8f3e81 by Daniel Brötzmann at 2019-07-01T20:42:08Z Remove convert_bytes method - - - - - 4 changed files: - gajim/chat_control.py - gajim/common/helpers.py - gajim/gtk/filetransfer.py - gajim/gtk/tooltips.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1468,11 +1468,17 @@ class ChatControl(ChatControlBase): """ Show an InfoBar on top of control """ + if app.config.get('use_kib_mib'): + units = GLib.FormatSizeFlags.IEC_UNITS + else: + units = GLib.FormatSizeFlags.DEFAULT + markup = '<b>%s</b>\n%s' % (_('File Transfer'), file_props.name) if file_props.desc: markup += '\n(%s)' % file_props.desc - markup += '\n%s: %s' % (_('Size'), helpers.convert_bytes( - file_props.size)) + markup += '\n%s: %s' % ( + _('Size'), + GLib.format_size_full(file_props.size, units)) b1 = Gtk.Button.new_with_mnemonic(_('_Accept')) b1.connect('clicked', self._on_accept_file_request, file_props) b2 = Gtk.Button.new_with_mnemonic(_('_Decline')) ===================================== gajim/common/helpers.py ===================================== @@ -576,44 +576,6 @@ def datetime_tuple(timestamp): tim = tim.timetuple() return tim -def convert_bytes(string_): - suffix = '' - # IEC standard says KiB = 1024 bytes KB = 1000 bytes - # but do we use the standard? - use_kib_mib = app.config.get('use_kib_mib') - align = 1024. - bytes_ = float(string_) - if bytes_ >= align: - bytes_ = round(bytes_/align, 1) - if bytes_ >= align: - bytes_ = round(bytes_/align, 1) - if bytes_ >= align: - bytes_ = round(bytes_/align, 1) - if use_kib_mib: - #GiB means gibibyte - suffix = _('%s GiB') - else: - #GB means gigabyte - suffix = _('%s GB') - else: - if use_kib_mib: - #MiB means mibibyte - suffix = _('%s MiB') - else: - #MB means megabyte - suffix = _('%s MB') - else: - if use_kib_mib: - #KiB means kibibyte - suffix = _('%s KiB') - else: - #KB means kilo bytes - suffix = _('%s KB') - else: - #B means bytes - suffix = _('%s B') - return suffix % str(bytes_) - def get_contact_dict_for_account(account): """ Create a dict of jid, nick -> contact with all contacts of account. ===================================== gajim/gtk/filetransfer.py ===================================== @@ -70,8 +70,8 @@ class FileTransfersWindow: def __init__(self): self.files_props = {'r': {}, 's': {}} self.height_diff = 0 - self._ui = get_builder('filetransfers.ui') + self._ui = get_builder('filetransfers.ui') self.window = self._ui.file_transfers_window show_notification = app.config.get('notify_on_file_complete') self._ui.notify_ft_complete.set_active(show_notification) @@ -142,6 +142,11 @@ class FileTransfersWindow: 'hash_error': 'network-error-symbolic', } + if app.config.get('use_kib_mib'): + self.units = GLib.FormatSizeFlags.IEC_UNITS + else: + self.units = GLib.FormatSizeFlags.DEFAULT + self._ui.transfers_list.get_selection().set_mode( Gtk.SelectionMode.SINGLE) self._ui.transfers_list.get_selection().connect( @@ -221,8 +226,8 @@ class FileTransfersWindow: else: file_name = file_props.name sectext = _('File name: %s') % GLib.markup_escape_text(file_name) - sectext += '\n' + _('Size: %s') % helpers.convert_bytes( - file_props.size) + sectext += '\n' + _('Size: %s') % GLib.format_size_full( + file_props.size, self.units) if file_props.type_ == 'r': jid = file_props.sender.split('/')[0] sender_name = app.contacts.get_first_contact_from_jid( @@ -456,8 +461,8 @@ class FileTransfersWindow: sectext = _('File: %s') % GLib.markup_escape_text( file_props.name) if file_props.size: - sectext += '\n' + _('Size: %s') % helpers.convert_bytes( - file_props.size) + sectext += '\n' + _('Size: %s') % GLib.format_size_full( + file_props.size, self.units) if file_props.mime_type: sectext += '\n' + _('Type: %s') % file_props.mime_type if file_props.desc: @@ -493,19 +498,19 @@ class FileTransfersWindow: elif status == 'ok': file_props.completed = True text = self._format_percent(100) - received_size = int(file_props.received_len) - full_size = file_props.size - text += helpers.convert_bytes(received_size) + '/' + \ - helpers.convert_bytes(full_size) + received_size = GLib.format_size_full( + int(file_props.received_len), self.units) + full_size = GLib.format_size_full(file_props.size, self.units) + text += received_size + '/' + full_size self.model.set(iter_, Column.PROGRESS, text) self.model.set(iter_, Column.PULSE, GLib.MAXINT32) elif status == 'computing': self.model.set(iter_, Column.PULSE, 1) text = _('Checking file…') + '\n' - received_size = int(file_props.received_len) - full_size = file_props.size - text += helpers.convert_bytes(received_size) + '/' + \ - helpers.convert_bytes(full_size) + received_size = GLib.format_size_full( + int(file_props.received_len), self.units) + full_size = GLib.format_size_full(file_props.size, self.units) + text += received_size + '/' + full_size self.model.set(iter_, Column.PROGRESS, text) def pulse(): @@ -517,10 +522,10 @@ class FileTransfersWindow: GLib.timeout_add(100, pulse) elif status == 'hash_error': text = _('File error') + '\n' - received_size = int(file_props.received_len) - full_size = file_props.size - text += helpers.convert_bytes(received_size) + '/' + \ - helpers.convert_bytes(full_size) + received_size = GLib.format_size_full( + int(file_props.received_len), self.units) + full_size = GLib.format_size_full(file_props.size, self.units) + text += received_size + '/' + full_size self.model.set(iter_, Column.PROGRESS, text) self.model.set(iter_, Column.PULSE, GLib.MAXINT32) self.model.set(iter_, Column.IMAGE, self.icons[status]) @@ -626,8 +631,8 @@ class FileTransfersWindow: if transfered_size == 0: text += '0' else: - text += helpers.convert_bytes(transfered_size) - text += '/' + helpers.convert_bytes(full_size) + text += GLib.format_size_full(transfered_size, self.units) + text += '/' + GLib.format_size_full(full_size, self.units) # Kb/s # remaining time @@ -647,11 +652,11 @@ class FileTransfersWindow: self.model.set(iter_, Column.PERCENT, int(percent)) text = self._format_time(eta) text += '\n' - # This should make the string Kb/s, - # where 'Kb' part is taken from %s. + # This should make the string KB/s, + # where 'KB' part is taken from %s. # Only the 's' after / (which means second) should be translated. text += _('(%(filesize_unit)s/s)') % { - 'filesize_unit': helpers.convert_bytes(speed)} + 'filesize_unit': GLib.format_size_full(speed, self.units)} self.model.set(iter_, Column.TIME, text) # try to guess what should be the status image ===================================== gajim/gtk/tooltips.py ===================================== @@ -535,6 +535,10 @@ class FileTransfersTooltip(): def __init__(self): self.sid = None self.widget = None + if app.config.get('use_kib_mib'): + self.units = GLib.FormatSizeFlags.IEC_UNITS + else: + self.units = GLib.FormatSizeFlags.DEFAULT def clear_tooltip(self): self.sid = None @@ -583,7 +587,7 @@ class FileTransfersTooltip(): if not transfered_len: transfered_len = 0 properties.append((Q_('?transfer status:Transferred: '), - helpers.convert_bytes(transfered_len))) + GLib.format_size_full(transfered_len, self.units))) status = self._get_current_status(file_props) properties.append((Q_('?transfer status:Status: '), status)) file_desc = file_props.desc or '' View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5ba5bc179bf9bbb25c10addedc6be12e3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5ba5bc179bf9bbb25c10addedc6be12e3… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2019