Commits May 2022

commits@gajim.org

1 participants
193 discussions

[Git][gajim/gajim][master] imprv: Windows: Change PANGOCAIRO backend to enable colored emojis
by Philipp Hörist (＠lovetox) 31 May '22

31 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 661c13b3 by wurstsalat at 2022-05-31T15:00:06+02:00 imprv: Windows: Change PANGOCAIRO backend to enable colored emojis - - - - - 1 changed file: - gajim/gtk/application.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -208,6 +208,11 @@ def _get_remaining_entry(): return [option] def _startup(self, _application: GajimApplication) -> None: + if sys.platform == 'win32': + # Changing the PANGOCAIRO_BACKEND is necessary on Windows + # to render colored emoji glyphs + os.environ['PANGOCAIRO_BACKEND'] = 'fontconfig' + self._init_core() icon_theme = Gtk.IconTheme.get_default() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/661c13b3051334bf216c6e50abf121a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/661c13b3051334bf216c6e50abf121a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: AccountsWindow: Point out the window's class
by Daniel Brötzmann (＠wurstsalat) 31 May '22

31 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 75f5c13b by wurstsalat at 2022-05-31T12:22:00+02:00 fix: AccountsWindow: Point out the window's class - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -565,8 +565,7 @@ def _disable() -> None: if (account in app.connections and not app.connections[account].state.is_disconnected): # Connecting or connected - window = get_app_window('AccountsWindow') - assert window is not None + window = cast(AccountsWindow, get_app_window('AccountsWindow')) ConfirmationDialog( _('Disable Account'), _('Account %s is still connected') % account, @@ -707,8 +706,7 @@ def __init__(self, account: str) -> None: GenericSettingPage.__init__(self, account, settings) def _on_account_name_change(self, *args: Any) -> None: - window = get_app_window('AccountsWindow') - assert window is not None + window = cast(AccountsWindow, get_app_window('AccountsWindow')) window.update_account_label(self.account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75f5c13bf6b4b64e71aea0cd3c7bb0c6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75f5c13bf6b4b64e71aea0cd3c7bb0c6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: AccountsWindow: Use get_app_window to reliably access window's methods
by Daniel Brötzmann (＠wurstsalat) 31 May '22

31 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f9be8b99 by wurstsalat at 2022-05-31T12:05:27+02:00 fix: AccountsWindow: Use get_app_window to reliably access window's methods Fixes #10911 - - - - - 19a55d54 by wurstsalat at 2022-05-31T12:11:22+02:00 fix: ContactInfo: Fix copying name and JID by Ctrl+C - - - - - 2 changed files: - gajim/data/gui/contact_info.ui - gajim/gtk/accounts.py Changes: ===================================== gajim/data/gui/contact_info.ui ===================================== @@ -302,7 +302,6 @@ <child> <object class="GtkLabel" id="contact_name_label"> <property name="visible">True</property> - <property name="can-focus">False</property> <property name="halign">center</property> <property name="ellipsize">end</property> <property name="single-line-mode">True</property> @@ -320,7 +319,6 @@ <child> <object class="GtkLabel" id="contact_jid_label"> <property name="visible">True</property> - <property name="can-focus">False</property> <property name="margin-bottom">6</property> <property name="selectable">True</property> <property name="ellipsize">end</property> ===================================== gajim/gtk/accounts.py ===================================== @@ -44,6 +44,7 @@ from .settings import SettingsDialog from .settings import SettingsBox from .settings import PopoverSetting +from .util import get_app_window from .util import open_window log = logging.getLogger('gajim.gui.accounts') @@ -564,7 +565,8 @@ def _disable() -> None: if (account in app.connections and not app.connections[account].state.is_disconnected): # Connecting or connected - window = cast(Gtk.Window, self.get_toplevel()) + window = get_app_window('AccountsWindow') + assert window is not None ConfirmationDialog( _('Disable Account'), _('Account %s is still connected') % account, @@ -705,7 +707,8 @@ def __init__(self, account: str) -> None: GenericSettingPage.__init__(self, account, settings) def _on_account_name_change(self, *args: Any) -> None: - window = cast(AccountsWindow, self.get_toplevel()) + window = get_app_window('AccountsWindow') + assert window is not None window.update_account_label(self.account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/41d6387ce32399889f6760c06444eb2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/41d6387ce32399889f6760c06444eb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Update gitlab-ci.yml
by Philipp Hörist (＠lovetox) 31 May '22

