Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Add monospace formatted fingerprint to encryption tooltip
by Philipp Hörist 28 Mar '19

28 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a7bc6dc5 by Daniel Brötzmann at 2019-03-28T19:54:04Z Add monospace formatted fingerprint to encryption tooltip - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -1158,10 +1158,10 @@ class ConversationTextview(GObject.GObject): color = 'encrypted-color' else: icon, trust_tooltip, color = TRUST_SYMBOL_DATA[trust] - tooltip = tooltip + '\n' + trust_tooltip + tooltip = '%s\n%s' % (tooltip, trust_tooltip) if fingerprint is not None: fingerprint = format_fingerprint(fingerprint) - tooltip = tooltip + '\n' + fingerprint + tooltip = '%s\n<tt>%s</tt>' % (tooltip, fingerprint) temp_mark = self._buffer.create_mark(None, iter_, True) self._buffer.insert(iter_, ' ') @@ -1175,7 +1175,7 @@ class ConversationTextview(GObject.GObject): image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) image.show() - image.set_tooltip_text(tooltip) + image.set_tooltip_markup(tooltip) image.get_style_context().add_class(color) self.tv.add_child_at_anchor(image, anchor) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a7bc6dc530590d73fcf4eac562eb22dd5a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a7bc6dc530590d73fcf4eac562eb22dd5a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MUC: Use NewConfirmationDialog for file transfer
by Philipp Hörist 27 Mar '19

27 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f838c2fa by Philipp Hörist at 2019-03-27T22:36:55Z MUC: Use NewConfirmationDialog for file transfer - - - - - ae29c937 by Philipp Hörist at 2019-03-27T22:36:55Z ChatControl: Use NewConfirmationDialog - - - - - 3 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -54,7 +54,8 @@ from gajim import gui_menu_builder from gajim import message_control from gajim import dialogs -from gajim.gtk.dialogs import ConfirmationDialog +from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import DialogButton from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_cursor @@ -1168,25 +1169,22 @@ class ChatControl(ChatControlBase): def safe_shutdown(self): return False - def allow_shutdown(self, method, on_yes, on_no, on_minimize): - if time.time() - app.last_message_time[self.account]\ - [self.get_full_jid()] < 2: + def allow_shutdown(self, method, on_yes, on_no, _on_minimize): + time_ = app.last_message_time[self.account][self.get_full_jid()] + if time.time() - time_ < 2: # 2 seconds - def on_ok(): - on_yes(self) - - def on_cancel(): - on_no(self) - - ConfirmationDialog( - #%s is being replaced in the code with JID - _('You just received a new message from "%s"') % \ - self.contact.jid, - _('If you close this tab and you have history disabled, '\ - 'this message will be lost.'), on_response_ok=on_ok, - on_response_cancel=on_cancel, - transient_for=self.parent_win.window) + NewConfirmationDialog( + _('Close'), + _('You just received a new message from %s') % self.contact.jid, + _('If you close this tab and you have history disabled, ' + 'this message will be lost.'), + [DialogButton.make('Cancel', + callback=lambda: on_no(self)), + DialogButton.make('OK', + text=_('Close'), + callback=lambda: on_yes(self))], + transient_for=self.parent_win.window).show() return on_yes(self) ===================================== gajim/chat_control_base.py ===================================== @@ -51,7 +51,8 @@ from gajim.message_control import MessageControl from gajim.conversation_textview import ConversationTextview from gajim.message_textview import MessageTextView -from gajim.gtk.dialogs import NonModalConfirmationDialog +from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import DialogButton from gajim.gtk import util from gajim.gtk.util import convert_rgb_to_hex from gajim.gtk.util import at_the_end @@ -1042,29 +1043,38 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): """ def _on_ok(c): app.interface.instances['file_transfers'].show_file_send_request( - self.account, c) + self.account, c) if self.type_id == message_control.TYPE_PM: gc_contact = self.gc_contact - if gc_contact: - # gc or pm - gc_control = app.interface.msg_win_mgr.get_gc_control( - gc_contact.room_jid, self.account) - self_contact = app.contacts.get_gc_contact(self.account, - gc_control.room_jid, gc_control.nick) - if gc_control.is_anonymous and gc_contact.affiliation.value not in ['admin', - 'owner'] and self_contact.affiliation.value in ['admin', 'owner']: - contact = app.contacts.get_contact(self.account, gc_contact.jid) - if not contact or contact.sub not in ('both', 'to'): - prim_text = _('Really send file?') - sec_text = _('If you send a file to %s, your real JID will ' - 'be revealed.') % gc_contact.name - dialog = NonModalConfirmationDialog(prim_text, - sec_text, on_response_ok=(_on_ok, gc_contact)) - dialog.popup() - return - _on_ok(gc_contact) + + if not gc_contact: + _on_ok(self.contact) return - _on_ok(self.contact) + + # gc or pm + gc_control = app.interface.msg_win_mgr.get_gc_control( + gc_contact.room_jid, self.account) + self_contact = app.contacts.get_gc_contact(self.account, + gc_control.room_jid, + gc_control.nick) + if (gc_control.is_anonymous and + gc_contact.affiliation.value not in ['admin', 'owner'] and + self_contact.affiliation.value in ['admin', 'owner']): + contact = app.contacts.get_contact(self.account, gc_contact.jid) + if not contact or contact.sub not in ('both', 'to'): + + NewConfirmationDialog( + _('Privacy'), + _('Warning'), + _('If you send a file to <b>%s</b>, ' + 'your real JID will be revealed.' % gc_contact.name), + [DialogButton.make('Cancel'), + DialogButton.make( + 'OK', + text=_('Continue'), + callback=lambda: _on_ok(gc_contact))]).show() + return + _on_ok(gc_contact) def on_notify_menuitem_toggled(self, widget): app.config.set_per('rooms', self.contact.jid, 'notify_on_all_messages', ===================================== gajim/groupchat_control.py ===================================== @@ -2786,12 +2786,12 @@ class GroupchatControl(ChatControlBase): self.handlers[id_] = item item = xml.get_object('send_file_menuitem') - if not c.resource: + if not c.jid: item.set_sensitive(False) else: - item.set_sensitive(False) + item.set_sensitive(True) # ToDo: integrate HTTP File Upload - id_ = item.connect('activate', self._on_send_file_jingle, c) + id_ = item.connect('activate', lambda x: self._on_send_file_jingle(c)) self.handlers[id_] = item # show the popup now! View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2080495efc8dcec53003c4ce58db382f3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2080495efc8dcec53003c4ce58db382f3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch wurstsalat/gajim-account-disable-offline
by Philipp Hörist 27 Mar '19

