Commits September 2020

commits@gajim.org

1 participants
105 discussions

[Git][gajim/gajim][master] Add AvatarSelector
by Philipp Hörist 19 Sep '20

19 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 892cdc21 by lovetox at 2020-09-19T21:59:54+02:00 Add AvatarSelector - - - - - 1 changed file: - + gajim/gtk/avatar_selector.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -0,0 +1,704 @@ +# This is a port of um-crop-area.c from GNOME’s 'Cheese' application, see +# https://gitlab.gnome.org/GNOME/cheese/-/blob/3.34.0/libcheese/um-crop-area.c +# +# 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/>. + +import os +import logging +from enum import IntEnum +from enum import unique + +from gi.repository import Gdk +from gi.repository import GdkPixbuf +from gi.repository import GLib +from gi.repository import Gtk +import cairo + +from gajim.common.const import AvatarSize +from gajim.common.i18n import _ +from gajim.common.helpers import get_file_path_from_dnd_dropped_uri + +from gajim.gtk.util import scale_with_ratio + +log = logging.getLogger('gajim.gtk.avatar_selector') + + +@unique +class Loc(IntEnum): + OUTSIDE = 0 + INSIDE = 1 + TOP = 2 + TOP_LEFT = 3 + TOP_RIGHT = 4 + BOTTOM = 5 + BOTTOM_LEFT = 6 + BOTTOM_RIGHT = 7 + LEFT = 8 + RIGHT = 9 + + +@unique +class Range(IntEnum): + BELOW = 0 + LOWER = 1 + BETWEEN = 2 + UPPER = 3 + ABOVE = 4 + + +class AvatarSelector(Gtk.Box): + def __init__(self): + Gtk.Box.__init__(self) + self.set_orientation(Gtk.Orientation.VERTICAL) + self.get_style_context().add_class('padding-18') + + uri_entry = Gtk.TargetEntry.new( + 'text/uri-list', Gtk.TargetFlags.OTHER_APP, 80) + dst_targets = Gtk.TargetList.new([uri_entry]) + + self.drag_dest_set( + Gtk.DestDefaults.ALL, + [uri_entry], + Gdk.DragAction.COPY | Gdk.DragAction.MOVE) + self.drag_dest_set_target_list(dst_targets) + self.connect('drag-data-received', self._on_drag_data_received) + + self._crop_area = CropArea() + self._crop_area.set_vexpand(True) + # self._crop_area.set_min_size(200, 200) + self.add(self._crop_area) + + self._helper_label = Gtk.Label( + label=_('Select a picture or drop it here')) + self._helper_label.get_style_context().add_class('bold') + self._helper_label.get_style_context().add_class('dim-label') + self._helper_label.set_vexpand(True) + self.add(self._helper_label) + + self.show_all() + + def prepare_crop_area(self, path): + pixbuf = self._get_pixbuf_from_path(path) + self._crop_area.set_pixbuf(pixbuf) + self._helper_label.hide() + self._crop_area.show() + + def _on_drag_data_received(self, _widget, _context, _x_coord, _y_coord, + selection, target_type, _timestamp): + if not selection.get_data(): + return + + if target_type == 80: + uri_split = selection.get_uris() # Might be more than one + path = get_file_path_from_dnd_dropped_uri(uri_split[0]) + if not os.path.isfile(path): + return + self.prepare_crop_area(path) + + @staticmethod + def _get_pixbuf_from_path(path): + try: + pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) + return pixbuf + except GLib.Error as err: + log.error('Unable to load file %s: %s', path, str(err)) + return None + + def get_prepared(self): + return bool(self._crop_area.get_pixbuf()) + + @staticmethod + def _scale_for_publish(pixbuf): + width = pixbuf.get_width() + height = pixbuf.get_height() + if width > AvatarSize.PUBLISH or height > AvatarSize.PUBLISH: + # Scale only down, never up + width, height = scale_with_ratio(AvatarSize.PUBLISH, width, height) + pixbuf = pixbuf.scale_simple(width, + height, + GdkPixbuf.InterpType.BILINEAR) + return pixbuf + + def get_avatar_surface(self): + pixbuf = self._crop_area.get_pixbuf() + if pixbuf is None: + return None + scaled = self._scale_for_publish(pixbuf) + + return Gdk.cairo_surface_create_from_pixbuf( + scaled, self.get_scale_factor()) + + def get_avatar_bytes(self): + pixbuf = self._crop_area.get_pixbuf() + if pixbuf is None: + return None + scaled = self._scale_for_publish(pixbuf) + + return scaled.save_to_bufferv('png', [], []) + + +class CropArea(Gtk.DrawingArea): + def __init__(self): + Gtk.DrawingArea.__init__(self) + self.set_no_show_all(True) + self.add_events( + Gdk.EventMask.BUTTON_PRESS_MASK | + Gdk.EventMask.BUTTON_RELEASE_MASK | + Gdk.EventMask.POINTER_MOTION_MASK) + + self._image = Gdk.Rectangle() + self._crop = Gdk.Rectangle() + self._pixbuf = None + self._browse_pixbuf = None + self._color_shifted_pixbuf = None + self._current_cursor = None + + self._scale = float(0.0) + self._image.x = 0 + self._image.y = 0 + self._image.width = 0 + self._image.height = 0 + self._active_region = Loc.OUTSIDE + self._last_press_x = -1 + self._last_press_y = -1 + self._base_width = 100 + self._base_height = 100 + self._aspect = float(1.0) + + self.set_size_request(self._base_width, self._base_height) + + self.connect('draw', self._on_draw) + self.connect('button-press-event', self._on_button_press) + self.connect('button-release-event', self._on_button_release) + self.connect('motion-notify-event', self._on_motion_notify) + + def set_min_size(self, width, height): + self._base_width = width + self._base_height = height + self.set_size_request(self._base_width, self._base_height) + + if self._aspect > 0: + self._aspect = self._base_width / self._base_height + + def set_contstrain_aspect(self, constrain): + if constrain: + self._aspect = self._base_width / self._base_height + else: + self._aspect = -1 + + def set_pixbuf(self, pixbuf): + if pixbuf: + self._browse_pixbuf = pixbuf + width = pixbuf.get_width() + height = pixbuf.get_height() + else: + width = 0 + height = 0 + + self._crop.width = 2 * self._base_width + self._crop.height = 2 * self._base_height + self._crop.x = (width - self._crop.width) / 2 + self._crop.y = (height - self._crop.height) / 2 + + self._scale = 0.0 + self._image.x = 0 + self._image.y = 0 + self._image.width = 0 + self._image.height = 0 + + self.queue_draw() + + def get_pixbuf(self): + if self._browse_pixbuf is None: + return None + + width = self._browse_pixbuf.get_width() + height = self._browse_pixbuf.get_height() + width = min(self._crop.width, width - self._crop.x) + height = min(self._crop.height, height - self._crop.y) + + return GdkPixbuf.Pixbuf.new_subpixbuf( + self._browse_pixbuf, self._crop.x, self._crop.y, width, height) + + def _on_draw(self, _widget, context): + if self._browse_pixbuf is None: + return False + + self._update_pixbufs() + + width = self._pixbuf.get_width() + height = self._pixbuf.get_height() + crop = self._crop_to_widget() + + ix = self._image.x + iy = self._image.y + + Gdk.cairo_set_source_pixbuf( + context, self._color_shifted_pixbuf, ix, iy) + context.rectangle( + ix, + iy, + width, + crop.y - iy) + context.rectangle( + ix, + crop.y, + crop.x - ix, + crop.height) + context.rectangle( + crop.x + crop.width, + crop.y, + width - crop.width - (crop.x - ix), + crop.height) + context.rectangle( + ix, + crop.y + crop.height, + width, + height - crop.height - (crop.y - iy)) + context.fill() + + Gdk.cairo_set_source_pixbuf(context, self._pixbuf, ix, iy) + context.rectangle(crop.x, crop.y, crop.width, crop.height) + context.fill() + + if self._active_region != Loc.OUTSIDE: + context.set_source_rgb(150, 150, 150) + context.set_line_width(1.0) + x1 = crop.x + crop.width / 3.0 + x2 = crop.x + 2 * crop.width / 3.0 + y1 = crop.y + crop.height / 3.0 + y2 = crop.y + 2 * crop.height / 3.0 + + context.move_to(x1 + 0.5, crop.y) + context.line_to(x1 + 0.5, crop.y + crop.height) + + context.move_to(x2 + 0.5, crop.y) + context.line_to(x2 + 0.5, crop.y + crop.height) + + context.move_to(crop.x, y1 + 0.5) + context.line_to(crop.x + crop.width, y1 + 0.5) + + context.move_to(crop.x, y2 + 0.5) + context.line_to(crop.x + crop.width, y2 + 0.5) + context.stroke() + + context.set_source_rgb(1, 1, 1) + context.set_line_width(1.0) + + context.rectangle( + crop.x + 0.5, + crop.y + 0.5, + crop.width - 1.0, + crop.height - 1.0) + context.stroke() + + context.set_source_rgb(1, 1, 1) + context.set_line_width(2.0) + context.rectangle( + crop.x + 2.0, + crop.y + 2.0, + crop.width - 4.0, + crop.height - 4.0) + context.stroke() + + return False + + def _on_button_press(self, _widget, event): + if self._browse_pixbuf is None: + return False + + crop = self._crop_to_widget() + + self._last_press_x = (event.x - self._image.x) / self._scale + self._last_press_y = (event.y - self._image.y) / self._scale + self._active_region = self._find_location(crop, event.x, event.y) + + self.queue_draw_area( + crop.x - 1, crop.y - 1, crop.width + 2, crop.height + 2) + + return False + + def _on_button_release(self, _widget, _event): + if self._browse_pixbuf is None: + return False + + crop = self._crop_to_widget() + self._last_press_x = -1 + self._last_press_y = -1 + self._active_region = Loc.OUTSIDE + + self.queue_draw_area( + crop.x - 1, crop.y - 1, crop.width + 2, crop.height + 2) + + return False + + def _on_motion_notify(self, _widget, event): + # pylint: disable=too-many-boolean-expressions + # pylint: disable=too-many-branches + # pylint: disable=too-many-statements + if self._browse_pixbuf is None: + return False + + self._update_cursor(event.x, event.y) + + damage = self._crop_to_widget() + self.queue_draw_area( + damage.x - 1, damage.y - 1, damage.width + 2, damage.height + 2) + + pb_width = self._browse_pixbuf.get_width() + pb_height = self._browse_pixbuf.get_height() + + x_coord = int((event.x - self._image.x) / self._scale) + y_coord = int((event.y - self._image.y) / self._scale) + + delta_x = int(x_coord - self._last_press_x) + delta_y = int(y_coord - self._last_press_y) + self._last_press_x = x_coord + self._last_press_y = y_coord + + left = int(self._crop.x) + right = int(self._crop.x + self._crop.width - 1) + top = int(self._crop.y) + bottom = int(self._crop.y + self._crop.height - 1) + + center_x = float((left + right) / 2.0) + center_y = float((top + bottom) / 2.0) + + if self._active_region == Loc.INSIDE: + width = right - left + 1 + height = bottom - top + 1 + + left += delta_x + right += delta_x + top += delta_y + bottom += delta_y + + if left < 0: + left = 0 + if top < 0: + top = 0 + if right > pb_width: + right = pb_width + if bottom > pb_height: + bottom = pb_height + + adj_width = int(right - left + 1) + adj_height = int(bottom - top + 1) + if adj_width != width: + if delta_x < 0: + right = left + width - 1 + else: + left = right - width + 1 + + if adj_height != height: + if delta_y < 0: + bottom = top + height - 1 + else: + top = bottom - height + 1 + + elif self._active_region == Loc.TOP_LEFT: + if self._aspect < 0: + top = y_coord + left = x_coord + elif y_coord < self._eval_radial_line( + center_x, center_y, left, top, x_coord): + top = y_coord + new_width = float((bottom - top) * self._aspect) + left = right - new_width + else: + left = x_coord + new_height = float((right - left) / self._aspect) + top = bottom - new_height + + elif self._active_region == Loc.TOP: + top = y_coord + if self._aspect > 0: + new_width = float((bottom - top) * self._aspect) + right = left + new_width + + elif self._active_region == Loc.TOP_RIGHT: + if self._aspect < 0: + top = y_coord + right = x_coord + elif y_coord < self._eval_radial_line( + center_x, center_y, right, top, x_coord): + top = y_coord + new_width = float((bottom - top) * self._aspect) + right = left + new_width + else: + right = x_coord + new_height = float((right - left) / self._aspect) + top = bottom - new_height + + elif self._active_region == Loc.LEFT: + left = x_coord + if self._aspect > 0: + new_height = float((right - left) / self._aspect) + bottom = top + new_height + + elif self._active_region == Loc.BOTTOM_LEFT: + if self._aspect < 0: + bottom = y_coord + left = x_coord + elif y_coord < self._eval_radial_line( + center_x, center_y, left, bottom, x_coord): + left = x_coord + new_height = float((right - left) / self._aspect) + bottom = top + new_height + else: + bottom = y_coord + new_width = float((bottom - top) * self._aspect) + left = right - new_width + + elif self._active_region == Loc.RIGHT: + right = x_coord + if self._aspect > 0: + new_height = float((right - left) / self._aspect) + bottom = top + new_height + + elif self._active_region == Loc.BOTTOM_RIGHT: + if self._aspect < 0: + bottom = y_coord + right = x_coord + elif y_coord < self._eval_radial_line( + center_x, center_y, right, bottom, x_coord): + right = x_coord + new_height = float((right - left) / self._aspect) + bottom = top + new_height + else: + bottom = y_coord + new_width = float((bottom - top) * self._aspect) + right = left + new_width + + elif self._active_region == Loc.BOTTOM: + bottom = y_coord + if self._aspect > 0: + new_width = float((bottom - top) * self._aspect) + right = left + new_width + else: + return False + + min_width = int(self._base_width / self._scale) + min_height = int(self._base_height / self._scale) + + width = right - left + 1 + height = bottom - top + 1 + if self._aspect < 0: + if left < 0: + left = 0 + if top < 0: + top = 0 + if right > pb_width: + right = pb_width + if bottom > pb_height: + bottom = pb_height + + width = right - left + 1 + height = bottom - top + 1 + + if self._active_region in ( + Loc.LEFT, Loc.TOP_LEFT, Loc.BOTTOM_LEFT): + if width < min_width: + left = right - min_width + elif self._active_region in ( + Loc.RIGHT, Loc.TOP_RIGHT, Loc.BOTTOM_RIGHT): + if width < min_width: + right = left + min_width + + if self._active_region in ( + Loc.TOP, Loc.TOP_LEFT, Loc.TOP_RIGHT): + if height < min_height: + top = bottom - min_height + elif self._active_region in ( + Loc.BOTTOM, Loc.BOTTOM_LEFT, Loc.BOTTOM_RIGHT): + if height < min_height: + bottom = top + min_height + + else: + if (left < 0 or top < 0 or + right > pb_width or bottom > pb_height or + width < min_width or height < min_height): + left = self._crop.x + right = self._crop.x + self._crop.width - 1 + top = self._crop.y + bottom = self._crop.y + self._crop.height - 1 + + self._crop.x = left + self._crop.y = top + self._crop.width = right - left + 1 + self._crop.height = bottom - top + 1 + + damage = self._crop_to_widget() + self.queue_draw_area( + damage.x - 1, damage.y - 1, damage.width + 2, damage.height + 2) + + return False + + def _update_pixbufs(self): + allocation = self.get_allocation() + width = self._browse_pixbuf.get_width() + height = self._browse_pixbuf.get_height() + + scale = allocation.height / float(height) + if scale * width > allocation.width: + scale = allocation.width / float(width) + + dest_width = width * scale + dest_height = height * scale + + if (self._pixbuf is None or + self._pixbuf.get_width != allocation.width or + self._pixbuf.get_height != allocation.height): + + self._pixbuf = GdkPixbuf.Pixbuf.new( + GdkPixbuf.Colorspace.RGB, + self._browse_pixbuf.get_has_alpha(), + 8, + dest_width, + dest_height) + self._pixbuf.fill(0x0) + + self._browse_pixbuf.scale( + self._pixbuf, + 0, + 0, + dest_width, + dest_height, + 0, + 0, + scale, + scale, + GdkPixbuf.InterpType.BILINEAR) + + self._generate_color_shifted_pixbuf() + + if self._scale == 0.0: + scale_to_80 = float(min( + (self._pixbuf.get_width() * 0.8 / self._base_width), + (self._pixbuf.get_height() * 0.8 / self._base_height))) + scale_to_image = float(min( + (dest_width / self._base_width), + (dest_height / self._base_height))) + crop_scale = float(min(scale_to_80, scale_to_image)) + + self._crop.width = crop_scale * self._base_width / scale + self._crop.height = crop_scale * self._base_height / scale + self._crop.x = ( + self._browse_pixbuf.get_width() - self._crop.width) / 2 + self._crop.y = ( + self._browse_pixbuf.get_height() - self._crop.height) / 2 + + self._scale = scale + self._image.x = (allocation.width - dest_width) / 2 + self._image.y = (allocation.height - dest_height) / 2 + self._image.width = dest_width + self._image.height = dest_height + + def _crop_to_widget(self): + crop = Gdk.Rectangle() + crop.x = self._image.x + self._crop.x * self._scale + crop.y = self._image.y + self._crop.y * self._scale + crop.width = self._crop.width * self._scale + crop.height = self._crop.height * self._scale + return crop + + def _update_cursor(self, x_coord, y_coord): + region = self._active_region + if self._active_region == Loc.OUTSIDE: + crop = self._crop_to_widget() + region = self._find_location(crop, x_coord, y_coord) + + if region == Loc.TOP_LEFT: + cursor_type = Gdk.CursorType.TOP_LEFT_CORNER + elif region == Loc.TOP: + cursor_type = Gdk.CursorType.TOP_SIDE + elif region == Loc.TOP_RIGHT: + cursor_type = Gdk.CursorType.TOP_RIGHT_CORNER + elif region == Loc.LEFT: + cursor_type = Gdk.CursorType.LEFT_SIDE + elif region == Loc.INSIDE: + cursor_type = Gdk.CursorType.FLEUR + elif region == Loc.RIGHT: + cursor_type = Gdk.CursorType.RIGHT_SIDE + elif region == Loc.BOTTOM_LEFT: + cursor_type = Gdk.CursorType.BOTTOM_LEFT_CORNER + elif region == Loc.BOTTOM: + cursor_type = Gdk.CursorType.BOTTOM_SIDE + elif region == Loc.BOTTOM_RIGHT: + cursor_type = Gdk.CursorType.BOTTOM_RIGHT_CORNER + else: # Loc.OUTSIDE + cursor_type = Gdk.CursorType.LEFT_PTR + + if cursor_type is not self._current_cursor: + cursor = Gdk.Cursor.new_for_display( + Gdk.Display.get_default(), + cursor_type) + self.get_window().set_cursor(cursor) + self._current_cursor = cursor_type + + @staticmethod + def _eval_radial_line(center_x, center_y, bounds_x, bounds_y, user_x): + decision_slope = float(bounds_y - center_y) / (bounds_x - center_x) + decision_intercept = - float(decision_slope * bounds_x) + return int(decision_slope * user_x + decision_intercept) + + def _find_location(self, rect, x_coord, y_coord): + # pylint: disable=line-too-long + location = [ + [Loc.OUTSIDE, Loc.OUTSIDE, Loc.OUTSIDE, Loc.OUTSIDE, Loc.OUTSIDE], + [Loc.OUTSIDE, Loc.TOP_LEFT, Loc.TOP, Loc.TOP_RIGHT, Loc.OUTSIDE], + [Loc.OUTSIDE, Loc.LEFT, Loc.INSIDE, Loc.RIGHT, Loc.OUTSIDE], + [Loc.OUTSIDE, Loc.BOTTOM_LEFT, Loc.BOTTOM, Loc.BOTTOM_RIGHT, Loc.OUTSIDE], + [Loc.OUTSIDE, Loc.OUTSIDE, Loc.OUTSIDE, Loc.OUTSIDE, Loc.OUTSIDE], + ] + # pylint: enable=line-too-long + + x_range = self._find_range(x_coord, rect.x, rect.x + rect.width) + y_range = self._find_range(y_coord, rect.y, rect.y + rect.height) + + return location[y_range][x_range] + + @staticmethod + def _find_range(coord, min_v, max_v): + tolerance = 12 + if coord < min_v - tolerance: + return Range.BELOW + if coord <= min_v + tolerance: + return Range.LOWER + if coord < max_v - tolerance: + return Range.BETWEEN + if coord <= max_v + tolerance: + return Range.UPPER + return Range.ABOVE + + def _generate_color_shifted_pixbuf(self): + # pylint: disable=no-member + surface = cairo.ImageSurface( + cairo.Format.ARGB32, + self._pixbuf.get_width(), + self._pixbuf.get_height()) + context = cairo.Context(surface) + # pylint: enable=no-member + + Gdk.cairo_set_source_pixbuf(context, self._pixbuf, 0, 0) + context.paint() + + context.rectangle(0, 0, 1, 1) + context.set_source_rgba(0, 0, 0, 0.5) + context.paint() + + surface = context.get_target() + self._color_shifted_pixbuf = Gdk.pixbuf_get_from_surface( + surface, 0, 0, surface.get_width(), surface.get_height()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/892cdc21d27f98cc96d0eb93b983d8b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/892cdc21d27f98cc96d0eb93b983d8b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Raise runtime version
by André 19 Sep '20

