Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] ChatList: Add chatstate icon
by Daniel Brötzmann 18 Feb '21

18 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e4a51256 by Daniel Brötzmann at 2021-02-18T19:13:59+01:00 ChatList: Add chatstate icon - - - - - 4 changed files: - gajim/data/gui/chat_list_row.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -95,17 +95,18 @@ </packing> </child> <child> - <object class="GtkLabel" id="unread_label"> + <object class="GtkImage" id="chatstate_image"> <property name="can-focus">False</property> <property name="no-show-all">True</property> + <property name="valign">end</property> + <property name="icon-name">content-loading-symbolic</property> <style> - <class name="unread-counter"/> + <class name="chatstate-icon"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> @@ -126,6 +127,21 @@ <property name="position">2</property> </packing> </child> + <child> + <object class="GtkLabel" id="unread_label"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <style> + <class name="unread-counter"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -165,7 +165,26 @@ .chatlist-row overlay > box { padding: 6px; } - +@keyframes composing { + 0% { + -gtk-icon-transform: translate(0px, 0px); + } + 10% { + -gtk-icon-transform: translate(0px, -3px) rotate(20deg); + } + 30% { + -gtk-icon-transform: translate(0px, -3px) rotate(-20deg); + } + 40% { + -gtk-icon-transform: translate(0px, 0px); + } +} +.chatstate-icon { + animation-name: composing; + animation-duration: 2.0s; + animation-timing-function: ease-in-out; + animation-iteration-count: infinite; +} .unread-counter { background-color: rgb(22, 100, 169); color: rgb(242, 242, 242); ===================================== gajim/gtk/chat_list.py ===================================== @@ -152,6 +152,8 @@ def process_event(self, event): self._on_presence_received(event) elif event.name == 'message-sent': self._on_message_sent(event) + elif event.name == 'chatstate-received': + self._on_chatstate_received(event) else: log.warning('Unhandled Event: %s', event.name) @@ -202,6 +204,15 @@ def _on_presence_received(self, event): row = self._chats.get((event.account, event.jid)) row.update_avatar() + def _on_chatstate_received(self, event): + row = self._chats.get((event.account, event.jid)) + if event.contact.is_gc_contact: + chatstate = event.contact.chatstate + else: + chatstate = app.contacts.get_combined_chatstate( + row.account, row.jid) + row.set_chatstate(chatstate) + @staticmethod def _add_unread(row, properties): if properties.is_carbon_message and properties.carbon.is_sent: @@ -329,6 +340,12 @@ def update_name(self): self._ui.name_label.set_text(name) + def set_chatstate(self, chatstate): + if chatstate == 'composing': + self._ui.chatstate_image.show() + else: + self._ui.chatstate_image.hide() + @property def unread_count(self): return self._unread_count ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -13,6 +13,7 @@ 'gc-message-received', 'presence-received', 'message-sent', + 'chatstate-received', ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4a5125627706d7aa87750f81ef78909… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4a5125627706d7aa87750f81ef78909… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Profile: Show error if avatar upload fails
by Philipp Hörist 17 Feb '21

17 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: b543f1ab by lovetox at 2021-02-17T22:05:26+01:00 Profile: Show error if avatar upload fails - - - - - 1 changed file: - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -236,8 +236,10 @@ def _on_save_clicked(self, _widget): else: # Only update avatar if it changed - con.get_module('UserAvatar').set_avatar(self._new_avatar, - public=public) + con.get_module('UserAvatar').set_avatar( + self._new_avatar, + public=public, + callback=self._on_set_avatar) nick = GLib.markup_escape_text(self._ui.nickname_entry.get_text()) con.get_module('UserNickname').set_nickname(nick, public=public) @@ -247,6 +249,28 @@ def _on_save_clicked(self, _widget): self.account, 'name') app.nicks[self.account] = nick + def _on_set_avatar(self, task): + try: + task.finish() + except StanzaError as error: + if self._new_avatar is None: + # Trying to remove the avatar but the node does not exist + if error.condition == 'item-not-found': + return + + title = _('Error while uploading avatar') + text = error.get_text() + + if (error.condition == 'not-acceptable' and + error.app_condition == 'payload-too-big'): + text = _('Avatar file size too big') + + ErrorDialog(title, text) + + self._ui.avatar_image.set_from_surface(self._current_avatar) + self._new_avatar = False + return + def _on_remove_avatar(self, _button): contact = app.contacts.create_contact(self._jid, self.account) scale = self.get_scale_factor() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b543f1ab31b022bb5e1326a25486401f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b543f1ab31b022bb5e1326a25486401f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DOAP: Update
by Daniel Brötzmann 17 Feb '21

17 Feb '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d58d6126 by wurstsalat at 2021-02-17T21:52:10+01:00 DOAP: Update - - - - - 1 changed file: - data/gajim.doap Changes: ===================================== data/gajim.doap ===================================== @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <?xml-stylesheet href="https://gajim.org/files/doap-style.xsl" type="text/xsl"?> -<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> -<Project xmlns="http://usefulinc.com/ns/doap#" +<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://usefulinc.com/ns/doap#" xmlns:xmpp="https://linkmauve.fr/ns/xmpp-doap#" xmlns:schema="https://schema.org/"> +<Project> <name>Gajim</name> <short-name>gajim</short-name> + <created>2004-05-21</created> + <shortdesc xml:lang="en">A fully-featured XMPP chat client</shortdesc> <description xml:lang="en"> Gajim aims to be an easy to use and fully-featured XMPP client. @@ -32,28 +35,32 @@ <os>Linux</os> <os>Windows</os> + <category rdf:resource='https://linkmauve.fr/ns/xmpp-doap#category-client'/> + <category rdf:resource="http://api.gnome.org/doap-extensions#apps"/> + <repository> <GitRepository> - <location rdf:resource="https://dev.gajim.org/gajim/gajim.git" /> - <browse rdf:resource="https://dev.gajim.org/gajim/" /> + <location rdf:resource="https://dev.gajim.org/gajim/gajim.git"/> + <browse rdf:resource="https://dev.gajim.org/gajim/"/> </GitRepository> </repository> - <implements rdf:resource="https://xmpp.org/rfcs/rfc6120.html" /> - <implements rdf:resource="https://xmpp.org/rfcs/rfc6121.html" /> - <implements rdf:resource="https://xmpp.org/rfcs/rfc6122.html" /> - <implements rdf:resource="https://xmpp.org/rfcs/rfc7395.html" /> - <implements rdf:resource="https://xmpp.org/rfcs/rfc7590.html" /> + <implements rdf:resource="https://xmpp.org/rfcs/rfc6120.html"/> + <implements rdf:resource="https://xmpp.org/rfcs/rfc6121.html"/> + <implements rdf:resource="https://xmpp.org/rfcs/rfc6122.html"/> + <implements rdf:resource="https://xmpp.org/rfcs/rfc7395.html"/> + <implements rdf:resource="https://xmpp.org/rfcs/rfc7590.html"/> + <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0004.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0004.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.9</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0027.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0027.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.3</xmpp:version> <xmpp:note>PGP Plugin</xmpp:note> @@ -61,14 +68,14 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0030.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0030.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.4</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0033.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0033.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.1</xmpp:version> <xmpp:note>Used to send one message to several JIDs at the same time and to forward messages.</xmpp:note> @@ -76,7 +83,7 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0045.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0045.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.31.2</xmpp:version> <xmpp:note>All basics stuff is supported. Also, some more advanced features like invitations, creation of rooms, etc.</xmpp:note> @@ -84,21 +91,21 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0047.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0047.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.3</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0048.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0048.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0049.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0049.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> <xmpp:note>For bookmark storage and meta contacts.</xmpp:note> @@ -106,28 +113,28 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0050.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0050.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0054.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0054.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0055.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0055.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.3</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0059.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0059.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> <xmpp:note>Used by XEP-0313.</xmpp:note> @@ -135,14 +142,14 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0060.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0060.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.13</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0065.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0065.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.8</xmpp:version> <xmpp:note>No handling of dstaddr attribute. Used for MUC, but exchanges real JID.</xmpp:note> @@ -150,7 +157,7 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0066.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0066.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.5</xmpp:version> <xmpp:note>Support for URLs in messages.</xmpp:note> @@ -158,105 +165,105 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0070.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0070.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0071.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0071.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.4</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0077.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0077.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.4</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0080.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0080.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.9</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0082.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0082.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0083.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0083.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0084.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0084.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0085.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0085.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0092.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0092.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0095.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0095.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0107.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0107.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0108.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0108.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.3</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0115.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0115.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.5</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0118.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0118.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0144.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0144.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.0</xmpp:version> <xmpp:note>Only the addition part is supported. Deletion or modification is not supported.</xmpp:note> @@ -264,35 +271,35 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0145.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0145.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0146.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0146.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0147.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0147.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0153.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0153.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0156.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0156.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.1.2</xmpp:version> <xmpp:note>Only DNS method.</xmpp:note> @@ -300,14 +307,14 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0157.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0157.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0158.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0158.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.0</xmpp:version> <xmpp:note>Images only.</xmpp:note> @@ -315,49 +322,49 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0163.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0163.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0172.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0172.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0174.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0174.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0175.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0175.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0178.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0178.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0184.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0184.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0191.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0191.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> <xmpp:note>Used when XEP-0016 is not available.</xmpp:note> @@ -365,49 +372,49 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0198.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0198.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.3</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0199.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0199.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0200.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0200.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0202.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0202.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0203.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0203.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0209.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0209.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0221.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0221.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.0</xmpp:version> <xmpp:note>Images only.</xmpp:note> @@ -415,28 +422,28 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0222.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0222.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0223.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0223.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0224.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0224.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0231.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0231.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.0</xmpp:version> <xmpp:note>No cache: Only for captchas.</xmpp:note> @@ -444,56 +451,56 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0234.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0234.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.17.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0237.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0237.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0245.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0245.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0249.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0249.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0258.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0258.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0261.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0261.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0280.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0280.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.12.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0284.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0284.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.1</xmpp:version> <xmpp:note>Whiteboard plugin.</xmpp:note> @@ -501,14 +508,14 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0292.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0292.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.10</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0297.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0297.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.3</xmpp:version> <xmpp:note>Supported for XEP-0313/XEP-0280.</xmpp:note> @@ -516,7 +523,7 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0300.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0300.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.3</xmpp:version> <xmpp:note>Used for XEP-0234.</xmpp:note> @@ -524,35 +531,35 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0306.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0306.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0308.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0308.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0313.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0313.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.6.3</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0319.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0319.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0333.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0333.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>0.4</xmpp:version> <xmpp:note>'displayed' markers are supported, but 'acknowledged' markers are not.</xmpp:note> @@ -560,21 +567,35 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0363.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0334.html"/> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.3.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0359.html"/> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.6.1</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0363.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.7.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0368.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0368.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0373.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0373.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.4.0</xmpp:version> <xmpp:note>OpenPGP plugin.</xmpp:note> @@ -582,7 +603,7 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0377.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0377.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>0.2</xmpp:version> <xmpp:note>Basic Spam/Abuse reporting via XEP-0191</xmpp:note> @@ -590,14 +611,14 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0380.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0380.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0384.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0384.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.1</xmpp:version> <xmpp:note>OMEMO plugin.</xmpp:note> @@ -605,7 +626,7 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0392.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0392.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.6.0</xmpp:version> <xmpp:note>Used for group chat participants and generated avatars.</xmpp:note> @@ -613,21 +634,21 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0398.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0398.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.2.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0411.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0411.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0441.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0441.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.2</xmpp:version> </xmpp:SupportedXep> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d58d6126e1ee19f75ecaf3af098d7af5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d58d6126e1ee19f75ecaf3af098d7af5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Update time, improve close button
by Daniel Brötzmann 17 Feb '21

17 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 23bfc8f0 by wurstsalat at 2021-02-17T21:46:41+01:00 ChatList: Update time, improve close button - - - - - 3 changed files: - gajim/data/gui/chat_list_row.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list.py Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -95,13 +95,11 @@ </packing> </child> <child> - <object class="GtkLabel" id="timestamp_label"> - <property name="visible">True</property> + <object class="GtkLabel" id="unread_label"> <property name="can-focus">False</property> - <property name="valign">end</property> + <property name="no-show-all">True</property> <style> - <class name="small-label"/> - <class name="dim-label"/> + <class name="unread-counter"/> </style> </object> <packing> @@ -112,11 +110,13 @@ </packing> </child> <child> - <object class="GtkLabel" id="unread_label"> + <object class="GtkLabel" id="timestamp_label"> + <property name="visible">True</property> <property name="can-focus">False</property> - <property name="no-show-all">True</property> + <property name="valign">end</property> <style> - <class name="unread-counter"/> + <class name="small-label"/> + <class name="dim-label"/> </style> </object> <packing> @@ -204,8 +204,8 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Close</property> <property name="valign">center</property> + <property name="margin-end">3</property> <child> <object class="GtkImage"> <property name="visible">True</property> @@ -213,10 +213,6 @@ <property name="icon-name">window-close-symbolic</property> </object> </child> - <style> - <class name="revealer-close-button"/> - <class name="flat"/> - </style> </object> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== @@ -152,10 +152,11 @@ .chatlist-row:selected label:not(.unread-counter){ color: @theme_text_color; } +.chatlist-row button { + padding: 3px; +} .chatlist-row:selected button { color: @theme_fg_color; -} -.chatlist-row:selected button:hover { border-color: @insensitive_fg_color; } .chatlist-row:selected image { @@ -164,10 +165,7 @@ .chatlist-row overlay > box { padding: 6px; } -.revealer-close-button { - padding: 0px; - margin-right: 6px; -} + .unread-counter { background-color: rgb(22, 100, 169); color: rgb(242, 242, 242); ===================================== gajim/gtk/chat_list.py ===================================== @@ -162,6 +162,7 @@ def _on_message_received(self, event): row = self._chats.get((event.account, event.jid)) nick = self._get_nick_for_received_message(event) row.set_last_message_text(nick, event.msgtxt) + row.set_timestamp(event.properties.timestamp) self._add_unread(row, event.properties) @@ -179,6 +180,7 @@ def _on_message_sent(self, event): else: nick = _('Me: ') row.set_last_message_text(nick, msgtext) + row.set_timestamp(event.timestamp) @staticmethod def _get_nick_for_received_message(event): @@ -358,6 +360,10 @@ def _on_state_flags_changed(self, _listboxrow, *args): def _on_close_button_clicked(self, _button): app.window.remove_chat(self.workspace_id, self.account, self.jid) + def set_timestamp(self, timestamp): + self._timestamp = timestamp + self.update_time() + def update_time(self): if self._timestamp is not None: self._ui.timestamp_label.set_text( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/23bfc8f0ba5dd2a7869a29f75291f54a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/23bfc8f0ba5dd2a7869a29f75291f54a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControlBase: Fix pipeline
by Daniel Brötzmann 17 Feb '21

17 Feb '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 662817c8 by wurstsalat at 2021-02-17T09:36:27+01:00 ChatControlBase: Fix pipeline - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -183,7 +183,7 @@ def __init__(self, parent_win, widget_name, contact, acct, # inserted before the line break. This triggers the hscrollbar to show, # see: https://gitlab.gnome.org/GNOME/gtk/-/issues/2384 # Using set_hscroll_policy(Gtk.Scrollable.Policy.NEVER) would cause bad - # performance during resize, and prevent the window from being shrinked + # performance during resize, and prevent the window from being shrunk # horizontally under certain conditions (applies to GroupchatControl) hscrollbar = self.xml.conversation_scrolledwindow.get_hscrollbar() hscrollbar.hide() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/662817c893650a7775c27e51011c4cde… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/662817c893650a7775c27e51011c4cde… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControlBase: Add workaround for hscrollbar
by Daniel Brötzmann 16 Feb '21

16 Feb '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8031e049 by wurstsalat at 2021-02-16T23:58:00+01:00 ChatControlBase: Add workaround for hscrollbar As soon as a line break occurs in Gtk.TextView with word-char wrapping enabled, a hyphen character is automatically inserted before the line break. This triggers the hscrollbar to show, see: https://gitlab.gnome.org/GNOME/gtk/-/issues/2384 - - - - - 3 changed files: - gajim/chat_control_base.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -178,6 +178,16 @@ def __init__(self, parent_win, widget_name, contact, acct, self.conv_textview.tv.connect('key-press-event', self._on_conv_textview_key_press_event) + # This is a workaround: as soon as a line break occurs in Gtk.TextView + # with word-char wrapping enabled, a hyphen character is automatically + # inserted before the line break. This triggers the hscrollbar to show, + # see: https://gitlab.gnome.org/GNOME/gtk/-/issues/2384 + # Using set_hscroll_policy(Gtk.Scrollable.Policy.NEVER) would cause bad + # performance during resize, and prevent the window from being shrinked + # horizontally under certain conditions (applies to GroupchatControl) + hscrollbar = self.xml.conversation_scrolledwindow.get_hscrollbar() + hscrollbar.hide() + self.xml.conversation_scrolledwindow.add(self.conv_textview.tv) widget = self.xml.conversation_scrolledwindow.get_vadjustment() widget.connect('changed', self.on_conversation_vadjustment_changed) ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -621,7 +621,6 @@ <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> <property name="height_request">60</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> <property name="overlay_scrolling">False</property> <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -261,7 +261,6 @@ <property name="height_request">60</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> <property name="overlay_scrolling">False</property> <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8031e049a943219a69b7db906046a9c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8031e049a943219a69b7db906046a9c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AvatarSelector: Fix pipeline
by Daniel Brötzmann 15 Feb '21

15 Feb '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e985e13b by wurstsalat at 2021-02-15T21:08:55+01:00 AvatarSelector: Fix pipeline - - - - - 1 changed file: - gajim/gtk/avatar_selector.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -231,7 +231,7 @@ def get_pixbuf(self): width = min(self._crop.width, width - self._crop.x) height = min(self._crop.height, height - self._crop.y) - if width <= 0 or height <=0: + if width <= 0 or height <= 0: return None return GdkPixbuf.Pixbuf.new_subpixbuf( @@ -661,7 +661,7 @@ def _eval_radial_line(center_x, center_y, bounds_x, bounds_y, user_x): # Prevent division by zero return 0 - decision_slope = float(bounds_y - center_y) / (bounds_x - center_x) + decision_slope = slope_y / slope_x decision_intercept = - float(decision_slope * bounds_x) return int(decision_slope * user_x + decision_intercept) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e985e13b2d78f189beb507ebf029cc4a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e985e13b2d78f189beb507ebf029cc4a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AvatarSelector: Improve error handling
by Daniel Brötzmann 15 Feb '21

15 Feb '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b0a95097 by Daniel Brötzmann at 2021-02-15T19:49:07+01:00 AvatarSelector: Improve error handling Enable loading images <100px and add multiple fail-safes - - - - - 2 changed files: - gajim/gtk/avatar_selector.py - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -77,7 +77,6 @@ def __init__(self): self._crop_area = CropArea() self._crop_area.set_vexpand(True) - # self._crop_area.set_min_size(200, 200) self.add(self._crop_area) self._helper_label = Gtk.Label( @@ -145,7 +144,7 @@ def get_avatar_surface(self): def get_avatar_bytes(self): pixbuf = self._crop_area.get_pixbuf() if pixbuf is None: - return None + return False, None, 0, 0 scaled, width, height = self._scale_for_publish(pixbuf) success, data = scaled.save_to_bufferv('png', [], []) @@ -176,8 +175,8 @@ def __init__(self): self._active_region = Loc.OUTSIDE self._last_press_x = -1 self._last_press_y = -1 - self._base_width = 100 - self._base_height = 100 + self._base_width = 10 + self._base_height = 10 self._aspect = float(1.0) self.set_size_request(self._base_width, self._base_height) @@ -212,8 +211,8 @@ def set_pixbuf(self, pixbuf): self._crop.width = 2 * self._base_width self._crop.height = 2 * self._base_height - self._crop.x = (width - self._crop.width) / 2 - self._crop.y = (height - self._crop.height) / 2 + self._crop.x = abs((width - self._crop.width) / 2) + self._crop.y = abs((height - self._crop.height) / 2) self._scale = 0.0 self._image.x = 0 @@ -232,6 +231,9 @@ def get_pixbuf(self): width = min(self._crop.width, width - self._crop.x) height = min(self._crop.height, height - self._crop.y) + if width <= 0 or height <=0: + return None + return GdkPixbuf.Pixbuf.new_subpixbuf( self._browse_pixbuf, self._crop.x, self._crop.y, width, height) @@ -653,6 +655,12 @@ def _update_cursor(self, x_coord, y_coord): @staticmethod def _eval_radial_line(center_x, center_y, bounds_x, bounds_y, user_x): + slope_y = float(bounds_y - center_y) + slope_x = bounds_x - center_x + if slope_y == 0 or slope_x == 0: + # Prevent division by zero + return 0 + decision_slope = float(bounds_y - center_y) / (bounds_x - center_x) decision_intercept = - float(decision_slope * bounds_x) return int(decision_slope * user_x + decision_intercept) ===================================== gajim/gtk/profile.py ===================================== @@ -17,6 +17,7 @@ from gajim.gui.avatar import clip_circle from gajim.gui.avatar_selector import AvatarSelector +from gajim.gui.dialogs import ErrorDialog from gajim.gui.filechoosers import AvatarChooserDialog from gajim.gui.util import get_builder from gajim.gui.vcard_grid import VCardGrid @@ -276,12 +277,16 @@ def _on_cancel_update_avatar(self, _button): def _on_update_avatar(self, _button): success, data, width, height = self._avatar_selector.get_avatar_bytes() if not success: - # TODO: Error handling + self._ui.profile_stack.set_visible_child_name('profile') + ErrorDialog(_('Error while processing image'), + _('Failed to generate avatar.')) return sha = app.interface.avatar_storage.save_avatar(data) if sha is None: - # TODO: Error handling + self._ui.profile_stack.set_visible_child_name('profile') + ErrorDialog(_('Error while processing image'), + _('Failed to generate avatar.')) return self._new_avatar = Avatar() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b0a9509763b845fb35442ca90a233099… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b0a9509763b845fb35442ca90a233099… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused imports
by Philipp Hörist 15 Feb '21

15 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 02b2e66c by lovetox at 2021-02-15T16:39:34+01:00 Remove unused imports - - - - - 1 changed file: - gajim/common/modules/vcard_temp.py Changes: ===================================== gajim/common/modules/vcard_temp.py ===================================== @@ -16,8 +16,6 @@ from nbxmpp.namespaces import Namespace -from gajim.common import app -from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02b2e66ce4c58819e180584b1a45594c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02b2e66ce4c58819e180584b1a45594c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused code
by Philipp Hörist 15 Feb '21

15 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: bb5d0b9b by lovetox at 2021-02-15T16:22:04+01:00 Remove unused code - - - - - 2d53fc26 by lovetox at 2021-02-15T16:23:19+01:00 Profile: Don’t check for server features We just assume pubsub will be always there - - - - - 2 changed files: - gajim/application.py - gajim/common/modules/vcard_temp.py Changes: ===================================== gajim/application.py ===================================== @@ -458,7 +458,7 @@ def _get_account_actions(account): ('-start-chat', a.start_chat, 'online', 'as'), ('-add-contact', a.on_add_contact, 'online', 'as'), ('-services', a.on_service_disco, 'online', 's'), - ('-profile', a.on_profile, 'feature', 's'), + ('-profile', a.on_profile, 'online', 's'), ('-server-info', a.on_server_info, 'online', 's'), ('-archive', a.on_mam_preferences, 'feature', 's'), ('-pep-config', a.on_pep_config, 'online', 's'), @@ -554,10 +554,7 @@ def _set_shortcuts(self): self.set_accels_for_action(action, accels) def _on_feature_discovered(self, event): - if event.feature == Namespace.PUBSUB: - action = '%s-profile' % event.account - self.lookup_action(action).set_enabled(True) - elif event.feature == Namespace.MAM_2: + if event.feature == Namespace.MAM_2: action = '%s-archive' % event.account self.lookup_action(action).set_enabled(True) elif event.feature == Namespace.BLOCKING: ===================================== gajim/common/modules/vcard_temp.py ===================================== @@ -42,10 +42,6 @@ def pass_disco(self, info): self.supported = True self._log.info('Discovered vcard-temp: %s', info.jid) - app.nec.push_incoming_event(NetworkEvent('feature-discovered', - account=self._account, - feature=Namespace.VCARD)) - def get_instance(*args, **kwargs): return VCardTemp(*args, **kwargs), 'VCardTemp' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/944600ebee34e71ca80e224f7ef4061… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/944600ebee34e71ca80e224f7ef4061… 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