Bump to 5.1.0

PR #22490.

.github/workflows/ci_ubuntu.yaml

@@ -138,16 +138,15 @@ jobs:
 
       - name: Install AppImage
         run: |
-          sudo apt install libfuse2
           curl \
             -L \
             -Z \
-            -O https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-static-x86_64.AppImage \
+            -O https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage \
-            -O https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-static-x86_64.AppImage \
+            -O https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage \
             -O https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage
           chmod +x \
-            linuxdeploy-static-x86_64.AppImage \
+            linuxdeploy-x86_64.AppImage \
-            linuxdeploy-plugin-qt-static-x86_64.AppImage \
+            linuxdeploy-plugin-qt-x86_64.AppImage \
             linuxdeploy-plugin-appimage-x86_64.AppImage
 
       - name: Prepare files for AppImage
@@ -160,12 +159,12 @@ jobs:
 
       - name: Package AppImage
         run: |
-          ./linuxdeploy-static-x86_64.AppImage --appdir qbittorrent --plugin qt
+          ./linuxdeploy-x86_64.AppImage --appdir qbittorrent --plugin qt
           rm qbittorrent/apprun-hooks/*
           cp .github/workflows/helper/appimage/export_vars.sh qbittorrent/apprun-hooks/export_vars.sh
           NO_APPSTREAM=1 \
             OUTPUT=upload/qbittorrent-CI_Ubuntu_x86_64.AppImage \
-            ./linuxdeploy-static-x86_64.AppImage --appdir qbittorrent --output appimage
+            ./linuxdeploy-x86_64.AppImage --appdir qbittorrent --output appimage
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:sledgehammer999:p:qbittorrent:r:qbittorrent_master]
+[o:sledgehammer999:p:qbittorrent:r:qbittorrent_v51x]
 file_filter  = src/lang/qbittorrent_<lang>.ts
 source_file  = src/lang/qbittorrent_en.ts
 source_lang  = en
@@ -9,7 +9,7 @@ type         = QT
 minimum_perc = 23
 lang_map     = pt: pt_PT, zh: zh_CN
 
-[o:sledgehammer999:p:qbittorrent:r:qbittorrent_webui]
+[o:sledgehammer999:p:qbittorrent:r:qbittorrent_webui_v51x]
 file_filter  = src/webui/www/translations/webui_<lang>.ts
 source_file  = src/webui/www/translations/webui_en.ts
 source_lang  = en

Changelog

@@ -1,4 +1,95 @@
-Unreleased - sledgehammer999 <sledgehammer999@qbittorrent.org> - v5.1.0
+Sun Apr 27th 2025 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v5.1.0
+    - FEATURE: Enable customizing the save statistics time interval (Burnerelu)
+    - FEATURE: Add drag support to torrent content widget (Chocobo1)
+    - FEATURE: Display External IP Address in status bar (Thomas Piccirello)
+    - FEATURE: Use modern functions to get random numbers under Linux/Windows (security related) (Chocobo1)
+    - FEATURE: Add eXact Length parameter when creating magnet URI (antanilol)
+    - FEATURE: Support fetching tracker list from URL (Thomas Piccirello)
+    - FEATURE: Add `announce_port` support (Maxime Thiebaut)
+    - BUGFIX: Enable adaptive step size for upload and download limits (Harald Nordgren)
+    - BUGFIX: Add URL link for reverse proxy setup examples (Chocobo1)
+    - BUGFIX: Allow drop action only on transfer list (Chocobo1)
+    - BUGFIX: Fix the tab order in dialogs (thalieht)
+    - BUGFIX: Fix filesize sorting in preview dialog (DoubleSpicy)
+    - BUGFIX: Improve the speed icons in the status bar (Mahdi Hosseinzadeh)
+    - BUGFIX: Update link to news (tinyboxvk)
+    - BUGFIX: Fix tab stop order in various dialogs and UI elements (Chocobo1)
+    - BUGFIX: Make links accessible by keyboard (Chocobo1)
+    - BUGFIX: Make tab key switch focus (Chocobo1)
+    - BUGFIX: Revise DHT bootstrap node list (stalkerok, Chocobo1)
+    - BUGFIX: Return first tracker as fallback for "current tracker" (glassez)
+    - BUGFIX: Prevent crash when exiting app with `Add torrent` dialogs opened (glassez)
+    - BUGFIX: Fix torrent relocating files when switching to "manual" mode (glassez)
+    - BUGFIX: Prevent crash due to corrupted resume data (glassez)
+    - WEBUI: Improvements that should help with assistive technologies (Chocobo1)
+    - WEBUI: Internal refactoring to migrate away from MooTools and towards native browser APIs (Chocobo1, skomerko)
+    - WEBUI: Implement path autocompletion (Paweł Kotiuk)
+    - WEBUI: Implement double-click behavior controls (Hanabishi)
+    - WEBUI: Add ability to toggle alternating row colors in tables (skomerko)
+    - WEBUI: Improve visibility of unread RSS articles (skomerko)
+    - WEBUI: Remove deleted torrents even if they are currently filtered out (Carmelo Scandaliato)
+    - WEBUI: Highlight torrent category in context menu (skomerko)
+    - WEBUI: Implement 'Auto hide zero status filters' (skomerko)
+    - WEBUI: Allow to filter torrent list by save path (skomerko)
+    - WEBUI: Handle regex syntax error for torrent filtering (HamletDuFromage)
+    - WEBUI: Add missing icons (skomerko)
+    - WEBUI: Add link to 'List of alternative WebUI' wiki page in Options (Chocobo1)
+    - WEBUI: Improve properties panel, torrent deletion dialog, filter list, subcategories, torrent deletion, statistics window (skomerko)
+    - WEBUI: Allow to display only hostname in the Tracker column (skomerko)
+    - WEBUI: Show country/region name next to its flag (skomerko)
+    - WEBUI: Improve hash copy actions in context menu (skomerko)
+    - WEBUI: Support removing tracker from all torrents in WebUI/WebAPI (Thomas Piccirello)
+    - WEBUI: Display DHT information in the Status bar only when DHT is enabled (skomerko)
+    - WEBUI: Add 'Confirm torrent recheck' option (skomerko)
+    - WEBUI: Support managing web seeds (Thomas Piccirello)
+    - WEBUI: Add colors to log table rows (skomerko)
+    - WEBUI: Prevent text selection within tabs, menu items (skomerko)
+    - WEBUI: Use correct text and background colors in RSS details view (skomerko)
+    - WEBUI: Reduce padding in torrents table (skomerko)
+    - WEBUI: Add WebAPI/WebUI for managing cookies (Thomas Piccirello)
+    - WEBUI: Support updating RSS feed URL (Thomas Piccirello)
+    - WEBUI: Add 'Engine' column to Search table (skomerko)
+    - WEBUI: Add confirm dialog for Auto TMM (skomerko)
+    - WEBUI: Add context menu to search tabs (skomerko)
+    - WEBUI: Show file filter when Content tab selected on load (Thomas Piccirello)
+    - WEBUI: DHT, PeX and LSD rows are now always on top in Trackers table (skomerko)
+    - WEBUI: Clear properties panel when torrent no longer selected (skomerko)
+    - WEBUI: Support auto resizing table columns (Thomas Piccirello)
+    - WEBUI: Fix displaying RSS panel on load (Thomas Piccirello)
+    - WEBUI: Add tooltip to regex filter button (Patrik Elfström)
+    - WEBUI: Hide context menu when clicking on a table row (Patrik Elfström)
+    - WEBUI: Display torrent progress percentage in General tab (skomerko)
+    - WEBUI: Use thin scrollbars (skomerko)
+    - WEBUI: Show 'Rename...' context menu item only when one torrent is selected (skomerko)
+    - WEBUI: Display error when download fails (Thomas Piccirello)
+    - WEBUI: Add colors to 'Status' column in Trackers table (skomerko)
+    - WEBUI: Add missing icon to 'Queue' context menu item (skomerko)
+    - WEBUI: Change filter inputs to type search (Patrik Elfström)
+    - WEBUI: Allow to move state icon to name column in torrents table (skomerko)
+    - WEBUI: Fix bug where the 'Tracker editing' dialog displays incorrect data (skomerko)
+    - WEBUI: Maintain row highlight after rearranging table columns (skomerko)
+    - WEBUI: Fix preferences not applied in magnet handler (Chocobo1)
+    - WEBUI: Update sort icon after changing column order (skomerko)
+    - WEBUI: Show 'Edit tracker URL...' only when one tracker is selected (skomerko)
+    - WEBUI: Set status filter to 'All' if selected filter is no longer visible (skomerko)
+    - WEBAPI: Don't reannounce when removing tracker via WebAPI (Thomas Piccirello)
+    - WEBAPI: Add WebAPI for managing torrent webseeds (Thomas Piccirello)
+    - WEBAPI: Add `forced` parameter to `torrents/add` (Chris B)
+    - WEBAPI: Optionally include trackers list in torrent info response (ze0s)
+    - WEBAPI: Add new method `setTags` to upsert tags on torrents (ze0s)
+    - RSS: Resolve relative URLs within RSS article description (Zentino)
+    - SEARCH: Provide SSL context field (Chocobo1)
+    - SEARCH: Allow to refresh existing search (glassez)
+    - SEARCH: Allow multiple simultaneous searches (glassez)
+    - SEARCH: Store opened search tabs (glassez)
+    - SEARCH: Store search history (glassez)
+    - SEARCH: Migrate socks.py from SocksiPy to PySocks 1.7.1 (FredBill1)
+    - SEARCH: Bump Python version minimum requirement (Chocobo1)
+    - WINDOWS: Opt into Windows SegmentHeap (Andarwinux)
+    - WINDOWS: Allow to choose color scheme on Windows (glassez)
+    - WINDOWS: Verify hash of Python installer (Chocobo1)
+    - LINUX: Add support for Thunar file manager (algebnaly)
+    - MACOS: Fix shift-click selection on macOS (Luke Memet)
 
 Mon Oct 28th 2024 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v5.0.1
     - FEATURE: Add "Simple pread/pwrite" disk IO type (Hanabishi)

dist/mac/Info.plist

@@ -67,7 +67,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2024 The qBittorrent project</string>
+	<string>Copyright © 2006-2025 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/unix/org.qbittorrent.qBittorrent.desktop

@@ -105,7 +105,7 @@ GenericName[ka]=BitTorrent კლიენტი
 Comment[ka]=გადმოტვირთეთ და გააზიარეთ ფაილები BitTorrent-ის საშუალებით
 Name[ka]=qBittorrent
 GenericName[ko]=BitTorrent 클라이언트
-Comment[ko]=BitTorrent를 통한 파일 다운로드 및 공유
+Comment[ko]=BitTorrent를 통해 파일 다운로드 및 공유
 Name[ko]=qBittorrent
 GenericName[lt]=BitTorrent klientas
 Comment[lt]=Atsisiųskite bei dalinkitės failais BitTorrent tinkle

dist/unix/org.qbittorrent.qBittorrent.metainfo.xml

@@ -62,6 +62,6 @@
   <url type="contribute">https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md</url>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="5.1.0~beta1" date="2024-12-16"/>
+    <release version="5.1.0" date="2025-04-27"/>
   </releases>
 </component>

dist/windows/config.nsh

@@ -86,7 +86,7 @@ OutFile "qbittorrent_${QBT_INSTALLER_FILENAME}_setup.exe"
 ;Installer Version Information
 VIAddVersionKey "ProductName" "qBittorrent"
 VIAddVersionKey "CompanyName" "The qBittorrent project"
-VIAddVersionKey "LegalCopyright" "Copyright ©2006-2024 The qBittorrent project"
+VIAddVersionKey "LegalCopyright" "Copyright ©2006-2025 The qBittorrent project"
 VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client"
 VIAddVersionKey "FileVersion" "${QBT_VERSION}"
 

dist/windows/installer-translations/swedish.nsh

@@ -7,21 +7,21 @@ LangString inst_desktop ${LANG_SWEDISH} "Skapa skrivbordsgenväg"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_SWEDISH} "Skapa startmenygenväg"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_SWEDISH} "Starta qBittorrent vid Windows start"
+LangString inst_startup ${LANG_SWEDISH} "Starta qBittorrent vid Windows-uppstart"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
 LangString inst_torrent ${LANG_SWEDISH} "Öppna .torrent-filer med qBittorrent"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
 LangString inst_magnet ${LANG_SWEDISH} "Öppna magnetlänkar med qBittorrent"
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_SWEDISH} "Lägg till Windows-brandväggregel"
+LangString inst_firewall ${LANG_SWEDISH} "Lägg till Windows-brandväggsregel"
 ;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_SWEDISH} "Inaktivera gränsen för Windows-sökvägslängd (260 tecken MAX_PATH-begränsning, kräver Windows 10 1607 eller senare)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_SWEDISH} "Lägger till Windows-brandväggregel"
+LangString inst_firewallinfo ${LANG_SWEDISH} "Lägger till Windows-brandväggsregel"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_SWEDISH} "qBittorrent körs. Vänligen stäng programmet innan du installerar."
+LangString inst_warning ${LANG_SWEDISH} "qBittorrent körs. Stäng programmet innan du installerar."
 ;LangString inst_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
-LangString inst_uninstall_question ${LANG_SWEDISH} "Nuvarande version avinstalleras. Användarinställningar och torrenter kommer att förbli intakta."
+LangString inst_uninstall_question ${LANG_SWEDISH} "Aktuell version avinstalleras. Användarinställningar och torrenter kommer att förbli intakta."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_SWEDISH} "Avinstallerar tidigare version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
@@ -53,7 +53,7 @@ LangString remove_firewallinfo ${LANG_SWEDISH} "Tar bort Windows-brandväggsrege
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
 LangString remove_cache ${LANG_SWEDISH} "Ta bort torrenter och cachade data"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_SWEDISH} "qBittorrent körs. Vänligen stäng programmet innan du avinstallerar."
+LangString uninst_warning ${LANG_SWEDISH} "qBittorrent körs. Stäng programmet innan du avinstallerar."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
 LangString uninst_tor_warn ${LANG_SWEDISH} "Tar inte bort .torrent-association. Den är associerad med:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"

src/app/application.cpp

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2015-2024  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2015-2025  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2006  Christophe Dumez
  *
  * This program is free software; you can redistribute it and/or
@@ -124,6 +124,28 @@ namespace
     const int PIXMAP_CACHE_SIZE = 64 * 1024 * 1024;  // 64MiB
 #endif
 
+    const QString PARAM_ADDSTOPPED = u"@addStopped"_s;
+    const QString PARAM_CATEGORY = u"@category"_s;
+    const QString PARAM_FIRSTLASTPIECEPRIORITY = u"@firstLastPiecePriority"_s;
+    const QString PARAM_SAVEPATH = u"@savePath"_s;
+    const QString PARAM_SEQUENTIAL = u"@sequential"_s;
+    const QString PARAM_SKIPCHECKING = u"@skipChecking"_s;
+    const QString PARAM_SKIPDIALOG = u"@skipDialog"_s;
+
+    QString bindParamValue(const QStringView paramName, const QStringView paramValue)
+    {
+        return paramName + u'=' + paramValue;
+    }
+
+    std::pair<QStringView, QStringView> parseParam(const QStringView param)
+    {
+        const qsizetype sepIndex = param.indexOf(u'=');
+        if (sepIndex >= 0)
+            return {param.first(sepIndex), param.sliced(sepIndex + 1)};
+
+        return {param, {}};
+    }
+
     QString serializeParams(const QBtCommandLineParameters &params)
     {
         QStringList result;
@@ -138,85 +160,86 @@ namespace
         const BitTorrent::AddTorrentParams &addTorrentParams = params.addTorrentParams;
 
         if (!addTorrentParams.savePath.isEmpty())
-            result.append(u"@savePath=" + addTorrentParams.savePath.data());
+            result.append(bindParamValue(PARAM_SAVEPATH, addTorrentParams.savePath.data()));
 
         if (addTorrentParams.addStopped.has_value())
-            result.append(*addTorrentParams.addStopped ? u"@addStopped=1"_s : u"@addStopped=0"_s);
+            result.append(bindParamValue(PARAM_ADDSTOPPED, (*addTorrentParams.addStopped ? u"1" : u"0")));
 
         if (addTorrentParams.skipChecking)
-            result.append(u"@skipChecking"_s);
+            result.append(PARAM_SKIPCHECKING);
 
         if (!addTorrentParams.category.isEmpty())
-            result.append(u"@category=" + addTorrentParams.category);
+            result.append(bindParamValue(PARAM_CATEGORY, addTorrentParams.category));
 
         if (addTorrentParams.sequential)
-            result.append(u"@sequential"_s);
+            result.append(PARAM_SEQUENTIAL);
 
         if (addTorrentParams.firstLastPiecePriority)
-            result.append(u"@firstLastPiecePriority"_s);
+            result.append(PARAM_FIRSTLASTPIECEPRIORITY);
 
         if (params.skipDialog.has_value())
-            result.append(*params.skipDialog ? u"@skipDialog=1"_s : u"@skipDialog=0"_s);
+            result.append(bindParamValue(PARAM_SKIPDIALOG, (*params.skipDialog ? u"1" : u"0")));
 
         result += params.torrentSources;
 
         return result.join(PARAMS_SEPARATOR);
     }
 
-    QBtCommandLineParameters parseParams(const QString &str)
+    QBtCommandLineParameters parseParams(const QStringView str)
     {
         QBtCommandLineParameters parsedParams;
         BitTorrent::AddTorrentParams &addTorrentParams = parsedParams.addTorrentParams;
 
-        for (QString param : asConst(str.split(PARAMS_SEPARATOR, Qt::SkipEmptyParts)))
+        for (QStringView param : asConst(str.split(PARAMS_SEPARATOR, Qt::SkipEmptyParts)))
         {
             param = param.trimmed();
+            const auto [paramName, paramValue] = parseParam(param);
 
             // Process strings indicating options specified by the user.
 
-            if (param.startsWith(u"@savePath="))
+            if (paramName == PARAM_SAVEPATH)
             {
-                addTorrentParams.savePath = Path(param.mid(10));
+                addTorrentParams.savePath = Path(paramValue.toString());
                 continue;
             }
 
-            if (param.startsWith(u"@addStopped="))
+            if (paramName == PARAM_ADDSTOPPED)
             {
-                addTorrentParams.addStopped = (QStringView(param).mid(11).toInt() != 0);
+                addTorrentParams.addStopped = (paramValue.toInt() != 0);
                 continue;
             }
 
-            if (param == u"@skipChecking")
+            if (paramName == PARAM_SKIPCHECKING)
             {
                 addTorrentParams.skipChecking = true;
                 continue;
             }
 
-            if (param.startsWith(u"@category="))
+            if (paramName == PARAM_CATEGORY)
             {
-                addTorrentParams.category = param.mid(10);
+                addTorrentParams.category = paramValue.toString();
                 continue;
             }
 
-            if (param == u"@sequential")
+            if (paramName == PARAM_SEQUENTIAL)
             {
                 addTorrentParams.sequential = true;
                 continue;
             }
 
-            if (param == u"@firstLastPiecePriority")
+            if (paramName == PARAM_FIRSTLASTPIECEPRIORITY)
             {
                 addTorrentParams.firstLastPiecePriority = true;
                 continue;
             }
 
-            if (param.startsWith(u"@skipDialog="))
+            if (paramName == PARAM_SKIPDIALOG)
             {
-                parsedParams.skipDialog = (QStringView(param).mid(12).toInt() != 0);
+                parsedParams.skipDialog = (paramValue.toInt() != 0);
                 continue;
             }
 
-            parsedParams.torrentSources.append(param);
+            parsedParams.torrentSources.append(param.toString());
         }
 
         return parsedParams;

src/base/bittorrent/bencoderesumedatastorage.cpp

@@ -290,6 +290,8 @@ BitTorrent::LoadResumeDataResult BitTorrent::BencodeResumeDataStorage::loadTorre
     lt::add_torrent_params &p = torrentParams.ltAddTorrentParams;
 
     p = lt::read_resume_data(resumeDataRoot, ec);
+    if (ec)
+        return nonstd::make_unexpected(tr("Cannot parse resume data: %1").arg(QString::fromStdString(ec.message())));
 
     if (!metadata.isEmpty())
     {
@@ -320,6 +322,8 @@ BitTorrent::LoadResumeDataResult BitTorrent::BencodeResumeDataStorage::loadTorre
 
     p.save_path = Profile::instance()->fromPortablePath(
                 Path(fromLTString(p.save_path))).toString().toStdString();
+    if (p.save_path.empty())
+        return nonstd::make_unexpected(tr("Corrupted resume data: %1").arg(tr("save_path is invalid")));
 
     torrentParams.stopped = (p.flags & lt::torrent_flags::paused) && !(p.flags & lt::torrent_flags::auto_managed);
     torrentParams.operatingMode = (p.flags & lt::torrent_flags::paused) || (p.flags & lt::torrent_flags::auto_managed)

src/base/bittorrent/dbresumedatastorage.cpp

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2021-2023  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2021-2025  Vladimir Golovnev <glassez@yandex.ru>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -217,80 +217,6 @@ namespace
     {
         return u"%1 %2"_s.arg(quoted(column.name), definition);
     }
-
-    LoadTorrentParams parseQueryResultRow(const QSqlQuery &query)
-    {
-        LoadTorrentParams resumeData;
-        resumeData.name = query.value(DB_COLUMN_NAME.name).toString();
-        resumeData.category = query.value(DB_COLUMN_CATEGORY.name).toString();
-        const QString tagsData = query.value(DB_COLUMN_TAGS.name).toString();
-        if (!tagsData.isEmpty())
-        {
-            const QStringList tagList = tagsData.split(u',');
-            resumeData.tags.insert(tagList.cbegin(), tagList.cend());
-        }
-        resumeData.hasFinishedStatus = query.value(DB_COLUMN_HAS_SEED_STATUS.name).toBool();
-        resumeData.firstLastPiecePriority = query.value(DB_COLUMN_HAS_OUTER_PIECES_PRIORITY.name).toBool();
-        resumeData.ratioLimit = query.value(DB_COLUMN_RATIO_LIMIT.name).toInt() / 1000.0;
-        resumeData.seedingTimeLimit = query.value(DB_COLUMN_SEEDING_TIME_LIMIT.name).toInt();
-        resumeData.inactiveSeedingTimeLimit = query.value(DB_COLUMN_INACTIVE_SEEDING_TIME_LIMIT.name).toInt();
-        resumeData.shareLimitAction = Utils::String::toEnum<ShareLimitAction>(
-                query.value(DB_COLUMN_SHARE_LIMIT_ACTION.name).toString(), ShareLimitAction::Default);
-        resumeData.contentLayout = Utils::String::toEnum<TorrentContentLayout>(
-                query.value(DB_COLUMN_CONTENT_LAYOUT.name).toString(), TorrentContentLayout::Original);
-        resumeData.operatingMode = Utils::String::toEnum<TorrentOperatingMode>(
-                query.value(DB_COLUMN_OPERATING_MODE.name).toString(), TorrentOperatingMode::AutoManaged);
-        resumeData.stopped = query.value(DB_COLUMN_STOPPED.name).toBool();
-        resumeData.stopCondition = Utils::String::toEnum(
-                query.value(DB_COLUMN_STOP_CONDITION.name).toString(), Torrent::StopCondition::None);
-        resumeData.sslParameters =
-        {
-            .certificate = QSslCertificate(query.value(DB_COLUMN_SSL_CERTIFICATE.name).toByteArray()),
-            .privateKey = Utils::SSLKey::load(query.value(DB_COLUMN_SSL_PRIVATE_KEY.name).toByteArray()),
-            .dhParams = query.value(DB_COLUMN_SSL_DH_PARAMS.name).toByteArray()
-        };
-
-        resumeData.savePath = Profile::instance()->fromPortablePath(
-                    Path(query.value(DB_COLUMN_TARGET_SAVE_PATH.name).toString()));
-        resumeData.useAutoTMM = resumeData.savePath.isEmpty();
-        if (!resumeData.useAutoTMM)
-        {
-            resumeData.downloadPath = Profile::instance()->fromPortablePath(
-                        Path(query.value(DB_COLUMN_DOWNLOAD_PATH.name).toString()));
-        }
-
-        const QByteArray bencodedResumeData = query.value(DB_COLUMN_RESUMEDATA.name).toByteArray();
-        const auto *pref = Preferences::instance();
-        const int bdecodeDepthLimit = pref->getBdecodeDepthLimit();
-        const int bdecodeTokenLimit = pref->getBdecodeTokenLimit();
-
-        lt::error_code ec;
-        const lt::bdecode_node resumeDataRoot = lt::bdecode(bencodedResumeData, ec
-                , nullptr, bdecodeDepthLimit, bdecodeTokenLimit);
-
-        lt::add_torrent_params &p = resumeData.ltAddTorrentParams;
-
-        p = lt::read_resume_data(resumeDataRoot, ec);
-
-        if (const QByteArray bencodedMetadata = query.value(DB_COLUMN_METADATA.name).toByteArray()
-                ; !bencodedMetadata.isEmpty())
-        {
-            const lt::bdecode_node torentInfoRoot = lt::bdecode(bencodedMetadata, ec
-                    , nullptr, bdecodeDepthLimit, bdecodeTokenLimit);
-            p.ti = std::make_shared<lt::torrent_info>(torentInfoRoot, ec);
-        }
-
-        p.save_path = Profile::instance()->fromPortablePath(Path(fromLTString(p.save_path)))
-                .toString().toStdString();
-
-        if (p.flags & lt::torrent_flags::stop_when_ready)
-        {
-            p.flags &= ~lt::torrent_flags::stop_when_ready;
-            resumeData.stopCondition = Torrent::StopCondition::FilesChecked;
-        }
-
-        return resumeData;
-    }
 }
 
 namespace BitTorrent
@@ -688,6 +614,90 @@ void BitTorrent::DBResumeDataStorage::enableWALMode() const
         throw RuntimeError(tr("WAL mode is probably unsupported due to filesystem limitations."));
 }
 
+LoadResumeDataResult DBResumeDataStorage::parseQueryResultRow(const QSqlQuery &query) const
+{
+    LoadTorrentParams resumeData;
+    resumeData.name = query.value(DB_COLUMN_NAME.name).toString();
+    resumeData.category = query.value(DB_COLUMN_CATEGORY.name).toString();
+    const QString tagsData = query.value(DB_COLUMN_TAGS.name).toString();
+    if (!tagsData.isEmpty())
+    {
+        const QStringList tagList = tagsData.split(u',');
+        resumeData.tags.insert(tagList.cbegin(), tagList.cend());
+    }
+    resumeData.hasFinishedStatus = query.value(DB_COLUMN_HAS_SEED_STATUS.name).toBool();
+    resumeData.firstLastPiecePriority = query.value(DB_COLUMN_HAS_OUTER_PIECES_PRIORITY.name).toBool();
+    resumeData.ratioLimit = query.value(DB_COLUMN_RATIO_LIMIT.name).toInt() / 1000.0;
+    resumeData.seedingTimeLimit = query.value(DB_COLUMN_SEEDING_TIME_LIMIT.name).toInt();
+    resumeData.inactiveSeedingTimeLimit = query.value(DB_COLUMN_INACTIVE_SEEDING_TIME_LIMIT.name).toInt();
+    resumeData.shareLimitAction = Utils::String::toEnum<ShareLimitAction>(
+        query.value(DB_COLUMN_SHARE_LIMIT_ACTION.name).toString(), ShareLimitAction::Default);
+    resumeData.contentLayout = Utils::String::toEnum<TorrentContentLayout>(
+        query.value(DB_COLUMN_CONTENT_LAYOUT.name).toString(), TorrentContentLayout::Original);
+    resumeData.operatingMode = Utils::String::toEnum<TorrentOperatingMode>(
+        query.value(DB_COLUMN_OPERATING_MODE.name).toString(), TorrentOperatingMode::AutoManaged);
+    resumeData.stopped = query.value(DB_COLUMN_STOPPED.name).toBool();
+    resumeData.stopCondition = Utils::String::toEnum(
+        query.value(DB_COLUMN_STOP_CONDITION.name).toString(), Torrent::StopCondition::None);
+    resumeData.sslParameters =
+        {
+            .certificate = QSslCertificate(query.value(DB_COLUMN_SSL_CERTIFICATE.name).toByteArray()),
+            .privateKey = Utils::SSLKey::load(query.value(DB_COLUMN_SSL_PRIVATE_KEY.name).toByteArray()),
+            .dhParams = query.value(DB_COLUMN_SSL_DH_PARAMS.name).toByteArray()
+        };
+
+    resumeData.savePath = Profile::instance()->fromPortablePath(
+        Path(query.value(DB_COLUMN_TARGET_SAVE_PATH.name).toString()));
+    resumeData.useAutoTMM = resumeData.savePath.isEmpty();
+    if (!resumeData.useAutoTMM)
+    {
+        resumeData.downloadPath = Profile::instance()->fromPortablePath(
+            Path(query.value(DB_COLUMN_DOWNLOAD_PATH.name).toString()));
+    }
+
+    const QByteArray bencodedResumeData = query.value(DB_COLUMN_RESUMEDATA.name).toByteArray();
+    const auto *pref = Preferences::instance();
+    const int bdecodeDepthLimit = pref->getBdecodeDepthLimit();
+    const int bdecodeTokenLimit = pref->getBdecodeTokenLimit();
+
+    lt::error_code ec;
+    const lt::bdecode_node resumeDataRoot = lt::bdecode(bencodedResumeData, ec, nullptr, bdecodeDepthLimit, bdecodeTokenLimit);
+    if (ec)
+        return nonstd::make_unexpected(tr("Cannot parse resume data: %1").arg(QString::fromStdString(ec.message())));
+
+    lt::add_torrent_params &p = resumeData.ltAddTorrentParams;
+
+    p = lt::read_resume_data(resumeDataRoot, ec);
+    if (ec)
+        return nonstd::make_unexpected(tr("Cannot parse resume data: %1").arg(QString::fromStdString(ec.message())));
+
+    if (const QByteArray bencodedMetadata = query.value(DB_COLUMN_METADATA.name).toByteArray()
+            ; !bencodedMetadata.isEmpty())
+    {
+        const lt::bdecode_node torentInfoRoot = lt::bdecode(bencodedMetadata, ec
+                , nullptr, bdecodeDepthLimit, bdecodeTokenLimit);
+        if (ec)
+            return nonstd::make_unexpected(tr("Cannot parse torrent info: %1").arg(QString::fromStdString(ec.message())));
+
+        p.ti = std::make_shared<lt::torrent_info>(torentInfoRoot, ec);
+        if (ec)
+            return nonstd::make_unexpected(tr("Cannot parse torrent info: %1").arg(QString::fromStdString(ec.message())));
+    }
+
+    p.save_path = Profile::instance()->fromPortablePath(Path(fromLTString(p.save_path)))
+            .toString().toStdString();
+    if (p.save_path.empty())
+        return nonstd::make_unexpected(tr("Corrupted resume data: %1").arg(tr("save_path is invalid")));
+
+    if (p.flags & lt::torrent_flags::stop_when_ready)
+    {
+        p.flags &= ~lt::torrent_flags::stop_when_ready;
+        resumeData.stopCondition = Torrent::StopCondition::FilesChecked;
+    }
+
+    return resumeData;
+}
+
 BitTorrent::DBResumeDataStorage::Worker::Worker(const Path &dbPath, QReadWriteLock &dbLock, QObject *parent)
     : QThread(parent)
     , m_path {dbPath}

src/base/bittorrent/dbresumedatastorage.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2021-2022  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2021-2025  Vladimir Golovnev <glassez@yandex.ru>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -31,9 +31,10 @@
 #include <QReadWriteLock>
 
 #include "base/pathfwd.h"
-#include "base/utils/thread.h"
 #include "resumedatastorage.h"
 
+class QSqlQuery;
+
 namespace BitTorrent
 {
     class DBResumeDataStorage final : public ResumeDataStorage
@@ -58,6 +59,7 @@ namespace BitTorrent
         void createDB() const;
         void updateDB(int fromVersion) const;
         void enableWALMode() const;
+        LoadResumeDataResult parseQueryResultRow(const QSqlQuery &query) const;
 
         class Worker;
         Worker *m_asyncWorker = nullptr;

src/base/bittorrent/sessionimpl.cpp

@@ -974,23 +974,25 @@ bool SessionImpl::editCategory(const QString &name, const CategoryOptions &optio
     if (options == currentOptions)
         return false;
 
-    currentOptions = options;
-    storeCategories();
     if (isDisableAutoTMMWhenCategorySavePathChanged())
     {
+        // This should be done before changing the category options
+        // to prevent the torrent from being moved at the new save path.
+
         for (TorrentImpl *const torrent : asConst(m_torrents))
         {
             if (torrent->category() == name)
                 torrent->setAutoTMMEnabled(false);
         }
     }
-    else
+
+    currentOptions = options;
+    storeCategories();
+
+    for (TorrentImpl *const torrent : asConst(m_torrents))
     {
-        for (TorrentImpl *const torrent : asConst(m_torrents))
+        if (torrent->category() == name)
-        {
+            torrent->handleCategoryOptionsChanged();
-            if (torrent->category() == name)
-                torrent->handleCategoryOptionsChanged();
-        }
     }
 
     emit categoryOptionsChanged(name);
@@ -3247,6 +3249,9 @@ void SessionImpl::setSavePath(const Path &path)
 
     if (isDisableAutoTMMWhenDefaultSavePathChanged())
     {
+        // This should be done before changing the save path
+        // to prevent the torrent from being moved at the new save path.
+
         QSet<QString> affectedCatogories {{}}; // includes default (unnamed) category
         for (auto it = m_categories.cbegin(); it != m_categories.cend(); ++it)
         {
@@ -3276,6 +3281,9 @@ void SessionImpl::setDownloadPath(const Path &path)
 
     if (isDisableAutoTMMWhenDefaultSavePathChanged())
     {
+        // This should be done before changing the save path
+        // to prevent the torrent from being moved at the new save path.
+
         QSet<QString> affectedCatogories {{}}; // includes default (unnamed) category
         for (auto it = m_categories.cbegin(); it != m_categories.cend(); ++it)
         {

src/base/bittorrent/torrentimpl.cpp

@@ -1615,18 +1615,20 @@ bool TorrentImpl::setCategory(const QString &category)
         if (!category.isEmpty() && !m_session->categories().contains(category))
             return false;
 
+        if (m_session->isDisableAutoTMMWhenCategoryChanged())
+        {
+            // This should be done before changing the category name
+            // to prevent the torrent from being moved at the path of new category.
+            setAutoTMMEnabled(false);
+        }
+
         const QString oldCategory = m_category;
         m_category = category;
         deferredRequestResumeData();
         m_session->handleTorrentCategoryChanged(this, oldCategory);
 
         if (m_useAutoTMM)
-        {
+            adjustStorageLocation();
-            if (!m_session->isDisableAutoTMMWhenCategoryChanged())
-                adjustStorageLocation();
-            else
-                setAutoTMMEnabled(false);
-        }
     }
 
     return true;

src/base/http/types.h

@@ -30,8 +30,10 @@
 #pragma once
 
 #include <QByteArray>
+#include <QHash>
 #include <QHostAddress>
 #include <QList>
+#include <QMap>
 #include <QString>
 
 #include "base/global.h"

src/base/preferences.cpp

@@ -2054,6 +2054,19 @@ void Preferences::setAddNewTorrentDialogSavePathHistoryLength(const int value)
     setValue(u"AddNewTorrentDialog/SavePathHistoryLength"_s, clampedValue);
 }
 
+bool Preferences::isAddNewTorrentDialogAttached() const
+{
+    return value(u"AddNewTorrentDialog/Attached"_s, false);
+}
+
+void Preferences::setAddNewTorrentDialogAttached(const bool attached)
+{
+    if (attached == isAddNewTorrentDialogAttached())
+        return;
+
+    setValue(u"AddNewTorrentDialog/Attached"_s, attached);
+}
+
 void Preferences::apply()
 {
     if (SettingsStorage::instance()->save())

src/base/preferences.h

@@ -433,6 +433,8 @@ public:
     void setAddNewTorrentDialogTopLevel(bool value);
     int addNewTorrentDialogSavePathHistoryLength() const;
     void setAddNewTorrentDialogSavePathHistoryLength(int value);
+    bool isAddNewTorrentDialogAttached() const;
+    void setAddNewTorrentDialogAttached(bool attached);
 
 public slots:
     void setStatusFilterState(bool checked);

src/base/version.h.in

@@ -32,7 +32,7 @@
 #define QBT_VERSION_MINOR 1
 #define QBT_VERSION_BUGFIX 0
 #define QBT_VERSION_BUILD 0
-#define QBT_VERSION_STATUS "beta1"  // 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)

src/gui/CMakeLists.txt

@@ -287,6 +287,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
         macosdockbadge/badger.mm
         macosdockbadge/badgeview.h
         macosdockbadge/badgeview.mm
+        macosshiftclickhandler.h
+        macosshiftclickhandler.cpp
         macutilities.h
         macutilities.mm
     )

src/gui/aboutdialog.cpp

@@ -67,7 +67,7 @@ AboutDialog::AboutDialog(QWidget *parent)
         u"</p>"_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-2024 The qBittorrent project").arg(C_COPYRIGHT)
+            , tr("Copyright %1 2006-2025 The qBittorrent project").arg(C_COPYRIGHT)
             , tr("Home Page:")
             , tr("Forum:")
             , tr("Bug Tracker:"));

src/gui/addnewtorrentdialog.cpp

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2022-2024  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2022-2025  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2012  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -384,7 +384,6 @@ AddNewTorrentDialog::AddNewTorrentDialog(const BitTorrent::TorrentDescriptor &to
 
 AddNewTorrentDialog::~AddNewTorrentDialog()
 {
-    saveState();
     delete m_ui;
 }
 
@@ -398,7 +397,7 @@ void AddNewTorrentDialog::loadState()
     if (const QSize dialogSize = m_storeDialogSize; dialogSize.isValid())
         resize(dialogSize);
 
-    m_ui->splitter->restoreState(m_storeSplitterState);;
+    m_ui->splitter->restoreState(m_storeSplitterState);
 }
 
 void AddNewTorrentDialog::saveState()
@@ -834,6 +833,12 @@ void AddNewTorrentDialog::reject()
     QDialog::reject();
 }
 
+void AddNewTorrentDialog::done(const int result)
+{
+    saveState();
+    QDialog::done(result);
+}
+
 void AddNewTorrentDialog::updateMetadata(const BitTorrent::TorrentInfo &metadata)
 {
     Q_ASSERT(m_currentContext);

src/gui/addnewtorrentdialog.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2022-2024  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2022-2025  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2012  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -68,6 +68,11 @@ signals:
     void torrentAccepted(const BitTorrent::TorrentDescriptor &torrentDescriptor, const BitTorrent::AddTorrentParams &addTorrentParams);
     void torrentRejected(const BitTorrent::TorrentDescriptor &torrentDescriptor);
 
+public slots:
+    void accept() override;
+    void reject() override;
+    void done(int result) override;
+
 private slots:
     void updateDiskSpaceLabel();
     void onSavePathChanged(const Path &newPath);
@@ -77,9 +82,6 @@ private slots:
     void categoryChanged(int index);
     void contentLayoutChanged();
 
-    void accept() override;
-    void reject() override;
-
 private:
     class TorrentContentAdaptor;
     struct Context;

src/gui/advancedsettings.cpp

@@ -99,6 +99,7 @@ namespace
         ENABLE_SPEED_WIDGET,
 #ifndef Q_OS_MACOS
         ENABLE_ICONS_IN_MENUS,
+        USE_ATTACHED_ADD_NEW_TORRENT_DIALOG,
 #endif
         // embedded tracker
         TRACKER_STATUS,
@@ -330,6 +331,7 @@ void AdvancedSettings::saveAdvancedSettings() const
     pref->setSpeedWidgetEnabled(m_checkBoxSpeedWidgetEnabled.isChecked());
 #ifndef Q_OS_MACOS
     pref->setIconsInMenusEnabled(m_checkBoxIconsInMenusEnabled.isChecked());
+    pref->setAddNewTorrentDialogAttached(m_checkBoxAttachedAddNewTorrentDialog.isChecked());
 #endif
 
     // Tracker
@@ -856,6 +858,9 @@ void AdvancedSettings::loadAdvancedSettings()
     // Enable icons in menus
     m_checkBoxIconsInMenusEnabled.setChecked(pref->iconsInMenusEnabled());
     addRow(ENABLE_ICONS_IN_MENUS, tr("Enable icons in menus"), &m_checkBoxIconsInMenusEnabled);
+
+    m_checkBoxAttachedAddNewTorrentDialog.setChecked(pref->isAddNewTorrentDialogAttached());
+    addRow(USE_ATTACHED_ADD_NEW_TORRENT_DIALOG, tr("Attach \"Add new torrent\" dialog to main window"), &m_checkBoxAttachedAddNewTorrentDialog);
 #endif
     // Tracker State
     m_checkBoxTrackerStatus.setChecked(session->isTrackerEnabled());

src/gui/advancedsettings.h

@@ -108,6 +108,7 @@ private:
 
 #ifndef Q_OS_MACOS
     QCheckBox m_checkBoxIconsInMenusEnabled;
+    QCheckBox m_checkBoxAttachedAddNewTorrentDialog;
 #endif
 
 #if defined(Q_OS_MACOS) || defined(Q_OS_WIN)

src/gui/guiaddtorrentmanager.cpp

@@ -82,6 +82,15 @@ GUIAddTorrentManager::GUIAddTorrentManager(IGUIApplication *app, BitTorrent::Ses
     connect(btSession(), &BitTorrent::Session::metadataDownloaded, this, &GUIAddTorrentManager::onMetadataDownloaded);
 }
 
+GUIAddTorrentManager::~GUIAddTorrentManager()
+{
+    for (AddNewTorrentDialog *dialog : asConst(m_dialogs))
+    {
+        dialog->disconnect(this);
+        dialog->reject();
+    }
+}
+
 bool GUIAddTorrentManager::addTorrent(const QString &source, const BitTorrent::AddTorrentParams &params, const AddTorrentOption option)
 {
     // `source`: .torrent file path,  magnet URI or URL
@@ -225,12 +234,19 @@ bool GUIAddTorrentManager::processTorrent(const QString &source
     if (!hasMetadata)
         btSession()->downloadMetadata(torrentDescr);
 
+#ifdef Q_OS_MACOS
+    const bool attached = false;
+#else
+    const bool attached = Preferences::instance()->isAddNewTorrentDialogAttached();
+#endif
+
     // 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(torrentDescr, params, nullptr);
+    auto *dlg = new AddNewTorrentDialog(torrentDescr, params, (attached ? app()->mainWindow() : 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);
+    if (!attached)
+        dlg->setWindowFlags(Qt::Window);
 
     dlg->setAttribute(Qt::WA_DeleteOnClose);
     m_dialogs[infoHash] = dlg;

src/gui/guiaddtorrentmanager.h

@@ -61,6 +61,7 @@ class GUIAddTorrentManager : public GUIApplicationComponent<AddTorrentManager>
 
 public:
     GUIAddTorrentManager(IGUIApplication *app, BitTorrent::Session *session, QObject *parent = nullptr);
+    ~GUIAddTorrentManager() override;
 
     bool addTorrent(const QString &source, const BitTorrent::AddTorrentParams &params = {}, AddTorrentOption option = AddTorrentOption::Default);
 

src/gui/macosshiftclickhandler.cpp

@@ -0,0 +1,73 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2025  Luke Memet (lukemmtt)
+ *
+ * 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 "macosshiftclickhandler.h"
+
+#include <QMouseEvent>
+#include <QTreeView>
+
+MacOSShiftClickHandler::MacOSShiftClickHandler(QTreeView *treeView)
+    : QObject(treeView)
+    , m_treeView {treeView}
+{
+    treeView->installEventFilter(this);
+}
+
+bool MacOSShiftClickHandler::eventFilter(QObject *watched, QEvent *event)
+{
+    if ((watched == m_treeView) && (event->type() == QEvent::MouseButtonPress))
+    {
+        const auto *mouseEvent = static_cast<QMouseEvent *>(event);
+        if (mouseEvent->button() != Qt::LeftButton)
+            return false;
+
+        const QModelIndex clickedIndex = m_treeView->indexAt(mouseEvent->position().toPoint());
+        if (!clickedIndex.isValid())
+            return false;
+
+        const Qt::KeyboardModifiers modifiers = mouseEvent->modifiers();
+        const bool shiftPressed = modifiers.testFlag(Qt::ShiftModifier);
+
+        if (shiftPressed && m_lastClickedIndex.isValid())
+        {
+            const QItemSelection selection(m_lastClickedIndex, clickedIndex);
+            const bool commandPressed = modifiers.testFlag(Qt::ControlModifier);
+            if (commandPressed)
+                m_treeView->selectionModel()->select(selection, (QItemSelectionModel::Select | QItemSelectionModel::Rows));
+            else
+                m_treeView->selectionModel()->select(selection, (QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows));
+            m_treeView->selectionModel()->setCurrentIndex(clickedIndex, QItemSelectionModel::NoUpdate);
+            return true;
+        }
+
+        if (!modifiers.testFlags(Qt::AltModifier | Qt::MetaModifier))
+            m_lastClickedIndex = clickedIndex;
+    }
+
+    return QObject::eventFilter(watched, event);
+}

src/gui/macosshiftclickhandler.h

@@ -0,0 +1,50 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2025  Luke Memet (lukemmtt)
+ *
+ * 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 <QObject>
+#include <QPersistentModelIndex>
+
+class QTreeView;
+
+// Workaround for QTBUG-115838: Shift-click range selection not working properly on macOS
+class MacOSShiftClickHandler final : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY_MOVE(MacOSShiftClickHandler)
+
+public:
+    explicit MacOSShiftClickHandler(QTreeView *treeView);
+
+private:
+    bool eventFilter(QObject *watched, QEvent *event) override;
+
+    QTreeView *m_treeView = nullptr;
+    QPersistentModelIndex m_lastClickedIndex;
+};

src/gui/transferlistwidget.cpp

@@ -74,6 +74,7 @@
 #include "utils.h"
 
 #ifdef Q_OS_MACOS
+#include "macosshiftclickhandler.h"
 #include "macutilities.h"
 #endif
 
@@ -158,6 +159,7 @@ TransferListWidget::TransferListWidget(IGUIApplication *app, QWidget *parent)
     setDropIndicatorShown(true);
 #if defined(Q_OS_MACOS)
     setAttribute(Qt::WA_MacShowFocusRect, false);
+    new MacOSShiftClickHandler(this);
 #endif
     header()->setFirstSectionMovable(true);
     header()->setStretchLastSection(false);

src/gui/uithemecommon.h

@@ -80,7 +80,33 @@ inline QHash<QString, UIThemeColor> defaultUIThemeColors()
         {u"TransferList.StoppedUploading"_s, {Color::Primer::Light::doneFg, Color::Primer::Dark::doneFg}},
         {u"TransferList.Moving"_s, {Color::Primer::Light::successFg, Color::Primer::Dark::successFg}},
         {u"TransferList.MissingFiles"_s, {Color::Primer::Light::dangerFg, Color::Primer::Dark::dangerFg}},
-        {u"TransferList.Error"_s, {Color::Primer::Light::dangerFg, Color::Primer::Dark::dangerFg}}
+        {u"TransferList.Error"_s, {Color::Primer::Light::dangerFg, Color::Primer::Dark::dangerFg}},
+
+        {u"Palette.Window"_s, {{}, {}}},
+        {u"Palette.WindowText"_s, {{}, {}}},
+        {u"Palette.Base"_s, {{}, {}}},
+        {u"Palette.AlternateBase"_s, {{}, {}}},
+        {u"Palette.Text"_s, {{}, {}}},
+        {u"Palette.ToolTipBase"_s, {{}, {}}},
+        {u"Palette.ToolTipText"_s, {{}, {}}},
+        {u"Palette.BrightText"_s, {{}, {}}},
+        {u"Palette.Highlight"_s, {{}, {}}},
+        {u"Palette.HighlightedText"_s, {{}, {}}},
+        {u"Palette.Button"_s, {{}, {}}},
+        {u"Palette.ButtonText"_s, {{}, {}}},
+        {u"Palette.Link"_s, {{}, {}}},
+        {u"Palette.LinkVisited"_s, {{}, {}}},
+        {u"Palette.Light"_s, {{}, {}}},
+        {u"Palette.Midlight"_s, {{}, {}}},
+        {u"Palette.Mid"_s, {{}, {}}},
+        {u"Palette.Dark"_s, {{}, {}}},
+        {u"Palette.Shadow"_s, {{}, {}}},
+        {u"Palette.WindowTextDisabled"_s, {{}, {}}},
+        {u"Palette.TextDisabled"_s, {{}, {}}},
+        {u"Palette.ToolTipTextDisabled"_s, {{}, {}}},
+        {u"Palette.BrightTextDisabled"_s, {{}, {}}},
+        {u"Palette.HighlightedTextDisabled"_s, {{}, {}}},
+        {u"Palette.ButtonTextDisabled"_s, {{}, {}}}
     };
 }
 

src/qbittorrent.rc

@@ -35,7 +35,7 @@ BEGIN
             VALUE "FileDescription",  "qBittorrent - A Bittorrent Client"
             VALUE "FileVersion",      VER_FILEVERSION_STR
             VALUE "InternalName",     "qbittorrent"
-            VALUE "LegalCopyright",   "Copyright ©2006-2024 The qBittorrent Project"
+            VALUE "LegalCopyright",   "Copyright ©2006-2025 The qBittorrent Project"
             VALUE "OriginalFilename", "qbittorrent.exe"
             VALUE "ProductName",      "qBittorrent"
             VALUE "ProductVersion",   VER_PRODUCTVERSION_STR

src/webui/api/rsscontroller.cpp

@@ -49,7 +49,7 @@ void RSSController::addFolderAction()
 {
     requireParams({u"path"_s});
 
-    const QString path = params()[u"path"_s].trimmed();
+    const QString path = params()[u"path"_s];
     const nonstd::expected<void, QString> result = RSS::Session::instance()->addFolder(path);
     if (!result)
         throw APIError(APIErrorType::Conflict, result.error());
@@ -59,8 +59,8 @@ void RSSController::addFeedAction()
 {
     requireParams({u"url"_s, u"path"_s});
 
-    const QString url = params()[u"url"_s].trimmed();
+    const QString url = params()[u"url"_s];
-    const QString path = params()[u"path"_s].trimmed();
+    const QString path = params()[u"path"_s];
     const nonstd::expected<void, QString> result = RSS::Session::instance()->addFeed(url, (path.isEmpty() ? url : path));
     if (!result)
         throw APIError(APIErrorType::Conflict, result.error());
@@ -70,8 +70,8 @@ void RSSController::setFeedURLAction()
 {
     requireParams({u"path"_s, u"url"_s});
 
-    const QString path = params()[u"path"_s].trimmed();
+    const QString path = params()[u"path"_s];
-    const QString url = params()[u"url"_s].trimmed();
+    const QString url = params()[u"url"_s];
     const nonstd::expected<void, QString> result = RSS::Session::instance()->setFeedURL(path, url);
     if (!result)
         throw APIError(APIErrorType::Conflict, result.error());
@@ -81,7 +81,7 @@ void RSSController::removeItemAction()
 {
     requireParams({u"path"_s});
 
-    const QString path = params()[u"path"_s].trimmed();
+    const QString path = params()[u"path"_s];
     const nonstd::expected<void, QString> result = RSS::Session::instance()->removeItem(path);
     if (!result)
         throw APIError(APIErrorType::Conflict, result.error());
@@ -91,8 +91,8 @@ void RSSController::moveItemAction()
 {
     requireParams({u"itemPath"_s, u"destPath"_s});
 
-    const QString itemPath = params()[u"itemPath"_s].trimmed();
+    const QString itemPath = params()[u"itemPath"_s];
-    const QString destPath = params()[u"destPath"_s].trimmed();
+    const QString destPath = params()[u"destPath"_s];
     const nonstd::expected<void, QString> result = RSS::Session::instance()->moveItem(itemPath, destPath);
     if (!result)
         throw APIError(APIErrorType::Conflict, result.error());
@@ -146,8 +146,8 @@ void RSSController::setRuleAction()
 {
     requireParams({u"ruleName"_s, u"ruleDef"_s});
 
-    const QString ruleName {params()[u"ruleName"_s].trimmed()};
+    const QString ruleName {params()[u"ruleName"_s]};
-    const QByteArray ruleDef {params()[u"ruleDef"_s].trimmed().toUtf8()};
+    const QByteArray ruleDef {params()[u"ruleDef"_s].toUtf8()};
 
     const auto jsonObj = QJsonDocument::fromJson(ruleDef).object();
     RSS::AutoDownloader::instance()->setRule(RSS::AutoDownloadRule::fromJsonObject(jsonObj, ruleName));
@@ -157,8 +157,8 @@ void RSSController::renameRuleAction()
 {
     requireParams({u"ruleName"_s, u"newRuleName"_s});
 
-    const QString ruleName {params()[u"ruleName"_s].trimmed()};
+    const QString ruleName {params()[u"ruleName"_s]};
-    const QString newRuleName {params()[u"newRuleName"_s].trimmed()};
+    const QString newRuleName {params()[u"newRuleName"_s]};
 
     RSS::AutoDownloader::instance()->renameRule(ruleName, newRuleName);
 }
@@ -167,7 +167,7 @@ void RSSController::removeRuleAction()
 {
     requireParams({u"ruleName"_s});
 
-    const QString ruleName {params()[u"ruleName"_s].trimmed()};
+    const QString ruleName {params()[u"ruleName"_s]};
     RSS::AutoDownloader::instance()->removeRule(ruleName);
 }
 

src/webui/webapplication.cpp

@@ -537,15 +537,12 @@ void WebApplication::sendFile(const Path &path)
     const QDateTime lastModified = Utils::Fs::lastModified(path);
 
     // find translated file in cache
-    if (!m_isAltUIUsed)
+    if (const auto it = m_translatedFiles.constFind(path);
+        (it != m_translatedFiles.constEnd()) && (lastModified <= it->lastModified))
     {
-        if (const auto it = m_translatedFiles.constFind(path);
+        print(it->data, it->mimeType);
-            (it != m_translatedFiles.constEnd()) && (lastModified <= it->lastModified))
+        setHeader({Http::HEADER_CACHE_CONTROL, getCachingInterval(it->mimeType)});
-        {
+        return;
-            print(it->data, it->mimeType);
-            setHeader({Http::HEADER_CACHE_CONTROL, getCachingInterval(it->mimeType)});
-            return;
-        }
     }
 
     const auto readResult = Utils::IO::readFile(path, MAX_ALLOWED_FILESIZE);
@@ -576,7 +573,7 @@ void WebApplication::sendFile(const Path &path)
 
     QByteArray data = readResult.value();
     const QMimeType mimeType = QMimeDatabase().mimeTypeForFileNameAndData(path.data(), data);
-    const bool isTranslatable = !m_isAltUIUsed && mimeType.inherits(u"text/plain"_s);
+    const bool isTranslatable = mimeType.inherits(u"text/plain"_s);
 
     if (isTranslatable)
     {

src/webui/www/private/css/style.css

@@ -100,6 +100,7 @@ ol {
     .dynamicTableDiv,
     .mochaContentWrapper,
     .panel,
+    .scrollableMenu,
     #rssDetailsView {
         scrollbar-width: thin;
     }

src/webui/www/private/rename_files.html

@@ -21,7 +21,7 @@
             } = window.MUI.Windows.instances["multiRenamePage"];
 
             const bulkRenameFilesContextMenu = new window.qBittorrent.ContextMenu.ContextMenu({
-                targets: "#bulkRenameFilesTableDiv tr",
+                targets: "#bulkRenameFilesTableDiv tbody tr",
                 menu: "multiRenameFilesMenu",
                 actions: {
                     ToggleSelection: (element, ref) => {

src/webui/www/private/scripts/client.js

@@ -381,8 +381,10 @@ window.addEventListener("DOMContentLoaded", () => {
             return false;
 
         let removed = false;
-        for (const data of categoryMap.values())
+        for (const data of categoryMap.values()) {
-            removed ||= data.torrents.delete(hash);
+            const deleteResult = data.torrents.delete(hash);
+            removed ||= deleteResult;
+        }
         return removed;
     };
 
@@ -418,8 +420,10 @@ window.addEventListener("DOMContentLoaded", () => {
             return false;
 
         let removed = false;
-        for (const torrents of tagMap.values())
+        for (const torrents of tagMap.values()) {
-            removed ||= torrents.delete(hash);
+            const deleteResult = torrents.delete(hash);
+            removed ||= deleteResult;
+        }
         return removed;
     };
 
@@ -477,6 +481,8 @@ window.addEventListener("DOMContentLoaded", () => {
         updateFilter("checking", "QBT_TR(Checking (%1))QBT_TR[CONTEXT=StatusFilterWidget]");
         updateFilter("moving", "QBT_TR(Moving (%1))QBT_TR[CONTEXT=StatusFilterWidget]");
         updateFilter("errored", "QBT_TR(Errored (%1))QBT_TR[CONTEXT=StatusFilterWidget]");
+        if (useAutoHideZeroStatusFilters && document.getElementById(`${selectedStatus}_filter`).classList.contains("invisible"))
+            setStatusFilter("all");
     };
 
     const highlightSelectedStatus = () => {
@@ -1509,7 +1515,9 @@ window.addEventListener("DOMContentLoaded", () => {
         },
         column: "mainColumn",
         onResize: window.qBittorrent.Misc.createDebounceHandler(500, (e) => {
-            saveColumnSizes();
+            const isHidden = (parseInt(document.getElementById("propertiesPanel").style.height, 10) === 0);
+            if (!isHidden)
+                saveColumnSizes();
         }),
         height: null
     });

src/webui/www/private/scripts/download.js

@@ -131,7 +131,11 @@ window.qBittorrent.Download ??= (() => {
         }
     };
 
-    $(window).addEventListener("load", () => {
+    $(window).addEventListener("load", async () => {
+        // user might load this page directly (via browser magnet handler)
+        // so wait for crucial initialization to complete
+        await window.parent.qBittorrent.Client.initializeCaches();
+
         getPreferences();
         getCategories();
     });

src/webui/www/private/scripts/dynamicTable.js

@@ -89,7 +89,6 @@ window.qBittorrent.DynamicTable ??= (() => {
             this.setupCommonEvents();
             this.setupHeaderEvents();
             this.setupHeaderMenu();
-            this.setSortedColumnIcon(this.sortedColumn, null, (this.reverseSort === "1"));
             this.setupAltRow();
         },
 
@@ -294,6 +293,7 @@ window.qBittorrent.DynamicTable ??= (() => {
                     this.updateTableHeaders();
                     this.tableBody.replaceChildren();
                     this.updateTable(true);
+                    this.reselectRows(this.selectedRowsIds());
                 }
                 if (this.currentHeaderAction === "drag") {
                     resetElementBorderStyle(el);
@@ -600,19 +600,21 @@ window.qBittorrent.DynamicTable ??= (() => {
         updateTableHeaders: function() {
             this.updateHeader(this.hiddenTableHeader);
             this.updateHeader(this.fixedTableHeader);
+            this.setSortedColumnIcon(this.sortedColumn, null, (this.reverseSort === "1"));
         },
 
         updateHeader: function(header) {
             const ths = this.getRowCells(header);
             for (let i = 0; i < ths.length; ++i) {
                 const th = ths[i];
-                th._this = this;
+                if (th.columnName !== this.columns[i].name) {
-                th.title = this.columns[i].caption;
+                    th.title = this.columns[i].caption;
-                th.textContent = this.columns[i].caption;
+                    th.textContent = this.columns[i].caption;
-                th.style.cssText = `width: ${this.columns[i].width}px; ${this.columns[i].style}`;
+                    th.style.cssText = `width: ${this.columns[i].width}px; ${this.columns[i].style}`;
-                th.columnName = this.columns[i].name;
+                    th.columnName = this.columns[i].name;
-                th.classList.add(`column_${th.columnName}`);
+                    th.className = `column_${th.columnName}`;
-                th.classList.toggle("invisible", ((this.columns[i].visible === "0") || this.columns[i].force_hide));
+                    th.classList.toggle("invisible", ((this.columns[i].visible === "0") || this.columns[i].force_hide));
+                }
             }
         },
 
@@ -750,10 +752,7 @@ window.qBittorrent.DynamicTable ??= (() => {
         reselectRows: function(rowIds) {
             this.deselectAll();
             this.selectedRows = rowIds.slice();
-            for (const tr of this.getTrs()) {
+            this.setRowClass();
-                if (rowIds.includes(tr.rowId))
-                    tr.classList.add("selected");
-            }
         },
 
         setRowClass: function() {
@@ -1752,7 +1751,7 @@ window.qBittorrent.DynamicTable ??= (() => {
                     td.append(span);
                 }
 
-                span.style.backgroundImage = `url('images/flags/${country_code ?? "xx"}.svg')`;
+                span.style.backgroundImage = `url('images/flags/${country_code || "xx"}.svg')`;
                 span.textContent = country;
                 td.title = country;
             };
@@ -2058,7 +2057,11 @@ window.qBittorrent.DynamicTable ??= (() => {
                         break;
                 }
 
-                td.className = statusClass;
+                for (const c of [...td.classList]) {
+                    if (c.startsWith("tracker"))
+                        td.classList.remove(c);
+                }
+                td.classList.add(statusClass);
                 td.textContent = status;
                 td.title = status;
             };

src/webui/www/private/scripts/prop-files.js

@@ -575,7 +575,7 @@ window.qBittorrent.PropFiles ??= (() => {
     };
 
     const torrentFilesContextMenu = new window.qBittorrent.ContextMenu.ContextMenu({
-        targets: "#torrentFilesTableDiv tr",
+        targets: "#torrentFilesTableDiv tbody tr",
         menu: "torrentFilesMenu",
         actions: {
             Rename: (element, ref) => {

src/webui/www/private/scripts/prop-trackers.js

@@ -138,8 +138,6 @@ window.qBittorrent.PropTrackers ??= (() => {
                 addTrackerFN();
             },
             EditTracker: (element, ref) => {
-                // only allow editing of one row
-                element.firstElementChild.click();
                 editTrackerFN(element);
             },
             RemoveTracker: (element, ref) => {
@@ -162,7 +160,11 @@ window.qBittorrent.PropTrackers ??= (() => {
                 this.hideItem("CopyTrackerUrl");
             }
             else {
-                this.showItem("EditTracker");
+                if (selectedTrackers.length === 1)
+                    this.showItem("EditTracker");
+                else
+                    this.hideItem("EditTracker");
+
                 this.showItem("RemoveTracker");
                 this.showItem("CopyTrackerUrl");
             }
@@ -196,7 +198,7 @@ window.qBittorrent.PropTrackers ??= (() => {
         if (current_hash.length === 0)
             return;
 
-        const trackerUrl = encodeURIComponent(element.childNodes[1].textContent);
+        const trackerUrl = encodeURIComponent(torrentTrackersTable.selectedRowsIds()[0]);
         new MochaUI.Window({
             id: "trackersPage",
             icon: "images/qbittorrent-tray.svg",

src/webui/www/private/scripts/search.js

@@ -97,8 +97,8 @@ window.qBittorrent.Search ??= (() => {
             }
         },
         offsets: {
-            x: -15,
+            x: 2,
-            y: -53
+            y: -60
         },
         onShow: function() {
             setActiveTab(this.options.element);
@@ -109,7 +109,7 @@ window.qBittorrent.Search ??= (() => {
         // load "Search in" preference from local storage
         $("searchInTorrentName").value = (LocalPreferences.get("search_in_filter") === "names") ? "names" : "everywhere";
         const searchResultsTableContextMenu = new window.qBittorrent.ContextMenu.ContextMenu({
-            targets: "#searchResultsTableDiv tr",
+            targets: "#searchResultsTableDiv tbody tr",
             menu: "searchResultsTableMenu",
             actions: {
                 Download: downloadSearchTorrent,
@@ -184,7 +184,10 @@ window.qBittorrent.Search ??= (() => {
         closeTabElem.src = "images/application-exit.svg";
         closeTabElem.width = "10";
         closeTabElem.height = "10";
-        closeTabElem.addEventListener("click", function(e) { qBittorrent.Search.closeSearchTab(this); });
+        closeTabElem.addEventListener("click", function(e) {
+            e.stopPropagation();
+            closeSearchTab(this);
+        });
 
         tabElem.prepend(closeTabElem);
         tabElem.appendChild(getStatusIconElement("QBT_TR(Searching...)QBT_TR[CONTEXT=SearchJobWidget]", "images/queued.svg"));

src/webui/www/private/views/about.html

@@ -5,7 +5,7 @@
         <h3 id="qbittorrentVersion">qBittorrent</h3>
     </div>
     <p>QBT_TR(An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.)QBT_TR[CONTEXT=AboutDialog]</p>
-    <p>Copyright © 2006-2024 The qBittorrent project</p>
+    <p>Copyright © 2006-2025 The qBittorrent project</p>
     <table>
         <tbody>
             <tr>

src/webui/www/private/views/filters.html

@@ -98,7 +98,7 @@
                 }
             },
             offsets: {
-                x: -15,
+                x: 0,
                 y: 2
             },
             onShow: function() {