Commits June 2019

commits@gajim.org

1 participants
70 discussions

[Git][gajim/gajim][master] GroupChatControl: Fix drag and drop invites
by Philipp Hörist 14 Jun '19

14 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 780fcfa5 by Daniel Brötzmann at 2019-06-14T16:50:38Z GroupChatControl: Fix drag and drop invites This adds the correct TargetList to our drag destination. Dropping a contact on the group chat's roster will send an invite. - - - - - 3 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1241,17 +1241,17 @@ class ChatControl(ChatControlBase): c = self.contact if target_type == self.TARGET_TYPE_URI_LIST: - # file drag and drop (handled in chat_control_base) + # File drag and drop (handled in chat_control_base) self.drag_data_file_transfer(c, selection, self) else: - # chat2muc + # Convert single chat to MUC treeview = app.interface.roster.tree model = treeview.get_model() - data = selection.get_data() + data = selection.get_data().decode() path = treeview.get_selection().get_selected_rows()[1][0] iter_ = model.get_iter(path) type_ = model[iter_][2] - if type_ != 'contact': # source is not a contact + if type_ != 'contact': # Source is not a contact return dropped_jid = data ===================================== gajim/chat_control_base.py ===================================== @@ -244,35 +244,48 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # Init DND self.TARGET_TYPE_URI_LIST = 80 - self.dnd_list = [Gtk.TargetEntry.new('text/uri-list', 0, - self.TARGET_TYPE_URI_LIST), Gtk.TargetEntry.new('MY_TREE_MODEL_ROW', - Gtk.TargetFlags.SAME_APP, 0)] + uri_entry = Gtk.TargetEntry.new( + 'text/uri-list', + Gtk.TargetFlags.OTHER_APP, + self.TARGET_TYPE_URI_LIST) + dst_targets = Gtk.TargetList.new([uri_entry]) + dst_targets.add_text_targets(0) + self.dnd_list = [uri_entry, + Gtk.TargetEntry.new( + 'MY_TREE_MODEL_ROW', + Gtk.TargetFlags.SAME_APP, + 0)] id_ = self.widget.connect('drag_data_received', - self._on_drag_data_received) + self._on_drag_data_received) self.handlers[id_] = self.widget - self.widget.drag_dest_set(Gtk.DestDefaults.MOTION | - Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, - self.dnd_list, Gdk.DragAction.COPY) + self.widget.drag_dest_set( + Gtk.DestDefaults.ALL, + self.dnd_list, + Gdk.DragAction.COPY) + self.widget.drag_dest_set_target_list(dst_targets) # Create textviews and connect signals self.conv_textview = ConversationTextview(self.account) id_ = self.conv_textview.connect('quote', self.on_quote) self.handlers[id_] = self.conv_textview.tv - id_ = self.conv_textview.tv.connect('key_press_event', - self._conv_textview_key_press_event) + id_ = self.conv_textview.tv.connect( + 'key_press_event', self._conv_textview_key_press_event) self.handlers[id_] = self.conv_textview.tv + # FIXME: DND on non editable TextView, find a better way self.drag_entered = False id_ = self.conv_textview.tv.connect('drag_data_received', - self._on_drag_data_received) + self._on_drag_data_received) self.handlers[id_] = self.conv_textview.tv id_ = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion) self.handlers[id_] = self.conv_textview.tv id_ = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave) self.handlers[id_] = self.conv_textview.tv - self.conv_textview.tv.drag_dest_set(Gtk.DestDefaults.MOTION | - Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, - self.dnd_list, Gdk.DragAction.COPY) + self.conv_textview.tv.drag_dest_set( + Gtk.DestDefaults.ALL, + self.dnd_list, + Gdk.DragAction.COPY) + self.conv_textview.tv.drag_dest_set_target_list(dst_targets) self.conv_scrolledwindow = self.xml.get_object( 'conversation_scrolledwindow') @@ -307,12 +320,15 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): id_ = self.msg_textview.connect('populate_popup', self.on_msg_textview_populate_popup) self.handlers[id_] = self.msg_textview + # Setup DND id_ = self.msg_textview.connect('drag_data_received', - self._on_drag_data_received) + self._on_drag_data_received) self.handlers[id_] = self.msg_textview - self.msg_textview.drag_dest_set(Gtk.DestDefaults.MOTION | - Gtk.DestDefaults.HIGHLIGHT, self.dnd_list, Gdk.DragAction.COPY) + self.msg_textview.drag_dest_set( + Gtk.DestDefaults.ALL, + self.dnd_list, + Gdk.DragAction.COPY) self._overlay = self.xml.get_object('overlay') ===================================== gajim/groupchat_control.py ===================================== @@ -2420,27 +2420,26 @@ class GroupchatControl(ChatControlBase): if not selection.get_data(): return - # get contact info + # Get contact info contact = contacts.Contact(jid=self.room_jid, account=self.account) - if target_type == self.TARGET_TYPE_URI_LIST: - # file drag and drop (handled in chat_control_base) + # File drag and drop (handled in chat_control_base) self.drag_data_file_transfer(contact, selection, self) else: # Invite contact to groupchat treeview = app.interface.roster.tree model = treeview.get_model() - data = selection.get_data() + data = selection.get_data().decode() path = treeview.get_selection().get_selected_rows()[1][0] iter_ = model.get_iter(path) type_ = model[iter_][2] - if type_ != 'contact': # source is not a contact + if type_ != 'contact': # Source is not a contact return contact_jid = data con = app.connections[self.account] con.get_module('MUC').invite(self.room_jid, contact_jid) - self.add_info_message(_('%(jid)s has been invited in this room') % + self.add_info_message(_('%(jid)s has been invited to this group chat') % {'jid': contact_jid}) def _jid_not_blocked(self, bare_jid: str) -> bool: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/780fcfa5ceeb97e17a752debadf943fe36… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/780fcfa5ceeb97e17a752debadf943fe36… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Keep cairo < 1.13 compatibility
by Philipp Hörist 14 Jun '19

14 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7c3d4740 by Philipp Hörist at 2019-06-14T16:40:16Z Keep cairo < 1.13 compatibility - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -660,7 +660,9 @@ def generate_avatar(letters, color, size, scale): y_pos = height / 2 - (ex_height / 2 + y_bearing) context.move_to(x_pos, y_pos) context.set_source_rgb(0.95, 0.95, 0.95) - context.set_operator(cairo.Operator.OVER) + # use cairo.OPERATOR_OVER legacy constant because its + # compatible with cairo < 1.13 + context.set_operator(cairo.OPERATOR_OVER) context.show_text(letters) return context.get_target() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7c3d474070ebca82e186be8c19c1d39442… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7c3d474070ebca82e186be8c19c1d39442… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Split message actions from URIs
by Philipp Hörist 13 Jun '19