31 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 41d6387c by lovetox at 2022-05-31T07:36:20+02:00 ci: Update gitlab-ci.yml - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,4 +1,4 @@ -image: ci-gajim:master +image: gajim-master:latest workflow: rules: @@ -57,13 +57,14 @@ test-unittest: interruptible: true build-linux: + image: gajim-deb-build:latest stage: build rules: - if: '$GAJIM_NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' script: - python3 setup.py sdist - # - python3 .ci/debian_build.py "$(find dist/gajim-*)" 1 + - python3 .ci/debian_build.py "$(find dist/gajim-*)" 1 artifacts: name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" @@ -111,6 +112,7 @@ deploy-linux: # - python3 .ci/deploy.py build deploy-flatpak: + image: git-deploy:latest stage: deploy needs: [] rules: @@ -131,6 +133,7 @@ deploy-flatpak: # - git push publish-release: + image: git-deploy:latest stage: publish needs: ['deploy-linux', build-and-deploy-windows] rules: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41d6387ce32399889f6760c06444eb24… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41d6387ce32399889f6760c06444eb24… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: AppPage: Show plugin update notifications
by Daniel Brötzmann (＠wurstsalat) 30 May '22

30 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 87125039 by wurstsalat at 2022-05-30T23:01:16+02:00 imprv: AppPage: Show plugin update notifications - - - - - ec03469c by wurstsalat at 2022-05-30T23:07:22+02:00 fix: StartChat: Allow transport JIDs without successful discovery Fixes #10924 - - - - - 6 changed files: - gajim/data/gui/app_page.ui - gajim/data/style/gajim.css - gajim/gtk/app_page.py - gajim/gtk/builder.pyi - gajim/gtk/main.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/data/gui/app_page.ui ===================================== @@ -13,7 +13,7 @@ <property name="receives-default">True</property> <property name="tooltip-text" translatable="yes">Dismiss</property> <property name="valign">center</property> - <signal name="clicked" handler="_on_dismiss_update_clicked" swapped="no"/> + <signal name="clicked" handler="_on_dismiss_clicked" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> @@ -31,7 +31,7 @@ </child> <child> <object class="GtkButton"> - <property name="label" translatable="yes">Website</property> + <property name="label" translatable="yes">Download</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> @@ -54,6 +54,7 @@ <property name="can-focus">False</property> <property name="valign">center</property> <property name="orientation">vertical</property> + <property name="spacing">3</property> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -79,7 +80,7 @@ <property name="can-focus">False</property> <property name="halign">start</property> <property name="ellipsize">end</property> - <property name="max-width-chars">30</property> + <property name="max-width-chars">40</property> <property name="xalign">0</property> <style> <class name="dim-label"/> @@ -99,7 +100,7 @@ </packing> </child> <style> - <class name="padding-6"/> + <class name="padding-12"/> </style> </object> <object class="GtkBox" id="gajim_update_check"> @@ -131,12 +132,12 @@ </child> <child> <object class="GtkButton"> - <property name="label" translatable="yes">Yes</property> + <property name="label" translatable="yes">Activate</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="valign">center</property> - <signal name="clicked" handler="_on_check_clicked" swapped="no"/> + <signal name="clicked" handler="_on_activate_check_clicked" swapped="no"/> <style> <class name="suggested-action"/> </style> @@ -154,6 +155,7 @@ <property name="can-focus">False</property> <property name="valign">center</property> <property name="orientation">vertical</property> + <property name="spacing">3</property> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -180,8 +182,91 @@ <property name="halign">start</property> <property name="label" translatable="yes">Search for Gajim updates periodically?</property> <property name="ellipsize">end</property> + <property name="max-width-chars">40</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">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="padding-12"/> + </style> + </object> + <object class="GtkBox" id="plugin_updates"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Dismiss</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_dismiss_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">window-close-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> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">3</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">Plugin Updates</property> + <property name="ellipsize">end</property> <property name="max-width-chars">30</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">There are updates for Gajim’s plugins</property> + <property name="ellipsize">end</property> + <property name="max-width-chars">40</property> + <property name="xalign">0</property> <style> <class name="dim-label"/> </style> @@ -192,15 +277,168 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="auto_update_plugins"> + <property name="label" translatable="yes">Update plugins automatically</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Open Plugins…</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_open_plugins" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">system-software-install-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">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Update</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_update_plugins_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="padding-12"/> + </style> + </object> + <object class="GtkBox" id="plugin_updates_finished"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">3</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">Plugins Updated Successfully</property> + <property name="ellipsize">end</property> + <property name="max-width-chars">30</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">Updates will be installed next time Gajim is started</property> + <property name="ellipsize">end</property> + <property name="max-width-chars">40</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> + <child> + <object class="GtkCheckButton" id="notify_after_plugin_updates"> + <property name="label" translatable="yes">Don’t show this again</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Dismiss</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_dismiss_update_notification" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">window-close-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">2</property> </packing> </child> <style> - <class name="padding-6"/> + <class name="padding-12"/> </style> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -753,6 +753,7 @@ .margin-3 { margin: 3px; } .margin-12 { margin: 12px; } .margin-18 { margin: 18px; } .padding-6 { margin: 6px; } +.padding-12 { margin: 12px; } .padding-18 { margin: 18px; } .padding-left30 { padding-left: 30px; } ===================================== gajim/gtk/app_page.py ===================================== @@ -24,6 +24,7 @@ from gajim.common.events import ApplicationEvent from gajim.common.helpers import open_uri from gajim.common.i18n import _ +from gajim.plugins.pluginmanager import PluginManifest from .status_message_selector import StatusMessageSelector from .status_selector import StatusSelector @@ -71,9 +72,18 @@ def __init__(self) -> None: self.show_all() - def add_app_message(self, category: str, message: Optional[str]) -> None: + def add_app_message(self, + category: str, + message: Optional[str] + ) -> None: self._app_message_listbox.add_app_message(category, message) + self._unread_count += 1 + self.emit('unread-count-changed', self._unread_count) + def add_plugin_update_message(self, + manifests: list[PluginManifest] + ) -> None: + self._app_message_listbox.add_plugin_update_message(manifests) self._unread_count += 1 self.emit('unread-count-changed', self._unread_count) @@ -104,6 +114,12 @@ def add_app_message(self, category: str, message: Optional[str]) -> None: row = AppMessageRow(category, message) self.add(row) + def add_plugin_update_message(self, + manifests: list[PluginManifest] + ) -> None: + row = AppMessageRow('plugin-updates', plugin_manifests=manifests) + self.add(row) + def remove_app_message(self, row: Gtk.ListBoxRow) -> None: self.remove(row) app_page = cast(AppPage, self.get_parent()) @@ -111,8 +127,14 @@ def remove_app_message(self, row: Gtk.ListBoxRow) -> None: class AppMessageRow(Gtk.ListBoxRow): - def __init__(self, category: str, message: Optional[str] = None) -> None: + def __init__(self, + category: str, + message: Optional[str] = None, + plugin_manifests: Optional[list[PluginManifest]] = None + ) -> None: Gtk.ListBoxRow.__init__(self) + self._plugin_manifests = plugin_manifests + self._ui = get_builder('app_page.ui') if category == 'allow-gajim-update-check': @@ -123,24 +145,46 @@ def __init__(self, category: str, message: Optional[str] = None) -> None: text = _('Version %s is available') % message self._ui.update_message.set_text(text) + if category == 'plugin-updates': + self.add(self._ui.plugin_updates) + + if category == 'plugin-updates-finished': + self.add(self._ui.plugin_updates_finished) + self._ui.connect_signals(self) self.show_all() - def _on_check_clicked(self, _button: Gtk.Button) -> None: - app.app.check_for_gajim_updates() + def _remove_app_message(self) -> None: list_box = cast(AppMessageListBox, self.get_parent()) list_box.remove_app_message(self) + def _on_activate_check_clicked(self, _button: Gtk.Button) -> None: + app.app.check_for_gajim_updates() + self._remove_app_message() + def _on_dismiss_check_clicked(self, _button: Gtk.Button) -> None: app.settings.set('check_for_update', False) - list_box = cast(AppMessageListBox, self.get_parent()) - list_box.remove_app_message(self) + self._remove_app_message() def _on_visit_website_clicked(self, _button: Gtk.Button) -> None: open_uri('https://gajim.org/download') - list_box = cast(AppMessageListBox, self.get_parent()) - list_box.remove_app_message(self) - - def _on_dismiss_update_clicked(self, _button: Gtk.Button) -> None: - list_box = cast(AppMessageListBox, self.get_parent()) - list_box.remove_app_message(self) + self._remove_app_message() + + def _on_dismiss_clicked(self, _button: Gtk.Button) -> None: + self._remove_app_message() + + def _on_update_plugins_clicked(self, _button: Gtk.Button) -> None: + if self._ui.auto_update_plugins.get_active(): + app.settings.set('plugins_auto_update', True) + assert self._plugin_manifests is not None + app.plugin_repository.download_plugins(self._plugin_manifests) + self._remove_app_message() + + def _on_dismiss_update_notification(self, _button: Gtk.Button) -> None: + if self._ui.notify_after_plugin_updates.get_active(): + app.settings.set('plugins_notify_after_update', False) + self._remove_app_message() + + def _on_open_plugins(self, _button: Gtk.Button) -> None: + app.app.activate_action('plugins', None) + self._remove_app_message() ===================================== gajim/gtk/builder.pyi ===================================== @@ -101,6 +101,10 @@ class AppPageBuilder(Builder): gajim_update: Gtk.Box update_message: Gtk.Label gajim_update_check: Gtk.Box + plugin_updates: Gtk.Box + auto_update_plugins: Gtk.CheckButton + plugin_updates_finished: Gtk.Box + notify_after_plugin_updates: Gtk.CheckButton class ApplicationMenuBuilder(Builder): ===================================== gajim/gtk/main.py ===================================== @@ -897,39 +897,9 @@ def _on_plugin_updates_available(self, _repository: PluginRepository, _signal_name: str, manifests: list[PluginManifest]) -> None: - - def _open_update(is_checked: bool): - if is_checked: - app.settings.set('plugins_auto_update', True) - app.plugin_repository.download_plugins(manifests) - - plugins_str = '\n' - plugins_str += '\n'.join([manifest.name for manifest in manifests]) - ConfirmationCheckDialog( - _('Plugin Updates'), - _('Plugin Updates Available'), - _('There are updates for your plugins:\n' - '<b>%s</b>') % plugins_str, - _('Update plugins automatically next time'), - [DialogButton.make('Cancel'), - DialogButton.make('Accept', - text=_('_Update'), - is_default=True, - callback=_open_update)]).show() + self._app_page.add_plugin_update_message(manifests) def _on_plugin_auto_update_finished(self, _repository: PluginRepository, _signal_name: str) -> None: - - def _on_ok(is_checked: bool) -> None: - if is_checked: - app.settings.set('plugins_notify_after_update', False) - - ConfirmationCheckDialog( - _('Plugins Updated'), - _('Plugins Updated'), - _('Plugin updates have successfully been downloaded.\n' - 'Updates will be installed next time Gajim is started.'), - _('Do not show this message again'), - [DialogButton.make('OK', - callback=_on_ok)]).show() + self.add_app_message('plugin-updates-finished') ===================================== gajim/gtk/start_chat.py ===================================== @@ -391,7 +391,8 @@ def _disco_info_received(self, task: Task) -> None: except StanzaError as error: contact_conditions = [ 'service-unavailable', # Prosody - 'subscription-required' # ejabberd + 'subscription-required', # ejabberd + 'feature-not-implemented' # transports/bridges ] if error.condition in contact_conditions: # These error conditions are the result of View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e157bf9f866bc38c2a5f5914fe7eacd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e157bf9f866bc38c2a5f5914fe7eacd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: chore: Update .gitignore
by Philipp Hörist (＠lovetox) 30 May '22