19 Sep '20

André pushed to branch master at gajim / gajim Commits: 052cf8f8 by André Apitzsch at 2020-09-19T21:43:02+02:00 Flatpak: Raise runtime version - - - - - 2 changed files: - + flatpak/farstream-make-4.3.patch - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/farstream-make-4.3.patch ===================================== @@ -0,0 +1,38 @@ +From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray <debarshir(a)freedesktop.org> +Date: Thu, 12 Mar 2020 14:07:23 +0100 +Subject: [PATCH] build: Adapt to backwards incompatible change in GNU Make 4.3 + +GNU Make 4.3 has a backwards incompatible change affecting the use of +number signs or hashes (ie., #) inside function invocations. See: +https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html + +In this case, it would expand the '\#' in the '\n\#include \"$(h)\"' +argument to the foreach call to '\#', not '#'. This would lead to +spurious backslashes in front of the '#include' directives in the +generated fs-enumtypes.c file. + +Spotted by Ernestas Kulik. + +https://gitlab.freedesktop.org/farstream/farstream/-/merge_requests/4 +--- + common-modified/gst-glib-gen.mak | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak +index 14f1ba37..2247a41c 100644 +--- a/common-modified/gst-glib-gen.mak ++++ b/common-modified/gst-glib-gen.mak +@@ -6,7 +6,8 @@ + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++hash:=\# ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers) +-- +2.26.2 + ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim.Devel runtime: org.gnome.Platform -runtime-version: '3.36' +runtime-version: '3.38' sdk: org.gnome.Sdk command: gajim-devel tags: @@ -160,15 +160,6 @@ modules: url: https://files.pythonhosted.org/packages/b2/34/bfcb43cc0ba81f527bc4f40ef41ba… sha256: aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b - - name: python3-importlib_metadata - buildsystem: simple - build-commands: - - pip3 install --prefix=/app importlib_metadata-1.7.0-py2.py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/8e/58/cdea07eb51fc2b906db0968a94700… - sha256: dc15b2969b4ce36305c51eebe62d418ac7791e9a157911d58bfb1f9ccd8e2070 - - name: python3-keyring buildsystem: simple build-commands: @@ -198,12 +189,22 @@ modules: url: https://files.pythonhosted.org/packages/13/f5/3a7485a32dd4422a2a78de744bea4… sha256: c7d5a1f5667a6e7cb85db0a5a4ec8e1090eaeb6e189e8131a5ee238492d60445 + # GSound dependency + - name: libcanberra + sources: + - type: archive + url: http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz + sha256: c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72 + config-opts: + - "--disable-alsa" + - "--disable-null" + - "--disable-oss" + - name: gsound sources: - - type: git - url: https://gitlab.gnome.org/GNOME/gsound.git - tag: 1.0.2 - commit: a86946b494aa32782b3f6334344d07b5c11d5219 + - type: archive + url: https://download.gnome.org/sources/gsound/1.0/gsound-1.0.2.tar.xz + sha256: bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53 - name: gspell cleanup: @@ -215,9 +216,12 @@ modules: - name: farstream sources: - - type: archive - url: https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2… - sha256: cb7d112433cf7c2e37a8ec918fb24f0ea5cb293cfa1002488e431de26482f47b + - type: git + url: https://gitlab.freedesktop.org/farstream/farstream.git + tag: 0.2.9 + commit: 1e42278d11730f8409878e3b4904fdd47e360e6f + - type: patch + path: farstream-make-4.3.patch - name: python3-nbxmpp buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/052cf8f843c4408dcd8b7556cfa38fab… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/052cf8f843c4408dcd8b7556cfa38fab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Typo
by Philipp Hörist 19 Sep '20

19 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: dbf32fe5 by lovetox at 2020-09-19T20:31:42+02:00 Fix Typo - - - - - 1 changed file: - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/settings.py ===================================== @@ -97,7 +97,7 @@ class SettingsBox(Gtk.ListBox): SettingKind.POPOVER: PopoverSetting, SettingKind.AUTO_AWAY: CutstomAutoAwaySetting, SettingKind.AUTO_EXTENDED_AWAY: CutstomAutoExtendedAwaySetting, - SettingKind.USE_STUN_SERVER: CutstomStunServerSetting, + SettingKind.USE_STUN_SERVER: CustomStunServerSetting, SettingKind.NOTIFICATIONS: NotificationsSetting, } @@ -796,7 +796,7 @@ class CutstomAutoExtendedAwaySetting(DialogSetting): return Q_('?switch:On') if value else Q_('?switch:Off') -class CutstomStunServerSetting(DialogSetting): +class CustomStunServerSetting(DialogSetting): def __init__(self, *args, **kwargs): DialogSetting.__init__(self, *args, **kwargs) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dbf32fe5e0d064b69028cfcbe0dadd04… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dbf32fe5e0d064b69028cfcbe0dadd04… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: GroupChatControl: Handle show-contact-info action
by Philipp Hörist 19 Sep '20