27 Mar '19

Philipp Hörist deleted branch wurstsalat/gajim-account-disable-offline at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch wurstsalat/gajim-account-disable-offline
by Philipp Hörist 27 Mar '19

27 Mar '19

Philipp Hörist pushed new branch wurstsalat/gajim-account-disable-offline at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/wurstsalat/gajim-account-disable-off… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Ask whether to disconnect when disabling account
by Philipp Hörist 27 Mar '19

27 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2080495e by Daniel Brötzmann at 2019-03-27T21:24:46Z Ask whether to disconnect when disabling account Fixes #8938 - - - - - 2 changed files: - gajim/dialog_messages.py - gajim/gtk/accounts.py Changes: ===================================== gajim/dialog_messages.py ===================================== @@ -48,11 +48,6 @@ messages = { _('Read all pending events before removing this account.'), ErrorDialog), - 'connected-on-disable-account': Message( - _('You are currently connected to the server'), - _('To disable the account, you must be disconnected.'), - ErrorDialog), - 'invalid-form': Message( _('Invalid Form'), _('The form is not filled correctly.'), ===================================== gajim/gtk/accounts.py ===================================== @@ -39,6 +39,8 @@ from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import ConfirmationDialogDoubleRadio 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 @@ -512,7 +514,7 @@ class GenericOptionPage(Gtk.Box): switch.set_sensitive(False) switch.set_active(False) - switch.connect('notify::active', self._on_enable_switch, self.account) + 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')) @@ -524,18 +526,34 @@ class GenericOptionPage(Gtk.Box): box.pack_end(button, False, False, 0) self.pack_start(box, True, True, 0) - def _on_enable_switch(self, switch, param, 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) + app.config.set_per('accounts', account, 'active', False) + switch.set_state(state) + old_state = app.config.get_per('accounts', account, 'active') - state = switch.get_active() if old_state == state: return if (account in app.connections and app.connections[account].connected > 0): - # connecting or connected - app.interface.raise_dialog('connected-on-disable-account') - switch.set_active(not state) - return + # Connecting or connected + NewConfirmationDialog( + _('Disable Account'), + _('Account %s is still connected') % account, + _('All chat and group chat windows will be closed. ' + 'Do you want to continue?'), + [DialogButton.make('Cancel', + callback=lambda: switch.set_active(True)), + DialogButton.make('Remove', + text=_('Disable Account'), + callback=_disable)], + transient_for=self.parent).show() + return Gdk.EVENT_STOP + if state: self.parent.enable_account(account) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2080495efc8dcec53003c4ce58db382f3e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2080495efc8dcec53003c4ce58db382f3e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch wurstsalat/gajim-account-disable-offline
by Philipp Hörist 27 Mar '19

