Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: ci: Fix project id in release script
by Philipp Hörist (＠lovetox) 14 Jan '23

14 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: f5c36b36 by Philipp Hörist at 2023-01-14T15:15:55+01:00 ci: Fix project id in release script - - - - - b79a219d by Philipp Hörist at 2023-01-14T15:17:09+01:00 ci: Execute release in a separate step So that if it fails the website publishing does not fail - - - - - 2 changed files: - .ci/make_release.py - .gitlab-ci.yml Changes: ===================================== .ci/make_release.py ===================================== @@ -13,7 +13,7 @@ GITLAB_INSTANCE_URL = 'https://dev.gajim.org' -PROJECT_ID = 31 +PROJECT_ID = 30 def adjust_milestones(project: Project, version: str) -> None: ===================================== .gitlab-ci.yml ===================================== @@ -146,7 +146,7 @@ deploy-flatpak: - git commit -m "$CI_COMMIT_TAG" - git push -publish-release: +publish-website: image: git-deploy:latest stage: publish dependencies: [] @@ -156,7 +156,6 @@ publish-release: - eval $(ssh-agent -s) - .ci/prepare_git.sh dev.gajim.org "${WEBSITE_DEPLOY_KEY}" script: - - .ci/make_release.py $CI_COMMIT_TAG "${PROJECT_TOKEN}" - git clone git@dev.gajim.org:gajim/website.git - cd website - git checkout master @@ -165,3 +164,12 @@ publish-release: - git add -u - git commit -m "Release Gajim $CI_COMMIT_TAG" - git push + +publish-release: + image: git-deploy:latest + stage: publish + dependencies: [] + rules: + - if: '$CI_COMMIT_TAG' + script: + - .ci/make_release.py $CI_COMMIT_TAG "${PROJECT_TOKEN}" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/64ee81ce6afaadeeb0feb6b5336058b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/64ee81ce6afaadeeb0feb6b5336058b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag 1.6.1
by Philipp Hörist (＠lovetox) 14 Jan '23

14 Jan '23

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

1 0

[Git][gajim/gajim][master] 5 commits: chore: Update translations
by Philipp Hörist (＠lovetox) 14 Jan '23

14 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: f4eeb3bb by Weblate at 2023-01-14T11:20:50+01:00 chore: Update translations - - - - - 20d0491c by Philipp Hörist at 2023-01-14T11:22:18+01:00 chore: Update IANA data - - - - - ddb4666e by Philipp Hörist at 2023-01-14T11:52:46+01:00 change: Raise required nbxmpp version - - - - - 321b3f36 by Philipp Hörist at 2023-01-14T11:52:53+01:00 ci: Update flatpak dependencies - - - - - 64ee81ce by Philipp Hörist at 2023-01-14T11:53:43+01:00 release: 1.6.1 - - - - - 30 changed files: - ChangeLog - README.md - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - gajim/common/iana.py - gajim/gajim.py - 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 The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e586d477082be2a6f21c16ef2d3733b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e586d477082be2a6f21c16ef2d3733b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: AdHocCommands: Refresh commands list after completing command
by Philipp Hörist (＠lovetox) 13 Jan '23

13 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: e586d477 by wurstsalat at 2023-01-13T22:59:13+00:00 imprv: AdHocCommands: Refresh commands list after completing command Fixes #11356 - - - - - 1 changed file: - gajim/gtk/adhoc.py Changes: ===================================== gajim/gtk/adhoc.py ===================================== @@ -134,7 +134,8 @@ def _on_button_clicked(self, button_name: str ) -> None: if button_name == 'commands': - self.show_page('commands') + self._client.get_module('AdHocCommands').request_command_list( + self.jid, callback=self._received_command_list) elif button_name == 'execute': self._on_execute() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e586d477082be2a6f21c16ef2d3733b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e586d477082be2a6f21c16ef2d3733b6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Limit message length and add FullMessageWindow
by Philipp Hörist (＠lovetox) 13 Jan '23

