From c887a6f7d87f37b8689c3e7a0a801af52d2fd28e Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 13 Dec 2024 16:21:22 +0800 Subject: [PATCH 1/4] GHA CI: add checks for grid items order Now all items under `QGridLayout` are required to be sorted. This allow us to omit tabstop order. The tabstop order will follow the layout order. The script can be invoked to fix wrong grid items order in .ui files: ```console python check_grid_items_order.py file.ui ``` --- .github/workflows/ci_python.yaml | 4 +- .../pre-commit/check_grid_items_order.py | 93 +++++++++++++++++++ .../pre-commit/check_translation_tag.py | 6 +- .pre-commit-config.yaml | 6 ++ 4 files changed, 105 insertions(+), 4 deletions(-) create mode 100755 .github/workflows/helper/pre-commit/check_grid_items_order.py diff --git a/.github/workflows/ci_python.yaml b/.github/workflows/ci_python.yaml index 268dd1ecf..e3183da5a 100644 --- a/.github/workflows/ci_python.yaml +++ b/.github/workflows/ci_python.yaml @@ -34,7 +34,7 @@ jobs: - name: Lint code (auxiliary scripts) run: | pyflakes $PY_FILES - bandit --skip B314,B405 $PY_FILES + bandit --skip B101,B314,B405 $PY_FILES - name: Format code (auxiliary scripts) run: | @@ -61,7 +61,7 @@ jobs: echo $PY_FILES echo "PY_FILES=$PY_FILES" >> "$GITHUB_ENV" - - name: Check typings (search engine) + - name: Check typings (search engine) run: | MYPYPATH="src/searchengine/nova3" \ mypy \ diff --git a/.github/workflows/helper/pre-commit/check_grid_items_order.py b/.github/workflows/helper/pre-commit/check_grid_items_order.py new file mode 100755 index 000000000..30d6fd057 --- /dev/null +++ b/.github/workflows/helper/pre-commit/check_grid_items_order.py @@ -0,0 +1,93 @@ +#!/usr/bin/env python3 + +# A pre-commit hook for checking items order in grid layouts +# Copyright (C) 2024 Mike Tzou (Chocobo1) +# +# 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. + +from collections.abc import Callable, Sequence +from typing import Optional +import argparse +import re +import xml.etree.ElementTree as ElementTree +import sys + + +def traversePostOrder(root: ElementTree.Element, visitFunc: Callable[[ElementTree.Element], None]) -> None: + stack = [(root, False)] + + while len(stack) > 0: + (element, visit) = stack.pop() + if visit: + visitFunc(element) + else: + stack.append((element, True)) + stack.extend((child, False) for child in reversed(element)) + + +def modifyElement(element: ElementTree.Element) -> None: + def getSortKey(e: ElementTree.Element) -> tuple[int, int]: + if e.tag == 'item': + return (int(e.attrib['row']), int(e.attrib['column'])) + return (-1, -1) # don't care + + if element.tag == 'layout' and element.attrib['class'] == 'QGridLayout' and len(element) > 0: + element[:] = sorted(element, key=getSortKey) + + # workaround_2a: ElementTree will unescape `"` and we need to escape it back + if element.tag == 'string' and element.text is not None: + element.text = element.text.replace('"', '"') + + +def main(argv: Optional[Sequence[str]] = None) -> int: + parser = argparse.ArgumentParser() + parser.add_argument('filenames', nargs='*', help='Filenames to check') + args = parser.parse_args(argv) + + for filename in args.filenames: + with open(filename, 'r+') as f: + orig = f.read() + root = ElementTree.fromstring(orig) + traversePostOrder(root, modifyElement) + ElementTree.indent(root, ' ') + + # workaround_1: cannot use `xml_declaration=True` since it uses single quotes instead of Qt preferred double quotes + ret = f'\n{ElementTree.tostring(root, 'unicode')}\n' + + # workaround_2b: ElementTree will turn `"` into `&quot;`, so revert it back + ret = ret.replace('&quot;', '"') + + # workaround_3: Qt prefers no whitespaces in self-closing tags + ret = re.sub('<(.+) +/>', r'<\1/>', ret) + + if ret != orig: + f.seek(0) + f.write(ret) + f.truncate() + + return 0 + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/.github/workflows/helper/pre-commit/check_translation_tag.py b/.github/workflows/helper/pre-commit/check_translation_tag.py index f3d4457e2..4be80df49 100755 --- a/.github/workflows/helper/pre-commit/check_translation_tag.py +++ b/.github/workflows/helper/pre-commit/check_translation_tag.py @@ -26,9 +26,11 @@ # but you are not obligated to do so. If you do not wish to do so, delete this # exception statement from your version. -from typing import Optional, Sequence +from collections.abc import Sequence +from typing import Optional import argparse import re +import sys def main(argv: Optional[Sequence[str]] = None) -> int: @@ -67,4 +69,4 @@ def main(argv: Optional[Sequence[str]] = None) -> int: if __name__ == '__main__': - exit(main()) + sys.exit(main()) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a4c84ea2d..e0bc4565d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,12 @@ repos: - repo: local hooks: + - id: check-grid-order + name: Check items order in grid layouts + entry: .github/workflows/helper/pre-commit/check_grid_items_order.py + language: script + files: \.ui$ + - id: check-translation-tag name: Check newline characters in tag entry: .github/workflows/helper/pre-commit/check_translation_tag.py From 0a36171999c9edf81f6266ee475c8df4a3af0620 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 14 Dec 2024 02:53:01 +0800 Subject: [PATCH 2/4] Sort grid items properly Supersedes #21856. --- .../pre-commit/check_grid_items_order.py | 2 + src/gui/aboutdialog.ui | 204 ++--- src/gui/addnewtorrentdialog.ui | 98 +- src/gui/banlistoptionsdialog.ui | 6 - src/gui/ipsubnetwhitelistoptionsdialog.ui | 6 - src/gui/optionsdialog.ui | 852 +++++++----------- src/gui/properties/propertieswidget.ui | 584 ++++++------ src/gui/rss/automatedrssdownloader.ui | 64 +- src/gui/statsdialog.ui | 94 +- src/gui/torrentcategorydialog.ui | 6 - src/gui/torrentcreatordialog.ui | 45 +- src/gui/torrentoptionsdialog.ui | 97 +- src/gui/torrentsharelimitswidget.ui | 161 ++-- 13 files changed, 973 insertions(+), 1246 deletions(-) diff --git a/.github/workflows/helper/pre-commit/check_grid_items_order.py b/.github/workflows/helper/pre-commit/check_grid_items_order.py index 30d6fd057..0ab3d6715 100755 --- a/.github/workflows/helper/pre-commit/check_grid_items_order.py +++ b/.github/workflows/helper/pre-commit/check_grid_items_order.py @@ -82,6 +82,8 @@ def main(argv: Optional[Sequence[str]] = None) -> int: ret = re.sub('<(.+) +/>', r'<\1/>', ret) if ret != orig: + print(f'Tip: run this script to apply the fix: `python {__file__} {filename}`', file=sys.stderr) + f.seek(0) f.write(ret) f.truncate() diff --git a/src/gui/aboutdialog.ui b/src/gui/aboutdialog.ui index a0efa8f49..67d583ba3 100644 --- a/src/gui/aboutdialog.ui +++ b/src/gui/aboutdialog.ui @@ -90,6 +90,27 @@ Current maintainer + + + + Name: + + + + + + + Sledgehammer999 + + + + + + + Nationality: + + + @@ -97,6 +118,13 @@ + + + + E-mail: + + + @@ -110,34 +138,6 @@ - - - - Nationality: - - - - - - - E-mail: - - - - - - - Name: - - - - - - - Sledgehammer999 - - - @@ -160,10 +160,10 @@ Original author - - + + - France + Name: @@ -174,6 +174,27 @@ + + + + Nationality: + + + + + + + France + + + + + + + E-mail: + + + @@ -187,27 +208,6 @@ - - - - Name: - - - - - - - E-mail: - - - - - - - Nationality: - - - @@ -365,8 +365,54 @@ - - + + + + Qt: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + Qt::Orientation::Horizontal + + + + 0 + 0 + + + + + + + + Libtorrent: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse @@ -385,32 +431,6 @@ - - - - Qt: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - Libtorrent: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - @@ -424,33 +444,13 @@ - - + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - Qt::Orientation::Horizontal - - - - 0 - 0 - - - - diff --git a/src/gui/addnewtorrentdialog.ui b/src/gui/addnewtorrentdialog.ui index 33711e2c9..71c3b1410 100644 --- a/src/gui/addnewtorrentdialog.ui +++ b/src/gui/addnewtorrentdialog.ui @@ -378,6 +378,26 @@ Torrent information + + + + Size: + + + + + + + + + + Date: + + + + + + @@ -385,11 +405,36 @@ - - + + + + Qt::TextInteractionFlag::TextSelectableByMouse + + - - + + + + Info hash v2: + + + + + + + Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + Comment: + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + @@ -447,51 +492,6 @@ - - - - Comment: - - - Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop - - - - - - - Size: - - - - - - - Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - Date: - - - - - - - Info hash v2: - - - - - - - Qt::TextInteractionFlag::TextSelectableByMouse - - - diff --git a/src/gui/banlistoptionsdialog.ui b/src/gui/banlistoptionsdialog.ui index 33d91fe4d..51abbf6dd 100644 --- a/src/gui/banlistoptionsdialog.ui +++ b/src/gui/banlistoptionsdialog.ui @@ -102,12 +102,6 @@ - - bannedIPList - txtIP - buttonBanIP - buttonDeleteIP - diff --git a/src/gui/ipsubnetwhitelistoptionsdialog.ui b/src/gui/ipsubnetwhitelistoptionsdialog.ui index 1452eaea0..962055d36 100644 --- a/src/gui/ipsubnetwhitelistoptionsdialog.ui +++ b/src/gui/ipsubnetwhitelistoptionsdialog.ui @@ -86,12 +86,6 @@ - - whitelistedIPSubnetList - txtIPSubnet - buttonWhitelistIPSubnet - buttonDeleteIPSubnet - diff --git a/src/gui/optionsdialog.ui b/src/gui/optionsdialog.ui index 91bac21fc..7b35d6052 100644 --- a/src/gui/optionsdialog.ui +++ b/src/gui/optionsdialog.ui @@ -361,6 +361,19 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -397,19 +410,6 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -1518,8 +1518,18 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. - - + + + + Sender + + + From: + + + + + @@ -1531,6 +1541,9 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. + + + @@ -1541,19 +1554,6 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. - - - - - - - Sender - - - From: - - - @@ -1824,26 +1824,6 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'.Connections Limits - - - - 500 - - - 4 - - - - - - - Maximum number of connections per torrent: - - - true - - - @@ -1870,6 +1850,29 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Maximum number of connections per torrent: + + + true + + + @@ -1883,13 +1886,6 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. - - - - Maximum number of upload slots per torrent: - - - @@ -1907,18 +1903,22 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. - - - - Qt::Orientation::Horizontal + + + + Maximum number of upload slots per torrent: - - - 40 - 20 - + + + + + + 500 - + + 4 + + @@ -1985,7 +1985,7 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. - <html><head/><body><p>If &quot;mixed mode&quot; is enabled I2P torrents are allowed to also get peers from other sources than the tracker, and connect to regular IPs, not providing any anonymization. This may be useful if the user is not interested in the anonymization of I2P, but still wants to be able to connect to I2P peers.</p></body></html> + <html><head/><body><p>If "mixed mode" is enabled I2P torrents are allowed to also get peers from other sources than the tracker, and connect to regular IPs, not providing any anonymization. This may be useful if the user is not interested in the anonymization of I2P, but still wants to be able to connect to I2P peers.</p></body></html> Mixed mode @@ -2294,6 +2294,16 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'.Global Rate Limits + + + + + + + Upload: + + + @@ -2313,6 +2323,26 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Download: + + + @@ -2332,36 +2362,6 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - Upload: - - - - - - - Download: - - - @@ -2371,143 +2371,14 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'.Alternative Rate Limits - - - - ∞ - - - KiB/s - - - 2000000 - - - QAbstractSpinBox::StepType::AdaptiveDecimalStepType - - - 10 - - - - - - - Schedule &the use of alternative rate limits + + + + Upload: - - true - - - false - - - - - - Start time - - - From: - - - - - - - true - - - hh:mm - - - - - - - - - - End time - - - To: - - - - - - - true - - - hh:mm - - - false - - - - - - - - - - When: - - - - - - - - 0 - 0 - - - - - Every day - - - - - Weekdays - - - - - Weekends - - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - @@ -2542,13 +2413,6 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. - - - - Upload: - - - @@ -2556,6 +2420,142 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. + + + + ∞ + + + KiB/s + + + 2000000 + + + QAbstractSpinBox::StepType::AdaptiveDecimalStepType + + + 10 + + + + + + + Schedule &the use of alternative rate limits + + + true + + + false + + + + + + Start time + + + From: + + + + + + + true + + + hh:mm + + + false + + + + + + + + + + End time + + + To: + + + + + + + true + + + hh:mm + + + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + When: + + + + + + + + 0 + 0 + + + + + Every day + + + + + Weekdays + + + + + Weekends + + + + + + + @@ -2839,6 +2839,19 @@ Disable encryption: Only connect to peers without protocol encryption + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -2879,19 +2892,6 @@ Disable encryption: Only connect to peers without protocol encryption - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -2904,6 +2904,13 @@ Disable encryption: Only connect to peers without protocol encryption false + + + + Download rate threshold: + + + @@ -2920,6 +2927,26 @@ Disable encryption: Only connect to peers without protocol encryption + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Upload rate threshold: + + + @@ -2936,33 +2963,13 @@ Disable encryption: Only connect to peers without protocol encryption - - + + - Upload rate threshold: + Torrent inactivity timer: - - - - Download rate threshold: - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -2979,13 +2986,6 @@ Disable encryption: Only connect to peers without protocol encryption - - - - Torrent inactivity timer: - - - @@ -3208,26 +3208,6 @@ Disable encryption: Only connect to peers without protocol encryption - - - - sec - - - 2147483646 - - - 2 - - - - - - - Same host request delay: - - - @@ -3257,13 +3237,23 @@ Disable encryption: Only connect to peers without protocol encryption - - + + + + Same host request delay: + + + + + + + sec + 2147483646 - 100 + 2 @@ -3274,6 +3264,16 @@ Disable encryption: Only connect to peers without protocol encryption + + + + 2147483646 + + + 100 + + + @@ -3462,12 +3462,8 @@ Specify an IPv4 or IPv6 address. You can specify "0.0.0.0" for any IPv false - - - - Key: - - + + @@ -3476,12 +3472,22 @@ Specify an IPv4 or IPv6 address. You can specify "0.0.0.0" for any IPv - - + + + + + + Key: + + + + + + @@ -3492,12 +3498,6 @@ Specify an IPv4 or IPv6 address. You can specify "0.0.0.0" for any IPv - - - - - - @@ -3574,6 +3574,16 @@ Specify an IPv4 or IPv6 address. You can specify "0.0.0.0" for any IPv + + + + Never + + + 2147483647 + + + @@ -3587,16 +3597,6 @@ Specify an IPv4 or IPv6 address. You can specify "0.0.0.0" for any IPv - - - - Never - - - 2147483647 - - - @@ -3967,206 +3967,6 @@ Use ';' to split multiple entries. Can use wildcard '*'. 1 - - tabOption - tabSelection - comboLanguage - comboStyle - comboColorScheme - checkUseCustomTheme - customThemeFilePath - checkUseSystemIcon - buttonCustomizeUITheme - confirmDeletion - checkAltRowColors - checkHideZero - comboHideZero - actionTorrentDlOnDblClBox - actionTorrentFnOnDblClBox - checkBoxHideZeroStatusFilters - checkStartup - checkShowSplash - windowStateComboBox - checkProgramExitConfirm - checkProgramAutoExitConfirm - checkShowSystray - checkMinimizeToSysTray - checkCloseToSystray - comboTrayIcon - checkAssociateTorrents - checkAssociateMagnetLinks - checkProgramUpdates - checkPreventFromSuspendWhenDownloading - checkPreventFromSuspendWhenSeeding - checkFileLog - textFileLogPath - checkFileLogBackup - spinFileLogSize - checkFileLogDelete - spinFileLogAge - comboFileLogAgeType - checkBoxPerformanceWarning - scrollArea - checkAdditionDialog - checkAdditionDialogFront - contentLayoutComboBox - checkAddToQueueTop - checkAddStopped - stopConditionComboBox - checkMergeTrackers - checkConfirmMergeTrackers - deleteTorrentBox - deleteCancelledTorrentBox - checkPreallocateAll - checkAppendqB - checkUnwantedFolder - checkRecursiveDownload - comboSavingMode - comboTorrentCategoryChanged - comboCategoryDefaultPathChanged - comboCategoryChanged - checkUseSubcategories - checkUseCategoryPaths - textSavePath - checkUseDownloadPath - textDownloadPath - checkExportDir - textExportDir - checkExportDirFin - textExportDirFin - scanFoldersView - addWatchedFolderButton - editWatchedFolderButton - removeWatchedFolderButton - groupExcludedFileNames - textExcludedFileNames - groupMailNotification - senderEmailTxt - lineEditDestEmail - lineEditSmtpServer - checkSmtpSSL - groupMailNotifAuth - mailNotifUsername - mailNotifPassword - sendTestEmail - groupBoxRunOnAdded - lineEditRunOnAdded - groupBoxRunOnFinished - lineEditRunOnFinished - autoRunConsole - scrollArea_2 - comboProtocol - spinPort - randomButton - checkUPnP - checkMaxConnections - spinMaxConnec - checkMaxConnectionsPerTorrent - spinMaxConnecPerTorrent - checkMaxUploads - spinMaxUploads - checkMaxUploadsPerTorrent - spinMaxUploadsPerTorrent - groupI2P - textI2PHost - spinI2PPort - checkI2PMixed - comboProxyType - textProxyIP - spinProxyPort - checkProxyHostnameLookup - checkProxyAuth - textProxyUsername - textProxyPassword - checkProxyBitTorrent - checkProxyPeerConnections - checkProxyRSS - checkProxyMisc - checkIPFilter - textFilterPath - IpFilterRefreshBtn - banListButton - checkIpFilterTrackers - scrollArea_3 - spinUploadLimit - spinDownloadLimit - spinUploadLimitAlt - spinDownloadLimitAlt - groupBoxSchedule - timeEditScheduleFrom - timeEditScheduleTo - comboBoxScheduleDays - checkLimituTPConnections - checkLimitTransportOverhead - checkLimitLocalPeerRate - scrollArea_9 - checkDHT - checkPeX - checkLSD - comboEncryption - checkAnonymousMode - spinBoxMaxActiveCheckingTorrents - checkEnableQueueing - spinMaxActiveDownloads - spinMaxActiveUploads - spinMaxActiveTorrents - checkIgnoreSlowTorrentsForQueueing - spinDownloadRateForSlowTorrents - spinUploadRateForSlowTorrents - spinSlowTorrentsInactivityTimer - checkMaxRatio - spinMaxRatio - checkMaxSeedingMinutes - spinMaxSeedingMinutes - checkMaxInactiveSeedingMinutes - spinMaxInactiveSeedingMinutes - comboRatioLimitAct - checkEnableAddTrackers - textTrackers - scrollArea_4 - checkRSSEnable - spinRSSRefreshInterval - spinRSSFetchDelay - spinRSSMaxArticlesPerFeed - checkRSSAutoDownloaderEnable - btnEditRules - checkSmartFilterDownloadRepacks - textSmartEpisodeFilters - scrollArea_5 - checkWebUI - textWebUIAddress - spinWebUIPort - checkWebUIUPnP - checkWebUIHttps - textWebUIHttpsCert - textWebUIHttpsKey - textWebUIUsername - textWebUIPassword - checkBypassLocalAuth - checkBypassAuthSubnetWhitelist - IPSubnetWhitelistButton - spinBanCounter - spinBanDuration - spinSessionTimeout - groupAltWebUI - textWebUIRootFolder - checkClickjacking - checkCSRFProtection - checkSecureCookie - groupHostHeaderValidation - textServerDomains - groupWebUIAddCustomHTTPHeaders - textWebUICustomHTTPHeaders - groupEnableReverseProxySupport - textTrustedReverseProxiesList - checkDynDNS - comboDNSService - registerDNSBtn - domainNameTxt - DNSUsernameTxt - DNSPasswordTxt - scrollArea_7 - diff --git a/src/gui/properties/propertieswidget.ui b/src/gui/properties/propertieswidget.ui index 564a88c82..dd21f6fef 100644 --- a/src/gui/properties/propertieswidget.ui +++ b/src/gui/properties/propertieswidget.ui @@ -85,6 +85,13 @@ + + + + Qt::TextFormat::PlainText + + + @@ -114,6 +121,13 @@ + + + + Qt::TextFormat::PlainText + + + @@ -127,20 +141,6 @@ - - - - Qt::TextFormat::PlainText - - - - - - - Qt::TextFormat::PlainText - - - @@ -163,6 +163,196 @@ 4 + + + + + 0 + 0 + + + + Time Active: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + 0 + 0 + + + + Qt::TextFormat::PlainText + + + + + + + + 0 + 0 + + + + ETA: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + 0 + 0 + + + + Qt::TextFormat::PlainText + + + + + + + + 0 + 0 + + + + Connections: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + 0 + 0 + + + + Qt::TextFormat::PlainText + + + + + + + + 0 + 0 + + + + Downloaded: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + 0 + 0 + + + + Qt::TextFormat::PlainText + + + + + + + + 0 + 0 + + + + Uploaded: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + 0 + 0 + + + + Qt::TextFormat::PlainText + + + + + + + + 0 + 0 + + + + Seeds: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + 0 + 0 + + + + Qt::TextFormat::PlainText + + + + + + + + 0 + 0 + + + + Download Speed: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + @@ -221,37 +411,8 @@ - - - - - 0 - 0 - - - - Connections: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - 0 - 0 - - - - Qt::TextFormat::PlainText - - - - - + + 0 @@ -279,43 +440,8 @@ - - - - - 0 - 0 - - - - Share Ratio: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - 0 - 0 - - - - Ratio / Time Active (in months), indicates how popular the torrent is - - - Popularity: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - + + 0 @@ -327,35 +453,6 @@ - - - - - 0 - 0 - - - - Qt::TextFormat::PlainText - - - - - - - - 0 - 0 - - - - Downloaded: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - @@ -372,24 +469,8 @@ - - - - - 0 - 0 - - - - Last Seen Complete: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - + + 0 @@ -401,8 +482,53 @@ - - + + + + + 0 + 0 + + + + Wasted: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + 0 + 0 + + + + Qt::TextFormat::PlainText + + + + + + + + 0 + 0 + + + + Share Ratio: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + 0 @@ -430,6 +556,35 @@ + + + + + 0 + 0 + + + + Qt::TextFormat::PlainText + + + + + + + + 0 + 0 + + + + Last Seen Complete: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + @@ -443,77 +598,25 @@ - - + + 0 0 + + Ratio / Time Active (in months), indicates how popular the torrent is + - Seeds: + Popularity: Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - 0 - 0 - - - - Download Speed: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - 0 - 0 - - - - Qt::TextFormat::PlainText - - - - - - - - 0 - 0 - - - - Qt::TextFormat::PlainText - - - - - - - - 0 - 0 - - - - Qt::TextFormat::PlainText - - - @@ -530,109 +633,6 @@ - - - - - 0 - 0 - - - - Uploaded: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - 0 - 0 - - - - Qt::TextFormat::PlainText - - - - - - - - 0 - 0 - - - - Qt::TextFormat::PlainText - - - - - - - - 0 - 0 - - - - Time Active: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - 0 - 0 - - - - Qt::TextFormat::PlainText - - - - - - - - 0 - 0 - - - - ETA: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - 0 - 0 - - - - Wasted: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - diff --git a/src/gui/rss/automatedrssdownloader.ui b/src/gui/rss/automatedrssdownloader.ui index 72bad112f..ad54a0eb0 100644 --- a/src/gui/rss/automatedrssdownloader.ui +++ b/src/gui/rss/automatedrssdownloader.ui @@ -182,22 +182,11 @@ - - - - Must Not Contain: - - + + - - - - Episode Filter: - - - - - + + 18 @@ -206,6 +195,16 @@ + + + + Must Not Contain: + + + + + + @@ -216,11 +215,18 @@ - - + + + + Episode Filter: + + - - + + + + + 18 @@ -239,12 +245,6 @@ - - - - - - @@ -427,20 +427,6 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also - - renameRuleBtn - removeRuleBtn - addRuleBtn - ruleList - lineContains - lineNotContains - lineEFilter - spinIgnorePeriod - listFeeds - matchingArticlesTree - importBtn - exportBtn - diff --git a/src/gui/statsdialog.ui b/src/gui/statsdialog.ui index 444843a2c..acb2767cc 100644 --- a/src/gui/statsdialog.ui +++ b/src/gui/statsdialog.ui @@ -20,29 +20,15 @@ User statistics - - + + - TextLabel + All-time upload: - - - - Connected peers: - - - - - - - All-time share ratio: - - - - - + + TextLabel @@ -62,6 +48,13 @@ + + + + All-time share ratio: + + + @@ -76,15 +69,22 @@ - - + + - All-time upload: + TextLabel - - + + + + Connected peers: + + + + + TextLabel @@ -113,13 +113,6 @@ - - - - TextLabel - - - @@ -127,6 +120,13 @@ + + + + TextLabel + + + @@ -136,17 +136,10 @@ Performance statistics - - + + - TextLabel - - - - - - - TextLabel + Write cache overload: @@ -157,6 +150,13 @@ + + + + Read cache overload: + + + @@ -171,10 +171,10 @@ - - + + - Write cache overload: + TextLabel @@ -185,10 +185,10 @@ - - + + - Read cache overload: + TextLabel diff --git a/src/gui/torrentcategorydialog.ui b/src/gui/torrentcategorydialog.ui index 3191232a7..804af09dd 100644 --- a/src/gui/torrentcategorydialog.ui +++ b/src/gui/torrentcategorydialog.ui @@ -173,12 +173,6 @@ 1 - - textCategoryName - comboSavePath - comboUseDownloadPath - comboDownloadPath - diff --git a/src/gui/torrentcreatordialog.ui b/src/gui/torrentcreatordialog.ui index 3a7d47bee..f4a5bf65e 100644 --- a/src/gui/torrentcreatordialog.ui +++ b/src/gui/torrentcreatordialog.ui @@ -313,6 +313,13 @@ Fields + + + + Tracker URLs: + + + @@ -337,20 +344,6 @@ - - - - false - - - - - - - Tracker URLs: - - - @@ -358,6 +351,13 @@ + + + + false + + + @@ -413,23 +413,6 @@ 1 - - textInputPath - addFileButton - addFolderButton - comboTorrentFormat - comboPieceSize - buttonCalcTotalPieces - checkPrivate - checkStartSeeding - checkIgnoreShareLimits - checkOptimizeAlignment - spinPaddedFileSizeLimit - trackersList - URLSeedsList - txtComment - lineEditSource - diff --git a/src/gui/torrentoptionsdialog.ui b/src/gui/torrentoptionsdialog.ui index 835dcc6b8..9fcb65d52 100644 --- a/src/gui/torrentoptionsdialog.ui +++ b/src/gui/torrentoptionsdialog.ui @@ -52,6 +52,13 @@ + + + + Category: + + + @@ -71,13 +78,6 @@ - - - - Category: - - - @@ -86,26 +86,17 @@ Torrent Speed Limits - - + + - Download: + Upload: - - - - ∞ - - - KiB/s - - - 2000000 - - - QAbstractSpinBox::StepType::AdaptiveDecimalStepType + + + + Qt::Orientation::Horizontal @@ -125,24 +116,10 @@ - - + + - These will not exceed the global limits - - - - - - - Upload: - - - - - - - Qt::Orientation::Horizontal + Download: @@ -153,6 +130,29 @@ + + + + ∞ + + + KiB/s + + + 2000000 + + + QAbstractSpinBox::StepType::AdaptiveDecimalStepType + + + + + + + These will not exceed the global limits + + + @@ -256,23 +256,6 @@ 1 - - checkAutoTMM - savePath - checkUseDownloadPath - downloadPath - comboCategory - sliderUploadLimit - spinUploadLimit - sliderDownloadLimit - spinDownloadLimit - torrentShareLimitsBox - checkDisableDHT - checkSequential - checkDisablePEX - checkFirstLastPieces - checkDisableLSD - diff --git a/src/gui/torrentsharelimitswidget.ui b/src/gui/torrentsharelimitswidget.ui index a532b0364..9ada9ed67 100644 --- a/src/gui/torrentsharelimitswidget.ui +++ b/src/gui/torrentsharelimitswidget.ui @@ -13,8 +13,60 @@ - - + + + + Ratio: + + + + + + + -1 + + + + Default + + + + + Unlimited + + + + + Set to + + + + + + + + false + + + 9998.000000000000000 + + + 0.050000000000000 + + + 1.000000000000000 + + + + + + + Seeding time: + + + + + -1 @@ -51,13 +103,6 @@ - - - - Ratio: - - - @@ -65,6 +110,28 @@ + + + + -1 + + + + Default + + + + + Unlimited + + + + + Set to + + + + @@ -81,73 +148,6 @@ - - - - false - - - 9998.000000000000000 - - - 0.050000000000000 - - - 1.000000000000000 - - - - - - - -1 - - - - Default - - - - - Unlimited - - - - - Set to - - - - - - - - -1 - - - - Default - - - - - Unlimited - - - - - Set to - - - - - - - - Seeding time: - - - @@ -208,15 +208,6 @@ - - comboBoxRatioMode - spinBoxRatioValue - comboBoxSeedingTimeMode - spinBoxSeedingTimeValue - comboBoxInactiveSeedingTimeMode - spinBoxInactiveSeedingTimeValue - comboBoxAction - From 85c4ddf6167f5f5d810fa73a14a76ab077a074c7 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 14 Dec 2024 22:36:05 +0800 Subject: [PATCH 3/4] Make links accessible by keyboard --- src/gui/aboutdialog.ui | 3 +++ src/gui/addnewtorrentdialog.ui | 2 +- src/gui/optionsdialog.ui | 17 ++++++++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/gui/aboutdialog.ui b/src/gui/aboutdialog.ui index 67d583ba3..68e2bf43b 100644 --- a/src/gui/aboutdialog.ui +++ b/src/gui/aboutdialog.ui @@ -75,6 +75,9 @@ true + + Qt::TextInteractionFlag::LinksAccessibleByKeyboard|Qt::TextInteractionFlag::LinksAccessibleByMouse + diff --git a/src/gui/addnewtorrentdialog.ui b/src/gui/addnewtorrentdialog.ui index 71c3b1410..7e17af2d6 100644 --- a/src/gui/addnewtorrentdialog.ui +++ b/src/gui/addnewtorrentdialog.ui @@ -484,7 +484,7 @@ true - Qt::TextInteractionFlag::TextBrowserInteraction + Qt::TextInteractionFlag::TextSelectableByKeyboard|Qt::TextInteractionFlag::TextSelectableByMouse diff --git a/src/gui/optionsdialog.ui b/src/gui/optionsdialog.ui index 7b35d6052..eb2e61811 100644 --- a/src/gui/optionsdialog.ui +++ b/src/gui/optionsdialog.ui @@ -2750,6 +2750,9 @@ Disable encryption: Only connect to peers without protocol encryption true + + Qt::TextInteractionFlag::LinksAccessibleByKeyboard|Qt::TextInteractionFlag::LinksAccessibleByMouse + @@ -3496,6 +3499,9 @@ Specify an IPv4 or IPv6 address. You can specify "0.0.0.0" for any IPv true + + Qt::TextInteractionFlag::LinksAccessibleByKeyboard|Qt::TextInteractionFlag::LinksAccessibleByMouse + @@ -3696,6 +3702,9 @@ Specify an IPv4 or IPv6 address. You can specify "0.0.0.0" for any IPv true + + Qt::TextInteractionFlag::LinksAccessibleByKeyboard|Qt::TextInteractionFlag::LinksAccessibleByMouse + @@ -3817,7 +3826,13 @@ Use ';' to split multiple entries. Can use wildcard '*'. - <html><head/><body><p><a href="https://github.com/qbittorrent/qBittorrent/wiki#reverse-proxy-setup-for-webui-access"><span style=" text-decoration: underline; color:#0000ff;">Reverse proxy setup examples</span></a></p></body></html> + <a href=https://github.com/qbittorrent/qBittorrent/wiki#reverse-proxy-setup-for-webui-access>Reverse proxy setup examples</a> + + + true + + + Qt::TextInteractionFlag::LinksAccessibleByKeyboard|Qt::TextInteractionFlag::LinksAccessibleByMouse From 7886ca65f9e455ad07e0ba66c2a8e4df52766623 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 15 Dec 2024 00:33:27 +0800 Subject: [PATCH 4/4] Make tab key switch focus These fields do not expect tab characters. --- src/gui/optionsdialog.ui | 18 ++++++++++++++++-- src/gui/properties/peersadditiondialog.ui | 3 +++ src/gui/torrentcreatordialog.ui | 9 +++++++++ src/gui/trackersadditiondialog.ui | 3 +++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/gui/optionsdialog.ui b/src/gui/optionsdialog.ui index eb2e61811..80b5eff8c 100644 --- a/src/gui/optionsdialog.ui +++ b/src/gui/optionsdialog.ui @@ -1496,6 +1496,9 @@ readme.txt: filter exact file name. ?.txt: filter 'a.txt', 'b.txt' but not 'aa.txt'. readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. + + true + QPlainTextEdit::LineWrapMode::NoWrap @@ -3136,7 +3139,11 @@ Disable encryption: Only connect to peers without protocol encryption - + + + true + + @@ -3326,7 +3333,11 @@ Disable encryption: Only connect to peers without protocol encryption - + + + true + + @@ -3785,6 +3796,9 @@ Use ';' to split multiple entries. Can use wildcard '*'. + + true + QPlainTextEdit::LineWrapMode::NoWrap diff --git a/src/gui/properties/peersadditiondialog.ui b/src/gui/properties/peersadditiondialog.ui index ed9641be6..fcc39159a 100644 --- a/src/gui/properties/peersadditiondialog.ui +++ b/src/gui/properties/peersadditiondialog.ui @@ -23,6 +23,9 @@ + + true + QTextEdit::LineWrapMode::NoWrap diff --git a/src/gui/torrentcreatordialog.ui b/src/gui/torrentcreatordialog.ui index f4a5bf65e..6a3eb33be 100644 --- a/src/gui/torrentcreatordialog.ui +++ b/src/gui/torrentcreatordialog.ui @@ -325,6 +325,9 @@ You can separate tracker tiers / groups with an empty line. + + true + false @@ -339,6 +342,9 @@ + + true + false @@ -353,6 +359,9 @@ + + true + false diff --git a/src/gui/trackersadditiondialog.ui b/src/gui/trackersadditiondialog.ui index 7776016e6..75c574459 100644 --- a/src/gui/trackersadditiondialog.ui +++ b/src/gui/trackersadditiondialog.ui @@ -23,6 +23,9 @@ + + true + QTextEdit::LineWrapMode::NoWrap