19 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e9575b51 by lovetox at 2020-09-19T19:02:52+02:00 GroupChatControl: Handle show-contact-info action - - - - - 269d57a0 by lovetox at 2020-09-19T19:16:03+02:00 Application: Change some Shortcuts We should not use the <Alt> modifier, because it is used for mnemonics change-subject -> <Primary><Shift>S show-emoji-chooser -> <Primary><Shift>M - - - - - 7ef818f7 by lovetox at 2020-09-19T20:28:33+02:00 Shortcuts: Use <Primary> instead of <Control> - - - - - e8d8c242 by lovetox at 2020-09-19T20:29:10+02:00 Update Shortcut Help - Use primary instead of ctrl - Add missing shortcuts - - - - - 3 changed files: - gajim/application.py - gajim/data/gui/shortcuts_window.ui - gajim/groupchat_control.py Changes: ===================================== gajim/application.py ===================================== @@ -548,22 +548,22 @@ class GajimApplication(Gtk.Application): 'win.show-roster': ['<Primary>R'], 'win.show-offline': ['<Primary>O'], 'win.show-active': ['<Primary>Y'], - 'win.change-nickname': ['<Control><Shift>n'], - 'win.change-subject': ['<Alt>t'], + 'win.change-nickname': ['<Primary><Shift>N'], + 'win.change-subject': ['<Primary><Shift>S'], 'win.escape': ['Escape'], - 'win.browse-history': ['<Control>h'], - 'win.send-file': ['<Control>f'], - 'win.show-contact-info': ['<Control>i'], - 'win.show-emoji-chooser': ['<Alt>m'], - 'win.clear-chat': ['<Control>l'], - 'win.delete-line': ['<Control>u'], - 'win.close-tab': ['<Control>w'], - 'win.move-tab-up': ['<Control><Shift>Page_Up'], - 'win.move-tab-down': ['<Control><Shift>Page_Down'], - 'win.switch-next-tab': ['<Control>Page_Down'], - 'win.switch-prev-tab': ['<Control>Page_Up'], - 'win.switch-next-unread-tab-right': ['<Control>Tab'], - 'win.switch-next-unread-tab-left': ['<Control>ISO_Left_Tab'], + 'win.browse-history': ['<Primary>H'], + 'win.send-file': ['<Primary>F'], + 'win.show-contact-info': ['<Primary>I'], + 'win.show-emoji-chooser': ['<Primary><Shift>M'], + 'win.clear-chat': ['<Primary>L'], + 'win.delete-line': ['<Primary>U'], + 'win.close-tab': ['<Primary>W'], + 'win.move-tab-up': ['<Primary><Shift>Page_Up'], + 'win.move-tab-down': ['<Primary><Shift>Page_Down'], + 'win.switch-next-tab': ['<Primary>Page_Down'], + 'win.switch-prev-tab': ['<Primary>Page_Up'], + 'win.switch-next-unread-tab-right': ['<Primary>Tab'], + 'win.switch-next-unread-tab-left': ['<Primary>ISO_Left_Tab'], 'win.switch-tab-1': ['<Alt>1', '<Alt>KP_1'], 'win.switch-tab-2': ['<Alt>2', '<Alt>KP_2'], 'win.switch-tab-3': ['<Alt>3', '<Alt>KP_3'], ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -4,73 +4,66 @@ <child> <object class="GtkShortcutsSection"> <property name="visible">1</property> - <property name="section-name">chat</property> - <property name="title" translatable="yes">Chat Shortcuts</property> + <property name="section-name">roster</property> + <property name="title" translatable="yes">Contact List</property> <child> <object class="GtkShortcutsGroup"> <property name="visible">1</property> - <property name="title" translatable="yes">Message composition</property> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator">Return</property> - <property name="title" translatable="yes">Send the message</property> - </object> - </child> + <property name="title" translatable="yes">General</property> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><shift>Return <ctrl>Return</property> - <property name="title" translatable="yes">Add new line</property> + <property name="accelerator"><primary>n</property> + <property name="title" translatable="yes">Start a new chat</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><alt>m</property> - <property name="title" translatable="yes">Select an emoji</property> + <property name="accelerator"><primary>g</property> + <property name="title" translatable="yes">Create new group chat</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator">Tab</property> - <property name="title" translatable="yes">Complete a command or a nickname</property> + <property name="accelerator"><primary>p</property> + <property name="title" translatable="yes">Preferences</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>Up</property> - <property name="title" translatable="yes">Previously sent message</property> + <property name="accelerator"><primary>e</property> + <property name="title" translatable="yes">Plugins</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>Down</property> - <property name="title" translatable="yes">Next sent messages</property> + <property name="accelerator"><primary>t</property> + <property name="title" translatable="yes">File transfers</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl><alt>Up</property> - <property name="title" translatable="yes">Quote previous message</property> + <property name="accelerator"><primary>s</property> + <property name="title" translatable="yes">Set the status message</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl><alt>Down</property> - <property name="title" translatable="yes">Quote next message</property> + <property name="accelerator"><primary><shift>x</property> + <property name="title" translatable="yes">Show XML console</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>u</property> - <property name="title" translatable="yes">Clear message entry</property> + <property name="accelerator"><primary>q</property> + <property name="title" translatable="yes">Quit Gajim</property> </object> </child> </object> @@ -78,33 +71,33 @@ <child> <object class="GtkShortcutsGroup"> <property name="visible">1</property> - <property name="title" translatable="yes">Recent history</property> + <property name="title" translatable="yes">Appearance</property> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><shift>Page_Up</property> - <property name="title" translatable="yes">Scroll up</property> + <property name="accelerator"><primary>o</property> + <property name="title" translatable="yes">Show offline contacts</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><shift>Page_Down</property> - <property name="title" translatable="yes">Scroll down</property> + <property name="accelerator"><primary>y</property> + <property name="title" translatable="yes">Show only active contacts</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>l</property> - <property name="title" translatable="yes">Clear chat window</property> + <property name="accelerator"><primary>k</property> + <property name="title" translatable="yes">Enable contact list filtering</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>h</property> - <property name="title" translatable="yes">Show chat history</property> + <property name="accelerator"><primary>r</property> + <property name="title" translatable="yes">Show / hide contact list</property> </object> </child> </object> @@ -112,130 +105,136 @@ <child> <object class="GtkShortcutsGroup"> <property name="visible">1</property> - <property name="title" translatable="yes">Tabs</property> + <property name="title" translatable="yes">Contacts</property> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>Page_Up</property> - <property name="title" translatable="yes">Switch to the previous tab</property> + <property name="accelerator"><primary>i</property> + <property name="title" translatable="yes">Contact information</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>Page_Down</property> - <property name="title" translatable="yes">Switch to the next tab</property> + <property name="accelerator">F2</property> + <property name="title" translatable="yes">Rename contact</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><Alt>1...9</property> - <property name="title" translatable="yes">Switch to the first - ninth tab</property> + <property name="accelerator">Delete</property> + <property name="title" translatable="yes">Delete contact</property> </object> </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkShortcutsSection"> + <property name="visible">1</property> + <property name="section-name">chat</property> + <property name="title" translatable="yes">Chat</property> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">Message composition</property> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl><shift>Tab</property> - <property name="title" translatable="yes">Switch to the previous unread tab</property> + <property name="accelerator">Return</property> + <property name="title" translatable="yes">Send the message</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>Tab</property> - <property name="title" translatable="yes">Switch to the next unread tab</property> + <property name="accelerator"><shift>Return <primary>Return</property> + <property name="title" translatable="yes">Add new line</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl><shift>Page_Up</property> - <property name="title" translatable="yes">Move tab to the left</property> + <property name="accelerator"><primary><shift>m</property> + <property name="title" translatable="yes">Select an emoji</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl><shift>Page_Down</property> - <property name="title" translatable="yes">Move tab to the right</property> + <property name="accelerator">Tab</property> + <property name="title" translatable="yes">Complete a command or a nickname</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>w</property> - <property name="title" translatable="yes">Close chat</property> + <property name="accelerator"><primary>Up</property> + <property name="title" translatable="yes">Previously sent message</property> </object> </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkShortcutsSection"> - <property name="visible">1</property> - <property name="section-name">roster</property> - <property name="title" translatable="yes">Contact List Shortcuts</property> - <child> - <object class="GtkShortcutsGroup"> - <property name="visible">1</property> - <property name="title" translatable="yes">General</property> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>n</property> - <property name="title" translatable="yes">Start a new chat</property> + <property name="accelerator"><primary>Down</property> + <property name="title" translatable="yes">Next sent messages</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>g</property> - <property name="title" translatable="yes">Create new group chat</property> + <property name="accelerator"><primary><alt>Up</property> + <property name="title" translatable="yes">Quote previous message</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>p</property> - <property name="title" translatable="yes">Preferences</property> + <property name="accelerator"><primary><alt>Down</property> + <property name="title" translatable="yes">Quote next message</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>e</property> - <property name="title" translatable="yes">Plugins</property> + <property name="accelerator"><primary>u</property> + <property name="title" translatable="yes">Clear message entry</property> </object> </child> + </object> + </child> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">Recent history</property> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>t</property> - <property name="title" translatable="yes">File transfers</property> + <property name="accelerator"><shift>Page_Up</property> + <property name="title" translatable="yes">Scroll up</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>s</property> - <property name="title" translatable="yes">Set the status message</property> + <property name="accelerator"><shift>Page_Down</property> + <property name="title" translatable="yes">Scroll down</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl><shift>x</property> - <property name="title" translatable="yes">Show XML console</property> + <property name="accelerator"><primary>l</property> + <property name="title" translatable="yes">Clear chat window</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>q</property> - <property name="title" translatable="yes">Quit Gajim</property> + <property name="accelerator"><primary>h</property> + <property name="title" translatable="yes">Show chat history</property> </object> </child> </object> @@ -243,60 +242,81 @@ <child> <object class="GtkShortcutsGroup"> <property name="visible">1</property> - <property name="title" translatable="yes">Appearance</property> + <property name="title" translatable="yes">Tabs</property> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>o</property> - <property name="title" translatable="yes">Show offline contacts</property> + <property name="accelerator"><primary>Page_Up</property> + <property name="title" translatable="yes">Switch to the previous tab</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>y</property> - <property name="title" translatable="yes">Show only active contacts</property> + <property name="accelerator"><primary>Page_Down</property> + <property name="title" translatable="yes">Switch to the next tab</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>k</property> - <property name="title" translatable="yes">Enable contact list filtering</property> + <property name="accelerator"><Alt>1...9</property> + <property name="title" translatable="yes">Switch to the first - ninth tab</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>r</property> - <property name="title" translatable="yes">Show / hide contact list</property> + <property name="accelerator"><primary><shift>Tab</property> + <property name="title" translatable="yes">Switch to the previous unread tab</property> </object> </child> - </object> - </child> - <child> - <object class="GtkShortcutsGroup"> - <property name="visible">1</property> - <property name="title" translatable="yes">Contacts</property> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>i</property> - <property name="title" translatable="yes">Contact information</property> + <property name="accelerator"><primary>Tab</property> + <property name="title" translatable="yes">Switch to the next unread tab</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator">F2</property> - <property name="title" translatable="yes">Rename contact</property> + <property name="accelerator"><primary><shift>Page_Up</property> + <property name="title" translatable="yes">Move tab to the left</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator">Delete</property> - <property name="title" translatable="yes">Delete contact</property> + <property name="accelerator"><primary><shift>Page_Down</property> + <property name="title" translatable="yes">Move tab to the right</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><primary>w</property> + <property name="title" translatable="yes">Close chat</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">Group Chat</property> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><primary><shift>n</property> + <property name="title" translatable="yes">Change Nickname</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><primary><shift>s</property> + <property name="title" translatable="yes">Change Subject</property> </object> </child> </object> ===================================== gajim/groupchat_control.py ===================================== @@ -1945,6 +1945,11 @@ class GroupchatControl(ChatControlBase): self.parent_win.window.lookup_action(control_action).activate() return Gdk.EVENT_STOP + if action == 'show-contact-info': + self.parent_win.window.lookup_action( + 'information-%s' % self.control_id).activate() + return Gdk.EVENT_STOP + return Gdk.EVENT_PROPAGATE def focus(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ba079322a2fc0e1940efd03c791b147… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ba079322a2fc0e1940efd03c791b147… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Pass keyword arg correctly
by Philipp Hörist 19 Sep '20

