Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] ci: Fix debian build
by Yann Leboulanger (＠asterix) 22 Aug '22

22 Aug '22

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 7fd1302e by Yann Leboulanger at 2022-08-22T21:24:44+02:00 ci: Fix debian build - - - - - 2 changed files: - + debian/compat - debian/control Changes: ===================================== debian/compat ===================================== @@ -0,0 +1 @@ +13 ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> Build-Depends: - debhelper-compat (= 13), + debhelper (>= 13), dh-python, gettext (>= 0.17-4), libglib2.0-dev, @@ -13,6 +13,7 @@ Build-Depends: python3-gi-cairo, python3-nbxmpp-nightly (>=20220727), python3-setuptools, + python3-packaging, python3-pil, gir1.2-gtk-3.0 (>=3.24.30), Rules-Requires-Root: no View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7fd1302ef0e51b07851c02fa138d1ed1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7fd1302ef0e51b07851c02fa138d1ed1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][public-encryption-button] imprv: MessageActionsBox: Disable encryption button if MUC is public
by Daniel Brötzmann (＠wurstsalat) 22 Aug '22

22 Aug '22

Daniel Brötzmann pushed to branch public-encryption-button at gajim / gajim Commits: d2b54cb0 by wurstsalat at 2022-08-22T20:22:13+02:00 imprv: MessageActionsBox: Disable encryption button if MUC is public Fixes #10959 - - - - - 3 changed files: - gajim/common/modules/contacts.py - gajim/data/gui/message_actions_box.ui - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -671,6 +671,15 @@ def is_irc(self) -> bool: return False return disco_info.is_irc + @property + def encryption_available(self) -> bool: + disco_info = self.get_disco() + if disco_info is None: + return True + + return (disco_info.muc_is_members_only and + disco_info.muc_is_nonanonymous) + def get_config_value(self, field_name: str) -> Any: disco_info = self.get_disco() assert disco_info is not None ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="box"> @@ -91,7 +91,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Choose encryption</property> <property name="relief">none</property> <child> <object class="GtkImage" id="encryption_image"> ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -219,9 +219,25 @@ def switch_contact(self, contact: ChatContactT) -> None: self._set_settings_menu(contact) - encryption = self._contact.settings.get('encryption') - self._set_encryption_state(encryption) - self._set_encryption_details(encryption) + encryption_available = True + if isinstance(self._contact, GroupchatContact): + encryption_available = self._contact.encryption_available + if not encryption_available: + self._ui.encryption_details_button.set_visible(False) + self._ui.encryption_menu_button.set_sensitive(False) + self._ui.encryption_image.set_from_icon_name( + 'channel-insecure-symbolic', Gtk.IconSize.MENU) + self._ui.encryption_menu_button.set_tooltip_text( + _('This is a public group chat. ' + 'Encryption is not available.')) + + if encryption_available: + self._ui.encryption_menu_button.set_sensitive(True) + self._ui.encryption_menu_button.set_tooltip_text( + _('Choose encryption')) + encryption = self._contact.settings.get('encryption') + self._set_encryption_state(encryption) + self._set_encryption_details(encryption) self._set_chatstate(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d2b54cb022f2a2c966a66b197af44cb2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d2b54cb022f2a2c966a66b197af44cb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch public-encryption-button
by Daniel Brötzmann (＠wurstsalat) 22 Aug '22

22 Aug '22

Daniel Brötzmann pushed new branch public-encryption-button at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/public-encryption-button You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Raise dependency versions
by Philipp Hörist (＠lovetox) 22 Aug '22

22 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ca38dd5e by lovetox at 2022-08-22T18:04:20+02:00 chore: Raise dependency versions - Show pango version in About dialog - Renamy python-cairo to pycairo - - - - - 4 changed files: - README.md - debian/control - gajim/gajim.py - gajim/gtk/about.py Changes: ===================================== README.md ===================================== @@ -5,6 +5,7 @@ ### Runtime Requirements - [Python](https://www.python.org/) (>=3.9) - [PyGObject](https://pypi.org/project/PyGObject/) - [pycairo](https://pypi.org/project/pycairo/) +- [cairo](https://gitlab.freedesktop.org/cairo/cairo) (>=1.16.0) - [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.1.1) - [pyOpenSSL](https://pypi.org/project/pyOpenSSL/) (>=16.2) - [css-parser](https://pypi.org/project/css-parser/) @@ -13,9 +14,10 @@ ### Runtime Requirements - [packaging](https://pypi.org/project/packaging/) - [Pillow](https://pypi.org/project/Pillow/) - [setuptools](https://pypi.org/project/setuptools/) -- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.22) +- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.24.30) - [GLib](https://gitlab.com/gnome/glib) (>=2.60.0) - [GtkSourceView](https://gitlab.gnome.org/GNOME/gtksourceview) +- [Pango](https://gitlab.gnome.org/GNOME/pango) (>=1.50.0) - [libsoup](https://gitlab.gnome.org/GNOME/libsoup/) ### Optional Runtime Requirements ===================================== debian/control ===================================== @@ -14,7 +14,7 @@ Build-Depends: python3-nbxmpp-nightly (>=20220727), python3-setuptools, python3-pil, - gir1.2-gtk-3.0, + gir1.2-gtk-3.0 (>=3.24.30), Rules-Requires-Root: no Standards-Version: 4.1.4 Homepage: https://gajim.org/ @@ -40,7 +40,8 @@ Depends: python3-pil, python3-setuptools, python3-css-parser, - gir1.2-gtk-3.0 (>= 3.22.27~), + gir1.2-pango-1.0 (>= 1.50.0), + gir1.2-gtk-3.0 (>= 3.24.30), gir1.2-gtksource-4, Recommends: aspell-en | aspell-dictionary, ===================================== gajim/gajim.py ===================================== @@ -31,10 +31,11 @@ _MIN_NBXMPP_VER = '3.1.1' -_MIN_GTK_VER = '3.22.27' +_MIN_GTK_VER = '3.24.30' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' _MIN_GLIB_VER = '2.60.0' +_MIN_PANGO_VER = '1.50.0' def check_version(dep_name: str, current_ver: str, min_ver: str) -> None: @@ -70,7 +71,7 @@ def _check_required_deps() -> None: try: import cairo except ImportError as error: - sys.exit(error_message % ('python-cairo', error)) + sys.exit(error_message % ('pycairo', error)) from gi.repository import Gtk gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), @@ -82,12 +83,15 @@ def _check_required_deps() -> None: GLib.MINOR_VERSION, GLib.MICRO_VERSION])) + from gi.repository import Pango + check_version('python-nbxmpp', nbxmpp.__version__, _MIN_NBXMPP_VER) check_version('pygobject', gi.__version__, _MIN_PYGOBJECT_VER) check_version('libcairo', cairo.cairo_version_string(), _MIN_CAIRO_VER) - check_version('python-cairo', cairo.version, _MIN_CAIRO_VER) + check_version('pycairo', cairo.version, _MIN_CAIRO_VER) check_version('gtk3', gtk_ver, _MIN_GTK_VER) check_version('glib', glib_ver, _MIN_GLIB_VER) + check_version('pango', Pango.version_string(), _MIN_PANGO_VER) def _init_gui(gui: str) -> None: ===================================== gajim/gtk/about.py ===================================== @@ -18,6 +18,7 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import GObject +from gi.repository import Pango import cairo @@ -56,9 +57,10 @@ def __init__(self): comments.append('') comments.append(_('GTK Version: %s') % gtk_ver) comments.append(_('GLib Version: %s') % glib_ver) + comments.append(_('Pango Version: %s') % Pango.version_string()) comments.append(_('PyGObject Version: %s') % gobject_ver) - comments.append(_('Cairo Version: %s') % cairo_ver) - comments.append(_('python-cairo Version: %s') % python_cairo_ver) + comments.append(_('cairo Version: %s') % cairo_ver) + comments.append(_('pycairo Version: %s') % python_cairo_ver) comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) self.set_comments('\n'.join(comments)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca38dd5ec54dc0134cc25d969e92fada… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca38dd5ec54dc0134cc25d969e92fada… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: StatusIcon: Use new icon for pending events
by Daniel Brötzmann (＠wurstsalat) 22 Aug '22

