Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: refactor: Remove unused code
by Philipp Hörist (＠lovetox) 05 Oct '22

05 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 814ce5de by Philipp Hörist at 2022-10-05T17:54:27+02:00 refactor: Remove unused code - - - - - 2175354d by Philipp Hörist at 2022-10-05T19:43:02+02:00 cfix: Raise AccountDisabled event only after account cleanup - - - - - 63a78910 by Philipp Hörist at 2022-10-05T19:45:02+02:00 change: Show account color bar only when multiple accounts are active - - - - - 2 changed files: - gajim/gtk/account_side_bar.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -21,10 +21,13 @@ from gi.repository import Gtk from gajim.common import app +from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.helpers import get_client_status from gajim.common.i18n import _ +from .util import EventHelper + class AccountSideBar(Gtk.ListBox): def __init__(self) -> None: @@ -67,14 +70,22 @@ def update_unread_count(self, account: str, count: int) -> None: break -class Account(Gtk.ListBoxRow): +class Account(Gtk.ListBoxRow, EventHelper): def __init__(self, account: str) -> None: Gtk.ListBoxRow.__init__(self) + EventHelper.__init__(self) self.get_style_context().add_class('account-sidebar-item') self.account = account self._account_class: Optional[str] = None + self.register_events([ + ('account-enabled', ged.GUI1, + self._update_account_color_visibility), + ('account-disabled', ged.GUI1, + self._update_account_color_visibility), + ]) + selection_bar = Gtk.Box() selection_bar.set_size_request(6, -1) selection_bar.get_style_context().add_class('selection-bar') @@ -89,9 +100,11 @@ def __init__(self, account: str) -> None: self._unread_label.set_valign(Gtk.Align.START) self._account_color_bar = Gtk.Box() + self._account_color_bar.set_no_show_all(True) self._account_color_bar.set_size_request(6, -1) self._account_color_bar.get_style_context().add_class( 'account-identifier-bar') + self._update_account_color_visibility() account_box = Gtk.Box(spacing=3) account_box.set_tooltip_text( @@ -99,7 +112,7 @@ def __init__(self, account: str) -> None: account_box.add(selection_bar) account_box.add(self._image) account_box.add(self._account_color_bar) - self._update_account_color() + self._set_account_color() overlay = Gtk.Overlay() overlay.add(account_box) @@ -108,7 +121,7 @@ def __init__(self, account: str) -> None: self.add(overlay) self.show_all() - def _update_account_color(self) -> None: + def _set_account_color(self) -> None: context = self._account_color_bar.get_style_context() if self._account_class is not None: context.remove_class(self._account_class) @@ -123,8 +136,9 @@ def set_unread_count(self, count: int) -> None: self._unread_label.set_text('999+') self._unread_label.set_visible(bool(count)) - def update(self) -> None: - self._update_account_color() + def _update_account_color_visibility(self, *args: Any) -> None: + visible = app.get_number_of_accounts() > 1 + self._account_color_bar.set_visible(visible) class AccountAvatar(Gtk.Image): ===================================== gajim/gui_interface.py ===================================== @@ -563,8 +563,6 @@ def disable_account(self, account: str) -> None: build_accounts_menu() app.app.update_app_actions_state() - app.ged.raise_event(AccountDisabled(account=account)) - app.connections[account].cleanup() del app.connections[account] del self.instances[account] @@ -572,6 +570,8 @@ def disable_account(self, account: str) -> None: del app.automatic_rooms[account] del app.to_be_removed[account] + app.ged.raise_event(AccountDisabled(account=account)) + def remove_account(self, account: str) -> None: if app.settings.get_account_setting(account, 'active'): self.disable_account(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2a0cd556b4bd40906b233211fbdd290… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2a0cd556b4bd40906b233211fbdd290… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch i18n-bidi
by Daniel Brötzmann (＠wurstsalat) 05 Oct '22

05 Oct '22

Daniel Brötzmann deleted branch i18n-bidi at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: MessageRow: Set text direction for RTL text
by Philipp Hörist (＠lovetox) 05 Oct '22

05 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2a0cd556 by wurstsalat at 2022-10-05T13:55:42+00:00 imprv: MessageRow: Set text direction for RTL text Fixes #11148 - - - - - 2 changed files: - gajim/common/i18n.py - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -107,21 +107,19 @@ def get_short_lang_code(lang: Optional[str] = None) -> str: return lang[:2] -def paragraph_direction_mark(text: str) -> str: +def is_rtl_text(text: str) -> bool: ''' Determine paragraph writing direction according to http://www.unicode.org/reports/tr9/#The_Paragraph_Level - - Returns either Unicode LTR mark or RTL mark. ''' for char in text: bidi = unicodedata.bidirectional(char) if bidi == 'L': - return '\u200E' + return False if bidi in ('AL', 'R'): - return '\u200F' + return True - return '\u200E' + return False def Q_(text: str) -> str: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -44,6 +44,7 @@ from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import to_user_string from gajim.common.i18n import _ +from gajim.common.i18n import is_rtl_text from gajim.common.i18n import Q_ from gajim.common.modules.contacts import GroupchatContact from gajim.common.types import ChatContactT @@ -194,6 +195,10 @@ def __init__(self, self._bottom_box = Gtk.Box(spacing=6) self._bottom_box.add(self._message_widget) + if is_rtl_text(text): + self._bottom_box.set_halign(Gtk.Align.END) + self._message_widget.set_direction(Gtk.TextDirection.RTL) + more_menu_button = MoreMenuButton(self, self._contact, name) more_menu_button.set_hexpand(True) more_menu_button.set_halign(Gtk.Align.END) @@ -443,6 +448,13 @@ def set_retracted(self, text: str) -> None: self._message_widget.destroy() self._message_widget = MessageWidget(self._account) self._bottom_box.pack_start(self._message_widget, True, True, 0) + if is_rtl_text(text): + self._bottom_box.set_halign(Gtk.Align.END) + self._message_widget.set_direction(Gtk.TextDirection.RTL) + else: + self._bottom_box.set_halign(Gtk.Align.FILL) + self._message_widget.set_direction(Gtk.TextDirection.LTR) + self._message_widget.add_with_styling(text) self.get_style_context().add_class('retracted-message') @@ -450,6 +462,13 @@ def set_correction(self, text: str, nickname: Optional[str]) -> None: if not isinstance(self._message_widget, PreviewWidget): self._message_widget.add_with_styling(text, nickname) + if is_rtl_text(text): + self._bottom_box.set_halign(Gtk.Align.END) + self._message_widget.set_direction(Gtk.TextDirection.RTL) + else: + self._bottom_box.set_halign(Gtk.Align.FILL) + self._message_widget.set_direction(Gtk.TextDirection.LTR) + self._has_receipt = False self._message_icons.set_receipt_icon_visible(False) self._message_icons.set_correction_icon_visible(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a0cd556b4bd40906b233211fbdd2908… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a0cd556b4bd40906b233211fbdd2908… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][i18n-bidi] 4 commits: cfix: PEPConfig: Make Delete button translatable
by Philipp Hörist (＠lovetox) 05 Oct '22

05 Oct '22

Philipp Hörist pushed to branch i18n-bidi at gajim / gajim Commits: 1adc22ec by Daniel Brötzmann at 2022-10-04T08:53:14+00:00 cfix: PEPConfig: Make Delete button translatable - - - - - d72d04fc by wurstsalat at 2022-10-04T11:39:21+02:00 imprv: AvatarSelector: Add border to mark drag and drop zone - - - - - 758948cb by wurstsalat at 2022-10-05T14:41:53+02:00 cfix: Preview: Limit displayed geo:-URI precision - - - - - 2a0cd556 by wurstsalat at 2022-10-05T13:55:42+00:00 imprv: MessageRow: Set text direction for RTL text Fixes #11148 - - - - - 6 changed files: - gajim/common/i18n.py - gajim/data/gui/pep_config.ui - gajim/data/style/gajim.css - gajim/gtk/avatar_selector.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/preview.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -107,21 +107,19 @@ def get_short_lang_code(lang: Optional[str] = None) -> str: return lang[:2] -def paragraph_direction_mark(text: str) -> str: +def is_rtl_text(text: str) -> bool: ''' Determine paragraph writing direction according to http://www.unicode.org/reports/tr9/#The_Paragraph_Level - - Returns either Unicode LTR mark or RTL mark. ''' for char in text: bidi = unicodedata.bidirectional(char) if bidi == 'L': - return '\u200E' + return False if bidi in ('AL', 'R'): - return '\u200F' + return True - return '\u200E' + return False def Q_(text: str) -> str: ===================================== gajim/data/gui/pep_config.ui ===================================== @@ -61,7 +61,7 @@ </child> <child> <object class="GtkButton" id="delete_button"> - <property name="label">_Delete</property> + <property name="label" translatable="yes">_Delete</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can-focus">True</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -158,6 +158,12 @@ .preview-button { .link-button { min-height: 0px; } +.avatar-selector { + border: 2px dotted @theme_selected_bg_color; + border-radius: 12px; + padding: 18px; +} + /* Main Window */ .mainwindow-grid { background: @theme_base_color; ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -69,7 +69,7 @@ class AvatarSelector(Gtk.Box): def __init__(self) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) - self.get_style_context().add_class('padding-18') + self.get_style_context().add_class('avatar-selector') uri_entry = Gtk.TargetEntry.new( 'text/uri-list', Gtk.TargetFlags.OTHER_APP, 80) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -44,6 +44,7 @@ from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import to_user_string from gajim.common.i18n import _ +from gajim.common.i18n import is_rtl_text from gajim.common.i18n import Q_ from gajim.common.modules.contacts import GroupchatContact from gajim.common.types import ChatContactT @@ -194,6 +195,10 @@ def __init__(self, self._bottom_box = Gtk.Box(spacing=6) self._bottom_box.add(self._message_widget) + if is_rtl_text(text): + self._bottom_box.set_halign(Gtk.Align.END) + self._message_widget.set_direction(Gtk.TextDirection.RTL) + more_menu_button = MoreMenuButton(self, self._contact, name) more_menu_button.set_hexpand(True) more_menu_button.set_halign(Gtk.Align.END) @@ -443,6 +448,13 @@ def set_retracted(self, text: str) -> None: self._message_widget.destroy() self._message_widget = MessageWidget(self._account) self._bottom_box.pack_start(self._message_widget, True, True, 0) + if is_rtl_text(text): + self._bottom_box.set_halign(Gtk.Align.END) + self._message_widget.set_direction(Gtk.TextDirection.RTL) + else: + self._bottom_box.set_halign(Gtk.Align.FILL) + self._message_widget.set_direction(Gtk.TextDirection.LTR) + self._message_widget.add_with_styling(text) self.get_style_context().add_class('retracted-message') @@ -450,6 +462,13 @@ def set_correction(self, text: str, nickname: Optional[str]) -> None: if not isinstance(self._message_widget, PreviewWidget): self._message_widget.add_with_styling(text, nickname) + if is_rtl_text(text): + self._bottom_box.set_halign(Gtk.Align.END) + self._message_widget.set_direction(Gtk.TextDirection.RTL) + else: + self._bottom_box.set_halign(Gtk.Align.FILL) + self._message_widget.set_direction(Gtk.TextDirection.LTR) + self._has_receipt = False self._message_icons.set_receipt_icon_visible(False) self._message_icons.set_correction_icon_visible(True) ===================================== gajim/gtk/preview.py ===================================== @@ -137,7 +137,8 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: location = split_geo_uri(preview.uri) self._ui.file_size.set_text(_('Lat: %s Lon: %s') % ( - location.lat, location.lon)) + round(float(location.lat), 5), + round(float(location.lon), 5))) self._ui.image_button.set_tooltip_text( _('Location at Lat: %s Lon: %s') % ( location.lat, location.lon)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/eaaaf8a708d88f6e7a97cadba09f75d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/eaaaf8a708d88f6e7a97cadba09f75d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: MUC: Relax definition of MUC config change
by Philipp Hörist (＠lovetox) 05 Oct '22

05 Oct '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 10c32003 by Philipp Hörist at 2022-10-05T15:26:55+02:00 fix: MUC: Relax definition of MUC config change - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -1057,7 +1057,7 @@ class MessageProperties: @property def is_muc_config_change(self) -> bool: - return self.body is None and bool(self.muc_status_codes) + return bool(self.muc_status_codes) @property def is_muc_pm(self) -> bool: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/10c32003f035214bfddd8525… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/10c32003f035214bfddd8525… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Preview: Limit displayed geo:-URI precision
by Daniel Brötzmann (＠wurstsalat) 05 Oct '22

05 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 758948cb by wurstsalat at 2022-10-05T14:41:53+02:00 cfix: Preview: Limit displayed geo:-URI precision - - - - - 1 changed file: - gajim/gtk/preview.py Changes: ===================================== gajim/gtk/preview.py ===================================== @@ -137,7 +137,8 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: location = split_geo_uri(preview.uri) self._ui.file_size.set_text(_('Lat: %s Lon: %s') % ( - location.lat, location.lon)) + round(float(location.lat), 5), + round(float(location.lon), 5))) self._ui.image_button.set_tooltip_text( _('Location at Lat: %s Lon: %s') % ( location.lat, location.lon)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/758948cb15589348c5ee7d90ce280590… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/758948cb15589348c5ee7d90ce280590… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: AvatarSelector: Add border to mark drag and drop zone
by Daniel Brötzmann (＠wurstsalat) 04 Oct '22

04 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d72d04fc by wurstsalat at 2022-10-04T11:39:21+02:00 imprv: AvatarSelector: Add border to mark drag and drop zone - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/avatar_selector.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -158,6 +158,12 @@ .preview-button { .link-button { min-height: 0px; } +.avatar-selector { + border: 2px dotted @theme_selected_bg_color; + border-radius: 12px; + padding: 18px; +} + /* Main Window */ .mainwindow-grid { background: @theme_base_color; ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -69,7 +69,7 @@ class AvatarSelector(Gtk.Box): def __init__(self) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) - self.get_style_context().add_class('padding-18') + self.get_style_context().add_class('avatar-selector') uri_entry = Gtk.TargetEntry.new( 'text/uri-list', Gtk.TargetFlags.OTHER_APP, 80) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d72d04fc595f5ec0aaec9b238839eb1c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d72d04fc595f5ec0aaec9b238839eb1c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: PEPConfig: Make Delete button translatable
by Daniel Brötzmann (＠wurstsalat) 04 Oct '22

04 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1adc22ec by Daniel Brötzmann at 2022-10-04T08:53:14+00:00 cfix: PEPConfig: Make Delete button translatable - - - - - 1 changed file: - gajim/data/gui/pep_config.ui Changes: ===================================== gajim/data/gui/pep_config.ui ===================================== @@ -61,7 +61,7 @@ </child> <child> <object class="GtkButton" id="delete_button"> - <property name="label">_Delete</property> + <property name="label" translatable="yes">_Delete</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can-focus">True</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1adc22ec1fa0be7a51cbe5deafc6ea46… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1adc22ec1fa0be7a51cbe5deafc6ea46… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch i18n-bidi
by Daniel Brötzmann (＠wurstsalat) 03 Oct '22

03 Oct '22

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

1 0

[Git][gajim/gajim][master] 2 commits: refactor: ChatListRow: Move active check into ChatList
by Philipp Hörist (＠lovetox) 03 Oct '22

03 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 172cf0d9 by Philipp Hörist at 2022-10-03T22:17:55+02:00 refactor: ChatListRow: Move active check into ChatList - - - - - 1ad0cafb by Philipp Hörist at 2022-10-03T22:17:55+02:00 refactor: Remove unused code - - - - - 4 changed files: - gajim/common/i18n.py - gajim/gajim.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_row.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -32,7 +32,6 @@ from gi.repository import GLib DOMAIN = 'gajim' -direction_mark = '\u200E' _translation = gettext.NullTranslations() @@ -108,15 +107,6 @@ def get_short_lang_code(lang: Optional[str] = None) -> str: return lang[:2] -def initialize_direction_mark() -> None: - from gi.repository import Gtk - - global direction_mark # pylint: disable=global-statement - - if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL: - direction_mark = '\u200F' - - def paragraph_direction_mark(text: str) -> str: ''' Determine paragraph writing direction according to ===================================== gajim/gajim.py ===================================== @@ -28,7 +28,6 @@ from packaging.version import Version as V import gajim.gui -from gajim.common import i18n _MIN_NBXMPP_VER = '3.2.2' @@ -120,8 +119,6 @@ def _init_gtk() -> None: from gajim.gui import exception exception.init() - i18n.initialize_direction_mark() - def _run_app() -> None: from gajim.gui.application import GajimApplication ===================================== gajim/gtk/chat_list.py ===================================== @@ -544,6 +544,12 @@ def _add_unread(row: ChatListRow, event: MessageEventT) -> None: row.reset_unread() return + control = app.window.get_control() + if (app.window.is_active() and + row.is_selected() and + control.get_autoscroll()): + return + row.add_unread(event.msgtxt) def _on_message_received(self, event: MessageEventT) -> None: ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -191,11 +191,6 @@ def __init__(self, def is_pinned(self) -> bool: return self._pinned - @property - def is_active(self) -> bool: - return (self.is_selected() and - self.get_toplevel().get_property('is-active')) - @property def unread_count(self) -> int: if (self.contact.is_groupchat and not self.contact.can_notify() and @@ -309,12 +304,6 @@ def update_time(self) -> None: get_uf_relative_time(self.timestamp)) def add_unread(self, text: str) -> None: - control = app.window.get_control() - if (self.is_active and - control.is_loaded(self.account, self.jid) and - control.get_autoscroll()): - return - self._unread_count += 1 self._update_unread() app.storage.cache.set_unread_count( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4f57adce1666a1599b420c02ce87eb4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4f57adce1666a1599b420c02ce87eb4… 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