Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Windows: Update build
by Philipp Hörist 28 Jun '20

28 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8913d83a by lovetox at 2020-06-28T13:27:42+02:00 Windows: Update build - Remove some unused dirs to reduce the size of the installation - Add some needed executables - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -190,9 +190,11 @@ function cleanup_install { fi done - find "${MINGW_ROOT}" -regextype "posix-extended" -name "*.exe" -a ! \ - -iregex ".*/(gajim|python|history_manager)[^/]*\\.exe" \ - -exec rm -f {} \; + KEEP="gajim|gajim-debug|python3|gajim-history-manager|gdbus|gspawn-win32-helper" + + echo "deleting .exe files" + find "${MINGW_ROOT}" -regextype "posix-extended" -name "*.exe" -and ! \ + -iregex ".*/(${KEEP})\.exe" -exec rm -f {} \; -print rm -Rf "${MINGW_ROOT}"/libexec rm -Rf "${MINGW_ROOT}"/share/gtk-doc @@ -227,6 +229,7 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/share/fontconfig rm -Rf "${MINGW_ROOT}"/share/gettext-* rm -Rf "${MINGW_ROOT}"/share/gstreamer-1.0 + rm -Rf "${MINGW_ROOT}"/share/terminfo find "${MINGW_ROOT}"/share/glib-2.0 -type f ! \ -name "*.compiled" -exec rm -f {} \; @@ -240,6 +243,10 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/lib/ruby rm -Rf "${MINGW_ROOT}"/lib/tcl8 rm -Rf "${MINGW_ROOT}"/lib/tcl8.6 + rm -Rf "${MINGW_ROOT}"/lib/terminfo + rm -Rf "${MINGW_ROOT}"/lib/installed-tests + rm -Rf "${MINGW_ROOT}"/lib/tabset + rm -Rf "${MINGW_ROOT}"/lib/libthai rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstvpx.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstdaala.dll View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8913d83a45694483b2f48fafea61e0a1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8913d83a45694483b2f48fafea61e0a1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Interface: Use rsplit for extracting the port
by Philipp Hörist 27 Jun '20

27 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e195994b by lovetox at 2020-06-27T20:05:03+02:00 Interface: Use rsplit for extracting the port - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -1533,7 +1533,7 @@ class Interface: config['use_custom_host'] = use_custom_host if custom_host: host, _protocol, type_ = custom_host - host, port = host.split(':') + host, port = host.rsplit(':', maxsplit=1) config['custom_port'] = int(port) config['custom_host'] = host config['custom_type'] = type_.value View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e195994b75feed11231d147ef66c648d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e195994b75feed11231d147ef66c648d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DOAP: Add XEPs 0080, 0082, and 0224
by Philipp Hörist 27 Jun '20

27 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8265ffb5 by Daniel Brötzmann at 2020-06-27T10:35:06+02:00 DOAP: Add XEPs 0080, 0082, and 0224 - - - - - 1 changed file: - data/gajim.doap Changes: ===================================== data/gajim.doap ===================================== @@ -179,6 +179,20 @@ <xmpp:version>2.4</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <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: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-0084.html" /> @@ -401,6 +415,13 @@ <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <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" /> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8265ffb5c8532a71221dfc1d17093f1b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8265ffb5c8532a71221dfc1d17093f1b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] DOAP: Add initial version
by Philipp Hörist 27 Jun '20