13 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0b1d7c02 by Daniel Brötzmann at 2023-01-13T22:54:14+00:00 imprv: Limit message length and add FullMessageWindow - - - - - 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/0b1d7c028ba21c626393c28b3ff2dde4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0b1d7c028ba21c626393c28b3ff2dde4… You're receiving this email because of your account on dev.gajim.org.

1 0

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

13 Jan '23

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

1 0

[Git][gajim/gajim][limit-message-length] 16 commits: fix: AudioPreview: Always format progress time as LTR
by Philipp Hörist (＠lovetox) 13 Jan '23

13 Jan '23

Philipp Hörist pushed to branch limit-message-length at gajim / gajim Commits: 6ea7bbe2 by mesonium at 2023-01-08T22:28:20+00:00 fix: AudioPreview: Always format progress time as LTR - - - - - d309712b by mesonium at 2023-01-08T22:55:03+00:00 fix: Audio Visualizer: Port deprecated methods - - - - - 65f27b1b by wurstsalat at 2023-01-11T17:55:07+01:00 imprv: AccountPage: Add menu item to deny all subscription requests Fixes #11367 - - - - - a2476a3c by Philipp Hörist at 2023-01-12T18:14:07+01:00 fix: Preview: Handle exceptions while decrypting - - - - - 8f901abc by mesonium at 2023-01-12T17:22:38+00:00 fix: AudioPreview: Make visualization fully RTL compatible again and ensure graph is always drawn - - - - - e57c3b87 by wurstsalat at 2023-01-12T19:03:19+01:00 fix: ChatStack DnD: Add workaround for mis-fired drag-motion signal Fixes #11226 - - - - - 574e312e by wurstsalat at 2023-01-12T20:06:12+01:00 imprv: UX: Make more text labels selectable/enable can-focus for copying Fixes #11336 - - - - - cf79eb93 by mesonium at 2023-01-13T08:46:55+00:00 fix: Audio Preview: Sync clock to make short files play properly on Win - - - - - e39dba6b by wurstsalat at 2023-01-13T13:48:30+01:00 fix: AvatarChooser: Fix file filter for Windows This was introduced in 16cd4ebdb69903024d54a46ee9e648e835875fdc but doesn't work on Windows - - - - - c3b0257a by wurstsalat at 2023-01-13T14:02:27+01:00 fix: Profile: Fix setting avatar This was accidentally introduced in fc4a56e2c1929866eb618ed5ba34b9891dc23ab6 Fixes #11371 - - - - - d54ec587 by wurstsalat at 2023-01-13T14:10:22+01:00 fix: Don't fail in mark_as_unread if there are no messages This can happen if chat history is not stored (user setting) Fixes #11360 - - - - - b40d9f04 by wurstsalat at 2023-01-13T15:07:20+01:00 fix: ServiceDiscoveryWindow: Fix jumping when resizing window Fixes #11239 - - - - - 0b2822a5 by wurstsalat at 2023-01-13T16:31:42+01:00 fix: Notifications: Fix rare case where Gajim displays notifications for our own messages Fixes #11305 - - - - - 304e9a98 by wurstsalat at 2023-01-13T22:11:17+00:00 imprv: CreateGroupchatWindow: Add Advanced switch and always show address entry Fixes #11310 - - - - - 74bd02d0 by Bronko at 2023-01-13T22:49:05+00:00 imprv: ChatList: Improve timedelta function - - - - - 7cef305f by wurstsalat at 2023-01-13T22:52:43+00:00 imprv: Limit message length and add FullMessageWindow Fixes #11123 - - - - - 30 changed files: - .gitignore - gajim/common/helpers.py - gajim/common/preview.py - gajim/data/gui/account_page.ui - gajim/data/gui/chat_banner.ui - gajim/data/gui/contact_info.ui - gajim/data/gui/file_transfer_jingle.ui - gajim/data/gui/groupchat_creation.ui - gajim/data/gui/groupchat_info_scrolled.ui - gajim/data/gui/preview.ui - gajim/data/gui/server_info.ui - gajim/data/gui/service_discovery_window.ui - gajim/data/style/gajim.css - gajim/gtk/account_page.py - gajim/gtk/builder.pyi - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/conversation/rows/muc_subject.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/filechoosers.py - gajim/gtk/groupchat_creation.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/message_input.py - gajim/gtk/notification_manager.py - gajim/gtk/preview.py - gajim/gtk/preview_audio.py - gajim/gtk/preview_audio_visualizer.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b00a6d33293f10832e94c60b36b721f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b00a6d33293f10832e94c60b36b721f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ChatList: Improve timedelta function
by Philipp Hörist (＠lovetox) 13 Jan '23

