Commits April 2023

commits@gajim.org

1 participants
108 discussions

[Git][gajim/gajim][master] fix: ContactInfo: Improve behavior for connection changes
by Daniel Brötzmann (＠wurstsalat) 25 Apr '23

25 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1a44795e by wurstsalat at 2023-04-25T23:37:29+02:00 fix: ContactInfo: Improve behavior for connection changes Fixes #11439 - - - - - 1 changed file: - gajim/gtk/contact_info.py Changes: ===================================== gajim/gtk/contact_info.py ===================================== @@ -33,7 +33,9 @@ from gajim.common import app from gajim.common import ged +from gajim.common import types from gajim.common.const import AvatarSize +from gajim.common.const import SimpleClientState from gajim.common.events import SubscribedPresenceReceived from gajim.common.events import UnsubscribedPresenceReceived from gajim.common.ged import EventHelper @@ -87,6 +89,8 @@ def __init__(self, self.account = account self.contact = contact self._client = app.get_client(account) + self._client.connect_signal( + 'state-changed', self._on_client_state_changed) self._ui = get_builder('contact_info.ui') @@ -142,6 +146,17 @@ def _on_key_press(self, _widget: ContactInfo, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() + def _on_client_state_changed(self, + _client: types.Client, + _signal_name: str, + state: SimpleClientState + ) -> None: + + self._ui.edit_name_button.set_sensitive(state.is_connected) + self._ui.edit_name_button.set_tooltip_text( + _('Not connected') if not state.is_connected else _('Edit Name…')) + self._ui.subscription_listbox.set_sensitive(state.is_connected) + def _on_stack_child_changed(self, _widget: Gtk.Stack, _pspec: GObject.ParamSpec) -> None: @@ -166,13 +181,17 @@ def _on_destroy(self, _widget: ContactInfo) -> None: def _fill_information_page(self, contact: ContactT) -> None: self._vcard_grid = VCardGrid(self.account) self._ui.vcard_box.add(self._vcard_grid) - self._client.get_module('VCard4').request_vcard( - jid=self.contact.jid, - callback=self._on_vcard_received) + if self._client.state.is_available: + self._client.get_module('VCard4').request_vcard( + jid=self.contact.jid, + callback=self._on_vcard_received) jid = str(contact.get_address()) self._ui.contact_name_label.set_text(contact.name) + self._ui.edit_name_button.set_sensitive( + self._client.state.is_available) + self._ui.contact_jid_label.set_text(jid) self._ui.contact_jid_label.set_tooltip_text(jid) @@ -210,6 +229,9 @@ def _fill_settings_page(self, contact: BareContact) -> None: self._ui.from_subscription_switch.set_state(contact.is_subscribed) + self._ui.subscription_listbox.set_sensitive( + self._client.state.is_available) + if contact.subscription in ('to', 'both'): self._ui.to_subscription_stack.set_visible_child_name('checkmark') @@ -231,7 +253,7 @@ def _fill_settings_page(self, contact: BareContact) -> None: params.to_variant()) def _fill_groups_page(self, contact: BareContact) -> None: - if not contact.is_in_roster: + if not contact.is_in_roster or not self._client.state.is_available: return model = self._ui.groups_treeview.get_model() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1a44795e6cb9f1ccaadbfc229f8ecfe8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1a44795e6cb9f1ccaadbfc229f8ecfe8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: GroupchatRoster: Fix roster margins for scrollbar
by Daniel Brötzmann (＠wurstsalat) 25 Apr '23

