Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: Preview: Handle exceptions while decrypting
by Philipp Hörist (＠lovetox) 12 Jan '23

12 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: a2476a3c by Philipp Hörist at 2023-01-12T18:14:07+01:00 fix: Preview: Handle exceptions while decrypting - - - - - 1 changed file: - gajim/common/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -535,7 +535,13 @@ def _on_finished(self, request: HTTPRequest) -> None: if preview.is_aes_encrypted: if preview.key is not None and preview.iv is not None: - data = aes_decrypt(preview.key, preview.iv, data) + try: + data = aes_decrypt(preview.key, preview.iv, data) + except Exception as error: + log.exception('Decryption failed') + preview.info_message = _('Decryption failed') + preview.update_widget() + return if preview.mime_type == 'application/octet-stream': if preview.orig_path is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a2476a3c82ced7ac7e8f96bf637a3d25… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a2476a3c82ced7ac7e8f96bf637a3d25… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: AccountPage: Add menu item to deny all subscription requests
by Daniel Brötzmann (＠wurstsalat) 11 Jan '23

11 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 65f27b1b by wurstsalat at 2023-01-11T17:55:07+01:00 imprv: AccountPage: Add menu item to deny all subscription requests Fixes #11367 - - - - - 5 changed files: - gajim/data/gui/account_page.ui - gajim/gtk/account_page.py - gajim/gtk/builder.pyi - gajim/gtk/menus.py - gajim/gtk/notification_manager.py Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -262,14 +262,50 @@ </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-top">6</property> - <property name="label" translatable="yes">Notifications</property> - <style> - <class name="bold16"/> - </style> + <property name="spacing">18</property> + <child type="center"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">6</property> + <property name="label" translatable="yes">Notifications</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="notifications_menu_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">view-more-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/account_page.py ===================================== @@ -29,6 +29,7 @@ from gajim.gtk.builder import get_builder from gajim.gtk.menus import get_account_menu +from gajim.gtk.menus import get_account_notifications_menu from gajim.gtk.menus import get_roster_view_menu from gajim.gtk.notification_manager import NotificationManager from gajim.gtk.roster import Roster @@ -63,6 +64,9 @@ def __init__(self, account: str) -> None: self._notification_manager = NotificationManager(account) self._ui.account_box.add(self._notification_manager) + self._ui.notifications_menu_button.set_menu_model( + get_account_notifications_menu(account)) + self._roster = Roster(account) self._ui.roster_box.add(self._roster) ===================================== gajim/gtk/builder.pyi ===================================== @@ -20,6 +20,7 @@ class AccountPageBuilder(Builder): account_label: Gtk.Label account_page_menu_button: Gtk.MenuButton status_box: Gtk.Box + notifications_menu_button: Gtk.MenuButton class AccountWizardBuilder(Builder): ===================================== gajim/gtk/menus.py ===================================== @@ -444,6 +444,15 @@ def get_roster_view_menu() -> GajimMenu: return GajimMenu.from_list(menuitems) +def get_account_notifications_menu(account: str) -> GajimMenu: + menuitems: MenuItemListT = [ + (_('Deny all subscription requests'), + f'win.subscription-deny-all-{account}', + None), + ] + return GajimMenu.from_list(menuitems) + + def get_subscription_menu(account: str, jid: JID) -> GajimMenu: params = AddChatActionParams(account=account, jid=jid, ===================================== gajim/gtk/notification_manager.py ===================================== @@ -15,6 +15,7 @@ from __future__ import annotations from typing import Any +from typing import Callable from typing import cast from typing import Optional from typing import Union @@ -38,6 +39,11 @@ from gajim.gtk.menus import get_subscription_menu from gajim.gtk.util import open_window +NotificationActionListT = list[ + tuple[str, + Callable[[Gio.SimpleAction, GLib.Variant], Any], + Optional[str]]] + class NotificationManager(Gtk.ListBox): def __init__(self, account: str) -> None: @@ -64,16 +70,19 @@ def _on_destroy(self, *args: Any) -> None: self._remove_actions() def _add_actions(self) -> None: - actions = [ + actions: NotificationActionListT = [ ('subscription-accept', self._on_subscription_accept, 'as'), ('subscription-deny', self._on_subscription_deny, 's'), + ('subscription-deny-all', self._on_subscription_deny_all, None), ('subscription-block', self._on_subscription_block, 's'), ('subscription-report', self._on_subscription_report, 's'), ] for action in actions: action_name, func, typ = action + if typ is not None: + typ = GLib.VariantType.new(typ) act = Gio.SimpleAction.new( - f'{action_name}-{self._account}', GLib.VariantType.new(typ)) + f'{action_name}-{self._account}', typ) act.connect('activate', func) app.window.add_action(act) @@ -91,6 +100,11 @@ def update_actions(self) -> None: assert sub_deny is not None sub_deny.set_enabled(online) + sub_deny_all = app.window.lookup_action( + f'subscription-deny-all-{self._account}') + assert sub_deny_all is not None + sub_deny_all.set_enabled(online) + sub_block = app.window.lookup_action( f'subscription-block-{self._account}') assert sub_block is not None @@ -105,6 +119,7 @@ def _remove_actions(self) -> None: actions = [ 'subscription-accept', 'subscription-deny', + 'subscription-deny-all', 'subscription-block', 'subscription-report', ] @@ -165,6 +180,17 @@ def _on_subscription_deny(self, if row is not None: row.destroy() + def _on_subscription_deny_all(self, + _action: Gio.SimpleAction, + _param: GLib.Variant + ) -> None: + + for row in cast(list[NotificationRow], self.get_children()): + if row.type != 'subscribe': + continue + self._deny_request(row.jid) + row.destroy() + def _deny_request(self, jid: str) -> None: self._client.get_module('Presence').unsubscribed(jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/65f27b1baa32142c402c4dc95ee0d5d1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/65f27b1baa32142c402c4dc95ee0d5d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: HTTP: Parse uri with correct flags
by Philipp Hörist (＠lovetox) 10 Jan '23