27 Jun '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 00c51071 by Daniel Brötzmann at 2020-06-27T10:26:40+02:00 DOAP: Add initial version - - - - - 1 changed file: - + python-nbxmpp.doap Changes: ===================================== python-nbxmpp.doap ===================================== @@ -0,0 +1,353 @@ +<?xml version="1.0" encoding="UTF-8"?> +<rdf:RDF xmlns="http://usefulinc.com/ns/doap#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:xmpp="https://linkmauve.fr/ns/xmpp-doap#" + xmlns:foaf="http://xmlns.com/foaf/0.1/"> + <Project> + + <name>python-nbxmpp</name> + <short-name>nbxmpp</short-name> + + <shortdesc xml:lang="en">XMPP Library</shortdesc> + <description xml:lang="en"> + python-nbxmpp is a Python library that provides a way for Python applications to use the XMPP network. + This library was initially a fork of xmpppy. + </description> + + <homepage rdf:resource="https://gajim.org/" /> + <wiki rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp/-/wikis/home" /> + <bug-database rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp/-/issues" /> + <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-library" /> + <category rdf:resource="http://api.gnome.org/doap-extensions#apps" /> + <license rdf:resource="http://usefulinc.com/doap/licenses/gplv3" /> + + <programming-language>Python</programming-language> + <os>Linux</os> + <os>Windows</os> + + <repository> + <GitRepository> + <location rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp.git" /> + <browse rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp" /> + </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://tools.ietf.org/html/rfc7395" /> + <implements rdf:resource="https://tools.ietf.org/html/rfc7590" /> + <implements> + <xmpp:SupportedXep> + <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: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-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-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> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <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: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-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-0059.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + <xmpp:note>Used by XEP-0313.</xmpp:note> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <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-0066.html" /> + <xmpp:status>partial</xmpp:status> + <xmpp:version>1.5</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <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-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: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: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-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: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: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: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: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: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: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-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-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-0158.html" /> + <xmpp:status>partial</xmpp:status> + <xmpp:version>1.0</xmpp:version> + <xmpp:note>Images only.</xmpp:note> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <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-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: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-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-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-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:status>partial</xmpp:status> + <xmpp:version>1.0</xmpp:version> + <xmpp:note>No cache: Only for captchas.</xmpp:note> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <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-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-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: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:status>complete</xmpp:status> + <xmpp:version>1.0.2</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0333.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-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: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:status>complete</xmpp:status> + <xmpp:version>0.4.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <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: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-0392.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.6.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0402.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.3.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + </Project> +</rdf:RDF> View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/00c51071aab2cc188aaaed49… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/00c51071aab2cc188aaaed49… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 26 Jun '20

26 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2198bfe9 by lovetox at 2020-06-26T19:48:48+02:00 Remove unused import - - - - - 1 changed file: - gajim/common/client.py Changes: ===================================== gajim/common/client.py ===================================== @@ -12,7 +12,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import sys import logging import nbxmpp View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2198bfe90c405dbdd692d28a3f320d8e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2198bfe90c405dbdd692d28a3f320d8e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Client: Register screensaver handler on all platforms
by Philipp Hörist 26 Jun '20

26 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a84f784b by lovetox at 2020-06-26T19:44:29+02:00 Client: Register screensaver handler on all platforms This is no problem because the signal is not emited if the platform does not support it Fixes #10152 - - - - - 1 changed file: - gajim/common/client.py Changes: ===================================== gajim/common/client.py ===================================== @@ -93,9 +93,8 @@ class Client(ConnectionHandlers): self._idle_handler_id = Monitor.connect('state-changed', self._idle_state_changed) - if sys.platform not in ('win32', 'darwin'): - self._screensaver_handler_id = app.app.connect( - 'notify::screensaver-active', self._screensaver_state_changed) + self._screensaver_handler_id = app.app.connect( + 'notify::screensaver-active', self._screensaver_state_changed) ConnectionHandlers.__init__(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a84f784bf9af479fae27161603b7ef2c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a84f784bf9af479fae27161603b7ef2c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] About: Update current developers
by Philipp Hörist 26 Jun '20