13 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 74bd02d0 by Bronko at 2023-01-13T22:49:05+00:00 imprv: ChatList: Improve timedelta function - - - - - 3 changed files: - .gitignore - gajim/common/helpers.py - + test/common/test_get_uf_relative_time.py Changes: ===================================== .gitignore ===================================== @@ -33,3 +33,4 @@ node_modules/ .vscode *.sublime-project *.sublime-workspace +.idea ===================================== gajim/common/helpers.py ===================================== @@ -248,29 +248,36 @@ def get_uf_affiliation(affiliation: Union[Affiliation, str], return '' -def get_uf_relative_time(timestamp: float) -> str: +def get_uf_relative_time(timestamp: float, + timenow: Optional[float] = None) -> str: date_time = datetime.fromtimestamp(timestamp) - now = datetime.now() + if timenow: # used by unittest + now = datetime.fromtimestamp(timenow) + else: + now = datetime.now() timespan = now - date_time - if timespan > timedelta(days=365): - return str(date_time.year) - if timespan > timedelta(days=7): - return date_time.strftime('%b %d') - if timespan > timedelta(days=2): - return date_time.strftime('%a') - if date_time.strftime('%d') != now.strftime('%d'): - return _('Yesterday') - if timespan > timedelta(minutes=15): - return date_time.strftime('%H:%M') - if timespan > timedelta(minutes=1): + if timespan < timedelta(minutes=1): + return _('Just now') + if timespan < timedelta(minutes=15): minutes = int(timespan.seconds / 60) return ngettext('%i min ago', '%i mins ago', minutes, minutes, minutes) - return _('Just now') + today = now.date() + if date_time.date() == today: + format_string = app.settings.get('time_format') + return date_time.strftime(format_string) + yesterday = now.date() - timedelta(days=1) + if date_time.date() == yesterday: + return _('Yesterday') + if timespan < timedelta(days=7): # this week + return date_time.strftime('%a') # weekday + if timespan < timedelta(days=365): # this year + return date_time.strftime('%b %d') + return str(date_time.year) def to_one_line(msg: str) -> str: ===================================== test/common/test_get_uf_relative_time.py ===================================== @@ -0,0 +1,89 @@ + +import unittest +from datetime import datetime +from datetime import timedelta +from datetime import timezone + +from gajim.common import app +from gajim.common.helpers import get_uf_relative_time +from gajim.common.settings import Settings + +app.settings = Settings(in_memory=True) + + +class GetRelativeTimeTest(unittest.TestCase): + '''Tests for the get_uf_relative_time function.''' + + def test_sub_1_minute(self): + '''Test timedelta less than 1 minute''' + timenow = datetime(2023, 1, 2, 3, 4, 0, tzinfo=timezone.utc) + timestamp1 = timenow - timedelta(seconds=30) + self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), + timenow.timestamp()), 'Just now') + + def test_sub_15_minutes(self): + '''Test timedelta less than 15 minutes and more than 1 minute ago''' + timenow = datetime(2023, 1, 2, 3, 4, 0, tzinfo=timezone.utc) + timestamp1 = timenow - timedelta(minutes=3) + self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), + timenow.timestamp()), + '3 mins ago') + + def test_sub_15_minutes_next_day(self): + '''Test timedelta less than 15 minutes and it is the next day''' + timenow = datetime(2023, 1, 1, 0, 5, 0, tzinfo=timezone.utc) + timestamp1 = timenow - timedelta(minutes=10) + self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), + timenow.timestamp()), + '10 mins ago') + + def test_today(self): + '''Test today: same day and more than 15 minutes ago''' + timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=timezone.utc) + timestamp1 = timenow - timedelta(hours=4) + self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), + timenow.timestamp()), + timestamp1.strftime(app.settings.get('time_format'))) + + def test_yesterday_less_than_24h(self): + '''Test yesterday and less than 24h ago''' + timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=timezone.utc) + timestamp1 = datetime(2023, 1, 1, 14, 0, 0, tzinfo=timezone.utc) + self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), + timenow.timestamp()), 'Yesterday') + + def test_yesterday_more_than_24h(self): + '''Test yesterday and more than 24h ago''' + timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=timezone.utc) + timestamp1 = datetime(2023, 1, 1, 10, 0, 0, tzinfo=timezone.utc) + self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), + timenow.timestamp()), + 'Yesterday') + + def test_weekday(self): + '''Test weekday: timestamp older than yesterday and less + than 7 days ago, should return the weekday, i.e. 'Sun' for Sunday''' + timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=timezone.utc) + timestamp1 = datetime(2023, 1, 1, 4, 5, 6, tzinfo=timezone.utc) + self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), + timenow.timestamp()), + timestamp1.strftime('%a')) + + def test_month_day(self): + '''Test month_day: timestamp more than 7 days ago but less than 365''' + timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=timezone.utc) + timestamp1 = datetime(2022, 11, 15, 4, 5, 6, tzinfo=timezone.utc) + self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), + timenow.timestamp()), + timestamp1.strftime('%b %d')) + + def test_year(self): + '''Test year: timestamp more than 365 days ago''' + timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=timezone.utc) + timestamp1 = datetime(2022, 1, 1, 4, 5, 6, tzinfo=timezone.utc) + self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), + timenow.timestamp()), '2022') + + +if __name__ == '__main__': + unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/74bd02d085e2d586595e6520429d6f58… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/74bd02d085e2d586595e6520429d6f58… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: CreateGroupchatWindow: Add Advanced switch and always show address entry
by Philipp Hörist (＠lovetox) 13 Jan '23

13 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 304e9a98 by wurstsalat at 2023-01-13T22:11:17+00:00 imprv: CreateGroupchatWindow: Add Advanced switch and always show address entry Fixes #11310 - - - - - 3 changed files: - gajim/data/gui/groupchat_creation.ui - gajim/gtk/builder.pyi - gajim/gtk/groupchat_creation.py Changes: ===================================== gajim/data/gui/groupchat_creation.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkListStore" id="account_liststore"> @@ -38,7 +38,7 @@ </packing> </child> <child> -  +  <object class="GtkGrid" id="grid"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -146,117 +146,173 @@ </packing> </child> <child> - <object class="GtkEntry" id="address_entry"> + <object class="GtkSwitch" id="advanced_switch"> + <property name="visible">True</property> <property name="can-focus">True</property> - <property name="no-show-all">True</property> - <signal name="changed" handler="_on_address_entry_changed" swapped="no"/> + <property name="halign">end</property> + <property name="margin-top">12</property> + <signal name="notify::active" handler="_on_toggle_advanced" swapped="no"/> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">5</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> - <object class="GtkLabel" id="address_label"> + <object class="GtkLabel"> + <property name="visible">True</property> <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Address</property> - <property name="use-underline">True</property> - <style> - <class name="dim-label"/> - </style> + <property name="halign">start</property> + <property name="margin-top">12</property> + <property name="label" translatable="yes">Advanced Settings</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">5</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> <child> - <object class="GtkRadioButton" id="private_radio"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="margin-top">12</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - <property name="group">public_radio</property> - <signal name="toggled" handler="_on_public_private_toggled" swapped="no"/> + <object class="GtkBox" id="advanced_box"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <object class="GtkBox"> + <object class="GtkRadioButton" id="private_radio"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="margin-start">6</property> - <property name="orientation">vertical</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="margin-top">12</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + <property name="group">public_radio</property> <child> - <object class="GtkLabel"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Private</property> - <property name="use-markup">True</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - <style> - <class name="bold"/> - </style> + <property name="margin-start">6</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Private</property> + <property name="use-markup">True</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">You have to invite people so they can join</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="public_radio"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + <property name="group">private_radio</property> <child> - <object class="GtkLabel"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">You have to invite people so they can join</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> + <property name="margin-start">6</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Public</property> + <property name="use-markup">True</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Anyone can join</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="public_radio"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="draw-indicator">True</property> - <property name="group">private_radio</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-start">6</property> - <property name="orientation">vertical</property> + <property name="halign">end</property> + <property name="spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Public</property> - <property name="use-markup">True</property> - <property name="xalign">0</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Address</property> + <property name="use-underline">True</property> <style> - <class name="bold"/> + <class name="dim-label"/> </style> </object> <packing> @@ -266,16 +322,11 @@ </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkEntry" id="address_entry"> + <property name="width-request">250</property> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Anyone can join</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> + <property name="can-focus">True</property> + <signal name="changed" handler="_on_address_entry_changed" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -284,19 +335,19 @@ </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">0</property> <property name="top-attach">4</property> + <property name="width">2</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/builder.pyi ===================================== @@ -388,10 +388,11 @@ class GroupchatCreationBuilder(Builder): description_entry: Gtk.Entry account_combo: Gtk.ComboBox account_label: Gtk.Label - address_entry: Gtk.Entry - address_label: Gtk.Label + advanced_switch: Gtk.Switch + advanced_box: Gtk.Box private_radio: Gtk.RadioButton public_radio: Gtk.RadioButton + address_entry: Gtk.Entry spinner: Gtk.Spinner create_button: Gtk.Button ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any from typing import Optional from typing import Union @@ -204,9 +205,6 @@ def _set_warning_from_error_code(self, error_code: str) -> None: self._set_warning(MUC_DISCO_ERRORS[error_code]) def _on_name_entry_changed(self, entry: Gtk.Entry) -> None: - if self._ui.private_radio.get_active(): - return - name = entry.get_text() name = name.replace(' ', '-') server = self._get_muc_service_jid() @@ -229,14 +227,12 @@ def _update_entry_completion(self, entry: Gtk.Entry, text: str) -> None: server = self._get_muc_service_jid() model.append([f'{text}@{server}']) - def _on_public_private_toggled(self, _radiobutton: Gtk.RadioButton) -> None: - is_public = self._ui.public_radio.get_active() - if is_public: - self._validate_jid(self._ui.address_entry.get_text()) + def _on_toggle_advanced(self, switch: Gtk.Switch, *args: Any) -> None: + if switch.get_active(): + self._ui.advanced_box.set_no_show_all(False) + self._ui.advanced_box.show_all() else: - self._ui.create_button.set_sensitive(True) - self._ui.address_label.set_visible(is_public) - self._ui.address_entry.set_visible(is_public) + self._ui.advanced_box.hide() def _on_create_clicked(self, _button: Gtk.Button) -> None: assert self._account is not None @@ -246,9 +242,8 @@ def _on_create_clicked(self, _button: Gtk.Button) -> None: _('You have to be connected to create a group chat.')) return - if self._ui.public_radio.get_active(): - room_jid = self._ui.address_entry.get_text() - else: + room_jid = self._ui.address_entry.get_text() + if not self._ui.advanced_switch.get_active() or not room_jid: server = self._get_muc_service_jid() room_jid = f'{get_random_muc_localpart()}@{server}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/304e9a9870974da515352bd9991eade5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/304e9a9870974da515352bd9991eade5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag 4.0.1
by Philipp Hörist (＠lovetox) 13 Jan '23

13 Jan '23

Philipp Hörist pushed new tag 4.0.1 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/4.0.1 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