10 Jan '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7ae72c8d by Philipp Hörist at 2023-01-10T18:45:27+01:00 fix: HTTP: Parse uri with correct flags - - - - - 1 changed file: - nbxmpp/http.py Changes: ===================================== nbxmpp/http.py ===================================== @@ -252,7 +252,7 @@ class HTTPRequest(GObject.GObject): Gio.FileCreateFlags.REPLACE_DESTINATION, self._cancellable) - uri = GLib.Uri.parse(uri_string, GLib.UriFlags.HAS_PASSWORD) + uri = GLib.Uri.parse(uri_string, GLib.UriFlags(Soup.HTTP_URI_FLAGS)) self._message.set_uri(uri) if self._request_body_data is not None: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7ae72c8deb14f03de6d05076… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7ae72c8deb14f03de6d05076… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][pyproject] change: Port package to pyproject.toml
by Philipp Hörist (＠lovetox) 09 Jan '23

09 Jan '23

Philipp Hörist pushed to branch pyproject at gajim / python-nbxmpp Commits: 1b054cc5 by Philipp Hörist at 2023-01-10T00:50:09+01:00 change: Port package to pyproject.toml - - - - - 6 changed files: - .gitlab-ci.yml - debian/control - pyproject.toml - scripts/bump_version.py - − setup.cfg - − setup.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -24,7 +24,8 @@ build-linux: stage: build dependencies: [] script: - - python3 setup.py sdist bdist_wheel + - pip install build + - python3 -m build - python3 .ci/debian_build.py "$(find dist/nbxmpp-*.tar.gz)" 1 --pkgprefix=python3- artifacts: ===================================== debian/control ===================================== @@ -1,18 +1,17 @@ Source: python3-nbxmpp-nightly -Section: net +Section: python Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> Build-Depends: debhelper-compat (= 13), dh-python, - libglib2.0-0 (>= 2.60), gir1.2-soup-3.0, python3-all, python3-gi, python3-idna, python3-packaging, python3-precis-i18n, - python3-setuptools, + python3-setuptools (>= 65.0.0), Standards-Version: 4.1.4 Rules-Requires-Root: no Homepage: https://dev.gajim.org/gajim/python-nbxmpp @@ -23,14 +22,10 @@ Package: python3-nbxmpp-nightly Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, - libglib2.0-0 (>= 2.60), gir1.2-soup-3.0, python3-gi, - python3-idna, - python3-packaging, - python3-precis-i18n, Recommends: python3-gssapi, -Breaks: gajim (<< 1.4~) +Breaks: gajim (<< 1.6~) Description: Non blocking XMPP Python library python-nbxmpp is a Python library that provides a way for Python applications - to use the XMPP network. This library was initially a fork of xmpppy. \ No newline at end of file + to use the XMPP network. This library was initially a fork of xmpppy. ===================================== pyproject.toml ===================================== @@ -1,9 +1,44 @@ [build-system] -requires = [ - "setuptools >= 43.0.0", -] +requires = ["setuptools >= 65.0.0"] build-backend = "setuptools.build_meta" +[project] +name = "nbxmpp" +description = "XMPP Library" +keywords = ["chat", "messaging", "im", "xmpp"] +readme = "README.md" +requires-python = ">=3.10" +license = {text = "GPL-3.0-or-later"} +authors = [ + {name = "Philipp Hörist", email = "philipp(a)hoerist.com"}, + {name = "Yann Leboulanger", email = "yann(a)leboulanger.org"}, +] +classifiers = [ + "Programming Language :: Python :: 3.10", +] +dependencies = [ + "precis-i18n>=1.0.0", + "packaging", + "idna", + "PyGObject", +] + +dynamic = ["version"] + +[project.optional-dependencies] +gssapi = ["gssapi"] + +[project.urls] +repository = "https://dev.gajim.org/gajim/python-nbxmpp" + +[tool.setuptools.packages.find] +include = ["nbxmpp*"] + +[tool.setuptools.package-data] +"nbxmpp" = ["py.typed"] + +[tool.setuptools.dynamic] +version = {attr = "nbxmpp.__version__"} [tool.pyright] pythonVersion = "3.10" ===================================== scripts/bump_version.py ===================================== @@ -9,7 +9,6 @@ REPO_DIR = Path(__file__).resolve().parent.parent INIT = REPO_DIR / 'nbxmpp' / '__init__.py' -CFG = REPO_DIR / 'setup.cfg' CHANGELOG = REPO_DIR / 'ChangeLog' VERSION_RX = r'\d+\.\d+\.\d+' @@ -28,10 +27,6 @@ def bump_version(current_version: str, new_version: str) -> None: content = content.replace(current_version, new_version, 1) INIT.write_text(content, encoding='utf8') - content = CFG.read_text(encoding='utf8') - content = content.replace(current_version, new_version, 1) - CFG.write_text(content, encoding='utf8') - def make_changelog(new_version: str) -> None: ===================================== setup.cfg deleted ===================================== @@ -1,32 +0,0 @@ -[metadata] -name = nbxmpp -version = 4.0.0 -description = XMPP Library -author = Yann Leboulanger, Philipp Hoerist -author_email = gajim-devel(a)gajim.org -long_description = file: README.md -long_description_content_type = text/markdown -keywords = xmpp chat -url = https://dev.gajim.org/gajim/python-nbxmpp -license_file = COPYING -license = GPL v3 -classifiers = - Programming Language :: Python :: 3.10 - -[options] -python_requires = >=3.10 -packages = find: -install_requires = - precis-i18n>=1.0.0 - packaging - idna - -[options.extras_require] -gssapi = gssapi - -[options.packages.find] -exclude = - test* - -[options.package_data] -nbxmpp = py.typed ===================================== setup.py deleted ===================================== @@ -1,5 +0,0 @@ -#!/usr/bin/env python3 - -from setuptools import setup - -setup() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1b054cc5a9b4753bb43cc459… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1b054cc5a9b4753bb43cc459… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new branch pyproject
by Philipp Hörist (＠lovetox) 09 Jan '23

