Commits September 2020

commits@gajim.org

1 participants
105 discussions

[Git][gajim/gajim][master] Add helper method get_group_chat_nick()
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3e0bdbf8 by lovetox at 2020-09-06T20:28:16+02:00 Add helper method get_group_chat_nick() - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gui_interface.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1430,3 +1430,16 @@ def ask_for_status_message(status, signin=False): return app.settings.get('ask_offline_status') return app.settings.get('always_ask_for_status_message') + + +def get_group_chat_nick(account, room_jid): + nick = app.nicks[account] + + client = app.get_client(account) + + bookmark = client.get_module('Bookmarks').get_bookmark(room_jid) + if bookmark is not None: + if bookmark.nick is not None: + nick = bookmark.nick + + return nick ===================================== gajim/gui_interface.py ===================================== @@ -76,6 +76,7 @@ from gajim.common import helpers from gajim.common import passwords from gajim.common import logging_helpers from gajim.common.helpers import ask_for_status_message +from gajim.common.helpers import get_group_chat_nick from gajim.common.structs import MUCData from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ @@ -1347,15 +1348,12 @@ class Interface: @staticmethod def _create_muc_data(account, room_jid, nick, password, config): if not nick: - nick = app.nicks[account] + nick = get_group_chat_nick(account, room_jid) # Fetch data from bookmarks - con = app.connections[account] - bookmark = con.get_module('Bookmarks').get_bookmark(room_jid) + client = app.get_client(account) + bookmark = client.get_module('Bookmarks').get_bookmark(room_jid) if bookmark is not None: - if bookmark.nick is not None: - nick = bookmark.nick - if bookmark.password is not None: password = bookmark.password View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3e0bdbf8a4a52dde0ccfdd8192817ba6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3e0bdbf8a4a52dde0ccfdd8192817ba6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Interface: Allow to join group chat with custom nickname
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: b24f9433 by lovetox at 2020-09-06T20:18:56+02:00 Interface: Allow to join group chat with custom nickname - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -1345,8 +1345,9 @@ class Interface: mw.set_active_tab(control) @staticmethod - def _create_muc_data(account, room_jid, password, config): - nick = app.nicks[account] + def _create_muc_data(account, room_jid, nick, password, config): + if not nick: + nick = app.nicks[account] # Fetch data from bookmarks con = app.connections[account] @@ -1361,7 +1362,7 @@ class Interface: return MUCData(room_jid, nick, password, config) def create_groupchat(self, account, room_jid, config=None): - muc_data = self._create_muc_data(account, room_jid, None, config) + muc_data = self._create_muc_data(account, room_jid, None, None, config) self.create_groupchat_control(account, room_jid, muc_data) app.connections[account].get_module('MUC').create(muc_data) @@ -1370,11 +1371,21 @@ class Interface: return self.join_groupchat(account, room_jid, **kwargs) - def join_groupchat(self, account, room_jid, password=None, minimized=False): + def join_groupchat(self, + account, + room_jid, + password=None, + nick=None, + minimized=False): + if not app.account_is_available(account): return - muc_data = self._create_muc_data(account, room_jid, password, None) + muc_data = self._create_muc_data(account, + room_jid, + nick, + password, + None) self.create_groupchat_control( account, room_jid, muc_data, minimize=minimized) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b24f943342103c348616dca2c1ab7c57… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b24f943342103c348616dca2c1ab7c57… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControlBase: Fix infinite recursion
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: da425e41 by lovetox at 2020-09-06T18:35:17+02:00 ChatControlBase: Fix infinite recursion If the input textview is not sensitive it can’t get the focus. In that case propagate_key_event() would send the event again to the conversation textview. This would mean a recursion. Fixes #10259 - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -266,6 +266,12 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if textview.get_buffer().props.has_selection: return Gdk.EVENT_PROPAGATE + if not self.msg_textview.get_sensitive(): + # If the input textview is not sensitive it can’t get the focus. + # In that case propagate_key_event() would send the event again + # to the conversation textview. This would mean a recursion. + return Gdk.EVENT_PROPAGATE + # Focus the Message Input and resend the event textview.unselect() self.msg_textview.grab_focus() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/da425e411bd585ab2b3e1267dba62ff3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/da425e411bd585ab2b3e1267dba62ff3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dialogs: Use connect_after() for key-press-event
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a4f46f62 by lovetox at 2020-09-06T18:27:08+02:00 Dialogs: Use connect_after() for key-press-event This allows other widgets to handle the ESCAPE Key first and only if not other widget handled the key press exits the dialog - - - - - 9 changed files: - gajim/gtk/accounts.py - gajim/gtk/add_contact.py - gajim/gtk/advanced_config.py - gajim/gtk/blocking.py - gajim/gtk/bookmarks.py - gajim/gtk/mam_preferences.py - gajim/gtk/proxies.py - gajim/gtk/settings.py - gajim/gtk/themes.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -68,7 +68,7 @@ class AccountsWindow(Gtk.ApplicationWindow): self._menu.connect('menu-activated', self._on_menu_activated) self.connect('destroy', self._on_destroy) - self.connect('key-press-event', self._on_key_press) + self.connect_after('key-press-event', self._on_key_press) self.show_all() ===================================== gajim/gtk/add_contact.py ===================================== @@ -41,7 +41,7 @@ class AddNewContactWindow(Gtk.ApplicationWindow, EventHelper): self.set_resizable(False) self.set_title(_('Add Contact')) - self.connect('key-press-event', self._on_key_press) + self.connect_after('key-press-event', self._on_key_press) self.account = account self.adding_jid = False ===================================== gajim/gtk/advanced_config.py ===================================== @@ -103,7 +103,7 @@ class AdvancedConfig(Gtk.ApplicationWindow): treeview.set_model(self.modelfilter) - self.connect('key-press-event', self._on_key_press) + self.connect_after('key-press-event', self._on_key_press) self._ui.connect_signals(self) self.show_all() @@ -111,9 +111,6 @@ class AdvancedConfig(Gtk.ApplicationWindow): if event.keyval != Gdk.KEY_Escape: return - if self.renderer_text.get_property('editing'): - return - if self._ui.search_entry.get_text(): self._ui.search_entry.set_text('') return ===================================== gajim/gtk/blocking.py ===================================== @@ -37,7 +37,7 @@ class BlockingList(Gtk.ApplicationWindow): self.set_show_menubar(False) self.set_title(_('Blocking List for %s') % account) - self.connect('key-press-event', self._on_key_press) + self.connect_after('key-press-event', self._on_key_press) self.account = account self._con = app.connections[account] ===================================== gajim/gtk/bookmarks.py ===================================== @@ -64,7 +64,7 @@ class Bookmarks(Gtk.ApplicationWindow): self._ui.bookmarks_view.set_search_equal_func(self._search_func) self._ui.connect_signals(self) - self.connect('key-press-event', self._on_key_press) + self.connect_after('key-press-event', self._on_key_press) self.show_all() ===================================== gajim/gtk/mam_preferences.py ===================================== @@ -41,7 +41,7 @@ class MamPreferences(Gtk.ApplicationWindow, EventHelper): self.set_show_menubar(False) self.set_title(_('Archiving Preferences for %s') % account) - self.connect('key-press-event', self._on_key_press) + self.connect_after('key-press-event', self._on_key_press) self.account = account self._con = app.connections[account] ===================================== gajim/gtk/proxies.py ===================================== @@ -38,7 +38,7 @@ class ManageProxies(Gtk.ApplicationWindow): self._init_list() self._block_signal = False - self.connect('key-press-event', self._on_key_press) + self.connect_after('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) self.show_all() ===================================== gajim/gtk/settings.py ===================================== @@ -61,7 +61,7 @@ class SettingsDialog(Gtk.ApplicationWindow): self.add(self.listbox) self.show_all() - self.connect('key-press-event', self.on_key_press) + self.connect_after('key-press-event', self.on_key_press) def on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: ===================================== gajim/gtk/themes.py ===================================== @@ -200,10 +200,16 @@ class Themes(Gtk.ApplicationWindow): self._ui.connect_signals(self) self.connect('destroy', self._on_destroy) + self.connect_after('key-press-event', self._on_key_press) + self.show_all() self._fill_choose_listbox() + def _on_key_press(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + def _get_themes(self): for theme in app.css_config.themes: self._ui.theme_store.append([theme]) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a4f46f62c9ce73e6cc83cddde2f944c0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a4f46f62c9ce73e6cc83cddde2f944c0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Allow bind_signal() to be inverted
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3befd602 by lovetox at 2020-09-06T16:19:10+02:00 Settings: Allow bind_signal() to be inverted - - - - - 2 changed files: - gajim/common/settings.py - gajim/gtk/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -27,7 +27,6 @@ from pathlib import Path from collections import namedtuple from collections import defaultdict -from gi.module import FunctionInfo from gi.repository import GLib from gajim import IS_PORTABLE @@ -93,19 +92,26 @@ class _Settings: def disconnect_signals(self, object_): for _, handlers in self._callbacks.items(): for handler in list(handlers): - if isinstance(handler, FunctionInfo): + if isinstance(handler, tuple): continue func = handler() if func is None or func.__self__ is object_: handlers.remove(handler) - def bind_signal(self, setting, widget, func_name, account=None, jid=None): + def bind_signal(self, + setting, + widget, + func_name, + account=None, + jid=None, + inverted=False): + callbacks = self._callbacks[(setting, account, jid)] func = getattr(widget, func_name) - callbacks.append(func) + callbacks.append((func, inverted)) def _on_destroy(*args): - callbacks.remove(func) + callbacks.remove((func, inverted)) widget.connect('destroy', _on_destroy) @@ -114,7 +120,11 @@ class _Settings: callbacks = self._callbacks[(setting, account, jid)] for func in list(callbacks): - if isinstance(func, FunctionInfo): + if isinstance(func, tuple): + func, inverted = func + if inverted: + value = not value + try: func(value) except Exception: ===================================== gajim/gtk/settings.py ===================================== @@ -195,16 +195,17 @@ class GenericSetting(Gtk.ListBoxRow): if self.bind is None: return - app.settings.connect_signal(self.bind, - self._on_setting_changed, - account=self.account) - - value = app.settings.get_account_setting(self.account, self.bind) - if self.inverted: - value = not value - self.set_sensitive(value) + app.settings.bind_signal(self.bind, + self, + 'set_sensitive', + account=self.account, + inverted=self.inverted) + + if self.account is not None: + value = app.settings.get_account_setting(self.account, self.bind) + else: + value = app.settings.get(self.bind) - def _on_setting_changed(self, value, *args): if self.inverted: value = not value self.set_sensitive(value) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3befd6022a35eabb3e64c21c89b13911… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3befd6022a35eabb3e64c21c89b13911… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConfirmationDialog: Add css styling
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7cfe520a by lovetox at 2020-09-06T12:43:02+02:00 ConfirmationDialog: Add css styling - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/dialogs.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -338,3 +338,6 @@ popover.combo list { border-style: none; background-color: transparent; } popover.combo list > row { padding: 0px 12px 0px 12px; min-height: 50px; } popover.combo list > row:not(:last-child) { border-bottom: 1px solid alpha(#cdc7c2, 0.5); } popover.combo scrollbar.vertical { padding-top: 2px; padding-bottom: 2px; } + + +messagedialog.confirmation-dialog > box { margin-top: 18px; } ===================================== gajim/gtk/dialogs.py ===================================== @@ -424,6 +424,8 @@ class ConfirmationDialog(Gtk.MessageDialog): message_type=Gtk.MessageType.QUESTION, modal=modal) + self.get_style_context().add_class('confirmation-dialog') + self._buttons = {} for button in buttons: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7cfe520a4ea1e292550d249c6c49b5bf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7cfe520a4ea1e292550d249c6c49b5bf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rename NewConfirmationDialog
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 050e58ee by lovetox at 2020-09-06T12:37:42+02:00 Rename NewConfirmationDialog - - - - - 14 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/groupchat_control.py - gajim/gtk/accounts.py - gajim/gtk/dialogs.py - gajim/gtk/filetransfer.py - gajim/gtk/mam_preferences.py - gajim/gtk/status_change.py - gajim/gtk/themes.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/message_window.py - gajim/plugins/gui.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -58,7 +58,7 @@ from gajim import gui_menu_builder from gajim import dialogs from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.util import get_cursor from gajim.gtk.util import format_mood @@ -406,7 +406,7 @@ class ChatControl(ChatControlBase): return app.interface.roster.draw_contact(self.contact.jid, self.account) - NewConfirmationDialog( + ConfirmationDialog( _('Block Contact'), _('Really block this contact?'), _('You will appear offline for this contact and you will ' @@ -1147,7 +1147,7 @@ class ChatControl(ChatControlBase): if more: text += '\n' + more - NewConfirmationDialog( + ConfirmationDialog( _('Close'), _('New Message'), text, ===================================== gajim/chat_control_base.py ===================================== @@ -52,7 +52,7 @@ from gajim import gtkgui_helpers from gajim.conversation_textview import ConversationTextview from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import PastePreviewDialog from gajim.gtk.message_input import MessageInputTextView from gajim.gtk.util import at_the_end @@ -1303,7 +1303,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): contact = app.contacts.get_contact(self.account, gc_contact.jid) if not contact or contact.sub not in ('both', 'to'): - NewConfirmationDialog( + ConfirmationDialog( _('Privacy'), _('Warning'), _('If you send a file to %s, your real XMPP ' ===================================== gajim/groupchat_control.py ===================================== @@ -63,9 +63,9 @@ from gajim.chat_control_base import ChatControlBase from gajim.command_system.implementation.hosts import GroupChatCommands from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationCheckDialog +from gajim.gtk.dialogs import ConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.adhoc import AdHocCommand @@ -847,7 +847,7 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] con.get_module('MUC').approve_voice_request(self.room_jid, event.voice_request) - NewConfirmationDialog( + ConfirmationDialog( _('Voice Request'), _('Voice Request'), _('%(nick)s from %(room_name)s requests voice') % { @@ -1735,7 +1735,7 @@ class GroupchatControl(ChatControlBase): app.settings.set('confirm_close_muc', False) on_no(self) - NewConfirmationCheckDialog( + ConfirmationCheckDialog( _('Leave Group Chat'), _('Are you sure you want to leave this group chat?'), _('If you close this window, you will leave ' ===================================== gajim/gtk/accounts.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import passwords from gajim.common.i18n import _ from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.const import Setting from gajim.gtk.const import SettingKind from gajim.gtk.const import SettingType @@ -118,7 +118,7 @@ class AccountsWindow(Gtk.ApplicationWindow): reconnect=True, destroy_client=True) - NewConfirmationDialog( + ConfirmationDialog( _('Re-Login'), _('Re-Login now?'), _('To apply all changes instantly, you have to re-login.'), @@ -533,7 +533,7 @@ class AccountRow(Gtk.ListBoxRow): if (account in app.connections and not app.connections[account].state.is_disconnected): # Connecting or connected - NewConfirmationDialog( + ConfirmationDialog( _('Disable Account'), _('Account %s is still connected') % account, _('All chat and group chat windows will be closed.'), ===================================== gajim/gtk/dialogs.py ===================================== @@ -412,7 +412,7 @@ class PassphraseDialog: self.cancel_handler() -class NewConfirmationDialog(Gtk.MessageDialog): +class ConfirmationDialog(Gtk.MessageDialog): def __init__(self, title, text, sec_text, buttons, modal=True, transient_for=None): if transient_for is None: @@ -460,16 +460,19 @@ class NewConfirmationDialog(Gtk.MessageDialog): self.show_all() -class NewConfirmationCheckDialog(NewConfirmationDialog): +NewConfirmationDialog = ConfirmationDialog + + +class ConfirmationCheckDialog(ConfirmationDialog): 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) + ConfirmationDialog.__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) @@ -491,17 +494,20 @@ class NewConfirmationCheckDialog(NewConfirmationDialog): super()._on_response(_dialog, response) -class PastePreviewDialog(NewConfirmationCheckDialog): +NewConfirmationCheckDialog = ConfirmationCheckDialog + + +class PastePreviewDialog(ConfirmationCheckDialog): def __init__(self, title, text, sec_text, check_text, image, buttons, modal=True, transient_for=None): - NewConfirmationCheckDialog.__init__(self, - title, - text, - sec_text, - check_text, - buttons, - transient_for=transient_for, - modal=modal) + ConfirmationCheckDialog.__init__(self, + title, + text, + sec_text, + check_text, + buttons, + transient_for=transient_for, + modal=modal) preview = Gtk.Image() preview.set_halign(Gtk.Align.CENTER) @@ -523,16 +529,16 @@ class PastePreviewDialog(NewConfirmationCheckDialog): content_area.reorder_child(preview, 2) -class InputDialog(NewConfirmationDialog): +class InputDialog(ConfirmationDialog): def __init__(self, title, text, sec_text, buttons, input_str=None, transient_for=None, modal=True): - NewConfirmationDialog.__init__(self, - title, - text, - sec_text, - buttons, - transient_for=transient_for, - modal=modal) + ConfirmationDialog.__init__(self, + title, + text, + sec_text, + buttons, + transient_for=transient_for, + modal=modal) self._entry = Gtk.Entry() self._entry.set_activates_default(True) ===================================== gajim/gtk/filetransfer.py ===================================== @@ -42,7 +42,7 @@ from gajim.common.modules.bytestream import (is_transfer_active, is_transfer_stopped) from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import HigDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import ErrorDialog @@ -329,7 +329,7 @@ class FileTransfersWindow: file_name = os.path.basename(file_props.file_name) else: file_name = file_props.name - NewConfirmationDialog( + ConfirmationDialog( _('File Transfer Error'), _('File Transfer Error'), _('The file %s has been received, but it seems to have ' @@ -420,7 +420,7 @@ class FileTransfersWindow: con.get_module('Bytestream').send_file_rejection( file_props) - NewConfirmationDialog( + ConfirmationDialog( _('File Transfer Conflict'), _('File already exists'), _('Resume download or replace file?'), @@ -481,7 +481,7 @@ class FileTransfersWindow: app.connections[account].get_module( 'Bytestream').send_file_rejection(file_props) - NewConfirmationDialog( + ConfirmationDialog( _('File Transfer Request'), _('%s wants to send you a file') % contact.get_shown_name(), sectext, ===================================== gajim/gtk/mam_preferences.py ===================================== @@ -26,7 +26,7 @@ from gajim.gtk.util import get_builder from gajim.gtk.util import EventHelper from gajim.gtk.util import ensure_not_destroyed from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import InformationDialog log = logging.getLogger('gajim.gtk.mam_preferences') @@ -94,7 +94,7 @@ class MamPreferences(Gtk.ApplicationWindow, EventHelper): def _on_ok(): self.destroy() - NewConfirmationDialog( + ConfirmationDialog( _('Archiving Preferences'), _('Archiving Preferences Saved'), _('Your archiving preferences have successfully been saved.'), ===================================== gajim/gtk/status_change.py ===================================== @@ -25,7 +25,7 @@ from gajim.common.i18n import _ from gajim.gtk.dialogs import TimeoutWindow from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.util import get_builder from gajim.gtk.util import get_activity_icon_name @@ -435,7 +435,7 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): self._get_presets() if preset_name in self._presets: - NewConfirmationDialog( + ConfirmationDialog( _('Overwrite'), _('Overwrite Status Message?'), _('This name is already in use. Do you want to ' ===================================== gajim/gtk/themes.py ===================================== @@ -27,7 +27,7 @@ from gajim.common.const import StyleAttr from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.util import get_builder from gajim.gtk.util import get_app_window @@ -348,7 +348,7 @@ class Themes(Gtk.ApplicationWindow): text = _('This is the theme you are currently using.\n' 'Do you want to delete this theme?') - NewConfirmationDialog( + ConfirmationDialog( _('Delete'), _('Delete Theme'), text, ===================================== gajim/gui_interface.py ===================================== @@ -94,8 +94,8 @@ from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog -from gajim.gtk.dialogs import NewConfirmationDialog -from gajim.gtk.dialogs import NewConfirmationCheckDialog +from gajim.gtk.dialogs import ConfirmationDialog +from gajim.gtk.dialogs import ConfirmationCheckDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import InvitationReceivedDialog @@ -175,7 +175,7 @@ class Interface: sec_msg = obj.msg + '\n' + sec_msg message = message + '\n' + sec_msg - NewConfirmationDialog( + ConfirmationDialog( _('Authorization Request'), _('HTTP Authorization Request'), message, @@ -327,7 +327,7 @@ class Interface: name = contact.get_shown_name() jid = contact.jid - NewConfirmationDialog( + ConfirmationDialog( _('Subscription Removed'), _('%(name)s (%(jid)s) has removed subscription from you') % { 'name': name, 'jid': jid}, @@ -971,7 +971,7 @@ class Interface: obj.exchange_items_list, obj.fjid) def handle_event_plain_connection(self, event): - NewConfirmationDialog( + ConfirmationDialog( _('Insecure Connection'), _('Insecure Connection'), _('You are about to connect to the account %(account)s ' @@ -1887,7 +1887,7 @@ class Interface: def _on_check(): self._get_latest_release() - NewConfirmationDialog( + ConfirmationDialog( _('Update Check'), _('Gajim Update Check'), _('Search for Gajim updates periodically?'), @@ -1934,7 +1934,7 @@ class Interface: app.settings.set('check_for_update', False) helpers.open_uri('https://gajim.org/download') - NewConfirmationCheckDialog( + ConfirmationCheckDialog( _('Update Available'), _('Gajim Update Available'), _('There is an update available for Gajim ' ===================================== gajim/history_manager.py ===================================== @@ -91,7 +91,7 @@ if is_standalone(): from gajim.common import helpers from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import DialogButton from gajim.gtk.filechoosers import FileSaveDialog from gajim.gtk.util import convert_rgb_to_hex @@ -251,7 +251,7 @@ class HistoryManager: if is_standalone(): Gtk.main_quit() - NewConfirmationDialog( + ConfirmationDialog( _('Database Cleanup'), _('Clean up the database?'), _('This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n' @@ -573,7 +573,7 @@ class HistoryManager: self.AT_LEAST_ONE_DELETION_DONE = True - NewConfirmationDialog( + ConfirmationDialog( _('Delete'), ngettext('Delete Conversation', 'Delete Conversations', paths_len), ngettext('Do you want to permanently delete this ' @@ -612,7 +612,7 @@ class HistoryManager: self.AT_LEAST_ONE_DELETION_DONE = True - NewConfirmationDialog( + ConfirmationDialog( _('Delete'), ngettext('Delete Message', 'Delete Messages', paths_len), ngettext('Do you want to permanently delete this message?', ===================================== gajim/message_window.py ===================================== @@ -42,7 +42,7 @@ from gajim.chat_control_base import ChatControlBase from gajim.chat_control import ChatControl from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationCheckDialog +from gajim.gtk.dialogs import ConfirmationCheckDialog from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import move_window @@ -361,7 +361,7 @@ class MessageWindow(EventHelper): # destroy window return False - NewConfirmationCheckDialog( + ConfirmationCheckDialog( _('Close Tabs'), _('You are about to close several tabs'), _('Do you really want to close all of them?'), ===================================== gajim/plugins/gui.py ===================================== @@ -40,7 +40,7 @@ from gajim.plugins.plugins_i18n import _ from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.filechoosers import ArchiveChooserDialog from gajim.gtk.util import get_builder from gajim.gtk.util import load_icon @@ -283,7 +283,7 @@ class PluginsWindow(Gtk.ApplicationWindow, EventHelper): _show_warn_dialog() return - NewConfirmationDialog( + ConfirmationDialog( _('Overwrite Plugin?'), _('Plugin already exists'), _('Do you want to overwrite the currently installed version?'), ===================================== gajim/roster_window.py ===================================== @@ -62,8 +62,8 @@ from gajim.common import ged from gajim.message_window import MessageWindowMgr from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog -from gajim.gtk.dialogs import NewConfirmationCheckDialog +from gajim.gtk.dialogs import ConfirmationDialog +from gajim.gtk.dialogs import ConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import WarningDialog @@ -2191,7 +2191,7 @@ class RosterWindow: if is_checked: app.settings.set('quit_on_roster_x_button', True) self.on_quit_request() - NewConfirmationCheckDialog( + ConfirmationCheckDialog( _('Quit Gajim'), _('You are about to quit Gajim'), _('Are you sure you want to quit Gajim?'), @@ -2285,7 +2285,7 @@ class RosterWindow: break if transfer_active: - NewConfirmationDialog( + ConfirmationDialog( _('Stop File Transfers'), _('You still have running file transfers'), _('If you quit now, the file(s) being transferred will ' @@ -2326,7 +2326,7 @@ class RosterWindow: break if unread or recent: - NewConfirmationDialog( + ConfirmationDialog( _('Unread Messages'), _('You still have unread messages'), _('Messages will only be available for reading them later ' @@ -2600,7 +2600,7 @@ class RosterWindow: sectext = _('You will no longer be able to send and receive ' 'messages from and to contacts using these ' 'transports:\n%s') % jids - NewConfirmationDialog( + ConfirmationDialog( _('Remove Transport'), pritext, sectext, @@ -2654,7 +2654,7 @@ class RosterWindow: _block_it() return - NewConfirmationCheckDialog( + ConfirmationCheckDialog( _('Block Contact'), _('Really block this contact?'), _('You will appear offline for this contact and you ' @@ -2761,7 +2761,7 @@ class RosterWindow: 'Presence').unsubscribe(contact.jid) self.remove_contact(contact.jid, account, backend=True) - NewConfirmationCheckDialog( + ConfirmationCheckDialog( _('Remove Group'), _('Remove Group'), _('Do you want to remove %s from the contact list?') % group, @@ -3082,7 +3082,7 @@ class RosterWindow: 'name': contact.get_shown_name(), 'jid': contact.jid} if contact.sub == 'to': - NewConfirmationDialog( + ConfirmationDialog( title, pritext, sectext + \ @@ -3093,7 +3093,7 @@ class RosterWindow: callback=on_ok2)]).show() elif _('Not in contact list') in contact.get_shown_groups(): # Contact is not in roster - NewConfirmationDialog( + ConfirmationDialog( title, pritext, sectext + \ @@ -3102,7 +3102,7 @@ class RosterWindow: DialogButton.make('Remove', callback=on_ok2)]).show() else: - NewConfirmationCheckDialog( + ConfirmationCheckDialog( title, pritext, sectext + \ @@ -3124,7 +3124,7 @@ class RosterWindow: sectext = _('By removing the following contacts, you will also ' 'remove authorization. This means they will see you ' 'as offline:\n\n%s') % jids - NewConfirmationDialog( + ConfirmationDialog( _('Remove Contacts'), pritext, sectext, @@ -3762,7 +3762,7 @@ class RosterWindow: sectext = _('Metacontacts are a way to regroup several contacts in ' 'one single contact. Generally it is used when the same ' 'person has several XMPP- or Transport-Accounts.') - NewConfirmationCheckDialog( + ConfirmationCheckDialog( _('Create Metacontact'), pritext, sectext, @@ -3905,7 +3905,7 @@ class RosterWindow: for uri in uri_splitted: path = helpers.get_file_path_from_dnd_dropped_uri(uri) text += '\n' + os.path.basename(path) - NewConfirmationDialog( + ConfirmationDialog( _('File Transfer'), _('File Transfer'), text, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/050e58ee3fbe09baca9a4c5b52d34e20… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/050e58ee3fbe09baca9a4c5b52d34e20… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Settings: Add bind_signal()
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6ab6bdaf by lovetox at 2020-09-06T12:19:14+02:00 Settings: Add bind_signal() This allows to bind the value of a specific setting to a widget method like set_sensitive() or set_visible() - - - - - 738723c6 by lovetox at 2020-09-06T12:19:14+02:00 Settings: Pass func as string - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -27,6 +27,7 @@ from pathlib import Path from collections import namedtuple from collections import defaultdict +from gi.module import FunctionInfo from gi.repository import GLib from gajim import IS_PORTABLE @@ -85,26 +86,51 @@ class _Settings: # remove the func once it should not be called anymore raise ValueError('Only bound methods can be connected') + func = weakref.WeakMethod(func) self._callbacks[(setting, account, jid)].append(func) def disconnect_signals(self, object_): for _, handlers in self._callbacks.items(): for handler in list(handlers): + if isinstance(handler, FunctionInfo): + continue func = handler() if func is None or func.__self__ is object_: handlers.remove(handler) + def bind_signal(self, setting, widget, func_name, account=None, jid=None): + callbacks = self._callbacks[(setting, account, jid)] + func = getattr(widget, func_name) + callbacks.append(func) + + def _on_destroy(*args): + callbacks.remove(func) + + widget.connect('destroy', _on_destroy) + def _notify(self, value, setting, account=None, jid=None): log.info('Signal: %s changed', setting) callbacks = self._callbacks[(setting, account, jid)] for func in list(callbacks): + if isinstance(func, FunctionInfo): + try: + func(value) + except Exception: + log.exception('Error while executing signal callback') + continue + if func() is None: callbacks.remove(func) continue + + func = func() + if func is None: + continue + try: - func()(value, setting, account, jid) + func(value, setting, account, jid) except Exception: log.exception('Error while executing signal callback') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1b9ccad1636c7f59d5cadd22bb35e99… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1b9ccad1636c7f59d5cadd22bb35e99… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Show preview when pasting image from clipboard
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1b9ccad1 by wurstsalat at 2020-09-06T12:02:31+02:00 Show preview when pasting image from clipboard - - - - - 3 changed files: - gajim/chat_control_base.py - gajim/gtk/dialogs.py - gajim/gtk/util.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -53,7 +53,7 @@ from gajim.conversation_textview import ConversationTextview from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog -from gajim.gtk.dialogs import NewConfirmationCheckDialog +from gajim.gtk.dialogs import PastePreviewDialog from gajim.gtk.message_input import MessageInputTextView from gajim.gtk.util import at_the_end from gajim.gtk.util import get_show_in_roster @@ -731,12 +731,13 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if not app.settings.get('confirm_paste_image'): self._paste_event_confirmed(True, image) return - NewConfirmationCheckDialog( + PastePreviewDialog( _('Paste Image'), _('You are trying to paste an image'), _('Are you sure you want to paste your ' 'clipboard\'s image into the chat window?'), _('_Do not ask me again'), + image, [DialogButton.make('Cancel'), DialogButton.make('Accept', text=_('_Paste'), ===================================== gajim/gtk/dialogs.py ===================================== @@ -18,6 +18,7 @@ from collections import namedtuple from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import GdkPixbuf from gi.repository import Pango from gajim.common import app @@ -26,6 +27,7 @@ from gajim.common.const import ButtonAction from gajim.common.helpers import convert_gio_to_openssl_cert from gajim.gtk.util import get_builder +from gajim.gtk.util import get_thumbnail_size class DialogButton(namedtuple('DialogButton', ('response text callback args ' @@ -489,6 +491,38 @@ class NewConfirmationCheckDialog(NewConfirmationDialog): super()._on_response(_dialog, response) +class PastePreviewDialog(NewConfirmationCheckDialog): + def __init__(self, title, text, sec_text, check_text, image, + buttons, modal=True, transient_for=None): + NewConfirmationCheckDialog.__init__(self, + title, + text, + sec_text, + check_text, + buttons, + transient_for=transient_for, + modal=modal) + + preview = Gtk.Image() + preview.set_halign(Gtk.Align.CENTER) + preview.get_style_context().add_class('preview-image') + size = 300 + image_width = image.get_width() + image_height = image.get_height() + + if size > image_width and size > image_height: + preview.set_from_pixbuf(image) + else: + thumb_width, thumb_height = get_thumbnail_size(image, size) + pixbuf_scaled = image.scale_simple( + thumb_width, thumb_height, GdkPixbuf.InterpType.BILINEAR) + preview.set_from_pixbuf(pixbuf_scaled) + + content_area = self.get_content_area() + content_area.pack_start(preview, True, True, 0) + content_area.reorder_child(preview, 2) + + class InputDialog(NewConfirmationDialog): def __init__(self, title, text, sec_text, buttons, input_str=None, transient_for=None, modal=True): ===================================== gajim/gtk/util.py ===================================== @@ -23,6 +23,7 @@ from typing import Optional import sys import weakref import logging +import math import textwrap import functools from importlib import import_module @@ -757,6 +758,25 @@ def load_pixbuf(path, size=None): return pixbuf +def get_thumbnail_size(pixbuf, size): + # Calculates the new thumbnail size while preserving the aspect ratio + image_width = pixbuf.get_width() + image_height = pixbuf.get_height() + + if image_width > image_height: + if image_width > size: + image_height = math.ceil( + (size / float(image_width) * image_height)) + image_width = int(size) + else: + if image_height > size: + image_width = math.ceil( + (size / float(image_height) * image_width)) + image_height = int(size) + + return image_width, image_height + + def make_href_markup(string): url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) color = convert_rgb_to_hex(url_color) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1b9ccad1636c7f59d5cadd22bb35e996… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1b9ccad1636c7f59d5cadd22bb35e996… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControlBase: Properly handle ENTER key if send_on_ctrl_enter is active
by Philipp Hörist 06 Sep '20

06 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: cbc7e8be by Andrey Gursky at 2020-09-06T10:36:55+02:00 ChatControlBase: Properly handle ENTER key if send_on_ctrl_enter is active Fixes #10258 - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -894,6 +894,10 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if not app.settings.get('send_on_ctrl_enter'): textview.insert_newline() return True + else: + if app.settings.get('send_on_ctrl_enter'): + textview.insert_newline() + return True if not app.account_is_available(self.account): # we are not connected View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cbc7e8be076eb1200518af8cb8318aff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cbc7e8be076eb1200518af8cb8318aff… 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 September 2020