13 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8992ae1a by Daniel Brötzmann at 2019-06-13T21:02:47Z Split message actions from URIs - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -32,7 +32,6 @@ import sys import re import os import subprocess -import urllib import webbrowser import errno import select @@ -48,6 +47,8 @@ import collections import random import string from string import Template +import urllib +from urllib.parse import unquote from io import StringIO from datetime import datetime, timedelta from distutils.version import LooseVersion as V @@ -1480,20 +1481,38 @@ def delay_execution(milliseconds): return delay_execution_decorator +def parse_uri_actions(uri): + uri = uri[5:] + if '?' not in uri: + return 'message', {'jid': uri} + + jid, action = uri.split('?', 1) + data = {'jid': jid} + if ';' in action: + action, keys = action.split(';', 1) + action_keys = keys.split(';') + for key in action_keys: + if key.startswith('subject='): + data['subject'] = unquote(key[8:]) + + elif key.startswith('body='): + data['body'] = unquote(key[5:]) + + elif key.startswith('thread='): + data['thread'] = key[7:] + return action, data + + def parse_uri(uri): if uri.startswith('xmpp:'): - uri = uri[5:] - if '?' in uri: - jid, action = uri.split('?') - try: - return URI(type=URIType.XMPP, - action=URIAction(action), - data=jid) - except ValueError: - # Unknown action - pass - - return URI(type=URIType.XMPP, action=URIAction.MESSAGE, data=uri) + action, data = parse_uri_actions(uri) + try: + return URI(type=URIType.XMPP, + action=URIAction(action), + data=data) + except ValueError: + # Unknown action + return URI(type=URIType.UNKNOWN) if uri.startswith('mailto:'): uri = uri[7:] @@ -1548,7 +1567,8 @@ def open_uri(uri, account=None): if uri.action == URIAction.JOIN: app.interface.join_gc_minimal(account, uri.data) elif uri.action == URIAction.MESSAGE: - app.interface.new_chat_from_jid(account, uri.data) + app.interface.new_chat_from_jid(account, uri.data['jid'], + message=uri.data.get('body')) else: log.warning('Cant open URI: %s', uri) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8992ae1ab730295ab813822b6353b155cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8992ae1ab730295ab813822b6353b155cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework RosterItemExchangeWindow
by Philipp Hörist 13 Jun '19