09 Jan '23

Philipp Hörist pushed new branch pyproject at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/pyproject You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][limit-message-length] imprv: Limit message length and add FullMessageWindow
by Daniel Brötzmann (＠wurstsalat) 09 Jan '23

09 Jan '23

Daniel Brötzmann pushed to branch limit-message-length at gajim / gajim Commits: b00a6d33 by wurstsalat at 2023-01-09T15:37:10+01:00 imprv: Limit message length and add FullMessageWindow Fixes #11123 - - - - - 4 changed files: - gajim/gtk/const.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/const.py ===================================== @@ -55,6 +55,8 @@ class Setting(NamedTuple): # Drag and drop target type URI list (for dropped files) TARGET_TYPE_URI_LIST = 80 +MAX_MESSAGE_LENGTH = 5000 + @unique class Theme(IntEnum): ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -18,14 +18,17 @@ from typing import Optional from typing import Union +from gi.repository import Gdk from gi.repository import Gtk +from gajim.common.i18n import _ from gajim.common.styling import ParsingResult from gajim.common.styling import PlainBlock from gajim.common.styling import PreBlock from gajim.common.styling import process from gajim.common.styling import QuoteBlock +from gajim.gtk.const import MAX_MESSAGE_LENGTH from gajim.gtk.conversation.code_widget import CodeWidget from gajim.gtk.conversation.plain_widget import PlainWidget from gajim.gtk.conversation.quote_widget import QuoteWidget @@ -59,12 +62,20 @@ def add_with_styling(self, text: str, nickname: Optional[str] = None) -> None: + original_text = text + if len(text) > MAX_MESSAGE_LENGTH: + text = text[:MAX_MESSAGE_LENGTH] + if text.startswith('/me') and nickname is not None: self._add_action_phrase(text, nickname) + if len(original_text) > MAX_MESSAGE_LENGTH: + self._add_read_more_button(original_text) return result = process(text) self.add_content(result) + if len(original_text) > MAX_MESSAGE_LENGTH: + self._add_read_more_button(original_text) def _add_action_phrase(self, text: str, nickname: str): self.clear() @@ -101,5 +112,49 @@ def add_content(self, content: ContentT) -> None: self.show_all() + def _add_read_more_button(self, text: str) -> None: + link_button = Gtk.LinkButton(label=_('[read more]')) + link_button.set_halign(Gtk.Align.START) + link_button.connect('activate-link', self._on_read_more, text) + self.add(link_button) + + def _on_read_more(self, _button: Gtk.LinkButton, text: str) -> bool: + FullMessageWindow(text) + return True + def clear(self) -> None: self.foreach(self.remove) + + +class FullMessageWindow(Gtk.ApplicationWindow): + def __init__(self, text: str) -> None: + Gtk.ApplicationWindow.__init__(self) + self.set_size_request(800, 800) + self.set_title(_('Full Message View')) + self.get_style_context().add_class('dialog-margin') + + textview = Gtk.TextView() + textview.set_editable(False) + textview.set_left_margin(3) + textview.set_top_margin(3) + textview.get_buffer().set_text(text) + + scrolled = Gtk.ScrolledWindow() + scrolled.set_hexpand(True) + scrolled.set_shadow_type(Gtk.ShadowType.IN) + scrolled.add(textview) + + box = Gtk.Box() + box.add(scrolled) + + self.add(box) + self.show_all() + + self.connect('key-press-event', self._on_key_press_event) + + def _on_key_press_event(self, + _widget: Gtk.Widget, + event: Gdk.EventKey + ) -> None: + if event.keyval == Gdk.KEY_Escape: + self.destroy() ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -28,6 +28,7 @@ from gajim.common.styling import PlainBlock from gajim.common.styling import process_uris +from gajim.gtk.const import MAX_MESSAGE_LENGTH from gajim.gtk.menus import get_conv_action_context_menu from gajim.gtk.menus import populate_uri_context_menu from gajim.gtk.util import make_pango_attributes @@ -107,7 +108,7 @@ def print_text_with_styling(self, block: PlainBlock) -> None: text = self._build_link_markup(block.text, block.uris) self.set_markup(text) - if len(self.get_text()) > 10000: + if len(self.get_text()) > MAX_MESSAGE_LENGTH: # Limit message styling processing return ===================================== gajim/gtk/message_input.py ===================================== @@ -41,6 +41,7 @@ from gajim.common.types import ChatContactT from gajim.gtk.chat_action_processor import ChatActionProcessor +from gajim.gtk.const import MAX_MESSAGE_LENGTH from gajim.gtk.util import scroll_to_end if app.is_installed('GSPELL'): @@ -311,7 +312,7 @@ def _on_text_changed(self, buf: Gtk.TextBuffer) -> None: self._clear_tags() - if len(text) > 10000: + if len(text) > MAX_MESSAGE_LENGTH: # Limit message styling processing return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b00a6d33293f10832e94c60b36b721f1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b00a6d33293f10832e94c60b36b721f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Audio Visualizer: Port deprecated methods
by Philipp Hörist (＠lovetox) 08 Jan '23

