Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Use Accept (and make it the default) for image pasting
by Philipp Hörist 10 Sep '19

10 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a27a4003 by Daniel Brötzmann at 2019-09-07T15:09:32Z Use Accept (and make it the default) for image pasting - - - - - d47bee03 by Daniel Brötzmann at 2019-09-07T15:10:23Z Use Accept default button, adapt some text strings - - - - - 07bb750d by Daniel Brötzmann at 2019-09-09T12:35:06Z Fix handle_event_http_auth answers from NewConfirmationDialog - - - - - 10 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtk/accounts.py - gajim/gtk/filetransfer.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/message_window.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1152,7 +1152,7 @@ class ChatControl(ChatControlBase): [DialogButton.make('Cancel', callback=lambda: on_no(self)), DialogButton.make('Remove', - text=_('Close'), + text=_('_Close'), callback=lambda: on_yes(self))], transient_for=self.parent_win.window).show() return ===================================== gajim/chat_control_base.py ===================================== @@ -622,8 +622,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): 'clipboard\'s image into the chat window?'), _('_Do not ask me again'), [DialogButton.make('Cancel'), - DialogButton.make('OK', + DialogButton.make('Accept', text=_('_Paste'), + is_default=True, callback=self._paste_event_confirmed, args=[image])]).show() @@ -1167,12 +1168,12 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): NewConfirmationDialog( _('Privacy'), _('Warning'), - _('If you send a file to %s, ' - 'your real JID will be revealed.' % gc_contact.name), + _('If you send a file to %s, your real XMPP ' + 'address will be revealed.' % gc_contact.name), [DialogButton.make('Cancel'), DialogButton.make( 'OK', - text=_('Continue'), + text=_('_Continue'), callback=lambda: _on_ok(gc_contact))]).show() return _on_ok(gc_contact) ===================================== gajim/dialogs.py ===================================== @@ -667,11 +667,12 @@ class ChangeStatusMessageDialog(TimeoutDialog): self.countdown_enabled = False start_iter, finish_iter = self.message_buffer.get_bounds() status_message_to_save_as_preset = self.message_buffer.get_text( - start_iter, finish_iter, True) + start_iter, finish_iter, True) + def on_ok(msg_name): msg_text = status_message_to_save_as_preset msg_text_1l = helpers.to_one_line(msg_text) - if not msg_name: # msg_name was '' + if not msg_name: # msg_name was '' msg_name = msg_text_1l def _on_ok2(): @@ -681,23 +682,23 @@ class ChangeStatusMessageDialog(TimeoutDialog): self.pep_dict.get('activity_text'), self.pep_dict.get('mood'), self.pep_dict.get('mood_text')] app.config.set_per('statusmsg', msg_name, 'message', - msg_text_1l) + msg_text_1l) app.config.set_per('statusmsg', msg_name, 'activity', - self.pep_dict.get('activity')) + self.pep_dict.get('activity')) app.config.set_per('statusmsg', msg_name, 'subactivity', - self.pep_dict.get('subactivity')) + self.pep_dict.get('subactivity')) app.config.set_per('statusmsg', msg_name, 'activity_text', - self.pep_dict.get('activity_text')) + self.pep_dict.get('activity_text')) app.config.set_per('statusmsg', msg_name, 'mood', - self.pep_dict.get('mood')) + self.pep_dict.get('mood')) app.config.set_per('statusmsg', msg_name, 'mood_text', - self.pep_dict.get('mood_text')) + self.pep_dict.get('mood_text')) if msg_name in self.preset_messages_dict: NewConfirmationDialog( _('Overwrite'), _('Overwrite Status Message?'), - _('Preset name is already in use. ' - 'Do you want to overwrite this preset?'), + _('This name is already in use. Do you want to ' + 'overwrite this preset?'), [DialogButton.make('Cancel'), DialogButton.make('Remove', text=_('_Overwrite'), ===================================== gajim/groupchat_control.py ===================================== @@ -64,7 +64,6 @@ from gajim.common import contacts from gajim.common.const import StyleAttr from gajim.common.const import Chatstate from gajim.common.const import MUCJoinedState -from gajim.common.const import ButtonAction from gajim.chat_control_base import ChatControlBase @@ -1174,9 +1173,8 @@ class GroupchatControl(ChatControlBase): _('%s from %s requests voice') % ( event.voice_request.nick, self.room_name), [DialogButton.make('Cancel'), - DialogButton.make('OK', - text=_('Approve'), - action=ButtonAction.SUGGESTED, + DialogButton.make('Accept', + text=_('_Approve'), callback=on_approve)], modal=False).show() @@ -2278,8 +2276,9 @@ class GroupchatControl(ChatControlBase): _('_Do not ask me again'), [DialogButton.make('Cancel', callback=on_cancel), - DialogButton.make('OK', + DialogButton.make('Accept', text=_('_Leave'), + is_default=True, callback=on_ok)], transient_for=self.parent_win.window).show() return ===================================== gajim/gtk/accounts.py ===================================== @@ -139,7 +139,7 @@ class AccountsWindow(Gtk.ApplicationWindow): _('To apply all changes instantly, you have to re-login.'), [DialogButton.make('Cancel', text=_('_Later')), - DialogButton.make('OK', + DialogButton.make('Accept', text=_('_Re-Login'), callback=lambda *args: relog(account))], transient_for=self).show() @@ -193,8 +193,7 @@ class AccountsWindow(Gtk.ApplicationWindow): NewConfirmationDialog( _('Remove Account'), _('You still have open chats in your account %s') % account, - _('All chat and group chat windows will be closed.\n' - 'Do you want to continue?'), + _('All chat and group chat windows will be closed.'), [DialogButton.make('Cancel'), DialogButton.make('Remove', callback=remove)], @@ -571,8 +570,7 @@ class AccountRow(Gtk.ListBoxRow): NewConfirmationDialog( _('Disable Account'), _('Account %s is still connected') % account, - _('All chat and group chat windows will be closed. ' - 'Do you want to continue?'), + _('All chat and group chat windows will be closed.'), [DialogButton.make('Cancel', callback=lambda: switch.set_active(True)), DialogButton.make('Remove', @@ -972,13 +970,13 @@ class RemoveAccountWindow: else: self._on_remove_success(True) - if self.account in app.connections and \ - app.connections[self.account].connected: + if (self.account in app.connections and + app.connections[self.account].connected): NewConfirmationDialog( _('Remove Account'), - _('Account \'%s\' is still connected to the ' - 'server') % self.account, - _('If you remove it, the connection will be lost.'), + _('Still connected to the server'), + _('Account \'%s\' is still connected to the server. If you ' + 'remove it, the connection will be lost.') % self.account, [DialogButton.make('Cancel'), DialogButton.make('Remove', callback=remove)], ===================================== gajim/gtk/filetransfer.py ===================================== @@ -336,7 +336,7 @@ class FileTransfersWindow: 'Do you want to download it again?') % file_name, [DialogButton.make('Cancel', text=_('_No')), - DialogButton.make('OK', + DialogButton.make('Accept', text=_('_Download Again'), callback=on_yes, args=[jid, @@ -421,16 +421,17 @@ class FileTransfersWindow: NewConfirmationDialog( _('File Transfer Conflict'), - _('This file already exists'), + _('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() + callback=_on_resume), + DialogButton.make('Accept', + text=_('Replace _File'), + is_default=True, + callback=_on_replace)]).show() # File does not exist yet dirname = os.path.dirname(file_path) @@ -486,8 +487,7 @@ class FileTransfersWindow: sectext, [DialogButton.make('Cancel', callback=_on_cancel), - DialogButton.make('OK', - text=_('_Accept'), + DialogButton.make('Accept', callback=_on_ok)]).show() def set_status(self, file_props, status): ===================================== gajim/gui_interface.py ===================================== @@ -167,7 +167,7 @@ class Interface: obj.stanza, answer) account = obj.conn.name - pri_msg = _('HTTP (%(method)s) Authorization ' + message = _('HTTP (%(method)s) Authorization ' 'for %(url)s (ID: %(id)s)') % { 'method': obj.method, 'url': obj.url, @@ -177,19 +177,19 @@ class Interface: sec_msg = _('Do you accept this request (account: %s)?') % account if obj.msg: sec_msg = obj.msg + '\n' + sec_msg + message = message + '\n' + sec_msg NewConfirmationDialog( - _('Authorization'), - pri_msg, - sec_msg, + _('Authorization Request'), + _('HTTP Authorization Request'), + message, [DialogButton.make('Cancel', text=_('_No'), callback=_response, - args=[obj, 'yes']), - DialogButton.make('OK', - text=_('_Accept'), + args=[obj, 'no']), + DialogButton.make('Accept', callback=_response, - args=[obj, 'no'])]).show() + args=[obj, 'yes'])]).show() def handle_event_iq_error(self, event): ctrl = self.msg_win_mgr.get_control(event.properties.jid.getBare(), ===================================== gajim/history_manager.py ===================================== @@ -245,9 +245,9 @@ class HistoryManager: NewConfirmationDialog( _('Database Cleanup'), - _('Do you want to clean up the database? ' - '(STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)'), - _('Normally, the allocated database size will not be freed, it ' + _('Clean up the database?'), + _('This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n' + 'Normally, the allocated database size will not be freed, it ' 'will just become reusable. This operation may take a while.'), [DialogButton.make('Cancel', callback=_on_no), ===================================== gajim/message_window.py ===================================== @@ -358,11 +358,13 @@ class MessageWindow: NewConfirmationCheckDialog( _('Close Tabs'), - _('You are going to close several tabs'), - _('Do you really want to close them all?'), + _('You are about to close several tabs'), + _('Do you really want to close all of them?'), _('_Do not ask me again'), [DialogButton.make('Cancel'), - DialogButton.make('OK', + DialogButton.make('Accept', + text=_('_Close'), + is_default=True, callback=_on_yes1)], transient_for=self.window).show() return True ===================================== gajim/roster_window.py ===================================== @@ -4125,8 +4125,9 @@ class RosterWindow: sectext, _('_Do not ask me again'), [DialogButton.make('Cancel'), - DialogButton.make('OK', + DialogButton.make('Accept', text=_('_Create'), + is_default=True, callback=merge_contacts)]).show() def on_drop_in_group(self, widget, account, c_source, grp_dest, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5623dfbaf766e10ad76420a0d16c7c199… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5623dfbaf766e10ad76420a0d16c7c199… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Remove menu for saving avatar to harddisk
by Philipp Hörist 06 Sep '19