27 Mar '19

Philipp Hörist deleted branch wurstsalat/gajim-account-disable-offline at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch wurstsalat/gajim-account-disable-offline
by Philipp Hörist 27 Mar '19

27 Mar '19

1 0

[Git][gajim/gajim][master] Rework HTTPUpload dialog
by Philipp Hörist 27 Mar '19

27 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 74ed71f5 by Daniel Brötzmann at 2019-03-26T23:40:46Z Rework HTTPUpload dialog - - - - - 2 changed files: - gajim/data/gui/httpupload_progress_dialog.ui - gajim/dialogs.py Changes: ===================================== gajim/data/gui/httpupload_progress_dialog.ui ===================================== @@ -1,29 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.14"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkBox" id="box"> + <property name="width_request">300</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">8</property> - <property name="bottom_padding">4</property> - <property name="left_padding">8</property> - <property name="right_padding">8</property> - <child> - <object class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <attributes> - <attribute name="weight" value="bold"/> - <attribute name="variant" value="normal"/> - </attributes> - </object> - </child> + <property name="icon_name">document-send-symbolic</property> + <property name="icon_size">6</property> </object> <packing> <property name="expand">False</property> @@ -32,21 +23,14 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">4</property> - <property name="bottom_padding">4</property> - <property name="left_padding">8</property> - <property name="right_padding">8</property> - <child> - <object class="GtkProgressBar" id="progressbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pulse_step">0.10000000149</property> - <property name="show_text">True</property> - </object> - </child> + <property name="margin_top">6</property> + <property name="label"><placeholder></property> + <style> + <class name="bold"/> + </style> </object> <packing> <property name="expand">False</property> @@ -54,5 +38,52 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkLabel" id="progress_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><progress></property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkProgressBar" id="progressbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="pulse_step">0.10000000149</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel_upload_button"> + <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"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> </object> </interface> ===================================== gajim/dialogs.py ===================================== @@ -1727,21 +1727,18 @@ class ProgressWindow(Gtk.ApplicationWindow): self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('File Transfer')) - self.set_default_size(250, -1) self.event = file.event self.file = file - self.xml = get_builder('httpupload_progress_dialog.ui') + self._ui = get_builder('httpupload_progress_dialog.ui') - self.label = self.xml.get_object('label') - self.progressbar = self.xml.get_object('progressbar') - - self.add(self.xml.get_object('box')) + 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) @@ -1749,20 +1746,23 @@ class ProgressWindow(Gtk.ApplicationWindow): if self.file != obj.file: return if obj.status == 'request': - self.label.set_text(_('Requesting HTTP Upload Slot…')) + self._ui.label.set_text(_('Requesting HTTP Upload Slot…')) elif obj.status == 'close': self.destroy() elif obj.status == 'upload': - self.label.set_text(_('Uploading file via HTTP File Upload…')) + self._ui.label.set_text(_('Uploading file via HTTP File Upload…')) elif obj.status == 'update': self.update_progress(obj.seen, obj.total) elif obj.status == 'encrypt': - self.label.set_text(_('Encrypting file…')) + self._ui.label.set_text(_('Encrypting file…')) def _pulse_progressbar(self): - self.progressbar.pulse() + 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: @@ -1776,6 +1776,9 @@ class ProgressWindow(Gtk.ApplicationWindow): if self.pulse: GLib.source_remove(self.pulse) self.pulse = None - pct = (float(seen) / total) * 100.0 - self.progressbar.set_fraction(float(seen) / total) - self.progressbar.set_text(str(int(pct)) + "%") + self._ui.progressbar.set_fraction(float(seen) / total) + size_total = round(total / (1024 * 1024), 1) + size_progress = round(seen / (1024 * 1024), 1) + self._ui.progress_label.set_text( + _('%(progress)s of %(total)s MiB sent') % \ + {'progress': str(size_progress), 'total': str(size_total)}) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/74ed71f57e6b675bfd8bc81b0193f7e44e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/74ed71f57e6b675bfd8bc81b0193f7e44e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Remove unused imports
by Philipp Hörist 26 Mar '19