08 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: d309712b by mesonium at 2023-01-08T22:55:03+00:00 fix: Audio Visualizer: Port deprecated methods - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/preview_audio_visualizer.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -651,14 +651,17 @@ .preview-image-button:hover { } /* Audiovisualizer */ -#AudioVisualizer { - color: @theme_selected_bg_color; +.audiovisualizer { background-color: @insensitive_fg_color; border-color: @theme_unfocused_bg_color; } - -#AudioVisualizer:selected { - color: lighter(@theme_selected_bg_color); +.audiovisualizer:checked { + background-color: @theme_selected_bg_color; + border-color: @theme_unfocused_bg_color; +} +.audiovisualizer:selected { + background-color: lighter(@theme_selected_bg_color); + border-color: @theme_unfocused_bg_color; } /* Conversation meta elements */ ===================================== gajim/gtk/preview_audio_visualizer.py ===================================== @@ -26,8 +26,6 @@ from gajim.common.preview import AudioSampleT -from gajim.gtk.util import rgba_to_float - log = logging.getLogger('gajim.gtk.preview_audio_visualizer') @@ -40,8 +38,6 @@ def __init__(self, Gtk.DrawingArea.__init__(self) - self.set_name('AudioVisualizer') - self._update_colors() self._x_offset = x_offset self._peak_width = 2 # in px self._width = width @@ -57,6 +53,9 @@ def __init__(self, self.connect('configure-event', self._on_drawingarea_changed) self.connect('style-updated', self._on_style_updated) + self._style_context = self.get_style_context() + self._style_context.add_class('audiovisualizer') + self.set_size_request(self._width, self._height) self._surface: Optional[cairo.ImageSurface] = None self._setup_surface() @@ -77,7 +76,7 @@ def draw_graph(self, position: float, seek_position: float = -1.0) -> None: self._position = position self._seek_position = seek_position - + self.queue_draw() def _on_drawingarea_draw(self, @@ -100,25 +99,8 @@ def _on_drawingarea_changed(self, def _on_style_updated(self, _event: Gdk.EventConfigure ) -> None: - - self._update_colors() self.queue_draw() - def _update_colors(self) -> None: - sc = self.get_style_context() - self._progress_color = rgba_to_float( - sc.get_color(Gtk.StateFlags.NORMAL) - ) - self._default_color = rgba_to_float( - sc.get_background_color(Gtk.StateFlags.NORMAL) - ) - self._outline_color = rgba_to_float( - sc.get_border_color(Gtk.StateFlags.NORMAL) - ) - self._seek_color = rgba_to_float( - sc.get_color(Gtk.StateFlags.SELECTED) - ) - def _setup_surface(self) -> None: if self._surface: self._surface.finish() @@ -128,8 +110,10 @@ def _setup_surface(self) -> None: self._width, self._height) ctx: cairo.Context[cairo.ImageSurface] = cairo.Context(self._surface) + self._cairo_path = ctx.copy_path() if self._num_samples != 0: + self._draw_rms_amplitudes(ctx) self._draw_surface(ctx) def _process_samples(self) -> None: @@ -164,56 +148,41 @@ def _process_samples(self) -> None: else: self._samples = samples + def _pixel_pos(self, pos: float) -> float: + return pos * self._width + self._x_offset + def _draw_surface(self, ctx: cairo.Context[cairo.ImageSurface]) -> None: - # First draw the progress part from left - end = min(round(self._position * self._num_samples), self._num_samples) - self._draw_rms_amplitudes(ctx, - start=0, - end=end, - color=self._progress_color - ) + ctx.append_path(self._cairo_path) + ctx.clip() + + play_pos = self._pixel_pos(self._position) + start_pos = self._pixel_pos(0.0) + width_pos = play_pos - start_pos + + # Default + self._style_context.set_state(Gtk.StateFlags.NORMAL) + Gtk.render_background( + self._style_context, ctx, + start_pos, 0, self._width, self._height) + # Progress + self._style_context.set_state(Gtk.StateFlags.CHECKED) + Gtk.render_background(self._style_context, ctx, + start_pos, 0, width_pos, self._height) + + # Seek if self._seek_position >= 0: - # If state is PLAYING and the user seeks, determine whether the - # seek position lies in the past, i.e. on the left side of current - # position or in the future, i.e. on the right side. - # Highlight the skipped area from seek - # to the current position on the determined site. - play_pos = min(round( - self._position * self._num_samples), self._num_samples) - seek_pos = min(round( - self._seek_position * self._num_samples), self._num_samples) - if play_pos > seek_pos: - start = seek_pos - end = play_pos - else: - start = play_pos - end = seek_pos - - self._draw_rms_amplitudes(ctx, - start=start, - end=end, - color=self._seek_color - ) - - # Draw the default amplitudes for the rest of the timeline - play_pos = min(round( - self._position * self._num_samples), self._num_samples) - seek_pos = min(round( - self._seek_position * self._num_samples), self._num_samples) - start_default = max(play_pos, seek_pos) - - self._draw_rms_amplitudes(ctx, - start=start_default, - end=self._num_samples, - color=self._default_color - ) + seek_pos = self._pixel_pos(self._seek_position) + start_seek = min(play_pos, seek_pos) + end_seek = max(play_pos, seek_pos) + width_seek = end_seek - start_seek + + self._style_context.set_state(Gtk.StateFlags.SELECTED) + Gtk.render_background(self._style_context, ctx, + start_seek, 0, width_seek, self._height) def _draw_rms_amplitudes(self, - ctx: cairo.Context[cairo.ImageSurface], - start: int, - end: int, - color: tuple[float, float, float] + ctx: cairo.Context[cairo.ImageSurface] ) -> None: peak_width = self._peak_width radius = 1 # radius of the arcs on top and bottom of the amplitudes @@ -224,12 +193,12 @@ def _draw_rms_amplitudes(self, if self._is_LTR: # determines the spacing between the amplitudes x_shift = (self._width - 2 * peak_width) / self._num_samples - x = self._x_offset + x_shift * (start + 1) + x = self._x_offset + x_shift else: x_shift = -(self._width - 2 * peak_width) / self._num_samples - x = -x_shift * (self._num_samples - start) + self._x_offset + x = -x_shift * (self._num_samples) + self._x_offset - for i in range(start, end): + for i in range(0, self._num_samples): if self._is_LTR: sample1 = self._samples[i][0] sample2 = self._samples[i][1] @@ -247,15 +216,10 @@ def _draw_rms_amplitudes(self, radius, gap, ) - - ctx.set_source_rgb(*self._outline_color) - ctx.stroke_preserve() - - ctx.set_source_rgb(*color) - ctx.fill() - x += x_shift + self._cairo_path = ctx.copy_path() + def _draw_rounded_rec(self, ctx: cairo.Context[cairo.ImageSurface], x: float, @@ -288,6 +252,7 @@ def _draw_rounded_rec(self, # Up # A -- B -- C + ctx.move_to(x, y + height1) ctx.curve_to(x, y + height1, x + m, y + height1 + radius, x + width, y + height1) @@ -297,6 +262,7 @@ def _draw_rounded_rec(self, ctx.line_to(x, y + gap_size) # F -- A ctx.line_to(x, y + height1) + ctx.close_path() # Down # C -- D @@ -310,3 +276,4 @@ def _draw_rounded_rec(self, ctx.line_to(x, y - gap_size) # A -- C ctx.line_to(x + width, y - gap_size) + ctx.close_path() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d309712bba72b35920caae91b1eb9e79… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d309712bba72b35920caae91b1eb9e79… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: AudioPreview: Always format progress time as LTR
by Daniel Brötzmann (＠wurstsalat) 08 Jan '23

