diff --git a/.github/workflows/ci_ubuntu.yaml b/.github/workflows/ci_ubuntu.yaml
index fcb7a58ce..9b8b7da12 100644
--- a/.github/workflows/ci_ubuntu.yaml
+++ b/.github/workflows/ci_ubuntu.yaml
@@ -117,6 +117,8 @@ jobs:
- name: Run CodeQL analysis
uses: github/codeql-action/analyze@v2
if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') && startsWith(matrix.qt_version, 6)
+ with:
+ category: ${{ github.base_ref || github.ref_name }}
- name: Prepare build artifacts
run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a2712e62..9c833f90b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,16 +30,21 @@ feature_option(STACKTRACE "Enable stacktrace support" ON)
feature_option(TESTING "Build internal testing suite" OFF)
feature_option(VERBOSE_CONFIGURE "Show information about PACKAGES_FOUND and PACKAGES_NOT_FOUND in the configure output (only useful for debugging the CMake build scripts)" OFF)
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
feature_option_dependent(DBUS
- "Enable support for notifications and power-management features via D-Bus on Linux"
+ "Enable support for notifications and power-management features via D-Bus"
ON "GUI" OFF
)
+endif()
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
feature_option_dependent(SYSTEMD
"Install systemd service file. Target directory is overridable with `SYSTEMD_SERVICES_INSTALL_DIR` variable"
OFF "NOT GUI" OFF
)
-elseif (MSVC)
+endif()
+
+if (MSVC)
feature_option(MSVC_RUNTIME_DYNAMIC "Use MSVC dynamic runtime library (-MD) instead of static (-MT)" ON)
endif()
diff --git a/Changelog b/Changelog
index 5163569ef..0120d3fbc 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,64 @@
+Sun Oct 22nd 2023 - sledgehammer999 - v4.6.0
+ - FEATURE: Add (experimental) I2P support (glassez)
+ - FEATURE: Provide UI editor for the default theme (glassez)
+ - FEATURE: Various UI theming improvements (glassez)
+ - FEATURE: Implement torrent tags editing dialog (glassez)
+ - FEATURE: Revamp "Watched folder options" and "Automated RSS downloader" dialog (glassez)
+ - FEATURE: Allow to use another icons in dark mode (glassez)
+ - FEATURE: Allow to add new torrents to queue top (glassez)
+ - FEATURE: Allow to filter torrent list by save path (Tom)
+ - FEATURE: Expose 'socket send/receive buffer size' options (Chocobo1)
+ - FEATURE: Expose 'max torrent file size' setting (Chocobo1)
+ - FEATURE: Expose 'bdecode limits' settings (Chocobo1)
+ - FEATURE: Add options to adjust behavior of merging trackers to existing torrent (glassez)
+ - FEATURE: Add option to stop seeding when torrent has been inactive (Christopher)
+ - FEATURE: Allow to use proxy per subsystem (glassez)
+ - FEATURE: Expand the scope of "Proxy hostname lookup" option (glassez)
+ - FEATURE: Add shortcut for "Ban peer permanently" function (Luka Čelebić)
+ - FEATURE: Add option to auto hide zero status filters (glassez)
+ - FEATURE: Allow to disable confirmation of Pause/Resume All (glassez)
+ - FEATURE: Add alternative shortcut CTRL+E for CTRL+F (Luka Čelebić)
+ - FEATURE: Show filtered port numbers in logs (Hanabishi)
+ - FEATURE: Add button to copy library versions to clipboard (Chocobo1)
+ - BUGFIX: Ensure ongoing storage moving job will be completed when shutting down (Chocobo1)
+ - BUGFIX: Refactored many areas to call non UI blocking code (glassez)
+ - BUGFIX: Various improvements to the SQLite backend (glassez)
+ - BUGFIX: Improve startup window state handling (glassez)
+ - BUGFIX: Use tray icon from system theme only if option is set (glassez)
+ - BUGFIX: Inhibit system sleep while torrents are moving (Sentox6)
+ - BUGFIX: Use hostname instead of domain name in tracker filter list (tearfur)
+ - BUGFIX: Visually validate input path in torrent creator dialog (Chocobo1)
+ - BUGFIX: Disable symlink resolving in Torrent creator (Ignat Loskutov)
+ - BUGFIX: Change default value for `file pool size` and `stop tracker timeout` settings (stalkerok)
+ - BUGFIX: Log when duplicate torrents are being added (glassez)
+ - BUGFIX: Inhibit suspend instead of screen idle (axet)
+ - BUGFIX: Ensure file name is valid when exporting torrents (glassez)
+ - BUGFIX: Open "Save path" if torrent has no metadata (Xu Chao)
+ - BUGFIX: Prevent torrent starting unexpectedly edge case with magnet (Xu Chao)
+ - BUGFIX: Better ergonomics of the "Add new torrent" dialog (Xu Chao, glassez)
+ - WEBUI: Add log viewer (brvphoenix)
+ - WEBUI: WebAPI: Allow to specify session cookie name (glassez)
+ - WEBUI: Improve sync API performance (glassez)
+ - WEBUI: Add filelog settings (brvphoenix)
+ - WEBUI: Add multi-file renaming (loligans)
+ - WEBUI: Add "Add to top of queue" option (thalieht)
+ - WEBUI: Implement subcategories (Bartu Özen)
+ - WEBUI: Set "SameSite=None" if CSRF Protection is disabled (七海千秋)
+ - WEBUI: Show only hosts in tracker filter list (ttys3)
+ - WEBUI: Set Connection status and Speed limits tooltips (Raymond Ha)
+ - WEBUI: set Cross Origin Opener Policy to `same-origin` (Chocobo1)
+ - WEBUI: Fix response for HTTP HEAD method (Chocobo1)
+ - WEBUI: Preserve the network interfaces when connection is down (Fabricio Silva)
+ - WEBUI: Add "Add Tags" field for RSS rules (Matic Babnik)
+ - WEBUI: Fix missing error icon (Trim21)
+ - RSS: Add "Rename rule" button to RSS Downloader (BallsOfSpaghetti)
+ - RSS: Allow to edit RSS feed URL (glassez)
+ - RSS: Allow to assign priority to RSS download rule (glassez)
+ - SEARCH: Use python isolate mode (Chocobo1)
+ - SEARCH: Bump python version minimum requirement to 3.7.0 (Chocobo1)
+ - OTHER: Enable DBUS cmake option on FreeBSD (yuri@FreeBSD)
+ - OTHER: Numerous code improvements and refactorings (glassez, Chocobo1)
+
Unreleased - sledgehammer999 - v4.5.0
- FEATURE: Add `Auto resize columns` functionality (Chocobo1)
- FEATURE: Allow to use Category paths in `Manual` mode (glassez)
diff --git a/configure b/configure
index 773548c5d..db18a5478 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for qbittorrent v4.6.0beta2.
+# Generated by GNU Autoconf 2.71 for qbittorrent v4.6.0.
#
# Report bugs to .
#
@@ -611,8 +611,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='qbittorrent'
PACKAGE_TARNAME='qbittorrent'
-PACKAGE_VERSION='v4.6.0beta2'
-PACKAGE_STRING='qbittorrent v4.6.0beta2'
+PACKAGE_VERSION='v4.6.0'
+PACKAGE_STRING='qbittorrent v4.6.0'
PACKAGE_BUGREPORT='bugs.qbittorrent.org'
PACKAGE_URL='https://www.qbittorrent.org/'
@@ -1329,7 +1329,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures qbittorrent v4.6.0beta2 to adapt to many kinds of systems.
+\`configure' configures qbittorrent v4.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1400,7 +1400,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of qbittorrent v4.6.0beta2:";;
+ short | recursive ) echo "Configuration of qbittorrent v4.6.0:";;
esac
cat <<\_ACEOF
@@ -1533,7 +1533,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-qbittorrent configure v4.6.0beta2
+qbittorrent configure v4.6.0
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1648,7 +1648,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by qbittorrent $as_me v4.6.0beta2, which was
+It was created by qbittorrent $as_me v4.6.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4779,7 +4779,7 @@ fi
# Define the identity of the package.
PACKAGE='qbittorrent'
- VERSION='v4.6.0beta2'
+ VERSION='v4.6.0'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -7237,7 +7237,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by qbittorrent $as_me v4.6.0beta2, which was
+This file was extended by qbittorrent $as_me v4.6.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7297,7 +7297,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-qbittorrent config.status v4.6.0beta2
+qbittorrent config.status v4.6.0
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index f05e7120c..de21f2cfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v4.6.0beta2], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.6.0], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
: ${CFLAGS=""}
diff --git a/dist/mac/Info.plist b/dist/mac/Info.plist
index f3d55f614..9044a73b2 100644
--- a/dist/mac/Info.plist
+++ b/dist/mac/Info.plist
@@ -55,7 +55,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 4.5.0
+ 4.6.0
CFBundleExecutable
${EXECUTABLE_NAME}
CFBundleIdentifier
@@ -67,7 +67,7 @@
NSAppleScriptEnabled
YES
NSHumanReadableCopyright
- Copyright © 2006-2022 The qBittorrent project
+ Copyright © 2006-2023 The qBittorrent project
UTExportedTypeDeclarations
diff --git a/dist/unix/org.qbittorrent.qBittorrent.appdata.xml b/dist/unix/org.qbittorrent.qBittorrent.appdata.xml
index e56ffc716..645d01a11 100644
--- a/dist/unix/org.qbittorrent.qBittorrent.appdata.xml
+++ b/dist/unix/org.qbittorrent.qBittorrent.appdata.xml
@@ -74,6 +74,6 @@
https://github.com/qbittorrent/qBittorrent/wiki/How-to-translate-qBittorrent
-
+
diff --git a/dist/unix/org.qbittorrent.qBittorrent.desktop b/dist/unix/org.qbittorrent.qBittorrent.desktop
index cb9e814cb..a23bc7845 100644
--- a/dist/unix/org.qbittorrent.qBittorrent.desktop
+++ b/dist/unix/org.qbittorrent.qBittorrent.desktop
@@ -14,216 +14,216 @@ Keywords=bittorrent;torrent;magnet;download;p2p;
SingleMainWindow=true
# Translations
-Comment[af]=Aflaai en deel lêers oor BitTorrent
GenericName[af]=BitTorrent kliënt
+Comment[af]=Aflaai en deel lêers oor BitTorrent
Name[af]=qBittorrent
-Comment[ar]=نزّل وشارك الملفات عبر كيوبتتورنت
GenericName[ar]=عميل بتتورنت
+Comment[ar]=نزّل وشارك الملفات عبر كيوبتتورنت
Name[ar]=qBittorrent
-Comment[be]=Спампоўванне і раздача файлаў праз пратакол BitTorrent
GenericName[be]=Кліент BitTorrent
+Comment[be]=Спампоўванне і раздача файлаў праз пратакол BitTorrent
Name[be]=qBittorrent
-Comment[bg]=Сваляне и споделяне на файлове чрез BitTorrent
GenericName[bg]=BitTorrent клиент
+Comment[bg]=Сваляне и споделяне на файлове чрез BitTorrent
Name[bg]=qBittorrent
-Comment[bn]=বিটটরেন্টে ফাইল ডাউনলোড এবং শেয়ার করুন
GenericName[bn]=বিটটরেন্ট ক্লায়েন্ট
+Comment[bn]=বিটটরেন্টে ফাইল ডাউনলোড এবং শেয়ার করুন
Name[bn]=qBittorrent
-Comment[zh]=通过 BitTorrent 下载和分享文件
GenericName[zh]=BitTorrent 客户端
+Comment[zh]=通过 BitTorrent 下载和分享文件
Name[zh]=qBittorrent
-Comment[bs]=Preuzmi i dijeli datoteke preko BitTorrent-a
GenericName[bs]=BitTorrent klijent
+Comment[bs]=Preuzmi i dijeli datoteke preko BitTorrent-a
Name[bs]=qBittorrent
-Comment[ca]=Baixeu i compartiu fitxers amb el BitTorrent
GenericName[ca]=Client de BitTorrent
+Comment[ca]=Baixeu i compartiu fitxers amb el BitTorrent
Name[ca]=qBittorrent
-Comment[cs]=Stahování a sdílení souborů přes síť BitTorrent
GenericName[cs]=BitTorrent klient
+Comment[cs]=Stahování a sdílení souborů přes síť BitTorrent
Name[cs]=qBittorrent
-Comment[da]=Download og del filer over BitTorrent
GenericName[da]=BitTorrent-klient
+Comment[da]=Download og del filer over BitTorrent
Name[da]=qBittorrent
-Comment[de]=Über BitTorrent Dateien herunterladen und teilen
GenericName[de]=BitTorrent Client
+Comment[de]=Über BitTorrent Dateien herunterladen und teilen
Name[de]=qBittorrent
-Comment[el]=Κάντε λήψη και μοιραστείτε αρχεία μέσω BitTorrent
GenericName[el]=BitTorrent client
+Comment[el]=Κάντε λήψη και μοιραστείτε αρχεία μέσω BitTorrent
Name[el]=qBittorrent
-Comment[en_GB]=Download and share files over BitTorrent
GenericName[en_GB]=BitTorrent client
+Comment[en_GB]=Download and share files over BitTorrent
Name[en_GB]=qBittorrent
-Comment[es]=Descargue y comparta archivos por BitTorrent
GenericName[es]=Cliente BitTorrent
+Comment[es]=Descargue y comparta archivos por BitTorrent
Name[es]=qBittorrent
-Comment[et]=Lae alla ja jaga faile üle BitTorrenti
GenericName[et]=BitTorrent klient
+Comment[et]=Lae alla ja jaga faile üle BitTorrenti
Name[et]=qBittorrent
-Comment[eu]=Jeitsi eta elkarbanatu agiriak BitTorrent bidez
GenericName[eu]=BitTorrent bezeroa
+Comment[eu]=Jeitsi eta elkarbanatu agiriak BitTorrent bidez
Name[eu]=qBittorrent
-Comment[fa]=دانلود و به اشتراک گذاری فایل های بوسیله بیت تورنت
GenericName[fa]=بیت تورنت نسخه کلاینت
+Comment[fa]=دانلود و به اشتراک گذاری فایل های بوسیله بیت تورنت
Name[fa]=qBittorrent
-Comment[fi]=Lataa ja jaa tiedostoja BitTorrentia käyttäen
GenericName[fi]=BitTorrent-asiakasohjelma
+Comment[fi]=Lataa ja jaa tiedostoja BitTorrentia käyttäen
Name[fi]=qBittorrent
-Comment[fr]=Télécharger et partager des fichiers sur BitTorrent
GenericName[fr]=Client BitTorrent
+Comment[fr]=Télécharger et partager des fichiers sur BitTorrent
Name[fr]=qBittorrent
-Comment[gl]=Descargar e compartir ficheiros co protocolo BitTorrent
GenericName[gl]=Cliente BitTorrent
+Comment[gl]=Descargar e compartir ficheiros co protocolo BitTorrent
Name[gl]=qBittorrent
-Comment[gu]=બિટ્ટોરેંટ પર ફાઈલો ડાઉનલોડ અને શેર કરો
GenericName[gu]=બિટ્ટોરેંટ ક્લાયન્ટ
+Comment[gu]=બિટ્ટોરેંટ પર ફાઈલો ડાઉનલોડ અને શેર કરો
Name[gu]=qBittorrent
-Comment[he]=הורד ושתף קבצים על גבי ביטורנט
GenericName[he]=לקוח ביטורנט
+Comment[he]=הורד ושתף קבצים על גבי ביטורנט
Name[he]=qBittorrent
-Comment[hr]=Preuzmite i dijelite datoteke putem BitTorrenta
GenericName[hr]=BitTorrent klijent
+Comment[hr]=Preuzmite i dijelite datoteke putem BitTorrenta
Name[hr]=qBittorrent
-Comment[hu]=Fájlok letöltése és megosztása a BitTorrent hálózaton keresztül
GenericName[hu]=BitTorrent kliens
+Comment[hu]=Fájlok letöltése és megosztása a BitTorrent hálózaton keresztül
Name[hu]=qBittorrent
-Comment[hy]=Նիշքերի փոխանցում BitTorrent-ի միջոցով
GenericName[hy]=BitTorrent սպասառու
+Comment[hy]=Նիշքերի փոխանցում BitTorrent-ի միջոցով
Name[hy]=qBittorrent
-Comment[id]=Unduh dan berbagi berkas melalui BitTorrent
GenericName[id]=Klien BitTorrent
+Comment[id]=Unduh dan berbagi berkas melalui BitTorrent
Name[id]=qBittorrent
-Comment[is]=Sækja og deila skrám yfir BitTorrent
GenericName[is]=BitTorrent biðlarar
+Comment[is]=Sækja og deila skrám yfir BitTorrent
Name[is]=qBittorrent
-Comment[it]=Scarica e condividi file tramite BitTorrent
GenericName[it]=Client BitTorrent
+Comment[it]=Scarica e condividi file tramite BitTorrent
Name[it]=qBittorrent
-Comment[ja]=BitTorrentでファイルのダウンロードと共有
GenericName[ja]=BitTorrentクライアント
+Comment[ja]=BitTorrentでファイルのダウンロードと共有
Name[ja]=qBittorrent
-Comment[ka]=გადმოტვირთეთ და გააზიარეთ ფაილები BitTorrent-ის საშუალებით
GenericName[ka]=BitTorrent კლიენტი
+Comment[ka]=გადმოტვირთეთ და გააზიარეთ ფაილები BitTorrent-ის საშუალებით
Name[ka]=qBittorrent
-Comment[ko]=BitTorrent를 통한 파일 내려받기 및 공유
GenericName[ko]=BitTorrent 클라이언트
+Comment[ko]=BitTorrent를 통한 파일 내려받기 및 공유
Name[ko]=qBittorrent
-Comment[lt]=Atsisiųskite bei dalinkitės failais BitTorrent tinkle
GenericName[lt]=BitTorrent klientas
+Comment[lt]=Atsisiųskite bei dalinkitės failais BitTorrent tinkle
Name[lt]=qBittorrent
-Comment[mk]=Превземајте и споделувајте фајлови преку BitTorrent
GenericName[mk]=BitTorrent клиент
+Comment[mk]=Превземајте и споделувајте фајлови преку BitTorrent
Name[mk]=qBittorrent
-Comment[my]=တောရန့်ဖြင့်ဖိုင်များဒေါင်းလုဒ်ဆွဲရန်နှင့်မျှဝေရန်
GenericName[my]=တောရန့်စီမံခန့်ခွဲသည့်အရာ
+Comment[my]=တောရန့်ဖြင့်ဖိုင်များဒေါင်းလုဒ်ဆွဲရန်နှင့်မျှဝေရန်
Name[my]=qBittorrent
-Comment[nb]=Last ned og del filer over BitTorrent
GenericName[nb]=BitTorrent-klient
+Comment[nb]=Last ned og del filer over BitTorrent
Name[nb]=qBittorrent
-Comment[nl]=Bestanden downloaden en delen via BitTorrent
GenericName[nl]=BitTorrent-client
+Comment[nl]=Bestanden downloaden en delen via BitTorrent
Name[nl]=qBittorrent
-Comment[pl]=Pobieraj i dziel się plikami przez BitTorrent
GenericName[pl]=Klient BitTorrent
+Comment[pl]=Pobieraj i dziel się plikami przez BitTorrent
Name[pl]=qBittorrent
-Comment[pt]=Transferir e partilhar ficheiros por BitTorrent
GenericName[pt]=Cliente BitTorrent
+Comment[pt]=Transferir e partilhar ficheiros por BitTorrent
Name[pt]=qBittorrent
-Comment[pt_BR]=Baixe e compartilhe arquivos pelo BitTorrent
GenericName[pt_BR]=Cliente BitTorrent
+Comment[pt_BR]=Baixe e compartilhe arquivos pelo BitTorrent
Name[pt_BR]=qBittorrent
-Comment[ro]=Descărcați și partajați fișiere prin BitTorrent
GenericName[ro]=Client BitTorrent
+Comment[ro]=Descărcați și partajați fișiere prin BitTorrent
Name[ro]=qBittorrent
-Comment[ru]=Обмен файлами по сети БитТоррент
GenericName[ru]=Клиент сети БитТоррент
+Comment[ru]=Обмен файлами по сети БитТоррент
Name[ru]=qBittorrent
-Comment[sk]=Sťahovanie a zdieľanie súborov prostredníctvom siete BitTorrent
GenericName[sk]=Klient siete BitTorrent
+Comment[sk]=Sťahovanie a zdieľanie súborov prostredníctvom siete BitTorrent
Name[sk]=qBittorrent
-Comment[sl]=Prenesite in delite datoteke preko BitTorrenta
GenericName[sl]=BitTorrent odjemalec
+Comment[sl]=Prenesite in delite datoteke preko BitTorrenta
Name[sl]=qBittorrent
Name[sq]=qBittorrent
-Comment[sr]=Преузимајте и делите фајлове преко BitTorrent протокола
GenericName[sr]=BitTorrent-клијент
+Comment[sr]=Преузимајте и делите фајлове преко BitTorrent протокола
Name[sr]=qBittorrent
-Comment[sr@latin]=Preuzimanje i deljenje fajlova preko BitTorrent-a
GenericName[sr@latin]=BitTorrent klijent
+Comment[sr@latin]=Preuzimanje i deljenje fajlova preko BitTorrent-a
Name[sr@latin]=qBittorrent
-Comment[sv]=Hämta och dela filer över BitTorrent
GenericName[sv]=BitTorrent-klient
+Comment[sv]=Hämta och dela filer över BitTorrent
Name[sv]=qBittorrent
-Comment[ta]=BitTorrent வழியாக கோப்புகளை பதிவிறக்க மற்றும் பகிர
GenericName[ta]=BitTorrent வாடிக்கையாளர்
+Comment[ta]=BitTorrent வழியாக கோப்புகளை பதிவிறக்க மற்றும் பகிர
Name[ta]=qBittorrent
-Comment[te]=క్యు బిట్ టొరెంట్ తో ఫైల్స్ దిగుమతి చేసుకోండి , పంచుకోండి
GenericName[te]=క్యు బిట్ టొరెంట్ క్లయింట్
+Comment[te]=క్యు బిట్ టొరెంట్ తో ఫైల్స్ దిగుమతి చేసుకోండి , పంచుకోండి
Name[te]=qBittorrent
-Comment[th]=ดาวน์โหลดและแชร์ไฟล์ผ่าน BitTorrent
GenericName[th]=โปรแกรมบิททอเร้นท์
+Comment[th]=ดาวน์โหลดและแชร์ไฟล์ผ่าน BitTorrent
Name[th]=qBittorrent
-Comment[tr]=Dosyaları BitTorrent üzerinden indirin ve paylaşın
GenericName[tr]=BitTorrent istemcisi
+Comment[tr]=Dosyaları BitTorrent üzerinden indirin ve paylaşın
Name[tr]=qBittorrent
-Comment[ur]=BitTorrent پر فائلوں کو ڈاؤن لوڈ کریں اور اشتراک کریں
GenericName[ur]=قیو بٹ ٹورنٹ کلائنٹ
+Comment[ur]=BitTorrent پر فائلوں کو ڈاؤن لوڈ کریں اور اشتراک کریں
Name[ur]=qBittorrent
-Comment[uk]=Завантажуйте та поширюйте файли через BitTorrent
GenericName[uk]=BitTorrent-клієнт
+Comment[uk]=Завантажуйте та поширюйте файли через BitTorrent
Name[uk]=qBittorrent
-Comment[vi]=Tải xuống và chia sẻ tệp qua BitTorrent
GenericName[vi]=Máy khách BitTorrent
+Comment[vi]=Tải xuống và chia sẻ tệp qua BitTorrent
Name[vi]=qBittorrent
-Comment[zh_HK]=經由BitTorrent下載並分享檔案
GenericName[zh_HK]=BitTorrent用戶端
+Comment[zh_HK]=經由BitTorrent下載並分享檔案
Name[zh_HK]=qBittorrent
-Comment[zh_TW]=經由 BitTorrent 下載並分享檔案
GenericName[zh_TW]=BitTorrent 用戶端
+Comment[zh_TW]=經由 BitTorrent 下載並分享檔案
Name[zh_TW]=qBittorrent
-Comment[eo]=Elŝutu kaj kunhavigu dosierojn per BitTorrent
GenericName[eo]=BitTorrent-kliento
+Comment[eo]=Elŝutu kaj kunhavigu dosierojn per BitTorrent
Name[eo]=qBittorrent
-Comment[kk]=BitTorrent арқылы файл жүктеу және бөлісу
GenericName[kk]=BitTorrent клиенті
+Comment[kk]=BitTorrent арқылы файл жүктеу және бөлісу
Name[kk]=qBittorrent
-Comment[en_AU]=Download and share files over BitTorrent
GenericName[en_AU]=BitTorrent client
+Comment[en_AU]=Download and share files over BitTorrent
Name[en_AU]=qBittorrent
Name[rm]=qBittorrent
Name[jv]=qBittorrent
-Comment[oc]=Telecargar e partejar de fichièrs amb BitTorrent
GenericName[oc]=Client BitTorrent
+Comment[oc]=Telecargar e partejar de fichièrs amb BitTorrent
Name[oc]=qBittorrent
Name[ug]=qBittorrent
Name[yi]=qBittorrent
-Comment[nqo]=ߞߐߕߐ߯ߘߐ ߟߎ߬ ߟߊߖߌ߰ ߞߊ߬ ߓߊ߲߫ ߞߵߊ߬ߟߎ߬ ߘߐߕߟߊ߫ ߓߌߙߏߙߍ߲ߕ ߞߊ߲߬
GenericName[nqo]=ߓߌߙߏߙߍ߲ߕ ߕߣߐ߬ߓߐ߬ߟߊ
+Comment[nqo]=ߞߐߕߐ߯ߘߐ ߟߎ߬ ߟߊߖߌ߰ ߞߊ߬ ߓߊ߲߫ ߞߵߊ߬ߟߎ߬ ߘߐߕߟߊ߫ ߓߌߙߏߙߍ߲ߕ ߞߊ߲߬
Name[nqo]=qBittorrent
-Comment[uz@Latn]=BitTorrent orqali fayllarni yuklab olish va baham ko‘rish
GenericName[uz@Latn]=BitTorrent mijozi
+Comment[uz@Latn]=BitTorrent orqali fayllarni yuklab olish va baham ko‘rish
Name[uz@Latn]=qBittorrent
-Comment[ltg]=Atsasyuteit i daleit failus ar BitTorrent
GenericName[ltg]=BitTorrent klients
+Comment[ltg]=Atsasyuteit i daleit failus ar BitTorrent
Name[ltg]=qBittorrent
-Comment[hi_IN]=BitTorrent द्वारा फाइल डाउनलोड व सहभाजन
GenericName[hi_IN]=Bittorrent साधन
+Comment[hi_IN]=BitTorrent द्वारा फाइल डाउनलोड व सहभाजन
Name[hi_IN]=qBittorrent
-Comment[az@latin]=Faylları BitTorrent vasitəsilə endirin və paylaşın
GenericName[az@latin]=BitTorrent client
+Comment[az@latin]=Faylları BitTorrent vasitəsilə endirin və paylaşın
Name[az@latin]=qBittorrent
-Comment[lv_LV]=Lejupielādēt un koplietot failus ar BitTorrent
GenericName[lv_LV]=BitTorrent klients
+Comment[lv_LV]=Lejupielādēt un koplietot failus ar BitTorrent
Name[lv_LV]=qBittorrent
-Comment[ms_MY]=Muat turun dan kongsi fail melalui BitTorrent
GenericName[ms_MY]=Klien BitTorrent
+Comment[ms_MY]=Muat turun dan kongsi fail melalui BitTorrent
Name[ms_MY]=qBittorrent
-Comment[mn_MN]=BitTorrent-оор файлуудаа тат, түгээ
GenericName[mn_MN]=BitTorrent татагч
+Comment[mn_MN]=BitTorrent-оор файлуудаа тат, түгээ
Name[mn_MN]=qBittorrent
-Comment[ne_NP]=फाइलहरू डाउनलोड गर्नुहोस् र BitTorrent मा साझा गर्नुहोस्
GenericName[ne_NP]=BitTorrent क्लाइन्ट
+Comment[ne_NP]=फाइलहरू डाउनलोड गर्नुहोस् र BitTorrent मा साझा गर्नुहोस्
Name[ne_NP]=qBittorrent
-Comment[pt_PT]=Transferir e partilhar ficheiros por BitTorrent
GenericName[pt_PT]=Cliente BitTorrent
+Comment[pt_PT]=Transferir e partilhar ficheiros por BitTorrent
Name[pt_PT]=qBittorrent
Name[si_LK]=qBittorrent
diff --git a/dist/windows/config.nsi b/dist/windows/config.nsi
index 3342e2b6c..8759bb92d 100644
--- a/dist/windows/config.nsi
+++ b/dist/windows/config.nsi
@@ -25,7 +25,7 @@
; 4.5.1.3 -> good
; 4.5.1.3.2 -> bad
; 4.5.0beta -> bad
-!define /ifndef QBT_VERSION "4.5.0"
+!define /ifndef QBT_VERSION "4.6.0"
; Option that controls the installer's window name
; If set, its value will be used like this:
@@ -112,7 +112,7 @@ OutFile "qbittorrent_${QBT_INSTALLER_FILENAME}_setup.exe"
;Installer Version Information
VIAddVersionKey "ProductName" "qBittorrent"
VIAddVersionKey "CompanyName" "The qBittorrent project"
-VIAddVersionKey "LegalCopyright" "Copyright ©2006-2022 The qBittorrent project"
+VIAddVersionKey "LegalCopyright" "Copyright ©2006-2023 The qBittorrent project"
VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client"
VIAddVersionKey "FileVersion" "${QBT_VERSION}"
diff --git a/dist/windows/installer-translations/french.nsi b/dist/windows/installer-translations/french.nsi
index a7f9ae947..2a38eef17 100644
--- a/dist/windows/installer-translations/french.nsi
+++ b/dist/windows/installer-translations/french.nsi
@@ -7,7 +7,7 @@ LangString inst_desktop ${LANG_FRENCH} "Créer un Raccourci sur le Bureau"
;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
LangString inst_startmenu ${LANG_FRENCH} "Créer un Raccourci dans le Menu Démarrer"
;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_FRENCH} "Démarrez qBittorrent au démarrage de Windows"
+LangString inst_startup ${LANG_FRENCH} "Démarrer qBittorrent au démarrage de Windows"
;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
LangString inst_torrent ${LANG_FRENCH} "Ouvrir les fichiers .torrent avec qBittorrent"
;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
@@ -15,7 +15,7 @@ LangString inst_magnet ${LANG_FRENCH} "Ouvrir les liens magnet avec qBittorrent"
;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
LangString inst_firewall ${LANG_FRENCH} "Ajouter une règle au Pare-Feu de Windows"
;LangString inst_pathlimit ${LANG_ENGLISH} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
-LangString inst_pathlimit ${LANG_FRENCH} "Désactiver la limite de taille du chemin de Windows (limitation de MAX_PATH 260 caractères, nécessite Windows 10 1607 ou plus)"
+LangString inst_pathlimit ${LANG_FRENCH} "Désactiver la limite de taille des chemins de Windows (limite MAX_PATH de 260 caractères, nécessite Windows 10 1607 ou plus)"
;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
LangString inst_firewallinfo ${LANG_FRENCH} "Ajout d'une règle au Pare-Feu de Windows"
;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
@@ -31,7 +31,7 @@ LangString inst_requires_64bit ${LANG_FRENCH} "Cet installateur ne fonctionne qu
;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
LangString inst_requires_win7 ${LANG_FRENCH} "Cette version de qBittorrent nécessite au moins Windows 7."
;LangString inst_requires_win10 ${LANG_ENGLISH} "This installer requires at least Windows 10 1809."
-LangString inst_requires_win10 ${LANG_FRENCH} "This installer requires at least Windows 10 1809."
+LangString inst_requires_win10 ${LANG_FRENCH} "Cet installateur nécessite au moins Windows 10 1809."
;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
LangString inst_uninstall_link_description ${LANG_FRENCH} "Désinstaller qBittorrent"
@@ -53,9 +53,9 @@ LangString remove_firewall ${LANG_FRENCH} "Supprimer la règle du Pare-Feu de Wi
;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
LangString remove_firewallinfo ${LANG_FRENCH} "Suppression de la règle du Pare-Feu de Windows"
;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_FRENCH} "Supprimer les torrents et données cachées"
+LangString remove_cache ${LANG_FRENCH} "Supprimer les torrents et données en cache"
;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_FRENCH} "qBittorrent est en cours d'exécution. Veuillez fermer l'application avant la désinstallation."
+LangString uninst_warning ${LANG_FRENCH} "qBittorrent est en cours d'exécution. Fermez l'application avant de la désinstaller."
;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
LangString uninst_tor_warn ${LANG_FRENCH} "Ne peut pas supprimer l'association du .torrent. Elle est associée avec :"
;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
diff --git a/dist/windows/installer-translations/romanian.nsi b/dist/windows/installer-translations/romanian.nsi
index e52eba970..bf912b96f 100644
--- a/dist/windows/installer-translations/romanian.nsi
+++ b/dist/windows/installer-translations/romanian.nsi
@@ -1,62 +1,62 @@
;Installer strings
;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
-LangString inst_qbt_req ${LANG_ROMANIAN} "qBittorrent (required)"
+LangString inst_qbt_req ${LANG_ROMANIAN} "qBittorrent (obligatoriu)"
;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_ROMANIAN} "Create Desktop Shortcut"
+LangString inst_desktop ${LANG_ROMANIAN} "Creați o comandă rapidă pe Desktop"
;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_ROMANIAN} "Create Start Menu Shortcut"
+LangString inst_startmenu ${LANG_ROMANIAN} "Creați o comandă rapidă în meniul Start"
;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_ROMANIAN} "Start qBittorrent on Windows start up"
+LangString inst_startup ${LANG_ROMANIAN} "Porniți qBittorrent la pornirea Windows"
;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
-LangString inst_torrent ${LANG_ROMANIAN} "Open .torrent files with qBittorrent"
+LangString inst_torrent ${LANG_ROMANIAN} "Deschideți fișierele .torrent cu qBittorrent"
;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
-LangString inst_magnet ${LANG_ROMANIAN} "Open magnet links with qBittorrent"
+LangString inst_magnet ${LANG_ROMANIAN} "Deschideți linkurile magnet cu qBittorrent"
;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_ROMANIAN} "Add Windows Firewall rule"
+LangString inst_firewall ${LANG_ROMANIAN} "Adăugați regula Windows Firewall"
;LangString inst_pathlimit ${LANG_ENGLISH} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
-LangString inst_pathlimit ${LANG_ROMANIAN} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
+LangString inst_pathlimit ${LANG_ROMANIAN} "Dezactivați limita de lungime a căii Windows (260 de caractere limită MAX_PATH, necesită Windows 10 1607 sau o versiune ulterioară)"
;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_ROMANIAN} "Adding Windows Firewall rule"
+LangString inst_firewallinfo ${LANG_ROMANIAN} "Adăugarea regulii Windows Firewall"
;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_ROMANIAN} "qBittorrent is running. Please close the application before installing."
+LangString inst_warning ${LANG_ROMANIAN} "qBittorrent rulează. Vă rugăm să închideți aplicația înainte de instalare."
;LangString inst_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
-LangString inst_uninstall_question ${LANG_ROMANIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_ROMANIAN} "Versiunea actuală va fi dezinstalată. Setările utilizatorului și torrentele vor rămâne intacte."
;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_ROMANIAN} "Uninstalling previous version."
+LangString inst_unist ${LANG_ROMANIAN} "Se dezinstalează versiunea anterioară."
;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_ROMANIAN} "Launch qBittorrent."
+LangString launch_qbt ${LANG_ROMANIAN} "Lansați qBittorrent."
;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_ROMANIAN} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ROMANIAN} "Acest program de instalare funcționează doar pe versiunile Windows pe 64 de biți."
;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_ROMANIAN} "This qBittorrent version requires at least Windows 7."
+LangString inst_requires_win7 ${LANG_ROMANIAN} "Această versiune de qBittorrent necesită cel puțin Windows 7."
;LangString inst_requires_win10 ${LANG_ENGLISH} "This installer requires at least Windows 10 1809."
-LangString inst_requires_win10 ${LANG_ROMANIAN} "This installer requires at least Windows 10 1809."
+LangString inst_requires_win10 ${LANG_ROMANIAN} "Acest program de instalare necesită cel puțin Windows 10 1809."
;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
-LangString inst_uninstall_link_description ${LANG_ROMANIAN} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_ROMANIAN} "Dezinstalați qBittorrent"
;------------------------------------
;Uninstaller strings
;LangString remove_files ${LANG_ENGLISH} "Remove files"
-LangString remove_files ${LANG_ROMANIAN} "Remove files"
+LangString remove_files ${LANG_ROMANIAN} "Eliminați fișierele"
;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
-LangString remove_shortcuts ${LANG_ROMANIAN} "Remove shortcuts"
+LangString remove_shortcuts ${LANG_ROMANIAN} "Eliminați comenzile rapide"
;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_ROMANIAN} "Remove file associations"
+LangString remove_associations ${LANG_ROMANIAN} "Eliminați asocierile de fișiere"
;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_ROMANIAN} "Remove registry keys"
+LangString remove_registry ${LANG_ROMANIAN} "Eliminați cheile din registru"
;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
-LangString remove_conf ${LANG_ROMANIAN} "Remove configuration files"
+LangString remove_conf ${LANG_ROMANIAN} "Eliminați fișierele de configurare"
;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_ROMANIAN} "Remove Windows Firewall rule"
+LangString remove_firewall ${LANG_ROMANIAN} "Eliminați regula Windows Firewall"
;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_ROMANIAN} "Removing Windows Firewall rule"
+LangString remove_firewallinfo ${LANG_ROMANIAN} "Se elimină regula Windows Firewall"
;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_ROMANIAN} "Remove torrents and cached data"
+LangString remove_cache ${LANG_ROMANIAN} "Eliminați torrentele și datele din cache"
;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_ROMANIAN} "qBittorrent is running. Please close the application before uninstalling."
+LangString uninst_warning ${LANG_ROMANIAN} "qBittorrent rulează. Vă rugăm să închideți aplicația înainte de a o dezinstala."
;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_ROMANIAN} "Not removing .torrent association. It is associated with:"
+LangString uninst_tor_warn ${LANG_ROMANIAN} "Nu se elimină asocierea .torrent. Este asociat cu:"
;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_ROMANIAN} "Not removing magnet association. It is associated with:"
+LangString uninst_mag_warn ${LANG_ROMANIAN} "Nu se elimină asocierea magnet. Este asociat cu:"
diff --git a/dist/windows/installer.nsi b/dist/windows/installer.nsi
index 14edd1f1f..a76e92609 100644
--- a/dist/windows/installer.nsi
+++ b/dist/windows/installer.nsi
@@ -109,7 +109,7 @@ Section $(inst_torrent) ;"Open .torrent files with qBittorrent"
!insertmacro UAC_AsUser_Call Function inst_torrent_user ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR}|${UAC_SYNCINSTDIR}
- System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
+ System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, p 0, p 0)'
SectionEnd
@@ -142,7 +142,7 @@ Section $(inst_magnet) ;"Open magnet links with qBittorrent"
!insertmacro UAC_AsUser_Call Function inst_magnet_user ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR}|${UAC_SYNCINSTDIR}
- System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
+ System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, p 0, p 0)'
SectionEnd
diff --git a/dist/windows/uninstaller.nsi b/dist/windows/uninstaller.nsi
index 64dee7dea..72a13749d 100644
--- a/dist/windows/uninstaller.nsi
+++ b/dist/windows/uninstaller.nsi
@@ -26,17 +26,17 @@ Section "un.$(remove_associations)" ;"un.Remove file associations"
DetailPrint "$(uninst_tor_warn) $0"
DeleteRegValue HKLM "Software\Classes\.torrent" ""
DeleteRegKey /ifempty HKLM "Software\Classes\.torrent"
-
torrent_end:
+
ReadRegStr $0 HKLM "Software\Classes\magnet\shell\open\command" ""
StrCmp $0 '"$INSTDIR\qbittorrent.exe" "%1"' 0 magnet_end
DetailPrint "$(uninst_mag_warn) $0"
DeleteRegKey HKLM "Software\Classes\magnet"
-
magnet_end:
+
!insertmacro UAC_AsUser_Call Function un.remove_associations_user ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR}|${UAC_SYNCINSTDIR}
- System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
+ System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, p 0, p 0)'
SectionEnd
Function un.remove_associations_user
@@ -45,13 +45,12 @@ Function un.remove_associations_user
DetailPrint "$(uninst_tor_warn) $0"
DeleteRegValue HKCU "Software\Classes\.torrent" ""
DeleteRegKey /ifempty HKCU "Software\Classes\.torrent"
-
torrent_end:
+
ReadRegStr $0 HKCU "Software\Classes\magnet\shell\open\command" ""
StrCmp $0 '"$INSTDIR\qbittorrent.exe" "%1"' 0 magnet_end
DetailPrint "$(uninst_mag_warn) $0"
DeleteRegKey HKCU "Software\Classes\magnet"
-
magnet_end:
FunctionEnd
@@ -62,7 +61,7 @@ Section "un.$(remove_registry)" ;"un.Remove registry keys"
DeleteRegKey HKLM "Software\qBittorrent"
DeleteRegKey HKLM "Software\Classes\qBittorrent"
- System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
+ System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, p 0, p 0)'
SectionEnd
Section "un.$(remove_firewall)" ;
diff --git a/src/app/application.cpp b/src/app/application.cpp
index 6abe0bdaa..0fb60f83f 100644
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -98,6 +98,10 @@
#include "gui/uithememanager.h"
#include "gui/utils.h"
#include "gui/windowstate.h"
+
+#ifdef Q_OS_WIN
+#include "base/utils/os.h"
+#endif // Q_OS_WIN
#endif // DISABLE_GUI
#ifndef DISABLE_WEBUI
@@ -763,7 +767,6 @@ void Application::processParams(const QBtCommandLineParameters ¶ms)
}
int Application::exec()
-try
{
#if !defined(DISABLE_WEBUI) && defined(DISABLE_GUI)
const QString loadingStr = tr("WebUI will be started shortly after internal preparations. Please wait...");
@@ -878,14 +881,14 @@ try
delete m_startupProgressDialog;
#ifdef Q_OS_WIN
auto *pref = Preferences::instance();
- if (!pref->neverCheckFileAssoc() && (!Preferences::isTorrentFileAssocSet() || !Preferences::isMagnetLinkAssocSet()))
+ if (!pref->neverCheckFileAssoc() && (!Utils::OS::isTorrentFileAssocSet() || !Utils::OS::isMagnetLinkAssocSet()))
{
if (QMessageBox::question(m_window, tr("Torrent file association")
, tr("qBittorrent is not the default application for opening torrent files or Magnet links.\nDo you want to make qBittorrent the default application for these?")
, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes)
{
- pref->setTorrentFileAssoc(true);
- pref->setMagnetLinkAssoc(true);
+ Utils::OS::setTorrentFileAssoc(true);
+ Utils::OS::setMagnetLinkAssoc(true);
}
else
{
@@ -932,21 +935,6 @@ try
return BaseApplication::exec();
}
-catch (const RuntimeError &err)
-{
-#ifdef DISABLE_GUI
- fprintf(stderr, "%s", qPrintable(err.message()));
-#else
- QMessageBox msgBox;
- msgBox.setIcon(QMessageBox::Critical);
- msgBox.setText(QCoreApplication::translate("Application", "Application failed to start."));
- msgBox.setInformativeText(err.message());
- msgBox.show(); // Need to be shown or to moveToCenter does not work
- msgBox.move(Utils::Gui::screenCenter(&msgBox));
- msgBox.exec();
-#endif
- return EXIT_FAILURE;
-}
bool Application::isRunning()
{
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 1e95075f4..23e838ec4 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -46,7 +46,7 @@
#endif
#include
-#include
+#include
#include
#ifndef DISABLE_GUI
@@ -86,6 +86,7 @@ using namespace std::chrono_literals;
void displayVersion();
bool userAgreesWithLegalNotice();
void displayBadArgMessage(const QString &message);
+void displayErrorMessage(const QString &message);
#ifndef DISABLE_GUI
void showSplashScreen();
@@ -114,10 +115,12 @@ int main(int argc, char *argv[])
Application::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
#endif
+ // `app` must be declared out of try block to allow display message box in case of exception
+ std::unique_ptr app;
try
{
// Create Application
- auto app = std::make_unique(argc, argv);
+ app = std::make_unique(argc, argv);
#ifdef Q_OS_WIN
// QCoreApplication::applicationDirPath() needs an Application object instantiated first
@@ -268,7 +271,7 @@ int main(int argc, char *argv[])
}
catch (const RuntimeError &er)
{
- qDebug() << er.message();
+ displayErrorMessage(er.message());
return EXIT_FAILURE;
}
}
@@ -311,6 +314,30 @@ void displayBadArgMessage(const QString &message)
#endif
}
+void displayErrorMessage(const QString &message)
+{
+#ifndef DISABLE_GUI
+ if (QApplication::instance())
+ {
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Critical);
+ msgBox.setText(QCoreApplication::translate("Main", "An unrecoverable error occurred."));
+ msgBox.setInformativeText(message);
+ msgBox.show(); // Need to be shown or to moveToCenter does not work
+ msgBox.move(Utils::Gui::screenCenter(&msgBox));
+ msgBox.exec();
+ }
+ else
+ {
+ const QString errMsg = QCoreApplication::translate("Main", "qBittorrent has encountered an unrecoverable error.") + u'\n' + message + u'\n';
+ fprintf(stderr, "%s", qUtf8Printable(errMsg));
+ }
+#else
+ const QString errMsg = QCoreApplication::translate("Main", "qBittorrent has encountered an unrecoverable error.") + u'\n' + message + u'\n';
+ fprintf(stderr, "%s", qUtf8Printable(errMsg));
+#endif
+}
+
bool userAgreesWithLegalNotice()
{
Preferences *const pref = Preferences::instance();
diff --git a/src/app/signalhandler.cpp b/src/app/signalhandler.cpp
index 36d24bcec..be70f254d 100644
--- a/src/app/signalhandler.cpp
+++ b/src/app/signalhandler.cpp
@@ -43,6 +43,7 @@
#endif
#include
+#include
#include "base/version.h"
@@ -89,7 +90,7 @@ namespace
const char *msgs[] = {"Catching signal: ", sysSigName[signum], "\nExiting cleanly\n"};
std::for_each(std::begin(msgs), std::end(msgs), safePrint);
signal(signum, SIG_DFL);
- QCoreApplication::exit(); // unsafe, but exit anyway
+ QMetaObject::invokeMethod(qApp, [] { QCoreApplication::exit(); }, Qt::QueuedConnection); // unsafe, but exit anyway
}
#ifdef STACKTRACE
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
index 2403c2e11..36825a283 100644
--- a/src/base/CMakeLists.txt
+++ b/src/base/CMakeLists.txt
@@ -99,6 +99,7 @@ add_library(qbt_base STATIC
utils/io.h
utils/misc.h
utils/net.h
+ utils/os.h
utils/password.h
utils/random.h
utils/string.h
@@ -184,6 +185,7 @@ add_library(qbt_base STATIC
utils/io.cpp
utils/misc.cpp
utils/net.cpp
+ utils/os.cpp
utils/password.cpp
utils/random.cpp
utils/string.cpp
diff --git a/src/base/base.pri b/src/base/base.pri
index e6fd1ca3b..7c1d3af57 100644
--- a/src/base/base.pri
+++ b/src/base/base.pri
@@ -99,6 +99,7 @@ HEADERS += \
$$PWD/utils/io.h \
$$PWD/utils/misc.h \
$$PWD/utils/net.h \
+ $$PWD/utils/os.h \
$$PWD/utils/password.h \
$$PWD/utils/random.h \
$$PWD/utils/string.h \
@@ -184,6 +185,7 @@ SOURCES += \
$$PWD/utils/io.cpp \
$$PWD/utils/misc.cpp \
$$PWD/utils/net.cpp \
+ $$PWD/utils/os.cpp \
$$PWD/utils/password.cpp \
$$PWD/utils/random.cpp \
$$PWD/utils/string.cpp \
diff --git a/src/base/bittorrent/dbresumedatastorage.cpp b/src/base/bittorrent/dbresumedatastorage.cpp
index cd360aef0..784c493f2 100644
--- a/src/base/bittorrent/dbresumedatastorage.cpp
+++ b/src/base/bittorrent/dbresumedatastorage.cpp
@@ -288,7 +288,7 @@ namespace BitTorrent
Q_DISABLE_COPY_MOVE(Worker)
public:
- Worker(const Path &dbPath, QReadWriteLock &dbLock);
+ Worker(const Path &dbPath, QReadWriteLock &dbLock, QObject *parent = nullptr);
void run() override;
void requestInterruption();
@@ -332,7 +332,7 @@ BitTorrent::DBResumeDataStorage::DBResumeDataStorage(const Path &dbPath, QObject
updateDB(dbVersion);
}
- m_asyncWorker = new Worker(dbPath, m_dbLock);
+ m_asyncWorker = new Worker(dbPath, m_dbLock, this);
m_asyncWorker->start();
}
@@ -611,10 +611,15 @@ void BitTorrent::DBResumeDataStorage::updateDB(const int fromVersion) const
if (fromVersion <= 4)
{
- const auto alterTableTorrentsQuery = u"ALTER TABLE %1 ADD %2"_s
- .arg(quoted(DB_TABLE_TORRENTS), makeColumnDefinition(DB_COLUMN_INACTIVE_SEEDING_TIME_LIMIT, "INTEGER NOT NULL DEFAULT -2"));
- if (!query.exec(alterTableTorrentsQuery))
- throw RuntimeError(query.lastError().text());
+ const auto testQuery = u"SELECT COUNT(%1) FROM %2;"_s
+ .arg(quoted(DB_COLUMN_INACTIVE_SEEDING_TIME_LIMIT.name), quoted(DB_TABLE_TORRENTS));
+ if (!query.exec(testQuery))
+ {
+ const auto alterTableTorrentsQuery = u"ALTER TABLE %1 ADD %2"_s
+ .arg(quoted(DB_TABLE_TORRENTS), makeColumnDefinition(DB_COLUMN_INACTIVE_SEEDING_TIME_LIMIT, "INTEGER NOT NULL DEFAULT -2"));
+ if (!query.exec(alterTableTorrentsQuery))
+ throw RuntimeError(query.lastError().text());
+ }
}
const QString updateMetaVersionQuery = makeUpdateStatement(DB_TABLE_META, {DB_COLUMN_NAME, DB_COLUMN_VALUE});
@@ -653,8 +658,9 @@ void BitTorrent::DBResumeDataStorage::enableWALMode() const
throw RuntimeError(tr("WAL mode is probably unsupported due to filesystem limitations."));
}
-BitTorrent::DBResumeDataStorage::Worker::Worker(const Path &dbPath, QReadWriteLock &dbLock)
- : m_path {dbPath}
+BitTorrent::DBResumeDataStorage::Worker::Worker(const Path &dbPath, QReadWriteLock &dbLock, QObject *parent)
+ : QThread(parent)
+ , m_path {dbPath}
, m_dbLock {dbLock}
{
}
diff --git a/src/base/bittorrent/sessionimpl.cpp b/src/base/bittorrent/sessionimpl.cpp
index e021a5453..aeaa54698 100644
--- a/src/base/bittorrent/sessionimpl.cpp
+++ b/src/base/bittorrent/sessionimpl.cpp
@@ -2950,7 +2950,7 @@ bool SessionImpl::addTorrent_impl(const std::variant &so
}
void SessionImpl::findIncompleteFiles(const TorrentInfo &torrentInfo, const Path &savePath
- , const Path &downloadPath, const PathList &filePaths) const
+ , const Path &downloadPath, const PathList &filePaths) const
{
Q_ASSERT(filePaths.isEmpty() || (filePaths.size() == torrentInfo.filesCount()));
@@ -3143,8 +3143,16 @@ void SessionImpl::generateResumeData()
void SessionImpl::saveResumeData()
{
for (const TorrentImpl *torrent : asConst(m_torrents))
- torrent->nativeHandle().save_resume_data(lt::torrent_handle::only_if_modified);
- m_numResumeData += m_torrents.size();
+ {
+ // When the session is terminated due to unrecoverable error
+ // some of the torrent handles can be corrupted
+ try
+ {
+ torrent->nativeHandle().save_resume_data(lt::torrent_handle::only_if_modified);
+ ++m_numResumeData;
+ }
+ catch (const std::exception &) {}
+ }
// clear queued storage move jobs except the current ongoing one
if (m_moveStorageQueue.size() > 1)
@@ -5547,10 +5555,13 @@ void SessionImpl::handleAlert(const lt::alert *a)
dispatchTorrentAlert(static_cast(a));
break;
case lt::state_update_alert::alert_type:
- handleStateUpdateAlert(static_cast(a));
+ handleStateUpdateAlert(static_cast(a));
+ break;
+ case lt::session_error_alert::alert_type:
+ handleSessionErrorAlert(static_cast(a));
break;
case lt::session_stats_alert::alert_type:
- handleSessionStatsAlert(static_cast(a));
+ handleSessionStatsAlert(static_cast(a));
break;
case lt::tracker_announce_alert::alert_type:
case lt::tracker_error_alert::alert_type:
@@ -5559,56 +5570,59 @@ void SessionImpl::handleAlert(const lt::alert *a)
handleTrackerAlert(static_cast(a));
break;
case lt::file_error_alert::alert_type:
- handleFileErrorAlert(static_cast(a));
+ handleFileErrorAlert(static_cast(a));
break;
case lt::add_torrent_alert::alert_type:
// handled separately
break;
case lt::torrent_removed_alert::alert_type:
- handleTorrentRemovedAlert(static_cast(a));
+ handleTorrentRemovedAlert(static_cast(a));
break;
case lt::torrent_deleted_alert::alert_type:
- handleTorrentDeletedAlert(static_cast(a));
+ handleTorrentDeletedAlert(static_cast(a));
break;
case lt::torrent_delete_failed_alert::alert_type:
- handleTorrentDeleteFailedAlert(static_cast(a));
+ handleTorrentDeleteFailedAlert(static_cast(a));
break;
case lt::portmap_error_alert::alert_type:
- handlePortmapWarningAlert(static_cast(a));
+ handlePortmapWarningAlert(static_cast(a));
break;
case lt::portmap_alert::alert_type:
- handlePortmapAlert(static_cast(a));
+ handlePortmapAlert(static_cast(a));
break;
case lt::peer_blocked_alert::alert_type:
- handlePeerBlockedAlert(static_cast(a));
+ handlePeerBlockedAlert(static_cast(a));
break;
case lt::peer_ban_alert::alert_type:
- handlePeerBanAlert(static_cast(a));
+ handlePeerBanAlert(static_cast(a));
break;
case lt::url_seed_alert::alert_type:
- handleUrlSeedAlert(static_cast(a));
+ handleUrlSeedAlert(static_cast(a));
break;
case lt::listen_succeeded_alert::alert_type:
- handleListenSucceededAlert(static_cast(a));
+ handleListenSucceededAlert(static_cast(a));
break;
case lt::listen_failed_alert::alert_type:
- handleListenFailedAlert(static_cast(a));
+ handleListenFailedAlert(static_cast(a));
break;
case lt::external_ip_alert::alert_type:
- handleExternalIPAlert(static_cast(a));
+ handleExternalIPAlert(static_cast(a));
break;
case lt::alerts_dropped_alert::alert_type:
handleAlertsDroppedAlert(static_cast(a));
break;
case lt::storage_moved_alert::alert_type:
- handleStorageMovedAlert(static_cast(a));
+ handleStorageMovedAlert(static_cast(a));
break;
case lt::storage_moved_failed_alert::alert_type:
- handleStorageMovedFailedAlert(static_cast(a));
+ handleStorageMovedFailedAlert(static_cast(a));
break;
case lt::socks5_alert::alert_type:
handleSocks5Alert(static_cast(a));
break;
+ case lt::i2p_alert::alert_type:
+ handleI2PAlert(static_cast(a));
+ break;
#ifdef QBT_USES_LIBTORRENT2
case lt::torrent_conflict_alert::alert_type:
handleTorrentConflictAlert(static_cast(a));
@@ -5915,6 +5929,12 @@ void SessionImpl::handleExternalIPAlert(const lt::external_ip_alert *p)
}
}
+void SessionImpl::handleSessionErrorAlert(const lt::session_error_alert *p) const
+{
+ LogMsg(tr("BitTorrent session encountered a serious error. Reason: \"%1\"")
+ .arg(QString::fromStdString(p->message())), Log::CRITICAL);
+}
+
void SessionImpl::handleSessionStatsAlert(const lt::session_stats_alert *p)
{
if (m_refreshEnqueued)
@@ -6109,6 +6129,15 @@ void SessionImpl::handleSocks5Alert(const lt::socks5_alert *p) const
}
}
+void SessionImpl::handleI2PAlert(const lt::i2p_alert *p) const
+{
+ if (p->error)
+ {
+ LogMsg(tr("I2P error. Message: \"%1\".")
+ .arg(QString::fromStdString(p->message())), Log::WARNING);
+ }
+}
+
void SessionImpl::handleTrackerAlert(const lt::tracker_alert *a)
{
TorrentImpl *torrent = m_torrents.value(a->handle.info_hash());
diff --git a/src/base/bittorrent/sessionimpl.h b/src/base/bittorrent/sessionimpl.h
index f75879019..a8c1f967b 100644
--- a/src/base/bittorrent/sessionimpl.h
+++ b/src/base/bittorrent/sessionimpl.h
@@ -564,11 +564,13 @@ namespace BitTorrent
void handleListenSucceededAlert(const lt::listen_succeeded_alert *p);
void handleListenFailedAlert(const lt::listen_failed_alert *p);
void handleExternalIPAlert(const lt::external_ip_alert *p);
+ void handleSessionErrorAlert(const lt::session_error_alert *p) const;
void handleSessionStatsAlert(const lt::session_stats_alert *p);
void handleAlertsDroppedAlert(const lt::alerts_dropped_alert *p) const;
void handleStorageMovedAlert(const lt::storage_moved_alert *p);
void handleStorageMovedFailedAlert(const lt::storage_moved_failed_alert *p);
void handleSocks5Alert(const lt::socks5_alert *p) const;
+ void handleI2PAlert(const lt::i2p_alert *p) const;
void handleTrackerAlert(const lt::tracker_alert *a);
#ifdef QBT_USES_LIBTORRENT2
void handleTorrentConflictAlert(const lt::torrent_conflict_alert *a);
diff --git a/src/base/bittorrent/torrentimpl.cpp b/src/base/bittorrent/torrentimpl.cpp
index 86a4e1147..f11256557 100644
--- a/src/base/bittorrent/torrentimpl.cpp
+++ b/src/base/bittorrent/torrentimpl.cpp
@@ -51,6 +51,7 @@
#include
#include
+#include "base/exceptions.h"
#include "base/global.h"
#include "base/logger.h"
#include "base/preferences.h"
@@ -599,6 +600,9 @@ void TorrentImpl::replaceTrackers(QVector trackers)
{
// TODO: use std::erase_if() in C++20
trackers.erase(std::remove_if(trackers.begin(), trackers.end(), [](const TrackerEntry &entry) { return entry.url.isEmpty(); }), trackers.end());
+ // Filter out duplicate trackers
+ const auto uniqueTrackers = QSet(trackers.cbegin(), trackers.cend());
+ trackers = QVector(uniqueTrackers.cbegin(), uniqueTrackers.cend());
std::sort(trackers.begin(), trackers.end()
, [](const TrackerEntry &lhs, const TrackerEntry &rhs) { return lhs.tier < rhs.tier; });
@@ -1602,7 +1606,8 @@ void TorrentImpl::applyFirstLastPiecePriority(const bool enabled)
void TorrentImpl::fileSearchFinished(const Path &savePath, const PathList &fileNames)
{
- endReceivedMetadataHandling(savePath, fileNames);
+ if (m_maintenanceJob == MaintenanceJob::HandleMetadata)
+ endReceivedMetadataHandling(savePath, fileNames);
}
TrackerEntry TorrentImpl::updateTrackerEntry(const lt::announce_entry &announceEntry, const QMap &updateInfo)
@@ -1635,7 +1640,13 @@ std::shared_ptr TorrentImpl::nativeTorrentInfo()
void TorrentImpl::endReceivedMetadataHandling(const Path &savePath, const PathList &fileNames)
{
+ Q_ASSERT(m_maintenanceJob == MaintenanceJob::HandleMetadata);
+ if (Q_UNLIKELY(m_maintenanceJob != MaintenanceJob::HandleMetadata))
+ return;
+
Q_ASSERT(m_filePaths.isEmpty());
+ if (Q_UNLIKELY(!m_filePaths.isEmpty()))
+ m_filePaths.clear();
lt::add_torrent_params &p = m_ltAddTorrentParams;
@@ -1644,7 +1655,7 @@ void TorrentImpl::endReceivedMetadataHandling(const Path &savePath, const PathLi
m_filePriorities.reserve(filesCount());
const auto nativeIndexes = m_torrentInfo.nativeIndexes();
p.file_priorities = resized(p.file_priorities, metadata->files().num_files()
- , LT::toNative(p.file_priorities.empty() ? DownloadPriority::Normal : DownloadPriority::Ignored));
+ , LT::toNative(p.file_priorities.empty() ? DownloadPriority::Normal : DownloadPriority::Ignored));
m_completedFiles.fill(static_cast(p.flags & lt::torrent_flags::seed_mode), filesCount());
m_filesProgress.resize(filesCount());
@@ -1694,6 +1705,7 @@ void TorrentImpl::endReceivedMetadataHandling(const Path &savePath, const PathLi
}
void TorrentImpl::reload()
+try
{
m_completedFiles.fill(false);
m_filesProgress.fill(0);
@@ -1736,6 +1748,11 @@ void TorrentImpl::reload()
updateState();
}
+catch (const lt::system_error &err)
+{
+ throw RuntimeError(tr("Failed to reload torrent. Torrent: %1. Reason: %2")
+ .arg(id().toString(), QString::fromLocal8Bit(err.what())));
+}
void TorrentImpl::pause()
{
diff --git a/src/base/net/downloadmanager.cpp b/src/base/net/downloadmanager.cpp
index 7669af79f..ea57d15cf 100644
--- a/src/base/net/downloadmanager.cpp
+++ b/src/base/net/downloadmanager.cpp
@@ -62,11 +62,10 @@ public:
{
const QDateTime now = QDateTime::currentDateTime();
QList cookies = Preferences::instance()->getNetworkCookies();
- for (const QNetworkCookie &cookie : asConst(Preferences::instance()->getNetworkCookies()))
+ cookies.erase(std::remove_if(cookies.begin(), cookies.end(), [&now](const QNetworkCookie &cookie)
{
- if (cookie.isSessionCookie() || (cookie.expirationDate() <= now))
- cookies.removeAll(cookie);
- }
+ return cookie.isSessionCookie() || (cookie.expirationDate() <= now);
+ }), cookies.end());
setAllCookies(cookies);
}
@@ -75,11 +74,10 @@ public:
{
const QDateTime now = QDateTime::currentDateTime();
QList cookies = allCookies();
- for (const QNetworkCookie &cookie : asConst(allCookies()))
+ cookies.erase(std::remove_if(cookies.begin(), cookies.end(), [&now](const QNetworkCookie &cookie)
{
- if (cookie.isSessionCookie() || (cookie.expirationDate() <= now))
- cookies.removeAll(cookie);
- }
+ return cookie.isSessionCookie() || (cookie.expirationDate() <= now);
+ }), cookies.end());
Preferences::instance()->setNetworkCookies(cookies);
}
@@ -91,11 +89,10 @@ public:
{
const QDateTime now = QDateTime::currentDateTime();
QList cookies = QNetworkCookieJar::cookiesForUrl(url);
- for (const QNetworkCookie &cookie : asConst(QNetworkCookieJar::cookiesForUrl(url)))
+ cookies.erase(std::remove_if(cookies.begin(), cookies.end(), [&now](const QNetworkCookie &cookie)
{
- if (!cookie.isSessionCookie() && (cookie.expirationDate() <= now))
- cookies.removeAll(cookie);
- }
+ return !cookie.isSessionCookie() && (cookie.expirationDate() <= now);
+ }), cookies.end());
return cookies;
}
@@ -104,11 +101,10 @@ public:
{
const QDateTime now = QDateTime::currentDateTime();
QList cookies = cookieList;
- for (const QNetworkCookie &cookie : cookieList)
+ cookies.erase(std::remove_if(cookies.begin(), cookies.end(), [&now](const QNetworkCookie &cookie)
{
- if (!cookie.isSessionCookie() && (cookie.expirationDate() <= now))
- cookies.removeAll(cookie);
- }
+ return !cookie.isSessionCookie() && (cookie.expirationDate() <= now);
+ }), cookies.end());
return QNetworkCookieJar::setCookiesFromUrl(cookies, url);
}
diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp
index 331983640..ca2b101ab 100644
--- a/src/base/preferences.cpp
+++ b/src/base/preferences.cpp
@@ -31,13 +31,6 @@
#include
-#ifdef Q_OS_MACOS
-#include
-#endif
-#ifdef Q_OS_WIN
-#include
-#endif
-
#include
#include
#include
@@ -47,10 +40,6 @@
#include
#include
-#ifdef Q_OS_WIN
-#include
-#endif
-
#include "algorithm.h"
#include "global.h"
#include "path.h"
@@ -1316,144 +1305,8 @@ void Preferences::setNeverCheckFileAssoc(const bool check)
setValue(u"Preferences/Win32/NeverCheckFileAssocation"_s, check);
}
-
-bool Preferences::isTorrentFileAssocSet()
-{
- const QSettings settings(u"HKEY_CURRENT_USER\\Software\\Classes"_s, QSettings::NativeFormat);
- if (settings.value(u".torrent/Default"_s).toString() != u"qBittorrent")
- {
- qDebug(".torrent != qBittorrent");
- return false;
- }
-
- return true;
-}
-
-void Preferences::setTorrentFileAssoc(const bool set)
-{
- QSettings settings(u"HKEY_CURRENT_USER\\Software\\Classes"_s, QSettings::NativeFormat);
-
- // .Torrent association
- if (set)
- {
- const QString oldProgId = settings.value(u".torrent/Default"_s).toString();
- if (!oldProgId.isEmpty() && (oldProgId != u"qBittorrent"))
- settings.setValue((u".torrent/OpenWithProgids/" + oldProgId), QString());
- settings.setValue(u".torrent/Default"_s, u"qBittorrent"_s);
- }
- else if (isTorrentFileAssocSet())
- {
- settings.setValue(u".torrent/Default"_s, QString());
- }
-
- SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, 0, 0);
-}
-
-bool Preferences::isMagnetLinkAssocSet()
-{
- const QSettings settings(u"HKEY_CURRENT_USER\\Software\\Classes"_s, QSettings::NativeFormat);
-
- // Check magnet link assoc
- const QString shellCommand = settings.value(u"magnet/shell/open/command/Default"_s, QString()).toString();
-
- const QRegularExpressionMatch exeRegMatch = QRegularExpression(u"\"([^\"]+)\".*"_s).match(shellCommand);
- if (!exeRegMatch.hasMatch())
- return false;
-
- const Path assocExe {exeRegMatch.captured(1)};
- if (assocExe != Path(qApp->applicationFilePath()))
- return false;
-
- return true;
-}
-
-void Preferences::setMagnetLinkAssoc(const bool set)
-{
- QSettings settings(u"HKEY_CURRENT_USER\\Software\\Classes"_s, QSettings::NativeFormat);
-
- // Magnet association
- if (set)
- {
- const QString applicationFilePath = Path(qApp->applicationFilePath()).toString();
- const QString commandStr = u'"' + applicationFilePath + u"\" \"%1\"";
- const QString iconStr = u'"' + applicationFilePath + u"\",1";
-
- settings.setValue(u"magnet/Default"_s, u"URL:Magnet link"_s);
- settings.setValue(u"magnet/Content Type"_s, u"application/x-magnet"_s);
- settings.setValue(u"magnet/URL Protocol"_s, QString());
- settings.setValue(u"magnet/DefaultIcon/Default"_s, iconStr);
- settings.setValue(u"magnet/shell/Default"_s, u"open"_s);
- settings.setValue(u"magnet/shell/open/command/Default"_s, commandStr);
- }
- else if (isMagnetLinkAssocSet())
- {
- settings.remove(u"magnet"_s);
- }
-
- SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, 0, 0);
-}
#endif // Q_OS_WIN
-#ifdef Q_OS_MACOS
-namespace
-{
- const CFStringRef torrentExtension = CFSTR("torrent");
- const CFStringRef magnetUrlScheme = CFSTR("magnet");
-}
-
-bool Preferences::isTorrentFileAssocSet()
-{
- bool isSet = false;
- const CFStringRef torrentId = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, torrentExtension, NULL);
- if (torrentId != NULL)
- {
- const CFStringRef defaultHandlerId = LSCopyDefaultRoleHandlerForContentType(torrentId, kLSRolesViewer);
- if (defaultHandlerId != NULL)
- {
- const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
- isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;
- CFRelease(defaultHandlerId);
- }
- CFRelease(torrentId);
- }
- return isSet;
-}
-
-void Preferences::setTorrentFileAssoc()
-{
- if (isTorrentFileAssocSet())
- return;
- const CFStringRef torrentId = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, torrentExtension, NULL);
- if (torrentId != NULL)
- {
- const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
- LSSetDefaultRoleHandlerForContentType(torrentId, kLSRolesViewer, myBundleId);
- CFRelease(torrentId);
- }
-}
-
-bool Preferences::isMagnetLinkAssocSet()
-{
- bool isSet = false;
- const CFStringRef defaultHandlerId = LSCopyDefaultHandlerForURLScheme(magnetUrlScheme);
- if (defaultHandlerId != NULL)
- {
- const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
- isSet = CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;
- CFRelease(defaultHandlerId);
- }
- return isSet;
-}
-
-void Preferences::setMagnetLinkAssoc()
-{
- if (isMagnetLinkAssocSet())
- return;
- const CFStringRef myBundleId = CFBundleGetIdentifier(CFBundleGetMainBundle());
- LSSetDefaultHandlerForURLScheme(magnetUrlScheme, myBundleId);
-}
-#endif // Q_OS_MACOS
-
int Preferences::getTrackerPort() const
{
return value(u"Preferences/Advanced/trackerPort"_s, 9000);
diff --git a/src/base/preferences.h b/src/base/preferences.h
index 9f17eabb5..3cd35c8c6 100644
--- a/src/base/preferences.h
+++ b/src/base/preferences.h
@@ -290,17 +290,8 @@ public:
#ifdef Q_OS_WIN
bool neverCheckFileAssoc() const;
void setNeverCheckFileAssoc(bool check = true);
- static bool isTorrentFileAssocSet();
- static void setTorrentFileAssoc(bool set);
- static bool isMagnetLinkAssocSet();
- static void setMagnetLinkAssoc(bool set);
-#endif
-#ifdef Q_OS_MACOS
- static bool isTorrentFileAssocSet();
- static void setTorrentFileAssoc();
- static bool isMagnetLinkAssocSet();
- static void setMagnetLinkAssoc();
#endif
+
int getTrackerPort() const;
void setTrackerPort(int port);
bool isTrackerPortForwardingEnabled() const;
diff --git a/src/base/rss/feed_serializer.cpp b/src/base/rss/feed_serializer.cpp
index 062360ba7..ce097c41c 100644
--- a/src/base/rss/feed_serializer.cpp
+++ b/src/base/rss/feed_serializer.cpp
@@ -45,8 +45,7 @@ const int ARTICLEDATALIST_TYPEID = qRegisterMetaType>();
void RSS::Private::FeedSerializer::load(const Path &dataFileName, const QString &url)
{
- const int fileMaxSize = 10 * 1024 * 1024;
- const auto readResult = Utils::IO::readFile(dataFileName, fileMaxSize);
+ const auto readResult = Utils::IO::readFile(dataFileName, -1);
if (!readResult)
{
if (readResult.error().status == Utils::IO::ReadError::NotExist)
diff --git a/src/base/rss/rss_session.cpp b/src/base/rss/rss_session.cpp
index 6de5c26d7..ec4959eeb 100644
--- a/src/base/rss/rss_session.cpp
+++ b/src/base/rss/rss_session.cpp
@@ -271,6 +271,7 @@ void Session::load()
if (readResult.error().status == Utils::IO::ReadError::NotExist)
{
loadLegacy();
+ store(); // convert to new format
return;
}
@@ -294,10 +295,11 @@ void Session::load()
return;
}
- loadFolder(jsonDoc.object(), rootFolder());
+ if (loadFolder(jsonDoc.object(), rootFolder()))
+ store(); // convert to updated format
}
-void Session::loadFolder(const QJsonObject &jsonObj, Folder *folder)
+bool Session::loadFolder(const QJsonObject &jsonObj, Folder *folder)
{
bool updated = false;
for (const QString &key : asConst(jsonObj.keys()))
@@ -353,7 +355,8 @@ void Session::loadFolder(const QJsonObject &jsonObj, Folder *folder)
}
else
{
- loadFolder(valObj, addSubfolder(key, folder));
+ if (loadFolder(valObj, addSubfolder(key, folder)))
+ updated = true;
}
}
else
@@ -363,8 +366,7 @@ void Session::loadFolder(const QJsonObject &jsonObj, Folder *folder)
}
}
- if (updated)
- store(); // convert to updated format
+ return updated;
}
void Session::loadLegacy()
@@ -394,8 +396,6 @@ void Session::loadLegacy()
addFeed(feedUrl, feedPath);
++i;
}
-
- store(); // convert to new format
}
void Session::store()
diff --git a/src/base/rss/rss_session.h b/src/base/rss/rss_session.h
index 79c920066..9fee14c1e 100644
--- a/src/base/rss/rss_session.h
+++ b/src/base/rss/rss_session.h
@@ -149,7 +149,7 @@ namespace RSS
private:
QUuid generateUID() const;
void load();
- void loadFolder(const QJsonObject &jsonObj, Folder *folder);
+ bool loadFolder(const QJsonObject &jsonObj, Folder *folder);
void loadLegacy();
void store();
nonstd::expected prepareItemDest(const QString &path);
diff --git a/src/base/torrentfileswatcher.cpp b/src/base/torrentfileswatcher.cpp
index 7015a293d..2af5cd276 100644
--- a/src/base/torrentfileswatcher.cpp
+++ b/src/base/torrentfileswatcher.cpp
@@ -141,7 +141,7 @@ TorrentFilesWatcher *TorrentFilesWatcher::instance()
}
TorrentFilesWatcher::TorrentFilesWatcher(QObject *parent)
- : QObject {parent}
+ : QObject(parent)
, m_ioThread {new QThread}
{
const auto *btSession = BitTorrent::Session::instance();
@@ -163,7 +163,7 @@ void TorrentFilesWatcher::initWorker()
connect(m_asyncWorker, &TorrentFilesWatcher::Worker::torrentFound, this, &TorrentFilesWatcher::onTorrentFound);
m_asyncWorker->moveToThread(m_ioThread.get());
- connect(m_ioThread.get(), &QThread::finished, m_asyncWorker, &QObject::deleteLater);
+ connect(m_ioThread.get(), &QObject::destroyed, this, [this] { delete m_asyncWorker; });
m_ioThread->start();
for (auto it = m_watchedFolders.cbegin(); it != m_watchedFolders.cend(); ++it)
diff --git a/src/base/utils/io.cpp b/src/base/utils/io.cpp
index 902297d6d..afe4c4deb 100644
--- a/src/base/utils/io.cpp
+++ b/src/base/utils/io.cpp
@@ -28,6 +28,8 @@
#include "io.h"
+#include
+
#include
#include
@@ -89,11 +91,20 @@ nonstd::expected Utils::IO::readFile(const Pat
return nonstd::make_unexpected(ReadError {ReadError::ExceedSize, message});
}
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
- QByteArray ret {fileSize, Qt::Uninitialized};
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ using ByteArraySizeType = qsizetype;
#else
- QByteArray ret {static_cast(fileSize), Qt::Uninitialized};
+ using ByteArraySizeType = int;
#endif
+ if ((fileSize < std::numeric_limits::min())
+ || (fileSize > std::numeric_limits::max()))
+ {
+ const QString message = QCoreApplication::translate("Utils::IO", "File size exceeds data size limit. File: \"%1\". File size: %2. Array limit: %3")
+ .arg(file.fileName(), QString::number(fileSize), QString::number(std::numeric_limits::max()));
+ return nonstd::make_unexpected(ReadError {ReadError::ExceedSize, message});
+ }
+
+ QByteArray ret {static_cast(fileSize), Qt::Uninitialized};
const qint64 actualSize = file.read(ret.data(), fileSize);
if (actualSize < 0)
diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp
index a39355e23..9ca0cdf24 100644
--- a/src/base/utils/misc.cpp
+++ b/src/base/utils/misc.cpp
@@ -611,4 +611,4 @@ Path Utils::Misc::windowsSystemPath()
}();
return path;
}
-#endif
+#endif // Q_OS_WIN
diff --git a/src/base/utils/os.cpp b/src/base/utils/os.cpp
new file mode 100644
index 000000000..8ee374e3d
--- /dev/null
+++ b/src/base/utils/os.cpp
@@ -0,0 +1,194 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2023 Mike Tzou (Chocobo1)
+ * Copyright (C) 2014 sledgehammer999
+ * Copyright (C) 2006 Christophe Dumez
+ *
+ * This program 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+#include "os.h"
+
+#ifdef Q_OS_MACOS
+#include
+#endif // Q_OS_MACOS
+
+#ifdef Q_OS_WIN
+#include
+#endif // Q_OS_WIN
+
+#include
+
+#ifdef Q_OS_WIN
+#include
+#include
+#include
+#endif // Q_OS_WIN
+
+#include "base/global.h"
+#include "base/path.h"
+
+#ifdef Q_OS_MACOS
+namespace
+{
+ const CFStringRef torrentExtension = CFSTR("torrent");
+ const CFStringRef magnetUrlScheme = CFSTR("magnet");
+}
+
+bool Utils::OS::isTorrentFileAssocSet()
+{
+ bool isSet = false;
+ const CFStringRef torrentId = ::UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, torrentExtension, NULL);
+ if (torrentId != NULL)
+ {
+ const CFStringRef defaultHandlerId = ::LSCopyDefaultRoleHandlerForContentType(torrentId, kLSRolesViewer);
+ if (defaultHandlerId != NULL)
+ {
+ const CFStringRef myBundleId = ::CFBundleGetIdentifier(::CFBundleGetMainBundle());
+ if (myBundleId != NULL)
+ isSet = ::CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;
+ ::CFRelease(defaultHandlerId);
+ }
+ ::CFRelease(torrentId);
+ }
+ return isSet;
+}
+
+void Utils::OS::setTorrentFileAssoc()
+{
+ if (isTorrentFileAssocSet())
+ return;
+
+ const CFStringRef torrentId = ::UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, torrentExtension, NULL);
+ if (torrentId != NULL)
+ {
+ const CFStringRef myBundleId = ::CFBundleGetIdentifier(::CFBundleGetMainBundle());
+ if (myBundleId != NULL)
+ ::LSSetDefaultRoleHandlerForContentType(torrentId, kLSRolesViewer, myBundleId);
+ ::CFRelease(torrentId);
+ }
+}
+
+bool Utils::OS::isMagnetLinkAssocSet()
+{
+ bool isSet = false;
+ const CFStringRef defaultHandlerId = ::LSCopyDefaultHandlerForURLScheme(magnetUrlScheme);
+ if (defaultHandlerId != NULL)
+ {
+ const CFStringRef myBundleId = ::CFBundleGetIdentifier(::CFBundleGetMainBundle());
+ if (myBundleId != NULL)
+ isSet = ::CFStringCompare(myBundleId, defaultHandlerId, 0) == kCFCompareEqualTo;
+ ::CFRelease(defaultHandlerId);
+ }
+ return isSet;
+}
+
+void Utils::OS::setMagnetLinkAssoc()
+{
+ if (isMagnetLinkAssocSet())
+ return;
+
+ const CFStringRef myBundleId = ::CFBundleGetIdentifier(::CFBundleGetMainBundle());
+ if (myBundleId != NULL)
+ ::LSSetDefaultHandlerForURLScheme(magnetUrlScheme, myBundleId);
+}
+#endif // Q_OS_MACOS
+
+#ifdef Q_OS_WIN
+bool Utils::OS::isTorrentFileAssocSet()
+{
+ const QSettings settings(u"HKEY_CURRENT_USER\\Software\\Classes"_s, QSettings::NativeFormat);
+ return settings.value(u".torrent/Default"_s).toString() == u"qBittorrent";
+}
+
+void Utils::OS::setTorrentFileAssoc(const bool set)
+{
+ if (set == isTorrentFileAssocSet())
+ return;
+
+ QSettings settings(u"HKEY_CURRENT_USER\\Software\\Classes"_s, QSettings::NativeFormat);
+
+ if (set)
+ {
+ const QString oldProgId = settings.value(u".torrent/Default"_s).toString();
+ if (!oldProgId.isEmpty() && (oldProgId != u"qBittorrent"))
+ settings.setValue((u".torrent/OpenWithProgids/" + oldProgId), QString());
+
+ settings.setValue(u".torrent/Default"_s, u"qBittorrent"_s);
+ settings.setValue(u".torrent/Content Type"_s, u"application/x-bittorrent"_s);
+ }
+ else
+ {
+ settings.setValue(u".torrent/Default"_s, QString());
+ }
+
+ ::SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr);
+}
+
+bool Utils::OS::isMagnetLinkAssocSet()
+{
+ const QSettings settings(u"HKEY_CURRENT_USER\\Software\\Classes"_s, QSettings::NativeFormat);
+ const QString shellCommand = settings.value(u"magnet/shell/open/command/Default"_s).toString();
+
+ const QRegularExpressionMatch exeRegMatch = QRegularExpression(u"\"([^\"]+)\".*"_s).match(shellCommand);
+ if (!exeRegMatch.hasMatch())
+ return false;
+
+ const Path assocExe {exeRegMatch.captured(1)};
+ if (assocExe != Path(qApp->applicationFilePath()))
+ return false;
+
+ return true;
+}
+
+void Utils::OS::setMagnetLinkAssoc(const bool set)
+{
+ if (set == isMagnetLinkAssocSet())
+ return;
+
+ QSettings settings(u"HKEY_CURRENT_USER\\Software\\Classes"_s, QSettings::NativeFormat);
+
+ if (set)
+ {
+ const QString applicationFilePath = Path(qApp->applicationFilePath()).toString();
+ const QString commandStr = u'"' + applicationFilePath + u"\" \"%1\"";
+ const QString iconStr = u'"' + applicationFilePath + u"\",1";
+
+ settings.setValue(u"magnet/Default"_s, u"URL:Magnet link"_s);
+ settings.setValue(u"magnet/Content Type"_s, u"application/x-magnet"_s);
+ settings.setValue(u"magnet/DefaultIcon/Default"_s, iconStr);
+ settings.setValue(u"magnet/shell/Default"_s, u"open"_s);
+ settings.setValue(u"magnet/shell/open/command/Default"_s, commandStr);
+ settings.setValue(u"magnet/URL Protocol"_s, QString());
+ }
+ else
+ {
+ // only wipe values that are specific to qbt
+ settings.setValue(u"magnet/DefaultIcon/Default"_s, QString());
+ settings.setValue(u"magnet/shell/open/command/Default"_s, QString());
+ }
+
+ ::SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr);
+}
+#endif // Q_OS_WIN
diff --git a/src/base/utils/os.h b/src/base/utils/os.h
new file mode 100644
index 000000000..66b899977
--- /dev/null
+++ b/src/base/utils/os.h
@@ -0,0 +1,50 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2023 Mike Tzou (Chocobo1)
+ * Copyright (C) 2014 sledgehammer999
+ * Copyright (C) 2006 Christophe Dumez
+ *
+ * This program 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+#pragma once
+
+#include
+
+namespace Utils::OS
+{
+#ifdef Q_OS_MACOS
+ bool isTorrentFileAssocSet();
+ void setTorrentFileAssoc();
+ bool isMagnetLinkAssocSet();
+ void setMagnetLinkAssoc();
+#endif // Q_OS_MACOS
+
+#ifdef Q_OS_WIN
+ bool isTorrentFileAssocSet();
+ void setTorrentFileAssoc(bool set);
+ bool isMagnetLinkAssocSet();
+ void setMagnetLinkAssoc(bool set);
+#endif // Q_OS_WIN
+}
diff --git a/src/base/version.h.in b/src/base/version.h.in
index 5c177f66e..3fba6fd86 100644
--- a/src/base/version.h.in
+++ b/src/base/version.h.in
@@ -32,7 +32,7 @@
#define QBT_VERSION_MINOR 6
#define QBT_VERSION_BUGFIX 0
#define QBT_VERSION_BUILD 0
-#define QBT_VERSION_STATUS "beta2" // Should be empty for stable releases!
+#define QBT_VERSION_STATUS "" // Should be empty for stable releases!
#define QBT__STRINGIFY(x) #x
#define QBT_STRINGIFY(x) QBT__STRINGIFY(x)
diff --git a/src/gui/aboutdialog.cpp b/src/gui/aboutdialog.cpp
index 27193a674..66622deb5 100644
--- a/src/gui/aboutdialog.cpp
+++ b/src/gui/aboutdialog.cpp
@@ -28,6 +28,8 @@
#include "aboutdialog.h"
+#include
+
#include "base/global.h"
#include "base/path.h"
#include "base/unicodestrings.h"
@@ -65,7 +67,7 @@ AboutDialog::AboutDialog(QWidget *parent)
u"
"_s
.arg(tr("An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.")
.replace(u"C++"_s, u"C\u2060+\u2060+"_s) // make C++ non-breaking
- , tr("Copyright %1 2006-2022 The qBittorrent project").arg(C_COPYRIGHT)
+ , tr("Copyright %1 2006-2023 The qBittorrent project").arg(C_COPYRIGHT)
, tr("Home Page:")
, tr("Forum:")
, tr("Bug Tracker:"));
@@ -74,22 +76,19 @@ AboutDialog::AboutDialog(QWidget *parent)
m_ui->labelMascot->setPixmap(Utils::Gui::scaledPixmap(Path(u":/icons/mascot.png"_s), this));
// Thanks
- if (const auto readResult = Utils::IO::readFile(Path(u":/thanks.html"_s), -1, QIODevice::Text)
- ; readResult)
+ if (const auto readResult = Utils::IO::readFile(Path(u":/thanks.html"_s), -1, QIODevice::Text))
{
m_ui->textBrowserThanks->setHtml(QString::fromUtf8(readResult.value()));
}
// Translation
- if (const auto readResult = Utils::IO::readFile(Path(u":/translators.html"_s), -1, QIODevice::Text)
- ; readResult)
+ if (const auto readResult = Utils::IO::readFile(Path(u":/translators.html"_s), -1, QIODevice::Text))
{
m_ui->textBrowserTranslation->setHtml(QString::fromUtf8(readResult.value()));
}
// License
- if (const auto readResult = Utils::IO::readFile(Path(u":/gpl.html"_s), -1, QIODevice::Text)
- ; readResult)
+ if (const auto readResult = Utils::IO::readFile(Path(u":/gpl.html"_s), -1, QIODevice::Text))
{
m_ui->textBrowserLicense->setHtml(QString::fromUtf8(readResult.value()));
}
@@ -101,6 +100,8 @@ AboutDialog::AboutDialog(QWidget *parent)
m_ui->labelOpensslVer->setText(Utils::Misc::opensslVersionString());
m_ui->labelZlibVer->setText(Utils::Misc::zlibVersionString());
+ connect(m_ui->btnCopyToClipboard, &QAbstractButton::clicked, this, &AboutDialog::copyVersionsToClipboard);
+
const QString DBIPText = u""
u"%1 (https://db-ip.com/)"
u"
"_s
@@ -117,3 +118,14 @@ AboutDialog::~AboutDialog()
m_storeDialogSize = size();
delete m_ui;
}
+
+void AboutDialog::copyVersionsToClipboard() const
+{
+ const QString versions = u"%1 %2\n%3 %4\n%5 %6\n%7 %8\n%9 %10\n"_s
+ .arg(m_ui->labelQt->text(), m_ui->labelQtVer->text()
+ , m_ui->labelLibt->text(), m_ui->labelLibtVer->text()
+ , m_ui->labelBoost->text(), m_ui->labelBoostVer->text()
+ , m_ui->labelOpenssl->text(), m_ui->labelOpensslVer->text()
+ , m_ui->labelZlib->text(), m_ui->labelZlibVer->text());
+ qApp->clipboard()->setText(versions);
+}
diff --git a/src/gui/aboutdialog.h b/src/gui/aboutdialog.h
index 2ac58617b..804933822 100644
--- a/src/gui/aboutdialog.h
+++ b/src/gui/aboutdialog.h
@@ -47,6 +47,8 @@ public:
~AboutDialog() override;
private:
+ void copyVersionsToClipboard() const;
+
Ui::AboutDialog *m_ui = nullptr;
SettingValue m_storeDialogSize;
};
diff --git a/src/gui/aboutdialog.ui b/src/gui/aboutdialog.ui
index 8b64e880d..abb6fd5c0 100644
--- a/src/gui/aboutdialog.ui
+++ b/src/gui/aboutdialog.ui
@@ -25,6 +25,9 @@
qBittorrent
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
-
@@ -281,12 +284,12 @@
-
-
- true
-
QTextEdit::NoWrap
+
+ true
+
@@ -323,11 +326,35 @@
-
-
-
- qBittorrent was built with the following libraries:
-
-
+
+
-
+
+
+ qBittorrent was built with the following libraries:
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Copy to clipboard
+
+
+
+
-
@@ -359,7 +386,7 @@
-
-
+
Qt:
@@ -372,7 +399,7 @@
-
-
+
Libtorrent:
@@ -385,7 +412,7 @@
-
-
+
Boost:
@@ -425,7 +452,7 @@
-
-
+
OpenSSL:
@@ -445,7 +472,7 @@
-
-
+
zlib:
diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp
index cf0ee4aaa..58bbfb216 100644
--- a/src/gui/addnewtorrentdialog.cpp
+++ b/src/gui/addnewtorrentdialog.cpp
@@ -330,7 +330,7 @@ AddNewTorrentDialog::AddNewTorrentDialog(const BitTorrent::AddTorrentParams &inP
m_ui->stopConditionComboBox->setItemData(1, QVariant::fromValue(BitTorrent::Torrent::StopCondition::MetadataReceived));
m_ui->stopConditionComboBox->setItemData(2, QVariant::fromValue(BitTorrent::Torrent::StopCondition::FilesChecked));
m_ui->stopConditionComboBox->setCurrentIndex(m_ui->stopConditionComboBox->findData(
- QVariant::fromValue(m_torrentParams.stopCondition.value_or(session->torrentStopCondition()))));
+ QVariant::fromValue(m_torrentParams.stopCondition.value_or(session->torrentStopCondition()))));
m_ui->stopConditionLabel->setEnabled(m_ui->startTorrentCheckBox->isChecked());
m_ui->stopConditionComboBox->setEnabled(m_ui->startTorrentCheckBox->isChecked());
connect(m_ui->startTorrentCheckBox, &QCheckBox::toggled, this, [this](const bool checked)
@@ -351,7 +351,7 @@ AddNewTorrentDialog::AddNewTorrentDialog(const BitTorrent::AddTorrentParams &inP
m_ui->checkBoxRememberLastSavePath->setChecked(m_storeRememberLastSavePath);
m_ui->contentLayoutComboBox->setCurrentIndex(
- static_cast(m_torrentParams.contentLayout.value_or(session->torrentContentLayout())));
+ static_cast(m_torrentParams.contentLayout.value_or(session->torrentContentLayout())));
connect(m_ui->contentLayoutComboBox, &QComboBox::currentIndexChanged, this, &AddNewTorrentDialog::contentLayoutChanged);
m_ui->sequentialCheckBox->setChecked(m_torrentParams.sequential);
@@ -489,7 +489,14 @@ void AddNewTorrentDialog::saveState()
void AddNewTorrentDialog::show(const QString &source, const BitTorrent::AddTorrentParams &inParams, QWidget *parent)
{
- auto *dlg = new AddNewTorrentDialog(inParams, parent);
+ Q_UNUSED(parent);
+
+ // By not setting a parent to the "AddNewTorrentDialog", all those dialogs
+ // will be displayed on top and will not overlap with the main window.
+ auto *dlg = new AddNewTorrentDialog(inParams, nullptr);
+ // Qt::Window is required to avoid showing only two dialog on top (see #12852).
+ // Also improves the general convenience of adding multiple torrents.
+ dlg->setWindowFlags(Qt::Window);
dlg->setAttribute(Qt::WA_DeleteOnClose);
if (Net::DownloadManager::hasSupportedScheme(source))
@@ -927,6 +934,9 @@ void AddNewTorrentDialog::updateMetadata(const BitTorrent::TorrentInfo &metadata
// Good to go
m_torrentInfo = metadata;
setMetadataProgressIndicator(true, tr("Parsing metadata..."));
+ const auto stopCondition = m_ui->stopConditionComboBox->currentData().value();
+ if (stopCondition == BitTorrent::Torrent::StopCondition::MetadataReceived)
+ m_ui->startTorrentCheckBox->setChecked(false);
// Update UI
setupTreeview();
diff --git a/src/gui/lineedit.cpp b/src/gui/lineedit.cpp
index b6ad0af76..f388fab60 100644
--- a/src/gui/lineedit.cpp
+++ b/src/gui/lineedit.cpp
@@ -38,7 +38,7 @@
LineEdit::LineEdit(QWidget *parent)
: QLineEdit(parent)
{
- auto *action = new QAction(UIThemeManager::instance()->getIcon(u"edit-find"_s), QString());
+ auto *action = new QAction(UIThemeManager::instance()->getIcon(u"edit-find"_s), QString(), this);
addAction(action, QLineEdit::LeadingPosition);
setClearButtonEnabled(true);
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 6ecdc1972..8a10f7025 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -455,8 +455,6 @@ MainWindow::MainWindow(IGUIApplication *app, WindowState initialState)
}
#endif
- m_propertiesWidget->readSettings();
-
const bool isFiltersSidebarVisible = pref->isFiltersSidebarVisible();
m_ui->actionShowFiltersSidebar->setChecked(isFiltersSidebarVisible);
if (isFiltersSidebarVisible)
@@ -1092,6 +1090,12 @@ void MainWindow::showEvent(QShowEvent *e)
{
// preparations before showing the window
+ if (m_neverShown)
+ {
+ m_propertiesWidget->readSettings();
+ m_neverShown = false;
+ }
+
if (currentTabWidget() == m_transferListWidget)
m_propertiesWidget->loadDynamicData();
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 1c484fe7e..0566c7050 100644
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -202,6 +202,7 @@ private:
QFileSystemWatcher *m_executableWatcher = nullptr;
// GUI related
bool m_posInitialized = false;
+ bool m_neverShown = true;
QPointer m_tabs;
QPointer m_statusBar;
QPointer m_options;
diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp
index d043dfbb6..4247c4e8d 100644
--- a/src/gui/optionsdialog.cpp
+++ b/src/gui/optionsdialog.cpp
@@ -74,6 +74,10 @@
#include "base/net/dnsupdater.h"
#endif
+#if defined Q_OS_MACOS || defined Q_OS_WIN
+#include "base/utils/os.h"
+#endif // defined Q_OS_MACOS || defined Q_OS_WIN
+
#define SETTINGS_KEY(name) u"OptionsDialog/" name
namespace
@@ -284,15 +288,15 @@ void OptionsDialog::loadBehaviorTabOptions()
#ifdef Q_OS_WIN
m_ui->checkStartup->setChecked(pref->WinStartup());
- m_ui->checkAssociateTorrents->setChecked(Preferences::isTorrentFileAssocSet());
- m_ui->checkAssociateMagnetLinks->setChecked(Preferences::isMagnetLinkAssocSet());
+ m_ui->checkAssociateTorrents->setChecked(Utils::OS::isTorrentFileAssocSet());
+ m_ui->checkAssociateMagnetLinks->setChecked(Utils::OS::isMagnetLinkAssocSet());
#endif
#ifdef Q_OS_MACOS
m_ui->checkShowSystray->setVisible(false);
- m_ui->checkAssociateTorrents->setChecked(Preferences::isTorrentFileAssocSet());
+ m_ui->checkAssociateTorrents->setChecked(Utils::OS::isTorrentFileAssocSet());
m_ui->checkAssociateTorrents->setEnabled(!m_ui->checkAssociateTorrents->isChecked());
- m_ui->checkAssociateMagnetLinks->setChecked(Preferences::isMagnetLinkAssocSet());
+ m_ui->checkAssociateMagnetLinks->setChecked(Utils::OS::isMagnetLinkAssocSet());
m_ui->checkAssociateMagnetLinks->setEnabled(!m_ui->checkAssociateMagnetLinks->isChecked());
#endif
@@ -433,8 +437,8 @@ void OptionsDialog::saveBehaviorTabOptions() const
#ifdef Q_OS_WIN
pref->setWinStartup(WinStartup());
- Preferences::setTorrentFileAssoc(m_ui->checkAssociateTorrents->isChecked());
- Preferences::setMagnetLinkAssoc(m_ui->checkAssociateMagnetLinks->isChecked());
+ Utils::OS::setTorrentFileAssoc(m_ui->checkAssociateTorrents->isChecked());
+ Utils::OS::setMagnetLinkAssoc(m_ui->checkAssociateMagnetLinks->isChecked());
#endif
#ifndef Q_OS_MACOS
@@ -447,14 +451,14 @@ void OptionsDialog::saveBehaviorTabOptions() const
#ifdef Q_OS_MACOS
if (m_ui->checkAssociateTorrents->isChecked())
{
- Preferences::setTorrentFileAssoc();
- m_ui->checkAssociateTorrents->setChecked(Preferences::isTorrentFileAssocSet());
+ Utils::OS::setTorrentFileAssoc();
+ m_ui->checkAssociateTorrents->setChecked(Utils::OS::isTorrentFileAssocSet());
m_ui->checkAssociateTorrents->setEnabled(!m_ui->checkAssociateTorrents->isChecked());
}
if (m_ui->checkAssociateMagnetLinks->isChecked())
{
- Preferences::setMagnetLinkAssoc();
- m_ui->checkAssociateMagnetLinks->setChecked(Preferences::isMagnetLinkAssocSet());
+ Utils::OS::setMagnetLinkAssoc();
+ m_ui->checkAssociateMagnetLinks->setChecked(Utils::OS::isMagnetLinkAssocSet());
m_ui->checkAssociateMagnetLinks->setEnabled(!m_ui->checkAssociateMagnetLinks->isChecked());
}
#endif
diff --git a/src/gui/powermanagement/powermanagement_x11.cpp b/src/gui/powermanagement/powermanagement_x11.cpp
index 55746da55..bfdb9da0b 100644
--- a/src/gui/powermanagement/powermanagement_x11.cpp
+++ b/src/gui/powermanagement/powermanagement_x11.cpp
@@ -105,7 +105,7 @@ void PowerManagementInhibitor::requestBusy()
args << 0u;
args << u"Active torrents are presented"_s;
if (m_useGSM)
- args << 8u;
+ args << 4u;
call.setArguments(args);
QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000);
diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp
index c46b65a03..38300d05c 100644
--- a/src/gui/transferlistwidget.cpp
+++ b/src/gui/transferlistwidget.cpp
@@ -100,13 +100,15 @@ namespace
void openDestinationFolder(const BitTorrent::Torrent *const torrent)
{
+ const Path contentPath = torrent->contentPath();
+ const Path openedPath = (!contentPath.isEmpty() ? contentPath : torrent->savePath());
#ifdef Q_OS_MACOS
- MacUtils::openFiles({torrent->contentPath()});
+ MacUtils::openFiles({openedPath});
#else
if (torrent->filesCount() == 1)
- Utils::Gui::openFolderSelect(torrent->contentPath());
+ Utils::Gui::openFolderSelect(openedPath);
else
- Utils::Gui::openPath(torrent->contentPath());
+ Utils::Gui::openPath(openedPath);
#endif
}
@@ -253,6 +255,16 @@ QModelIndex TransferListWidget::mapToSource(const QModelIndex &index) const
return index;
}
+QModelIndexList TransferListWidget::mapToSource(const QModelIndexList &indexes) const
+{
+ QModelIndexList result;
+ result.reserve(indexes.size());
+ for (const QModelIndex &index : indexes)
+ result.append(mapToSource(index));
+
+ return result;
+}
+
QModelIndex TransferListWidget::mapFromSource(const QModelIndex &index) const
{
Q_ASSERT(index.isValid());
@@ -263,11 +275,13 @@ QModelIndex TransferListWidget::mapFromSource(const QModelIndex &index) const
void TransferListWidget::torrentDoubleClicked()
{
const QModelIndexList selectedIndexes = selectionModel()->selectedRows();
- if ((selectedIndexes.size() != 1) || !selectedIndexes.first().isValid()) return;
+ if ((selectedIndexes.size() != 1) || !selectedIndexes.first().isValid())
+ return;
const QModelIndex index = m_listModel->index(mapToSource(selectedIndexes.first()).row());
BitTorrent::Torrent *const torrent = m_listModel->torrentHandle(index);
- if (!torrent) return;
+ if (!torrent)
+ return;
int action;
if (torrent->isFinished())
@@ -575,21 +589,22 @@ void TransferListWidget::openSelectedTorrentsFolder() const
for (BitTorrent::Torrent *const torrent : asConst(getSelectedTorrents()))
{
const Path contentPath = torrent->contentPath();
- paths.insert(contentPath);
+ paths.insert(!contentPath.isEmpty() ? contentPath : torrent->savePath());
}
MacUtils::openFiles(PathList(paths.cbegin(), paths.cend()));
#else
for (BitTorrent::Torrent *const torrent : asConst(getSelectedTorrents()))
{
const Path contentPath = torrent->contentPath();
- if (!paths.contains(contentPath))
+ const Path openedPath = (!contentPath.isEmpty() ? contentPath : torrent->savePath());
+ if (!paths.contains(openedPath))
{
if (torrent->filesCount() == 1)
- Utils::Gui::openFolderSelect(contentPath);
+ Utils::Gui::openFolderSelect(openedPath);
else
- Utils::Gui::openPath(contentPath);
+ Utils::Gui::openPath(openedPath);
}
- paths.insert(contentPath);
+ paths.insert(openedPath);
}
#endif // Q_OS_MACOS
}
@@ -806,7 +821,8 @@ void TransferListWidget::exportTorrent()
bool hasError = false;
for (const BitTorrent::Torrent *torrent : torrents)
{
- const Path filePath = savePath / Path(torrent->name() + u".torrent");
+ const QString validName = Utils::Fs::toValidFileName(torrent->name(), u"_"_s);
+ const Path filePath = savePath / Path(validName + u".torrent");
if (filePath.exists())
{
LogMsg(errorMsg.arg(torrent->name(), filePath.toString(), tr("A file with the same name already exists")) , Log::WARNING);
@@ -871,9 +887,13 @@ QStringList TransferListWidget::askTagsForSelection(const QString &dialogTitle)
void TransferListWidget::applyToSelectedTorrents(const std::function &fn)
{
- for (const QModelIndex &index : asConst(selectionModel()->selectedRows()))
+ // Changing the data may affect the layout of the sort/filter model, which in turn may invalidate
+ // the indexes previously obtained from selection model before we process them all.
+ // Therefore, we must map all the selected indexes to source before start processing them.
+ const QModelIndexList sourceRows = mapToSource(selectionModel()->selectedRows());
+ for (const QModelIndex &index : sourceRows)
{
- BitTorrent::Torrent *const torrent = m_listModel->torrentHandle(mapToSource(index));
+ BitTorrent::Torrent *const torrent = m_listModel->torrentHandle(index);
Q_ASSERT(torrent);
fn(torrent);
}
@@ -882,11 +902,13 @@ void TransferListWidget::applyToSelectedTorrents(const std::functionselectedRows();
- if ((selectedIndexes.size() != 1) || !selectedIndexes.first().isValid()) return;
+ if ((selectedIndexes.size() != 1) || !selectedIndexes.first().isValid())
+ return;
const QModelIndex mi = m_listModel->index(mapToSource(selectedIndexes.first()).row(), TransferListModel::TR_NAME);
BitTorrent::Torrent *const torrent = m_listModel->torrentHandle(mi);
- if (!torrent) return;
+ if (!torrent)
+ return;
// Ask for a new Name
bool ok = false;
@@ -901,8 +923,7 @@ void TransferListWidget::renameSelectedTorrent()
void TransferListWidget::setSelectionCategory(const QString &category)
{
- for (const QModelIndex &index : asConst(selectionModel()->selectedRows()))
- m_listModel->setData(m_listModel->index(mapToSource(index).row(), TransferListModel::TR_CATEGORY), category, Qt::DisplayRole);
+ applyToSelectedTorrents([&category](BitTorrent::Torrent *torrent) { torrent->setCategory(category); });
}
void TransferListWidget::addSelectionTag(const QString &tag)
@@ -923,7 +944,8 @@ void TransferListWidget::clearSelectionTags()
void TransferListWidget::displayListMenu()
{
const QModelIndexList selectedIndexes = selectionModel()->selectedRows();
- if (selectedIndexes.isEmpty()) return;
+ if (selectedIndexes.isEmpty())
+ return;
auto *listMenu = new QMenu(this);
listMenu->setAttribute(Qt::WA_DeleteOnClose);
diff --git a/src/gui/transferlistwidget.h b/src/gui/transferlistwidget.h
index 205b21246..ad9b0f37b 100644
--- a/src/gui/transferlistwidget.h
+++ b/src/gui/transferlistwidget.h
@@ -119,6 +119,7 @@ private slots:
private:
void wheelEvent(QWheelEvent *event) override;
QModelIndex mapToSource(const QModelIndex &index) const;
+ QModelIndexList mapToSource(const QModelIndexList &indexes) const;
QModelIndex mapFromSource(const QModelIndex &index) const;
bool loadSettings();
QVector getSelectedTorrents() const;
diff --git a/src/gui/uithemesource.cpp b/src/gui/uithemesource.cpp
index 8565c6414..c4e4ef7f4 100644
--- a/src/gui/uithemesource.cpp
+++ b/src/gui/uithemesource.cpp
@@ -161,13 +161,13 @@ void DefaultThemeSource::loadColors()
return;
}
- const QByteArray configData = readResult.value();
+ const QByteArray &configData = readResult.value();
if (configData.isEmpty())
return;
const QJsonObject config = parseThemeConfig(configData);
- QHash lightModeColorOverrides = colorsFromJSON(config.value(KEY_COLORS_LIGHT).toObject());
+ const QHash lightModeColorOverrides = colorsFromJSON(config.value(KEY_COLORS_LIGHT).toObject());
for (auto overridesIt = lightModeColorOverrides.cbegin(); overridesIt != lightModeColorOverrides.cend(); ++overridesIt)
{
auto it = m_colors.find(overridesIt.key());
@@ -175,7 +175,7 @@ void DefaultThemeSource::loadColors()
it.value().light = overridesIt.value();
}
- QHash darkModeColorOverrides = colorsFromJSON(config.value(KEY_COLORS_DARK).toObject());
+ const QHash darkModeColorOverrides = colorsFromJSON(config.value(KEY_COLORS_DARK).toObject());
for (auto overridesIt = darkModeColorOverrides.cbegin(); overridesIt != darkModeColorOverrides.cend(); ++overridesIt)
{
auto it = m_colors.find(overridesIt.key());
@@ -184,6 +184,12 @@ void DefaultThemeSource::loadColors()
}
}
+CustomThemeSource::CustomThemeSource(const Path &themeRootPath)
+ : m_themeRootPath {themeRootPath}
+{
+ loadColors();
+}
+
QColor CustomThemeSource::getColor(const QString &colorId, const ColorMode colorMode) const
{
if (colorMode == ColorMode::Dark)
@@ -246,6 +252,11 @@ DefaultThemeSource *CustomThemeSource::defaultThemeSource() const
return m_defaultThemeSource.get();
}
+Path CustomThemeSource::themeRootPath() const
+{
+ return m_themeRootPath;
+}
+
void CustomThemeSource::loadColors()
{
const auto readResult = Utils::IO::readFile((themeRootPath() / Path(CONFIG_FILE_NAME)), FILE_MAX_SIZE, QIODevice::Text);
@@ -257,7 +268,7 @@ void CustomThemeSource::loadColors()
return;
}
- const QByteArray configData = readResult.value();
+ const QByteArray &configData = readResult.value();
if (configData.isEmpty())
return;
@@ -267,13 +278,9 @@ void CustomThemeSource::loadColors()
m_darkModeColors.insert(colorsFromJSON(config.value(KEY_COLORS_DARK).toObject()));
}
-Path QRCThemeSource::themeRootPath() const
-{
- return Path(u":/uitheme"_s);
-}
-
FolderThemeSource::FolderThemeSource(const Path &folderPath)
- : m_folder {folderPath}
+ : CustomThemeSource(folderPath)
+ , m_folder {folderPath}
{
}
@@ -285,10 +292,10 @@ QByteArray FolderThemeSource::readStyleSheet()
const QString stylesheetResourcesDir = u":/uitheme"_s;
QByteArray styleSheetData = CustomThemeSource::readStyleSheet();
- return styleSheetData.replace(stylesheetResourcesDir.toUtf8(), themeRootPath().data().toUtf8());
+ return styleSheetData.replace(stylesheetResourcesDir.toUtf8(), m_folder.data().toUtf8());
}
-Path FolderThemeSource::themeRootPath() const
+QRCThemeSource::QRCThemeSource()
+ : CustomThemeSource(Path(u":/uitheme"_s))
{
- return m_folder;
}
diff --git a/src/gui/uithemesource.h b/src/gui/uithemesource.h
index 4969c3cee..5c0920303 100644
--- a/src/gui/uithemesource.h
+++ b/src/gui/uithemesource.h
@@ -84,21 +84,24 @@ public:
QByteArray readStyleSheet() override;
protected:
- virtual Path themeRootPath() const = 0;
+ explicit CustomThemeSource(const Path &themeRootPath);
+
DefaultThemeSource *defaultThemeSource() const;
private:
+ Path themeRootPath() const;
void loadColors();
const std::unique_ptr m_defaultThemeSource = std::make_unique();
+ Path m_themeRootPath;
QHash m_colors;
QHash m_darkModeColors;
};
class QRCThemeSource final : public CustomThemeSource
{
-private:
- Path themeRootPath() const override;
+public:
+ QRCThemeSource();
};
class FolderThemeSource : public CustomThemeSource
@@ -109,7 +112,5 @@ public:
QByteArray readStyleSheet() override;
private:
- Path themeRootPath() const override;
-
const Path m_folder;
};
diff --git a/src/icons/flags/ac.svg b/src/icons/flags/ac.svg
index 1a6d50805..b1ae9ac52 100644
--- a/src/icons/flags/ac.svg
+++ b/src/icons/flags/ac.svg
@@ -1,73 +1,686 @@
diff --git a/src/icons/flags/af.svg b/src/icons/flags/af.svg
index 6e755396f..417dd0476 100644
--- a/src/icons/flags/af.svg
+++ b/src/icons/flags/af.svg
@@ -14,7 +14,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
diff --git a/src/icons/flags/ag.svg b/src/icons/flags/ag.svg
index 875f9753a..250b50126 100644
--- a/src/icons/flags/ag.svg
+++ b/src/icons/flags/ag.svg
@@ -1,14 +1,14 @@
diff --git a/src/icons/flags/ai.svg b/src/icons/flags/ai.svg
index cf91b39b9..81a857d5b 100644
--- a/src/icons/flags/ai.svg
+++ b/src/icons/flags/ai.svg
@@ -1,758 +1,29 @@
-