06 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 45a200f7 by Philipp Hörist at 2019-09-06T20:23:28Z Remove menu for saving avatar to harddisk All avatars are available under ~/.cache/gajim/avatars - - - - - ea251998 by Philipp Hörist at 2019-09-06T20:23:28Z Avatar: Force avatars to be square - - - - - 5623dfba by Philipp Hörist at 2019-09-06T20:23:28Z Avatar: Remove unused method - - - - - 10 changed files: - gajim/chat_control.py - gajim/data/gui/profile_window.ui - gajim/data/gui/vcard_information_window.ui - gajim/data/gui/zeroconf_information_window.ui - gajim/gtk/avatar.py - gajim/gtk/filechoosers.py - gajim/gtk/profile.py - gajim/gtkgui_helpers.py - gajim/gui_menu_builder.py - gajim/vcard.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -142,13 +142,6 @@ class ChatControl(ChatControlBase): self.show_avatar() # Hook up signals - widget = self.xml.get_object('avatar_eventbox') - widget.set_property('height-request', AvatarSize.CHAT) - - id_ = widget.connect('button-press-event', - self.on_avatar_eventbox_button_press_event) - self.handlers[id_] = widget - widget = self.xml.get_object('location_eventbox') id_ = widget.connect('button-release-event', self.on_location_eventbox_button_release_event) @@ -639,22 +632,6 @@ class ChatControl(ChatControlBase): # Save volume to config app.config.set('audio_output_volume', value) - def on_avatar_eventbox_button_press_event(self, widget, event): - """ - If right-clicked, show popup - """ - if event.button == 3: # right click - if self.TYPE_ID == message_control.TYPE_CHAT: - sha = app.contacts.get_avatar_sha( - self.account, self.contact.jid) - name = self.contact.get_shown_name() - else: - sha = self.gc_contact.avatar_sha - name = self.gc_contact.get_shown_name() - if sha is not None: - gui_menu_builder.show_save_as_menu(sha, name) - return True - def on_location_eventbox_button_release_event(self, widget, event): if 'geoloc' in self.contact.pep: location = self.contact.pep['geoloc'].data ===================================== gajim/data/gui/profile_window.ui ===================================== @@ -43,7 +43,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <signal name="button-press-event" handler="on_PHOTO_button_press_event" swapped="no"/> + <signal name="clicked" handler="_on_set_avatar_clicked" swapped="no"/> <child> <object class="GtkOverlay"> <property name="visible">True</property> @@ -108,7 +108,7 @@ <property name="halign">start</property> <property name="valign">start</property> <property name="use_underline">True</property> - <signal name="button-press-event" handler="on_PHOTO_button_press_event" swapped="no"/> + <signal name="clicked" handler="_on_set_avatar_clicked" swapped="no"/> <child> <object class="GtkBox"> <property name="visible">True</property> ===================================== gajim/data/gui/vcard_information_window.ui ===================================== @@ -364,7 +364,6 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="visible_window">False</property> - <signal name="button-press-event" handler="on_PHOTO_eventbox_button_press_event" swapped="no"/> <child> <object class="GtkImage" id="PHOTO_image"> <property name="can_focus">False</property> ===================================== gajim/data/gui/zeroconf_information_window.ui ===================================== @@ -179,7 +179,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="visible_window">False</property> - <signal name="button-press-event" handler="on_PHOTO_eventbox_button_press_event" swapped="no"/> <child> <object class="GtkImage" id="PHOTO_image"> <property name="visible">True</property> ===================================== gajim/gtk/avatar.py ===================================== @@ -119,6 +119,30 @@ def add_status_to_avatar(surface, show): return context.get_target() +def square(surface, size): + width = surface.get_width() + height = surface.get_height() + if width == height: + return surface + + new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, size, size) + new_surface.set_device_scale(*surface.get_device_scale()) + context = cairo.Context(new_surface) + + scale = surface.get_device_scale()[0] + + if width == size: + x_pos = 0 + y_pos = (size - height) / 2 / scale + else: + y_pos = 0 + x_pos = (size - width) / 2 / scale + + context.set_source_surface(surface, x_pos, y_pos) + context.paint() + return context.get_target() + + def clip_circle(surface): new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, surface.get_width(), @@ -260,12 +284,6 @@ class AvatarStorage(metaclass=Singleton): return None return path - def pixbuf_from_filename(self, filename): - path = self.get_avatar_path(filename) - if path is None: - return None - return load_pixbuf(path) - def surface_from_filename(self, filename, size, scale): size = size * scale path = self.get_avatar_path(filename) @@ -276,7 +294,8 @@ class AvatarStorage(metaclass=Singleton): if pixbuf is None: return None - return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) + surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) + return square(surface, size) def _load_surface_from_storage(self, contact, size, scale): filename = contact.avatar_sha @@ -288,7 +307,8 @@ class AvatarStorage(metaclass=Singleton): pixbuf = load_pixbuf(path, size) if pixbuf is None: return None - return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) + surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) + return square(surface, size) def _get_avatar_from_storage(self, contact, size, scale): if contact.avatar_sha is None: ===================================== gajim/gtk/filechoosers.py ===================================== @@ -144,12 +144,6 @@ class FileSaveDialog(NativeFileChooserDialog): _action = Gtk.FileChooserAction.SAVE -class AvatarSaveDialog(FileSaveDialog): - - if sys.platform == 'win32': - _filters = [Filter(_('Images'), '*.png;*.jpg;*.jpeg;*.svg', True)] - - class NativeFileOpenDialog(BaseFileOpenDialog, NativeFileChooserDialog): pass ===================================== gajim/gtk/profile.py ===================================== @@ -32,7 +32,6 @@ 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 from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InformationDialog @@ -127,7 +126,7 @@ class ProfileWindow(Gtk.ApplicationWindow): self.avatar_sha = None self.avatar_mime_type = None - def on_set_avatar_button_clicked(self, widget): + def _on_set_avatar_clicked(self, _button): def on_ok(path_to_file): data, sha = app.interface.avatar_storage.prepare_for_publish( path_to_file) @@ -153,20 +152,6 @@ class ProfileWindow(Gtk.ApplicationWindow): AvatarChooserDialog(on_ok, transient_for=self) - def on_PHOTO_button_press_event(self, widget, event): - """ - If right-clicked, show popup - """ - if event.button == 3: - # right click - nick = app.config.get_per('accounts', self.account, 'name') - if self.avatar_sha is None: - return - show_save_as_menu(self.avatar_sha, nick) - - elif event.button == 1: # left click - self.on_set_avatar_button_clicked(widget) - def on_BDAY_entry_focus_out_event(self, widget, event): txt = widget.get_text() if not txt: ===================================== gajim/gtkgui_helpers.py ===================================== @@ -39,7 +39,6 @@ try: except Exception: pass -from gajim.common.i18n import _ from gajim.common import app HAS_PYWIN32 = True @@ -148,70 +147,6 @@ def scale_pixbuf_from_data(data, size): return scale_pixbuf(pixbuf, size) -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.filechoosers import AvatarSaveDialog - - 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): - # We got a SHA - pixbuf = app.interface.avatar_storage.pixbuf_from_filename(avatar) - else: - # We got a pixbuf - pixbuf = avatar - extension = os.path.splitext(file_path)[1] - if not extension: - # Silently save as Jpeg image - image_format = 'png' - file_path += '.png' - else: - image_format = extension[1:] # remove leading dot - - # Save image - try: - pixbuf.savev(file_path, image_format, [], []) - except Exception as error: - log.error('Error saving avatar: %s', error) - if os.path.exists(file_path): - os.remove(file_path) - new_file_path = '.'.join(file_path.split('.')[:-1]) + '.png' - - def _on_ok(file_path, pixbuf): - pixbuf.savev(file_path, 'png', [], []) - - NewConfirmationDialog( - _('Error While Saving'), - _('Extension not supported'), - _('Image cannot be saved in %(type)s format.\n' - 'Save as %(new_filename)s?') % { - 'type': image_format, - 'new_filename': new_file_path}, - [DialogButton.make('Cancel'), - DialogButton.make('OK', - text=_('_Save'), - callback=_on_ok, - args=[new_file_path, - pixbuf])]).show() - - AvatarSaveDialog(_on_save_avatar, - path=app.config.get('last_save_dir'), - file_name='%s.png' % default_name, - transient_for=app.app.get_active_window()) - - def create_combobox(value_list, selected_value=None): """ Value_list is [(label1, value1)] ===================================== gajim/gui_menu_builder.py ===================================== @@ -509,18 +509,6 @@ def get_transport_menu(contact, account): return menu -def show_save_as_menu(sha, name): - menu = Gtk.Menu() - menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) - menuitem.connect( - 'activate', - gtkgui_helpers.on_avatar_save_as_menuitem_activate, sha, name) - menu.append(menuitem) - menu.connect('selection-done', lambda w: w.destroy()) - menu.show_all() - menu.popup_at_pointer() - - def get_singlechat_menu(control_id, account, jid): singlechat_menu = [ (_('Send File…'), [ ===================================== gajim/vcard.py ===================================== @@ -37,7 +37,6 @@ from nbxmpp.util import is_error_result from nbxmpp.protocol import JID from gajim import gtkgui_helpers -from gajim.gui_menu_builder import show_save_as_menu from gajim.common import helpers from gajim.common import app from gajim.common import ged @@ -158,22 +157,6 @@ class VcardWindow: def on_information_notebook_switch_page(self, widget, page, page_num): GLib.idle_add(self.xml.get_object('close_button').grab_focus) - def on_PHOTO_eventbox_button_press_event(self, widget, event): - """ - If right-clicked, show popup - """ - if event.button == 3: # right click - if self.gc_contact: - sha = self.gc_contact.avatar_sha - name = self.gc_contact.get_shown_name() - else: - sha = app.contacts.get_avatar_sha( - self.account, self.contact.jid) - name = self.contact.get_shown_name() - if sha is None: - sha = self.avatar - show_save_as_menu(sha, name) - def set_value(self, entry_name, value): try: widget = self.xml.get_object(entry_name) @@ -499,14 +482,6 @@ class ZeroconfVcardWindow: if event.keyval == Gdk.KEY_Escape: self.window.destroy() - def on_PHOTO_eventbox_button_press_event(self, widget, event): - """ - If right-clicked, show popup - """ - if event.button == 3: # right click - show_save_as_menu(self.contact.avatar_sha, - self.contact.get_shown_name()) - def set_value(self, entry_name, value): try: if value and entry_name == 'URL_label': View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9f59eb54955249aa11fd84eeb8a4debc8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9f59eb54955249aa11fd84eeb8a4debc8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: CommandSystem: Add setting to disable execution of commands by default
by Philipp Hörist 05 Sep '19