08 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6ea7bbe2 by mesonium at 2023-01-08T22:28:20+00:00 fix: AudioPreview: Always format progress time as LTR - - - - - 1 changed file: - gajim/gtk/preview_audio.py Changes: ===================================== gajim/gtk/preview_audio.py ===================================== @@ -125,10 +125,7 @@ def __init__(self, file_path: Path) -> None: self._ui.speed_bar.add_mark(1.75, Gtk.PositionType.BOTTOM, '') self._ui.speed_bar.add_mark(2, Gtk.PositionType.BOTTOM, '2') - if self._is_LTR: - self._ui.progress_label.set_xalign(1.0) - else: - self._ui.progress_label.set_xalign(0.0) + self._ui.progress_label.set_xalign(1.0) self.connect('destroy', self._on_destroy) self.show_all() @@ -270,20 +267,14 @@ def _update_timestamp_label(self) -> None: dur = self._state.duration dur_str = format_duration(dur, dur) - ltr_char = '\u202B' - pop_char = '\u202C' + ltr_char = '\u200E' if self._state.is_timestamp_positive: cur_str = f'{format_duration(cur, dur)}' self._ui.progress_label.set_text(f'{cur_str}/{dur_str}') else: cur_str = f'{format_duration(dur - cur, dur)}' - if self._is_LTR: - self._ui.progress_label.set_text(f'-{cur_str}/{dur_str}') - else: - self._ui.progress_label.set_text( - f'{cur_str}{ltr_char}/-{pop_char}{dur_str}' - ) + self._ui.progress_label.set_text(f'{ltr_char}-{cur_str}/{dur_str}') def _update_seek_bar_and_visualisation(self) -> bool: assert self._playbin is not None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ea7bbe2fa194545c986354bb8d211aa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ea7bbe2fa194545c986354bb8d211aa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch limit-message-length
by Daniel Brötzmann (＠wurstsalat) 08 Jan '23

