FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prevent right click double fire when closing notifications

Browse Source
This commit is contained in:
Martin Rotter 2023-11-14 09:48:36 +01:00
parent 63fd0b532f
commit 07cd1ce23d
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
aqt/settings.ini
View File

@ -1,5 +1,16 @@
[DEFAULTS]
[aqt] [aqt]
concurrency: 8 concurrency: 8
baseurl: https://mirror.netcologne.de/qtproject baseurl: https://mirror.netcologne.de/qtproject
[mirrors]
trusted_mirrors:
https://download.qt.io
blacklist:
http://mirrors.ustc.edu.cn
http://mirrors.tuna.tsinghua.edu.cn
http://mirrors.geekpie.club
fallbacks:
https://mirrors.ocf.berkeley.edu/qt
https://ftp.jaist.ac.jp/pub/qtproject
http://ftp1.nluug.nl/languages/qt
https://mirrors.dotsrc.org/qtproject

6
resources/scripts/github-actions/build-linux-mac.sh
View File

@ -61,9 +61,9 @@ else
echo "Qt will be installed to: $QTPATH" echo "Qt will be installed to: $QTPATH"
# Install Qt. # Install Qt.
aqt install-qt -O "$QTPATH" "$QTTARGET" "desktop" "$QTVERSION" "$QTARCH" -m "qtwebengine" "qtimageformats" "qtwebchannel" "qtmultimedia" "qt5compat" "qtpositioning" "qtserialport" aqt -c 'aqt/settings.ini' install-qt -O "$QTPATH" "$QTTARGET" "desktop" "$QTVERSION" "$QTARCH" -m "qtwebengine" "qtimageformats" "qtwebchannel" "qtmultimedia" "qt5compat" "qtpositioning" "qtserialport"
aqt install-tool -O "$QTPATH" "$QTTARGET" "desktop" "tools_cmake" aqt -c 'aqt/settings.ini' install-tool -O "$QTPATH" "$QTTARGET" "desktop" "tools_cmake"
aqt install-tool -O "$QTPATH" "$QTTARGET" "desktop" "tools_ninja" aqt -c 'aqt/settings.ini' install-tool -O "$QTPATH" "$QTTARGET" "desktop" "tools_ninja"
export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/$QTOS/plugins" export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/$QTOS/plugins"
export PATH="$QTBIN:$QTPATH/Tools/CMake/CMake.app/Contents/bin:$QTPATH/Tools/Ninja:$PATH" export PATH="$QTBIN:$QTPATH/Tools/CMake/CMake.app/Contents/bin:$QTPATH/Tools/Ninja:$PATH"

8
resources/scripts/github-actions/build-windows.ps1
View File

@ -61,20 +61,20 @@ pip3 install -U pip
pip3 install -I git+https://github.com/miurahr/aqtinstall pip3 install -I git+https://github.com/miurahr/aqtinstall
if ($is_qt_6) { if ($is_qt_6) {
aqt install-qt -O "$qt_path" windows desktop $qt_version win64_msvc2019_64 -m qtwebengine qtimageformats qtmultimedia qt5compat qtwebchannel qtpositioning aqt -c 'aqt\settings.ini' install-qt -O "$qt_path" windows desktop $qt_version win64_msvc2019_64 -m qtwebengine qtimageformats qtmultimedia qt5compat qtwebchannel qtpositioning
} }
else { else {
aqt install-qt -O "$qt_path" windows desktop $qt_version win64_msvc2019_64 -m qtwebengine aqt -c 'aqt\settings.ini' install-qt -O "$qt_path" windows desktop $qt_version win64_msvc2019_64 -m qtwebengine
} }
aqt install-src -O "$qt_path" windows desktop $qt_version --archives qtbase aqt -c 'aqt\settings.ini' install-src -O "$qt_path" windows desktop $qt_version --archives qtbase
$qt_qmake = "$qt_path\$qt_version\msvc2019_64\bin\qmake.exe" $qt_qmake = "$qt_path\$qt_version\msvc2019_64\bin\qmake.exe"
$env:PATH = "$qt_path\$qt_version\msvc2019_64\bin\;" + $env:PATH $env:PATH = "$qt_path\$qt_version\msvc2019_64\bin\;" + $env:PATH
if ($is_qt_6) { if ($is_qt_6) {
# Download openssl 3.x. # Download openssl 3.x.
aqt install-tool -O "$qt_path" windows desktop tools_opensslv3_x64 qt.tools.opensslv3.win_x64 aqt -c 'aqt\settings.ini' install-tool -O "$qt_path" windows desktop tools_opensslv3_x64 qt.tools.opensslv3.win_x64
$openssl_base_path = "$qt_path\Tools\OpenSSLv3\Win_x64" $openssl_base_path = "$qt_path\Tools\OpenSSLv3\Win_x64"
} }
else { else {

7
src/librssguard/gui/notifications/basetoastnotification.cpp
View File

@ -79,10 +79,11 @@ bool BaseToastNotification::eventFilter(QObject* watched, QEvent* event) {
setupTimedClosing(); setupTimedClosing();
} }
if (event->type() == QEvent::Type::MouseButtonPress) { if (event->type() == QEvent::Type::MouseButtonPress || event->type() == QEvent::Type::MouseButtonRelease) {
if (dynamic_cast<QMouseEvent*>(event)->button() == Qt::MouseButton::RightButton) { if (dynamic_cast<QMouseEvent*>(event)->button() == Qt::MouseButton::RightButton) {
event->ignore(); event->accept();
close(); QTimer::singleShot(100, this, &BaseToastNotification::close);
return true;
} }
} }