Commits September 2019

commits@gajim.org

1 participants
59 discussions

[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

[Git][gajim/gajim][master] Improve default avatar caching
by Philipp Hörist 02 Sep '19

02 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1044d1c7 by Philipp Hörist at 2019-09-02T19:55:01Z Improve default avatar caching Caches now also the circle clipping - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -37,7 +37,6 @@ from gajim.gtk.util import scale_with_ratio log = logging.getLogger('gajim.gtk.avatar') -@lru_cache(maxsize=1024) def generate_avatar(letters, color, size, scale): # Get color for nickname with XEP-0392 color_r, color_g, color_b = color @@ -139,7 +138,9 @@ class AvatarStorage(metaclass=Singleton): else: color_string = contact.jid - surface = self._generate_default_avatar(name, color_string, size, scale) + letter = self._generate_letter(name) + surface = self._generate_default_avatar( + letter, color_string, size, scale) self._cache[jid][(size, scale)] = surface return surface @@ -159,7 +160,8 @@ class AvatarStorage(metaclass=Singleton): con = app.connections[account] name = get_groupchat_name(con, jid) - surface = self._generate_default_avatar(name, jid, size, scale) + letter = self._generate_letter(name) + surface = self._generate_default_avatar(letter, jid, size, scale) self._cache[jid][(size, scale)] = surface return surface @@ -265,8 +267,9 @@ class AvatarStorage(metaclass=Singleton): return letter.capitalize() return name[0].capitalize() - def _generate_default_avatar(self, name, color_string, size, scale): - letter = self._generate_letter(name) + @staticmethod + @lru_cache(maxsize=2048) + def _generate_default_avatar(letter, color_string, size, scale): color = text_to_color(color_string) surface = generate_avatar(letter, color, size, scale) surface = clip_circle(surface) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1044d1c7ba143c4d3916f48e025e7b0bd7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1044d1c7ba143c4d3916f48e025e7b0bd7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DialogButton: Add Accept button type
by Philipp Hörist 02 Sep '19

02 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ee7ad12f by Daniel Brötzmann at 2019-09-02T15:25:57Z DialogButton: Add Accept button type - - - - - 1 changed file: - gajim/gtk/dialogs.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -52,6 +52,11 @@ class DialogButton(namedtuple('DialogButton', ('response text callback args ' default_kwargs['response'] = Gtk.ResponseType.CANCEL default_kwargs['text'] = _('Cancel') + elif type_ == 'Accept': + default_kwargs['response'] = Gtk.ResponseType.OK + default_kwargs['text'] = _('Accept') + default_kwargs['action'] = ButtonAction.SUGGESTED + elif type_ == 'Delete': default_kwargs['response'] = Gtk.ResponseType.OK default_kwargs['text'] = _('Delete') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ee7ad12f073b6a56406823ecb716092590… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ee7ad12f073b6a56406823ecb716092590… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] fix error
by Yann Leboulanger 01 Sep '19

01 Sep '19

Yann Leboulanger pushed to branch chat_markers at gajim / gajim Commits: b22005a8 by Yann Leboulanger at 2019-09-01T16:23:52Z fix error - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1249,6 +1249,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # we are at the end if not app.events.remove_events( self.account, jid, types=types_list): + con = app.connections[self.account] # There were events to remove self.redraw_after_event_removed(jid) # XEP-0333 Send <displayed> tag. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b22005a86aabbc404f2670fc90997c5822… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b22005a86aabbc404f2670fc90997c5822… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch chat_markers
by Yann Leboulanger 01 Sep '19

01 Sep '19

Yann Leboulanger pushed new branch chat_markers at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/chat_markers You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MUC: Set state to NOT_JOINED on password request
by Philipp Hörist 01 Sep '19

01 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 31a90949 by Philipp Hörist at 2019-09-01T12:32:50Z MUC: Set state to NOT_JOINED on password request - - - - - 5c04e715 by Philipp Hörist at 2019-09-01T12:52:55Z Groupchat: Make sure we leave the MUC on control shutdown - - - - - 2 changed files: - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -366,6 +366,7 @@ class MUC(BaseModule): muc_data.jid, muc_data.nick) self._join(muc_data) elif properties.error.condition == 'not-authorized': + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._raise_muc_event('muc-password-required', properties) else: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) ===================================== gajim/groupchat_control.py ===================================== @@ -1594,10 +1594,8 @@ class GroupchatControl(ChatControlBase): self.update_actions() def leave(self, reason=None): - app.connections[self.account].get_module('MUC').leave(self.room_jid, - reason=reason) self.got_disconnected() - self._close_control() + self._close_control(reason=reason) def rejoin(self): if not self.autorejoin: @@ -2187,7 +2185,16 @@ class GroupchatControl(ChatControlBase): del win._controls[self.account][self.contact.jid] - def shutdown(self, status='offline'): + def shutdown(self, reason=None): + # Preventing autorejoin from being activated + self.autorejoin = False + + # Leave MUC if we are still joined + if self._muc_data.state != MUCJoinedState.NOT_JOINED: + self.got_disconnected() + app.connections[self.account].get_module('MUC').leave( + self.room_jid, reason=reason) + # PluginSystem: calling shutdown of super class (ChatControlBase) # to let it remove it's GUI extension points super(GroupchatControl, self).shutdown() @@ -2196,9 +2203,6 @@ class GroupchatControl(ChatControlBase): app.plugin_manager.remove_gui_extension_point('groupchat_control', self) - # Preventing autorejoin from being activated - self.autorejoin = False - # Unregister handlers for handler in self._event_handlers: app.ged.remove_event_handler(*handler) @@ -2282,11 +2286,11 @@ class GroupchatControl(ChatControlBase): on_yes(self) - def _close_control(self): + def _close_control(self, reason=None): if self.parent_win is None: - self.shutdown() + self.shutdown(reason) else: - self.parent_win.remove_tab(self, None, force=True) + self.parent_win.remove_tab(self, None, reason=reason, force=True) def set_control_active(self, state): self.conv_textview.allow_focus_out_line = True View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2143849981a79c65d0f8629820d900507… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2143849981a79c65d0f8629820d900507… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2019