25 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7f6bfeeb by wurstsalat at 2023-04-25T23:09:58+02:00 cfix: GroupchatRoster: Fix roster margins for scrollbar Fix for e266a44790ca07e598b5f559dfe5dab4338d67d0 Margins have to be set using GTK properties, since using GTK's CSS doesn't seem to have the same effect on treeviews. - - - - - 2 changed files: - gajim/data/gui/groupchat_roster.ui - gajim/data/style/gajim.css Changes: ===================================== gajim/data/gui/groupchat_roster.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="box"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -11,8 +11,8 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-start">6</property> - <property name="margin-end">6</property> + <property name="margin-start">18</property> + <property name="margin-end">18</property> <property name="margin-top">12</property> <property name="orientation">vertical</property> <property name="spacing">12</property> @@ -98,6 +98,8 @@ <object class="GtkTreeView" id="roster_treeview"> <property name="visible">True</property> <property name="can-focus">True</property> + <property name="margin-start">18</property> + <property name="margin-end">18</property> <property name="headers-visible">False</property> <property name="expander-column">expander</property> <property name="enable-search">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -988,10 +988,6 @@ .start-chat-row { padding: 10px 20px 10px 10px; } .start-chat-row:not(.activatable) label { color: @insensitive_fg_color; } .start-chat-row:focus { outline: none; } -/* GroupChatRoster */ -.groupchat-roster treeview { padding-left: 4px; } -.groupchat-roster { padding: 0 18px 0 18px; } - /* GroupchatConfig */ #GroupchatConfig stack { border-bottom: 1px solid; border-color: @borders;} #GroupchatConfig stacksidebar > scrolledwindow { View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7f6bfeeb688473c9723bb9d8d3319d43… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7f6bfeeb688473c9723bb9d8d3319d43… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Revert: GroupChatRoster: Make scrollbar the right-most widget
by Philipp Hörist (＠lovetox) 24 Apr '23

24 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: e266a447 by Philipp Hörist at 2023-04-24T22:07:17+00:00 cfix: Revert: GroupChatRoster: Make scrollbar the right-most widget Putting a treeview inside a viewport seems to cause weird issues - - - - - 2 changed files: - gajim/data/gui/groupchat_roster.ui - gajim/data/style/gajim.css Changes: ===================================== gajim/data/gui/groupchat_roster.ui ===================================== @@ -67,8 +67,6 @@ <object class="GtkSearchEntry" id="search_entry"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="margin-start">18</property> - <property name="margin-end">18</property> <property name="primary-icon-name">edit-find-symbolic</property> <property name="primary-icon-activatable">False</property> <property name="primary-icon-sensitive">False</property> @@ -97,56 +95,53 @@ <property name="can-focus">True</property> <property name="hscrollbar-policy">never</property> <child> - <object class="GtkViewport"> + <object class="GtkTreeView" id="roster_treeview"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> + <property name="headers-visible">False</property> + <property name="expander-column">expander</property> + <property name="enable-search">False</property> + <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/> + <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/> + <signal name="query-tooltip" handler="_query_tooltip" swapped="no"/> + <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> <child> - <object class="GtkTreeView" id="roster_treeview"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="headers-visible">False</property> - <property name="expander-column">expander</property> - <property name="enable-search">False</property> - <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/> - <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/> - <signal name="query-tooltip" handler="_query_tooltip" swapped="no"/> - <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/> + <object class="GtkTreeViewColumn" id="contact_column"> + <property name="sizing">fixed</property> + <property name="fixed-width">210</property> + <property name="title">avatar</property> + <property name="expand">True</property> <child> - <object class="GtkTreeViewColumn" id="contact_column"> - <property name="sizing">fixed</property> - <property name="fixed-width">210</property> - <property name="title">avatar</property> - <property name="expand">True</property> - <child> - <object class="GtkCellRendererPixbuf" id="avatar_renderer"> - <property name="width">40</property> - <property name="ypad">3</property> - <property name="xalign">0</property> - </object> - <attributes> - <attribute name="visible">2</attribute> - <attribute name="surface">0</attribute> - </attributes> - </child> - <child> - <object class="GtkCellRendererText" id="text_renderer"> - <property name="ellipsize">end</property> - </object> - <attributes> - <attribute name="markup">1</attribute> - </attributes> - </child> + <object class="GtkCellRendererPixbuf" id="avatar_renderer"> + <property name="width">40</property> + <property name="ypad">3</property> + <property name="xalign">0</property> </object> + <attributes> + <attribute name="visible">2</attribute> + <attribute name="surface">0</attribute> + </attributes> </child> <child> - <object class="GtkTreeViewColumn" id="expander"> - <property name="visible">False</property> - <property name="sizing">fixed</property> - <property name="title">expander</property> + <object class="GtkCellRendererText" id="text_renderer"> + <property name="ellipsize">end</property> </object> + <attributes> + <attribute name="markup">1</attribute> + </attributes> </child> </object> </child> + <child> + <object class="GtkTreeViewColumn" id="expander"> + <property name="visible">False</property> + <property name="sizing">fixed</property> + <property name="title">expander</property> + </object> + </child> </object> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== @@ -989,8 +989,8 @@ .start-chat-row:not(.activatable) label { color: @insensitive_fg_color; } .start-chat-row:focus { outline: none; } /* GroupChatRoster */ -.groupchat-roster viewport { padding: 0 18px 0 18px; } .groupchat-roster treeview { padding-left: 4px; } +.groupchat-roster { padding: 0 18px 0 18px; } /* GroupchatConfig */ #GroupchatConfig stack { border-bottom: 1px solid; border-color: @borders;} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e266a44790ca07e598b5f559dfe5dab4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e266a44790ca07e598b5f559dfe5dab4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch revert-ed3a18b7
by Philipp Hörist (＠lovetox) 24 Apr '23