19 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: ba079322 by lovetox at 2020-09-19T16:04:21+02:00 Settings: Pass keyword arg correctly - - - - - 1 changed file: - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/settings.py ===================================== @@ -51,7 +51,7 @@ class SettingsDialog(Gtk.ApplicationWindow): elif flags == Gtk.DialogFlags.DESTROY_WITH_PARENT: self.set_destroy_with_parent(True) - self.listbox = SettingsBox(account, extend) + self.listbox = SettingsBox(account, extend=extend) self.listbox.set_hexpand(True) self.listbox.set_selection_mode(Gtk.SelectionMode.NONE) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ba079322a2fc0e1940efd03c791b1478… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ba079322a2fc0e1940efd03c791b1478… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Preferences: Add dedicated notification setting
by Philipp Hörist 19 Sep '20

19 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 956d00c9 by lovetox at 2020-09-19T14:20:36+02:00 Preferences: Add dedicated notification setting So we can enable/disable system notifications - - - - - 75059a1f by lovetox at 2020-09-19T15:22:01+02:00 Preferences: Simplify event handling setting Because we have now a dedicated notification setting, this can be simplified with a switch - - - - - a17f0392 by lovetox at 2020-09-19T15:29:14+02:00 Settings: Bind to group chat and contact settings - - - - - 7 changed files: - gajim/common/config.py - gajim/common/connection_handlers_events.py - gajim/common/helpers.py - gajim/common/setting_values.py - gajim/gtk/const.py - gajim/gtk/preferences.py - gajim/gtk/settings.py Changes: ===================================== gajim/common/config.py ===================================== @@ -67,7 +67,6 @@ class Config: # name: [ type, default_value, help_string, restart ] 'verbose': [opt_bool, False, '', True], 'autopopup': [opt_bool, False], - 'notify_on_new_message': [opt_bool, True], 'autopopupaway': [opt_bool, False], 'sounddnd': [opt_bool, False, _('Play sound even when being busy.')], 'showoffline': [opt_bool, True], ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -243,7 +243,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): '%(n_msgs)i unread messages from %(nickname)s', num_unread) % {'nickname': nick, 'n_msgs': num_unread} - if app.settings.get('notify_on_new_message'): + if app.settings.get('show_notifications'): if self.first_unread or not self.control_focused: if app.settings.get('autopopupaway'): # always show notification @@ -304,7 +304,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): if self.control is not None: self.control_focused = self.control.has_focus() - if app.settings.get('notify_on_new_message'): + if app.settings.get('show_notifications'): contact = app.contacts.get_groupchat_contact(self.account, self.jid) notify_for_muc = sound == 'highlight' or contact.can_notify() ===================================== gajim/common/helpers.py ===================================== @@ -655,7 +655,7 @@ def get_os_info(): return info def allow_showing_notification(account): - if not app.settings.get('notify_on_new_message'): + if not app.settings.get('show_notifications'): return False if app.settings.get('autopopupaway'): return True ===================================== gajim/common/setting_values.py ===================================== @@ -15,7 +15,7 @@ HAS_ACCOUNT_DEFAULT = _ACCOUNT_DEFAULT() APP_SETTINGS = { 'verbose': False, 'autopopup': False, - 'notify_on_new_message': True, + 'show_notifications': True, 'autopopupaway': False, 'sounddnd': False, 'showoffline': True, ===================================== gajim/gtk/const.py ===================================== @@ -61,6 +61,7 @@ class SettingKind(IntEnum): AUTO_AWAY = 15 AUTO_EXTENDED_AWAY = 16 USE_STUN_SERVER = 17 + NOTIFICATIONS = 18 @unique ===================================== gajim/gtk/preferences.py ===================================== @@ -465,12 +465,6 @@ class VisualNotifications(PreferenceBox): 'always': _('Always show icon'), } - event_received_items = { - 'open_message': _('Pop it up'), - 'notify_me': _('Notify me about it'), - 'show_in_roster': _('Show only in contact list'), - } - settings = [ Setting(SettingKind.POPOVER, _('Notification Area Icon'), @@ -479,20 +473,18 @@ class VisualNotifications(PreferenceBox): props={'entries': trayicon_items}, callback=self._on_trayicon), - Setting(SettingKind.POPOVER, - _('Event Handling'), - SettingType.VALUE, - self._get_event_handling(), - desc=_('How Gajim notifies you about new events'), - props={'entries': event_received_items}, - callback=self._set_event_handling), - Setting(SettingKind.SWITCH, - _('Notifications When Away'), + _('Open Events'), SettingType.CONFIG, - 'autopopupaway', - desc=_('Show notifications even if you are Away, ' - 'Busy, etc.')), + 'autopopup', + desc=_('Open events instead of showing a notification ' + 'in the contact list')), + + Setting(SettingKind.NOTIFICATIONS, + _('Show Notifications'), + SettingType.DIALOG, + props={'dialog': NotificationsDialog}), + ] PreferenceBox.__init__(self, settings) @@ -506,29 +498,27 @@ class VisualNotifications(PreferenceBox): else: app.interface.show_systray() - @staticmethod - def _get_event_handling(): - autopopup = app.settings.get('autopopup') - notify_on_new_message = app.settings.get('notify_on_new_message') - if autopopup and not notify_on_new_message: - return 'open_message' - if not autopopup and notify_on_new_message: - return 'notify_me' - if not autopopup and not notify_on_new_message: - return 'show_in_roster' - return 'open_message' - @staticmethod - def _set_event_handling(value, *args): - if value == 'open_message': - app.settings.set('autopopup', True) - app.settings.set('notify_on_new_message', False) - elif value == 'notify_me': - app.settings.set('autopopup', False) - app.settings.set('notify_on_new_message', True) - else: - app.settings.set('autopopup', False) - app.settings.set('notify_on_new_message', False) +class NotificationsDialog(SettingsDialog): + def __init__(self, account, parent): + + settings = [ + Setting(SettingKind.SWITCH, + _('Show Notifications'), + SettingType.CONFIG, + 'show_notifications'), + + Setting(SettingKind.SWITCH, + _('Notifications When Away'), + SettingType.CONFIG, + 'autopopupaway', + desc=_('Show notifications even if you are Away, ' + 'Busy, etc.'), + bind='show_notifications'), + ] + + SettingsDialog.__init__(self, parent, _('Notifications'), + Gtk.DialogFlags.MODAL, settings, account) class Sounds(PreferenceBox): ===================================== gajim/gtk/settings.py ===================================== @@ -97,7 +97,8 @@ class SettingsBox(Gtk.ListBox): SettingKind.POPOVER: PopoverSetting, SettingKind.AUTO_AWAY: CutstomAutoAwaySetting, SettingKind.AUTO_EXTENDED_AWAY: CutstomAutoExtendedAwaySetting, - SettingKind.USE_STUN_SERVER: CutstomStunServerSetting + SettingKind.USE_STUN_SERVER: CutstomStunServerSetting, + SettingKind.NOTIFICATIONS: NotificationsSetting, } if extend is not None: @@ -648,7 +649,10 @@ class PopoverSetting(GenericSetting): text = self._entries.get(self.setting_value, self._default_text or '') self._current_label.set_text(text) - self._bind_label() + app.settings.connect_signal(self.value, + self._on_setting_changed, + account=self.account, + jid=self.jid) self.connect('destroy', self._on_destroy) @@ -660,14 +664,6 @@ class PopoverSetting(GenericSetting): entries = {key: key for key in entries} return entries - def _bind_label(self): - if self.type_ not in (SettingType.CONFIG, SettingType.ACCOUNT_CONFIG): - return - - app.settings.connect_signal(self.value, - self._on_setting_changed, - account=self.account) - def _on_setting_changed(self, value, *args): text = self._entries.get(value) if text is None: @@ -807,3 +803,12 @@ class CutstomStunServerSetting(DialogSetting): def get_setting_value(self): value = app.settings.get('use_stun_server') return Q_('?switch:On') if value else Q_('?switch:Off') + + +class NotificationsSetting(DialogSetting): + def __init__(self, *args, **kwargs): + DialogSetting.__init__(self, *args, **kwargs) + + def get_setting_value(self): + value = app.settings.get('show_notifications') + return Q_('?switch:On') if value else Q_('?switch:Off') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/28d11df0b6d5f26f60ba4706193484e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/28d11df0b6d5f26f60ba4706193484e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Notifications: Remove notify on signin/signout
by Philipp Hörist 19 Sep '20