26 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: afe212b7 by lovetox at 2020-06-26T16:02:25+02:00 About: Update current developers - - - - - 1 changed file: - gajim/common/const.py Changes: ===================================== gajim/common/const.py ===================================== @@ -627,6 +627,8 @@ Jakub Szypulka DEVS_CURRENT = u"""\ Yann Leboulanger (asterix AT lagaule.org) Philipp Hörist (philipp AT hoerist.com) +Daniel Brötzmann (wurstsalat AT posteo.de) +André Apitzsch """.strip().split("\n") DEVS_PAST = u"""\ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/afe212b754e8291e327c8416f3236622… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/afe212b754e8291e327c8416f3236622… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatRoster: Sort by status in correct order
by Philipp Hörist 25 Jun '20

25 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2df09bc2 by lovetox at 2020-06-25T18:01:21+02:00 GroupchatRoster: Sort by status in correct order - - - - - 1 changed file: - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -345,7 +345,7 @@ class GroupchatRoster(Gtk.ScrolledWindow, EventHelper): self.room_jid, nick2) if gc_contact1.show != gc_contact2.show: - return -1 if gc_contact1.show < gc_contact2.show else 1 + return -1 if gc_contact1.show > gc_contact2.show else 1 return locale.strcoll(nick1.lower(), nick2.lower()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2df09bc2e6840c1573701bc5ebbd4fa5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2df09bc2e6840c1573701bc5ebbd4fa5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControlBase: Rework drag and drop
by Philipp Hörist 24 Jun '20

24 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0df75488 by Daniel Brötzmann at 2020-06-24T23:32:27+02:00 ChatControlBase: Rework drag and drop - - - - - 4 changed files: - gajim/chat_control_base.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/style/gajim.css Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -148,7 +148,10 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.xml.account_badge.add(account_badge) account_badge.show() - # Init DND + # Drag and drop + self.xml.overlay.add_overlay(self.xml.drop_area) + self.xml.drop_area.hide() + self.TARGET_TYPE_URI_LIST = 80 uri_entry = Gtk.TargetEntry.new( 'text/uri-list', @@ -156,40 +159,33 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.TARGET_TYPE_URI_LIST) dst_targets = Gtk.TargetList.new([uri_entry]) dst_targets.add_text_targets(0) - self.dnd_list = [uri_entry, - Gtk.TargetEntry.new( - 'MY_TREE_MODEL_ROW', - Gtk.TargetFlags.SAME_APP, - 0)] - id_ = self.widget.connect('drag_data_received', - self._on_drag_data_received) - self.handlers[id_] = self.widget - self.widget.drag_dest_set( + self._dnd_list = [uri_entry, + Gtk.TargetEntry.new( + 'MY_TREE_MODEL_ROW', + Gtk.TargetFlags.SAME_APP, + 0)] + + id_ = self.xml.overlay.connect('drag_data_received', + self._on_drag_data_received) + + self.handlers[id_] = self.xml.overlay + id_ = self.xml.overlay.connect('drag_motion', self._on_drag_motion) + self.handlers[id_] = self.xml.overlay + id_ = self.xml.overlay.connect('drag_leave', self._on_drag_leave) + self.handlers[id_] = self.xml.overlay + + self.xml.overlay.drag_dest_set( Gtk.DestDefaults.ALL, - self.dnd_list, + self._dnd_list, Gdk.DragAction.COPY) - self.widget.drag_dest_set_target_list(dst_targets) + self.xml.overlay.drag_dest_set_target_list(dst_targets) # Create textviews and connect signals self.conv_textview = ConversationTextview(self.account) + self.conv_textview.tv.drag_dest_unset() id_ = self.conv_textview.connect('quote', self.on_quote) self.handlers[id_] = self.conv_textview.tv - # FIXME: DND on non editable TextView, find a better way - self.drag_entered = False - id_ = self.conv_textview.tv.connect('drag_data_received', - self._on_drag_data_received) - self.handlers[id_] = self.conv_textview.tv - id_ = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion) - self.handlers[id_] = self.conv_textview.tv - id_ = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave) - self.handlers[id_] = self.conv_textview.tv - self.conv_textview.tv.drag_dest_set( - Gtk.DestDefaults.ALL, - self.dnd_list, - Gdk.DragAction.COPY) - self.conv_textview.tv.drag_dest_set_target_list(dst_targets) - id_ = self.conv_textview.tv.connect('grab-focus', self._on_html_textview_grab_focus) self.handlers[id_] = self.conv_textview.tv @@ -938,14 +934,12 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): """ def _on_drag_leave(self, *args): - # FIXME: DND on non editable TextView, find a better way - self.drag_entered = False - self.conv_textview.tv.set_editable(False) + self.xml.drop_area.set_no_show_all(True) + self.xml.drop_area.hide() def _on_drag_motion(self, *args): - # FIXME: DND on non editable TextView, find a better way - if not self.drag_entered: - self.conv_textview.tv.set_editable(True) + self.xml.drop_area.set_no_show_all(False) + self.xml.drop_area.show_all() def drag_data_file_transfer(self, selection): # we may have more than one file dropped ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -14,6 +14,51 @@ <property name="page_increment">10</property> <property name="page_size">10</property> </object> + <object class="GtkBox" id="drop_area"> + <property name="name">DropArea</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="opacity">0.9</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="vexpand">True</property> + <property name="icon_name">mail-attachment-symbolic</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="vexpand">True</property> + <property name="label" translatable="yes">Drop files or contacts</property> + <property name="wrap">True</property> + <property name="max_width_chars">40</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> <object class="GtkPopover" id="dtmf_popover"> <property name="can_focus">False</property> <child> @@ -344,130 +389,351 @@ </object> <object class="GtkBox" id="chat_control_hbox"> <property name="can_focus">True</property> - <property name="margin_left">7</property> - <property name="margin_right">7</property> + <property name="margin_start">7</property> + <property name="margin_end">7</property> <property name="margin_top">5</property> <property name="margin_bottom">7</property> <property name="spacing">1</property> <child> - <object class="GtkPaned" id="paned1"> + <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="vbox2"> + <object class="GtkPaned" id="paned1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="can_focus">True</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> - <property name="name">ChatControl-BannerEventBox</property> + <object class="GtkBox" id="vbox2"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox"> - <property name="visible">True</property> + <object class="GtkEventBox" id="banner_eventbox"> + <property name="name">ChatControl-BannerEventBox</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="no_show_all">True</property> <child> - <object class="GtkEventBox" id="avatar_eventbox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="visible_window">False</property> + <property name="spacing">6</property> <child> - <object class="GtkImage" id="avatar_image"> - <property name="width_request">48</property> - <property name="height_request">48</property> + <object class="GtkEventBox" id="avatar_eventbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> + <property name="visible_window">False</property> + <child> + <object class="GtkImage" id="avatar_image"> + <property name="width_request">48</property> + <property name="height_request">48</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + </object> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="row_spacing">3</property> - <property name="column_spacing">3</property> <child> - <object class="GtkLabel" id="banner_name_label"> - <property name="name">ChatControl-BannerNameLabel</property> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="label">Contact name</property> - <property name="ellipsize">end</property> - <property name="xalign">0</property> - <style> - <class name="large-header"/> - </style> + <property name="row_spacing">3</property> + <property name="column_spacing">3</property> + <child> + <object class="GtkLabel" id="banner_name_label"> + <property name="name">ChatControl-BannerNameLabel</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="label">Contact name</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="banner_label"> + <property name="name">ChatControl-BannerLabel</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="label">label</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="phone_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">The last message was written on a mobile client</property> + <property name="halign">start</property> + <property name="margin_right">4</property> + <property name="icon_name">phone-apple-iphone-symbolic</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="account_badge"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkLabel" id="banner_label"> - <property name="name">ChatControl-BannerLabel</property> + <object class="GtkBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="label">label</property> - <property name="selectable">True</property> - <property name="ellipsize">end</property> - <property name="xalign">0</property> - <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> + <property name="spacing">4</property> + <child> + <object class="GtkImage" id="mood_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="activity_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="tune_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="location_eventbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="visible_window">False</property> + <child> + <object class="GtkImage" id="location_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkImage" id="audio_banner_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkImage" id="video_banner_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">5</property> + </packing> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> </packing> </child> + </object> + </child> + <style> + <class name="gajim-banner"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="chatcontrol-separator-top"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="height_request">60</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <property name="overlay_scrolling">False</property> + <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> + <signal name="scroll-event" handler="_on_scroll" swapped="no"/> + <child> + <placeholder/> + </child> + <style> + <class name="scrolled-no-border"/> + <class name="no-scroll-indicator"/> + <class name="scrollbar-style"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="chatcontrol-separator"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkBox" id="hbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <object class="GtkMenuButton" id="emoticons_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> + <property name="relief">none</property> <child> - <object class="GtkImage" id="phone_image"> + <object class="GtkImage"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">The last message was written on a mobile client</property> - <property name="halign">start</property> - <property name="margin_right">4</property> - <property name="icon_name">phone-apple-iphone-symbolic</property> + <property name="icon_name">face-smile-symbolic</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="formattings_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="relief">none</property> + <property name="popup">formattings_menu</property> <child> - <object class="GtkBox" id="account_badge"> + <object class="GtkImage" id="image10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> + <property name="icon_name">format-text-bold-symbolic</property> + <property name="icon_size">1</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <placeholder/> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> @@ -476,264 +742,153 @@ </packing> </child> <child> - <object class="GtkBox" id="hbox2"> - <property name="visible">True</property> + <object class="GtkBox" id="audio_buttons_hbox"> <property name="can_focus">False</property> - <property name="spacing">4</property> + <property name="no_show_all">True</property> <child> - <object class="GtkImage" id="mood_image"> + <object class="GtkSeparator" id="vseparator2"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> + <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkImage" id="activity_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> + <object class="GtkVolumeButton" id="sound_hscale"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="relief">none</property> + <property name="orientation">vertical</property> + <property name="size">menu</property> + <property name="adjustment">adjustment1</property> + <property name="icons">audio-volume-muted-symbolic +audio-volume-low-symbolic +audio-volume-medium-symbolic +audio-volume-high-symbolic</property> + <property name="use_symbolic">False</property> + <child internal-child="plus_button"> + <object class="GtkButton" id="volumebutton-plus_button1"> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + </object> + </child> + <child internal-child="minus_button"> + <object class="GtkButton" id="volumebutton-minus_button1"> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkImage" id="tune_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> + <object class="GtkVolumeButton" id="mic_hscale"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="relief">none</property> + <property name="orientation">vertical</property> + <property name="size">menu</property> + <property name="adjustment">adjustment2</property> + <property name="icons">microphone-sensitivity-muted-symbolic +microphone-sensitivity-low-symbolic +microphone-sensitivity-medium-symbolic +microphone-sensitivity-high-symbolic</property> + <property name="use_symbolic">False</property> + <child internal-child="plus_button"> + <object class="GtkButton" id="volumebutton-plus_button2"> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + </object> + </child> + <child internal-child="minus_button"> + <object class="GtkButton" id="volumebutton-minus_button2"> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkEventBox" id="location_eventbox"> + <object class="GtkMenuButton" id="dtmf_button"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="visible_window">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="relief">none</property> + <property name="direction">up</property> + <property name="popover">dtmf_popover</property> <child> - <object class="GtkImage" id="location_image"> + <object class="GtkImage"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> + <property name="icon_name">input-dialpad-symbolic</property> <property name="icon_size">1</property> </object> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkImage" id="audio_banner_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">4</property> </packing> </child> - <child> - <object class="GtkImage" id="video_banner_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">5</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> - </object> - </child> - <style> - <class name="gajim-banner"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="chatcontrol-separator-top"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="height_request">60</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> - <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> - <signal name="scroll-event" handler="_on_scroll" swapped="no"/> - <child> - <placeholder/> - </child> - <style> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - <class name="scrollbar-style"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="chatcontrol-separator"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkMenuButton" id="emoticons_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> - <property name="relief">none</property> <child> - <object class="GtkImage"> + <object class="GtkComboBox" id="label_selector"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">face-smile-symbolic</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="formattings_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="relief">none</property> - <property name="popup">formattings_menu</property> - <child> - <object class="GtkImage" id="image10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">format-text-bold-symbolic</property> - <property name="icon_size">1</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="audio_buttons_hbox"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <child> - <object class="GtkSeparator" id="vseparator2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkVolumeButton" id="sound_hscale"> + <object class="GtkMenuButton" id="settings_menu"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="focus_on_click">False</property> <property name="receives_default">True</property> - <property name="has_tooltip">True</property> <property name="relief">none</property> - <property name="orientation">vertical</property> - <property name="size">menu</property> - <property name="adjustment">adjustment1</property> - <property name="icons">audio-volume-muted-symbolic -audio-volume-low-symbolic -audio-volume-medium-symbolic -audio-volume-high-symbolic</property> - <property name="use_symbolic">False</property> - <child internal-child="plus_button"> - <object class="GtkButton" id="volumebutton-plus_button1"> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - </object> - </child> - <child internal-child="minus_button"> - <object class="GtkButton" id="volumebutton-minus_button1"> + <child> + <object class="GtkImage"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="receives_default">False</property> + <property name="icon_name">open-menu-symbolic</property> </object> </child> <style> @@ -743,36 +898,47 @@ audio-volume-high-symbolic</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="pack_type">end</property> + <property name="position">4</property> </packing> </child> <child> - <object class="GtkVolumeButton" id="mic_hscale"> - <property name="visible">True</property> + <object class="GtkButton" id="authentication_button"> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">True</property> - <property name="has_tooltip">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> <property name="relief">none</property> - <property name="orientation">vertical</property> - <property name="size">menu</property> - <property name="adjustment">adjustment2</property> - <property name="icons">microphone-sensitivity-muted-symbolic -microphone-sensitivity-low-symbolic -microphone-sensitivity-medium-symbolic -microphone-sensitivity-high-symbolic</property> - <property name="use_symbolic">False</property> - <child internal-child="plus_button"> - <object class="GtkButton" id="volumebutton-plus_button2"> + <signal name="clicked" handler="_on_authentication_button_clicked" swapped="no"/> + <child> + <object class="GtkImage" id="lock_image"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="receives_default">False</property> + <property name="stock">gtk-dialog-authentication</property> + <property name="icon_size">1</property> </object> </child> - <child internal-child="minus_button"> - <object class="GtkButton" id="volumebutton-minus_button2"> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - </object> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="encryption_menu"> + <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> + <placeholder/> </child> <style> <class name="chatcontrol-actionbar-button"/> @@ -781,22 +947,23 @@ microphone-sensitivity-high-symbolic</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="pack_type">end</property> + <property name="position">6</property> </packing> </child> <child> - <object class="GtkMenuButton" id="dtmf_button"> + <object class="GtkButton" id="sendfile_button"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="relief">none</property> - <property name="direction">up</property> - <property name="popover">dtmf_popover</property> <child> <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">input-dialpad-symbolic</property> + <property name="icon_name">mail-attachment-symbolic</property> <property name="icon_size">1</property> </object> </child> @@ -806,181 +973,73 @@ microphone-sensitivity-high-symbolic</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">7</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="label_selector"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="settings_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="relief">none</property> <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">open-menu-symbolic</property> - </object> + <placeholder/> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="fill">False</property> <property name="position">4</property> </packing> </child> + </object> + <packing> + <property name="resize">False</property> + <property name="shrink">True</property> + </packing> + </child> + <child> + <object class="GtkBox" id="video_hbox"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="spacing">6</property> <child> - <object class="GtkButton" id="authentication_button"> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <object class="GtkFixed" id="outgoing_fixed"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="relief">none</property> - <signal name="clicked" handler="_on_authentication_button_clicked" swapped="no"/> <child> - <object class="GtkImage" id="lock_image"> + <object class="GtkViewport" id="outgoing_viewport"> + <property name="width_request">160</property> + <property name="height_request">120</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-dialog-authentication</property> - <property name="icon_size">1</property> + <child> + <placeholder/> + </child> </object> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="encryption_menu"> - <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> - <placeholder/> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">6</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="sendfile_button"> + <object class="GtkBox" id="vbox1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="relief">none</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkImage"> + <object class="GtkViewport" id="incoming_viewport"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">mail-attachment-symbolic</property> - <property name="icon_size">1</property> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">7</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">True</property> - </packing> - </child> - <child> - <object class="GtkBox" id="video_hbox"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkFixed" id="outgoing_fixed"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <child> - <object class="GtkViewport" id="outgoing_viewport"> - <property name="width_request">160</property> - <property name="height_request">120</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="vbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkViewport" id="incoming_viewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -988,30 +1047,25 @@ microphone-sensitivity-high-symbolic</property> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="resize">True</property> + <property name="shrink">True</property> </packing> </child> </object> <packing> - <property name="resize">True</property> - <property name="shrink">True</property> + <property name="index">-1</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> ===================================== gajim/data/gui/groupchat_control.ui ===================================== The diff for this file was not included because it is too large. ===================================== gajim/data/style/gajim.css ===================================== @@ -24,6 +24,8 @@ #MessageWindow, #RosterWindow paned { background-color: @theme_base_color; } +#DropArea {background-color: @theme_base_color;} + .chatcontrol-separator-top {margin-top: 5px;} .chatcontrol-separator {margin-bottom: 5px;} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0df75488dfac23f4e5b421fbdd67d4c2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0df75488dfac23f4e5b421fbdd67d4c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused script
by André 24 Jun '20

24 Jun '20

André pushed to branch master at gajim / gajim Commits: 36c8287f by André Apitzsch at 2020-06-24T19:59:08+02:00 Remove unused script The script has been moved to gajim-plugins repo. - - - - - 1 changed file: - − scripts/dev/plugins_translate Changes: ===================================== scripts/dev/plugins_translate deleted ===================================== @@ -1,88 +0,0 @@ -#!/bin/sh - -PYFILES=$(find -L ./ -type f -name "*.py") -GLADEFILES=$(find -L ./ -type f -name "*.ui") - - -check_args() -{ - if [ $# -ne 2 ]; then - echo "Missing lang argument" >&2 - exit 4 - fi -} - -init_ln() -{ - if [ ! -L "community_plugins" ]; then - echo "community_plugins should be a symbolic link to gajim-plugins repository, else they won't be in po files" - fi -} - -make_pot() -{ - # Generate .ui.h - find -L ./ -type f -name "*.ui" -exec intltool-extract --type="gettext/glade" {} \; - GLADEHFILES=$(find -L ./ -type f -name "*.ui.h") - xgettext -k_ -kN_ -o plugins_translations.pot $PYFILES $GLADEHFILES --from-code=utf-8 - rm $GLADEHFILES -} - -make_po() -{ - if [ -f $1.po ]; then - echo "Updating '$1' language"; - msgmerge -U $1.po plugins_translations.pot; - else - msginit -l $1.UTF-8 -o $1.po; - fi -} - -make_mo() -{ - if [ ! -f $1.po ]; then - echo "$1.po doesn't exist. Use plugins_translation make_po $1 to create it."; - exit 3 - fi - mkdir -p locale/$1/LC_MESSAGES - msgfmt -o $1.mo $1.po -} - -install_mo() -{ - if [ -L community_plugins ]; then - cp $1.mo community_plugins/plugins_translations/ - fi - mkdir -p ~/.local/share/gajim/plugins/locale/$1/LC_MESSAGES/ - cp $1.mo ~/.local/share/gajim/plugins/locale/$1/LC_MESSAGES/gajim_plugins.mo -} - - -case "$1" in - make_po) - check_args $@ - init_ln - make_pot - make_po $2 - ;; - make_mo) - check_args $@ - make_mo $2 - ;; - install_mo) - install_mo $2 - ;; - all) - check_args $@ - init_ln - make_pot - make_po $2 - make_mo $2 - install_mo $2 - ;; - *) - echo "Usage: plugins_translation {all|make_po|make_mo|install_mo}" >&2 - echo "example: plugins_translation make_po fr_FR" - exit 2 - ;; -esac View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/36c8287f3e481486b623cf0d6ef40539… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/36c8287f3e481486b623cf0d6ef40539… 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