13 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 485d0e7b by Daniel Brötzmann at 2019-06-13T19:25:31Z Rework RosterItemExchangeWindow - - - - - 4 changed files: - gajim/data/gui/roster_item_exchange_window.ui - gajim/dialogs.py - + gajim/gtk/roster_item_exchange.py - gajim/gui_interface.py Changes: ===================================== gajim/data/gui/roster_item_exchange_window.ui ===================================== @@ -1,154 +1,167 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkTextBuffer" id="textbuffer1"/> - <object class="GtkWindow" id="roster_item_exchange_window"> + <object class="GtkBox" id="roster_item_exchange"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="title" translatable="yes">Roster Item Exchange</property> - <property name="type_hint">dialog</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="vbox1"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">8</property> + <property name="margin_bottom">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="type_label"> <property name="visible">True</property> <property name="can_focus">False</property> -  - <property name="label"><b>someone(a)somewhere.com</b> would like you to <b>add</b> some contacts in your roster.</property> - <property name="use_markup">True</property> - <property name="justify">center</property> - <property name="selectable">True</property> + <property name="halign">start</property> + <property name="label"><user(a)example.org> would like to <action> some contacts in your contact list</property> + <property name="wrap">True</property> + <property name="max_width_chars">50</property> + <property name="xalign">0</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">4</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="body_scrolledwindow"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <child> - <object class="GtkTextView" id="body_textview"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="editable">False</property> - <property name="justification">center</property> - <property name="cursor_visible">False</property> - <property name="buffer">textbuffer1</property> - </object> - </child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Contact List Exchange</property> + <style> + <class name="large-header"/> + </style> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">avatar-default-symbolic</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="height">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="body_scrolledwindow"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="body_textview"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="editable">False</property> + <property name="wrap_mode">word</property> + <property name="left_margin">6</property> + <property name="right_margin">6</property> + <property name="top_margin">6</property> + <property name="bottom_margin">6</property> + <property name="cursor_visible">False</property> + <property name="buffer">textbuffer1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="width_request">350</property> + <property name="height_request">250</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> + <object class="GtkTreeView" id="items_list_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <child> - <object class="GtkTreeView" id="items_list_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> + <property name="has_focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> </child> </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButtonBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_cancel_button_clicked" swapped="no"/> + </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox1"> + <object class="GtkButton" id="accept_button"> + <property name="label" translatable="yes">OK</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="accept_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="on_accept_button_clicked" swapped="no"/> - <child> - <object class="GtkBox" id="hbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="stock">gtk-ok</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="accept_button_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_OK</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_on_accept_button_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> </child> </object> </interface> ===================================== gajim/dialogs.py ===================================== @@ -45,13 +45,11 @@ from gajim.common.const import MOODS from gajim.common import app from gajim.common import helpers -from gajim.common import i18n from gajim.common.exceptions import GajimGeneralException from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import InputDialog -from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_builder @@ -870,234 +868,6 @@ class SynchroniseSelectContactsDialog: iter_ = model.iter_next(iter_) self.dialog.destroy() -#Action that can be done with an incoming list of contacts -TRANSLATED_ACTION = {'add': _('add'), 'modify': _('modify'), - 'remove': _('remove')} -class RosterItemExchangeWindow: - """ - Windows used when someone send you a exchange contact suggestion - """ - - def __init__(self, account, action, exchange_list, jid_from, - message_body=None): - self.account = account - self.action = action - self.exchange_list = exchange_list - self.message_body = message_body - self.jid_from = jid_from - - show_dialog = False - - # Connect to gtk builder - self.xml = get_builder('roster_item_exchange_window.ui') - self.window = self.xml.get_object('roster_item_exchange_window') - - # Add Widgets. - for widget_to_add in ['accept_button_label', 'type_label', - 'body_scrolledwindow', 'body_textview', 'items_list_treeview']: - self.__dict__[widget_to_add] = self.xml.get_object(widget_to_add) - - # Set labels - # self.action can be 'add', 'modify' or 'remove' - self.type_label.set_label( - _('<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts ' - 'in your roster.') % {'jid': jid_from, - 'action': TRANSLATED_ACTION[self.action]}) - if message_body: - buffer_ = self.body_textview.get_buffer() - buffer_.set_text(self.message_body) - else: - self.body_scrolledwindow.hide() - # Treeview - model = Gtk.ListStore(bool, str, str, str, str) - self.items_list_treeview.set_model(model) - # columns - renderer1 = Gtk.CellRendererToggle() - renderer1.set_property('activatable', True) - renderer1.connect('toggled', self.toggled_callback) - if self.action == 'add': - title = _('Add') - elif self.action == 'modify': - title = _('Modify') - elif self.action == 'delete': - title = _('Delete') - self.items_list_treeview.insert_column_with_attributes(-1, title, - renderer1, active=0) - renderer2 = Gtk.CellRendererText() - self.items_list_treeview.insert_column_with_attributes(-1, _('JID'), - renderer2, text=1) - renderer3 = Gtk.CellRendererText() - self.items_list_treeview.insert_column_with_attributes(-1, _('Name'), - renderer3, text=2) - renderer4 = Gtk.CellRendererText() - self.items_list_treeview.insert_column_with_attributes(-1, _('Groups'), - renderer4, text=3) - - # Init contacts - model = self.items_list_treeview.get_model() - model.clear() - - if action == 'add': - for jid in self.exchange_list: - groups = '' - is_in_roster = True - contact = app.contacts.get_contact_with_highest_priority( - self.account, jid) - if not contact or _('Not in Roster') in contact.groups: - is_in_roster = False - name = self.exchange_list[jid][0] - num_list = len(self.exchange_list[jid][1]) - current = 0 - for group in self.exchange_list[jid][1]: - current += 1 - if contact and not group in contact.groups: - is_in_roster = False - if current == num_list: - groups = groups + group - else: - groups = groups + group + ', ' - if not is_in_roster: - show_dialog = True - iter_ = model.append() - model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) - - # Change label for accept_button to action name instead of 'OK'. - self.accept_button_label.set_label(_('Add')) - elif action == 'modify': - for jid in self.exchange_list: - groups = '' - is_in_roster = True - is_right = True - contact = app.contacts.get_contact_with_highest_priority( - self.account, jid) - name = self.exchange_list[jid][0] - if not contact: - is_in_roster = False - is_right = False - else: - if name != contact.name: - is_right = False - num_list = len(self.exchange_list[jid][1]) - current = 0 - for group in self.exchange_list[jid][1]: - current += 1 - if contact and not group in contact.groups: - is_right = False - if current == num_list: - groups = groups + group - else: - groups = groups + group + ', ' - if not is_right and is_in_roster: - show_dialog = True - iter_ = model.append() - model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) - - # Change label for accept_button to action name instead of 'OK'. - self.accept_button_label.set_label(_('Modify')) - elif action == 'delete': - for jid in self.exchange_list: - groups = '' - is_in_roster = True - contact = app.contacts.get_contact_with_highest_priority( - self.account, jid) - name = self.exchange_list[jid][0] - if not contact: - is_in_roster = False - num_list = len(self.exchange_list[jid][1]) - current = 0 - for group in self.exchange_list[jid][1]: - current += 1 - if current == num_list: - groups = groups + group - else: - groups = groups + group + ', ' - if is_in_roster: - show_dialog = True - iter_ = model.append() - model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) - - # Change label for accept_button to action name instead of 'OK'. - self.accept_button_label.set_label(_('Delete')) - - if show_dialog: - self.window.show_all() - self.xml.connect_signals(self) - - def toggled_callback(self, cell, path): - model = self.items_list_treeview.get_model() - iter_ = model.get_iter(path) - model[iter_][0] = not cell.get_active() - - def on_accept_button_clicked(self, widget): - model = self.items_list_treeview.get_model() - iter_ = model.get_iter_first() - if self.action == 'add': - a = 0 - while iter_: - if model[iter_][0]: - a += 1 - # it is selected - #remote_jid = model[iter_][1] - message = _('%s suggested me to add you in my roster.' - % self.jid_from) - # keep same groups and same nickname - groups = model[iter_][3].split(', ') - if groups == ['']: - groups = [] - jid = model[iter_][1] - if app.jid_is_transport(self.jid_from): - con = app.connections[self.account] - con.get_module('Presence').automatically_added.append(jid) - app.interface.roster.req_sub(self, jid, message, - self.account, groups=groups, nickname=model[iter_][2], - auto_auth=True) - iter_ = model.iter_next(iter_) - InformationDialog(i18n.ngettext('Added %d contact', - 'Added %d contacts', a, a, a)) - elif self.action == 'modify': - a = 0 - while iter_: - if model[iter_][0]: - a += 1 - # it is selected - jid = model[iter_][1] - # keep same groups and same nickname - groups = model[iter_][3].split(', ') - if groups == ['']: - groups = [] - for u in app.contacts.get_contact(self.account, jid): - u.name = model[iter_][2] - con = app.connections[self.account] - con.get_module('Roster').update_contact( - jid, model[iter_][2], groups) - self.draw_contact(jid, self.account) - # Update opened chat - ctrl = app.interface.msg_win_mgr.get_control(jid, self.account) - if ctrl: - ctrl.update_ui() - win = app.interface.msg_win_mgr.get_window(jid, - self.account) - win.redraw_tab(ctrl) - win.show_title() - iter_ = model.iter_next(iter_) - elif self.action == 'delete': - a = 0 - while iter_: - if model[iter_][0]: - a += 1 - # it is selected - jid = model[iter_][1] - app.connections[self.account].get_module('Presence').unsubscribe(jid) - app.interface.roster.remove_contact(jid, self.account) - app.contacts.remove_jid(self.account, jid) - iter_ = model.iter_next(iter_) - InformationDialog(i18n.ngettext('Removed %d contact', - 'Removed %d contacts', a, a, a)) - self.window.destroy() - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - class TransformChatToMUC: # Keep a reference on windows so garbage collector don't restroy them ===================================== gajim/gtk/roster_item_exchange.py ===================================== @@ -0,0 +1,257 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk + +from gajim.common import app +from gajim.common import i18n +from gajim.common.i18n import _ + +from gajim.gtk.dialogs import InformationDialog +from gajim.gtk.util import get_builder + + +class RosterItemExchangeWindow(Gtk.ApplicationWindow): + """ + Used when someone sends a Roster Item Exchange suggestion (XEP-0144) + """ + def __init__(self, account, action, exchange_list, jid_from, + message_body=None): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('Contact List Exchange')) + self.set_name('RosterItemExchangeWindow') + + self.account = account + self.action = action + self.exchange_list = exchange_list + self.message_body = message_body + self.jid_from = jid_from + + self._ui = get_builder('roster_item_exchange_window.ui') + self.add(self._ui.roster_item_exchange) + + # Set label depending on action + if action == 'add': + type_label = _('<b>%s</b> would like to add some ' + 'contacts to your contact list.') % self.jid_from + elif action == 'modify': + type_label = _('<b>%s</b> would like to modify some ' + 'contacts in your contact list.') % self.jid_from + elif action == 'delete': + type_label = _('<b>%s</b> would like to delete some ' + 'contacts from your contact list.') % self.jid_from + self._ui.type_label.set_markup(type_label) + if message_body: + buffer_ = self._ui.body_textview.get_buffer() + buffer_.set_text(self.message_body) + else: + self._ui.body_scrolledwindow.hide() + # Treeview + model = Gtk.ListStore(bool, str, str, str, str) + self._ui.items_list_treeview.set_model(model) + # Columns + renderer1 = Gtk.CellRendererToggle() + renderer1.set_property('activatable', True) + renderer1.connect('toggled', self._toggled) + if self.action == 'add': + title = _('Add') + elif self.action == 'modify': + title = _('Modify') + elif self.action == 'delete': + title = _('Delete') + self._ui.items_list_treeview.insert_column_with_attributes( + -1, title, renderer1, active=0) + renderer2 = Gtk.CellRendererText() + self._ui.items_list_treeview.insert_column_with_attributes( + -1, _('JID'), renderer2, text=1) + renderer3 = Gtk.CellRendererText() + self._ui.items_list_treeview.insert_column_with_attributes( + -1, _('Name'), renderer3, text=2) + renderer4 = Gtk.CellRendererText() + self._ui.items_list_treeview.insert_column_with_attributes( + -1, _('Groups'), renderer4, text=3) + + # Init contacts + self.model = self._ui.items_list_treeview.get_model() + self.model.clear() + + if action == 'add': + self._add() + elif action == 'modify': + self._modify() + elif action == 'delete': + self._delete() + + self._ui.connect_signals(self) + + def _toggled(self, cell, path): + model = self._ui.items_list_treeview.get_model() + iter_ = model.get_iter(path) + model[iter_][0] = not cell.get_active() + + def _add(self): + for jid in self.exchange_list: + groups = '' + is_in_roster = True + contact = app.contacts.get_contact_with_highest_priority( + self.account, jid) + if not contact or _('Not in Roster') in contact.groups: + is_in_roster = False + name = self.exchange_list[jid][0] + num_list = len(self.exchange_list[jid][1]) + current = 0 + for group in self.exchange_list[jid][1]: + current += 1 + if contact and group not in contact.groups: + is_in_roster = False + if current == num_list: + groups = groups + group + else: + groups = groups + group + ', ' + if not is_in_roster: + self.show_all() + iter_ = self.model.append() + self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + + self._ui.accept_button.set_label(_('Add')) + + def _modify(self): + for jid in self.exchange_list: + groups = '' + is_in_roster = True + is_right = True + contact = app.contacts.get_contact_with_highest_priority( + self.account, jid) + name = self.exchange_list[jid][0] + if not contact: + is_in_roster = False + is_right = False + else: + if name != contact.name: + is_right = False + num_list = len(self.exchange_list[jid][1]) + current = 0 + for group in self.exchange_list[jid][1]: + current += 1 + if contact and group not in contact.groups: + is_right = False + if current == num_list: + groups = groups + group + else: + groups = groups + group + ', ' + if not is_right and is_in_roster: + self.show_all() + iter_ = self.model.append() + self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + + self._ui.accept_button.set_label(_('Modify')) + + def _delete(self): + for jid in self.exchange_list: + groups = '' + is_in_roster = True + contact = app.contacts.get_contact_with_highest_priority( + self.account, jid) + name = self.exchange_list[jid][0] + if not contact: + is_in_roster = False + num_list = len(self.exchange_list[jid][1]) + current = 0 + for group in self.exchange_list[jid][1]: + current += 1 + if current == num_list: + groups = groups + group + else: + groups = groups + group + ', ' + if is_in_roster: + self.show_all() + iter_ = self.model.append() + self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + + self._ui.accept_button.set_label(_('Delete')) + + def _on_accept_button_clicked(self, widget): + model = self._ui.items_list_treeview.get_model() + iter_ = model.get_iter_first() + if self.action == 'add': + a = 0 + while iter_: + if model[iter_][0]: + a += 1 + # It is selected + message = _('%s suggested me to add you to my ' + 'contact list.' % self.jid_from) + # Keep same groups and same nickname + groups = model[iter_][3].split(', ') + if groups == ['']: + groups = [] + jid = model[iter_][1] + if app.jid_is_transport(self.jid_from): + con = app.connections[self.account] + con.get_module('Presence').automatically_added.append( + jid) + app.interface.roster.req_sub( + self, jid, message, self.account, groups=groups, + nickname=model[iter_][2], auto_auth=True) + iter_ = model.iter_next(iter_) + InformationDialog(i18n.ngettext('Added %d contact', + 'Added %d contacts', a, a, a)) + elif self.action == 'modify': + a = 0 + while iter_: + if model[iter_][0]: + a += 1 + # It is selected + jid = model[iter_][1] + # Keep same groups and same nickname + groups = model[iter_][3].split(', ') + if groups == ['']: + groups = [] + for u in app.contacts.get_contact(self.account, jid): + u.name = model[iter_][2] + con = app.connections[self.account] + con.get_module('Roster').update_contact( + jid, model[iter_][2], groups) + self.draw_contact(jid, self.account) + # Update opened chats + ctrl = app.interface.msg_win_mgr.get_control(jid, + self.account) + if ctrl: + ctrl.update_ui() + win = app.interface.msg_win_mgr.get_window(jid, + self.account) + win.redraw_tab(ctrl) + win.show_title() + iter_ = model.iter_next(iter_) + elif self.action == 'delete': + a = 0 + while iter_: + if model[iter_][0]: + a += 1 + # It is selected + jid = model[iter_][1] + app.connections[self.account].get_module( + 'Presence').unsubscribe(jid) + app.interface.roster.remove_contact(jid, self.account) + app.contacts.remove_jid(self.account, jid) + iter_ = model.iter_next(iter_) + InformationDialog(i18n.ngettext('Removed %d contact', + 'Removed %d contacts', a, a, a)) + self.destroy() + + def _on_cancel_button_clicked(self, widget): + self.destroy() ===================================== gajim/gui_interface.py ===================================== @@ -121,6 +121,7 @@ from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.filetransfer import FileTransfersWindow +from gajim.gtk.roster_item_exchange import RosterItemExchangeWindow from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray @@ -1127,8 +1128,8 @@ class Interface: @staticmethod def handle_event_roster_item_exchange(obj): # data = (action in [add, delete, modify], exchange_list, jid_from) - dialogs.RosterItemExchangeWindow(obj.conn.name, obj.action, - obj.exchange_items_list, obj.fjid) + RosterItemExchangeWindow(obj.conn.name, obj.action, + obj.exchange_items_list, obj.fjid) def handle_event_ssl_error(self, obj): account = obj.conn.name View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/485d0e7b83e9ab077c1ca4778f15539d9a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/485d0e7b83e9ab077c1ca4778f15539d9a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Keep cairo < 1.15 compatibility
by Philipp Hörist 13 Jun '19

