Merge remote-tracking branch 'qbee/v5_0_x' into v5_0_x

# Conflicts:
#	src/base/version.h.in

.github/workflows/build_appimage.sh

@@ -79,48 +79,48 @@ EOF
 
   retry apt update
   retry apt install -y \
+    build-essential \
     curl \
-    git \
-    unzip \
+    desktop-file-utils \
     g++-11 \
-    pkg-config \
-    libssl-dev \
-    libzstd-dev \
-    zlib1g-dev \
+    git \
     libbrotli-dev \
-    libxcb1-dev \
-    libicu-dev \
-    libgtk2.0-dev \
-    build-essential \
-    libgl1-mesa-dev \
     libfontconfig1-dev \
     libfreetype6-dev \
+    libgl1-mesa-dev \
+    libgtk-3-dev \
+    libicu-dev \
+    libssl-dev \
+    libwayland-dev \
+    libwayland-egl-backend-dev \
     libx11-dev \
     libx11-xcb-dev \
-    libxext-dev \
-    libxfixes-dev \
-    libxi-dev \
-    libxrender-dev \
+    libxcb1-dev \
     libxcb1-dev \
     libxcb-cursor-dev \
     libxcb-glx0-dev \
-    libxcb-keysyms1-dev \
-    libxcb-image0-dev \
-    libxcb-shm0-dev \
     libxcb-icccm4-dev \
-    libxcb-sync-dev \
-    libxcb-xfixes0-dev \
-    libxcb-shape0-dev \
+    libxcb-image0-dev \
+    libxcb-keysyms1-dev \
     libxcb-randr0-dev \
     libxcb-render-util0-dev \
+    libxcb-shape0-dev \
+    libxcb-shm0-dev \
+    libxcb-sync-dev \
     libxcb-util-dev \
+    libxcb-xfixes0-dev \
     libxcb-xinerama0-dev \
     libxcb-xkb-dev \
+    libxext-dev \
+    libxfixes-dev \
+    libxi-dev \
     libxkbcommon-dev \
     libxkbcommon-x11-dev \
-    libwayland-dev \
-    libwayland-egl-backend-dev \
-    desktop-file-utils \
+    libxrender-dev \
+    libzstd-dev \
+    pkg-config \
+    unzip \
+    zlib1g-dev \
     zsync
 
   update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
