Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Accounts: Destroy all GroupchatControl on disable
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 542b70aa by Philipp Hörist at 2019-06-21T21:29:23Z Accounts: Destroy all GroupchatControl on disable - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -1937,7 +1937,10 @@ class Interface: self.roster.send_status(account, 'online', '') def disable_account(self, account): - self.roster.close_all(account) + self.roster.close_all(account, force=True) + for jid in self.minimized_controls[account]: + ctrl = self.minimized_controls[account][jid] + ctrl.shutdown() if account == app.ZEROCONF_ACC_NAME: app.connections[account].disable_account() app.connections[account].cleanup() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/542b70aa0c91a0c0dc11088b3a0081d225… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/542b70aa0c91a0c0dc11088b3a0081d225… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused imports
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3431320a by Philipp Hörist at 2019-06-21T20:36:55Z Remove unused imports - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -25,10 +25,7 @@ from gi.repository import GObject from gajim.common import app from gajim.common import passwords -from gajim.common import helpers from gajim.common.i18n import _ -from gajim.common.connection import Connection -from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf from gajim import gui_menu_builder View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3431320accc0600ede7c1393bf85048ed0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3431320accc0600ede7c1393bf85048ed0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move enable/disable account methods to interface
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1051da2e by Philipp Hörist at 2019-06-21T20:32:45Z Move enable/disable account methods to interface - - - - - 2 changed files: - gajim/gtk/accounts.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -219,81 +219,6 @@ class AccountsWindow(Gtk.ApplicationWindow): log.warning('select_account() failed, account %s not found', account) - @staticmethod - def enable_account(account): - if account == app.ZEROCONF_ACC_NAME: - app.connections[account] = ConnectionZeroconf(account) - else: - app.connections[account] = Connection(account) - - app.plugin_manager.register_modules_for_account( - app.connections[account]) - - # update variables - app.interface.instances[account] = { - 'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}, - 'online_dialog': {}, 'sub_request': {}} - app.interface.minimized_controls[account] = {} - app.connections[account].connected = 0 - app.groups[account] = {} - app.contacts.add_account(account) - app.gc_connected[account] = {} - app.automatic_rooms[account] = {} - app.newly_added[account] = [] - app.to_be_removed[account] = [] - if account == app.ZEROCONF_ACC_NAME: - app.nicks[account] = app.ZEROCONF_ACC_NAME - else: - app.nicks[account] = app.config.get_per( - 'accounts', account, 'name') - app.block_signed_in_notifications[account] = True - app.sleeper_state[account] = 'off' - app.last_message_time[account] = {} - app.status_before_autoaway[account] = '' - app.gajim_optional_features[account] = [] - app.caps_hash[account] = '' - helpers.update_optional_features(account) - # refresh roster - if len(app.connections) >= 2: - # Do not merge accounts if only one exists - app.interface.roster.regroup = app.config.get('mergeaccounts') - else: - app.interface.roster.regroup = False - app.interface.roster.setup_and_draw_roster() - gui_menu_builder.build_accounts_menu() - - @staticmethod - def disable_account(account): - app.interface.roster.close_all(account) - if account == app.ZEROCONF_ACC_NAME: - app.connections[account].disable_account() - app.connections[account].cleanup() - del app.connections[account] - del app.interface.instances[account] - del app.interface.minimized_controls[account] - del app.nicks[account] - del app.block_signed_in_notifications[account] - del app.groups[account] - app.contacts.remove_account(account) - del app.gc_connected[account] - del app.automatic_rooms[account] - del app.to_be_removed[account] - del app.newly_added[account] - del app.sleeper_state[account] - del app.last_message_time[account] - del app.status_before_autoaway[account] - del app.gajim_optional_features[account] - del app.caps_hash[account] - if len(app.connections) >= 2: - # Do not merge accounts if only one exists - app.interface.roster.regroup = app.config.get('mergeaccounts') - else: - app.interface.roster.regroup = False - app.config.set_per( - 'accounts', account, 'roster_version', '') - app.interface.roster.setup_and_draw_roster() - gui_menu_builder.build_accounts_menu() - class Settings(Gtk.ScrolledWindow): def __init__(self): @@ -632,7 +557,7 @@ class AccountRow(Gtk.ListBoxRow): def _disable(): app.connections[account].change_status('offline', 'offline') app.connections[account].disconnect(reconnect=False) - self.get_toplevel().disable_account(account) + app.interface.disable_account(account) app.config.set_per('accounts', account, 'active', False) switch.set_state(state) @@ -657,9 +582,9 @@ class AccountRow(Gtk.ListBoxRow): return Gdk.EVENT_STOP if state: - self.get_toplevel().enable_account(account) + app.interface.enable_account(account) else: - self.get_toplevel().disable_account(account) + app.interface.disable_account(account) app.config.set_per('accounts', account, 'active', state) return Gdk.EVENT_PROPAGATE ===================================== gajim/gui_interface.py ===================================== @@ -1892,6 +1892,81 @@ class Interface: app.sleeper_state[account] = 'autoxa' return True # renew timeout (loop for ever) + def enable_account(self, account): + if account == app.ZEROCONF_ACC_NAME: + app.connections[account] = connection_zeroconf.ConnectionZeroconf( + account) + else: + app.connections[account] = Connection(account) + + app.plugin_manager.register_modules_for_account( + app.connections[account]) + + # update variables + self.instances[account] = { + 'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}, + 'online_dialog': {}, 'sub_request': {}} + self.minimized_controls[account] = {} + app.connections[account].connected = 0 + app.groups[account] = {} + app.contacts.add_account(account) + app.gc_connected[account] = {} + app.automatic_rooms[account] = {} + app.newly_added[account] = [] + app.to_be_removed[account] = [] + if account == app.ZEROCONF_ACC_NAME: + app.nicks[account] = app.ZEROCONF_ACC_NAME + else: + app.nicks[account] = app.config.get_per( + 'accounts', account, 'name') + app.block_signed_in_notifications[account] = True + app.sleeper_state[account] = 'off' + app.last_message_time[account] = {} + app.status_before_autoaway[account] = '' + app.gajim_optional_features[account] = [] + app.caps_hash[account] = '' + helpers.update_optional_features(account) + # refresh roster + if len(app.connections) >= 2: + # Do not merge accounts if only one exists + self.roster.regroup = app.config.get('mergeaccounts') + else: + self.roster.regroup = False + self.roster.setup_and_draw_roster() + gui_menu_builder.build_accounts_menu() + self.roster.send_status(account, 'online', '') + + def disable_account(self, account): + self.roster.close_all(account) + if account == app.ZEROCONF_ACC_NAME: + app.connections[account].disable_account() + app.connections[account].cleanup() + del app.connections[account] + del self.instances[account] + del self.minimized_controls[account] + del app.nicks[account] + del app.block_signed_in_notifications[account] + del app.groups[account] + app.contacts.remove_account(account) + del app.gc_connected[account] + del app.automatic_rooms[account] + del app.to_be_removed[account] + del app.newly_added[account] + del app.sleeper_state[account] + del app.last_message_time[account] + del app.status_before_autoaway[account] + del app.gajim_optional_features[account] + del app.caps_hash[account] + if len(app.connections) >= 2: + # Do not merge accounts if only one exists + self.roster.regroup = app.config.get('mergeaccounts') + else: + self.roster.regroup = False + app.config.set_per( + 'accounts', account, 'roster_version', '') + self.roster.setup_and_draw_roster() + gui_menu_builder.build_accounts_menu() + def autoconnect(self): """ Auto connect at startup View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1051da2e312fa3ed2fc39119b16b53a966… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1051da2e312fa3ed2fc39119b16b53a966… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageWindow: Fix window resizing in one window mode
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7a3b82d1 by Daniel Brötzmann at 2019-06-21T19:39:26Z MessageWindow: Fix window resizing in one window mode When using one window mode, we get the allocated size of our message control notebook and save it before closing. The allocated width of our notebook does not include the background-size of the Paned's separator. Calculating width by subtracting roster_hpaned_position from allocated width of our window fixes this. - - - - - 1 changed file: - gajim/message_window.py Changes: ===================================== gajim/message_window.py ===================================== @@ -1031,10 +1031,8 @@ class MessageWindowMgr(GObject.GObject): size = (app.config.get('msgwin-width'), app.config.get('msgwin-height')) if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - # Need to add the size of the now visible paned handle, otherwise - # the saved width of the message window decreases by this amount - handle_size = win.parent_paned.style_get_property('handle-size') - size = (hpaned + size[0] + handle_size, size[1]) + # Add the hpaned position to our message window's size + size = (hpaned + size[0], size[1]) elif self.mode == self.ONE_MSG_WINDOW_PERACCT: size = (app.config.get_per('accounts', acct, 'msgwin-width'), app.config.get_per('accounts', acct, 'msgwin-height')) @@ -1245,8 +1243,10 @@ class MessageWindowMgr(GObject.GObject): size_width_key = type_ + '-msgwin-width' size_height_key = type_ + '-msgwin-height' elif self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - # Ignore any hpaned width - width = msg_win.notebook.get_allocation().width + # Ignore hpaned separator's width and calculate width ourselves + win_width = msg_win.window.get_allocation().width + hpaned_position = app.config.get('roster_hpaned_position') + width = win_width - hpaned_position if acct: app.config.set_per('accounts', acct, size_width_key, width) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7a3b82d15792c457cc6dae27f9827e72da… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7a3b82d15792c457cc6dae27f9827e72da… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HTTP Upload Progress: Add ETA
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c99ee623 by Daniel Brötzmann at 2019-06-21T19:28:54Z HTTP Upload Progress: Add ETA - - - - - 4 changed files: - gajim/data/gui/httpupload_progress_dialog.ui - gajim/dialogs.py - + gajim/gtk/http_upload_progress.py - gajim/gui_interface.py Changes: ===================================== gajim/data/gui/httpupload_progress_dialog.ui ===================================== @@ -2,14 +2,13 @@  <interface> <requires lib="gtk+" version="3.20"/> - <object class="GtkGrid" id="grid"> - <property name="width_request">300</property> + <object class="GtkBox" id="box"> + <property name="width_request">350</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">18</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkImage"> <property name="visible">True</property> @@ -18,8 +17,25 @@ <property name="icon_size">6</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="label"><placeholder></property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> @@ -29,21 +45,111 @@ <property name="label"><file name></property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkLabel" id="progress_label"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <style> - <class name="dim-label"/> - </style> + <property name="margin_top">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> + <child> + <object class="GtkLabel" id="progress_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="speed_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="eta_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <style> + <class name="dim-label"/> + </style> + </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">Progress</property> + <style> + <class name="dim-label"/> + </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">Speed</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">Time remaining</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> <child> @@ -54,41 +160,29 @@ <property name="pulse_step">0.10000000149</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> </packing> </child> <child> <object class="GtkButton" id="cancel_upload_button"> - <property name="label" translatable="yes">Cancel Upload</property> + <property name="label" translatable="yes">_Cancel Upload</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">center</property> <property name="margin_top">6</property> - <signal name="clicked" handler="on_cancel_upload_button_clicked" swapped="no"/> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_cancel_upload_button_clicked" swapped="no"/> <style> <class name="destructive-action"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="label"><placeholder></property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> </packing> </child> </object> ===================================== gajim/dialogs.py ===================================== @@ -32,13 +32,11 @@ from typing import Tuple # pylint: disable=unused-import import os import uuid import logging -import time from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib -from gajim.common import ged from gajim.common.i18n import _ from gajim.common.const import ACTIVITIES from gajim.common.const import MOODS @@ -1146,79 +1144,3 @@ class VoIPCallReceivedDialog: session.reject_content(content) dialog.destroy() - -class ProgressWindow(Gtk.ApplicationWindow): - def __init__(self, file): - Gtk.ApplicationWindow.__init__(self) - self.set_name('HTTPUploadProgressWindow') - self.set_application(app.app) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_show_menubar(False) - self.set_title(_('File Transfer')) - - self.event = file.event - self.file = file - self._ui = get_builder('httpupload_progress_dialog.ui') - file_name = os.path.basename(file.path) - self._ui.file_name_label.set_text(file_name) - self._start_time = time.time() - - self.add(self._ui.grid) - - self.pulse = GLib.timeout_add(100, self._pulse_progressbar) - self.show_all() - - self.connect('destroy', self._on_destroy) - self._ui.connect_signals(self) - app.ged.register_event_handler('httpupload-progress', ged.CORE, - self._on_httpupload_progress) - - def _on_httpupload_progress(self, obj): - if self.file != obj.file: - return - - if obj.status == 'request': - self._ui.label.set_text(_('Requesting HTTP File Upload Slot…')) - elif obj.status == 'close': - self.destroy() - elif obj.status == 'upload': - self._ui.label.set_text(_('Uploading via HTTP File Upload…')) - elif obj.status == 'update': - self.update_progress(obj.seen, obj.total) - elif obj.status == 'encrypt': - self._ui.label.set_text(_('Encrypting file…')) - - def _pulse_progressbar(self): - self._ui.progressbar.pulse() - return True - - def on_cancel_upload_button_clicked(self, widget): - self.destroy() - - def _on_destroy(self, *args): - self.event.set() - if self.pulse: - GLib.source_remove(self.pulse) - app.ged.remove_event_handler('httpupload-progress', ged.CORE, - self._on_httpupload_progress) - - def update_progress(self, seen, total): - if self.event.isSet(): - return - if self.pulse: - GLib.source_remove(self.pulse) - self.pulse = None - - size_total = round(total / (1024 * 1024), 1) - size_progress = round(seen / (1024 * 1024), 1) - - time_now = time.time() - mbytes_sec = round(size_progress / (time_now - self._start_time), 1) - - self._ui.progressbar.set_fraction(float(seen) / total) - - self._ui.progress_label.set_text( - _('%(progress)s of %(total)s MiB sent (%(speed)s MiB/s)') % \ - {'progress': str(size_progress), - 'total': str(size_total), - 'speed': str(mbytes_sec)}) ===================================== gajim/gtk/http_upload_progress.py ===================================== @@ -0,0 +1,116 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import os +import time + +from gi.repository import Gtk +from gi.repository import GLib + +from gajim.common import app +from gajim.common import ged +from gajim.common.i18n import _ + +from gajim.gtk.util import get_builder + + +class HTTPUploadProgressWindow(Gtk.ApplicationWindow): + def __init__(self, file): + Gtk.ApplicationWindow.__init__(self) + self.set_name('HTTPUploadProgressWindow') + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('File Transfer')) + + self.event = file.event + self.file = file + self._ui = get_builder('httpupload_progress_dialog.ui') + file_name = os.path.basename(file.path) + self._ui.file_name_label.set_text(file_name) + self._start_time = time.time() + + self.add(self._ui.box) + + self.pulse = GLib.timeout_add(100, self._pulse_progressbar) + self.show_all() + + self.connect('destroy', self._on_destroy) + self._ui.connect_signals(self) + app.ged.register_event_handler('httpupload-progress', ged.CORE, + self._on_httpupload_progress) + + def _on_httpupload_progress(self, obj): + if self.file != obj.file: + return + + if obj.status == 'request': + self._ui.label.set_text(_('Requesting HTTP File Upload Slot…')) + elif obj.status == 'close': + self.destroy() + elif obj.status == 'upload': + self._ui.label.set_text(_('Uploading via HTTP File Upload…')) + elif obj.status == 'update': + self._update_progress(obj.seen, obj.total) + elif obj.status == 'encrypt': + self._ui.label.set_text(_('Encrypting file…')) + + def _pulse_progressbar(self): + self._ui.progressbar.pulse() + return True + + def _on_cancel_upload_button_clicked(self, widget): + self.destroy() + + def _on_destroy(self, *args): + self.event.set() + if self.pulse: + GLib.source_remove(self.pulse) + app.ged.remove_event_handler('httpupload-progress', ged.CORE, + self._on_httpupload_progress) + + def _update_progress(self, seen, total): + if self.event.isSet(): + return + if self.pulse: + GLib.source_remove(self.pulse) + self.pulse = None + + size_total = round(total / (1024 * 1024), 1) + size_progress = round(seen / (1024 * 1024), 1) + + time_now = time.time() + mbytes_sec = round(size_progress / (time_now - self._start_time), 1) + eta = self._format_eta( + round((size_total - size_progress) / mbytes_sec)) + + self._ui.progressbar.set_fraction(float(seen) / total) + + self._ui.progress_label.set_text( + _('%(progress)s of %(total)s MiB') % { + 'progress': str(size_progress), + 'total': str(size_total)}) + + self._ui.speed_label.set_text(_('%s MiB/s') % str(mbytes_sec)) + self._ui.eta_label.set_text(str(eta)) + + def _format_eta(self, time_): + times = {'minutes': 0, 'seconds': 0} + time_ = int(time_) + times['seconds'] = time_ % 60 + if time_ >= 60: + time_ /= 60 + times['minutes'] = time_ % 60 + + return _('%(minutes)s min %(seconds)s sec') % times ===================================== gajim/gui_interface.py ===================================== @@ -58,7 +58,6 @@ from gajim import gui_menu_builder from gajim import dialogs from gajim import message_control from gajim.dialog_messages import get_dialog -from gajim.dialogs import ProgressWindow from gajim.chat_control_base import ChatControlBase from gajim.chat_control import ChatControl @@ -111,6 +110,7 @@ from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.filetransfer import FileTransfersWindow +from gajim.gtk.http_upload_progress import HTTPUploadProgressWindow from gajim.gtk.roster_item_exchange import RosterItemExchangeWindow from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_show_in_roster @@ -928,7 +928,7 @@ class Interface: @staticmethod def show_httpupload_progress(file): - ProgressWindow(file) + HTTPUploadProgressWindow(file) def send_httpupload(self, chat_control): accept_cb = partial(self.on_file_dialog_ok, chat_control) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c99ee623fc9fd10111600d4a720e2374b3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c99ee623fc9fd10111600d4a720e2374b3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Make some labels non-translatable
by Philipp Hörist 21 Jun '19