26 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ca037665 by Philipp Hörist at 2019-03-26T20:55:51Z Remove unused imports - - - - - bbada2ec by Philipp Hörist at 2019-03-26T22:49:45Z Improve NewConfirmationDialog - Add setting for modal/non-modal - Add default transient - Dont call run() it only returns after response - - - - - 4c062bf9 by Philipp Hörist at 2019-03-26T22:53:12Z Call show() on new dialogs - run() was removed from the dialog because it blocks - - - - - 760b94f2 by Philipp Hörist at 2019-03-26T23:14:00Z Add NewConfirmationCheckDialog - - - - - 4 changed files: - gajim/gtk/dialogs.py - gajim/gtk/themes.py - gajim/history_manager.py - gajim/roster_window.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -15,6 +15,7 @@ from collections import namedtuple from gi.repository import Gtk +from gi.repository import Pango from gajim.common import app from gajim.common import helpers @@ -53,6 +54,11 @@ class DialogButton(namedtuple('DialogButton', ('response text callback args ' default_kwargs['response'] = Gtk.ResponseType.OK default_kwargs['text'] = _('Delete') default_kwargs['action'] = ButtonAction.DESTRUCTIVE + + elif type_ == 'Remove': + default_kwargs['response'] = Gtk.ResponseType.OK + default_kwargs['text'] = _('Remove') + default_kwargs['action'] = ButtonAction.DESTRUCTIVE else: raise ValueError('Unknown button type: %s ' % type_) @@ -990,12 +996,16 @@ class ChangePasswordDialog(Gtk.Dialog): class NewConfirmationDialog(Gtk.MessageDialog): - def __init__(self, title, text, sec_text, buttons, transient_for=None): + def __init__(self, title, text, sec_text, buttons, + modal=True, transient_for=None): + if transient_for is None: + transient_for = app.app.get_active_window() Gtk.MessageDialog.__init__(self, title=title, text=text, transient_for=transient_for, - message_type=Gtk.MessageType.QUESTION) + message_type=Gtk.MessageType.QUESTION, + modal=modal) self._buttons = {} @@ -1012,8 +1022,6 @@ class NewConfirmationDialog(Gtk.MessageDialog): self.connect('response', self._on_response) - self.run() - def _on_response(self, _dialog, response): if response == Gtk.ResponseType.DELETE_EVENT: # Look if DELETE_EVENT is mapped to another response @@ -1031,6 +1039,40 @@ class NewConfirmationDialog(Gtk.MessageDialog): button.callback(*button.args, **button.kwargs) self.destroy() + def show(self): + self.show_all() + + +class NewConfirmationCheckDialog(NewConfirmationDialog): + def __init__(self, title, text, sec_text, check_text, + buttons, modal=True, transient_for=None): + NewConfirmationDialog.__init__(self, + title, + text, + sec_text, + buttons, + transient_for=transient_for, + modal=modal) + + self._checkbutton = Gtk.CheckButton.new_with_mnemonic(check_text) + self._checkbutton.set_can_focus(False) + self._checkbutton.set_margin_start(30) + self._checkbutton.set_margin_end(30) + label = self._checkbutton.get_child() + label.set_line_wrap(True) + label.set_max_width_chars(50) + label.set_halign(Gtk.Align.START) + label.set_line_wrap_mode(Pango.WrapMode.WORD) + label.set_margin_start(10) + + self.get_content_area().add(self._checkbutton) + + def _on_response(self, _dialog, response): + button = self._buttons.get(response) + if button is not None: + button.args.insert(0, self._checkbutton.get_active()) + super()._on_response(_dialog, response) + class ShortcutsWindow: def __init__(self): ===================================== gajim/gtk/themes.py ===================================== @@ -24,7 +24,6 @@ from gajim.common import app from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.const import StyleAttr -from gajim.common.const import ButtonAction from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import DialogButton @@ -326,7 +325,7 @@ class Themes(Gtk.ApplicationWindow): _('Do you want to permanently delete this theme?'), [DialogButton.make('Cancel'), DialogButton.make('Delete', callback=_remove_theme)], - transient_for=self) + transient_for=self).show() @staticmethod def _on_destroy(*args): ===================================== gajim/history_manager.py ===================================== @@ -44,7 +44,6 @@ from gi.repository import Gio from gi.repository import Pango from gajim.common import app -from gajim.common import i18n from gajim.common import configpaths from gajim.common.i18n import _ from gajim.common.i18n import ngettext @@ -578,7 +577,7 @@ class HistoryManager: paths_len, liststore[list_of_paths[0]][0]), [DialogButton.make('Cancel'), DialogButton.make('Delete', callback=on_ok)], - transient_for=self._ui.history_manager_window) + transient_for=self._ui.history_manager_window).show() def _delete_logs(self, liststore, list_of_paths): paths_len = len(list_of_paths) @@ -615,7 +614,7 @@ class HistoryManager: paths_len), [DialogButton.make('Cancel'), DialogButton.make('Delete', callback=on_ok)], - transient_for=self._ui.history_manager_window) + transient_for=self._ui.history_manager_window).show() def on_search_db_button_clicked(self, widget): text = self._ui.search_entry.get_text() ===================================== gajim/roster_window.py ===================================== @@ -71,6 +71,8 @@ from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import NonModalConfirmationDialog +from gajim.gtk.dialogs import NewConfirmationCheckDialog +from gajim.gtk.dialogs import DialogButton from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.add_contact import AddNewContactWindow @@ -3347,7 +3349,7 @@ class RosterWindow: """ Remove a contact. list_ is a list of (contact, account) tuples """ - def on_ok(is_checked, list_): + def on_ok(is_checked): remove_auth = True if len(list_) == 1: contact = list_[0][0] @@ -3366,8 +3368,8 @@ class RosterWindow: contact.show = 'offline' app.contacts.add_contact(account, contact) self.add_contact(contact.jid, account) - def on_ok2(list_): - on_ok(False, list_) + def on_ok2(): + on_ok(False) if len(list_) == 1: contact = list_[0][0] @@ -3380,19 +3382,22 @@ class RosterWindow: ConfirmationDialog(pritext, sectext + \ _('By removing this contact you also remove authorization ' 'resulting in them always seeing you as offline.'), - on_response_ok=(on_ok2, list_)) + on_response_ok=on_ok2) elif _('Not in Roster') in contact.get_shown_groups(): # Contact is not in roster ConfirmationDialog(pritext, sectext + \ - _('Do you want to continue?'), on_response_ok=(on_ok2, - list_)) + _('Do you want to continue?'), on_response_ok=on_ok2) else: - ConfirmationDialogCheck(pritext, sectext + \ + NewConfirmationCheckDialog( + _('Remove'), + pritext, sectext + \ _('By removing this contact you also by default remove ' - 'authorization resulting in them always seeing you as' - ' offline.'), - _('I want this contact to know my status after removal'), - on_response_ok=(on_ok, list_)) + 'authorization resulting in them always seeing you as' + ' offline.'), + _('_I want this contact to know my status after removal'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', callback=on_ok)], + modal=False).show() else: # several contact to remove at the same time pritext = _('Contacts will be removed from your roster') @@ -3403,8 +3408,7 @@ class RosterWindow: sectext = _('By removing these contacts:%s\nyou also remove ' 'authorization resulting in them always seeing you as ' 'offline.') % jids - ConfirmationDialog(pritext, sectext, - on_response_ok=(on_ok2, list_)) + ConfirmationDialog(pritext, sectext, on_response_ok=on_ok2) def on_send_custom_status(self, widget, contact_list, show, group=None): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/acd9f67d926e9c971aba82ef08cc2bfe1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/acd9f67d926e9c971aba82ef08cc2bfe1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HistoryManager: Use NewConfirmationDialog
by Philipp Hörist 26 Mar '19

26 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: acd9f67d by Philipp Hörist at 2019-03-26T20:47:18Z HistoryManager: Use NewConfirmationDialog - - - - - 3 changed files: - gajim/gtk/dialogs.py - gajim/gtk/themes.py - gajim/history_manager.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -19,6 +19,7 @@ from gi.repository import Gtk from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ +from gajim.common.const import ButtonAction from gajim.gtk.util import get_builder from gajim.gtk.util import load_icon @@ -47,6 +48,11 @@ class DialogButton(namedtuple('DialogButton', ('response text callback args ' elif type_ == 'Cancel': default_kwargs['response'] = Gtk.ResponseType.CANCEL default_kwargs['text'] = _('Cancel') + + elif type_ == 'Delete': + default_kwargs['response'] = Gtk.ResponseType.OK + default_kwargs['text'] = _('Delete') + default_kwargs['action'] = ButtonAction.DESTRUCTIVE else: raise ValueError('Unknown button type: %s ' % type_) ===================================== gajim/gtk/themes.py ===================================== @@ -323,13 +323,9 @@ class Themes(Gtk.ApplicationWindow): NewConfirmationDialog( _('Delete'), _('Delete Theme'), - _('Do you want to permanently ' - 'delete this theme?'), + _('Do you want to permanently delete this theme?'), [DialogButton.make('Cancel'), - DialogButton.make('OK', - text=_('Delete'), - callback=_remove_theme, - action=ButtonAction.DESTRUCTIVE)], + DialogButton.make('Delete', callback=_remove_theme)], transient_for=self) @staticmethod ===================================== gajim/history_manager.py ===================================== @@ -47,6 +47,7 @@ from gajim.common import app from gajim.common import i18n from gajim.common import configpaths from gajim.common.i18n import _ +from gajim.common.i18n import ngettext from gajim.common.const import StyleAttr from gajim.common.const import JIDConstant from gajim.common.const import KindConstant @@ -88,7 +89,8 @@ if is_standalone(): from gajim.common import helpers from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import ConfirmationDialog +from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import DialogButton from gajim.gtk.filechoosers import FileSaveDialog from gajim.gtk.util import convert_rgb_to_hex from gajim.gtk.util import get_builder @@ -539,7 +541,7 @@ class HistoryManager: if paths_len == 0: # nothing is selected return - def on_ok(liststore, list_of_paths): + def on_ok(): # delete all rows from db that match jid_id list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) @@ -567,21 +569,16 @@ class HistoryManager: self.AT_LEAST_ONE_DELETION_DONE = True - if paths_len == 1: - jid_id = '<i>%s</i>' % liststore[list_of_paths[0]][0] - pri_text = _('Do you wish to delete all correspondence with %(jid)s?') \ - % {'jid': jid_id} - else: - pri_text = _( - 'Do you wish to delete all correspondence with the selected contacts?') - dialog = ConfirmationDialog('', - _('This can not be undone.'), on_response_ok=(on_ok, - liststore, list_of_paths)) - dialog.set_title(_('Deletion Confirmation')) - dialog.set_markup(pri_text) - ok_button = dialog.get_children()[0].get_children()[1].get_children()[0] - ok_button.grab_focus() - dialog.set_transient_for(self._ui.history_manager_window) + NewConfirmationDialog( + _('Delete'), + ngettext('Delete Conversation', 'Delete Conversations', paths_len), + ngettext('Do you want to permanently delete this ' + 'conversation with <b>%s</b>', + 'Do you want to permanently delete these Conversations', + paths_len, liststore[list_of_paths[0]][0]), + [DialogButton.make('Cancel'), + DialogButton.make('Delete', callback=on_ok)], + transient_for=self._ui.history_manager_window) def _delete_logs(self, liststore, list_of_paths): paths_len = len(list_of_paths) @@ -610,16 +607,15 @@ class HistoryManager: self.AT_LEAST_ONE_DELETION_DONE = True - pri_text = i18n.ngettext( - 'Do you really want to delete the selected message?', - 'Do you really want to delete the selected messages?', paths_len) - dialog = ConfirmationDialog(pri_text, - _('This can not be undone.'), on_response_ok=(on_ok, - liststore, list_of_paths)) - dialog.set_title(_('Deletion Confirmation')) - ok_button = dialog.get_children()[0].get_children()[1].get_children()[0] - ok_button.grab_focus() - dialog.set_transient_for(self._ui.history_manager_window) + NewConfirmationDialog( + _('Delete'), + ngettext('Delete Message', 'Delete Messages', paths_len), + ngettext('Do you want to permanently delete this message', + 'Do you want to permanently delete these messages', + paths_len), + [DialogButton.make('Cancel'), + DialogButton.make('Delete', callback=on_ok)], + transient_for=self._ui.history_manager_window) def on_search_db_button_clicked(self, widget): text = self._ui.search_entry.get_text() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/acd9f67d926e9c971aba82ef08cc2bfe1f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/acd9f67d926e9c971aba82ef08cc2bfe1f… 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