13 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 68b87bbb by Philipp Hörist at 2019-06-13T19:19:37Z Keep cairo < 1.15 compatibility Fixes #9733 - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -647,8 +647,17 @@ def generate_avatar(letters, color, size, scale): cairo.FONT_WEIGHT_NORMAL) context.set_font_size(font_size) extends = context.text_extents(letters) - x_pos = width / 2 - (extends.width / 2 + extends.x_bearing) - y_pos = height / 2 - (extends.height / 2 + extends.y_bearing) + if isinstance(extends, tuple): + # For cairo < 1.15 + x_bearing, y_bearing, ex_width, ex_height = extends[0:4] + else: + x_bearing = extends.x_bearing + y_bearing = extends.y_bearing + ex_width = extends.width + ex_height = extends.height + + x_pos = width / 2 - (ex_width / 2 + x_bearing) + y_pos = height / 2 - (ex_height / 2 + y_bearing) context.move_to(x_pos, y_pos) context.set_source_rgb(0.95, 0.95, 0.95) context.set_operator(cairo.Operator.OVER) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/68b87bbb3569684281c6ace7d3fd76cd85… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/68b87bbb3569684281c6ace7d3fd76cd85… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MucCapsCache: Add query for anonymity
by Philipp Hörist 13 Jun '19