@@ -266,20 +266,6 @@ prepare_qt() {
   cat config.summary
   cmake --build . --parallel
   cmake --install .
-
-  # install qt6gtk2 for better look
-  if [ ! -d "/usr/src/qt6gtk2/" ]; then
-    qt6gtk2_git_url="https://github.com/trialuser02/qt6gtk2.git"
-    if [ x"${USE_CHINA_MIRROR}" = x1 ]; then
-      qt6gtk2_git_url="https://ghp.ci/${qt6gtk2_git_url}"
-    fi
-    retry git clone --depth 1 --recursive "${qt6gtk2_git_url}" "/usr/src/qt6gtk2/"
-  fi
-  cd "/usr/src/qt6gtk2/"
-  git pull
-  git clean -fdx
-  qmake
-  make -j$(nproc) install
 }
 
 preapare_libboost() {
@@ -370,8 +356,8 @@ build_appimage() {
 
 this_dir="\$(readlink -f "\$(dirname "\$0")")"
 export XDG_DATA_DIRS="\${this_dir}/usr/share:\${XDG_DATA_DIRS}:/usr/share:/usr/local/share"
-export QT_QPA_PLATFORMTHEMES=gtk2
-export QT_STYLE_OVERRIDE=qt6gtk2
+export QT_QPA_PLATFORMTHEME=gtk3
+unset QT_STYLE_OVERRIDE
 
 # Force set openssl config directory to an invalid directory to fallback to use default openssl config.
 # This can avoid some distributions (mainly Fedora) having some strange patches or configurations
@@ -417,18 +403,6 @@ EOF
     wayland-shell-integration
   )
   exclude_libs=(
-    libX11-xcb.so.1
-    libXau.so.6
-    libXcomposite.so.1
-    libXcursor.so.1
-    libXdamage.so.1
-    libXdmcp.so.6
-    libXext.so.6
-    libXfixes.so.3
-    libXi.so.6
-    libXinerama.so.1
-    libXrandr.so.2
-    libXrender.so.1
     libatk-1.0.so.0
     libatk-bridge-2.0.so.0
     libatspi.so.0
@@ -447,8 +421,8 @@ EOF
     libffi.so.6
     libgcrypt.so.20
     libgdk-3.so.0
-    libgdk-x11-2.0.so.0
     libgdk_pixbuf-2.0.so.0
+    libgdk-x11-2.0.so.0
     libgio-2.0.so.0
     libglib-2.0.so.0
     libgmodule-2.0.so.0
@@ -458,6 +432,8 @@ EOF
     libgtk-x11-2.0.so.0
     libkj-0.5.3.so
     libkj-0.6.1.so
+    liblz4.so.1
+    liblzma.so.5
     libmirclient.so.9
     libmircommon.so.7
     libmircore.so.1
@@ -466,8 +442,8 @@ EOF
     libpango-1.0.so.0
     libpangocairo-1.0.so.0
     libpangoft2-1.0.so.0
-    libpcre.so.3
     libpcre2-8.so.0
+    libpcre.so.3
     libpixman-1.so.0
     libprotobuf-lite.so.9
     libselinux.so.1
@@ -477,22 +453,34 @@ EOF
     libwayland-cursor.so.0
     libwayland-egl.so.1
     libwayland-server.so.0
+    libX11-xcb.so.1
+    libXau.so.6
     libxcb-cursor.so.0
     libxcb-glx.so.0
     libxcb-icccm.so.4
     libxcb-image.so.0
     libxcb-keysyms.so.1
     libxcb-randr.so.0
-    libxcb-render-util.so.0
     libxcb-render.so.0
+    libxcb-render-util.so.0
     libxcb-shape.so.0
     libxcb-shm.so.0
     libxcb-sync.so.1
     libxcb-util.so.1
     libxcb-xfixes.so.0
     libxcb-xkb.so.1
-    libxkbcommon-x11.so.0
+    libXcomposite.so.1
+    libXcursor.so.1
+    libXdamage.so.1
+    libXdmcp.so.6
+    libXext.so.6
+    libXfixes.so.3
+    libXinerama.so.1
+    libXi.so.6
     libxkbcommon.so.0
+    libxkbcommon-x11.so.0
+    libXrandr.so.2
+    libXrender.so.1
   )
 
   # fix AppImage output file name, maybe not needed anymore since appimagetool lets you set output file name?

Changelog

@@ -1,3 +1,37 @@
+Sun Nov 17th 2024 - sledgehammer999 <[email protected]> - v5.0.2
+    - BUGFIX: Remove trackers from previous category when moved to new one (glassez)
+    - BUGFIX: Fix `.torrent` file could not be deleted when torrent is canceled (glassez)
+    - BUGFIX: Reset tracker entries when pausing the session (glassez)
+    - BUGFIX: Check real palette darkness to detect "dark theme" (glassez)
+    - BUGFIX: Correctly handle "torrent finished" events (glassez)
+    - BUGFIX: Preserve initial torrent progress while checking resume data (glassez)
+    - BUGFIX: Avoid reapplying Mark-of-the-Web when it already exists (Chocobo1)
+    - BUGFIX: Don't apply Mark-of-the-Web on existing files (Chocobo1)
+    - WEBUI: Add color scheme switcher (sledgehammer999)
+    - SEARCH: Correctly delete the moved search tab (glassez)
+    - WINDOWS: Correctly save and restore Qt style setting (glassez)
+    - WINDOWS: NSIS: update Luxembourgish, Simplified Chinese and Traditional Chinese translations (Ikko Eltociear Ashimine, 3gf8jv4dv)
+
+Mon Oct 28th 2024 - sledgehammer999 <[email protected]> - v5.0.1
+    - FEATURE: Add "Simple pread/pwrite" disk IO type (Hanabishi)
+    - BUGFIX: Don't ignore SSL errors (sledgehammer999)
+    - BUGFIX: Don't try to apply Mark-of-the-Web to nonexistent files (glassez)
+    - BUGFIX: Disable "Move to trash" option by default (glassez)
+    - BUGFIX: Disable the ability to create torrents with a piece size of 256MiB (stalkerok)
+    - BUGFIX: Allow to choose Qt style (glassez)
+    - BUGFIX: Always notify user about duplicate torrent (glassez)
+    - BUGFIX: Correctly handle "torrent finished after move" event (glassez)
+    - BUGFIX: Correctly apply filename filter when `!qB` extension is enabled (glassez)
+    - BUGFIX: Improve color scheme change detection (glassez)
+    - BUGFIX: Fix button state for SSL certificate check (Chocobo1)
+    - WEBUI: Fix CSS that results in hidden torrent list in some browsers (skomerko)
+    - WEBUI: Use proper text color to highlight items in all filter lists (skomerko)
+    - WEBUI: Fix 'rename files' dialog cannot be opened more than once (Chocobo1)
+    - WEBUI: Fix UI of Advanced Settings to show all settings (glassez)
+    - WEBUI: Free resources allocated by web session once it is destructed (dyseg)
+    - SEARCH: Import correct libraries (Chocobo1)
+    - OTHER: Sync flag icons with upstream (xavier2k6)
+
 Sun Sep 29th 2024 - sledgehammer999 <[email protected]> - v5.0.0
     - FEATURE: Support creating .torrent with larger piece size (Chocobo1)
     - FEATURE: Improve tracker entries handling (glassez)

dist/mac/Info.plist

@@ -55,7 +55,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0.0</string>
+	<string>5.0.2</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>

dist/unix/org.qbittorrent.qBittorrent.desktop

@@ -161,8 +161,8 @@ Name[ta]=qBittorrent
 GenericName[te]=క్యు  బిట్ టొరెంట్ క్లయింట్
 Comment[te]=క్యు  బిట్ టొరెంట్ తో ఫైల్స్ దిగుమతి చేసుకోండి , పంచుకోండి
 Name[te]=qBittorrent
-GenericName[th]=โปรแกรมบิททอเร้นท์
-Comment[th]=ดาวน์โหลดและแชร์ไฟล์ผ่าน BitTorrent
+GenericName[th]=โปรแกรมบิตทอร์เรนต์
+Comment[th]=ดาวน์โหลดและแชร์ไฟล์ผ่านบิตทอร์เรนต์
 Name[th]=qBittorrent
 GenericName[tr]=BitTorrent istemcisi
 Comment[tr]=Dosyaları BitTorrent üzerinden indirin ve paylaşın

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.0.0" date="2024-09-29"/>
+    <release version="5.0.2" date="2024-11-17"/>
   </releases>
 </component>

dist/windows/config.nsh

@@ -14,7 +14,7 @@
 ; 4.5.1.3 -> good
 ; 4.5.1.3.2 -> bad
 ; 4.5.0beta -> bad
-!define /ifndef QBT_VERSION "5.0.0.10"
+!define /ifndef QBT_VERSION "5.0.2.10"
 
 ; Option that controls the installer's window name
 ; If set, its value will be used like this:

dist/windows/installer-translations/luxembourgish.nsh

@@ -15,7 +15,7 @@ LangString inst_magnet ${LANG_LUXEMBOURGISH} "Magnet-Linken mat qBittorrent opma
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
 LangString inst_firewall ${LANG_LUXEMBOURGISH} "Reegel an der Windows Firewall dobäisetzen"
 ;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_LUXEMBOURGISH} "D'Windows path lenght (Padlängtbeschränkung) desaktivéieren (260 Zeechen MAX_PATH Beschränkung, erfuerdert min. Windows 10 1607)"