05 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2257da6c by Daniel Brötzmann at 2019-09-05T21:02:00Z CommandSystem: Add setting to disable execution of commands by default - - - - - 9f59eb54 by Daniel Brötzmann at 2019-09-05T21:02:00Z CommandSystem: Fix some pylint errors - - - - - 10 changed files: - gajim/command_system/errors.py - gajim/command_system/framework.py - gajim/command_system/implementation/custom.py - gajim/command_system/implementation/execute.py - gajim/command_system/implementation/hosts.py - gajim/command_system/implementation/middleware.py - gajim/command_system/implementation/standard.py - gajim/command_system/mapping.py - gajim/command_system/tools.py - gajim/common/config.py Changes: ===================================== gajim/command_system/errors.py ===================================== @@ -13,6 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. + class BaseError(Exception): """ Common base for errors which relate to a specific command. @@ -34,16 +35,19 @@ class BaseError(Exception): def __str__(self): return self.message + class DefinitionError(BaseError): """ Used to indicate errors occurred on command definition. """ + class CommandError(BaseError): """ Used to indicate errors occurred during command execution. """ + class NoCommandError(BaseError): """ Used to indicate an inability to find the specified command. ===================================== gajim/command_system/framework.py ===================================== @@ -22,10 +22,16 @@ declarative way. from types import FunctionType from inspect import getargspec, getdoc -from gajim.command_system.dispatcher import Host, Container -from gajim.command_system.dispatcher import get_command, list_commands -from gajim.command_system.mapping import parse_arguments, adapt_arguments -from gajim.command_system.errors import DefinitionError, CommandError, NoCommandError +from gajim.command_system.dispatcher import Host +from gajim.command_system.dispatcher import Container +from gajim.command_system.dispatcher import get_command +from gajim.command_system.dispatcher import list_commands +from gajim.command_system.mapping import parse_arguments +from gajim.command_system.mapping import adapt_arguments +from gajim.command_system.errors import DefinitionError +from gajim.command_system.errors import CommandError +from gajim.command_system.errors import NoCommandError + class CommandHost(metaclass=Host): """ @@ -39,6 +45,7 @@ class CommandHost(metaclass=Host): """ __metaclass__ = Host + class CommandContainer(metaclass=Container): """ Command container is an entity which holds defined commands, @@ -55,6 +62,7 @@ class CommandContainer(metaclass=Container): """ __metaclass__ = Container + class CommandProcessor: """ Command processor is an immediate command emitter. It does not @@ -142,6 +150,7 @@ class CommandProcessor: commands = dict(commands) return sorted(set(commands.values()), key=lambda k: k.__repr__()) + class Command: def __init__(self, handler, *names, **properties): @@ -217,7 +226,8 @@ class Command: # Behavior of this code need to be checked. Might yield # incorrect results on some rare occasions. spec_args = names[:-len(defaults) if defaults else len(names)] - spec_kwargs = list(zip(names[-len(defaults):], defaults)) if defaults else {} + spec_kwargs = list( + zip(names[-len(defaults):], defaults)) if defaults else {} # Removing self from arguments specification. Command handler # should receive the processors as a first argument, which @@ -227,6 +237,7 @@ class Command: return spec_args, spec_kwargs, var_args, var_kwargs + def command(*names, **properties): """ A decorator for defining commands in a declarative way. Provides @@ -287,7 +298,8 @@ def command(*names, **properties): raise DefinitionError("Empty option can be used only with raw commands") if extra and overlap: - raise DefinitionError("Extra and overlap options can not be used together") + raise DefinitionError("Extra and overlap options can not be used " + "together") properties = { 'usage': usage, @@ -323,6 +335,7 @@ def command(*names, **properties): return decorator + def doc(text): """ This decorator is used to bind a documentation (a help) to a ===================================== gajim/command_system/implementation/custom.py ===================================== @@ -35,8 +35,13 @@ detected. """ from gajim.common.i18n import _ -from gajim.command_system.framework import CommandContainer, command, doc -from gajim.command_system.implementation.hosts import ChatCommands, PrivateChatCommands, GroupChatCommands +from gajim.command_system.framework import CommandContainer +from gajim.command_system.framework import command +from gajim.command_system.framework import doc +from gajim.command_system.implementation.hosts import ChatCommands +from gajim.command_system.implementation.hosts import PrivateChatCommands +from gajim.command_system.implementation.hosts import GroupChatCommands + class CustomCommonCommands(CommandContainer): """ @@ -69,6 +74,7 @@ class CustomCommonCommands(CommandContainer): """ return "I don't dance." + class CustomChatCommands(CommandContainer): """ This command container bounds only to the ChatCommands command host. @@ -92,6 +98,7 @@ class CustomChatCommands(CommandContainer): """ return "Buy yourself a stereo." + class CustomPrivateChatCommands(CommandContainer): """ This command container bounds only to the PrivateChatCommands @@ -108,6 +115,7 @@ class CustomPrivateChatCommands(CommandContainer): def make_coffee(self): return "I'm not a coffee machine!" + class CustomGroupChatCommands(CommandContainer): """ This command container bounds only to the GroupChatCommands command ===================================== gajim/command_system/implementation/execute.py ===================================== @@ -37,9 +37,15 @@ from os.path import expanduser from gi.repository import GLib +from gajim.common import app from gajim.common.i18n import _ -from gajim.command_system.framework import CommandContainer, command, doc -from gajim.command_system.implementation.hosts import ChatCommands, PrivateChatCommands, GroupChatCommands +from gajim.command_system.framework import CommandContainer +from gajim.command_system.framework import command +from gajim.command_system.framework import doc +from gajim.command_system.implementation.hosts import ChatCommands +from gajim.command_system.implementation.hosts import PrivateChatCommands +from gajim.command_system.implementation.hosts import GroupChatCommands + class Execute(CommandContainer): AUTOMATIC = True @@ -57,10 +63,18 @@ class Execute(CommandContainer): @classmethod def spawn(cls, processor, expression): - pipes = dict(stdout=PIPE, stderr=PIPE) - directory = expanduser(cls.DIRECTORY) - popen = Popen(expression, shell=True, cwd=directory, **pipes) - cls.monitor(processor, popen) + command_system_execute = app.config.get('command_system_execute') + if command_system_execute: + pipes = dict(stdout=PIPE, stderr=PIPE) + directory = expanduser(cls.DIRECTORY) + popen = Popen(expression, shell=True, cwd=directory, **pipes) + cls.monitor(processor, popen) + else: + processor.echo_error( + _('Command disabled. This command can be enabled by ' + 'setting \'command_system_execute\' to True in ACE ' + '(Advanced Configuration Editor).')) + return @classmethod def monitor(cls, processor, popen): @@ -104,6 +118,7 @@ class Execute(CommandContainer): strip = chr(10) + chr(32) return text.decode().strip(strip) + class Show(Execute): @command("sh", raw=True) ===================================== gajim/command_system/implementation/hosts.py ===================================== @@ -20,6 +20,7 @@ different command processors, which are the source of commands. from gajim.command_system.framework import CommandHost + class ChatCommands(CommandHost): """ This command host is bound to the command processor which processes @@ -27,6 +28,7 @@ class ChatCommands(CommandHost): """ AUTOMATIC = True + class PrivateChatCommands(CommandHost): """ This command host is bound to the command processor which processes @@ -34,6 +36,7 @@ class PrivateChatCommands(CommandHost): """ AUTOMATIC = True + class GroupChatCommands(CommandHost): """ This command host is bound to the command processor which processes ===================================== gajim/command_system/implementation/middleware.py ===================================== @@ -39,7 +39,9 @@ from gajim.common import app from gajim.common.i18n import _ from gajim.command_system.framework import CommandProcessor -from gajim.command_system.errors import CommandError, NoCommandError +from gajim.command_system.errors import CommandError +from gajim.command_system.errors import NoCommandError + class ChatCommandProcessor(CommandProcessor): """ @@ -95,12 +97,14 @@ class ChatCommandProcessor(CommandProcessor): self.echo(help_(self, name)) return True - def command_postprocessor(self, command, name, arguments, args, kwargs, value): + def command_postprocessor(self, command, name, arguments, args, kwargs, + value): # If command returns a string - print it to a user. A convenient # and sufficient in most simple cases shortcut to a using echo. if value and isinstance(value, str): self.echo(value) + class CommandTools: """ Contains a set of basic tools and shortcuts you can use in your ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -17,7 +17,8 @@ Provides an actual implementation for the standard commands. """ -from time import localtime, strftime +from time import localtime +from time import strftime from datetime import date from gi.repository import GLib @@ -28,10 +29,14 @@ from gajim.common.i18n import _ from gajim.common.const import KindConstant from gajim.command_system.errors import CommandError -from gajim.command_system.framework import CommandContainer, command, doc +from gajim.command_system.framework import CommandContainer +from gajim.command_system.framework import command +from gajim.command_system.framework import doc from gajim.command_system.mapping import generate_usage -from gajim.command_system.implementation.hosts import ChatCommands, PrivateChatCommands, GroupChatCommands +from gajim.command_system.implementation.hosts import ChatCommands +from gajim.command_system.implementation.hosts import PrivateChatCommands +from gajim.command_system.implementation.hosts import GroupChatCommands class StandardCommonCommands(CommandContainer): @@ -44,7 +49,8 @@ class StandardCommonCommands(CommandContainer): HOSTS = ChatCommands, PrivateChatCommands, GroupChatCommands @command(overlap=True) - @doc(_("Show help on a given command or a list of available commands if -a is given")) + @doc(_("Show help on a given command or a list of available commands if " + "-a is given")) def help(self, cmd=None, all_=False): if cmd: cmd = self.get_command(cmd) @@ -111,12 +117,13 @@ class StandardCommonCommands(CommandContainer): if date_obj == date.today(): formatted = "[%s] %s: %s" % (time_, contact, row.message) else: - formatted = "[%s, %s] %s: %s" % (date_, time_, contact, row.message) + formatted = "[%s, %s] %s: %s" % ( + date_, time_, contact, row.message) self.echo(formatted) @command(raw=True, empty=True) - #Do not translate online, away, chat, xa, dnd + # Do not translate online, away, chat, xa, dnd @doc(_(""" Set the current status @@ -128,7 +135,7 @@ class StandardCommonCommands(CommandContainer): raise CommandError("Invalid status given") for connection in app.connections.values(): if not app.config.get_per('accounts', connection.name, - 'sync_with_global_status'): + 'sync_with_global_status'): continue if not connection.is_connected: continue @@ -142,7 +149,7 @@ class StandardCommonCommands(CommandContainer): for connection in app.connections.values(): if not app.config.get_per('accounts', connection.name, - 'sync_with_global_status'): + 'sync_with_global_status'): continue if not connection.is_connected: continue @@ -156,12 +163,13 @@ class StandardCommonCommands(CommandContainer): for connection in app.connections.values(): if not app.config.get_per('accounts', connection.name, - 'sync_with_global_status'): + 'sync_with_global_status'): continue if not connection.is_connected: continue connection.change_status('online', message) + class StandardCommonChatCommands(CommandContainer): """ This command container contains standard commands, which are common @@ -180,7 +188,8 @@ class StandardCommonChatCommands(CommandContainer): @doc(_("Send a ping to the contact")) def ping(self): if self.account == app.ZEROCONF_ACC_NAME: - raise CommandError(_('Command is not supported for zeroconf accounts')) + raise CommandError( + _('Command is not supported for zeroconf accounts')) app.connections[self.account].get_module('Ping').send_ping(self.contact) @command @@ -221,6 +230,7 @@ class StandardCommonChatCommands(CommandContainer): def attention(self, message): self.send_message(message, process_commands=False, attention=True) + class StandardChatCommands(CommandContainer): """ This command container contains standard commands which are unique @@ -230,6 +240,7 @@ class StandardChatCommands(CommandContainer): AUTOMATIC = True HOSTS = (ChatCommands,) + class StandardPrivateChatCommands(CommandContainer): """ This command container contains standard commands which are unique @@ -239,6 +250,7 @@ class StandardPrivateChatCommands(CommandContainer): AUTOMATIC = True HOSTS = (PrivateChatCommands,) + class StandardGroupChatCommands(CommandContainer): """ This command container contains standard commands which are unique @@ -275,7 +287,8 @@ class StandardGroupChatCommands(CommandContainer): raise CommandError(_("Nickname not found")) @command('msg', raw=True) - @doc(_("Open a private chat window with a specified participant and send him a message")) + @doc(_("Open a private chat window with a specified participant and send " + "him a message")) def message(self, nick, a_message): nicks = app.contacts.get_nick_list(self.account, self.room_jid) if nick in nicks: @@ -296,7 +309,8 @@ class StandardGroupChatCommands(CommandContainer): @doc(_("Invite a user to a group chat for a reason")) def invite(self, jid, reason): self.connection.get_module('MUC').invite(self.room_jid, jid, reason) - return _("Invited %(jid)s to %(room_jid)s") % {'jid': jid, + return _("Invited %(jid)s to %(room_jid)s") % { + 'jid': jid, 'room_jid': self.room_jid} @command(raw=True, empty=True) @@ -310,7 +324,8 @@ class StandardGroupChatCommands(CommandContainer): GLib.Variant('as', [self.account, jid])) @command('part', 'close', raw=True, empty=True) - @doc(_("Leave the group chat, optionally giving a reason, and close tab or window")) + @doc(_("Leave the group chat, optionally giving a reason, and close tab or " + "window")) def leave(self, reason): self.leave(reason=reason) @@ -322,7 +337,8 @@ class StandardGroupChatCommands(CommandContainer): """)) def ban(self, who, reason=''): if who in app.contacts.get_nick_list(self.account, self.room_jid): - contact = app.contacts.get_gc_contact(self.account, self.room_jid, who) + contact = app.contacts.get_gc_contact( + self.account, self.room_jid, who) who = contact.jid self.connection.get_module('MUC').set_affiliation( self.room_jid, @@ -332,25 +348,25 @@ class StandardGroupChatCommands(CommandContainer): @command(raw=True, empty=True) @doc(_("Kick user from group chat by nickname")) def kick(self, who, reason): - if not who in app.contacts.get_nick_list(self.account, self.room_jid): + if who not in app.contacts.get_nick_list(self.account, self.room_jid): raise CommandError(_("Nickname not found")) self.connection.get_module('MUC').set_role( self.room_jid, who, 'none', reason or str()) @command(raw=True) - #Do not translate moderator, participant, visitor, none + # Do not translate moderator, participant, visitor, none @doc(_("""Set participant role in group chat. Role can be given as one of the following values: moderator, participant, visitor, none""")) def role(self, who, role): if role not in ('moderator', 'participant', 'visitor', 'none'): raise CommandError(_("Invalid role given")) - if not who in app.contacts.get_nick_list(self.account, self.room_jid): + if who not in app.contacts.get_nick_list(self.account, self.room_jid): raise CommandError(_("Nickname not found")) self.connection.get_module('MUC').set_role(self.room_jid, who, role) @command(raw=True) - #Do not translate owner, admin, member, outcast, none + # Do not translate owner, admin, member, outcast, none @doc(_("""Set participant affiliation in group chat. Affiliation can be given as one of the following values: owner, admin, member, outcast, none""")) @@ -401,6 +417,7 @@ class StandardGroupChatCommands(CommandContainer): @doc(_("Send a ping to the contact")) def ping(self, nick): if self.account == app.ZEROCONF_ACC_NAME: - raise CommandError(_('Command is not supported for zeroconf accounts')) + raise CommandError( + _('Command is not supported for zeroconf accounts')) gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) app.connections[self.account].get_module('Ping').send_ping(gc_c) ===================================== gajim/command_system/mapping.py ===================================== @@ -27,7 +27,8 @@ from operator import itemgetter from gajim.common.i18n import _ -from gajim.command_system.errors import DefinitionError, CommandError +from gajim.command_system.errors import DefinitionError +from gajim.command_system.errors import CommandError # Quite complex piece of regular expression logic to parse options and # arguments. Might need some tweaking along the way. @@ -43,6 +44,7 @@ KEY_ENCODING = 'UTF-8' # on command handler argument specification) will be rendered. USAGE_PATTERN = 'Usage: %s %s' + def parse_arguments(arguments): """ Simple yet effective and sufficient in most cases parser which @@ -110,6 +112,7 @@ def parse_arguments(arguments): return args, opts + def adapt_arguments(command, arguments, args, opts): """ Adapt args and opts got from the parser to a specific handler by @@ -268,7 +271,8 @@ def adapt_arguments(command, arguments, args, opts): initial = norm_kwargs.get(key) if isinstance(initial, bool): if not isinstance(value, bool): - raise CommandError("%s: Switch can not take an argument" % key, command) + raise CommandError( + "%s: Switch can not take an argument" % key, command) # Inject the source arguments as a string as a first argument, if # command has enabled the corresponding option. @@ -279,6 +283,7 @@ def adapt_arguments(command, arguments, args, opts): # command handler and being expanded. return tuple(args), dict(opts) + def generate_usage(command, complete=True): """ Extract handler's arguments specification and wrap them in a @@ -323,7 +328,8 @@ def generate_usage(command, complete=True): if spec_args: args += '<%s>' % ', '.join(spec_args) if var_args or sp_extra: - args += (' ' if spec_args else str()) + '<<%s>>' % (var_args or sp_extra) + args += (' ' if spec_args else str()) + '<<%s>>' % ( + var_args or sp_extra) usage += args ===================================== gajim/command_system/tools.py ===================================== @@ -24,6 +24,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + def remove(sequence, target): if isinstance(sequence, list): if target in sequence: ===================================== gajim/common/config.py ===================================== @@ -288,6 +288,7 @@ class Config: 'muclumbus_api_http_uri': [opt_str, 'https://search.jabbercat.org/api/1.0/search'], 'muclumbus_api_pref': [opt_str, 'http', _('API Preferences. Possible values: \'http\', \'iq\'')], 'auto_copy': [opt_bool, True, _('Selecting text will copy it to the clipboard')], + 'command_system_execute': [opt_bool, False, _('If enabled, Gajim will execute commands (/show, /sh, /execute, /exec).')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/911aaa1f88552992788410210e9cfe34d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/911aaa1f88552992788410210e9cfe34d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Replace PlainConnectionDialog with NewConfirmationCheckDialog
by Philipp Hörist 05 Sep '19

05 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0a3bd34e by Daniel Brötzmann at 2019-09-05T19:33:28Z Replace PlainConnectionDialog with NewConfirmationCheckDialog - - - - - 911aaa1f by Daniel Brötzmann at 2019-09-05T19:34:05Z Remove PlainConnectionDialog - - - - - 2 changed files: - gajim/gtk/dialogs.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -319,31 +319,6 @@ class ConfirmationDialogDoubleCheck(ConfirmationDialog): return [is_checked_1, is_checked_2] -class PlainConnectionDialog(ConfirmationDialogDoubleCheck): - """ - Dialog that is shown when using an insecure connection - """ - def __init__(self, account, on_ok, on_cancel): - pritext = _('Insecure connection') - sectext = _('You are about to connect to the account %(account)s ' - '(%(server)s) insecurely. This means conversations will not be ' - 'encrypted, and is strongly discouraged.\nAre you sure you want ' - 'to do that?') % {'account': account, - 'server': app.get_hostname_from_account(account)} - checktext1 = _('Yes, I really want to connect insecurely') - tooltip1 = _('Gajim will NOT connect unless you check this box') - checktext2 = _('_Do not ask me again') - ConfirmationDialogDoubleCheck.__init__(self, pritext, sectext, - checktext1, checktext2, tooltip1=tooltip1, on_response_ok=on_ok, - on_response_cancel=on_cancel, is_modal=False) - self.ok_button = self.get_widget_for_response(Gtk.ResponseType.OK) - self.ok_button.set_sensitive(False) - self.checkbutton1.connect('clicked', self.on_checkbutton_clicked) - self.set_title(_('Insecure connection')) - - def on_checkbutton_clicked(self, widget): - self.ok_button.set_sensitive(widget.get_active()) - class ConfirmationDialogDoubleRadio(ConfirmationDialog): """ HIG compliant confirmation dialog with 2 radios ===================================== gajim/gui_interface.py ===================================== @@ -99,10 +99,10 @@ 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 DialogButton from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import PassphraseDialog -from gajim.gtk.dialogs import PlainConnectionDialog from gajim.gtk.dialogs import SSLErrorDialog from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.profile import ProfileWindow @@ -1161,34 +1161,38 @@ class Interface: def handle_event_plain_connection(self, obj): # ('PLAIN_CONNECTION', account, (connection)) - def on_ok(is_checked): - if not is_checked[0]: - if is_checked[1]: - app.config.set_per('accounts', obj.conn.name, - 'action_when_plaintext_connection', 'disconnect') - on_cancel() - return - # On cancel call del self.instances, so don't call it another time - # before - del self.instances[obj.conn.name]['online_dialog']\ - ['plain_connection'] - if is_checked[1]: + def _on_connect_anyway(is_checked): + if is_checked: app.config.set_per('accounts', obj.conn.name, - 'action_when_plaintext_connection', 'connect') + 'action_when_plaintext_connection', + 'connect') obj.conn.connection_accepted(obj.xmpp_client, 'plain') - def on_cancel(): - del self.instances[obj.conn.name]['online_dialog']\ - ['plain_connection'] + def _on_abort(is_checked): + if is_checked: + app.config.set_per('accounts', obj.conn.name, + 'action_when_plaintext_connection', + 'disconnect') obj.conn.disconnect(reconnect=False) app.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, - show='offline')) - - if 'plain_connection' in self.instances[obj.conn.name]['online_dialog']: - self.instances[obj.conn.name]['online_dialog']['plain_connection'].\ - destroy() - self.instances[obj.conn.name]['online_dialog']['plain_connection'] = \ - PlainConnectionDialog(obj.conn.name, on_ok, on_cancel) + show='offline')) + + NewConfirmationCheckDialog( + _('Insecure Connection'), + _('Insecure Connection'), + _('You are about to connect to the account %(account)s ' + '(%(server)s) using an insecure connection method. This means ' + 'conversations will not be encrypted. Connecting PLAIN is ' + 'strongly discouraged.') % { + 'account': obj.conn.name, + 'server': app.get_hostname_from_account(obj.conn.name)}, + _('_Do not ask me again'), + [DialogButton.make('Cancel', + text=_('_Abort'), + callback=_on_abort), + DialogButton.make('Remove', + text=_('_Connect Anyway'), + callback=_on_connect_anyway)]).show() def create_core_handlers_list(self): self.handlers = { View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/18070f5983296936b1f71da5f3ed1bec3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/18070f5983296936b1f71da5f3ed1bec3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add public method to access the openssl connection object
by Philipp Hörist 05 Sep '19

05 Sep '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 40520af1 by Philipp Hörist at 2019-09-05T20:07:53Z Add public method to access the openssl connection object - - - - - 2 changed files: - nbxmpp/client.py - nbxmpp/tls.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -119,6 +119,10 @@ class NonBlockingClient: def get_bound_jid(self): return self._registered_name + def get_ssl_connection(self): + if 'NonBlockingTCP' in self.__dict__: + return self.NonBlockingTCP.get_ssl_connection() + def disconnect(self, message=''): """ Called on disconnection - disconnect callback is picked based on state of ===================================== nbxmpp/tls.py ===================================== @@ -212,6 +212,7 @@ class NonBlockingTLS(PlugIn): None is provided, a default list is used: HIGH:!aNULL """ PlugIn.__init__(self) + self._exported_methods = [self.get_ssl_connection] self.cacerts = cacerts self.mycerts = mycerts if cipher_list is None: @@ -423,3 +424,9 @@ class NonBlockingTLS(PlugIn): return sslObj.get_finished() except AttributeError: raise NotImplementedError + + def get_ssl_connection(self): + try: + return self._owner._sslObj + except Exception: + pass View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/40520af11ae80d17f12f74c0ab… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/40520af11ae80d17f12f74c0ab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] HTTPAuth: Parse attrs correctly
by Philipp Hörist 05 Sep '19

05 Sep '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 63d72fbd by Philipp Hörist at 2019-09-05T19:13:58Z HTTPAuth: Parse attrs correctly Fixes #84 - - - - - 1 changed file: - nbxmpp/modules/http_auth.py Changes: ===================================== nbxmpp/modules/http_auth.py ===================================== @@ -45,7 +45,10 @@ class HTTPAuth: if confirm is None: return - http_auth = confirm.getAttrs().copy() - http_auth['body'] = stanza.getTagData('body') - properties.http_auth = HTTPAuthData(**http_auth) - log.info('Found data: %s', http_auth) + attrs = confirm.getAttrs() + body = stanza.getTagData('body') + id_ = attrs.get('id') + method = attrs.get('method') + url = attrs.get('url') + properties.http_auth = HTTPAuthData(id_, method, url, body) + log.info('HTTPAuth received: %s %s %s %s', id_, method, url, body) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/63d72fbdefa46f00951f7154a2… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/63d72fbdefa46f00951f7154a2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Avatar: Make show indicator smaller
by Philipp Hörist 04 Sep '19

04 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 18070f59 by Philipp Hörist at 2019-09-04T18:29:28Z Avatar: Make show indicator smaller - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -102,14 +102,14 @@ def add_status_to_avatar(surface, show): width = width / scale height = height / scale - clip_size = width / 5 + clip_size = width / 6.5 context.set_source_rgb(255, 255, 255) context.set_operator(cairo.Operator.CLEAR) context.arc(width - clip_size, height - clip_size, clip_size, 0, 2 * pi) context.fill() color = SHOW_COLORS[show] - show_size = width / 5 + show_size = width / 6.5 show_radius = show_size * 0.80 context.set_source_rgb(*color) context.set_operator(cairo.Operator.OVER) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/18070f5983296936b1f71da5f3ed1bec33… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/18070f5983296936b1f71da5f3ed1bec33… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Use cross-platform compatible cursors
by Philipp Hörist 04 Sep '19

04 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2745d3ce by Philipp Hörist at 2019-09-04T16:50:26Z Use cross-platform compatible cursors see: https://lazka.github.io/pgi-docs/Gdk-3.0/classes/Cursor.html#Gdk.Cursor.new… Fixes #9800 - - - - - 0927655c by Philipp Hörist at 2019-09-04T16:51:13Z Remove unused import - - - - - 5 changed files: - gajim/chat_control.py - gajim/conversation_textview.py - gajim/gtk/htmltextview.py - gajim/gtk/util.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -667,11 +667,11 @@ class ChatControl(ChatControlBase): """ Just moved the mouse so show the cursor """ - cursor = get_cursor('LEFT_PTR') + cursor = get_cursor('default') self.parent_win.window.get_window().set_cursor(cursor) def on_location_eventbox_enter_notify_event(self, widget, event): - cursor = get_cursor('HAND2') + cursor = get_cursor('pointer') self.parent_win.window.get_window().set_cursor(cursor) def update_ui(self): ===================================== gajim/conversation_textview.py ===================================== @@ -332,11 +332,11 @@ class ConversationTextview(GObject.GObject): if len(text) > 50: text = text[:47] + '…' tooltip.set_text(text) - window.set_cursor(get_cursor('HAND2')) + window.set_cursor(get_cursor('pointer')) self._cursor_changed = True return True if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): - window.set_cursor(get_cursor('HAND2')) + window.set_cursor(get_cursor('pointer')) self._cursor_changed = True return False try: @@ -346,7 +346,7 @@ class ConversationTextview(GObject.GObject): except KeyError: pass if self._cursor_changed: - window.set_cursor(get_cursor('XTERM')) + window.set_cursor(get_cursor('text')) self._cursor_changed = False return False ===================================== gajim/gtk/htmltextview.py ===================================== @@ -881,18 +881,18 @@ class HtmlTextView(Gtk.TextView): if len(text) > 50: text = text[:47] + '…' tooltip.set_text(text) - window.set_cursor(get_cursor('HAND2')) + window.set_cursor(get_cursor('pointer')) self._cursor_changed = True return True tag_name = tag.get_property('name') if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): - window.set_cursor(get_cursor('HAND2')) + window.set_cursor(get_cursor('pointer')) self._cursor_changed = True return False if self._cursor_changed: - window.set_cursor(get_cursor('XTERM')) + window.set_cursor(get_cursor('text')) self._cursor_changed = False return False ===================================== gajim/gtk/util.py ===================================== @@ -356,10 +356,12 @@ def get_completion_liststore(entry: Gtk.Entry) -> Gtk.ListStore: return liststore -def get_cursor(attr: str) -> Gdk.Cursor: +def get_cursor(name: str) -> Gdk.Cursor: display = Gdk.Display.get_default() - cursor = getattr(Gdk.CursorType, attr) - return Gdk.Cursor.new_for_display(display, cursor) + cursor = Gdk.Cursor.new_from_name(display, name) + if cursor is not None: + return cursor + return Gdk.Cursor.new_from_name(display, 'default') def scroll_to_end(widget: Gtk.ScrolledWindow) -> bool: ===================================== gajim/privatechat_control.py ===================================== @@ -24,8 +24,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from gi.repository import Gtk - from gajim import message_control from gajim.common import app View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c51e8498563fb99cfef68bf4ca8820bc3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c51e8498563fb99cfef68bf4ca8820bc3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PrivateChatControl: Display show value with avatar
by Philipp Hörist 03 Sep '19

03 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c51e8498 by Philipp Hörist at 2019-09-03T22:53:10Z PrivateChatControl: Display show value with avatar - - - - - 1 changed file: - gajim/privatechat_control.py Changes: ===================================== gajim/privatechat_control.py ===================================== @@ -233,22 +233,11 @@ class PrivateChatControl(ChatControl): return scale = self.parent_win.window.get_scale_factor() - surface = app.interface.get_avatar( - self.gc_contact, AvatarSize.CHAT, scale) - image = self.xml.get_object('avatar_image') - if surface is None: - image.set_from_icon_name('avatar-default', Gtk.IconSize.DIALOG) - else: - image.set_from_surface(surface) + surface = self.gc_contact.get_avatar(AvatarSize.CHAT, + scale, + self.gc_contact.show.value) - def _update_banner_state_image(self): - # Set banner image - if self.gc_contact.presence.is_unavailable: - icon = get_icon_name('offline') - else: - icon = get_icon_name(self.gc_contact.show.value) - banner_status_img = self.xml.get_object('banner_status_image') - banner_status_img.set_from_icon_name(icon, Gtk.IconSize.DND) + self.xml.avatar_image.set_from_surface(surface) def get_tab_image(self, count_unread=True): jid = self.gc_contact.get_full_jid() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c51e8498563fb99cfef68bf4ca8820bc3e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c51e8498563fb99cfef68bf4ca8820bc3e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Avatar: Add indicator for show value
by Philipp Hörist 03 Sep '19

03 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 032930ce by Philipp Hörist at 2019-09-03T20:47:30Z Avatar: Add indicator for show value - - - - - 279143f8 by Philipp Hörist at 2019-09-03T20:50:27Z StartChat: Display show value with avatar - - - - - d15ec5e7 by Philipp Hörist at 2019-09-03T20:50:31Z ChatControl: Display show value with avatar - - - - - 7 changed files: - gajim/chat_control.py - gajim/common/contacts.py - gajim/data/gui/chat_control.ui - gajim/gtk/avatar.py - gajim/gtk/const.py - gajim/gtk/start_chat.py - gajim/gui_interface.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -678,19 +678,7 @@ class ChatControl(ChatControlBase): # The name banner is drawn here ChatControlBase.update_ui(self) self.update_toolbar() - - def _update_banner_state_image(self): - contact = app.contacts.get_contact_with_highest_priority( - self.account, self.contact.jid) - if not contact or self.resource: - # For transient contacts - contact = self.contact - show = contact.show - - # Set banner image - icon = get_icon_name(show) - banner_status_img = self.xml.get_object('banner_status_image') - banner_status_img.set_from_icon_name(icon, Gtk.IconSize.DND) + self.show_avatar() def draw_banner_text(self): """ @@ -1239,11 +1227,13 @@ class ChatControl(ChatControlBase): return scale = self.parent_win.window.get_scale_factor() - surface = app.contacts.get_avatar( - self.account, self.contact.jid, AvatarSize.CHAT, scale) + surface = app.contacts.get_avatar(self.account, + self.contact.jid, + AvatarSize.CHAT, + scale, + self.contact.show) - image = self.xml.get_object('avatar_image') - image.set_from_surface(surface) + self.xml.avatar_image.set_from_surface(surface) def _nec_update_avatar(self, obj): if obj.account != self.account: ===================================== gajim/common/contacts.py ===================================== @@ -600,13 +600,13 @@ class Contacts(): if contacts[0].is_groupchat: return contacts[0] - def get_avatar(self, jid, size, scale): + def get_avatar(self, jid, size, scale, show=None): if jid not in self._contacts: return None for resource in self._contacts[jid]: avatar = common.app.interface.get_avatar( - resource, size, scale) + resource, size, scale, show) if avatar is None: self.set_avatar(jid, None) return avatar ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -560,17 +560,7 @@ </packing> </child> <child> - <object class="GtkImage" id="banner_status_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> + <placeholder/> </child> </object> </child> ===================================== gajim/gtk/avatar.py ===================================== @@ -32,6 +32,7 @@ from gajim.common.const import AvatarSize from gajim.gtk.util import load_pixbuf from gajim.gtk.util import text_to_color from gajim.gtk.util import scale_with_ratio +from gajim.gtk.const import SHOW_COLORS log = logging.getLogger('gajim.gtk.avatar') @@ -84,6 +85,40 @@ def generate_avatar(letters, color, size, scale): return context.get_target() +def add_status_to_avatar(surface, show): + width = surface.get_width() + height = surface.get_height() + + new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) + new_surface.set_device_scale(*surface.get_device_scale()) + + scale = surface.get_device_scale()[0] + + context = cairo.Context(new_surface) + context.set_source_surface(surface, 0, 0) + context.paint() + + # Correct height and width for scale + width = width / scale + height = height / scale + + clip_size = width / 5 + context.set_source_rgb(255, 255, 255) + context.set_operator(cairo.Operator.CLEAR) + context.arc(width - clip_size, height - clip_size, clip_size, 0, 2 * pi) + context.fill() + + color = SHOW_COLORS[show] + show_size = width / 5 + show_radius = show_size * 0.80 + context.set_source_rgb(*color) + context.set_operator(cairo.Operator.OVER) + context.arc(width - show_size, height - show_size, show_radius, 0, 2 * pi) + context.fill() + + return context.get_target() + + def clip_circle(surface): new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, surface.get_width(), @@ -113,22 +148,24 @@ class AvatarStorage(metaclass=Singleton): def invalidate_cache(self, jid): self._cache.pop(jid, None) - def get_pixbuf(self, contact, size, scale): - surface = self.get_surface(contact, size, scale) + def get_pixbuf(self, contact, size, scale, show=None): + surface = self.get_surface(contact, size, scale, show) return Gdk.pixbuf_get_from_surface(surface, 0, 0, size, size) - def get_surface(self, contact, size, scale): + def get_surface(self, contact, size, scale, show=None): jid = contact.jid if contact.is_gc_contact: jid = contact.get_full_jid() - surface = self._cache[jid].get((size, scale)) + surface = self._cache[jid].get((size, scale, show)) if surface is not None: return surface surface = self._get_avatar_from_storage(contact, size, scale) if surface is not None: - self._cache[jid][(size, scale)] = surface + if show is not None: + surface = add_status_to_avatar(surface, show) + self._cache[jid][(size, scale, show)] = surface return surface name = contact.get_shown_name() @@ -141,7 +178,9 @@ class AvatarStorage(metaclass=Singleton): letter = self._generate_letter(name) surface = self._generate_default_avatar( letter, color_string, size, scale) - self._cache[jid][(size, scale)] = surface + if show is not None: + surface = add_status_to_avatar(surface, show) + self._cache[jid][(size, scale, show)] = surface return surface def get_muc_surface(self, account, jid, size, scale): ===================================== gajim/gtk/const.py ===================================== @@ -67,3 +67,14 @@ class SettingType(IntEnum): VALUE = 2 ACTION = 3 DIALOG = 4 + + +SHOW_COLORS = { + 'online': (102/255, 191/255, 16/255), + 'offline': (154/255, 154/255, 154/255), + 'not in roster': (154/255, 154/255, 154/255), + 'chat': (102/255, 191/255, 16/255), + 'away': (255/255, 133/255, 51/255), + 'dnd': (230/255, 46/255, 0), + 'xa': (106/255, 0, 242/255) +} ===================================== gajim/gtk/start_chat.py ===================================== @@ -24,7 +24,6 @@ from gi.repository import Pango from nbxmpp.util import is_error_result from gajim.common import app -from gajim.common import helpers from gajim.common.helpers import validate_jid from gajim.common.helpers import to_user_string from gajim.common.helpers import get_groupchat_name @@ -580,12 +579,13 @@ class ContactRow(Gtk.ListBoxRow): self.groupchat = groupchat self.new = jid == '' + show = contact.show if contact else 'offline' grid = Gtk.Grid() grid.set_column_spacing(12) grid.set_size_request(260, -1) - image = self._get_avatar_image(account, jid) + image = self._get_avatar_image(account, jid, show) image.set_size_request(AvatarSize.CHAT, AvatarSize.CHAT) grid.add(image) @@ -604,11 +604,6 @@ class ContactRow(Gtk.ListBoxRow): self.name_label.set_width_chars(25) self.name_label.set_halign(Gtk.Align.START) self.name_label.get_style_context().add_class('bold16') - - status = contact.show if contact else 'offline' - css_class = helpers.get_css_show_color(status) - if css_class is not None: - self.name_label.get_style_context().add_class(css_class) middle_box.add(self.name_label) self.jid_label = Gtk.Label(label=jid) @@ -634,7 +629,7 @@ class ContactRow(Gtk.ListBoxRow): self.add(grid) self.show_all() - def _get_avatar_image(self, account, jid): + def _get_avatar_image(self, account, jid, show): if self.new: icon_name = 'avatar-default' if self.groupchat: @@ -648,7 +643,7 @@ class ContactRow(Gtk.ListBoxRow): return Gtk.Image.new_from_surface(surface) avatar = app.contacts.get_avatar( - account, jid, AvatarSize.CHAT, scale) + account, jid, AvatarSize.CHAT, scale, show) return Gtk.Image.new_from_surface(avatar) def update_jid(self, jid): ===================================== gajim/gui_interface.py ===================================== @@ -1994,10 +1994,10 @@ class Interface: def save_avatar(self, data): return self.avatar_storage.save_avatar(data) - def get_avatar(self, contact, size, scale, pixbuf=False): + def get_avatar(self, contact, size, scale, show=None, pixbuf=False): if pixbuf: - return self.avatar_storage.get_pixbuf(contact, size, scale) - return self.avatar_storage.get_surface(contact, size, scale) + return self.avatar_storage.get_pixbuf(contact, size, scale, show) + return self.avatar_storage.get_surface(contact, size, scale, show) def avatar_exists(self, filename): return self.avatar_storage.get_avatar_path(filename) is not None View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1044d1c7ba143c4d3916f48e025e7b0bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1044d1c7ba143c4d3916f48e025e7b0bd… 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