13 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1348a741 by Daniel Brötzmann at 2019-06-13T15:23:38Z MucCapsCache: Add query for anonymity This adds a query to determine whether a MUC is semi-anonymous or non-anonymous. - - - - - 1 changed file: - gajim/common/caps_cache.py Changes: ===================================== gajim/common/caps_cache.py ===================================== @@ -505,6 +505,9 @@ class MucCapsCache: pass return allowed + def is_anonymous(self, jid): + return 'muc_nonanonymous' not in self.cache[jid].features + def get_room_infos(self, jid): room_info = {} if jid in self.cache: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1348a741fd2dd24bc285525b022070c374… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1348a741fd2dd24bc285525b022070c374… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MUC: Rework captcha prompt
by Philipp Hörist 12 Jun '19

12 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e1bef611 by Philipp Hörist at 2019-06-12T19:18:58Z MUC: Rework captcha prompt - - - - - 4 changed files: - gajim/chat_control_base.py - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - gajim/gtk/dataform.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -314,6 +314,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.msg_textview.drag_dest_set(Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT, self.dnd_list, Gdk.DragAction.COPY) + self._overlay = self.xml.get_object('overlay') + # the following vars are used to keep history of user's messages self.sent_history = [] self.sent_history_pos = 0 ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -98,309 +98,318 @@ <signal name="button-release-event" handler="_on_hpaned_release_button" swapped="no"/> <signal name="notify::position" handler="_on_hpaned_handle_change" swapped="no"/> <child> - <object class="GtkBox" id="gc_textviews_vbox"> - <property name="width_request">0</property> + <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">4</property> - <property name="orientation">vertical</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> - <property name="name">GroupChatControl-BannerEventBox</property> + <object class="GtkBox" id="gc_textviews_vbox"> + <property name="width_request">0</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_right">4</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="hbox3024"> + <object class="GtkEventBox" id="banner_eventbox"> + <property name="name">GroupChatControl-BannerEventBox</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkImage" id="gc_banner_status_image"> + <object class="GtkBox" id="hbox3024"> <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">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="banner_name_label"> - <property name="name">GroupChatControl-BannerNameLabel</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"><span weight="heavy" size="large">room jid</span></property> - <property name="use_markup">True</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkActionBar" id="banner_actionbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="actionbar-no-border"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <style> - <class name="gajim-banner"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="chatcontrol-separator-top"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="width_request">200</property> - <property name="height_request">60</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> - <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> - <signal name="scroll-event" handler="_on_scroll" swapped="no"/> - <child> - <placeholder/> - </child> - <style> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - <class name="scrollbar-style"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="chatcontrol-separator"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkMenuButton" id="settings_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">open-menu-symbolic</property> + <child> + <object class="GtkImage" id="gc_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">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="banner_name_label"> + <property name="name">GroupChatControl-BannerNameLabel</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><span weight="heavy" size="large">room jid</span></property> + <property name="use_markup">True</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkActionBar" id="banner_actionbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="actionbar-no-border"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> </object> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="gajim-banner"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="authentication_button"> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="lock_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-authentication</property> - <property name="icon_size">1</property> - </object> - </child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="chatcontrol-separator-top"/> </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkMenuButton" id="encryption_menu"> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="width_request">200</property> + <property name="height_request">60</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Choose encryption</property> - <property name="relief">none</property> + <property name="shadow_type">in</property> + <property name="overlay_scrolling">False</property> + <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> + <signal name="scroll-event" handler="_on_scroll" swapped="no"/> <child> <placeholder/> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="scrolled-no-border"/> + <class name="no-scroll-indicator"/> + <class name="scrollbar-style"/> </style> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkButton" id="sendfile_button"> + <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">mail-attachment-symbolic</property> - </object> - </child> + <property name="can_focus">False</property> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="chatcontrol-separator"/> </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> - <object class="GtkMenuButton" id="emoticons_button"> + <object class="GtkBox" id="hbox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> - <property name="relief">none</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkImage"> + <object class="GtkMenuButton" id="settings_menu"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">face-smile-symbolic</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">open-menu-symbolic</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="authentication_button"> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="lock_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-dialog-authentication</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="encryption_menu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose encryption</property> + <property name="relief">none</property> + <child> + <placeholder/> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="formattings_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="relief">none</property> - <property name="popup">formattings_menu</property> <child> - <object class="GtkImage" id="image10"> + <object class="GtkButton" id="sendfile_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">mail-attachment-symbolic</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="emoticons_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">face-smile-symbolic</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="formattings_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="relief">none</property> + <property name="popup">formattings_menu</property> + <child> + <object class="GtkImage" id="image10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">format-text-bold-symbolic</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkComboBox" id="label_selector"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">format-text-bold-symbolic</property> - <property name="icon_size">1</property> + <property name="no_show_all">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkComboBox" id="label_selector"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">7</property> + <property name="fill">False</property> + <property name="position">4</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> + <property name="index">-1</property> </packing> </child> </object> <packing> - <property name="resize">True</property> + <property name="resize">False</property> <property name="shrink">False</property> </packing> </child> ===================================== gajim/groupchat_control.py ===================================== @@ -264,8 +264,6 @@ class GroupchatControl(ChatControlBase): self.setup_seclabel() - self.form_widget = None - # Send file self.sendfile_button = self.xml.get_object('sendfile_button') self.sendfile_button.set_action_name('win.send-file-' + \ @@ -299,6 +297,9 @@ class GroupchatControl(ChatControlBase): self.banner_actionbar.pack_end(self.hide_roster_button) self.banner_actionbar.pack_start(self.subject_button) + # Holds CaptchaRequest widget + self._captcha_request = None + # GC Roster tooltip self.gc_tooltip = GCTooltip() @@ -1155,42 +1156,31 @@ class GroupchatControl(ChatControlBase): if event.jid != self.room_jid: return - if self.form_widget: - self.form_widget.hide() - self.form_widget.destroy() - self.btn_box.destroy() # pylint: disable=access-member-before-definition + self._remove_captcha_request() - self.form_widget = DataFormWidget(event.form) - - def on_send_dataform_clicked(widget): - if not self.form_widget: - return - form_node = self.form_widget.get_submit_form() + def on_send_dataform_clicked(*args): + form_node = self._captcha_request.get_submit_form() con = app.connections[self.account] con.get_module('MUC').send_captcha(self.room_jid, form_node) - self.form_widget.hide() - self.form_widget.destroy() - self.btn_box.destroy() - self.form_widget = None - del self.btn_box - - # self.form_widget.connect('validated', on_send_dataform_clicked) - self.form_widget.show_all() - vbox = self.xml.get_object('gc_textviews_vbox') - vbox.pack_start(self.form_widget, False, True, 0) - - valid_button = Gtk.Button(stock=Gtk.STOCK_OK) - valid_button.connect('clicked', on_send_dataform_clicked) - self.btn_box = Gtk.HButtonBox() - self.btn_box.set_layout(Gtk.ButtonBoxStyle.END) - self.btn_box.pack_start(valid_button, True, True, 0) - self.btn_box.show_all() - vbox.pack_start(self.btn_box, False, False, 0) + self._remove_captcha_request() + + self._captcha_request = CaptchaRequest(event.form, + on_send_dataform_clicked) + self._overlay.add_overlay(self._captcha_request) + if self.parent_win: self.parent_win.redraw_tab(self, 'attention') else: self.attention_flag = True + def _remove_captcha_request(self): + if self._captcha_request is None: + return + if self._captcha_request in self._overlay.get_children(): + self._overlay.remove(self._captcha_request) + self._captcha_request.destroy() + self._captcha_request = None + def _nec_mam_decrypted_message_received(self, obj): if obj.conn.name != self.account: return @@ -3062,3 +3052,27 @@ class SubjectPopover(Gtk.Popover): # is not cross-platform compatible open_uri(uri) return Gdk.EVENT_STOP + + +class CaptchaRequest(Gtk.Box): + def __init__(self, form, callback): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + + options = {'no-scrolling': True} + self._form_widget = DataFormWidget(form, options=options) + self._form_widget.set_valign(Gtk.Align.START) + + send_button = Gtk.Button(label='Send') + send_button.connect('clicked', callback) + send_button.set_halign(Gtk.Align.CENTER) + + self.add(self._form_widget) + self.add(send_button) + + self.set_valign(Gtk.Align.START) + self.set_margin_top(100) + + self.show_all() + + def get_submit_form(self): + return self._form_widget.get_submit_form() ===================================== gajim/gtk/dataform.py ===================================== @@ -38,10 +38,13 @@ class DataFormWidget(Gtk.ScrolledWindow): self.get_style_context().add_class('data-form-widget') self.set_overlay_scrolling(False) - self._form_node = form_node - if options is None: options = {} + + if options.get('no-scrolling', False): + self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER) + + self._form_node = form_node self._form_grid = FormGrid(form_node, options) self.add(self._form_grid) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e1bef6111caa5132adc60bc4c5c06d36b1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e1bef6111caa5132adc60bc4c5c06d36b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Unpack colors correctly
by Philipp Hörist 12 Jun '19

