Commits January 2022

commits@gajim.org

1 participants
161 discussions

[Git][gajim/gajim][master] 5 commits: MessageInput: Typing
by Daniel Brötzmann (＠wurstsalat) 26 Jan '22

26 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 755ab990 by wurstsalat at 2022-01-26T20:38:46+01:00 MessageInput: Typing - - - - - db1ce5ad by wurstsalat at 2022-01-26T20:49:53+01:00 PEPConfig: Typing - - - - - d0075c4e by wurstsalat at 2022-01-26T20:53:55+01:00 MamPreferences: Typing - - - - - 4ad0530c by wurstsalat at 2022-01-26T21:15:30+01:00 AdvancedConfig: Typing - - - - - fda036d5 by wurstsalat at 2022-01-26T21:16:54+01:00 Update pyrightconfig - - - - - 5 changed files: - gajim/gtk/advanced_config.py - gajim/gtk/mam_preferences.py - gajim/gtk/message_input.py - gajim/gtk/pep_config.py - pyrightconfig.json Changes: ===================================== gajim/gtk/advanced_config.py ===================================== @@ -83,8 +83,8 @@ def __init__(self) -> None: col = Gtk.TreeViewColumn(Q_('?config:Preference Name'), renderer_text, text=0) treeview.insert_column(col, -1) - col.props.expand = True - col.props.sizing = Gtk.TreeViewColumnSizing.FIXED + col.set_expand(True) + col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) col.set_resizable(True) self.renderer_text = Gtk.CellRendererText() @@ -95,14 +95,14 @@ def __init__(self) -> None: treeview.insert_column(col, -1) col.set_cell_data_func(self.renderer_text, self._value_column_data_callback) - col.props.expand = True - col.props.sizing = Gtk.TreeViewColumnSizing.FIXED + col.set_expand(True) + col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) col.set_resizable(True) renderer_text = Gtk.CellRendererText() col = Gtk.TreeViewColumn(Q_('?config:Type'), renderer_text, text=2) treeview.insert_column(col, -1) - col.props.sizing = Gtk.TreeViewColumnSizing.FIXED + col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) treeview.set_model(self.modelfilter) @@ -149,6 +149,7 @@ def _on_treeview_row_activated(self, _column: Gtk.TreeViewColumn ) -> None: modelpath = self.modelfilter.convert_path_to_child_path(path) + assert modelpath modelrow = self.model[modelpath] setting = modelrow[Column.NAME] @@ -166,8 +167,9 @@ def _on_config_edited(self, path: str, text: str ) -> None: - path = Gtk.TreePath.new_from_string(path) - modelpath = self.modelfilter.convert_path_to_child_path(path) + treepath = Gtk.TreePath.new_from_string(path) + modelpath = self.modelfilter.convert_path_to_child_path(treepath) + assert modelpath modelrow = self.model[modelpath] setting = modelrow[Column.NAME] @@ -194,7 +196,7 @@ def _on_reset_button_clicked(self, button: Gtk.Button) -> None: app.settings.set(setting, default) button.set_sensitive(False) - def _fill_model(self, parent=None) -> None: + def _fill_model(self) -> None: for category, settings in ADVANCED_SETTINGS.items(): if category != 'app': continue @@ -215,7 +217,7 @@ def _fill_model(self, parent=None) -> None: else: raise ValueError - self.model.append(parent, [setting, value, type_]) + self.model.append(None, [setting, value, type_]) def _visible_func(self, model: Gtk.TreeModel, ===================================== gajim/gtk/mam_preferences.py ===================================== @@ -82,10 +82,10 @@ def _mam_prefs_received(self, task: Task) -> None: self._ui.default_combo.set_active_id(result.default) self._ui.preferences_store.clear() for jid in result.always: - self._ui.preferences_store.append((str(jid), True)) + self._ui.preferences_store.append([str(jid), True]) for jid in result.never: - self._ui.preferences_store.append((str(jid), False)) + self._ui.preferences_store.append([str(jid), False]) def _mam_prefs_saved(self, task: Task) -> None: try: ===================================== gajim/gtk/message_input.py ===================================== @@ -94,6 +94,7 @@ def _on_focus_in(self, ) -> bool: self.toggle_speller(True) scrolled = self.get_parent() + assert scrolled scrolled.get_style_context().add_class('message-input-focus') return False @@ -102,6 +103,7 @@ def _on_focus_out(self, _event: Gdk.EventFocus ) -> bool: scrolled = self.get_parent() + assert scrolled scrolled.get_style_context().remove_class('message-input-focus') if not self.has_text(): self.toggle_speller(False) @@ -225,7 +227,8 @@ def _replace(anchor: Gtk.TextChildAnchor) -> None: image = anchor.get_widgets()[0] if hasattr(image, 'codepoint'): # found emoji - self._replace_char_at_iter(iter_, image.codepoint) + codepoint = getattr(image, 'codepoint') + self._replace_char_at_iter(iter_, codepoint) image.destroy() iter_ = self.get_buffer().get_start_iter() @@ -258,7 +261,7 @@ def insert_emoji(self, codepoint: str, pixbuf: GdkPixbuf.Pixbuf) -> None: else: anchor = buf.create_child_anchor(insert_iter) image = Gtk.Image.new_from_pixbuf(pixbuf) - image.codepoint = codepoint + setattr(image, 'codepoint', codepoint) image.show() self.add_child_at_anchor(image, anchor) buf.insert_at_cursor(' ') ===================================== gajim/gtk/pep_config.py ===================================== @@ -16,7 +16,9 @@ from gi.repository import Gdk from gi.repository import Gtk + from nbxmpp.errors import StanzaError +from nbxmpp.task import Task from gajim.common import app from gajim.common.i18n import _ @@ -32,7 +34,7 @@ class PEPConfig(Gtk.ApplicationWindow): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -47,21 +49,23 @@ def __init__(self, account): self.account = account self.set_title(_('PEP Service Configuration (%s)') % self.account) - self._con = app.connections[self.account] + self._client = app.get_client(account) self._init_services() self._ui.services_treeview.get_selection().connect( 'changed', self._on_services_selection_changed) self.show_all() - self.connect('key-press-event', self._on_key_press_event) + self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self) - def _on_key_press_event(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _on_services_selection_changed(self, _selection): + def _on_services_selection_changed(self, + _selection: Gtk.TreeSelection + ) -> None: self._ui.configure_button.set_sensitive(True) self._ui.delete_button.set_sensitive(True) @@ -79,11 +83,11 @@ def _init_services(self): col.pack_start(cellrenderer_text, True) col.add_attribute(cellrenderer_text, 'text', 0) - jid = self._con.get_own_jid().bare - self._con.get_module('Discovery').disco_items( + jid = self._client.get_own_jid().bare + self._client.get_module('Discovery').disco_items( jid, callback=self._items_received) - def _items_received(self, task): + def _items_received(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -95,7 +99,7 @@ def _items_received(self, task): if item.jid == jid and item.node is not None: self.treestore.append([item.node]) - def _on_node_delete(self, task): + def _on_node_delete(self, task: Task) -> None: node = task.get_user_data() try: @@ -104,10 +108,12 @@ def _on_node_delete(self, task): WarningDialog( _('PEP node was not removed'), _('PEP node %(node)s was not removed:\n%(message)s') % { - 'node': node, 'message': error}) + 'node': node, + 'message': error}) return model = self._ui.services_treeview.get_model() + assert isinstance(model, Gtk.ListStore) iter_ = model.get_iter_first() while iter_: if model[iter_][0] == node: @@ -115,35 +121,37 @@ def _on_node_delete(self, task): break iter_ = model.iter_next(iter_) - def _on_delete_button_clicked(self, _widget): + def _on_delete_button_clicked(self, _widget: Gtk.Button) -> None: selection = self._ui.services_treeview.get_selection() if not selection: return model, iter_ = selection.get_selected() + assert isinstance(model, Gtk.ListStore) + assert iter_ node = model[iter_][0] - con = app.connections[self.account] - con.get_module('PubSub').delete(node, - callback=self._on_node_delete, - user_data=node) + self._client.get_module('PubSub').delete( + node, + callback=self._on_node_delete, + user_data=node) - def _on_configure_button_clicked(self, _widget): + def _on_configure_button_clicked(self, _button: Gtk.Button) -> None: selection = self._ui.services_treeview.get_selection() if not selection: return model, iter_ = selection.get_selected() + assert isinstance(model, Gtk.ListStore) + assert iter_ node = model[iter_][0] - con = app.connections[self.account] - con.get_module('PubSub').get_node_configuration( + self._client.get_module('PubSub').get_node_configuration( node, callback=self._nec_pep_config_received) def _on_config_submit(self, form, node): - con = app.connections[self.account] - con.get_module('PubSub').set_node_configuration(node, form) + self._client.get_module('PubSub').set_node_configuration(node, form) - def _nec_pep_config_received(self, task): + def _nec_pep_config_received(self, task: Task) -> None: try: result = task.finish() except Exception: ===================================== pyrightconfig.json ===================================== @@ -50,7 +50,9 @@ "gajim/gtk/groupchat_state.py", "gajim/gtk/main.py", "gajim/gtk/main_stack.py", + "gajim/gtk/mam_preferences.py", "gajim/gtk/manage_sounds.py", + "gajim/gtk/message_input.py", "gajim/gtk/notification.py", "gajim/gtk/password_dialog.py", "gajim/gtk/preview_audio.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ba90f881a750e9d77c9e291f09d1dc4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ba90f881a750e9d77c9e291f09d1dc4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Roster: Typing, fix error
by Daniel Brötzmann (＠wurstsalat) 26 Jan '22

26 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2743de11 by wurstsalat at 2022-01-26T20:11:02+01:00 Roster: Typing, fix error - - - - - ba90f881 by wurstsalat at 2022-01-26T20:11:02+01:00 RosterItemExchange: Typing - - - - - 3 changed files: - gajim/common/events.py - gajim/gtk/roster.py - gajim/gtk/roster_item_exchange.py Changes: ===================================== gajim/common/events.py ===================================== @@ -418,7 +418,7 @@ class RosterItemExchangeEvent(ApplicationEvent): name: str = field(init=False, default='roster-item-exchange') client: 'Client' jid: JID - exchange_items_list: list[str] + exchange_items_list: dict[str, list[str]] action: str ===================================== gajim/gtk/roster.py ===================================== @@ -30,7 +30,7 @@ from gi.repository import Gtk from nbxmpp import JID -from nbxmpp import Namespace +from nbxmpp.namespaces import Namespace from gajim.common import app from gajim.common import ged @@ -39,6 +39,8 @@ from gajim.common.const import StyleAttr from gajim.common.const import PresenceShowExt from gajim.common.events import ApplicationEvent +from gajim.common.events import RosterPush +from gajim.common.events import RosterReceived from gajim.common.helpers import event_filter from gajim.common.i18n import _ @@ -358,11 +360,12 @@ def _on_remove_contact(self, if contact.jid.domain == selected_contact.jid.domain: has_transport_contacts = True break - if has_transport_contacts: - def _on_remove(): - self._client.get_module('Gateway').unsubscribe( - selected_contact.jid) + def _on_remove(): + self._client.get_module('Gateway').unsubscribe( + selected_contact.jid) + + if has_transport_contacts: ConfirmationDialog( _('Remove Transport'), _('Transport \'%s\' will be ' @@ -406,6 +409,9 @@ def _on_roster_button_press_event(self, return path, _, _, _ = pos + if path is None: + return + path = self._modelfilter.convert_path_to_child_path(path) assert path is not None iter_ = self._store.get_iter(path) @@ -524,12 +530,12 @@ def _on_contact_update(self, self._draw_contact(contact) @event_filter(['account']) - def _on_roster_received(self, _event: ApplicationEvent) -> None: + def _on_roster_received(self, _event: RosterReceived) -> None: self._reset_roster() @event_filter(['account']) - def _on_roster_push(self, event: ApplicationEvent) -> None: - contact = self._get_contact(event.item.jid) + def _on_roster_push(self, event: RosterPush) -> None: + contact = self._get_contact(str(event.item.jid)) if event.item.subscription == 'remove': contact.disconnect(self) @@ -718,15 +724,15 @@ def _text_cell_data_func(_column: Gtk.TreeViewColumn, has_parent = bool(model.iter_parent(iter_)) style = 'contact' if has_parent else 'group' - bgcolor = app.css_config.get_value('.gajim-%s-row' % style, + bgcolor = app.css_config.get_value(f'.gajim-{style}-row', StyleAttr.BACKGROUND) renderer.set_property('cell-background', bgcolor) - color = app.css_config.get_value('.gajim-%s-row' % style, + color = app.css_config.get_value(f'.gajim-{style}-row', StyleAttr.COLOR) renderer.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-%s-row' % style) + desc = app.css_config.get_font(f'.gajim-{style}-row') renderer.set_property('font-desc', desc) if not has_parent: ===================================== gajim/gtk/roster_item_exchange.py ===================================== @@ -12,8 +12,12 @@ # 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 Optional + from gi.repository import Gtk +from nbxmpp.protocol import JID + from gajim.common import app from gajim.common import i18n from gajim.common.i18n import _ @@ -26,8 +30,13 @@ class RosterItemExchange(Gtk.ApplicationWindow): """ Used when someone sends a Roster Item Exchange suggestion (XEP-0144) """ - def __init__(self, account, action, exchange_list, jid_from, - message_body=None): + def __init__(self, + account: str, + action: str, + exchange_list: dict[str, list[str]], + jid_from: JID, + message_body: Optional[str] = None + ) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -46,6 +55,7 @@ def __init__(self, account, action, exchange_list, jid_from, # Set label depending on action contact = self._client.get_module('Contacts').get_contact(jid_from) + type_label = '' if action == 'add': type_label = _('%(name)s (%(jid)s) would like to add some ' 'contacts to your contact list.') % { @@ -75,7 +85,8 @@ def __init__(self, account, action, exchange_list, jid_from, # Columns renderer1 = Gtk.CellRendererToggle() renderer1.set_property('activatable', True) - renderer1.connect('toggled', self._toggled) + renderer1.connect('toggled', self._on_toggled) + title = '' if self._action == 'add': title = _('Add') elif self._action == 'modify': @@ -95,8 +106,9 @@ def __init__(self, account, action, exchange_list, jid_from, -1, _('Groups'), renderer4, text=3) # Init contacts - self.model = self._ui.items_list_treeview.get_model() - self.model.clear() + self._model = self._ui.items_list_treeview.get_model() + assert isinstance(self._model, Gtk.ListStore) + self._model.clear() if action == 'add': self._add() @@ -107,12 +119,13 @@ def __init__(self, account, action, exchange_list, jid_from, self._ui.connect_signals(self) - def _toggled(self, cell, path): + def _on_toggled(self, cell: Gtk.CellRendererToggle, path: str) -> None: model = self._ui.items_list_treeview.get_model() + assert isinstance(model, Gtk.ListStore) iter_ = model.get_iter(path) model[iter_][0] = not cell.get_active() - def _add(self): + def _add(self) -> None: for jid in self._exchange_list: contact = self._client.get_module('Contacts').get_contact(jid) name = self._exchange_list[jid][0] @@ -127,12 +140,13 @@ def _add(self): groups = groups + group + ', ' if not contact.is_in_roster: self.show_all() - iter_ = self.model.append() - self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + assert isinstance(self._model, Gtk.ListStore) + iter_ = self._model.append() + self._model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) self._ui.accept_button.set_label(_('Add')) - def _modify(self): + def _modify(self) -> None: for jid in self._exchange_list: is_right = True contact = self._client.get_module('Contacts').get_contact(jid) @@ -153,12 +167,13 @@ def _modify(self): groups = groups + group + ', ' if not is_right and contact.is_in_roster: self.show_all() - iter_ = self.model.append() - self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + assert isinstance(self._model, Gtk.ListStore) + iter_ = self._model.append() + self._model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) self._ui.accept_button.set_label(_('Modify')) - def _delete(self): + def _delete(self) -> None: for jid in self._exchange_list: contact = self._client.get_module('Contacts').get_contact(jid) name = self._exchange_list[jid][0] @@ -173,13 +188,15 @@ def _delete(self): groups = groups + group + ', ' if contact.is_in_roster: self.show_all() - iter_ = self.model.append() - self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + assert isinstance(self._model, Gtk.ListStore) + iter_ = self._model.append() + self._model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) self._ui.accept_button.set_label(_('Delete')) - def _on_accept_button_clicked(self, _widget): + def _on_accept_button_clicked(self, _button: Gtk.Button) -> None: model = self._ui.items_list_treeview.get_model() + assert isinstance(model, Gtk.ListStore) iter_ = model.get_iter_first() if self._action == 'add': count = 0 @@ -198,7 +215,7 @@ def _on_accept_button_clicked(self, _widget): if groups == ['']: groups = [] jid = model[iter_][1] - if app.jid_is_transport(self._jid_from): + if app.jid_is_transport(str(self._jid_from)): self._client.get_module('Presence').automatically_added.append( jid) @@ -211,7 +228,7 @@ def _on_accept_button_clicked(self, _widget): iter_ = model.iter_next(iter_) InformationDialog(i18n.ngettext('Added %d contact', 'Added %d contacts', - count, count, count)) + count, str(count), str(count))) elif self._action == 'modify': count = 0 while iter_: @@ -244,8 +261,8 @@ def _on_accept_button_clicked(self, _widget): iter_ = model.iter_next(iter_) InformationDialog(i18n.ngettext('Removed %d contact', 'Removed %d contacts', - count, count, count)) + count, str(count), str(count))) self.destroy() - def _on_cancel_button_clicked(self, _widget): + def _on_cancel_button_clicked(self, _button: Gtk.Button) -> None: self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ed50151e036b8fda6580e2fadeef5b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ed50151e036b8fda6580e2fadeef5b9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConversationView: Don’t allow to focus rows
by Philipp Hörist (＠lovetox) 26 Jan '22

26 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ed50151e by lovetox at 2022-01-26T20:09:59+01:00 ConversationView: Don’t allow to focus rows This can steal focus from the text and hinder users to copy text - - - - - 1 changed file: - gajim/gtk/conversation/rows/base.py Changes: ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -41,6 +41,7 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None: self.text: str = '' self._merged: bool = False + self.set_can_focus(False) self.get_style_context().add_class('conversation-row') self.grid = Gtk.Grid(row_spacing=3, column_spacing=12) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ed50151e036b8fda6580e2fadeef5b9a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ed50151e036b8fda6580e2fadeef5b9a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Add Certificate tab
by Daniel Brötzmann (＠wurstsalat) 26 Jan '22

26 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 264735fb by wurstsalat at 2022-01-26T19:01:13+01:00 ServerInfo: Add Certificate tab - - - - - 3 changed files: - gajim/data/gui/server_info.ui - gajim/gtk/builder.pyi - gajim/gtk/server_info.py Changes: ===================================== gajim/data/gui/server_info.ui ===================================== @@ -6,7 +6,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <child> -  +  <object class="GtkGrid" id="server"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -135,21 +135,6 @@ <property name="width">2</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <style> <class name="margin-18"/> </style> @@ -161,12 +146,9 @@ <property name="can-focus">False</property> <property name="label" translatable="yes">Server</property> </object> - <packing> - <property name="tab-fill">False</property> - </packing> </child> <child> -  +  <object class="GtkGrid"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -214,23 +196,6 @@ <property name="top-attach">5</property> </packing> </child> - <child> - <object class="GtkButton" id="cert_button"> - <property name="label" translatable="yes">View _Certificate</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">center</property> - <property name="margin-top">12</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_cert_button_clicked" swapped="no"/> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">8</property> - <property name="width">2</property> - </packing> - </child> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -382,39 +347,6 @@ <property name="top-attach">3</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <style> <class name="margin-18"/> </style> @@ -431,7 +363,42 @@ </object> <packing> <property name="position">1</property> - <property name="tab-fill">False</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="border-width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkScrolledWindow" id="cert_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Certificate</property> + </object> + <packing> + <property name="position">2</property> </packing> </child> <child> @@ -492,7 +459,7 @@ </child> </object> <packing> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child type="tab"> @@ -502,8 +469,7 @@ <property name="label" translatable="yes">Features</property> </object> <packing> - <property name="position">2</property> - <property name="tab-fill">False</property> + <property name="position">3</property> </packing> </child> </object> ===================================== gajim/gtk/builder.pyi ===================================== @@ -818,6 +818,7 @@ class ServerInfoBuilder(Builder): dns: Gtk.Label ip_port: Gtk.Label websocket: Gtk.Label + cert_scrolled: Gtk.ScrolledWindow features: Gtk.Box features_listbox: Gtk.ListBox clipboard_button: Gtk.Button ===================================== gajim/gtk/server_info.py ===================================== @@ -40,8 +40,8 @@ from gajim.common.i18n import _ from .builder import get_builder +from .certificate_dialog import CertificateBox from .util import EventHelper -from .util import open_window log = logging.getLogger('gajim.gui.server_info') @@ -99,6 +99,9 @@ def __init__(self, account: str) -> None: self._cert = self._client.certificate self._add_connection_info() + cert_box = CertificateBox(account, self._cert) + self._ui.cert_scrolled.add(cert_box) + for feature in self._get_features(): self._add_feature(feature) self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) @@ -128,8 +131,6 @@ def _add_connection_info(self) -> None: self._ui.proxy_type.set_text(proxy.type) self._ui.proxy_host.set_text(proxy.host) - self._ui.cert_button.set_sensitive(self._cert) - self._ui.domain.set_text(address.domain) visible = address.service is not None @@ -147,12 +148,6 @@ def _add_connection_info(self) -> None: self._ui.websocket.set_visible(visible) self._ui.websocket.set_text(address.uri or '') - def _on_cert_button_clicked(self, _button: Gtk.Button) -> None: - open_window('CertificateDialog', - account=self.account, - transient_for=self, - cert=self._cert) - def _add_contact_addresses(self, dataforms: list[SimpleDataForm]) -> None: fields = { 'admin-addresses': _('Admin'), @@ -342,6 +337,7 @@ def __init__(self, feature: Feature) -> None: self._icon = Gtk.Image() self._feature_label = Gtk.Label() + self._feature_label.set_halign(Gtk.Align.START) self._additional_label = Gtk.Label() self._additional_label.set_halign(Gtk.Align.START) self._additional_label.set_no_show_all(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/264735fbbff25ae499f517b67e7bc34a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/264735fbbff25ae499f517b67e7bc34a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CertificateDialog: Factor Box out into own widget
by Philipp Hörist (＠lovetox) 25 Jan '22

25 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 11a91bc3 by lovetox at 2022-01-26T00:48:36+01:00 CertificateDialog: Factor Box out into own widget This allows us to add it to other Dialogs - - - - - 4 changed files: - gajim/data/gui/certificate_dialog.ui → gajim/data/gui/certificate.ui - gajim/gtk/builder.pyi - gajim/gtk/certificate_dialog.py - pyrightconfig.json Changes: ===================================== gajim/data/gui/certificate_dialog.ui → gajim/data/gui/certificate.ui ===================================== ===================================== gajim/gtk/builder.pyi ===================================== @@ -175,7 +175,7 @@ class CallWidgetBuilder(Builder): av_cam_image: Gtk.Image -class CertificateDialogBuilder(Builder): +class CertificateBuilder(Builder): certificate_box: Gtk.Box label_cert_for_account: Gtk.Label data_it_common_name: Gtk.Label @@ -981,7 +981,7 @@ def get_builder(file_name: Literal['bookmarks.ui'], widgets: list[str] = ...) -> @overload def get_builder(file_name: Literal['call_widget.ui'], widgets: list[str] = ...) -> CallWidgetBuilder: ... @overload -def get_builder(file_name: Literal['certificate_dialog.ui'], widgets: list[str] = ...) -> CertificateDialogBuilder: ... +def get_builder(file_name: Literal['certificate.ui'], widgets: list[str] = ...) -> CertificateBuilder: ... @overload def get_builder(file_name: Literal['chat_control.ui'], widgets: list[str] = ...) -> ChatControlBuilder: ... @overload ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -31,28 +31,41 @@ def __init__(self, account: str, cert: Gio.TlsCertificate ) -> None: + Gtk.ApplicationWindow.__init__(self) self.account = account self.set_name('CertificateDialog') self.set_application(app.app) self.set_show_menubar(False) - self.set_resizable(False) + self.set_resizable(True) self.set_position(Gtk.WindowPosition.CENTER) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.set_title(_('Certificate')) - self._ui = get_builder('certificate_dialog.ui') - self.add(self._ui.certificate_box) + self.add(CertificateBox(account, cert)) self.connect('key-press-event', self._on_key_press) - self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + self.set_transient_for(transient_for) + self.show_all() + + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + +class CertificateBox(Gtk.Box): + def __init__(self, account: str, cert: Gio.TlsCertificate) -> None: + Gtk.Box.__init__(self) + + self._ui = get_builder('certificate.ui') certificate = convert_gio_to_openssl_cert(cert) - # Get data for labels and copy button + issuer = certificate.get_issuer() subject = certificate.get_subject() - self._headline = _('Certificate for \n%s') % self.account + self._headline = _('Certificate for \n%s') % account self._it_common_name = subject.commonName or '' self._it_organization = subject.organizationName or '' self._it_org_unit = subject.organizationalUnitName or '' @@ -64,19 +77,28 @@ def __init__(self, self._ib_common_name = issuer.commonName or '' self._ib_organization = issuer.organizationName or '' self._ib_org_unit = issuer.organizationalUnitName or '' - issued = datetime.strptime(certificate.get_notBefore().decode('ascii'), - '%Y%m%d%H%M%SZ') - self._issued = issued.strftime('%c %Z') - expires = datetime.strptime(certificate.get_notAfter().decode('ascii'), - '%Y%m%d%H%M%SZ') - self._expires = expires.strftime('%c %Z') - sha1 = certificate.digest('sha1').decode('utf-8') + + before = certificate.get_notBefore() + if before is None: + self._issued = '' + else: + issued = datetime.strptime(before.decode('ascii'), '%Y%m%d%H%M%SZ') + self._issued = issued.strftime('%c %Z') + + after = certificate.get_notAfter() + if after is None: + self._expires = '' + else: + expires = datetime.strptime(after.decode('ascii'), '%Y%m%d%H%M%SZ') + self._expires = expires.strftime('%c %Z') + + sha1 = certificate.digest('sha1').decode('utf-8') # type: ignore self._sha1 = '%s\n%s' % (sha1[:29], sha1[30:]) - sha256 = certificate.digest('sha256').decode('utf-8') + + sha256 = certificate.digest('sha256').decode('utf-8') # type: ignore self._sha256 = '%s\n%s\n%s\n%s' % ( sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) - # Set labels self._ui.label_cert_for_account.set_text(self._headline) self._ui.data_it_common_name.set_text(self._it_common_name) self._ui.data_it_organization.set_text(self._it_organization) @@ -90,13 +112,9 @@ def __init__(self, self._ui.data_sha1.set_text(self._sha1) self._ui.data_sha256.set_text(self._sha256) - self.set_transient_for(transient_for) - self._ui.connect_signals(self) - self.show_all() + self.add(self._ui.certificate_box) - def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: - if event.keyval == Gdk.KEY_Escape: - self.destroy() + self._ui.connect_signals(self) def _on_copy_cert_info_button_clicked(self, _widget: Gtk.Button) -> None: clipboard_text = \ @@ -117,4 +135,6 @@ def _on_copy_cert_info_button_clicked(self, _widget: Gtk.Button) -> None: self._sha1 + '\n' + \ _('SHA-256:') + '\n' + \ self._sha256 + '\n' - self._clipboard.set_text(clipboard_text, -1) + + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clipboard.set_text(clipboard_text, -1) ===================================== pyrightconfig.json ===================================== @@ -27,6 +27,7 @@ "gajim/gtk/app_page.py", "gajim/gtk/app_side_bar.py", "gajim/gtk/application.py", + "gajim/gtk/certificate_dialog.py", "gajim/gtk/blocking.py", "gajim/gtk/bookmarks.py", "gajim/gtk/builder.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11a91bc31cb7c7d17f796bc77a815403… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11a91bc31cb7c7d17f796bc77a815403… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatJoin: Set default size
by Philipp Hörist (＠lovetox) 25 Jan '22

25 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 75e0aa37 by lovetox at 2022-01-25T23:18:10+01:00 GroupchatJoin: Set default size - - - - - 1 changed file: - gajim/gtk/groupchat_join.py Changes: ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -47,6 +47,7 @@ def __init__(self, account: str, jid: str) -> None: self.set_show_menubar(False) self.set_title(_('Join Group Chat')) self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_default_size(500, 550) self._destroyed = False self.account = account View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75e0aa37313c0d961f0c768415dcf495… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75e0aa37313c0d961f0c768415dcf495… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ServerInfo: Simplify code
by Daniel Brötzmann (＠wurstsalat) 25 Jan '22

25 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b9b0dff6 by wurstsalat at 2022-01-25T23:09:41+01:00 ServerInfo: Simplify code - - - - - bdaf009f by wurstsalat at 2022-01-25T23:09:41+01:00 GroupchatDetails: Add page icon for affiliation - - - - - 4 changed files: - gajim/data/gui/groupchat_details.ui - gajim/data/gui/server_info.ui - gajim/gtk/builder.pyi - gajim/gtk/server_info.py Changes: ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -143,6 +143,7 @@ <packing> <property name="name">affiliations</property> <property name="title" translatable="yes">Affiliations</property> + <property name="icon-name">system-users-symbolic</property> <property name="position">2</property> </packing> </child> ===================================== gajim/data/gui/server_info.ui ===================================== @@ -1,21 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkNotebook" id="server_info_notebook"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <child> +  <object class="GtkGrid" id="server"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">center</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Hostname</property> <style> @@ -23,29 +24,29 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="server_hostname"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> <property name="ellipsize">end</property> - <property name="single_line_mode">True</property> + <property name="single-line-mode">True</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Server Software</property> <style> @@ -53,29 +54,29 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="server_software"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> <property name="ellipsize">end</property> - <property name="single_line_mode">True</property> + <property name="single-line-mode">True</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Server Uptime</property> <style> @@ -83,57 +84,72 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="server_uptime"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> <property name="ellipsize">end</property> - <property name="single_line_mode">True</property> + <property name="single-line-mode">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">12</property> + <property name="can-focus">False</property> + <property name="margin-top">12</property> <property name="label" translatable="yes">Contact Addresses</property> <style> <class name="bold16"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel" id="no_addresses_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="label" translatable="yes">No contact addresses published for this server.</property> <property name="wrap">True</property> - <property name="max_width_chars">50</property> + <property name="max-width-chars">50</property> <style> <class name="dim-label"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</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> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> <style> <class name="margin-18"/> </style> @@ -142,37 +158,38 @@ <child type="tab"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Server</property> </object> <packing> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> +  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> + <property name="column-homogeneous">True</property> <child> <object class="GtkLabel" id="connection_type"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="single_line_mode">True</property> + <property name="single-line-mode">True</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left-attach">1</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Proxy Type</property> <style> @@ -180,44 +197,44 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="left-attach">0</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkLabel" id="proxy_type"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">No proxy used</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="left-attach">1</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkButton" id="cert_button"> <property name="label" translatable="yes">View _Certificate</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="halign">center</property> - <property name="margin_top">12</property> - <property name="use_underline">True</property> + <property name="margin-top">12</property> + <property name="use-underline">True</property> <signal name="clicked" handler="_on_cert_button_clicked" swapped="no"/> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> + <property name="left-attach">0</property> + <property name="top-attach">8</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Proxy Host</property> <style> @@ -225,27 +242,27 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="left-attach">0</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkLabel" id="proxy_host"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label">-</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="left-attach">1</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Type</property> <style> @@ -253,14 +270,14 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="domain_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label">Domain</property> <style> @@ -268,14 +285,14 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="dns_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">end</property> <property name="label">DNS</property> <style> @@ -283,14 +300,14 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="ip_port_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">end</property> <property name="label">IP / Port</property> <style> @@ -298,14 +315,14 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="websocket_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">end</property> <property name="label">WebSocket URL</property> <style> @@ -313,56 +330,56 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="domain"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="dns"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">start</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="ip_port"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">start</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="websocket"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">start</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> <child> @@ -371,6 +388,33 @@ <child> <placeholder/> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> <style> <class name="margin-18"/> </style> @@ -382,29 +426,40 @@ <child type="tab"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Connection</property> </object> <packing> <property name="position">1</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkBox" id="features"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> + <property name="can-focus">False</property> + <property name="border-width">18</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkScrolledWindow" id="features_scrolled"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="max_content_height">500</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <property name="max-content-height">500</property> <child> - <placeholder/> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkListBox" id="features_listbox"> + <property name="name">ServerInfo</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + </object> + </child> + </object> </child> </object> <packing> @@ -416,16 +471,16 @@ <child> <object class="GtkButton" id="clipboard_button"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Copy info to clipboard</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Copy info to clipboard</property> <property name="halign">end</property> <signal name="clicked" handler="_on_clipboard_button_clicked" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">edit-copy-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">edit-copy-symbolic</property> </object> </child> </object> @@ -443,12 +498,12 @@ <child type="tab"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Features</property> </object> <packing> <property name="position">2</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> </object> ===================================== gajim/gtk/builder.pyi ===================================== @@ -819,7 +819,7 @@ class ServerInfoBuilder(Builder): ip_port: Gtk.Label websocket: Gtk.Label features: Gtk.Box - features_scrolled: Gtk.ScrolledWindow + features_listbox: Gtk.ListBox clipboard_button: Gtk.Button ===================================== gajim/gtk/server_info.py ===================================== @@ -12,19 +12,30 @@ # 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 cast +from typing import Any +from typing import NamedTuple +from typing import Optional + import logging -from collections import namedtuple from datetime import timedelta -from nbxmpp.errors import StanzaError -from nbxmpp.errors import MalformedStanzaError -from nbxmpp.namespaces import Namespace +from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.modules.dataforms import SimpleDataForm +from nbxmpp.namespaces import Namespace +from nbxmpp.structs import LastActivityData +from nbxmpp.structs import SoftwareVersionResult +from nbxmpp.task import Task + from gajim.common import app from gajim.common import ged +from gajim.common.events import ServerDiscoReceived from gajim.common.helpers import open_uri from gajim.common.i18n import _ @@ -35,25 +46,37 @@ log = logging.getLogger('gajim.gui.server_info') +class Feature(NamedTuple): + name: str + available: bool + additional: Optional[str] = None + + class ServerInfo(Gtk.ApplicationWindow, EventHelper): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ApplicationWindow.__init__(self) EventHelper.__init__(self) self.set_name('ServerInfo') self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) - self.set_default_size(400, 600) + self.set_default_size(500, 600) self.set_show_menubar(False) self.set_title(_('Server Info')) self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.account = account + self._client = app.get_client(account) self._destroyed = False + if app.settings.get('use_kib_mib'): + self._units = GLib.FormatSizeFlags.IEC_UNITS + else: + self._units = GLib.FormatSizeFlags.DEFAULT + self._ui = get_builder('server_info.ui') self.add(self._ui.server_info_notebook) - self.connect('destroy', self.on_destroy) + self.connect('destroy', self._on_destroy) self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self) @@ -61,39 +84,37 @@ def __init__(self, account): ('server-disco-received', ged.GUI1, self._server_disco_received), ]) - self.version = '' - self.hostname = app.get_hostname_from_account(account) - self._ui.server_hostname.set_text(self.hostname) - con = app.connections[account] - con.get_module('SoftwareVersion').request_software_version( - self.hostname, callback=self._software_version_received) + self._version = '' + self._hostname = app.get_hostname_from_account(account) + self._ui.server_hostname.set_text(self._hostname) + self._client.get_module('SoftwareVersion').request_software_version( + self._hostname, callback=self._software_version_received) - con.get_module('LastActivity').request_last_activity( - self.hostname, callback=self._on_last_activity) + self._client.get_module('LastActivity').request_last_activity( + self._hostname, callback=self._on_last_activity) - server_info = con.get_module('Discovery').server_info + server_info = self._client.get_module('Discovery').server_info self._add_contact_addresses(server_info.dataforms) - self.cert = con.certificate + self._cert = self._client.certificate self._add_connection_info() - self.feature_listbox = Gtk.ListBox() - self.feature_listbox.set_name('ServerInfo') - self.feature_listbox.set_selection_mode(Gtk.SelectionMode.NONE) - self._ui.features_scrolled.add(self.feature_listbox) - for feature in self.get_features(): - self.add_feature(feature) - self.clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + for feature in self._get_features(): + self._add_feature(feature) + self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) self.show_all() - def _on_key_press(self, _widget, event): + def _on_destroy(self, *args: Any) -> None: + self._destroyed = True + + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _add_connection_info(self): + def _add_connection_info(self) -> None: # Connection type - nbxmpp_client = app.connections[self.account].connection + nbxmpp_client = self._client.connection address = nbxmpp_client.current_address self._ui.connection_type.set_text(address.type.value) @@ -107,7 +128,7 @@ def _add_connection_info(self): self._ui.proxy_type.set_text(proxy.type) self._ui.proxy_host.set_text(proxy.host) - self._ui.cert_button.set_sensitive(self.cert) + self._ui.cert_button.set_sensitive(self._cert) self._ui.domain.set_text(address.domain) @@ -126,13 +147,13 @@ def _add_connection_info(self): self._ui.websocket.set_visible(visible) self._ui.websocket.set_text(address.uri or '') - def _on_cert_button_clicked(self, _button): + def _on_cert_button_clicked(self, _button: Gtk.Button) -> None: open_window('CertificateDialog', account=self.account, transient_for=self, - cert=self.cert) + cert=self._cert) - def _add_contact_addresses(self, dataforms): + def _add_contact_addresses(self, dataforms: list[SimpleDataForm]) -> None: fields = { 'admin-addresses': _('Admin'), 'status-addresses': _('Status'), @@ -159,8 +180,10 @@ def _add_contact_addresses(self, dataforms): row_count += 1 @staticmethod - def _get_addresses(fields, dataforms): - addresses = {} + def _get_addresses(fields: dict[str, str], + dataforms: list[SimpleDataForm] + ) -> Optional[dict[str, list[str]]]: + addresses: dict[str, list[str]] = {} for form in dataforms: field = form.vars.get('FORM_TYPE') if field.value != 'http://jabber.org/network/serverinfo': @@ -182,16 +205,19 @@ def _get_addresses(fields, dataforms): return None @staticmethod - def _get_address_type_label(text): + def _get_address_type_label(text: str) -> Gtk.Label: label = Gtk.Label(label=text) label.set_halign(Gtk.Align.END) label.set_valign(Gtk.Align.START) label.get_style_context().add_class('dim-label') return label - def _get_address_label(self, address, last=False): + def _get_address_label(self, + address: str, + last: bool = False + ) -> Gtk.Label: label = Gtk.Label() - label.set_markup('<a href="%s">%s</a>' % (address, address)) + label.set_markup(f'<a href="{address}">{address}</a>') label.set_ellipsize(Pango.EllipsizeMode.END) label.set_xalign(0) label.set_halign(Gtk.Align.START) @@ -201,13 +227,13 @@ def _get_address_label(self, address, last=False): label.set_margin_bottom(6) return label - def _on_activate_link(self, label, *args): + def _on_activate_link(self, label: Gtk.Label, *args: Any) -> int: open_uri(label.get_text(), account=self.account) return Gdk.EVENT_STOP - def _on_last_activity(self, task): + def _on_last_activity(self, task: Task) -> None: try: - result = task.finish() + result = cast(LastActivityData, task.finish()) except (StanzaError, MalformedStanzaError) as error: log.warning(error) return @@ -217,141 +243,137 @@ def _on_last_activity(self, task): if result.seconds >= 3600: hours = delta.seconds // 3600 uptime = _('%(days)s days, %(hours)s hours') % { - 'days': delta.days, 'hours': hours} + 'days': delta.days, + 'hours': hours} self._ui.server_uptime.set_text(uptime) - def _software_version_received(self, task): + def _software_version_received(self, task: Task) -> None: try: - result = task.finish() + result = cast(SoftwareVersionResult, task.finish()) except StanzaError: - self.version = _('Unknown') + self._version = _('Unknown') else: - self.version = '%s %s' % (result.name, result.version) + self._version = f'{result.name} {result.version}' - self._ui.server_software.set_text(self.version) + self._ui.server_software.set_text(self._version) - @staticmethod - def update(func, listbox): - for index, item in enumerate(func()): - row = listbox.get_row_at_index(index) - row.get_child().update(item) - row.set_tooltip_text(row.get_child().tooltip) - - def _server_disco_received(self, _event): - self.update(self.get_features, self.feature_listbox) + def _server_disco_received(self, _event: ServerDiscoReceived) -> None: + features = self._get_features() + for index, item in enumerate(features): + row = cast( + FeatureItem, self._ui.features_listbox.get_row_at_index(index)) + row.update(item) - def add_feature(self, feature): + def _add_feature(self, feature: Feature) -> None: item = FeatureItem(feature) - self.feature_listbox.add(item) - item.get_parent().set_tooltip_text(item.tooltip or '') - - def get_features(self): - con = app.connections[self.account] - Feature = namedtuple('Feature', - ['name', 'available', 'tooltip', 'enabled']) - Feature.__new__.__defaults__ = (None, None) # type: ignore - - # HTTP File Upload - http_upload_info = con.get_module('HTTPUpload').httpupload_namespace - if con.get_module('HTTPUpload').available: - max_file_size = con.get_module('HTTPUpload').max_file_size - if max_file_size is not None: - max_file_size = max_file_size / (1024 * 1024) - http_upload_info = http_upload_info + ' (max. %s MiB)' % \ - max_file_size + self._ui.features_listbox.add(item) + + def _get_features(self) -> list[Feature]: + http_upload_module = self._client.get_module('HTTPUpload') + http_upload_info = http_upload_module.httpupload_namespace + if http_upload_module.available: + max_size = http_upload_module.max_file_size + if max_size is not None: + max_size = GLib.format_size_full(max_size, self._units) + http_upload_info = f'{http_upload_info} (max. {max_size})' return [ Feature('XEP-0045: Multi-User Chat', - con.get_module('MUC').supported), + self._client.get_module('MUC').supported), Feature('XEP-0054: vcard-temp', - con.get_module('VCardTemp').supported), + self._client.get_module('VCardTemp').supported), Feature('XEP-0077: In-Band Registration', - con.get_module('Register').supported), + self._client.get_module('Register').supported), Feature('XEP-0163: Personal Eventing Protocol', - con.get_module('PEP').supported), + self._client.get_module('PEP').supported), Feature('XEP-0163: #publish-options', - con.get_module('PubSub').publish_options), + self._client.get_module('PubSub').publish_options), Feature('XEP-0191: Blocking Command', - con.get_module('Blocking').supported, + self._client.get_module('Blocking').supported, Namespace.BLOCKING), Feature('XEP-0198: Stream Management', - con.features.has_sm, Namespace.STREAM_MGMT), + self._client.features.has_sm, + Namespace.STREAM_MGMT), Feature('XEP-0258: Security Labels in XMPP', - con.get_module('SecLabels').supported, + self._client.get_module('SecLabels').supported, Namespace.SECLABEL), Feature('XEP-0280: Message Carbons', - con.get_module('Carbons').supported, + self._client.get_module('Carbons').supported, Namespace.CARBONS), Feature('XEP-0313: Message Archive Management', - con.get_module('MAM').available), + self._client.get_module('MAM').available), Feature('XEP-0363: HTTP File Upload', - con.get_module('HTTPUpload').available, + self._client.get_module('HTTPUpload').available, http_upload_info), Feature('XEP-0398: Avatar Conversion', - con.get_module('VCardAvatars').avatar_conversion_available), + self._client.get_module('VCardAvatars').avatar_conversion_available), Feature('XEP-0411: Bookmarks Conversion', - con.get_module('Bookmarks').conversion), + self._client.get_module('Bookmarks').conversion), Feature('XEP-0402: Bookmarks Compat', - con.get_module('Bookmarks').compat), + self._client.get_module('Bookmarks').compat), Feature('XEP-0402: Bookmarks Compat PEP', - con.get_module('Bookmarks').compat_pep) + self._client.get_module('Bookmarks').compat_pep) ] - def _on_clipboard_button_clicked(self, _widget): - server_software = 'Server Software: %s\n' % self.version + def _on_clipboard_button_clicked(self, _widget: Gtk.Button) -> None: + server_software = _('Server Software: %s\n') % self._version server_features = '' - for feature in self.get_features(): + for feature in self._get_features(): if feature.available: - available = 'Yes' - else: - available = 'No' - if feature.tooltip is not None: - tooltip = '(%s)' % feature.tooltip + available = _('Available') else: - tooltip = '' - server_features += '%s: %s %s\n' % ( - feature.name, available, tooltip) + available = _('Not available') + additional = '' + if feature.additional is not None: + additional = f'({feature.additional})' + server_features += f'{feature.name}: {available} {additional}\n' clipboard_text = server_software + server_features - self.clipboard.set_text(clipboard_text, -1) + self._clipboard.set_text(clipboard_text, -1) - def on_destroy(self, *args): - self._destroyed = True +class FeatureItem(Gtk.ListBoxRow): + def __init__(self, feature: Feature) -> None: + Gtk.ListBoxRow.__init__(self) + self._feature = feature + + grid = Gtk.Grid(row_spacing=3, column_spacing=12) + + self._icon = Gtk.Image() + self._feature_label = Gtk.Label() + self._additional_label = Gtk.Label() + self._additional_label.set_halign(Gtk.Align.START) + self._additional_label.set_no_show_all(True) + self._additional_label.get_style_context().add_class('dim-label') + + grid.attach(self._icon, 0, 0, 1, 1) + grid.attach(self._feature_label, 1, 0, 1, 1) + grid.attach(self._additional_label, 1, 1, 1, 1) + + self._set_feature() + + self.add(grid) + self.show_all() + + def _set_feature(self) -> None: + self._feature_label.set_text(self._feature.name) + if self._feature.additional is not None: + self._additional_label.set_text(self._feature.additional) + self._additional_label.show() + + self._icon.get_style_context().remove_class('error-color') + self._icon.get_style_context().remove_class('success-color') -class FeatureItem(Gtk.Grid): - def __init__(self, feature): - super().__init__() - self.tooltip = feature.tooltip - self.set_column_spacing(6) - - self.icon = Gtk.Image() - self.feature_label = Gtk.Label(label=feature.name) - self.set_feature(feature.available, feature.enabled) - - self.add(self.icon) - self.add(self.feature_label) - - def set_feature(self, available, enabled): - self.icon.get_style_context().remove_class('error-color') - self.icon.get_style_context().remove_class('warning-color') - self.icon.get_style_context().remove_class('success-color') - - if not available: - self.icon.set_from_icon_name('window-close-symbolic', - Gtk.IconSize.MENU) - self.icon.get_style_context().add_class('error-color') - elif enabled is False: - self.icon.set_from_icon_name('dialog-warning-symbolic', - Gtk.IconSize.MENU) - self.tooltip += _('\nDisabled in preferences') - self.icon.get_style_context().add_class('warning-color') + if self._feature.available: + self._icon.set_from_icon_name( + 'emblem-ok-symbolic', Gtk.IconSize.MENU) + self._icon.get_style_context().add_class('success-color') else: - self.icon.set_from_icon_name('emblem-ok-symbolic', - Gtk.IconSize.MENU) - self.icon.get_style_context().add_class('success-color') + self._icon.set_from_icon_name( + 'window-close-symbolic', Gtk.IconSize.MENU) + self._icon.get_style_context().add_class('error-color') - def update(self, feature): - self.tooltip = feature.tooltip - self.set_feature(feature.available, feature.enabled) + def update(self, feature: Feature) -> None: + self._feature = feature + self._set_feature() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/45585811f2f1eaf77bd5f0794638708… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/45585811f2f1eaf77bd5f0794638708… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Notifications: Add code comment
by Philipp Hörist (＠lovetox) 25 Jan '22

25 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 12c20823 by lovetox at 2022-01-25T22:59:16+01:00 Notifications: Add code comment - - - - - 45585811 by lovetox at 2022-01-25T23:06:14+01:00 PlainWidget: Use open_uri() to open links - - - - - 2 changed files: - gajim/gtk/conversation/plain_widget.py - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -86,6 +86,7 @@ def __init__(self, account: str, selectable: bool) -> None: self.get_style_context().add_class('gajim-conversation-text') self.connect('populate-popup', self._on_populate_popup) + self.connect('activate-link', self._on_activate_link) def _on_populate_popup(self, label: Gtk.Label, menu: Gtk.Menu) -> None: selected, start, end = label.get_selection_bounds() @@ -118,6 +119,10 @@ def add_action_phrase(self, text: str) -> None: def update_text_tags(self) -> None: pass + def _on_activate_link(self, _label: Gtk.Label, uri: str) -> int: + open_uri(uri, self._account) + return Gdk.EVENT_STOP + class MessageTextview(Gtk.TextView): def __init__(self, account: str) -> None: ===================================== gajim/gtk/notification.py ===================================== @@ -253,6 +253,11 @@ def __init__(self): def _detect_dbus_caps(self) -> None: if app.is_flatpak() or app.desktop_env == 'gnome': + # Gnome Desktop does not use org.freedesktop.Notifications. + # It has its own API at org.gtk.Notifications, which is not an + # implementation of the freedesktop spec. There is no documentation + # on what it currently supports, we can assume at least what the + # GLib.Notification API offers (icons, actions). self._caps = ['actions'] self._dbus_available = True return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/58aaa25098197c1fcdac80ec523685b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/58aaa25098197c1fcdac80ec523685b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Notifications: Escape markup in body only if body-markup is supported
by Philipp Hörist (＠lovetox) 25 Jan '22

25 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 58aaa250 by lovetox at 2022-01-25T22:24:13+01:00 Notifications: Escape markup in body only if body-markup is supported - Gnome does not support body-markup - Title should not be escaped - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -247,11 +247,13 @@ class Linux(NotificationBackend): def __init__(self): NotificationBackend.__init__(self) self._dbus_available: bool = False - self._daemon_capabilities = ['actions'] + self._caps: list[str] = [] self._detect_dbus_caps() + log.info('Detected notification capabilities: %s', self._caps) def _detect_dbus_caps(self) -> None: - if app.is_flatpak(): + if app.is_flatpak() or app.desktop_env == 'gnome': + self._caps = ['actions'] self._dbus_available = True return @@ -259,7 +261,7 @@ def on_proxy_ready(_source: Gio.DBusProxy, res: Gio.AsyncResult) -> None: try: proxy = Gio.DBusProxy.new_finish(res) - self._daemon_capabilities = proxy.GetCapabilities() # type: ignore + self._caps = proxy.GetCapabilities() # type: ignore except GLib.Error as error: log.warning('Notifications D-Bus not available: %s', error) else: @@ -282,8 +284,13 @@ def _send(self, event: events.Notification) -> None: notification = Gio.Notification() if event.title is not None: - notification.set_title(GLib.markup_escape_text(event.title)) - notification.set_body(GLib.markup_escape_text(event.text)) + notification.set_title(event.title) + + text = event.text + if 'body-markup' in self._caps: + text = GLib.markup_escape_text(event.text) + + notification.set_body(text) notification.set_priority(Gio.NotificationPriority.NORMAL) icon = self._make_icon(event) @@ -302,7 +309,7 @@ def _add_actions(self, if event.type not in self._action_types: return - if 'actions' not in self._daemon_capabilities: + if 'actions' not in self._caps: return jid = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/58aaa25098197c1fcdac80ec523685b4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/58aaa25098197c1fcdac80ec523685b4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Backport jingle-initiator, fixes jingle file transfer from Conversations
by Philipp Hörist (＠lovetox) 25 Jan '22

25 Jan '22

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: e98cf336 by ValdikSS at 2021-12-15T03:13:02+03:00 Backport jingle-initiator, fixes jingle file transfer from Conversations Conversations XMPP client does not include initiator attribute in Jingle connection stanza, while Gajim 1.3 expects it and fails to accept the file or even show the file transfer dialog without it. - - - - - 1 changed file: - gajim/common/jingle_session.py Changes: ===================================== gajim/common/jingle_session.py ===================================== @@ -516,7 +516,17 @@ def __on_session_initiate(self, stanza, jingle, error, action): """ if self.state != JingleStates.ENDED: raise OutOfOrder - self.initiator = jingle['initiator'] + + # In "session-initiate", the <jingle/> element SHOULD possess an + # 'initiator' attribute. If it differs from the JID 'from', jingle + # 'initiator' SHOULD be ignored. + if jingle['initiator'] is None: + self.initiator = str(stanza['from']) + elif str(jingle['initiator']) != str(stanza['from']): + self.initiator = str(stanza['from']) + else: + self.initiator = str(jingle['initiator']) + self.responder = self.ourjid self.peerjid = self.initiator self.accepted = False # user did not accept this session yet View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e98cf3367c962c8de4345e27ff09e68f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e98cf3367c962c8de4345e27ff09e68f… 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 January 2022