+LangString inst_pathlimit ${LANG_LUXEMBOURGISH} "D'Windows path length (Padlängtbeschränkung) desaktivéieren (260 Zeechen MAX_PATH Beschränkung, erfuerdert min. Windows 10 1607)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_LUXEMBOURGISH} "Reegel an der Windows Firewall dobäisetzen"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."

dist/windows/installer-translations/simpchinese.nsh

@@ -23,13 +23,13 @@ LangString inst_warning ${LANG_SIMPCHINESE} "qBittorrent 正在运行。 安装
 ;LangString inst_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_SIMPCHINESE} "当前版本会被卸载。 用户设置和种子会被完整保留。"
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_SIMPCHINESE} "卸载以前的版本。"
+LangString inst_unist ${LANG_SIMPCHINESE} "正在卸载以前的版本。"
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_SIMPCHINESE} "启动 qBittorrent。"
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_SIMPCHINESE} "此安装程序仅支持 64 位 Windows 系统。"
 ;LangString inst_requires_win10 ${LANG_ENGLISH} "This installer requires at least Windows 10 (1809) / Windows Server 2019."
-LangString inst_requires_win10 ${LANG_SIMPCHINESE}  "This installer requires at least Windows 10 (1809) / Windows Server 2019."
+LangString inst_requires_win10 ${LANG_SIMPCHINESE}  "此安装程序仅支持 Windows 10 (1809) / Windows Server 2019 或更新的系统。"
 ;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
 LangString inst_uninstall_link_description ${LANG_SIMPCHINESE} "卸载 qBittorrent"
 