12 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b86c5afa by Philipp Hörist at 2019-06-12T17:23:38Z Unpack colors correctly - - - - - 239b34f4 by Philipp Hörist at 2019-06-12T17:39:11Z Dont use deprecated Gdk.Color - - - - - 3 changed files: - gajim/conversation_textview.py - gajim/gtk/htmltextview.py - gajim/gtk/util.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -1253,8 +1253,8 @@ class ConversationTextview(GObject.GObject): def _add_new_colour_tags(self, tag, name): if self._buffer.get_tag_table().lookup(tag) is not None: return - gdk_color = Gdk.Color.from_floats(*text_to_color(name)) - self._buffer.create_tag(tag, foreground_gdk=gdk_color) + rgba = Gdk.RGBA(*text_to_color(name)) + self._buffer.create_tag(tag, foreground_rgba=rgba) def print_subject(self, subject, iter_=None): if subject: # if we have subject, show it too! ===================================== gajim/gtk/htmltextview.py ===================================== @@ -193,10 +193,11 @@ for _name in BLOCK_HEAD: ('font-weight: bold', 'font-style: oblique')[_weight]) def _parse_css_color(color): - if color.startswith('rgb(') and color.endswith(')'): - red, green, blue = [int(c)*257 for c in color[4:-1].split(',')] - return Gdk.Color(red, green, blue) - return Gdk.color_parse(color) + rgba = Gdk.RGBA() + success = rgba.parse(color) + if not success: + log.warning('Can\'t parse color: %s', color) + return rgba def style_iter(style): return ([x.strip() for x in item.split(':', 1)] for item in style.split(';')\ @@ -237,13 +238,13 @@ class HtmlHandler(xml.sax.handler.ContentHandler): @staticmethod def _parse_style_color(tag, value): color = _parse_css_color(value) - tag.set_property('foreground-gdk', color) + tag.set_property('foreground-rgba', color) @staticmethod def _parse_style_background_color(tag, value): color = _parse_css_color(value) - tag.set_property('background-gdk', color) - tag.set_property('paragraph-background-gdk', color) + tag.set_property('background-rgba', color) + tag.set_property('paragraph-background-rgba', color) @staticmethod def __parse_length_frac_size_allocate(_textview, allocation, frac, ===================================== gajim/gtk/util.py ===================================== @@ -623,7 +623,7 @@ def find_widget(name, container): @lru_cache(maxsize=1024) def generate_avatar(letters, color, size, scale): # Get color for nickname with XEP-0392 - color_r, color_b, color_g = color + color_r, color_g, color_b = color # Set up colors and size if scale is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/de982e963b80f23c28c1988ec86bc943a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/de982e963b80f23c28c1988ec86bc943a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add avatar generator
by Philipp Hörist 12 Jun '19