21 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 70ebcb6d by Daniel Brötzmann at 2019-06-21T07:42:24Z Make some labels non-translatable - - - - - ab74eb8d by Daniel Brötzmann at 2019-06-21T07:43:49Z Remove unused ConfirmationDialogCheck - - - - - 3 changed files: - gajim/data/gui/filetransfers.ui - gajim/data/gui/service_discovery_window.ui - gajim/gtk/dialogs.py Changes: ===================================== gajim/data/gui/filetransfers.ui ===================================== @@ -155,7 +155,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Remove completed, cancelled and failed file transfers from the list</property> - <property name="label" translatable="yes">toolbutton</property> <property name="icon_name">edit-clear-all-symbolic</property> <signal name="clicked" handler="_on_cleanup_button_clicked" swapped="no"/> </object> @@ -169,7 +168,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Pause or resume file transfer</property> - <property name="use_underline">True</property> <property name="icon_name">media-playback-pause-symbolic</property> <signal name="clicked" handler="_on_pause_resume_button_clicked" swapped="no"/> </object> @@ -183,7 +181,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Cancel the selected file transfer and remove incomplete files</property> - <property name="use_underline">True</property> <property name="icon_name">process-stop-symbolic</property> <signal name="clicked" handler="_on_cancel_button_clicked" swapped="no"/> </object> ===================================== gajim/data/gui/service_discovery_window.ui ===================================== @@ -75,7 +75,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="halign">start</property> - <property name="label" translatable="yes">Agent JID - node</property> + <property name="label">Agent JID - node</property> <property name="ellipsize">end</property> <property name="xalign">0</property> </object> ===================================== gajim/gtk/dialogs.py ===================================== @@ -330,58 +330,6 @@ class YesNoDialog(HigDialog): return self.checkbutton.get_active() -class ConfirmationDialogCheck(ConfirmationDialog): - """ - HIG compliant confirmation dialog with checkbutton - """ - - def __init__(self, pritext, sectext='', checktext='', on_response_ok=None, - on_response_cancel=None, is_modal=True, transient_for=None): - self.user_response_ok = on_response_ok - self.user_response_cancel = on_response_cancel - if transient_for is None: - transient_for = app.app.get_active_window() - HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION, - Gtk.ButtonsType.OK_CANCEL, pritext, sectext, self.on_response_ok, - self.on_response_cancel) - - self.set_default_response(Gtk.ResponseType.OK) - - ok_button = self.get_widget_for_response(Gtk.ResponseType.OK) - ok_button.grab_focus() - - self.checkbutton = Gtk.CheckButton.new_with_mnemonic(checktext) - self.get_content_area().pack_start(self.checkbutton, False, True, 0) - self.set_modal(is_modal) - self.popup() - - def on_response_ok(self, widget): - if self.user_response_ok: - if isinstance(self.user_response_ok, tuple): - self.user_response_ok[0](self.is_checked(), - *self.user_response_ok[1:]) - else: - self.user_response_ok(self.is_checked()) - self.call_cancel_on_destroy = False - self.destroy() - - def on_response_cancel(self, widget): - if self.user_response_cancel: - if isinstance(self.user_response_cancel, tuple): - self.user_response_cancel[0](self.is_checked(), - *self.user_response_cancel[1:]) - else: - self.user_response_cancel(self.is_checked()) - self.call_cancel_on_destroy = False - self.destroy() - - def is_checked(self): - """ - Get active state of the checkbutton - """ - return self.checkbutton.get_active() - - class ConfirmationDialogDoubleCheck(ConfirmationDialog): """ HIG compliant confirmation dialog with 2 checkbuttons View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f907ada8491a9bcde34db88c8dba12efd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f907ada8491a9bcde34db88c8dba12efd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor around VCard events
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f907ada8 by Philipp Hörist at 2019-06-20T23:17:04Z Refactor around VCard events - - - - - 6 changed files: - gajim/common/modules/muc.py - gajim/common/modules/vcard_temp.py - gajim/groupchat_control.py - gajim/gtk/profile.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -128,6 +128,9 @@ class MUC(BaseModule): def _get_muc_state(self, room_jid): return self._muc_data[room_jid].state + 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): if not app.account_is_connected(self._account): return @@ -165,7 +168,13 @@ class MUC(BaseModule): '%s/%s' % (room_jid, muc.nick), typ='unavailable') - def send_muc_presence(self, room_jid, auto=False): + def update_presence(self, auto=False): + mucs = self.get_mucs_with_state([MUCJoinedState.JOINED, + MUCJoinedState.JOINING]) + for muc in mucs: + self._send_presence(muc.jid, auto) + + def _send_presence(self, room_jid, auto): show = app.SHOW_LIST[self._con.connected] if show in ('invisible', 'offline'): # FIXME: Check if this ===================================== gajim/common/modules/vcard_temp.py ===================================== @@ -23,7 +23,6 @@ import nbxmpp from gajim.common import app from gajim.common.const import RequestAvatar from gajim.common.nec import NetworkEvent -from gajim.common.nec import NetworkIncomingEvent from gajim.common.modules.base import BaseModule from gajim.common.connection_handlers_events import InformationEvent @@ -158,12 +157,13 @@ class VCardTemp(BaseModule): self._con.get_module('VCardAvatars').send_avatar_presence( after_publish=True) self._log.info('%s: Published: %s', self._account, sha) + self._con.get_module('MUC').update_presence() app.nec.push_incoming_event( - VcardPublishedEvent(None, conn=self._con)) + NetworkEvent('vcard-published', account=self._account)) elif stanza.getType() == 'error': app.nec.push_incoming_event( - VcardNotPublishedEvent(None, conn=self._con)) + NetworkEvent('vcard-not-published', account=self._account)) def _get_vcard_photo(self, vcard, jid): try: @@ -216,10 +216,10 @@ class VCardTemp(BaseModule): elif 'FN' in vcard: app.nicks[self._account] = vcard['FN'] - app.nec.push_incoming_event( - VcardReceivedEvent(None, conn=self._con, - vcard_dict=vcard, - jid=jid)) + app.nec.push_incoming_event(NetworkEvent('vcard-received', + account=self._account, + jid=jid, + vcard_dict=vcard)) callback(jid, resource, room, vcard, expected_sha) @@ -309,17 +309,5 @@ class VCardTemp(BaseModule): return name -class VcardPublishedEvent(NetworkIncomingEvent): - name = 'vcard-published' - - -class VcardNotPublishedEvent(NetworkIncomingEvent): - name = 'vcard-not-published' - - -class VcardReceivedEvent(NetworkIncomingEvent): - name = 'vcard-received' - - def get_instance(*args, **kwargs): return VCardTemp(*args, **kwargs), 'VCardTemp' ===================================== gajim/groupchat_control.py ===================================== @@ -328,7 +328,6 @@ class GroupchatControl(ChatControlBase): ('muc-voice-approval', ged.GUI1, self._on_voice_approval), ('gc-message-received', ged.GUI1, self._nec_gc_message_received), ('mam-decrypted-message-received', ged.GUI1, self._nec_mam_decrypted_message_received), - ('vcard-published', ged.GUI1, self._nec_vcard_published), ('update-gc-avatar', ged.GUI1, self._nec_update_avatar), ('update-room-avatar', ged.GUI1, self._nec_update_room_avatar), ('signed-in', ged.GUI1, self._nec_signed_in), @@ -1122,12 +1121,6 @@ class GroupchatControl(ChatControlBase): subject_text = self.urlfinder.sub(self.make_href, subject) self.subject_button.get_popover().set_text(subject_text) - def _nec_vcard_published(self, obj): - if obj.conn.name != self.account: - return - - obj.conn.get_module('MUC').send_muc_presence(self.room_jid) - def _nec_update_avatar(self, obj): if obj.contact.room_jid != self.room_jid: return ===================================== gajim/gtk/profile.py ===================================== @@ -29,6 +29,7 @@ from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ from gajim.common.const import AvatarSize +from gajim.common.helpers import event_filter from gajim import gtkgui_helpers from gajim.gui_menu_builder import show_save_as_menu @@ -338,17 +339,15 @@ class ProfileWindow(Gtk.ApplicationWindow): self.update_progressbar_timeout_id = GLib.timeout_add( 100, self.update_progressbar) - def _nec_vcard_published(self, obj): - if obj.conn.name != self.account: - return + @event_filter(['account']) + def _nec_vcard_published(self, _event): if self.update_progressbar_timeout_id is not None: GLib.source_remove(self.update_progressbar_timeout_id) self.update_progressbar_timeout_id = None self.destroy() - def _nec_vcard_not_published(self, obj): - if obj.conn.name != self.account: - return + @event_filter(['account']) + def _nec_vcard_not_published(self, _event): if self.message_id: self.statusbar.remove(self.context_id, self.message_id) self.message_id = self.statusbar.push( ===================================== gajim/remote_control.py ===================================== @@ -386,7 +386,7 @@ class GajimRemote(Server): self.raise_signal('NewAccount', (obj.conn.name, obj.account_info)) def on_vcard_received(self, obj): - self.raise_signal('VcardInfo', (obj.conn.name, obj.vcard_dict)) + self.raise_signal('VcardInfo', (obj.account, obj.vcard_dict)) def raise_signal(self, event_name, data): log.info('Send event %s', event_name) ===================================== gajim/roster_window.py ===================================== @@ -2109,14 +2109,7 @@ class RosterWindow: self.delete_pep(app.get_jid_from_account(account), account) was_invisible = app.is_invisible(account) app.connections[account].change_status(status, txt, auto) - - for gc_control in app.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC) + \ - list(app.interface.minimized_controls[account].values()): - if gc_control.account == account: - if app.gc_connected[account][gc_control.room_jid]: - app.connections[account].get_module('MUC').send_muc_presence( - gc_control.room_jid, auto=auto) + app.connections[account].get_module('MUC').update_presence(auto) if was_invisible and status != 'offline': # We come back from invisible, join bookmarks con = app.connections[account] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f907ada8491a9bcde34db88c8dba12efd8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f907ada8491a9bcde34db88c8dba12efd8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused Dialog
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 878f0458 by Daniel Brötzmann at 2019-06-20T21:57:58Z Remove unused Dialog - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== @@ -997,48 +997,6 @@ class TransformChatToMUC: def on_cancel_button_clicked(self, widget): self.window.destroy() -class Dialog(Gtk.Dialog): - def __init__(self, parent, title, buttons, default=None, - on_response_ok=None, on_response_cancel=None): - super().__init__(title=title, - transient_for=parent, - destroy_with_parent=True) - - self.user_response_ok = on_response_ok - self.user_response_cancel = on_response_cancel - self.set_border_width(6) - self.get_content_area().set_spacing(12) - self.set_resizable(False) - - for stock, response in buttons: - self.add_button(stock, response) - - if default is not None: - self.set_default_response(default) - else: - self.set_default_response(buttons[-1][1]) - - self.connect('response', self.on_response) - - def on_response(self, widget, response_id): - if response_id == Gtk.ResponseType.OK: - if self.user_response_ok: - if isinstance(self.user_response_ok, tuple): - self.user_response_ok[0](*self.user_response_ok[1:]) - else: - self.user_response_ok() - self.destroy() - elif response_id == Gtk.ResponseType.CANCEL: - if self.user_response_cancel: - if isinstance(self.user_response_cancel, tuple): - self.user_response_cancel[0](*self.user_response_ok[1:]) - else: - self.user_response_cancel() - self.destroy() - - def just_destroy(self, widget): - self.destroy() - class ResourceConflictDialog(TimeoutDialog, InputDialog): def __init__(self, title, text, resource, ok_handler): @@ -1052,7 +1010,6 @@ class ResourceConflictDialog(TimeoutDialog, InputDialog): self.on_okbutton_clicked(None) - class VoIPCallReceivedDialog: instances = {} # type: Dict[Tuple[str, str], VoIPCallReceivedDialog] def __init__(self, account, contact_jid, sid, content_types): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/878f0458fa33b9d799a63e437cfb78950c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/878f0458fa33b9d799a63e437cfb78950c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: FTOverwriteConfirmationDialog: Remove dialog usage
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fc5c2d59 by Daniel Brötzmann at 2019-06-20T21:47:36Z FTOverwriteConfirmationDialog: Remove dialog usage - - - - - bf207395 by Daniel Brötzmann at 2019-06-20T21:47:36Z Remove FTOverwriteConfirmationDialog - - - - - 3 changed files: - gajim/gtk/dialogs.py - gajim/gtk/filetransfer.py - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -541,48 +541,6 @@ class ConfirmationDialogDoubleRadio(ConfirmationDialog): is_checked_2 = False return [is_checked_1, is_checked_2] -class FTOverwriteConfirmationDialog(ConfirmationDialog): - """ - HIG compliant confirmation dialog to overwrite or resume a file transfert - """ - def __init__(self, pritext, sectext='', propose_resume=True, - on_response=None, transient_for=None): - if transient_for is None: - transient_for = app.app.get_active_window() - HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION, - Gtk.ButtonsType.CANCEL, pritext, sectext) - - self.on_response = on_response - - if propose_resume: - b = Gtk.Button(label='', stock=Gtk.STOCK_REFRESH) - align = b.get_children()[0] - hbox = align.get_children()[0] - label = hbox.get_children()[1] - label.set_text(_('_Resume')) - label.set_use_underline(True) - self.add_action_widget(b, 100) - - b = Gtk.Button(label='', stock=Gtk.STOCK_SAVE_AS) - align = b.get_children()[0] - hbox = align.get_children()[0] - label = hbox.get_children()[1] - label.set_text(_('Re_place')) - label.set_use_underline(True) - self.add_action_widget(b, 200) - - self.connect('response', self.on_dialog_response) - self.show_all() - - def on_dialog_response(self, dialog, response): - if self.on_response: - if isinstance(self.on_response, tuple): - self.on_response[0](response, *self.on_response[1:]) - else: - self.on_response(response) - self.call_cancel_on_destroy = False - self.destroy() - class CommonInputDialog: """ ===================================== gajim/gtk/filetransfer.py ===================================== @@ -40,12 +40,12 @@ from gajim.common.modules.bytestream import (is_transfer_active, is_transfer_paused, is_transfer_stopped) +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import HigDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import FTOverwriteConfirmationDialog -from gajim.gtk.dialogs import NonModalConfirmationDialog from gajim.gtk.filechoosers import FileSaveDialog from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.tooltips import FileTransfersTooltip @@ -220,8 +220,8 @@ class FileTransfersWindow: (file_path, file_name) = os.path.split(file_props.file_name) else: file_name = file_props.name - sectext = '\t' + _('Filename: %s') % GLib.markup_escape_text(file_name) - sectext += '\n\t' + _('Size: %s') % helpers.convert_bytes( + sectext = _('File name: %s') % GLib.markup_escape_text(file_name) + sectext += '\n' + _('Size: %s') % helpers.convert_bytes( file_props.size) if file_props.type_ == 'r': jid = file_props.sender.split('/')[0] @@ -231,8 +231,8 @@ class FileTransfersWindow: else: # You is a reply of who sent a file sender = _('You') - sectext += '\n\t' + _('Sender: %s') % sender - sectext += '\n\t' + _('Recipient: ') + sectext += '\n' + _('Sender: %s') % sender + sectext += '\n' + _('Recipient: ') if file_props.type_ == 's': jid = file_props.receiver.split('/')[0] receiver_name = app.contacts.get_first_contact_from_jid( @@ -243,14 +243,15 @@ class FileTransfersWindow: recipient = _('You') sectext += recipient if file_props.type_ == 'r': - sectext += '\n\t' + _('Saved in: %s') % file_path + sectext += '\n' + _('Saved in: %s') % file_path + dialog = HigDialog(app.interface.roster.window, Gtk.MessageType.INFO, Gtk.ButtonsType.NONE, _('File transfer completed'), sectext) if file_props.type_ == 'r': - button = Gtk.Button.new_with_mnemonic(_('Open _Containing Folder')) + button = Gtk.Button.new_with_mnemonic(_('Open _Folder')) button.connect('clicked', on_open, file_props) dialog.action_area.pack_start(button, True, True, 0) ok_button = dialog.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK) @@ -375,52 +376,68 @@ class FileTransfersWindow: file_props) def on_file_request_accepted(self, account, contact, file_props): - def on_ok(account, contact, file_props, file_path): + def _on_accepted(account, contact, file_props, file_path): if os.path.exists(file_path): app.config.set('last_save_dir', os.path.dirname(file_path)) - # check if we have write permissions + + # Check if we have write permissions if not os.access(file_path, os.W_OK): file_name = GLib.markup_escape_text( os.path.basename(file_path)) ErrorDialog( - _('Cannot overwrite existing file "%s"' % file_name), + _('Cannot overwrite existing file \'%s\'' % file_name), _('A file with this name already exists and you do ' 'not have permission to overwrite it.')) return + stat = os.stat(file_path) dl_size = stat.st_size file_size = file_props.size dl_finished = dl_size >= file_size - def on_response(response): - if response < 0: - return - if response == 100: + def _on_resume(): + if not dl_finished: file_props.offset = dl_size - self._start_receive(file_path, account, contact, file_props) + self._start_receive( + file_path, account, contact, file_props) - dialog = FTOverwriteConfirmationDialog( - _('This file already exists'), - _('What do you want to do?'), - propose_resume=not dl_finished, - on_response=on_response) - dialog.set_destroy_with_parent(True) - return + def _on_replace(): + self._start_receive( + file_path, account, contact, file_props) + + def _on_cancel(): + con.get_module('Bytestream').send_file_rejection( + file_props) + NewConfirmationDialog( + _('File Transfer Conflict'), + _('This file already exists'), + _('Resume download or replace file?'), + [DialogButton.make('Cancel', + callback=_on_cancel), + DialogButton.make('OK', + text=_('Replace _File'), + callback=_on_replace), + DialogButton.make('OK', + text=_('Resume _Download'), + callback=_on_resume)]).show() + + # File does not exist yet dirname = os.path.dirname(file_path) if not os.access(dirname, os.W_OK) and os.name != 'nt': # read-only bit is used to mark special folder under # windows, not to mark that a folder is read-only. # See ticket #3587 ErrorDialog( - _('Directory "%s" is not writable') % dirname, - _('You do not have permission to create files ' + _('Directory \'%s\' is not writable') % dirname, + _('You do not have permissions to create files ' 'in this directory.')) return self._start_receive(file_path, account, contact, file_props) + # Show file save as dialog con = app.connections[account] - accept_cb = partial(on_ok, account, contact, file_props) + accept_cb = partial(_on_accepted, account, contact, file_props) cancel_cb = partial(con.get_module('Bytestream').send_file_rejection, file_props) FileSaveDialog(accept_cb, @@ -435,33 +452,33 @@ class FileTransfersWindow: """ if not file_props or not file_props.name: return - sec_text = '\t' + _('File: %s') % GLib.markup_escape_text( + + sectext = _('File: %s') % GLib.markup_escape_text( file_props.name) if file_props.size: - sec_text += '\n\t' + _('Size: %s') % \ - helpers.convert_bytes(file_props.size) + sectext += '\n' + _('Size: %s') % helpers.convert_bytes( + file_props.size) if file_props.mime_type: - sec_text += '\n\t' + _('Type: %s') % file_props.mime_type + sectext += '\n' + _('Type: %s') % file_props.mime_type if file_props.desc: - sec_text += '\n\t' + _('Description: %s') % file_props.desc - prim_text = _('%s wants to send you a file:') % contact.jid - dialog = None + sectext += '\n' + _('Description: %s') % file_props.desc - def on_response_ok(account, contact, file_props): + def _on_ok(): self.on_file_request_accepted(account, contact, file_props) - def on_response_cancel(account, file_props): + def _on_cancel(): app.connections[account].get_module( 'Bytestream').send_file_rejection(file_props) - dialog = NonModalConfirmationDialog( - prim_text, - sec_text, - on_response_ok=(on_response_ok, account, contact, file_props), - on_response_cancel=(on_response_cancel, account, file_props)) - dialog.connect('delete-event', lambda widget, event: - on_response_cancel(account, file_props)) - dialog.popup() + NewConfirmationDialog( + _('File Transfer Request'), + _('%s wants to send you a file') % contact.jid, + sectext, + [DialogButton.make('Cancel', + callback=_on_cancel), + DialogButton.make('OK', + text=_('_Accept'), + callback=_on_ok)]).show() def set_status(self, file_props, status): """ ===================================== gajim/gtkgui_helpers.py ===================================== @@ -152,12 +152,18 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import NewConfirmationDialog - from gajim.gtk.dialogs import FTOverwriteConfirmationDialog from gajim.gtk.filechoosers import AvatarSaveDialog - def on_continue(response, file_path): - if response < 0: - return + def _on_save_avatar(file_path): + if os.path.exists(file_path): + # Check if we have write permissions + if not os.access(file_path, os.W_OK): + file_name = os.path.basename(file_path) + ErrorDialog( + _('Cannot overwrite existing file \'%s\'' % file_name), + _('A file with this name already exists and you do ' + 'not have permission to overwrite it.')) + return app.config.set('last_save_dir', os.path.dirname(file_path)) if isinstance(avatar, str): @@ -200,34 +206,11 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): args=[new_file_path, pixbuf])]).show() - def on_ok(file_path): - if os.path.exists(file_path): - # check if we have write permissions - if not os.access(file_path, os.W_OK): - file_name = os.path.basename(file_path) - ErrorDialog(_('Cannot overwrite existing file "%s"') % \ - file_name, _('A file with this name already exists and you ' - 'do not have permission to overwrite it.')) - return - dialog2 = FTOverwriteConfirmationDialog( - _('This file already exists'), _('What do you want to do?'), - propose_resume=False, on_response=(on_continue, file_path)) - dialog2.set_destroy_with_parent(True) - else: - dirname = os.path.dirname(file_path) - if not os.access(dirname, os.W_OK): - ErrorDialog(_('Directory "%s" is not writable') % \ - dirname, _('You do not have permission to create files in ' - 'this directory.')) - return - - on_continue(0, file_path) - - transient = app.app.get_active_window() - AvatarSaveDialog(on_ok, + AvatarSaveDialog(_on_save_avatar, path=app.config.get('last_save_dir'), file_name='%s.png' % default_name, - transient_for=transient) + transient_for=app.app.get_active_window()) + def create_combobox(value_list, selected_value=None): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/90abf6bf60be99220dfd8c25ed40f68df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/90abf6bf60be99220dfd8c25ed40f68df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix undefined variable
by Philipp Hörist 20 Jun '19

20 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 90abf6bf by Philipp Hörist at 2019-06-20T21:47:15Z Fix undefined variable - - - - - 1 changed file: - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -445,8 +445,7 @@ class MUC(BaseModule): app.nec.push_incoming_event( NetworkEvent('muc-voice-approval', account=self._account, - room_jid=room_jid, - jid=jid, + room_jid=properties.jid.getBare(), form=properties.voice_request.form)) raise nbxmpp.NodeProcessed View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/90abf6bf60be99220dfd8c25ed40f68df9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/90abf6bf60be99220dfd8c25ed40f68df9… 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