19 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ed18786 by lovetox at 2020-09-19T12:59:00+02:00 Notifications: Remove notify on signin/signout Feature is not very useful, needs to be reimplemented with an option to track status changes per contact - - - - - 28d11df0 by lovetox at 2020-09-19T13:49:03+02:00 Notifications: Remove setting We don’t show a notification if a chat has focus, in all other cases a notification is shown - - - - - 8 changed files: - gajim/common/config.py - gajim/common/connection_handlers_events.py - gajim/common/helpers.py - gajim/common/setting_values.py - gajim/data/style/default.css - gajim/gtk/notification.py - gajim/gtk/preferences.py - gajim/gtk/util.py Changes: ===================================== gajim/common/config.py ===================================== @@ -67,11 +67,8 @@ class Config: # name: [ type, default_value, help_string, restart ] 'verbose': [opt_bool, False, '', True], 'autopopup': [opt_bool, False], - 'notify_on_signin': [opt_bool, False], - 'notify_on_signout': [opt_bool, False], 'notify_on_new_message': [opt_bool, True], 'autopopupaway': [opt_bool, False], - 'autopopup_chat_opened': [opt_bool, False, _('Show desktop notification even when a chat window is opened for this contact and does not have focus.')], 'sounddnd': [opt_bool, False, _('Play sound even when being busy.')], 'showoffline': [opt_bool, True], 'show_only_chat_and_online': [opt_bool, False, _('Show only online and free for chat contacts in the contact list.')], ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -244,8 +244,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): num_unread) % {'nickname': nick, 'n_msgs': num_unread} if app.settings.get('notify_on_new_message'): - if self.first_unread or (app.settings.get('autopopup_chat_opened') \ - and not self.control_focused): + if self.first_unread or not self.control_focused: if app.settings.get('autopopupaway'): # always show notification self.do_popup = True @@ -380,10 +379,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): if account_server in app.block_signed_in_notifications and \ app.block_signed_in_notifications[account_server]: block_transport = True - if helpers.allow_showing_notification(account, 'notify_on_signin') \ - and not app.block_signed_in_notifications[account] and \ - not block_transport: - self.do_popup = True + sound = app.settings.get_soundevent_settings('contact_connected') if sound['enabled'] and not app.block_signed_in_notifications[account] and\ not block_transport and helpers.allow_sound_notification(account, @@ -393,9 +389,6 @@ class NotificationEvent(nec.NetworkIncomingEvent): elif pres_obj.old_show > 1 and pres_obj.new_show < 2: event = 'contact_disconnected' - if helpers.allow_showing_notification(account, 'notify_on_signout'): - self.do_popup = True - sound = app.settings.get_soundevent_settings('contact_disconnected') if sound['enabled'] and helpers.allow_sound_notification(account, event): self.sound_event = event @@ -422,18 +415,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): if pres_obj.status: self.popup_text = self.popup_text + " : " + pres_obj.status self.popup_event_type = _('Contact Changed Status') - elif event == 'contact_connected': - self.popup_title = _('%(nickname)s Signed In') % {'nickname': nick} - self.popup_text = '' - if pres_obj.status: - self.popup_text = pres_obj.status - self.popup_event_type = _('Contact Signed In') - elif event == 'contact_disconnected': - self.popup_title = _('%(nickname)s Signed Out') % {'nickname': nick} - self.popup_text = '' - if pres_obj.status: - self.popup_text = pres_obj.status - self.popup_event_type = _('Contact Signed Out') + class InformationEvent(nec.NetworkIncomingEvent): name = 'information' ===================================== gajim/common/helpers.py ===================================== @@ -654,21 +654,12 @@ def get_os_info(): info = platform.system() return info -def allow_showing_notification(account, - type_='notify_on_new_message', - is_first_message=True): - """ - Is it allowed to show nofication? - - Check OUR status and if we allow notifications for that status type is the - option that need to be True e.g.: notify_on_signing is_first_message: set it - to false when it's not the first message - """ - if type_ and (not app.settings.get(type_) or not is_first_message): +def allow_showing_notification(account): + if not app.settings.get('notify_on_new_message'): return False if app.settings.get('autopopupaway'): return True - if app.connections[account].status in ('online', 'chat'): + if app.account_is_available(account): return True return False ===================================== gajim/common/setting_values.py ===================================== @@ -15,11 +15,8 @@ HAS_ACCOUNT_DEFAULT = _ACCOUNT_DEFAULT() APP_SETTINGS = { 'verbose': False, 'autopopup': False, - 'notify_on_signin': False, - 'notify_on_signout': False, 'notify_on_new_message': True, 'autopopupaway': False, - 'autopopup_chat_opened': False, 'sounddnd': False, 'showoffline': True, 'show_only_chat_and_online': False, ===================================== gajim/data/style/default.css ===================================== @@ -53,12 +53,6 @@ .gajim-notify-message { color: rgb(30, 144, 255); } -.gajim-notify-signin { - color: rgb(68, 134, 38); -} -.gajim-notify-signout { - color: rgb(134, 22, 22); -} .gajim-notify-status { color: rgb(170, 170, 170); } ===================================== gajim/gtk/notification.py ===================================== @@ -181,7 +181,6 @@ class Notification(EventHelper): notification.set_body(text) notif_id = None if event_type in ( - _('Contact Signed In'), _('Contact Signed Out'), _('New Message'), _('New Private Message'), _('New Group Chat Message'), _('Contact Changed Status'), _('File Transfer Request'), @@ -203,9 +202,7 @@ class Notification(EventHelper): variant_dict) # Only one notification per JID - if event_type in (_('Contact Signed In'), - _('Contact Signed Out'), - _('Contact Changed Status')): + if event_type == _('Contact Changed Status'): notif_id = self._make_id('contact-status-changed', account, jid) elif event_type == _('Group Chat Invitation'): notif_id = self._make_id('gc-invitation', account, room_jid) @@ -264,15 +261,9 @@ class PopupNotification(Gtk.Window): self._ui = get_builder('popup_notification_window.ui') self.add(self._ui.eventbox) - if event_type == _('Contact Signed In'): - bg_color = app.css_config.get_value('.gajim-notify-signin', - StyleAttr.COLOR) - elif event_type == _('Contact Signed Out'): - bg_color = app.css_config.get_value('.gajim-notify-signout', - StyleAttr.COLOR) - elif event_type in (_('New Message'), - _('New Private Message'), - _('New E-mail')): + if event_type in (_('New Message'), + _('New Private Message'), + _('New E-mail')): bg_color = app.css_config.get_value('.gajim-notify-message', StyleAttr.COLOR) elif event_type == _('File Transfer Request'): ===================================== gajim/gtk/preferences.py ===================================== @@ -487,33 +487,12 @@ class VisualNotifications(PreferenceBox): props={'entries': event_received_items}, callback=self._set_event_handling), - Setting(SettingKind.SWITCH, - _('Always Show Notifications'), - SettingType.CONFIG, - 'autopopup_chat_opened', - desc=_('Show notifications even if there is already ' - 'a chat window opened')), - Setting(SettingKind.SWITCH, _('Notifications When Away'), SettingType.CONFIG, 'autopopupaway', desc=_('Show notifications even if you are Away, ' 'Busy, etc.')), - - Setting(SettingKind.SWITCH, - _('Contact Online Notification'), - SettingType.CONFIG, - 'notify_on_signin', - desc=_('Show a notification when a contact goes ' - 'online')), - - Setting(SettingKind.SWITCH, - _('Contact Offline Notification'), - SettingType.CONFIG, - 'notify_on_signout', - desc=_('Show a notification when a contact goes ' - 'offline')), ] PreferenceBox.__init__(self, settings) ===================================== gajim/gtk/util.py ===================================== @@ -494,8 +494,6 @@ def get_show_in_roster(event, session=None): if event == 'gc_message_received': return True if event == 'message_received': - if app.settings.get('autopopup_chat_opened'): - return True if session and session.control: return False return True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59e95afd27b2d9a256d8950b627dc52… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59e95afd27b2d9a256d8950b627dc52… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Storage: Fix SQL statement
by Philipp Hörist 19 Sep '20