30 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a46c97cf by lovetox at 2022-05-30T22:47:44+02:00 chore: Update .gitignore - - - - - f93e4388 by lovetox at 2022-05-30T22:47:44+02:00 chore: Update MANIFEST.in - - - - - e157bf9f by lovetox at 2022-05-30T22:47:44+02:00 ci: Update debian files - - - - - 3 changed files: - .gitignore - MANIFEST.in - debian/rules Changes: ===================================== .gitignore ===================================== @@ -8,32 +8,23 @@ syntax: glob *.pyo *~ *# -autom4te.cache -data/org.gajim.Gajim.appdata.xml -data/org.gajim.Gajim.desktop -libtool -po/.intltool-merge-cache -data/gajim-remote.desktop -po/POTFILES -po/stamp-it -stamp-h1 -Makefile + +gajim/gui/* +!gajim/gui/__init__.py + +# Cache + __pycache__/ .mypy_cache/ + +# Build folders + debian_build/ build/ dist/ gajim.egg-info/ -src/gtk/ win/_build_root -.vscode - -syntax: regexp -^config\.* -^config\/ -^scripts\/gajim.* -!MANIFEST.in +# IDE files -gajim/gui/* -!gajim/gui/__init__.py \ No newline at end of file +.vscode ===================================== MANIFEST.in ===================================== @@ -1,5 +1,3 @@ -include COPYING -recursive-include po *.po +recursive-include po * recursive-include data *.1 *.in -recursive-include test *.py -recursive-exclude * *.pyc +recursive-include test test_*.py ===================================== debian/rules ===================================== @@ -3,7 +3,5 @@ %: dh $@ --with python3 --buildsystem=pybuild - -# override_dh_auto_clean: -# python3 setup.py clean -a -# rm -rf $$(find gajim/ -name __pycache__) +override_dh_auto_test: + python3 -m unittest discover -s test -v View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7883c1bdf17b8ea57e0d3984af0322e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7883c1bdf17b8ea57e0d3984af0322e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Windows: Add GTK Inspector hint in Windows development Readme
by Daniel Brötzmann (＠wurstsalat) 30 May '22

