Commits June 2022

commits@gajim.org

1 participants
132 discussions

[Git][gajim/gajim][master] chore: Update translations
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 67e3aadd by Weblate at 2022-06-21T22:00:20+02:00 chore: Update translations - - - - - 30 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gajim.pot - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/lt.po - po/nb_NO.po - po/nl.po - po/pl.po - po/pt.po - po/pt_BR.po - po/ro.po - po/ru.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67e3aaddb833ef68b8efa271faab500a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67e3aaddb833ef68b8efa271faab500a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update release template
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1016819b by lovetox at 2022-06-21T21:59:00+02:00 chore: Update release template - - - - - 1 changed file: - .gitlab/issue_templates/Release.md Changes: ===================================== .gitlab/issue_templates/Release.md ===================================== @@ -1,12 +1,7 @@ *Release date: xx xxx xxxx* -## Things to do before release: - -* [ ] xxx - ## Build * [ ] Merge translations from Weblate -* [ ] Update `ChangeLog` * [ ] Run `./scripts/bump_version.py x.x.x` * [ ] Push release tag `x.x.x` View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1016819b2d9c2a02fc3d44e78c055961… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1016819b2d9c2a02fc3d44e78c055961… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Update git-chglog template
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e0b32d9e by lovetox at 2022-06-21T21:56:38+02:00 chore: Update git-chglog template - - - - - ebe34654 by lovetox at 2022-06-21T21:56:38+02:00 chore: Scripts: Generate changelog when using bump_version.py - - - - - 2 changed files: - .chglog/CHANGELOG.tpl.md - scripts/bump_version.py Changes: ===================================== .chglog/CHANGELOG.tpl.md ===================================== @@ -1,26 +1,11 @@ -{{ if .Versions -}} -<a name="unreleased"></a> -## [Unreleased] - -{{ if .Unreleased.CommitGroups -}} -{{ range .Unreleased.CommitGroups -}} -{{ .Title }} - -{{ range .Commits -}} - * {{if .Refs}}{{range .Refs}}#{{.Ref}} {{end}}{{end}}{{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} -{{ end }} -{{ end -}} -{{ end -}} -{{ end -}} - - {{ range .Versions }} -<a name="{{ .Tag.Name }}"></a> -## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }} +Gajim {{ .Tag.Name }} ({{ datetime "02 Jan 2006" .Tag.Date }}) + {{ range .CommitGroups -}} -{{ .Title }} +{{ if .Title }} {{ .Title }}{{end}} + {{ range .Commits -}} - * {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} +{{ if .Subject }} * {{ .Subject }}{{end}}{{if .Refs}} ({{range .Refs}}#{{.Ref}}{{end}}){{end}} {{ end }} {{ end -}} @@ -32,13 +17,7 @@ ## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - { {{ end }} {{ end -}} {{ end -}} -{{ end -}} -{{- if .Versions }} -[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD -{{ range .Versions -}} -{{ if .Tag.Previous -}} -[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }} -{{ end -}} +{{break}} + {{ end -}} -{{ end -}} \ No newline at end of file ===================================== scripts/bump_version.py ===================================== @@ -4,6 +4,7 @@ import argparse from datetime import datetime from pathlib import Path +import subprocess REPO_DIR = Path(__file__).resolve().parent.parent @@ -11,6 +12,7 @@ INIT = REPO_DIR / 'gajim' / '__init__.py' FLATPAK = REPO_DIR / 'flatpak' / 'org.gajim.Gajim.yaml' APPDATA = REPO_DIR / 'data' / 'org.gajim.Gajim.appdata.xml.in' +CHANGELOG = REPO_DIR / 'ChangeLog' VERSION_RX = r"\d+\.\d+\.\d+" @@ -61,6 +63,29 @@ def bump_appdata(new_version: str) -> None: f.write('\n') +def make_changelog(new_version: str) -> None: + + cmd = [ + 'git-chglog', + '--next-tag', + new_version + ] + + result = subprocess.run(cmd, + cwd=REPO_DIR, + text=True, + check=True, + capture_output=True) + + changes = result.stdout + changes = changes.removeprefix('\n') + + current_changelog = CHANGELOG.read_text() + + with CHANGELOG.open('w') as f: + f.write(changes + current_changelog) + + if __name__ == '__main__': parser = argparse.ArgumentParser(description='Bump Version') parser.add_argument('version', help='The new version, e.g. 1.5.0') @@ -70,3 +95,4 @@ def bump_appdata(new_version: str) -> None: bump_init(current_version, args.version) bump_flatpak(current_version, args.version) bump_appdata(args.version) + make_changelog(args.version) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ec46547c3b0efb7a94b2b16e59571e2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ec46547c3b0efb7a94b2b16e59571e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Use nickname provided in subscription requests everywhere
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ec46547c by bodqhrohro at 2022-06-21T18:53:28+00:00 fix: Use nickname provided in subscription requests everywhere The nickname is now also shown in the notification and passed to the AddContact dialog, which afterwards adds the nickname to the roster. - - - - - 1 changed file: - gajim/gtk/notification_manager.py Changes: ===================================== gajim/gtk/notification_manager.py ===================================== @@ -66,15 +66,15 @@ def _on_destroy(self, *args: Any) -> None: def _add_actions(self) -> None: actions = [ - ('subscription-accept', self._on_subscription_accept), - ('subscription-deny', self._on_subscription_deny), - ('subscription-block', self._on_subscription_block), - ('subscription-report', self._on_subscription_report), + ('subscription-accept', self._on_subscription_accept, 'as'), + ('subscription-deny', self._on_subscription_deny, 's'), + ('subscription-block', self._on_subscription_block, 's'), + ('subscription-report', self._on_subscription_report, 's'), ] for action in actions: - action_name, func = action + action_name, func, typ = action act = Gio.SimpleAction.new( - f'{action_name}-{self._account}', GLib.VariantType.new('s')) + f'{action_name}-{self._account}', GLib.VariantType.new(typ)) act.connect('activate', func) app.window.add_action(act) @@ -123,14 +123,14 @@ def _on_subscription_accept(self, _action: Gio.SimpleAction, param: GLib.Variant ) -> None: - jid = param.get_string() + jid, nickname = param.get_strv() row = self._get_notification_row(jid) self._client.get_module('Presence').subscribed(jid) jid = JID.from_string(jid) contact = self._client.get_module('Contacts').get_contact(jid) if not contact.is_in_roster: open_window('AddContact', account=self._account, - jid=jid, nick=contact.name) + jid=jid, nick=nickname or contact.name) if row is not None: row.destroy() @@ -189,9 +189,12 @@ def add_subscription_request(self, new_row.connect('destroy', self._on_row_destroy) self.add(new_row) - contact = self._client.get_module('Contacts').get_contact( - event.jid) - text = _('%s asks you to share your status') % contact.name + nick = event.user_nick + if not nick: + contact = self._client.get_module('Contacts').get_contact( + event.jid) + nick = contact.name + text = _('%s asks you to share your status') % nick app.ged.raise_event( Notification(account=self._account, @@ -330,7 +333,10 @@ def __init__(self, accept_button.set_valign(Gtk.Align.CENTER) accept_button.set_action_name( f'win.subscription-accept-{self._account}') - accept_button.set_action_target_value(GLib.Variant('s', self.jid)) + accept_button.set_action_target_value(GLib.Variant.new_strv([ + self.jid, + user_nick or '' + ])) self.grid.attach(accept_button, 3, 1, 1, 2) more_image = Gtk.Image.new_from_icon_name( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ec46547c3b0efb7a94b2b16e59571e2c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ec46547c3b0efb7a94b2b16e59571e2c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: BaseControl: Remove obsolete code
by Daniel Brötzmann (＠wurstsalat) 21 Jun '22

21 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 41096418 by wurstsalat at 2022-06-21T19:05:03+02:00 chore: BaseControl: Remove obsolete code - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -867,41 +867,6 @@ def _on_message_textview_key_press_event(self, message_buffer = self.msg_textview.get_buffer() event_state = event.get_state() - if event.keyval == Gdk.KEY_Tab: - start, end = message_buffer.get_bounds() - position = message_buffer.get_insert() - end = message_buffer.get_iter_at_mark(position) - text = message_buffer.get_text(start, end, False) - split = text.split() - if (text.startswith(self.COMMAND_PREFIX) and - not text.startswith(self.COMMAND_PREFIX * 2) and - len(split) == 1): - text = split[0] - bare = text.lstrip(self.COMMAND_PREFIX) - if len(text) == 1: - self.command_hits = [] - for command in self.list_commands(): - for name in command.names: - self.command_hits.append(name) - else: - if (self.last_key_tabs and self.command_hits and - self.command_hits[0].startswith(bare)): - self.command_hits.append(self.command_hits.pop(0)) - else: - self.command_hits = [] - for command in self.list_commands(): - for name in command.names: - if name.startswith(bare): - self.command_hits.append(name) - - if self.command_hits: - message_buffer.delete(start, end) - message_buffer.insert_at_cursor( - self.COMMAND_PREFIX + self.command_hits[0] + ' ') - self.last_key_tabs = True - return True - if not self.is_groupchat: - self.last_key_tabs = False if event.keyval == Gdk.KEY_Up: if event_state & Gdk.ModifierType.CONTROL_MASK: if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+UP View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41096418bbdc047513ea1d72c9561251… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41096418bbdc047513ea1d72c9561251… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: GroupchatOutcasts: Make removing users work
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d4e30292 by lovetox at 2022-06-21T19:03:33+02:00 fix: GroupchatOutcasts: Make removing users work - - - - - 1 changed file: - gajim/gtk/groupchat_outcasts.py Changes: ===================================== gajim/gtk/groupchat_outcasts.py ===================================== @@ -175,7 +175,7 @@ def _get_new_rows(self) -> set[OutcastRow]: reason=row[Column.REASON])) return rows - def _get_diff(self) -> list[OutcastRow]: + def _get_diff(self) -> tuple[list[OutcastRow], list[OutcastRow]]: new_rows = self._get_new_rows() @@ -192,17 +192,20 @@ def _get_diff(self) -> list[OutcastRow]: same_rows = {row for row in new_rows if row.jid in same} modified_rows = list(same_rows - self._current_rows) - return removed_rows + added_rows + modified_rows + return removed_rows, added_rows + modified_rows def _set_outcasts(self) -> None: - diff_rows = self._get_diff() + removed_rows, other_rows = self._get_diff() outcasts = {} - for row in diff_rows: + for row in other_rows: outcasts[row.jid] = {'affiliation': 'outcast'} if row.reason: outcasts[row.jid]['reason'] = row.reason + for row in removed_rows: + outcasts[row.jid] = {'affiliation': 'none'} + self._client.get_module('MUC').set_affiliation( self._contact.jid, outcasts, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4e3029221fbf7c8614cab5aa5a4ee3a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4e3029221fbf7c8614cab5aa5a4ee3a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Preferences: Add setting for emoji shortcodes
by Daniel Brötzmann (＠wurstsalat) 21 Jun '22

21 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a5d1233d by wurstsalat at 2022-06-21T18:27:53+02:00 imprv: Preferences: Add setting for emoji shortcodes - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/gtk/chat_action_processor.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -107,6 +107,7 @@ class _ACCOUNT_DEFAULT: 'use_stun_server', 'use_urgency_hint', 'video_see_self', + 'enable_emoji_shortcodes', ] IntSettings = Literal[ @@ -294,6 +295,7 @@ class _ACCOUNT_DEFAULT: 'video_see_self': True, 'video_size': '', 'workspace_order': [], + 'enable_emoji_shortcodes': True, } BoolAccountSettings = Literal[ ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -178,6 +178,9 @@ def _update_commands_menu(self, self.popdown() def _check_for_emoji(self, start_iter: Gtk.TextIter) -> bool: + if not app.settings.get('enable_emoji_shortcodes'): + return False + assert self._current_iter is not None search = self._current_iter.backward_search( ':', ===================================== gajim/gtk/preferences.py ===================================== @@ -293,7 +293,11 @@ def __init__(self, *args: Any) -> None: SettingType.CONFIG, 'show_send_message_button', callback=self._on_show_send_message_button), - + Setting(SettingKind.SWITCH, + _('Emoji Shortcodes'), + SettingType.CONFIG, + 'enable_emoji_shortcodes', + desc=_('Show suggestions for shortcodes, e.g. :+1:')), Setting(SettingKind.SWITCH, _('Show Status Changes'), SettingType.CONFIG, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a5d1233d41a671f5ece69a5e52768f95… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a5d1233d41a671f5ece69a5e52768f95… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Chat: Display corrections for /me messages correctly
by Daniel Brötzmann (＠wurstsalat) 20 Jun '22

20 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 11ff1e70 by wurstsalat at 2022-06-21T00:10:07+02:00 fix: Chat: Display corrections for /me messages correctly Fixes #10933 - - - - - 9 changed files: - gajim/common/events.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/gtk/chat_list.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/events.py ===================================== @@ -349,6 +349,7 @@ class MessageUpdated(ApplicationEvent): account: str jid: JID msgtxt: str + nickname: Optional[str] properties: Any correct_id: str ===================================== gajim/common/modules/mam.py ===================================== @@ -313,9 +313,11 @@ def _mam_message_received(self, correct_id = parse_correction(properties) if correct_id is not None: + nickname = properties.muc_nickname or properties.nickname app.ged.raise_event(MessageUpdated(account=self._account, jid=jid, msgtxt=properties.body, + nickname=nickname, properties=properties, correct_id=correct_id)) app.storage.archive.store_message_correction( ===================================== gajim/common/modules/message.py ===================================== @@ -192,9 +192,11 @@ def _message_received(self, correct_id = parse_correction(properties) if correct_id is not None: + nickname = properties.muc_nickname or properties.nickname event = MessageUpdated(account=self._account, jid=event_attr['jid'], msgtxt=msgtxt, + nickname=nickname, properties=properties, correct_id=correct_id) ===================================== gajim/gtk/chat_list.py ===================================== @@ -433,7 +433,7 @@ def _on_message_updated(self, event: events.MessageUpdated) -> None: return if event.correct_id == row.message_id: - row.set_message_text(event.msgtxt) + row.set_message_text(event.msgtxt, event.nickname) def _on_message_moderated(self, event: events.MessageModerated) -> None: row = self._chats.get((event.account, event.jid)) ===================================== gajim/gtk/controls/base.py ===================================== @@ -327,7 +327,8 @@ def process_event(self, event: events.ApplicationEvent) -> None: getattr(self, method_name)(event) def _on_message_updated(self, event: events.MessageUpdated) -> None: - self.conversation_view.correct_message(event.correct_id, event.msgtxt) + self.conversation_view.correct_message( + event.correct_id, event.msgtxt, event.nickname) def _on_message_moderated(self, event: events.MessageModerated) -> None: text = get_retraction_text( ===================================== gajim/gtk/controls/chat.py ===================================== @@ -415,7 +415,7 @@ def _on_message_sent(self, event: events.MessageSent) -> None: if event.correct_id: self.conversation_view.correct_message( - event.correct_id, event.message) + event.correct_id, event.message, self.get_our_nick()) return self.add_message(event.message, ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -60,8 +60,10 @@ def add_with_styling(self, self.add_content(result) def _add_action_phrase(self, text: str, nickname: str): + self.clear() widget = PlainWidget(self._account, self._selectable) widget.add_action_phrase(text, nickname) + widget.show_all() self.add(widget) def add_content(self, content: ContentT) -> None: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -417,9 +417,9 @@ def set_retracted(self, text: str) -> None: self._message_widget.add_with_styling(text) self.get_style_context().add_class('retracted-message') - def set_correction(self, text: str) -> None: + def set_correction(self, text: str, nickname: Optional[str]) -> None: if not isinstance(self._message_widget, PreviewWidget): - self._message_widget.add_with_styling(text) + self._message_widget.add_with_styling(text, nickname) self._has_receipt = False self._message_icons.set_receipt_icon_visible(False) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -487,10 +487,14 @@ def scroll_to_end(self, force: bool = False) -> None: if self.autoscroll or force: GLib.idle_add(self.emit, 'scroll-to-end') - def correct_message(self, correct_id: str, text: str) -> None: + def correct_message(self, + correct_id: str, + text: str, + nickname: Optional[str] + ) -> None: message_row = self._get_row_by_message_id(correct_id) if message_row is not None: - message_row.set_correction(text) + message_row.set_correction(text, nickname) message_row.set_merged(False) def show_message_retraction(self, stanza_id: str, text: str) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11ff1e707f34e5c7a0f892569495c294… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11ff1e707f34e5c7a0f892569495c294… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Styling: Process URIs when using /me command
by Philipp Hörist (＠lovetox) 20 Jun '22

20 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5462da5a by lovetox at 2022-06-20T23:08:05+02:00 fix: Styling: Process URIs when using /me command Fixes #10988 - - - - - 2 changed files: - gajim/common/styling.py - gajim/gtk/conversation/plain_widget.py Changes: ===================================== gajim/common/styling.py ===================================== @@ -219,6 +219,21 @@ def process(text: Union[str, bytes], level: int = 0) -> ParsingResult: return ParsingResult(text, blocks) +def process_uris(text: Union[str, bytes]) -> list[BaseUri]: + if isinstance(text, bytes): + text = text.decode() + + uris: list[BaseUri] = [] + offset = 0 + offset_bytes = 0 + for line in text.splitlines(keepends=True): + uris += _parse_uris(line, offset, offset_bytes) + offset += len(line) + offset_bytes += len(line.encode()) + + return uris + + def _parse_blocks(text: str, level: int) -> list[Block]: blocks: list[Block] = [] text_len = len(text) ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -31,7 +31,9 @@ from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri from gajim.common.structs import URI +from gajim.common.styling import BaseUri from gajim.common.styling import PlainBlock +from gajim.common.styling import process_uris from ..menus import get_conv_action_context_menu from ..menus import get_conv_uri_context_menu @@ -70,9 +72,7 @@ def add_content(self, block: PlainBlock) -> None: self._text_widget.print_text_with_styling(block) def add_action_phrase(self, text: str, nickname: str) -> None: - text = text.replace('/me', f'* {nickname}', 1) - text = GLib.markup_escape_text(text) - self._text_widget.add_action_phrase(text) + self._text_widget.add_action_phrase(text, nickname) class MessageLabel(Gtk.Label): @@ -106,16 +106,19 @@ def _on_populate_popup(self, label: Gtk.Label, menu: Gtk.Menu) -> None: menu.prepend(action_menu_item) menu.show_all() - def print_text_with_styling(self, block: PlainBlock) -> None: - text = '' - after = GLib.markup_escape_text(block.text.strip()) - for uri in block.uris: + def _build_link_markup(self, text: str, uris: list[BaseUri]) -> str: + markup_text = '' + after = GLib.markup_escape_text(text.strip()) + for uri in uris: uri_escaped = GLib.markup_escape_text(uri.text) before, _, after = after.partition(uri_escaped) - text += before - text += uri.get_markup_string() - text += after + markup_text += before + markup_text += uri.get_markup_string() + markup_text += after + return markup_text + 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: @@ -124,7 +127,10 @@ def print_text_with_styling(self, block: PlainBlock) -> None: self.set_attributes(make_pango_attributes(block)) - def add_action_phrase(self, text: str) -> None: + def add_action_phrase(self, text: str, nickname: str) -> None: + text = text.replace('/me', f'* {nickname}', 1) + uris = process_uris(text) + text = self._build_link_markup(text, uris) self.set_markup(f'<i>{text}</i>') def _on_activate_link(self, _label: Gtk.Label, uri: str) -> int: @@ -274,10 +280,18 @@ def replace_emoji(self, buffer_.delete_mark(start_mark) buffer_.delete_mark(end_mark) - def add_action_phrase(self, text: str) -> None: + def add_action_phrase(self, text: str, nickname: str) -> None: + text = text.replace('/me', f'* {nickname}', 1) + buffer_ = self.get_buffer() buffer_.insert(buffer_.get_start_iter(), text.strip()) + uris = process_uris(text) + for uri in uris: + start_iter = buffer_.get_iter_at_offset(uri.start) + end_iter = buffer_.get_iter_at_offset(uri.end) + buffer_.apply_tag_by_name(uri.name, start_iter, end_iter) + start_iter = buffer_.get_start_iter() end_iter = buffer_.get_end_iter() buffer_.apply_tag_by_name('emphasis', start_iter, end_iter) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5462da5a803fdc87932aaaa28065ebbf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5462da5a803fdc87932aaaa28065ebbf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Align link button correctly
by Daniel Brötzmann (＠wurstsalat) 20 Jun '22

20 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 78c6711a by wurstsalat at 2022-06-20T22:51:09+02:00 fix: Preview: Align link button correctly Fixes #10997 - - - - - 1 changed file: - gajim/data/gui/preview.ui Changes: ===================================== gajim/data/gui/preview.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="preview_box"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -158,8 +158,9 @@ <child> <object class="GtkLinkButton" id="link_button"> <property name="can-focus">True</property> - <property name="receives-default">True</property> + <property name="receives-default">False</property> <property name="no-show-all">True</property> + <property name="halign">start</property> <property name="relief">none</property> </object> <packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/78c6711a2d50c91dc4717242e1333a48… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/78c6711a2d50c91dc4717242e1333a48… You're receiving this email because of your account on dev.gajim.org.

1 0

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

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 June 2022