19 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 59e95afd by lovetox at 2020-09-19T10:56:34+02:00 Storage: Fix SQL statement - - - - - 1 changed file: - gajim/common/storage/archive.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -77,7 +77,7 @@ ARCHIVE_SQL_STATEMENT = ''' jid_id INTEGER PRIMARY KEY UNIQUE, last_mam_id TEXT, oldest_mam_timestamp TEXT, - last_muc_timestamp TEXT, + last_muc_timestamp TEXT ); CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); CREATE INDEX idx_logs_stanza_id ON logs (stanza_id); View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/59e95afd27b2d9a256d8950b627dc526… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/59e95afd27b2d9a256d8950b627dc526… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatControl: Use helper for popup logic
by Philipp Hörist 19 Sep '20

19 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2b166066 by lovetox at 2020-09-19T07:53:59+02:00 GroupChatControl: Use helper for popup logic - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -51,6 +51,7 @@ from gajim.common import ged from gajim.common import helpers from gajim.common.helpers import event_filter from gajim.common.helpers import to_user_string +from gajim.common.helpers import allow_popup_window from gajim.common.const import AvatarSize from gajim.common.i18n import _ @@ -916,16 +917,13 @@ class GroupchatControl(ChatControlBase): additional_data=additional_data) app.events.add_event(self.account, fjid, event) - autopopup = app.settings.get('autopopup') - autopopupaway = app.settings.get('autopopupaway') - if not autopopup or (not autopopupaway and \ - app.account_is_available(self.account)): + if allow_popup_window(self.account): + self._start_private_message(nick) + else: self.roster.draw_contact(nick) if self.parent_win: self.parent_win.show_title() self.parent_win.redraw_tab(self) - else: - self._start_private_message(nick) contact = app.contacts.get_contact_with_highest_priority( self.account, self.room_jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2b16606612b501cd3cf60d16a40cef66… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2b16606612b501cd3cf60d16a40cef66… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Move treshold setting from archive storage
by Philipp Hörist 18 Sep '20

18 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a72de039 by lovetox at 2020-09-18T23:45:29+02:00 Settings: Move treshold setting from archive storage - - - - - 9 changed files: - gajim/common/config.py - gajim/common/const.py - gajim/common/helpers.py - gajim/common/modules/mam.py - gajim/common/setting_values.py - gajim/common/storage/archive.py - gajim/groupchat_control.py - gajim/gtk/preferences.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/config.py ===================================== @@ -227,7 +227,6 @@ class Config: 'use_keyring': [opt_bool, True, _('If enabled, Gajim will use the System\'s Keyring to store account passwords.')], 'remote_commands': [opt_bool, False, _('If enabled, Gajim will execute XEP-0146 Commands.')], 'dark_theme': [opt_int, 2, _('2: System, 1: Enabled, 0: Disabled')], - 'threshold_options': [opt_str, '1, 2, 4, 10, 0', _('Options in days which can be chosen in the sync threshold menu'), True], 'public_room_sync_threshold': [opt_int, 1, _('Maximum history in days we request from a public group chat archive. 0: As much as possible.')], 'private_room_sync_threshold': [opt_int, 0, _('Maximum history in days we request from a private group chat archive. 0: As much as possible.')], 'show_subject_on_join': [opt_bool, True, _('If enabled, Gajim shows the group chat subject in the chat window when joining.')], ===================================== gajim/common/const.py ===================================== @@ -161,6 +161,7 @@ class Chatstate(IntEnum): class SyncThreshold(IntEnum): + NO_SYNC = -1 NO_THRESHOLD = 0 def __str__(self): @@ -1085,3 +1086,13 @@ URI_SCHEMES = { 'webcal://', 'aesgcm://', } + + +THRESHOLD_OPTIONS = { + -1: _('No Sync'), + 1: _('1 Day'), + 2: _('2 Days'), + 7: _('1 Week'), + 30: _('1 Month'), + 0: _('No Threshold'), +} ===================================== gajim/common/helpers.py ===================================== @@ -897,17 +897,6 @@ def call_counter(func): return func(self) return helper -def get_sync_threshold(jid, archive_info): - disco_info = app.storage.cache.get_last_disco_info(jid) - if archive_info is None or archive_info.sync_threshold is None: - if disco_info is not None and disco_info.muc_is_members_only: - threshold = app.settings.get('private_room_sync_threshold') - else: - threshold = app.settings.get('public_room_sync_threshold') - app.storage.archive.set_archive_infos(jid, sync_threshold=threshold) - return threshold - return archive_info.sync_threshold - def load_json(path, key=None, default=None): try: with path.open('r') as file: ===================================== gajim/common/modules/mam.py ===================================== @@ -30,7 +30,6 @@ from gajim.common.nec import NetworkIncomingEvent from gajim.common.const import ArchiveState from gajim.common.const import KindConstant from gajim.common.const import SyncThreshold -from gajim.common.helpers import get_sync_threshold from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_correction @@ -302,9 +301,21 @@ class MAM(BaseModule): def request_archive_on_muc_join(self, jid): archive = app.storage.archive.get_archive_infos(jid) - threshold = get_sync_threshold(jid, archive) + disco_info = app.storage.cache.get_last_disco_info(jid) + + context = 'public' + if disco_info is not None and disco_info.muc_is_members_only: + context = 'private' + + threshold = app.settings.get_group_chat_setting(self._account, + jid, + 'sync_threshold', + context=context) self._log.info('Threshold for %s: %s', jid, threshold) + if threshold == SyncThreshold.NO_SYNC: + return + mam_id = None start_date = None if archive is None or archive.last_mam_id is None: ===================================== gajim/common/setting_values.py ===================================== @@ -167,9 +167,8 @@ APP_SETTINGS = { 'use_keyring': True, 'remote_commands': False, 'dark_theme': 2, - 'threshold_options': '1, 2, 4, 10, 0', - 'public_room_sync_threshold': 1, - 'private_room_sync_threshold': 0, + 'gc_sync_threshold_public_default': 1, + 'gc_sync_threshold_private_default': 0, 'show_subject_on_join': True, 'show_chatstate_in_roster': True, 'show_chatstate_in_tabs': True, @@ -275,6 +274,7 @@ ACCOUNT_SETTINGS = { 'minimize_on_close': True, 'send_chatstate': HAS_ACCOUNT_DEFAULT, 'encryption': '', + 'sync_threshold': HAS_APP_DEFAULT, }, } @@ -449,8 +449,6 @@ ADVANCED_SETTINGS = { 'ignore_incoming_attention': _('If enabled, Gajim will ignore incoming attention requests (\'wizz\').'), 'remember_opened_chat_controls': _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.'), 'remote_commands': _('If enabled, Gajim will execute XEP-0146 Commands.'), - 'threshold_options': _('Options in days which can be chosen in the sync threshold menu'), - 'private_room_sync_threshold': _('Maximum history in days we request from a private group chat archive. 0: As much as possible.'), 'muclumbus_api_jid': '', 'muclumbus_api_http_uri': '', 'muclumbus_api_pref': _('API Preferences. Possible values: \'http\', \'iq\''), ===================================== gajim/common/storage/archive.py ===================================== @@ -41,7 +41,7 @@ from gajim.common.storage.base import SqliteStorage from gajim.common.storage.base import timeit -CURRENT_USER_VERSION = 5 +CURRENT_USER_VERSION = 6 ARCHIVE_SQL_STATEMENT = ''' CREATE TABLE jids( @@ -78,7 +78,6 @@ ARCHIVE_SQL_STATEMENT = ''' last_mam_id TEXT, oldest_mam_timestamp TEXT, last_muc_timestamp TEXT, - sync_threshold INTEGER ); CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); CREATE INDEX idx_logs_stanza_id ON logs (stanza_id); @@ -940,14 +939,13 @@ class MessageArchiveStorage(SqliteStorage): if not exists: sql = '''INSERT INTO last_archive_message (jid_id, last_mam_id, oldest_mam_timestamp, - last_muc_timestamp, sync_threshold) - VALUES (?, ?, ?, ?, ?)''' + last_muc_timestamp) + VALUES (?, ?, ?, ?)''' self._con.execute(sql, ( jid_id, kwargs.get('last_mam_id', None), kwargs.get('oldest_mam_timestamp', None), kwargs.get('last_muc_timestamp', None), - kwargs.get('sync_threshold', None) )) else: for key, value in list(kwargs.items()): ===================================== gajim/groupchat_control.py ===================================== @@ -268,6 +268,13 @@ class GroupchatControl(ChatControlBase): def disco_info(self): return app.storage.cache.get_last_disco_info(self.contact.jid) + @property + def context(self): + disco_info = self.disco_info + if disco_info is None or not self.disco_info.muc_is_members_only: + return 'public' + return 'private' + def add_actions(self): super().add_actions() actions = [ @@ -322,12 +329,8 @@ class GroupchatControl(ChatControlBase): act.connect('change-state', self._on_send_chatstate) self.parent_win.window.add_action(act) - context = 'public' - if self.disco_info is not None and self.disco_info.muc_is_members_only: - context = 'private' - value = self.contact.settings.get('notify_on_all_messages', - context=context) + context=self.context) act = Gio.SimpleAction.new_stateful( 'notify-on-message-' + self.control_id, @@ -351,9 +354,8 @@ class GroupchatControl(ChatControlBase): act.connect('change-state', self._on_print_join_left) self.parent_win.window.add_action(act) - archive_info = app.storage.archive.get_archive_infos(self.contact.jid) - threshold = helpers.get_sync_threshold(self.contact.jid, - archive_info) + threshold = self.contact.settings.get('sync_threshold', + context=self.context) initial = GLib.Variant.new_string(str(threshold)) act = Gio.SimpleAction.new_stateful( @@ -534,9 +536,8 @@ class GroupchatControl(ChatControlBase): # After the room has been created, reevaluate threshold if self.disco_info.has_mam: - archive_info = app.storage.archive.get_archive_infos(self.contact.jid) - threshold = helpers.get_sync_threshold(self.contact.jid, - archive_info) + threshold = self.contact.settings.get('sync_threshold', + context=self.context) win.change_action_state('choose-sync-%s' % self.control_id, GLib.Variant('s', str(threshold))) @@ -661,7 +662,9 @@ class GroupchatControl(ChatControlBase): def _on_sync_threshold(self, action, param): threshold = param.get_string() action.set_state(param) - app.storage.archive.set_archive_infos(self.contact.jid, sync_threshold=threshold) + self.contact.settings.set('sync_threshold', + int(threshold), + context=self.context) def _on_execute_command(self, _action, param): jid = self.room_jid ===================================== gajim/gtk/preferences.py ===================================== @@ -21,9 +21,9 @@ from gi.repository import Gdk from gajim.common import app from gajim.common import configpaths from gajim.common import helpers +from gajim.common.const import THRESHOLD_OPTIONS from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ -from gajim.common.i18n import ngettext from gajim.common.helpers import open_file from gajim.common.multimedia_helpers import AudioInputManager from gajim.common.multimedia_helpers import AudioOutputManager @@ -390,16 +390,6 @@ class Chats(PreferenceBox): class GroupChats(PreferenceBox): def __init__(self, *args): - sync_threshold = {} - options = app.settings.get('threshold_options').split(',') - days = [int(option.strip()) for option in options] - for day in days: - if day == 0: - label = _('No threshold') - else: - label = ngettext('%i day', '%i days', day, day, day) - sync_threshold[day] = label - settings = [ Setting(SettingKind.SWITCH, @@ -416,9 +406,9 @@ class GroupChats(PreferenceBox): Setting(SettingKind.POPOVER, _('Default Sync Threshold'), SettingType.CONFIG, - 'public_room_sync_threshold', + 'gc_sync_threshold_public_default', desc=_('Default for new public group chats'), - props={'entries': sync_threshold}, + props={'entries': THRESHOLD_OPTIONS}, callback=self._on_sync_threshold_changed), Setting(SettingKind.SWITCH, ===================================== gajim/gui_menu_builder.py ===================================== @@ -22,10 +22,10 @@ from gajim.common import app from gajim.common import helpers from gajim.common.helpers import is_affiliation_change_allowed from gajim.common.helpers import is_role_change_allowed -from gajim.common.i18n import ngettext from gajim.common.i18n import _ from gajim.common.const import URIType from gajim.common.const import URIAction +from gajim.common.const import THRESHOLD_OPTIONS from gajim.gtk.util import get_builder from gajim.gtk.const import ControlType @@ -633,15 +633,9 @@ def get_groupchat_menu(control_id, account, jid): def build_sync_menu(): menu = Gio.Menu() - days = app.settings.get('threshold_options').split(',') - days = [int(day) for day in days] action_name = 'win.choose-sync-%s::' % control_id - for day in days: - if day == 0: - label = _('No threshold') - else: - label = ngettext('%i day', '%i days', day, day, day) - menu.append(label, '%s%s' % (action_name, day)) + for days, label in THRESHOLD_OPTIONS.items(): + menu.append(label, '%s%s' % (action_name, days)) return menu def build_chatstate_menu(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a72de0396002a6d28ea25a22a4c8fc61… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a72de0396002a6d28ea25a22a4c8fc61… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2020