12 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: de982e96 by Daniel Brötzmann at 2019-06-12T17:04:46Z Add avatar generator - - - - - 11 changed files: - gajim/chat_control.py - gajim/common/config.py - gajim/common/contacts.py - gajim/groupchat_control.py - gajim/gtk/profile.py - gajim/gtk/tooltips.py - gajim/gtk/util.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/privatechat_control.py - gajim/remote_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1220,10 +1220,7 @@ class ChatControl(ChatControlBase): self.account, self.contact.jid, 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) + image.set_from_surface(surface) def _nec_update_avatar(self, obj): if obj.account != self.account: ===================================== gajim/common/config.py ===================================== @@ -294,6 +294,7 @@ class Config: 'show_chatstate_in_banner': [opt_bool, True, _('Shows a text in the banner that describes the current chatstate of the contact')], 'send_chatstate_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled')], 'send_chatstate_muc_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: all, composing_only, disabled')], + 'avatar_clipping': [opt_str, 'rounded_corners', _('How to display avatars:\n\'rounded_corners\' - Display avatars with cropped corners.\n\'circle\' - Display round avatars.\n\'no_clipping\' - Display avatar as-is.')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/common/contacts.py ===================================== @@ -251,7 +251,7 @@ class GC_Contact(CommonContact): return self.name def get_avatar(self, *args, **kwargs): - return common.app.interface.get_avatar(self.avatar_sha, *args, **kwargs) + return common.app.interface.get_avatar(self, *args, **kwargs) def as_contact(self): """ @@ -599,10 +599,8 @@ class Contacts(): return None for resource in self._contacts[jid]: - if resource.avatar_sha is None: - continue avatar = common.app.interface.get_avatar( - resource.avatar_sha, size, scale) + resource, size, scale) if avatar is None: self.set_avatar(jid, None) return avatar ===================================== gajim/groupchat_control.py ===================================== @@ -746,7 +746,7 @@ class GroupchatControl(ChatControlBase): transient_for=self.parent_win.window) return - publish = app.interface.get_avatar(sha, publish=True) + publish = app.interface.get_avatar_from_storage(sha, publish=True) avatar = base64.b64encode(publish).decode('utf-8') con = app.connections[self.account] con.get_module('VCardTemp').upload_room_avatar( @@ -1074,7 +1074,7 @@ class GroupchatControl(ChatControlBase): banner_status_img = self.xml.get_object('gc_banner_status_image') if self.is_connected: if self.contact.avatar_sha: - surface = app.interface.get_avatar(self.contact.avatar_sha, + surface = app.interface.get_avatar(self.contact, AvatarSize.ROSTER, self.scale_factor) banner_status_img.set_from_surface(surface) @@ -1694,7 +1694,7 @@ class GroupchatControl(ChatControlBase): return surface = app.interface.get_avatar( - gc_contact.avatar_sha, AvatarSize.ROSTER, self.scale_factor) + gc_contact, AvatarSize.ROSTER, self.scale_factor) image = Gtk.Image.new_from_surface(surface) self.model[iter_][Column.AVATAR_IMG] = image @@ -2119,7 +2119,7 @@ class GroupchatControl(ChatControlBase): image = None if app.config.get('show_avatars_in_roster'): surface = app.interface.get_avatar( - contact.avatar_sha, AvatarSize.ROSTER, self.scale_factor) + contact, AvatarSize.ROSTER, self.scale_factor) image = Gtk.Image.new_from_surface(surface) # Add to model ===================================== gajim/gtk/profile.py ===================================== @@ -135,7 +135,7 @@ class ProfileWindow(Gtk.ApplicationWindow): return scale = self.get_scale_factor() - surface = app.interface.get_avatar(sha, AvatarSize.VCARD, scale) + surface = app.interface.get_avatar_from_storage(sha, AvatarSize.VCARD, scale) button = self.xml.get_object('PHOTO_button') image = self.xml.get_object('PHOTO_image') @@ -145,7 +145,7 @@ class ProfileWindow(Gtk.ApplicationWindow): text_button.hide() self.avatar_sha = sha - publish = app.interface.get_avatar(sha, publish=True) + publish = app.interface.get_avatar_from_storage(sha, publish=True) self.avatar_encoded = base64.b64encode(publish).decode('utf-8') self.avatar_mime_type = 'image/png' @@ -212,7 +212,7 @@ class ProfileWindow(Gtk.ApplicationWindow): self.avatar_mime_type = vcard_[i]['TYPE'] scale = self.get_scale_factor() - surface = app.interface.get_avatar( + surface = app.interface.get_avatar_from_storage( self.avatar_sha, AvatarSize.VCARD, scale) if surface is None: pixbuf = gtkgui_helpers.scale_pixbuf_from_data( ===================================== gajim/gtk/tooltips.py ===================================== @@ -232,13 +232,12 @@ class GCTooltip(): if contact.avatar_sha is not None: app.log('avatar').debug( 'Load GCTooltip: %s %s', contact.name, contact.avatar_sha) - scale = self._ui.tooltip_grid.get_scale_factor() - surface = app.interface.get_avatar( - contact.avatar_sha, AvatarSize.TOOLTIP, scale) - if surface is not None: - self._ui.avatar.set_from_surface(surface) - self._ui.avatar.show() - self._ui.fillelement.show() + scale = self._ui.tooltip_grid.get_scale_factor() + surface = app.interface.get_avatar( + contact, AvatarSize.TOOLTIP, scale) + self._ui.avatar.set_from_surface(surface) + self._ui.avatar.show() + self._ui.fillelement.show() app.plugin_manager.gui_extension_point( 'gc_tooltip_populate', self, contact, self._ui.tooltip_grid) @@ -442,9 +441,8 @@ class RosterTooltip(StatusTable): scale = self._ui.tooltip_grid.get_scale_factor() surface = app.contacts.get_avatar( account, self.prim_contact.jid, AvatarSize.TOOLTIP, scale) - if surface is not None: - self._ui.avatar.set_from_surface(surface) - self._ui.avatar.show() + self._ui.avatar.set_from_surface(surface) + self._ui.avatar.show() app.plugin_manager.gui_extension_point( 'roster_tooltip_populate', self, contacts, self._ui.tooltip_grid) ===================================== gajim/gtk/util.py ===================================== @@ -26,7 +26,9 @@ import logging import textwrap import xml.etree.ElementTree as ET from pathlib import Path +from functools import lru_cache from functools import wraps +from math import pi from gi.repository import Gdk from gi.repository import Gtk @@ -618,6 +620,87 @@ def find_widget(name, container): return find_widget(name, child) +@lru_cache(maxsize=1024) +def generate_avatar(letters, color, size, scale): + # Get color for nickname with XEP-0392 + color_r, color_b, color_g = color + + # Set up colors and size + if scale is not None: + size = size * scale + + width = size + height = size + font_size = size * 0.5 + + # Set up surface + surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) + context = cairo.Context(surface) + + context.set_source_rgb(color_r, color_g, color_b) + context.rectangle(0, 0, width, height) + context.fill() + + # Draw letters + context.select_font_face('sans-serif', + cairo.FONT_SLANT_NORMAL, + cairo.FONT_WEIGHT_NORMAL) + context.set_font_size(font_size) + extends = context.text_extents(letters) + x_pos = width / 2 - (extends.width / 2 + extends.x_bearing) + y_pos = height / 2 - (extends.height / 2 + extends.y_bearing) + context.move_to(x_pos, y_pos) + context.set_source_rgb(0.95, 0.95, 0.95) + context.set_operator(cairo.Operator.OVER) + context.show_text(letters) + + return context.get_target() + + +def clip_circle(surface): + new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, + surface.get_width(), + surface.get_height()) + context = cairo.Context(new_surface) + context.set_source_surface(surface, 0, 0) + + width = surface.get_width() + height = surface.get_height() + radius = width / 2 + + context.arc(width / 2, height / 2, radius, 0, 2 * pi) + + context.clip() + context.paint() + + return context.get_target() + + +def clip_rounded_corners(surface): + new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, + surface.get_width(), + surface.get_height()) + context = cairo.Context(new_surface) + context.set_source_surface(surface, 0, 0) + + width = surface.get_width() + height = surface.get_height() + radius = width * 0.1 + deg = pi / 180.0 + + context.new_sub_path() + context.arc(width - radius, radius, radius, -90 * deg, 0) + context.arc(width - radius, height - radius, radius, 0, 90 * deg) + context.arc(radius, height - radius, radius, 90 * deg, 180 * deg) + context.arc(radius, radius, radius, 180 * deg, 270 * deg) + context.close_path() + + context.clip() + context.paint() + + return context.get_target() + + class MultiLineLabel(Gtk.Label): def __init__(self, *args, **kwargs): Gtk.Label.__init__(self, *args, **kwargs) ===================================== gajim/gtkgui_helpers.py ===================================== @@ -159,7 +159,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): app.config.set('last_save_dir', os.path.dirname(file_path)) if isinstance(avatar, str): # We got a SHA - pixbuf = app.interface.get_avatar(avatar) + pixbuf = app.interface.get_avatar_from_storage(avatar) else: # We got a pixbuf pixbuf = avatar ===================================== gajim/gui_interface.py ===================================== @@ -124,6 +124,10 @@ from gajim.gtk.filetransfer import FileTransfersWindow from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray +from gajim.gtk.util import generate_avatar +from gajim.gtk.util import clip_circle +from gajim.gtk.util import clip_rounded_corners +from gajim.gtk.util import text_to_color parser = optparser.OptionsParser(configpaths.get('CONFIG_FILE')) @@ -2044,8 +2048,37 @@ class Interface: return sha - @staticmethod - def get_avatar(filename, size=None, scale=None, publish=False): + def get_avatar(self, contact, size=None, scale=None, publish=False): + surface = self.get_avatar_from_storage(contact.avatar_sha, + size, + scale, + publish) + + if surface is None: + # No avatar found, generate one + + # Get initial from name + name = contact.get_shown_name() + letter = name[0].capitalize() + + # Use nickname for group chats and bare JID for single contacts + if contact.is_gc_contact: + color_string = contact.name + else: + color_string = contact.jid + color = text_to_color(color_string) + surface = generate_avatar(letter, color, size, scale) + + # Clip avatar + clip_setting = app.config.get('avatar_clipping') + if clip_setting == 'circle': + return clip_circle(surface) + if clip_setting == 'rounded_corners': + return clip_rounded_corners(surface) + + return surface + + def get_avatar_from_storage(self, filename, size=None, scale=None, publish=False): if filename is None or '': return ===================================== gajim/privatechat_control.py ===================================== @@ -231,7 +231,7 @@ class PrivateChatControl(ChatControl): scale = self.parent_win.window.get_scale_factor() surface = app.interface.get_avatar( - self.gc_contact.avatar_sha, AvatarSize.CHAT, scale) + 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) ===================================== gajim/remote_control.py ===================================== @@ -918,7 +918,7 @@ class GajimRemote(Server): if sha is None: return app.config.set_per('accounts', self.name, 'avatar_sha', sha) - data = app.interface.get_avatar(sha, publish=True) + data = app.interface.get_avatar_from_storage(sha, publish=True) avatar = base64.b64encode(data).decode('utf-8') avatar_mime_type = mimetypes.guess_type(picture)[0] vcard = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/de982e963b80f23c28c1988ec86bc943ae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/de982e963b80f23c28c1988ec86bc943ae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConsistentColors: Fix background argument
by Philipp Hörist 12 Jun '19

12 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5fdb76d0 by Philipp Hörist at 2019-06-12T16:04:16Z ConsistentColors: Fix background argument - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -646,7 +646,7 @@ class MaxWidthComboBoxText(Gtk.ComboBoxText): def text_to_color(text): if app.css_config.prefer_dark: - background = (1, 1, 1) + background = (0, 0, 0) # RGB (0, 0, 0) black else: - background = (0, 0, 0) + background = (1, 1, 1) # RGB (255, 255, 255) white return nbxmpp.util.text_to_color(text, background) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fdb76d02a12aa1a475143a8f06e848fac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fdb76d02a12aa1a475143a8f06e848fac… 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 June 2019