24 Apr '23

Philipp Hörist deleted branch revert-ed3a18b7 at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch revert-ed3a18b7
by Philipp Hörist (＠lovetox) 24 Apr '23

24 Apr '23

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

1 0

[Git][gajim/gajim][master] cfix: GroupchatRoster: Open correct chat on row activate
by Philipp Hörist (＠lovetox) 24 Apr '23

24 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: e0900133 by Philipp Hörist at 2023-04-24T22:14:21+02:00 cfix: GroupchatRoster: Open correct chat on row activate - - - - - 1 changed file: - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -386,7 +386,10 @@ def _on_roster_row_activated(self, _column: Gtk.TreeViewColumn ) -> None: - iter_ = self._store.get_iter(path) + child_path = self._modelfilter.convert_path_to_child_path(path) + assert child_path is not None + + iter_ = self._store.get_iter(child_path) if self._store.iter_parent(iter_) is None: # This is a group row return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e0900133d165e31fe6f0066dbb33daf7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e0900133d165e31fe6f0066dbb33daf7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ChatStack: Only respond to supported drag-n-drop types while dragging
by Philipp Hörist (＠lovetox) 24 Apr '23

24 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7bc116d6 by mjk at 2023-04-24T15:59:09+00:00 imprv: ChatStack: Only respond to supported drag-n-drop types while dragging - - - - - 1 changed file: - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -678,7 +678,7 @@ def _on_drag_leave(self, def _on_drag_motion(self, _widget: Gtk.Widget, - _context: Gdk.DragContext, + context: Gdk.DragContext, _x_coord: int, _y_coord: int, time: int @@ -688,9 +688,13 @@ def _on_drag_motion(self, # Workaround for https://gitlab.gnome.org/GNOME/gtk/-/issues/5518 return False - self._drop_area.set_no_show_all(False) - self._drop_area.show_all() - return True + for targ in context.list_targets(): + if targ.name() in {'text/uri-list', 'application/vnd.portal.files'}: + self._drop_area.set_no_show_all(False) + self._drop_area.show_all() + return True + + return False def _show_chat_function_page(self, function_mode: FunctionMode, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7bc116d6f82502cbfccfca0125811354… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7bc116d6f82502cbfccfca0125811354… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][imprv-roster] imprv: GroupchatRoster: Don’t show participants if roster size is big
by Philipp Hörist (＠lovetox) 23 Apr '23

23 Apr '23

Philipp Hörist pushed to branch imprv-roster at gajim / gajim Commits: 880030e2 by Philipp Hörist at 2023-04-24T00:13:38+02:00 imprv: GroupchatRoster: Don’t show participants if roster size is big - - - - - 1 changed file: - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -100,6 +100,8 @@ def __init__(self) -> None: self._modelfilter.set_visible_func(self._visible_func) self._roster.set_has_tooltip(True) + self._is_big_roster = False + self._ui.contact_column.set_fixed_width( app.settings.get('groupchat_roster_width')) self._ui.contact_column.set_cell_data_func(self._ui.text_renderer, @@ -222,6 +224,17 @@ def _visible_func(self, ) -> bool: if not self._filter_string: + if not self._is_big_roster: + return True + + if not model[iter_][Column.IS_CONTACT]: + return True + + group_iter = model.iter_parent(iter_) + assert group_iter is not None + group_name = model[group_iter][Column.NICK_OR_GROUP] + if group_name in ('participant', 'visitor'): + return False return True if not model[iter_][Column.IS_CONTACT]: @@ -539,10 +552,13 @@ def _load_roster(self) -> None: for participant in self._contact.get_participants(): self._add_contact(participant) + self._is_big_roster = self._get_total_user_count() > 100 + + self._ui.search_entry.set_text('') + self._modelfilter.refilter() self.enable_sort(True) self._roster.set_model(self._modelfilter) - self._ui.search_entry.set_text('') self._roster.expand_all() def _unload_roster(self) -> None: @@ -557,6 +573,7 @@ def _unload_roster(self) -> None: self._store.clear() self.enable_sort(False) + self._is_big_roster = False self._contact_refs = {} self._group_refs = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/880030e22bf9395bc7391a05e01e9b3c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/880030e22bf9395bc7391a05e01e9b3c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: App menu: Add menu entry for privacy policy
by Daniel Brötzmann (＠wurstsalat) 23 Apr '23

23 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1d84d1b3 by wurstsalat at 2023-04-23T22:35:39+02:00 imprv: App menu: Add menu entry for privacy policy - - - - - 4 changed files: - gajim/common/const.py - gajim/data/gui/application_menu.ui - gajim/gtk/application.py - gajim/gtk/const.py Changes: ===================================== gajim/common/const.py ===================================== @@ -960,6 +960,7 @@ def is_active(self): } GAJIM_FAQ_URI = 'https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq' +GAJIM_PRIVACY_POLICY_URI = 'https://gajim.org/privacy/' GAJIM_WIKI_URI = 'https://dev.gajim.org/gajim/gajim/wikis' GAJIM_SUPPORT_JID = 'gajim(a)conference.gajim.org' ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -55,6 +55,10 @@ <attribute name="label" translatable="yes">FA_Q (Online)</attribute> <attribute name="action">app.faq</attribute> </item> + <item> + <attribute name="label" translatable="yes">_Privacy Policy (Online)</attribute> + <attribute name="action">app.privacy-policy</attribute> + </item> <item> <attribute name="label" translatable="yes">Join Support Chat</attribute> <attribute name="action">app.join-support-chat</attribute> ===================================== gajim/gtk/application.py ===================================== @@ -65,6 +65,7 @@ from gajim.common import idle from gajim.common.application import CoreApplication from gajim.common.const import GAJIM_FAQ_URI +from gajim.common.const import GAJIM_PRIVACY_POLICY_URI from gajim.common.const import GAJIM_SUPPORT_JID from gajim.common.const import GAJIM_WIKI_URI from gajim.common.exceptions import GajimGeneralException @@ -416,6 +417,7 @@ def _connect_app_actions(self) -> None: ('join-support-chat', self._on_join_support_chat), ('about', self._on_about_action), ('faq', self._on_faq_action), + ('privacy-policy', self._on_privacy_policy_action), ('start-chat', self._on_new_chat_action), ('accounts', self._on_accounts_action), ('add-contact', self._on_add_contact_action), @@ -747,6 +749,11 @@ def _on_faq_action(_action: Gio.SimpleAction, _param: Optional[GLib.Variant]) -> None: open_uri(GAJIM_FAQ_URI) + @staticmethod + def _on_privacy_policy_action(_action: Gio.SimpleAction, + _param: Optional[GLib.Variant]) -> None: + open_uri(GAJIM_PRIVACY_POLICY_URI) + @staticmethod def _on_shortcuts_action(_action: Gio.SimpleAction, _param: Optional[GLib.Variant]) -> None: ===================================== gajim/gtk/const.py ===================================== @@ -192,6 +192,7 @@ def __str__(self): ('copy-text', 's'), ('create-groupchat', 's'), ('faq', None), + ('privacy-policy', None), ('features', None), ('file-transfer', None), ('forget-groupchat', 'a{sv}'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d84d1b3782f723c9ba315400e79e046… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d84d1b3782f723c9ba315400e79e046… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch imprv-roster
by Philipp Hörist (＠lovetox) 23 Apr '23

23 Apr '23

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

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2023