22 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6e7c3c63 by wurstsalat at 2022-08-22T17:50:42+02:00 imprv: StatusIcon: Use new icon for pending events Fallback to 'mail-message-new' on Flatpak is required - - - - - 2 changed files: - + gajim/data/icons/hicolor/scalable/status/dcraven-message-new.svg - gajim/gtk/status_icon.py Changes: ===================================== gajim/data/icons/hicolor/scalable/status/dcraven-message-new.svg ===================================== @@ -0,0 +1,637 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + width="32" + height="32" + id="svg5868" + sodipodi:version="0.32" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + sodipodi:docname="dcraven-message-new.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0" + inkscape:export-filename="/home/cornelius/Desktop/GAJIM iconset/data/iconsets/dcraven/32x32/message.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + sodipodi:modified="TRUE" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs + id="defs5870"> + <linearGradient + inkscape:collect="always" + id="linearGradient6166"> + <stop + style="stop-color:#73d216;stop-opacity:1" + offset="0" + id="stop6168" /> + <stop + style="stop-color:#66ba13;stop-opacity:1" + offset="1" + id="stop6170" /> + </linearGradient> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="24.999996" + x2="10.000471" + y1="24.999996" + x1="8.8586321" + id="linearGradient3811" + xlink:href="#linearGradient3805" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="13.072449" + x2="15.5" + y1="0.10591315" + x1="15.5" + id="linearGradient3173" + xlink:href="#linearGradient3167" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="15.460861" + x2="11.313708" + y1="10.041267" + x1="11.313708" + id="linearGradient3142" + xlink:href="#linearGradient3136" + inkscape:collect="always" /> + <linearGradient + y2="38.184418" + x2="19.293913" + y1="14.866997" + x1="19.293913" + gradientTransform="matrix(1,0,0,1.019549,-31.40102,-3.714102)" + gradientUnits="userSpaceOnUse" + id="linearGradient3122" + xlink:href="#linearGradient3124" + inkscape:collect="always" /> + <linearGradient + gradientTransform="matrix(0.876811,0,0,0.884616,2.431162,6.557698)" + y2="38.184418" + x2="19.293913" + y1="14.866997" + x1="19.293913" + gradientUnits="userSpaceOnUse" + id="linearGradient3095" + xlink:href="#linearGradient3058" + inkscape:collect="always" /> + <linearGradient + gradientTransform="matrix(0.876811,0,0,0.937062,2.431162,6.381118)" + y2="38.184418" + x2="19.293913" + y1="14.866997" + x1="19.293913" + gradientUnits="userSpaceOnUse" + id="linearGradient3093" + xlink:href="#linearGradient3058" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3058" + inkscape:collect="always"> + <stop + id="stop3060" + offset="0" + style="stop-color:#fafaf9;stop-opacity:1;" /> + <stop + id="stop3062" + offset="1" + style="stop-color:#ececec;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3124"> + <stop + style="stop-color:#fafaf9;stop-opacity:1;" + offset="0" + id="stop3126" /> + <stop + style="stop-color:#d7d7d7;stop-opacity:1" + offset="1" + id="stop3128" /> + </linearGradient> + <linearGradient + id="linearGradient3136" + inkscape:collect="always"> + <stop + id="stop3138" + offset="0" + style="stop-color:#ef2929;stop-opacity:1" /> + <stop + id="stop3140" + offset="1" + style="stop-color:#ba0000;stop-opacity:1" /> + </linearGradient> + <linearGradient + id="linearGradient3167" + inkscape:collect="always"> + <stop + id="stop3169" + offset="0" + style="stop-color:white;stop-opacity:1;" /> + <stop + id="stop3171" + offset="1" + style="stop-color:white;stop-opacity:0;" /> + </linearGradient> + <linearGradient + y2="609.5199" + x2="512.28497" + y1="365.21631" + x1="512.28497" + gradientTransform="matrix(3.659125,0,0,1.892176,-1492.258,-825.6305)" + gradientUnits="userSpaceOnUse" + id="linearGradient3255" + xlink:href="#linearGradient5048" + inkscape:collect="always" /> + <linearGradient + id="linearGradient5048"> + <stop + id="stop5050" + offset="0" + style="stop-color:black;stop-opacity:0;" /> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0.5" + id="stop5056" /> + <stop + id="stop5052" + offset="1" + style="stop-color:black;stop-opacity:0;" /> + </linearGradient> + <radialGradient + r="117.14286" + fy="488.07959" + fx="602.65948" + cy="488.07959" + cx="602.65948" + gradientTransform="matrix(2.746819,0,0,1.900281,-941.7278,-828.6181)" + gradientUnits="userSpaceOnUse" + id="radialGradient3257" + xlink:href="#linearGradient5060" + inkscape:collect="always" /> + <linearGradient + id="linearGradient5060" + inkscape:collect="always"> + <stop + id="stop5062" + offset="0" + style="stop-color:black;stop-opacity:1;" /> + <stop + id="stop5064" + offset="1" + style="stop-color:black;stop-opacity:0;" /> + </linearGradient> + <radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" + gradientUnits="userSpaceOnUse" + id="radialGradient3259" + xlink:href="#linearGradient5060" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3805" + inkscape:collect="always"> + <stop + id="stop3807" + offset="0" + style="stop-color:white;stop-opacity:1;" /> + <stop + id="stop3809" + offset="1" + style="stop-color:white;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient6126" + gradientUnits="userSpaceOnUse" + x1="15.5" + y1="0.10591315" + x2="15.5" + y2="13.072449" + gradientTransform="translate(-19.999995,-21)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3136" + id="linearGradient6131" + gradientUnits="userSpaceOnUse" + x1="11.313708" + y1="10.041267" + x2="11.313708" + y2="15.460861" + gradientTransform="translate(-19.999995,-21)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3805" + id="linearGradient6134" + gradientUnits="userSpaceOnUse" + x1="8.8586321" + y1="24.999996" + x2="10.000471" + y2="24.999996" + gradientTransform="translate(-19.999995,-21)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3124" + id="linearGradient6137" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.019549,-51.401015,-24.714102)" + x1="19.293913" + y1="14.866997" + x2="19.293913" + y2="38.184418" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3058" + id="linearGradient6142" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.56179943,0,0,0.65507342,2.1758649,5.3084907)" + x1="19.293913" + y1="14.866997" + x2="19.293913" + y2="38.184418" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3058" + id="linearGradient6146" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.59108158,0,0,0.61596522,1.4567103,5.2742774)" + x1="19.293913" + y1="14.866997" + x2="19.293913" + y2="38.184418" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5048" + id="linearGradient6152" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.659125,0,0,1.892176,-1492.258,-825.6305)" + x1="512.28497" + y1="365.21631" + x2="512.28497" + y2="609.5199" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient6154" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.746819,0,0,1.900281,-941.7278,-828.6181)" + cx="602.65948" + cy="488.07959" + fx="602.65948" + fy="488.07959" + r="117.14286" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient6156" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6166" + id="linearGradient6172" + x1="21.213203" + y1="14.47671" + x2="30.598438" + y2="16.501608" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,1)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3122-3" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.587733,0,0,0.453793,18.035612,-0.8400137)" + x1="17.725422" + y1="3.860764" + x2="27.055439" + y2="24.431168" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3223" + id="linearGradient3229" + x1="24.000008" + y1="31.785711" + x2="30.00001" + y2="38.499996" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.514307,0,0,0.531053,19.823682,-9.4929857)" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3223"> + <stop + style="stop-color:#729fcf;stop-opacity:1;" + offset="0" + id="stop3225" /> + <stop + style="stop-color:#396ea7;stop-opacity:1" + offset="1" + id="stop3227" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3957" + x1="16" + y1="2" + x2="32.927006" + y2="31.587952" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.725295,0,0,0.682879,14.70918,-5.7835017)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3118" + x1="24.260687" + y1="2.5335035" + x2="24.832115" + y2="22.012075" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3305,0,0,0.44295568,21.489561,-6.2673639)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3128" + id="radialGradient3221" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.764705,0,0,0.71453,13.788265,-15.699922)" + cx="21.142859" + cy="22.17857" + fx="21.142859" + fy="22.17857" + r="9" /> + <linearGradient + id="linearGradient3128" + inkscape:collect="always"> + <stop + id="stop3130" + offset="0" + style="stop-color:#fef291;stop-opacity:1" /> + <stop + id="stop3132" + offset="1" + style="stop-color:#edd400;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3115" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.909689,0,0,0.916448,10.32612,-10.167823)" + x1="16" + y1="2" + x2="38.465416" + y2="42.405006" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="linearGradient3113" + x1="15.571428" + y1="29.99917" + x2="15.571428" + y2="42.285942" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.721659,0,0,0.722208,15.580708,-9.6922277)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="linearGradient3116" + x1="15.571428" + y1="29.99917" + x2="15.571428" + y2="42.285942" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.721659,0,0,0.722208,14.137391,-9.6922277)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3103" + id="radialGradient3117" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.451479,0,0,1.326922,2.017389,-23.693285)" + cx="16.488304" + cy="23.537582" + fx="16.488304" + fy="23.537582" + r="19" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3103"> + <stop + style="stop-color:#73d216;stop-opacity:1" + offset="0" + id="stop3105" /> + <stop + style="stop-color:#4e9a06;stop-opacity:1" + offset="1" + id="stop3107" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient3127" + cx="23.991123" + cy="44.514973" + fx="23.991123" + fy="44.514973" + r="20.85965" + gradientTransform="matrix(0.663335,0,0,0.11651846,16.39013,16.634124)" + gradientUnits="userSpaceOnUse" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="15.556349" + inkscape:cx="26.902199" + inkscape:cy="13.885006" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:document-units="px" + inkscape:grid-bbox="true" + inkscape:window-width="1920" + inkscape:window-height="1009" + inkscape:window-x="-8" + inkscape:window-y="-8" + width="32px" + height="32px" + inkscape:pagecheckerboard="0" + inkscape:snap-midpoints="false" + inkscape:window-maximized="1" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> + <metadata + id="metadata5873"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="Layer 2" + style="display:inline"> + <g + id="g1986" + transform="translate(-16.141218,6.6790471)"> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient3127);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.680165;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="path3119" + cx="32.304283" + cy="21.820944" + rx="13.836936" + ry="2.4305375" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3117);fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 32.141219,4.8904253 c -7.049193,0 -13.500009,3.835561 -13.500009,6.3188637 0,1.155559 4.584884,0.493656 4.743246,1.507343 l 1.140204,7.919377 c 0,0.757614 0.388002,1.350953 0.889358,1.350953 4.569936,1.213496 9.058209,1.195698 13.431596,0 0.501357,0 0.912162,-0.59334 0.912162,-1.350953 l 1.140204,-7.919377 c 0.210487,-0.853968 4.743247,-0.351784 4.743246,-1.507343 0,-2.4833027 -6.450816,-6.3188637 -13.500007,-6.3188637 z" + id="rect2193" + sodipodi:nodetypes="csccccccsc" /> + <path + style="opacity:0.137778;fill:url(#linearGradient3116);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 23.518953,11.97401 c 0.780596,0.05418 2.242934,0.630826 2.886634,0 -1.338424,0.85311 -0.630016,6.411993 -1.288676,9.233943 -0.532636,-3.078224 -0.922989,-8.149915 -1.597958,-9.233943 z" + id="path2203" + sodipodi:nodetypes="cccc" /> + <path + sodipodi:nodetypes="cccc" + id="path3092" + d="m 40.838758,11.97401 c -0.780597,0.05418 -2.242935,0.630826 -2.886634,0 1.338424,0.85311 0.630015,6.411993 1.288675,9.233943 0.532636,-3.078224 0.922989,-8.149915 1.597959,-9.233943 z" + style="opacity:0.137778;fill:url(#linearGradient3113);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + sodipodi:nodetypes="csccccccsc" + id="path2200" + d="m 32.158614,5.8904263 c -6.605188,0 -12.944748,3.963519 -12.494797,5.1944347 0.0621,0.169878 3.538484,-0.554632 4.697025,1.001379 l 0.970742,7.596179 c 0,0.709955 0.05378,1.473666 0.523552,1.473665 4.393355,0.996408 8.581636,0.961641 12.585588,0 0.469778,0 0.54492,-0.556016 0.544921,-1.265968 l 1.020126,-7.701444 C 41.314167,10.78233 44.449242,11.663176 44.550148,10.877165 44.739457,9.4025453 38.763803,5.8904263 32.158614,5.8904263 Z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3115);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.0593608;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.423529;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="path2201" + cx="32.141212" + cy="8.8904352" + rx="3.4999976" + ry="3.0000017" /> + <path + style="fill:url(#radialGradient3221);fill-opacity:1;stroke:#c4a000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="m 32.141204,-5.1095754 c -3.590048,0 -6.499998,2.7209313 -6.499998,6.0735054 0,2.1426933 1.186771,4.0280503 2.982131,5.1094643 1.172036,1.248458 0.650108,0.840347 0.841399,2.370773 0,0.405659 0.354458,0.736858 0.788599,0.736858 1.39175,0.9976727 2.632324,0.8925797 3.775735,0 0.434144,0 0.788603,-0.3312 0.788603,-0.736858 0.227694,-1.498063 -0.101585,-1.307904 0.735074,-2.308082 1.854678,-1.070257 3.088455,-2.98744 3.088455,-5.1721553 0,-3.3525741 -2.909951,-6.0735054 -6.499998,-6.0735054 z" + id="path2159" + sodipodi:nodetypes="csccccccsc" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3118);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.345338;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="path3110" + transform="matrix(1,0,-0.46540548,0.88509759,0,0)" + cx="29.068079" + cy="-0.68871218" + rx="1.4021927" + ry="2.2596366" /> + <path + sodipodi:nodetypes="csccccccsc" + id="path3941" + d="m 32.116262,-4.1095724 c -3.023951,0 -5.475048,2.3853009 -5.475048,5.3243292 0,1.8783895 1.092749,3.2467945 2.786018,4.4788535 0.987223,1.094462 0.623644,0.945094 0.698178,2.09035 0,0.35562 0.125492,0.464838 0.491178,0.464838 1.024539,0.871317 2.075143,0.84879 3.059684,-0.02841 0.365688,0 0.399768,-0.159214 0.399768,-0.514834 0.12754,-1.483697 0.198657,-1.305328 0.903386,-2.182131 1.562225,-0.938238 2.611886,-2.393443 2.611886,-4.3086695 0,-2.9390291 -2.451098,-5.3243292 -5.47505,-5.3243292 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3957);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3229);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 29.147323,6.4231053 c 0.238053,0.410672 0.240436,0.834421 0.369974,1.944893 0,0.427101 0.344243,0.775541 0.770836,0.775541 1.367536,1.0504037 2.593002,0.9397567 3.716519,0 0.426591,0 0.824866,-0.335073 0.824866,-0.762172 0.146984,-1.036197 0.204956,-1.69938 0.359553,-2.060622 l -1.048792,0.603815 h -3.960042 z" + id="rect3216" + sodipodi:nodetypes="ccccccccc" /> + <path + sodipodi:nodetypes="ccccccc" + id="path3118" + d="m 30.641208,8.0018903 0.03177,0.459128 0.295739,-3.71e-4 c 1.07472,0.727125 1.733875,0.396194 2.366231,-0.003 l 0.2301,-2.87e-4 0.07617,-0.455504 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3122-3);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + </g> + </g> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer" + style="display:inline"> + <g + id="g1669" + transform="matrix(0.84275615,0,0,0.84275615,2.8730287,0.277767)"> + <g + style="display:inline;opacity:0.615721" + transform="matrix(0.01171965,0,0,0.01156799,17.632051,28.016284)" + id="g3197"> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#linearGradient6152);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3199" + width="1766.8337" + height="459.52847" + x="-1053.1652" + y="-131.86813" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402;fill:url(#radialGradient6154);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 713.66862,-131.86814 c 0,0 0,461.47139 0,461.47139 141.45436,0.86871 341.96798,-103.39233 341.96788,-230.765396 0,-127.373088 -157.85248,-230.705984 -341.96788,-230.705994 z" + id="path3201" + sodipodi:nodetypes="cccc" /> + <path + sodipodi:nodetypes="cccc" + id="path3203" + d="m -1053.1653,-131.86814 c 0,0 0,461.47139 0,461.47139 -141.4545,0.86871 -341.968,-103.39232 -341.968,-230.765395 0,-127.373086 157.8525,-230.705975 341.968,-230.705995 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402;fill:url(#radialGradient6156);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + </g> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6146);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="rect3056" + width="24.234327" + height="16.015079" + x="3.5254958" + y="13.589798" + rx="1.8042489" + ry="1.7884865" /> + <path + sodipodi:nodetypes="ccc" + id="path3090" + d="M 3.8210368,28.908582 15.369508,19.733056 27.429803,28.777912" + style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.405405" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6142);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 4.423063,14.479525 10.349206,9.539681 c 0.362537,0.27982 0.761136,0.376115 1.252526,1.69e-4 l 10.837459,-9.394603" + id="path3066" + sodipodi:nodetypes="cccc" /> + <rect + ry="0.87882441" + rx="0.8865695" + y="14.479525" + x="4.4230633" + height="14.235625" + width="22.43919" + id="rect3086" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + <path + sodipodi:nodetypes="cccc" + id="path3790" + d="m 5.3206308,14.479525 9.7804342,8.555689 c 0.564324,-0.02892 0.408905,0.231125 0.860986,-0.114235 l 10.002635,-8.308024" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + </g> + <ellipse + style="fill:#e30000;fill-opacity:1;stroke:#d60200;stroke-width:1.501;stroke-dasharray:none;stop-color:#000000;stroke-opacity:1;stroke-dashoffset:0" + id="path1032" + cx="24.908081" + cy="23.752359" + rx="4.7234011" + ry="4.5319118" /> + </g> +</svg> ===================================== gajim/gtk/status_icon.py ===================================== @@ -232,7 +232,10 @@ def update_state(self, init: bool = False) -> None: self._status_icon.set_visible(True) if not init and app.window.get_total_unread_count(): - self._status_icon.set_from_icon_name('mail-message-new') + icon_name = 'dcraven-message-new' + if app.is_flatpak(): + icon_name = 'mail-message-new' + self._status_icon.set_from_icon_name(icon_name) return show = get_global_show() @@ -316,7 +319,9 @@ def update_state(self, init: bool = False) -> None: self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) if not init and app.window.get_total_unread_count(): - icon_name = 'mail-message-new' + icon_name = 'dcraven-message-new' + if app.is_flatpak(): + icon_name = 'mail-message-new' self._status_icon.set_icon_full(icon_name, _('Pending Event')) return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e7c3c63262eb85423e3d4275eba5240… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e7c3c63262eb85423e3d4275eba5240… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][pinned-chat-dnd] 7 commits: refactor: Reduce indentation level
by Philipp Hörist (＠lovetox) 21 Aug '22