30 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7883c1bd by Daniel Brötzmann at 2022-05-30T14:55:10+00:00 chore: Windows: Add GTK Inspector hint in Windows development Readme - - - - - 1 changed file: - win/README.md Changes: ===================================== win/README.md ===================================== @@ -18,6 +18,15 @@ ## Development * Now go to the git root dir `cd ..` * Launch Gajim `./launch.py` +### GtkInspector + +For Gtk Inspector to work, add the following registry key +``` +HKEY_CURRENT_USER\Software\GSettings\org\gtk\settings\debug +DWORD enable-inspector-keybinding = 1 +``` + +Afterwards press CTRL + SHIFT + I, to activate GtkInspector ## Build Gajim / Create an Installer View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7883c1bdf17b8ea57e0d3984af0322e5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7883c1bdf17b8ea57e0d3984af0322e5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ComponentSearch: Show Start Chat for JIDs only
by Daniel Brötzmann (＠wurstsalat) 30 May '22

30 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: aa968238 by wurstsalat at 2022-05-30T14:43:14+02:00 imprv: ComponentSearch: Show Start Chat for JIDs only - - - - - 2 changed files: - gajim/gtk/component_search.py - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/component_search.py ===================================== @@ -40,7 +40,7 @@ from .assistant import Page from .assistant import ProgressPage from .dataform import DataFormWidget -from .menus import get_directory_search_menu +from .menus import get_component_search_menu from .util import ensure_not_destroyed from .util import EventHelper @@ -208,6 +208,8 @@ def __init__(self) -> None: Page.__init__(self) self.title = _('Search Result') + self._jid_col: Optional[int] = None + self._label = Gtk.Label(label=_('No results found')) self._label.get_style_context().add_class('bold16') self._label.set_no_show_all(True) @@ -241,15 +243,20 @@ def process_result(self, form: Optional[Node]) -> None: fieldtypes: list[Union[Type[bool], Type[str]]] = [] fieldvars: list[Any] = [] + index = 0 for field in form.reported.iter_fields(): if field.type_ == 'boolean': fieldtypes.append(bool) elif field.type_ in ('jid-single', 'text-single'): fieldtypes.append(str) + if field.type_ == 'jid-single' or field.var == 'jid': + # Enable Start Chat context menu entry + self._jid_col = index else: log.warning('Not supported field received: %s', field.type_) continue fieldvars.append(field.var) + index += 1 liststore = Gtk.ListStore(*fieldtypes) @@ -298,7 +305,10 @@ def _on_button_press(self, column_values = store[iter_] text = ' '.join(column_values) - menu = get_directory_search_menu(column_values[0], text) + jid = None + if self._jid_col is not None: + jid = column_values[self._jid_col] + menu = get_component_search_menu(jid, text) rectangle = Gdk.Rectangle() rectangle.x = int(event.x) ===================================== gajim/gtk/menus.py ===================================== @@ -549,11 +549,14 @@ def get_groupchat_roster_menu(account: str, return menu -def get_directory_search_menu(jid: str, copy_text: str) -> Gio.Menu: +def get_component_search_menu(jid: Optional[str], copy_text: str) -> Gio.Menu: menu_items: list[tuple[str, str]] = [ ('app.copy-text', _('Copy')), - ('app.start-chat', _('Start Chat…')) ] + if jid is not None: + menu_items.append( + ('app.start-chat', _('Start Chat…'))) + menu = Gio.Menu() for item in menu_items: action, label = item View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa96823872c7aa07b0b5dc530d2beb92… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa96823872c7aa07b0b5dc530d2beb92… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: GroupchatControl: Bind roster revealer to hide_groupchat_occupants_list setting
by Daniel Brötzmann (＠wurstsalat) 30 May '22

