diff --git a/.appveyor.yml b/.appveyor.yml
index cdb7ec973..e9741f3e9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -37,8 +37,6 @@ install:
RMDIR /S /Q "%CACHE_DIR%" & MKDIR "%CACHE_DIR%" &&
appveyor DownloadFile "%QBT_LIB_URL%" -FileName "c:\qbt_lib.7z" && 7z x "c:\qbt_lib.7z" -o"%CACHE_DIR%" > nul &&
COPY "c:\version_new" "%CACHE_DIR%\version")
- # Qt stay compressed in cache
- - 7z x "%CACHE_DIR%\qt5_64.7z" -o"c:\qbt" > nul
before_build:
# setup env
@@ -47,6 +45,7 @@ before_build:
# setup project
- COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"
# workarounds
+ - MKDIR "c:\qbt"
- MKLINK /J "c:\qbt\base" "%CACHE_DIR%\base"
build_script:
@@ -69,8 +68,11 @@ after_build:
- COPY src\release\qbittorrent.exe upload
- COPY src\release\qbittorrent.pdb upload
- COPY "%CACHE_DIR%\base\bin\libcrypto-1_1-x64.dll" upload
+ - COPY "%CACHE_DIR%\base\bin\libcrypto-1_1-x64.pdb" upload
- COPY "%CACHE_DIR%\base\bin\libssl-1_1-x64.dll" upload
- - COPY "%CACHE_DIR%\base\lib\torrent-rasterbar.dll" upload
+ - COPY "%CACHE_DIR%\base\bin\libssl-1_1-x64.pdb" upload
+ - COPY "%CACHE_DIR%\base\bin\torrent-rasterbar.dll" upload
+ - COPY "%CACHE_DIR%\base\bin\torrent-rasterbar.pdb" upload
- COPY "%CACHE_DIR%\base\lib\zlib1.dll" upload
- COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Core.dll upload
- COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Gui.dll upload
diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml
index 181331069..7209f44c2 100644
--- a/.github/workflows/ci_macos.yaml
+++ b/.github/workflows/ci_macos.yaml
@@ -74,6 +74,7 @@ jobs:
cmake \
-B build \
-G "Ninja" \
+ -DBUILD_SHARED_LIBS=OFF \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
@@ -124,7 +125,17 @@ jobs:
- name: Prepare build artifacts
run: |
+ # create .dmg
+ appName="qbittorrent"
+ if [ "${{ matrix.qbt_gui }}" = "GUI=OFF" ]; then
+ appName="qbittorrent-nox"
+ fi
+ pushd build
+ macdeployqt "$appName.app" -dmg -no-strip
+ popd
+ # prepare upload folder
mkdir upload
+ cp "build/$appName.dmg" upload
mkdir upload/cmake
cp build/compile_commands.json upload/cmake
mkdir upload/cmake/libtorrent
@@ -133,5 +144,5 @@ jobs:
- name: Upload build artifacts
uses: actions/upload-artifact@v3
with:
- name: build-info_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
+ name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
path: upload
diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml
index 611c1cc2a..977744e85 100644
--- a/.github/workflows/ci_windows.yaml
+++ b/.github/workflows/ci_windows.yaml
@@ -152,6 +152,8 @@ jobs:
copy "${{ env.Qt6_DIR }}/plugins/sqldrivers/qsqlite.dll" upload/plugins/sqldrivers
mkdir upload/plugins/styles
copy "${{ env.Qt6_DIR }}/plugins/styles/qwindowsvistastyle.dll" upload/plugins/styles
+ mkdir upload/plugins/tls
+ copy "${{ env.Qt6_DIR }}/plugins/tls/qschannelbackend.dll" upload/plugins/tls
# cmake additionals
mkdir upload/cmake
copy build/compile_commands.json upload/cmake
diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp
index 9946c9116..c5f698138 100644
--- a/src/base/preferences.cpp
+++ b/src/base/preferences.cpp
@@ -1224,6 +1224,16 @@ void Preferences::setConfirmRemoveAllTags(const bool enabled)
setValue(u"Preferences/Advanced/confirmRemoveAllTags"_qs, enabled);
}
+bool Preferences::confirmPauseAndResumeAll() const
+{
+ return value(u"GUI/ConfirmActions/PauseAndResumeAllTorrents"_qs, true);
+}
+
+void Preferences::setConfirmPauseAndResumeAll(const bool enabled)
+{
+ setValue(u"GUI/ConfirmActions/PauseAndResumeAllTorrents"_qs, enabled);
+}
+
#ifndef Q_OS_MACOS
TrayIcon::Style Preferences::trayIconStyle() const
{
diff --git a/src/base/preferences.h b/src/base/preferences.h
index 0dde9afef..8a1397b21 100644
--- a/src/base/preferences.h
+++ b/src/base/preferences.h
@@ -315,6 +315,8 @@ public:
void setConfirmTorrentRecheck(bool enabled);
bool confirmRemoveAllTags() const;
void setConfirmRemoveAllTags(bool enabled);
+ bool confirmPauseAndResumeAll() const;
+ void setConfirmPauseAndResumeAll(bool enabled);
#ifndef Q_OS_MACOS
bool systemTrayEnabled() const;
void setSystemTrayEnabled(bool enabled);
diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp
index 66ceb7f58..328815a38 100644
--- a/src/gui/optionsdialog.cpp
+++ b/src/gui/optionsdialog.cpp
@@ -252,6 +252,7 @@ void OptionsDialog::loadBehaviorTabOptions()
m_ui->checkStartMinimized->setChecked(pref->startMinimized());
m_ui->checkProgramExitConfirm->setChecked(pref->confirmOnExit());
m_ui->checkProgramAutoExitConfirm->setChecked(!pref->dontConfirmAutoExit());
+ m_ui->checkConfirmPauseAndResumeAll->setChecked(pref->confirmPauseAndResumeAll());
#if !(defined(Q_OS_WIN) || defined(Q_OS_MACOS))
m_ui->groupFileAssociation->setVisible(false);
@@ -334,6 +335,7 @@ void OptionsDialog::loadBehaviorTabOptions()
connect(m_ui->checkStartMinimized, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->checkProgramExitConfirm, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->checkProgramAutoExitConfirm, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
+ connect(m_ui->checkConfirmPauseAndResumeAll, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->checkShowSystray, &QGroupBox::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->checkMinimizeToSysTray, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->checkCloseToSystray, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
@@ -410,6 +412,7 @@ void OptionsDialog::saveBehaviorTabOptions() const
pref->setStartMinimized(startMinimized());
pref->setConfirmOnExit(m_ui->checkProgramExitConfirm->isChecked());
pref->setDontConfirmAutoExit(!m_ui->checkProgramAutoExitConfirm->isChecked());
+ pref->setConfirmPauseAndResumeAll(m_ui->checkConfirmPauseAndResumeAll->isChecked());
#ifdef Q_OS_WIN
pref->setWinStartup(WinStartup());
diff --git a/src/gui/optionsdialog.ui b/src/gui/optionsdialog.ui
index e407d79e9..b35d48f72 100644
--- a/src/gui/optionsdialog.ui
+++ b/src/gui/optionsdialog.ui
@@ -232,6 +232,19 @@
+ -
+
+
+ Shows a confirmation dialog upon pausing/resuming all the torrents
+
+
+ Confirm "Pause/Resume all" actions
+
+
+ true
+
+
+
-
diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp
index 9bca61d45..c1251181d 100644
--- a/src/gui/transferlistwidget.cpp
+++ b/src/gui/transferlistwidget.cpp
@@ -363,14 +363,15 @@ void TransferListWidget::setSelectedTorrentsLocation()
void TransferListWidget::pauseAllTorrents()
{
- // Show confirmation if user would really like to Pause All
- const QMessageBox::StandardButton ret =
- QMessageBox::question(this, tr("Confirm pause")
- , tr("Would you like to pause all torrents?")
- , (QMessageBox::Yes | QMessageBox::No));
+ if (Preferences::instance()->confirmPauseAndResumeAll())
+ {
+ // Show confirmation if user would really like to Pause All
+ const QMessageBox::StandardButton ret = QMessageBox::question(this, tr("Confirm pause")
+ , tr("Would you like to pause all torrents?"), (QMessageBox::Yes | QMessageBox::No));
- if (ret != QMessageBox::Yes)
- return;
+ if (ret != QMessageBox::Yes)
+ return;
+ }
for (BitTorrent::Torrent *const torrent : asConst(BitTorrent::Session::instance()->torrents()))
torrent->pause();
@@ -378,14 +379,15 @@ void TransferListWidget::pauseAllTorrents()
void TransferListWidget::resumeAllTorrents()
{
- // Show confirmation if user would really like to Resume All
- const QMessageBox::StandardButton ret =
- QMessageBox::question(this, tr("Confirm resume")
- , tr("Would you like to resume all torrents?")
- , (QMessageBox::Yes | QMessageBox::No));
+ if (Preferences::instance()->confirmPauseAndResumeAll())
+ {
+ // Show confirmation if user would really like to Resume All
+ const QMessageBox::StandardButton ret = QMessageBox::question(this, tr("Confirm resume")
+ , tr("Would you like to resume all torrents?"), (QMessageBox::Yes | QMessageBox::No));
- if (ret != QMessageBox::Yes)
- return;
+ if (ret != QMessageBox::Yes)
+ return;
+ }
for (BitTorrent::Torrent *const torrent : asConst(BitTorrent::Session::instance()->torrents()))
torrent->resume();
diff --git a/src/icons/flags/ag.svg b/src/icons/flags/ag.svg
index 3bce74822..875f9753a 100644
--- a/src/icons/flags/ag.svg
+++ b/src/icons/flags/ag.svg
@@ -5,10 +5,10 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/icons/flags/al.svg b/src/icons/flags/al.svg
index 9ec80b808..4e7098f3a 100644
--- a/src/icons/flags/al.svg
+++ b/src/icons/flags/al.svg
@@ -1,5 +1,5 @@
diff --git a/src/icons/flags/bl.svg b/src/icons/flags/bl.svg
index 15803ff9a..79689fe94 100644
--- a/src/icons/flags/bl.svg
+++ b/src/icons/flags/bl.svg
@@ -1,7 +1,5 @@
-
diff --git a/src/icons/flags/dg.svg b/src/icons/flags/dg.svg
index 8ba67509b..f101d5248 100644
--- a/src/icons/flags/dg.svg
+++ b/src/icons/flags/dg.svg
@@ -1,4 +1,5 @@