dist/windows/installer-translations/tradchinese.nsh

@@ -29,7 +29,7 @@ LangString launch_qbt ${LANG_TRADCHINESE} "啟動 qBittorrent"
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_TRADCHINESE} "此安裝程式僅支援 64 位元版本的 Windows。"
 ;LangString inst_requires_win10 ${LANG_ENGLISH} "This installer requires at least Windows 10 (1809) / Windows Server 2019."
-LangString inst_requires_win10 ${LANG_TRADCHINESE}  "This installer requires at least Windows 10 (1809) / Windows Server 2019."
+LangString inst_requires_win10 ${LANG_TRADCHINESE}  "此安裝程式僅支援 Windows 10 (1809) / Windows Server 2019 以上的系統。"
 ;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
 LangString inst_uninstall_link_description ${LANG_TRADCHINESE} "移除 qBittorrent"
 

src/base/addtorrentmanager.cpp

@@ -195,11 +195,9 @@ void AddTorrentManager::setTorrentFileGuard(const QString &source, std::shared_p
     m_guardedTorrentFiles.emplace(source, std::move(torrentFileGuard));
 }
 
-void AddTorrentManager::releaseTorrentFileGuard(const QString &source)
+std::shared_ptr<TorrentFileGuard> AddTorrentManager::releaseTorrentFileGuard(const QString &source)
 {
-    auto torrentFileGuard = m_guardedTorrentFiles.take(source);
-    if (torrentFileGuard)
-        torrentFileGuard->setAutoRemove(false);
+    return m_guardedTorrentFiles.take(source);
 }
 
 bool AddTorrentManager::processTorrent(const QString &source, const BitTorrent::TorrentDescriptor &torrentDescr

src/base/addtorrentmanager.h

@@ -74,7 +74,7 @@ class AddTorrentManager : public ApplicationComponent<QObject>
     void handleAddTorrentFailed(const QString &source, const QString &reason);
     void handleDuplicateTorrent(const QString &source, const BitTorrent::TorrentDescriptor &torrentDescr, BitTorrent::Torrent *existingTorrent);
     void setTorrentFileGuard(const QString &source, std::shared_ptr<TorrentFileGuard> torrentFileGuard);
-    void releaseTorrentFileGuard(const QString &source);
+    std::shared_ptr<TorrentFileGuard> releaseTorrentFileGuard(const QString &source);
 
 private:
     void onDownloadFinished(const Net::DownloadResult &result);