30 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ceac0348 by wurstsalat at 2022-05-30T13:58:17+02:00 imprv: GroupchatControl: Bind roster revealer to hide_groupchat_occupants_list setting - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -126,6 +126,10 @@ def __init__(self, account: str, jid: JID) -> None: self.xml.roster_revealer.add(self.roster) self.xml.roster_revealer.set_reveal_child( not app.settings.get('hide_groupchat_occupants_list')) + app.settings.bind_signal( + 'hide_groupchat_occupants_list', + self.xml.roster_revealer, + 'set_reveal_child') self.roster.connect('row-activated', self._on_roster_row_activated) self.add_actions() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ceac03481656491dd8d056f07e884387… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ceac03481656491dd8d056f07e884387… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: HistorySyncAssistant: Port to Gajim’s Assistant class
by Daniel Brötzmann (＠wurstsalat) 30 May '22

30 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9bc1a686 by wurstsalat at 2022-05-30T13:14:27+02:00 refactor: HistorySyncAssistant: Port to Gajim’s Assistant class Fixes #10763 - - - - - c976e50d by wurstsalat at 2022-05-30T13:14:27+02:00 refactor: Rename DirectorySearch to ComponentSearch - - - - - 3 changed files: - gajim/gtk/search.py → gajim/gtk/component_search.py - gajim/gtk/discovery.py - gajim/gtk/history_sync.py Changes: ===================================== gajim/gtk/search.py → gajim/gtk/component_search.py ===================================== @@ -47,7 +47,7 @@ log = logging.getLogger('gajim.gui.search') -class DirectorySearch(Assistant, EventHelper): +class ComponentSearch(Assistant, EventHelper): def __init__(self, account: str, jid: str, ===================================== gajim/gtk/discovery.py ===================================== @@ -59,7 +59,7 @@ from gajim.common.const import StyleAttr from .dialogs import ErrorDialog -from .search import DirectorySearch +from .component_search import ComponentSearch from .util import icon_exists from .builder import get_builder from .util import open_window @@ -1310,7 +1310,7 @@ def on_search_button_clicked(self, widget=None): if not iter_: return service = model[iter_][0] - DirectorySearch(self.account, service, self.window.window) + ComponentSearch(self.account, service, self.window.window) def cleanup(self): AgentBrowser.cleanup(self) ===================================== gajim/gtk/history_sync.py ===================================== @@ -12,285 +12,291 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import cast +from typing import Optional + import logging -from enum import IntEnum -from datetime import datetime, timedelta +from datetime import datetime +from datetime import timedelta from gi.repository import Gtk from gi.repository import GLib from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError +from nbxmpp.task import Task from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ from gajim.common.const import ArchiveState +from gajim.common.events import ArchivingIntervalFinished +from gajim.common.events import RawMamMessageReceived from gajim.common.helpers import event_filter +from .assistant import Assistant +from .assistant import Page +from .assistant import SuccessPage from .util import load_icon_surface from .util import EventHelper log = logging.getLogger('gajim.gui.history_sync') -class Pages(IntEnum): - TIME = 0 - SYNC = 1 - SUMMARY = 2 - - -class HistorySyncAssistant(Gtk.Assistant, EventHelper): - def __init__(self, account): - Gtk.Assistant.__init__(self) +class HistorySyncAssistant(Assistant, EventHelper): + def __init__(self, account: str) -> None: + Assistant.__init__(self, width=600, transient_for=app.window) EventHelper.__init__(self) - self.set_application(app.app) - self.set_position(Gtk.WindowPosition.CENTER) self.set_name('HistorySyncAssistant') - self.set_default_size(300, -1) - self.set_resizable(False) - self.set_transient_for(app.window) self.account = account - self.con = app.connections[self.account] - self.timedelta = None - self.now = datetime.utcnow() - self.query_id = None - self.start = None - self.end = None - self.next = None - - self._hide_buttons() + self._client = app.get_client(account) - own_jid = self.con.get_own_jid().bare + self._timedelta: Optional[timedelta] = None + self._now = datetime.utcnow() + self._query_id: Optional[str] = None + self._start: Optional[datetime] = None + self._end: Optional[datetime] = None mam_start = ArchiveState.NEVER - archive = app.storage.archive.get_archive_infos(own_jid) + archive = app.storage.archive.get_archive_infos( + self._client.get_own_jid().bare) if archive is not None and archive.oldest_mam_timestamp is not None: mam_start = int(float(archive.oldest_mam_timestamp)) if mam_start == ArchiveState.NEVER: - self.current_start = self.now + self._current_start = self._now elif mam_start == ArchiveState.ALL: - self.current_start = datetime.utcfromtimestamp(0) + self._current_start = datetime.utcfromtimestamp(0) else: - self.current_start = datetime.fromtimestamp(mam_start) + self._current_start = datetime.fromtimestamp(mam_start) + + self.add_button('synchronize', _('Synchronize'), 'suggested-action') + self.add_button('close', _('Close')) + self.set_button_visible_func(self._visible_func) - self.select_time = SelectTimePage(self) - self.append_page(self.select_time) - self.set_page_type(self.select_time, Gtk.AssistantPageType.INTRO) + self.add_pages({ + 'select': SelectTime(self._now, self._current_start), + 'progress': Progress(), + }) - self.download_history = DownloadHistoryPage(self) - self.append_page(self.download_history) - self.set_page_type(self.download_history, - Gtk.AssistantPageType.PROGRESS) - self.set_page_complete(self.download_history, True) + self.add_default_page('success') + success_page = cast(SuccessPage, self.get_page('success')) + success_page.set_title(_('Synchronize Chat History')) + success_page.set_heading(_('Finished')) - self.summary = SummaryPage(self) - self.append_page(self.summary) - self.set_page_type(self.summary, Gtk.AssistantPageType.SUMMARY) - self.set_page_complete(self.summary, True) + self.connect('button-clicked', self._on_button_clicked) # pylint: disable=line-too-long self.register_events([ ('archiving-count-received', ged.GUI1, self._received_count), ('archiving-interval-finished', ged.GUI1, self._received_finished), - ('raw-mam-message-received', ged.PRECORE, self._nec_mam_message_received), + ('raw-mam-message-received', ged.PRECORE, self._mam_message_received), ]) # pylint: enable=line-too-long - self.connect('prepare', self._on_page_change) - self.connect('cancel', self._on_close_clicked) - self.connect('close', self._on_close_clicked) - if mam_start == ArchiveState.ALL: - self.set_current_page(Pages.SUMMARY) - self.summary.nothing_to_do() + success_page.set_text( + _('Gajim is fully synchronised with the archive.')) + self.show_page('success') self.show_all() - self.set_title(_('Synchronise History')) - - def _hide_buttons(self): - ''' - Hide some of the standard buttons that are included in Gtk.Assistant - ''' - if self.get_property('use-header-bar'): - action_area = self.get_children()[1] - else: - box = self.get_children()[0] - content_box = box.get_children()[1] - action_area = content_box.get_children()[1] - for button in action_area.get_children(): - button_name = Gtk.Buildable.get_name(button) - if button_name == 'back': - button.connect('show', self._on_show_button) - elif button_name == 'forward': - self.next = button - button.connect('show', self._on_show_button) @staticmethod - def _on_show_button(button): - button.hide() + def _visible_func(_assistant: Assistant, page_name: str) -> list[str]: + if page_name == 'select': + return ['close', 'synchronize'] - def _prepare_query(self): - if self.timedelta: - self.start = self.now - self.timedelta - self.end = self.current_start + if page_name == 'progress': + return ['close'] - log.info('Get mam_start_date: %s', self.current_start) - log.info('Now: %s', self.now) - log.info('Start: %s', self.start) - log.info('End: %s', self.end) + if page_name == 'success': + return ['close'] - jid = self.con.get_own_jid().bare + raise ValueError(f'page {page_name} unknown') - self.con.get_module('MAM').make_query(jid, - start=self.start, - end=self.end, - max_=0, - callback=self._received_count) + def _on_button_clicked(self, + _assistant: Assistant, + button_name: str + ) -> None: + if button_name == 'synchronize': + self._prepare_query() + self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) + return - def _received_count(self, task): + if button_name == 'close': + self.destroy() + + def _prepare_query(self) -> None: + select_time_page = cast(SelectTime, self.get_page('select')) + self._timedelta = select_time_page.get_timedelta() + if self._timedelta is not None: + self._start = self._now - self._timedelta + self._end = self._current_start + + log.info('Get mam_start_date: %s', self._current_start) + log.info('Now: %s', self._now) + log.info('Start: %s', self._start) + log.info('End: %s', self._end) + + self._client.get_module('MAM').make_query( + self._client.get_own_jid().bare, + start=self._start, + end=self._end, + max_=0, + callback=self._received_count) + + def _received_count(self, task: Task) -> None: try: result = task.finish() except (StanzaError, MalformedStanzaError): return if result.rsm.count is not None: - self.download_history.count = int(result.rsm.count) - self.query_id = self.con.get_module('MAM').request_archive_interval( - self.start, self.end) + progress_page = cast(Progress, self.get_page('progress')) + progress_page.set_count(int(result.rsm.count)) + mam_module = self._client.get_module('MAM') + self._query_id = mam_module.request_archive_interval( + self._start, self._end) @event_filter(['account']) - def _received_finished(self, event): - if event.query_id != self.query_id: + def _received_finished(self, event: ArchivingIntervalFinished) -> None: + if event.query_id != self._query_id: return - self.query_id = None + self._query_id = None log.info('Query finished') - GLib.idle_add(self.download_history.finished) - self.set_current_page(Pages.SUMMARY) - self.summary.finished() + progress_page = cast(Progress, self.get_page('progress')) + GLib.idle_add(progress_page.set_finished) + received_count = progress_page.get_received_count() + success_page = cast(SuccessPage, self.get_page('success')) + success_page.set_text(_('Finished synchronising chat history:\n' + '%s messages downloaded') % received_count) + self.show_page('success') @event_filter(['account']) - def _nec_mam_message_received(self, event): - if self.query_id != event.properties.mam.query_id: + def _mam_message_received(self, event: RawMamMessageReceived) -> None: + if self._query_id != event.properties.mam.query_id: return log.debug('Received message') - GLib.idle_add(self.download_history.set_fraction) + progress_page = cast(Progress, self.get_page('progress')) + GLib.idle_add(progress_page.set_fraction) - def on_row_selected(self, _listbox, row): - self.timedelta = row.get_child().get_delta() - if row: - self.set_page_complete(self.select_time, True) - else: - self.set_page_complete(self.select_time, False) - def _on_page_change(self, _assistant, page): - if page == self.download_history: - self.next.hide() - self._prepare_query() - self.set_title(_('Synchronise History')) +class SelectTime(Page): + def __init__(self, + now: datetime, + current_start: datetime + ) -> None: + Page.__init__(self) + self.title = _('Synchronize Chat History') - def _on_close_clicked(self, *args): - self.destroy() + self.complete = False + self._timedelta: Optional[timedelta] = None + heading = Gtk.Label() + heading.get_style_context().add_class('large-header') + heading.set_max_width_chars(30) + heading.set_line_wrap(True) + heading.set_halign(Gtk.Align.CENTER) + heading.set_justify(Gtk.Justification.CENTER) + heading.set_text(_('Synchronize Chat History')) -class SelectTimePage(Gtk.Box): - def __init__(self, assistant): - super().__init__(orientation=Gtk.Orientation.VERTICAL) - self.set_spacing(18) - self.assistant = assistant label = Gtk.Label( label=_('How far back should the chat history be synchronised?')) + label.set_halign(Gtk.Align.CENTER) + label.set_line_wrap(True) + label.set_max_width_chars(40) listbox = Gtk.ListBox() listbox.set_hexpand(False) listbox.set_halign(Gtk.Align.CENTER) - listbox.add(TimeOption(_('One Month'), 1)) - listbox.add(TimeOption(_('Three Months'), 3)) - listbox.add(TimeOption(_('One Year'), 12)) + listbox.add(TimeOption(_('One Month'), timedelta(days=30))) + listbox.add(TimeOption(_('Three Months'), timedelta(days=90))) + listbox.add(TimeOption(_('One Year'), timedelta(days=365))) listbox.add(TimeOption(_('Everything'))) - listbox.connect('row-selected', assistant.on_row_selected) + listbox.connect('row-selected', self._on_row_selected) - for row in listbox.get_children(): - option = row.get_child() - if not option.get_delta(): + for row in cast(list[TimeOption], listbox.get_children()): + delta = row.get_timedelta() + if delta is None: continue - if assistant.now - option.get_delta() > assistant.current_start: + if now - delta > current_start: row.set_activatable(False) row.set_selectable(False) - self.pack_start(label, True, True, 0) - self.pack_start(listbox, False, False, 0) + self.add(heading) + self.add(label) + self.add(listbox) + self.show_all() -class DownloadHistoryPage(Gtk.Box): - def __init__(self, assistant): - super().__init__(orientation=Gtk.Orientation.VERTICAL) - self.set_spacing(18) - self.assistant = assistant - self.count = 0 - self.received = 0 + def _on_row_selected(self, _listbox: Gtk.ListBox, row: TimeOption) -> None: + self._timedelta = row.get_timedelta() + self.complete = row is not None + self.update_page_complete() - surface = load_icon_surface('folder-download-symbolic', size=64) - image = Gtk.Image.new_from_surface(surface) + def get_timedelta(self) -> Optional[timedelta]: + return self._timedelta - self.progress = Gtk.ProgressBar() - self.progress.set_show_text(True) - self.progress.set_text(_('Connecting...')) - self.progress.set_pulse_step(0.1) - self.progress.set_vexpand(True) - self.progress.set_valign(Gtk.Align.CENTER) - - self.pack_start(image, False, False, 0) - self.pack_start(self.progress, False, False, 0) - - def set_fraction(self): - self.received += 1 - if self.count: - self.progress.set_fraction(self.received / self.count) - self.progress.set_text(_('%(received)s of %(max)s') % { - 'received': self.received, 'max': self.count}) - else: - self.progress.pulse() - self.progress.set_text(_('Downloaded %s messages') % self.received) + def get_default_button(self) -> str: + return 'synchronize' - def finished(self): - self.progress.set_fraction(1) +class Progress(Page): + def __init__(self) -> None: + Page.__init__(self) + self.title = _('Synchronizing Chat History…') -class SummaryPage(Gtk.Box): - def __init__(self, assistant): - super().__init__(orientation=Gtk.Orientation.VERTICAL) - self.set_spacing(18) - self.assistant = assistant + self._count = 0 + self._received = 0 - self.label = Gtk.Label() - self.label.set_name('FinishedLabel') - self.label.set_valign(Gtk.Align.CENTER) + surface = load_icon_surface('folder-download-symbolic', size=64) + image = Gtk.Image.new_from_surface(surface) + + self._progress_bar = Gtk.ProgressBar() + self._progress_bar.set_show_text(True) + self._progress_bar.set_text(_('Connecting...')) + self._progress_bar.set_pulse_step(0.1) + self._progress_bar.set_vexpand(True) + self._progress_bar.set_valign(Gtk.Align.CENTER) + + self.add(image) + self.add(self._progress_bar) + self.show_all() + + def set_fraction(self) -> None: + self._received += 1 + if self._count: + self._progress_bar.set_fraction(self._received / self._count) + self._progress_bar.set_text( + _('%(received)s of %(max)s') % { + 'received': self._received, + 'max': self._count}) + else: + self._progress_bar.pulse() + self._progress_bar.set_text( + _('Downloaded %s messages') % self._received) - self.pack_start(self.label, True, True, 0) + def set_count(self, count: int) -> None: + self._count = count - def finished(self): - received = self.assistant.download_history.received - self.label.set_text(_('Finished synchronising chat history:\n' - '%s messages downloaded') % received) + def set_finished(self) -> None: + self._progress_bar.set_fraction(1) - def nothing_to_do(self): - self.label.set_text(_('Gajim is fully synchronised with the archive.')) + def get_received_count(self) -> int: + return self._received - def query_already_running(self): - self.label.set_text(_('There is already a synchronisation in ' - 'progress. Please try again later.')) +class TimeOption(Gtk.ListBoxRow): + def __init__(self, text: str, months: Optional[timedelta] = None) -> None: + Gtk.ListBoxRow.__init__(self) + label = Gtk.Label(label=text) + self.add(label) -class TimeOption(Gtk.Label): - def __init__(self, label, months=None): - super().__init__(label=label) - self.date = months - if months: - self.date = timedelta(days=30 * months) + self._timedelta = months - def get_delta(self): - return self.date + def get_timedelta(self) -> Optional[timedelta]: + return self._timedelta View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9c80e5ff8fd0554302ad4e411177c94… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9c80e5ff8fd0554302ad4e411177c94… 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 May 2022