08 Jan '23

Daniel Brötzmann pushed new branch limit-message-length at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/limit-message-length You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: AppPage: Differentiate between updates (Gajim/Plugins)
by Daniel Brötzmann (＠wurstsalat) 08 Jan '23

08 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 02c6c225 by wurstsalat at 2023-01-08T18:46:09+01:00 fix: AppPage: Differentiate between updates (Gajim/Plugins) Fixes #11363 - - - - - 1 changed file: - gajim/gtk/app_page.py Changes: ===================================== gajim/gtk/app_page.py ===================================== @@ -131,17 +131,27 @@ def _on_update_check(self, *args: Any) -> None: @staticmethod def _get_update_text() -> str: + gajim = '' + plugins = _('Plugins: No updates available') if not app.settings.get('check_for_update'): - return _('Update check disabled in preferences') + gajim = _('Gajim: Update check disabled in preferences') + + if not app.settings.get('plugins_update_check'): + plugins = _('Plugins: Update check disabled in preferences') + + if any(gajim and plugins): + return f'{gajim}\n{plugins}' last_check = app.settings.get('last_update_check') if not last_check: - return _('No updates available (last check: never)') + gajim = _('Gajim: No updates available (last check: never)') + return f'{gajim}\n{plugins}' date = datetime.strptime(last_check, '%Y-%m-%d %H:%M') format_string = app.settings.get('date_format') - return _('No updates available (last check: %s)') % date.strftime( - format_string) + gajim = _('Gajim: No updates available ' + '(last check: %s)') % date.strftime(format_string) + return f'{gajim}\n{plugins}' class AppMessageRow(Gtk.ListBoxRow): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02c6c225f665a2ccd55fe9c67d652958… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02c6c225f665a2ccd55fe9c67d652958… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits