From e1d1a9fed5383dd34ae20f16a3c956370575a979 Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Mon, 24 Feb 2020 16:33:26 -0500 Subject: [PATCH 1/8] chore(travis): pick any Python 3.x, x>=5 for CIRP --- .travis/cirp/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/cirp/install.sh b/.travis/cirp/install.sh index 242da9935..e163bb50a 100644 --- a/.travis/cirp/install.sh +++ b/.travis/cirp/install.sh @@ -28,7 +28,7 @@ else python3 --version || true pyenv versions || true - pyenv global 3.7 + pyenv global $(pyenv versions | grep -o ' 3\.[5-99]\.[1-99]' | tail -n1) fi pip install --upgrade pip From 88eba99eb3479d1020d8fa01c81961ee1406c00f Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Mon, 24 Feb 2020 16:39:14 -0500 Subject: [PATCH 2/8] chore(travis): update CIRP to v0.2.0 --- .travis/cirp/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/cirp/install.sh b/.travis/cirp/install.sh index e163bb50a..ad945f431 100644 --- a/.travis/cirp/install.sh +++ b/.travis/cirp/install.sh @@ -53,9 +53,9 @@ if ! pip list --format=columns | grep '^ci-release-publisher ' then cd . cd "$(mktemp -d)" - VERSION="0.2.0a3" + VERSION="0.2.0" FILENAME="ci_release_publisher-$VERSION-py3-none-any.whl" - HASH="399d0c645ea115d72c646c87e3b4094af04018c5bcb6a95abed4c09cdeec8bd3" + HASH="da7f139e90c57fb64ed2eb83c883ad6434d7c0598c843f7be7b572377bed4bc4" pip download ci_release_publisher==$VERSION check_sha256 "$HASH" "$FILENAME" pip install --no-index --find-links "$PWD" "$FILENAME" From 14e14e0e2643fee5797220012356471396cc0249 Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Thu, 20 Feb 2020 14:39:59 -0500 Subject: [PATCH 3/8] chore(windows): update Qt to 5.12.7 --- windows/cross-compile/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index 7d8cecf72..d910e004b 100644 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -272,10 +272,10 @@ fi QT_PREFIX_DIR="$DEP_DIR/libqt5" QT_MAJOR=5 QT_MINOR=12 -QT_PATCH=5 +QT_PATCH=7 QT_VERSION=$QT_MAJOR.$QT_MINOR.$QT_PATCH -# hash from https://download.qt.io/archive/qt/5.12/5.12.5/single/qt-everywhere-src-5.12.5.tar.xz.mirrorlist -QT_HASH="a2299e21db7767caf98242767bffb18a2a88a42fee2d6a393bedd234f8c91298" +# hash from https://download.qt.io/archive/qt/5.12/5.12.7/single/qt-everywhere-src-5.12.7.tar.xz.mirrorlist +QT_HASH="873783a0302129d98a8f63de9afe4520fb5f8d5316be8ad7b760c59875cd8a8d" QT_FILENAME="qt-everywhere-src-$QT_VERSION.tar.xz" if [ ! -f "$QT_PREFIX_DIR/done" ] then From d6299b6db74bd37f937115070583da8c874719ce Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Thu, 20 Feb 2020 14:40:55 -0500 Subject: [PATCH 4/8] chore(windows): update SQLCipher to 4.3.0 --- windows/cross-compile/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index d910e004b..4f540f5d2 100644 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -389,8 +389,8 @@ set -u # SQLCipher SQLCIPHER_PREFIX_DIR="$DEP_DIR/libsqlcipher" -SQLCIPHER_VERSION=v4.2.0 -SQLCIPHER_HASH="105c1b813f848da038c03647a8bfc9d42fb46865e6aaf4edfd46ff3b18cdccfc" +SQLCIPHER_VERSION=v4.3.0 +SQLCIPHER_HASH="fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f" SQLCIPHER_FILENAME="$SQLCIPHER_VERSION.tar.gz" if [ ! -f "$SQLCIPHER_PREFIX_DIR/done" ] then From cfe4d4bbb1da86f791b0fca85c7271ac8e9eb00c Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Thu, 20 Feb 2020 14:41:37 -0500 Subject: [PATCH 5/8] chore(windows): update FFmpeg to 4.2.2 --- windows/cross-compile/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index 4f540f5d2..cc1897bcf 100644 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -450,8 +450,8 @@ fi # FFmpeg FFMPEG_PREFIX_DIR="$DEP_DIR/libffmpeg" -FFMPEG_VERSION=4.2.1 -FFMPEG_HASH="cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4" +FFMPEG_VERSION=4.2.2 +FFMPEG_HASH="cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c" FFMPEG_FILENAME="ffmpeg-$FFMPEG_VERSION.tar.xz" if [ ! -f "$FFMPEG_PREFIX_DIR/done" ] then From 9ca34ab5e86e670d4f72e51f51bd7d3ba104b455 Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Thu, 20 Feb 2020 14:41:57 -0500 Subject: [PATCH 6/8] chore(windows): update VPX to 1.8.2 --- windows/cross-compile/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index cc1897bcf..2accb4cca 100644 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -881,8 +881,8 @@ fi # VPX VPX_PREFIX_DIR="$DEP_DIR/libvpx" -VPX_VERSION=v1.8.1 -VPX_HASH="df19b8f24758e90640e1ab228ab4a4676ec3df19d23e4593375e6f3847dee03e" +VPX_VERSION=v1.8.2 +VPX_HASH="8735d9fcd1a781ae6917f28f239a8aa358ce4864ba113ea18af4bb2dc8b474ac" VPX_FILENAME="libvpx-$VPX_VERSION.tar.gz" if [ ! -f "$VPX_PREFIX_DIR/done" ] then From 1158faee070d06e1e28d195db0808403982a4392 Mon Sep 17 00:00:00 2001 From: sudden6 Date: Sun, 1 Mar 2020 00:42:52 +0100 Subject: [PATCH 7/8] chore: update copyright date in About --- src/widget/form/settings/aboutsettings.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widget/form/settings/aboutsettings.ui b/src/widget/form/settings/aboutsettings.ui index 4e381f8ec..1faec7617 100644 --- a/src/widget/form/settings/aboutsettings.ui +++ b/src/widget/form/settings/aboutsettings.ui @@ -280,7 +280,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">Copyright © 2014-2018 by The qTox Project Contributors</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">Copyright © 2014-2020 by The qTox Project Contributors</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu';">qTox is a Qt-based graphical interface for Tox.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">qTox is libre 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, either version 3 of the License, or (at your option) any later version.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">qTox 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. </span></p> From 7e4f7f0489084cfbdf9a959d0d78566949cbf269 Mon Sep 17 00:00:00 2001 From: sudden6 Date: Sun, 1 Mar 2020 01:12:36 +0100 Subject: [PATCH 8/8] fix: remove unused variables --- src/widget/form/genericchatform.cpp | 5 +---- src/widget/form/genericchatform.h | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp index f6158c103..601221f74 100644 --- a/src/widget/form/genericchatform.cpp +++ b/src/widget/form/genericchatform.cpp @@ -623,7 +623,6 @@ void GenericChatForm::setColorizedNames(bool enable) void GenericChatForm::addSystemInfoMessage(const QString& message, ChatMessage::SystemMessageType type, const QDateTime& datetime) { - previousId = ToxPk(); insertChatMessage(ChatMessage::createChatInfoMessage(message, type, datetime)); } @@ -632,7 +631,6 @@ void GenericChatForm::addSystemDateMessage(const QDate& date) const Settings& s = Settings::getInstance(); QString dateText = date.toString(s.getDateFormat()); - previousId = ToxPk(); insertChatMessage(ChatMessage::createChatInfoMessage(dateText, ChatMessage::INFO, QDateTime())); } @@ -791,7 +789,6 @@ void GenericChatForm::clearChatArea(bool confirm, bool inform) } chatWidget->clear(); - previousId = ToxPk(); if (inform) addSystemInfoMessage(tr("Cleared"), ChatMessage::INFO, QDateTime::currentDateTime()); @@ -1148,7 +1145,7 @@ void GenericChatForm::renderMessages(ChatLogIdx begin, ChatLogIdx end, if (onCompletion) { auto connection = std::make_shared(); *connection = connect(chatWidget, &ChatLog::workerTimeoutFinished, - [onCompletion, connection, this] { + [onCompletion, connection] { onCompletion(); disconnect(*connection); }); diff --git a/src/widget/form/genericchatform.h b/src/widget/form/genericchatform.h index 192e868bf..ba4d813c3 100644 --- a/src/widget/form/genericchatform.h +++ b/src/widget/form/genericchatform.h @@ -173,8 +173,6 @@ protected: QAction* exportChatAction; QAction* goCurrentDateAction; - ToxPk previousId; - QMenu menu; QPushButton* emoteButton;