21 Aug '22

Philipp Hörist pushed to branch pinned-chat-dnd at gajim / gajim Commits: 87dccc70 by lovetox at 2022-08-21T20:19:31+02:00 refactor: Reduce indentation level - - - - - 1c8b8148 by lovetox at 2022-08-21T20:22:18+02:00 refactor: Move drag logic into drag data received handler - - - - - c77e67bb by lovetox at 2022-08-21T20:26:44+02:00 refactor: Make code more concise - - - - - 7c7067dd by lovetox at 2022-08-21T20:53:15+02:00 refactor: Make code more readable - - - - - d1d6ef5a by lovetox at 2022-08-21T20:54:24+02:00 refactor: Remove unnecessary properties - - - - - 57f7adb3 by lovetox at 2022-08-21T21:08:40+02:00 refactor: Simplify toggle_chat_pinned() - - - - - 5d71bdfc by lovetox at 2022-08-21T22:56:44+02:00 refactor: Fix some bugs when dropping under not pinned row - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -160,16 +160,22 @@ def emit_unread_changed(self) -> None: count) def _get_row_before(self, row: ChatRow) -> Optional[ChatRow]: - row = cast(ChatRow, self.get_row_at_index(row.get_index() - 1)) - return row + row_before = self.get_row_at_index(row.get_index() - 1) + if row_before is None: + return + return cast(ChatRow, row_before) def _get_row_after(self, row: ChatRow) -> Optional[ChatRow]: - row = cast(ChatRow, self.get_row_at_index(row.get_index() + 1)) - return row + row_after = self.get_row_at_index(row.get_index() + 1) + if row_after is None: + return + return cast(ChatRow, row_after) def _get_last_row(self) -> ChatRow: - row = cast(ChatRow, self.get_row_at_index(len(self.get_children()))) - return row + index = len(self.get_children()) - 1 + last_row = self.get_row_at_index(index) + assert last_row is not None + return cast(ChatRow, last_row) def set_drag_row(self, row: ChatRow) -> None: self._drag_row = row @@ -185,34 +191,9 @@ def _on_drag_data_received(self, ) -> None: item_type = selection_data.get_data_type().name() - if item_type == 'CHAT_LIST_ITEM': - row = cast(ChatRow, self.get_row_at_y(y_coord)) - if row: - alloc = row.get_allocation() - hover_row_y = alloc.y - hover_row_height = alloc.height - - if y_coord < hover_row_y + hover_row_height / 2: - row_before = self._get_row_before(row) - row_after = row - else: - row_before = row - row_after = self._get_row_after(row) - else: - row_before = self._get_last_row() - row_after = None - - if self._drag_row in (row_before, row_after): - return - - self._change_pinned_order(row_before, row_after) - else: + if item_type != 'CHAT_LIST_ITEM': log.debug('Unknown item type dropped') - - def _change_pinned_order(self, - row_before: Optional[ChatRow], - row_after: Optional[ChatRow] - ) -> None: + return assert self._drag_row is not None @@ -220,24 +201,43 @@ def _change_pinned_order(self, log.debug('Dropped row is not pinned') return + row = cast(ChatRow, self.get_row_at_y(y_coord)) + if row is not None: + alloc = row.get_allocation() + hover_row_y = alloc.y + hover_row_height = alloc.height + + if y_coord < hover_row_y + hover_row_height / 2: + row_before = self._get_row_before(row) + row_after = row + else: + row_before = row + row_after = self._get_row_after(row) + else: + row_before = self._get_last_row() + row_after = None + if self._drag_row in (row_before, row_after): - # TODO: already checked this case!? log.debug('Dropped row on self') return - if row_after is None: - log.debug('Dropped row into empty space') + if row_before is not None and not row_before.is_pinned: + log.debug('Dropped under not pinned row') return + self._change_pinned_order(row_before) + + def _change_pinned_order(self, row_before: Optional[ChatRow]) -> None: + assert self._drag_row is not None + self._chat_order.remove(self._drag_row) if row_before is None: self._chat_order.insert(0, self._drag_row) else: + offset = 0 if row_before.position < self._drag_row.position: offset = 1 - else: - offset = 0 self._chat_order.insert( row_before.position + offset, self._drag_row) @@ -374,7 +374,7 @@ def add_chat(self, position) self._chats[key] = row - if position != -1: + if pinned: self._chat_order.insert(position, row) self.add(row) @@ -451,17 +451,15 @@ def select_chat_number(self, number: int) -> None: def toggle_chat_pinned(self, account: str, jid: JID) -> None: row = self._chats[(account, jid)] - row.toggle_pinned() - self._chat_order.clear() - chat_rows = cast(list[ChatRow], self.get_children()) - for row in chat_rows: - if row.is_pinned: - row.position = chat_rows.index(row) - self._chat_order.append(row) - else: - row.position = -1 + if row.is_pinned: + self._chat_order.remove(row) + row.position = -1 + else: + self._chat_order.append(row) + row.position = self._chat_order.index(row) + row.toggle_pinned() self.invalidate_sort() def remove_chat(self, @@ -471,7 +469,7 @@ def remove_chat(self, ) -> None: row = self._chats.pop((account, jid)) - if row.position != -1: + if row.is_pinned: self._chat_order.remove(row) self.remove(row) row.destroy() @@ -691,7 +689,7 @@ def __init__(self, self.jid = jid self.workspace_id = workspace_id self.type = type_ - self._position = position + self.position = position self.active_label = ActiveHeader() self.conversations_label = ConversationsHeader() @@ -853,14 +851,6 @@ def header(self, type_: Optional[RowHeaderType]) -> None: def is_pinned(self) -> bool: return self._pinned - @property - def position(self) -> int: - return self._position - - @position.setter - def position(self, position: int) -> None: - self._position = position - def _on_button_press(self, _widget: Gtk.Widget, event: Gdk.EventButton View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/240f8e5ce059505646b1021326fe487… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/240f8e5ce059505646b1021326fe487… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch manpages
by Philipp Hörist (＠lovetox) 21 Aug '22

21 Aug '22

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

1 0

[Git][gajim/gajim][master] chore: Update man pages
by Philipp Hörist (＠lovetox) 21 Aug '22

21 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d8d3999a by lovetox at 2022-08-21T16:47:05+02:00 chore: Update man pages Move man page creation to markdown syntax. This allows for easier editing than groff syntax. - - - - - 5 changed files: - CONTRIBUTING.md - data/gajim-remote.1 - + data/gajim-remote.1.md - data/gajim.1 - + data/gajim.1.md Changes: ===================================== CONTRIBUTING.md ===================================== @@ -58,3 +58,15 @@ # Commit Messages Example: `feat: New Button which does something` + +# Man Pages + +Man pages are written in markdown and converted with pandoc + +While developing this command is useful to preview the manpage + + $ pandoc gajim.1.md -s -t man | /usr/bin/man -l - + +To convert the markdown + + $ pandoc gajim.1.md -s -t man -o gajim.1 ===================================== data/gajim-remote.1 ===================================== @@ -1,116 +1,71 @@ -.Dd January 21, 2018 -.Dt GAJIM-REMOTE 1 URM -.Os UNIX -.Sh NAME -.Nm gajim-remote -.Nd a remote control utility for -.Xr gajim 1 -.Sh SYNOPSIS -.Nm -.Ar command -.Sh DESCRIPTION -.Nm -is a script to control and communicate with a running instance of -.Xr gajim 1 -by D-Bus. -.Sh OPTIONS -.Bl -tag -width Ds -.It Available commands -.El -.Ss account_info Aq account -Gets detailed info on a account -.Ss change_status Bo status Bc Bo message Bc Bq account -Changes the status of account or accounts -.Ss check_gajim_running -Check if Gajim is running -.Ss contact_info Aq jid -Gets detailed info on a contact -.Ss get_status Bq account -Returns current status (the global one unless account is specified) -.Ss get_status_message Bq account -Returns current status message (the global one unless account is specified) -.Ss get_unread_msgs_number -Returns number of unread messages -.Ss help Bq command -Shows a help on specific command -.Ss list_accounts -Prints a list of registered accounts -.Ss list_contacts Bq account -Prints a list of all contacts in the roster. Each contact appears on a separate line -.Ss remove_contact Ao jid Ac Bq account -Removes contact from roster -.Ss send_chat_message Ao jid Ac Ao message Ac Bo PGP key Bc Bq account -Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''. -.Ss send_file Ao file Ac Ao jid Ac Bq account -Sends file to a contact -.Ss send_groupchat_message Ao room_jid Ac Ao message Ac Bq account -Sends new message to a groupchat you've joined. -.Ss send_single_message Ao jid subject Ac Ao message Ac Bo PGP key Bc Bq account -Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''. -.Ss send_xml Ao xml Ac Bq account -Sends custom XML -.Ss set_priority Ao priority Ac Bq account -Changes the priority of account or accounts -.Ss show_next_pending_event -Pops up a window with the next pending event -.Ss toggle_roster_appearance -Shows or hides the roster window -.Sh EXAMPLES -Open a URI of group chat gajim -.Pp -.Dl $ gajim-remote handle_uri xmpp:gajim@conference.gajim.org?join -.Pp -Send custom XML -.Pp -.Dl $ gajim-remote send_xml $(cat Pa filename.xml ) Qq your(a)jabber.id -.Sh AUTHORS -.An -nosplit -.Nm -is written and maintained by -.An Yann Leboulanger , -and -.An Denis Fomin , -with contributions and patches merged from many individuals around the world. -See files -.Pa AUTHORS -and -.Pa THANKS , -for a complete list. -.Sh COPYRIGHT -Copyright (C) 2003-2022 Gajim Team -.Pp -.Nm -is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. -.Pp -.Nm -is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -.Pp -You should have received a copy of the GNU General Public License along with -.Nm . -If not, see <https://www.gnu.org/licenses/>. -.Sh FEEDBACK -You can report bugs or feature requests in our bug tracker at -.Em https://dev.gajim.org/gajim/gajim/issues -or in the -.Em gajim-devel -mailing list; if you want to send us a patch, please do so in our bug tracker. -You can also find us in our chat room. -.Sh WWW -https://www.gajim.org/ -.Sh XMPP -You are welcome to join us at gajim(a)conference.gajim.org -.Sh MAILING LIST -Below are public mailing lists on lists.gajim.org -.Bd -literal -offset indent -https://lists.gajim.org/cgi-bin/listinfo/gajim-devel -https://lists.gajim.org/cgi-bin/listinfo/translators -.Ed -.Pp -More mailing lists at -.Bd -literal -offset indent -https://lists.gajim.org/cgi-bin/listinfo -.Ed -.Sh BUGS -Please submit bugs at https://dev.gajim.org/gajim/gajim/issues -.Sh SEE ALSO -.Xr gajim 1 +.\" Automatically generated by Pandoc 2.9.2.1 +.\" +.TH "gajim-remote" "1" "August 2022" "" "Manual" +.hy +.SH NAME +.PP +gajim-remote - a remote control utility for \f[B]gajim\f[R](1) +.SH SYNOPSIS +.PP +gajim-remote -h +.PD 0 +.P +.PD +gajim-remote \f[I]command\f[R] [arguments \&...] +.SH DESCRIPTION +.PP +gajim-remote is an application to control and communicate with a running +instance of \f[B]gajim\f[R](1) via dbus. +.SH OPTIONS +.TP +\f[B]\f[CB]-h, --help\f[B]\f[R] +Display the help +.TP +\f[B]\f[CB]--app-id\f[B]\f[R] APP_ID +The application id of the running \f[B]gajim\f[R](1) instance +.SH COMMANDS +.TP +\f[B]\f[CB]list_contacts\f[B]\f[R] account +Get all roster contacts +.TP +\f[B]\f[CB]list_accounts\f[B]\f[R] +Get the list of accounts +.TP +\f[B]\f[CB]change_status\f[B]\f[R] {offline,online,away,xa,dnd} message account +Change the status +.TP +\f[B]\f[CB]send_chat_message\f[B]\f[R] address message account +Send a chat message to a contact +.TP +\f[B]\f[CB]send_groupchat_message\f[B]\f[R] address message account +Send a chat message to a group chat +.TP +\f[B]\f[CB]account_info\f[B]\f[R] account +Get account details +.TP +\f[B]\f[CB]get_status\f[B]\f[R] account +Get the current status +.TP +\f[B]\f[CB]get_status_message\f[B]\f[R] account +Get the current status message +.TP +\f[B]\f[CB]get_unread_msgs_number\f[B]\f[R] +Get the unread message count +.SH BUGS +.PP +Please submit bugs at https://dev.gajim.org/gajim/gajim/issues. +.SH SUPPORT +.PP +You are welcome to join us at xmpp:gajim\[at]conference.gajim.org?join. +.SH COPYRIGHT +.PP +gajim is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; version 3 only. +.PP +gajim is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. +.SH AUTHORS +Philipp H\[:o]rist, Yann Leboulanger. ===================================== data/gajim-remote.1.md ===================================== @@ -0,0 +1,72 @@ +% gajim-remote(1) | Manual +% Philipp Hörist, Yann Leboulanger +% August 2022 + +# NAME + +gajim-remote - a remote control utility for **gajim**(1) + +# SYNOPSIS + +gajim-remote -h\ +gajim-remote *command* [arguments ...] + +# DESCRIPTION + +gajim-remote is an application to control and communicate with a running instance of **gajim**(1) via dbus. + +# OPTIONS + +`-h, --help` +: Display the help + +`--app-id` APP_ID +: The application id of the running **gajim**(1) instance + +# COMMANDS + +`list_contacts` account +: Get all roster contacts + +`list_accounts` +: Get the list of accounts + +`change_status` {offline,online,away,xa,dnd} message account +: Change the status + +`send_chat_message` address message account +: Send a chat message to a contact + +`send_groupchat_message` address message account +: Send a chat message to a group chat + +`account_info` account +: Get account details + +`get_status` account +: Get the current status + +`get_status_message` account +: Get the current status message + +`get_unread_msgs_number` +: Get the unread message count + +# BUGS + +Please submit bugs at https://dev.gajim.org/gajim/gajim/issues. + +# SUPPORT + +You are welcome to join us at xmpp:gajim@conference.gajim.org?join. + +# COPYRIGHT + +gajim is free software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the +Free Software Foundation; version 3 only. + +gajim is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. ===================================== data/gajim.1 ===================================== @@ -1,137 +1,117 @@ -.Dd January 21, 2018 -.Dt GAJIM 1 URM -.Os UNIX -.Sh NAME -.Nm gajim -.Nd A fully-featured XMPP chat client -.Sh SYNOPSIS -.Nm -.Fl h -.Nm -.Op Fl q -.Op Fl v -.Op Fl w -.Op Fl l Ar subsystem=level -.Op Fl p Ar name -.Op Fl s -.Op Fl c Ar directory -.Sh DESCRIPTION -.Nm -aims to be an easy to use and fully-featured XMPP client. -Just chat with your friends or family, easily share pictures and thoughts or -discuss the news with your groups. +.\" Automatically generated by Pandoc 2.9.2.1 +.\" +.TH "gajim" "1" "August 2022" "" "Manual" +.hy +.SH NAME +.PP +gajim - a fully-featured XMPP chat client +.SH SYNOPSIS +.PP +gajim -h +.PD 0 +.P +.PD +gajim --show +.PD 0 +.P +.PD +gajim --start-chat +.PD 0 +.P +.PD +gajim [-q] [-v] [-w] [-l subsystem=level] [-p name] [-s] [-c directory] +[--gdebug] [--cprofile] +.SH DESCRIPTION +.PP +\f[B]gajim\f[R] aims to be an easy to use and fully-featured XMPP +client. +Just chat with your friends or family, easily share pictures and +thoughts or discuss the news with your groups. Chat securely with End-to-End encryption via OMEMO or OpenPGP. -.Nm -integrates well with your other devices: -simply continue conversations on your mobile device. -.Pp +gajim integrates well with your other devices: simply continue +conversations on your mobile device. +.PP XMPP is the Extensible Messaging and Presence Protocol, a set of open technologies for instant messaging, presence, multi-party chat, voice -and video calls, collaboration, lightweight middleware, content -syndication, and generalized routing of XML data. For more information -on the XMPP protocol see <https://xmpp.org/about/>. -.Sh OPTIONS -.Bl -tag -width Ds -.It Fl h Fl Fl help +and video calls, collaboration, lightweight middle\[hy] ware, content +syndication, and generalized routing of XML data. +For more information on the XMPP protocol see https://xmpp.org/about/. +.SH OPTIONS +.TP +\f[B]\f[CB]-h, --help\f[B]\f[R] Show help options -.It Fl q Fl Fl quiet +.TP +\f[B]\f[CB]-V, --version\f[B]\f[R] +Show the application\[cq]s version +.TP +\f[B]\f[CB]-q, --quiet\f[B]\f[R] Show only critical errors -.It Fl s Fl Fl separate -Separate profiles completely (even history db and plugins) -.It Fl v Fl Fl verbose -Print xml stanzas and other debug information -.It Fl w Fl Fl warnings -Show all GTK warnings with traceback -.It Fl l Fl Fl loglevel Em subsystem=level Bq , Em subsystem=level Bq Em ... -Configure logging system. -Subsystem can be -.Em gajim.c.preview , -.Em gajim.gui.preview , -.Em .nbxmpp.stream , -etc. -.Pp -Level can be -.Em DEBUG , -.Em INFO , -.Em WARNING , -.Em ERROR -or -.Em CRITICAL . -.It Fl p Fl Fl profile Em name -Run -.Nm -using -.Pa config.name -in configuration directory -.It Fl c Fl Fl config-path Em directory -Where to look for configuration files -.El -.Sh FILES -.Bl -tag -width Ds -.It $XDG_CACHE_HOME/gajim/cache.db -Cache database file of transports, caps, roster entry, and roster group. -.It $XDG_CACHE_HOME/gajim/avatars/ -Cache directory of avatars. -.It $XDG_CONFIG_HOME/gajim/ -The config-path used when -.Op Fl c -is not specified. -.It $XDG_DATA_HOME/gajim/certs/ -Directory where certificates are stored. -.It $XDG_DATA_HOME/gajim/logs.db -The history database log file. -For more information on database logs see -<https://dev.gajim.org/gajim/gajim/wikis/development/LogsDatabase>. -.El -.Sh AUTHORS -.An -nosplit -.Nm -is written and maintained by -.An Yann Leboulanger -and -.An Philipp Hörist , -with contributions and patches merged from many individuals around the world. -See the About Dialog for a complete list. -.Sh COPYRIGHT -Copyright (C) 2003-2022 Gajim Team -.Pp -.Nm -is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. -.Pp -.Nm -is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -.Pp -You should have received a copy of the GNU General Public License along with -.Nm . -If not, see <https://www.gnu.org/licenses/>. -.Sh FEEDBACK -You can report bugs or feature requests in our bug tracker at -.Em https://dev.gajim.org/gajim/gajim/issues -or in the -.Em gajim-devel -mailing list; if you want to send us a patch, please do so in our bug tracker. -You can also find us in our chat room. -.Sh WWW -https://www.gajim.org/ -.Sh XMPP -You are welcome to join us at gajim(a)conference.gajim.org -.Sh MAILING LIST -Below are public mailing lists on lists.gajim.org -.Bd -literal -offset indent -https://lists.gajim.org/cgi-bin/listinfo/gajim-devel -https://lists.gajim.org/cgi-bin/listinfo/translators -.Ed -.Pp -More mailing lists at -.Bd -literal -offset indent -https://lists.gajim.org/cgi-bin/listinfo -.Ed -.Sh BUGS -Please submit bugs at -.Bd -literal -offset indent -https://dev.gajim.org/gajim/gajim/issues -https://dev.gajim.org/gajim/gajim-plugins/issues -https://dev.gajim.org/gajim/python-nbxmpp/issues -.Ed -.Sh SEE ALSO -.Xr gajim-remote 1 +.TP +\f[B]\f[CB]-s, --separate\f[B]\f[R] +Separate profile files completely (even history database and plugins) +.TP +\f[B]\f[CB]-v, --verbose\f[B]\f[R] +Print XML stanzas and other debug information +.TP +\f[B]\f[CB]-p, --profile=NAME\f[B]\f[R] +Use defined profile in configuration directory +.TP +\f[B]\f[CB]-c, --config-path=PATH\f[B]\f[R] +Set configuration directory +.TP +\f[B]\f[CB]-l, --loglevel=SUBSYSTEM=LEVEL\f[B]\f[R] +Configure logging. +.RS +.PP +SUBSYSTEM e.g.\ gajim.c.m +.PD 0 +.P +.PD +LEVEL (DEBUG, INFO, WARNING, ERROR, CRITICAL) +.PP +Example: gajim.c.m=DEBUG +.RE +.TP +\f[B]\f[CB]-w, --warnings\f[B]\f[R] +Show all warnings +.TP +\f[B]\f[CB]--gdebug\f[B]\f[R] +Sets an environment variable so GLib debug messages are printed +.TP +\f[B]\f[CB]--cprofile\f[B]\f[R] +Profile application with cprofile +.TP +\f[B]\f[CB]--start-chat\f[B]\f[R] +Start a new chat +.TP +\f[B]\f[CB]--show\f[B]\f[R] +Show Gajim +.SH FILES +.TP +$XDG_CACHE_HOME/gajim/ +The directory for cached data. +.TP +$XDG_CONFIG_HOME/gajim/ +The directory where settings and configurations are stored. +.TP +$XDG_DATA_HOME/gajim/ +The directory where all persistent data, e.g.\ the message database, is +stored. +.SH BUGS +.PP +Please submit bugs at https://dev.gajim.org/gajim/gajim/issues. +.SH SUPPORT +.PP +You are welcome to join us at xmpp:gajim\[at]conference.gajim.org?join. +.SH COPYRIGHT +.PP +gajim is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; version 3 only. +.PP +gajim is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. +.SH AUTHORS +Philipp H\[:o]rist, Daniel Br\[:o]tzmann, Yann Leboulanger. ===================================== data/gajim.1.md ===================================== @@ -0,0 +1,103 @@ +% gajim(1) | Manual +% Philipp Hörist, Daniel Brötzmann, Yann Leboulanger +% August 2022 + +# NAME + +gajim - a fully-featured XMPP chat client + +# SYNOPSIS + +gajim -h\ +gajim \--show\ +gajim \--start-chat\ +gajim [-q] [-v] [-w] [-l subsystem=level] [-p name] [-s] [-c directory] [\--gdebug] [\--cprofile] + +# DESCRIPTION + +**gajim** aims to be an easy to use and fully-featured XMPP client. Just chat with your friends or +family, easily share pictures and thoughts or discuss the news with your groups. Chat securely +with End-to-End encryption via OMEMO or OpenPGP. gajim integrates well with your other devices: +simply continue conversations on your mobile device. + +XMPP is the Extensible Messaging and Presence Protocol, a set of open technologies for instant +messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middle‐ +ware, content syndication, and generalized routing of XML data. For more information on the XMPP +protocol see https://xmpp.org/about/. + +# OPTIONS + +`-h, --help` + +: Show help options + +`-V, --version` +: Show the application's version + +`-q, --quiet` +: Show only critical errors + +`-s, --separate` +: Separate profile files completely (even history database and plugins) + +`-v, --verbose` +: Print XML stanzas and other debug information + +`-p, --profile=NAME` +: Use defined profile in configuration directory + +`-c, --config-path=PATH` +: Set configuration directory + +`-l, --loglevel=SUBSYSTEM=LEVEL` +: Configure logging. + + SUBSYSTEM e.g. gajim.c.m\ + LEVEL (DEBUG, INFO, WARNING, ERROR, CRITICAL) + + Example: gajim.c.m=DEBUG + +`-w, --warnings` +: Show all warnings + +`--gdebug` +: Sets an environment variable so GLib debug messages are printed + +`--cprofile` +: Profile application with cprofile + +`--start-chat` +: Start a new chat + +`--show` +: Show Gajim + +# FILES + +$XDG_CACHE_HOME/gajim/ +: The directory for cached data. + +$XDG_CONFIG_HOME/gajim/ +: The directory where settings and configurations are stored. + +$XDG_DATA_HOME/gajim/ +: The directory where all persistent data, e.g. the message database, is stored. + +# BUGS + +Please submit bugs at https://dev.gajim.org/gajim/gajim/issues. + +# SUPPORT + +You are welcome to join us at xmpp:gajim@conference.gajim.org?join. + +# COPYRIGHT + +gajim is free software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the +Free Software Foundation; version 3 only. + +gajim is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d8d3999a46a3a2832720541cc328cb89… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d8d3999a46a3a2832720541cc328cb89… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch manpages
by Philipp Hörist (＠lovetox) 21 Aug '22

21 Aug '22

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

1 0

[Git][gajim/gajim][pinned-chat-dnd] feature: ChatList: Add drag and drop for pinned chats
by Daniel Brötzmann (＠wurstsalat) 21 Aug '22

21 Aug '22

Daniel Brötzmann pushed to branch pinned-chat-dnd at gajim / gajim Commits: 240f8e5c by wurstsalat at 2022-08-21T16:45:11+02:00 feature: ChatList: Add drag and drop for pinned chats - - - - - 2 changed files: - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -22,11 +22,11 @@ import logging import time import pickle -import operator from gi.repository import Gio from gi.repository import Gdk from gi.repository import GLib +from gi.repository import GObject from gi.repository import Gtk import cairo @@ -67,6 +67,13 @@ class ChatList(Gtk.ListBox, EventHelper): + + __gsignals__ = { + 'chat-order-changed': (GObject.SignalFlags.RUN_LAST, + None, + ()), + } + def __init__(self, workspace_id: str) -> None: Gtk.ListBox.__init__(self) EventHelper.__init__(self) @@ -75,7 +82,6 @@ def __init__(self, workspace_id: str) -> None: self._chats: dict[tuple[str, JID], Any] = {} self._current_filter: str = 'all' self._current_filter_text: str = '' - self._chat_order: dict[tuple[str, JID], int] = {} self.get_style_context().add_class('chatlist') self.set_filter_func(self._filter_func) @@ -97,12 +103,16 @@ def __init__(self, workspace_id: str) -> None: entries, Gdk.DragAction.MOVE) + self._drag_row: Optional[ChatRow] = None + self._chat_order: list[ChatRow] = [] + self.register_events([ ('account-enabled', ged.GUI2, self._on_account_changed), ('account-disabled', ged.GUI2, self._on_account_changed), ('bookmarks-received', ged.GUI1, self._on_bookmarks_received), ]) + self.connect('drag-data-received', self._on_drag_data_received) self.connect('destroy', self._on_destroy) self._timer_id = GLib.timeout_add_seconds(60, self._update_timer) @@ -149,6 +159,94 @@ def emit_unread_changed(self) -> None: self._workspace_id, count) + def _get_row_before(self, row: ChatRow) -> Optional[ChatRow]: + row = cast(ChatRow, self.get_row_at_index(row.get_index() - 1)) + return row + + def _get_row_after(self, row: ChatRow) -> Optional[ChatRow]: + row = cast(ChatRow, self.get_row_at_index(row.get_index() + 1)) + return row + + def _get_last_row(self) -> ChatRow: + row = cast(ChatRow, self.get_row_at_index(len(self.get_children()))) + return row + + def set_drag_row(self, row: ChatRow) -> None: + self._drag_row = row + + def _on_drag_data_received(self, + _widget: Gtk.Widget, + _drag_context: Gdk.DragContext, + _x_coord: int, + y_coord: int, + selection_data: Gtk.SelectionData, + _info: int, + _time: int + ) -> None: + + item_type = selection_data.get_data_type().name() + if item_type == 'CHAT_LIST_ITEM': + row = cast(ChatRow, self.get_row_at_y(y_coord)) + if row: + alloc = row.get_allocation() + hover_row_y = alloc.y + hover_row_height = alloc.height + + if y_coord < hover_row_y + hover_row_height / 2: + row_before = self._get_row_before(row) + row_after = row + else: + row_before = row + row_after = self._get_row_after(row) + else: + row_before = self._get_last_row() + row_after = None + + if self._drag_row in (row_before, row_after): + return + + self._change_pinned_order(row_before, row_after) + else: + log.debug('Unknown item type dropped') + + def _change_pinned_order(self, + row_before: Optional[ChatRow], + row_after: Optional[ChatRow] + ) -> None: + + assert self._drag_row is not None + + if not self._drag_row.is_pinned: + log.debug('Dropped row is not pinned') + return + + if self._drag_row in (row_before, row_after): + # TODO: already checked this case!? + log.debug('Dropped row on self') + return + + if row_after is None: + log.debug('Dropped row into empty space') + return + + self._chat_order.remove(self._drag_row) + + if row_before is None: + self._chat_order.insert(0, self._drag_row) + else: + if row_before.position < self._drag_row.position: + offset = 1 + else: + offset = 0 + self._chat_order.insert( + row_before.position + offset, self._drag_row) + + for row in self._chat_order: + row.position = self._chat_order.index(row) + + self.emit('chat-order-changed') + self.invalidate_sort() + def _on_destroy(self, _widget: Gtk.Widget) -> None: GLib.source_remove(self._timer_id) @@ -273,10 +371,11 @@ def add_chat(self, jid, type_, pinned, - self._chat_order) + position) - self._chat_order[key] = position self._chats[key] = row + if position != -1: + self._chat_order.insert(position, row) self.add(row) @@ -353,6 +452,16 @@ def select_chat_number(self, number: int) -> None: def toggle_chat_pinned(self, account: str, jid: JID) -> None: row = self._chats[(account, jid)] row.toggle_pinned() + + self._chat_order.clear() + chat_rows = cast(list[ChatRow], self.get_children()) + for row in chat_rows: + if row.is_pinned: + row.position = chat_rows.index(row) + self._chat_order.append(row) + else: + row.position = -1 + self.invalidate_sort() def remove_chat(self, @@ -362,6 +471,8 @@ def remove_chat(self, ) -> None: row = self._chats.pop((account, jid)) + if row.position != -1: + self._chat_order.remove(row) self.remove(row) row.destroy() if emit_unread: @@ -563,29 +674,6 @@ def _on_bookmarks_received(self, _event: events.BookmarksReceived) -> None: for row in rows: row.update_name() - def _change_pinned_order(self, - row: ChatRow, - row_after: Optional[ChatRow]) -> None: - - # Make list ordered by position of tuple[account, JID] - order = [item[0] for item in sorted(self._chat_order.items(), - key=operator.itemgetter(1))] - - key = (row.account, row.jid) - - order.remove(key) - if row_after is None or not row_after.is_pinned: - order.append(key) - else: - pos = order.index((row_after.account, row_after.jid)) - order.insert(pos, key) - - self._chat_order.clear() - for pos, value in enumerate(order): - self._chat_order[value] = pos - - self.invalidate_sort() - class ChatRow(Gtk.ListBoxRow): def __init__(self, @@ -594,7 +682,7 @@ def __init__(self, jid: JID, type_: str, pinned: bool, - position: dict[tuple[str, JID], int] + position: int ) -> None: Gtk.ListBoxRow.__init__(self) @@ -767,7 +855,11 @@ def is_pinned(self) -> bool: @property def position(self) -> int: - return self._position.get((self.account, self.jid), -1) + return self._position + + @position.setter + def position(self, position: int) -> None: + self._position = position def _on_button_press(self, _widget: Gtk.Widget, @@ -799,6 +891,10 @@ def _on_drag_begin(self, widget: Gtk.Widget, drag_context: Gdk.DragContext ) -> None: + + chat_list = cast(ChatList, self.get_parent()) + chat_list.set_drag_row(self) + # Use rendered ChatListRow as drag icon alloc = self.get_allocation() surface = cairo.ImageSurface( ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -14,7 +14,6 @@ from __future__ import annotations -from typing import Dict from typing import Optional from typing import cast @@ -66,7 +65,7 @@ def __init__(self, self.set_vexpand(True) self.set_vhomogeneous(False) - self._chat_lists: Dict[str, ChatList] = {} + self._chat_lists: dict[str, ChatList] = {} self._last_visible_child_name: str = 'default' @@ -153,6 +152,7 @@ def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: def add_chat_list(self, workspace_id: str) -> ChatList: chat_list = ChatList(workspace_id) chat_list.connect('row-selected', self._on_row_selected) + chat_list.connect('chat-order-changed', self._on_chat_order_changed) self._chat_lists[workspace_id] = chat_list self.add_named(chat_list, workspace_id) @@ -179,6 +179,12 @@ def _on_row_selected(self, self.emit('chat-selected', row.workspace_id, row.account, row.jid) + def _on_chat_order_changed(self, + chat_list: ChatList + ) -> None: + + self.store_open_chats(chat_list.workspace_id) + def show_chat_list(self, workspace_id: str) -> None: cur_workspace_id = self.get_visible_child_name() if cur_workspace_id == workspace_id: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/240f8e5ce059505646b1021326fe4876… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/240f8e5ce059505646b1021326fe4876… 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