d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #10690 from Chocobo1/rtl 

Various visual tweaks
adaptive-webui-19844
Mike Tzou 6 years ago committed by GitHub
parent
4df1bca8bb ccbb4576b6
commit
c5430030e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 129 additions and 229 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/gui/lineedit/src/lineedit.cpp
  2. 352
      src/gui/optionsdialog.ui

6
src/gui/lineedit/src/lineedit.cpp
Unescape View File

@ -11,6 +11,7 @@
#include <algorithm> #include <algorithm>
#include <QGuiApplication>
#include <QResizeEvent> #include <QResizeEvent>
#include <QStyle> #include <QStyle>
#include <QToolButton> #include <QToolButton>
@ -38,7 +39,10 @@ LineEdit::LineEdit(QWidget *parent)
void LineEdit::resizeEvent(QResizeEvent *e) void LineEdit::resizeEvent(QResizeEvent *e)
{ {
const int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth); const int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
m_searchButton->move(frameWidth, (e->size().height() - m_searchButton->sizeHint().height()) / 2); const int xPos = QGuiApplication::isLeftToRight()
? frameWidth
: (e->size().width() - m_searchButton->sizeHint().width() - frameWidth);
m_searchButton->move(xPos, (e->size().height() - m_searchButton->sizeHint().height()) / 2);
} }
void LineEdit::keyPressEvent(QKeyEvent *event) void LineEdit::keyPressEvent(QKeyEvent *event)

352
src/gui/optionsdialog.ui
Unescape View File

@ -257,19 +257,10 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_7"> <widget class="QGroupBox" name="groupBox_7">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="title"> <property name="title">
<string>Action on double-click</string> <string>Action on double-click</string>
</property> </property>
<property name="flat"> <layout class="QGridLayout" name="gridLayout_14">
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="lblDlList_2"> <widget class="QLabel" name="lblDlList_2">
<property name="text"> <property name="text">
@ -279,12 +270,6 @@
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="actionTorrentDlOnDblClBox"> <widget class="QComboBox" name="actionTorrentDlOnDblClBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
@ -331,6 +316,19 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="0" column="2">
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -414,15 +412,15 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QFormLayout" name="formLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item row="0" column="0"> <item>
<widget class="QLabel" name="labelTrayIconStyle"> <widget class="QLabel" name="labelTrayIconStyle">
<property name="text"> <property name="text">
<string>Tray icon style:</string> <string>Tray icon style:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item>
<widget class="QComboBox" name="comboTrayIcon"> <widget class="QComboBox" name="comboTrayIcon">
<item> <item>
<property name="text"> <property name="text">
@ -441,6 +439,19 @@
</item> </item>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -1278,12 +1289,6 @@
<layout class="QHBoxLayout" name="horizontalLayout_12"> <layout class="QHBoxLayout" name="horizontalLayout_12">
<item> <item>
<widget class="QLabel" name="label_24"> <widget class="QLabel" name="label_24">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Enabled protocol:</string> <string>Enabled protocol:</string>
</property> </property>
@ -1308,6 +1313,19 @@
</item> </item>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_23">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -2335,19 +2353,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2"> <item row="0" column="2">
<spacer name="horizontalSpacer_7"> <spacer name="horizontalSpacer_7">
<property name="orientation"> <property name="orientation">
@ -2361,19 +2366,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="2">
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" colspan="3"> <item row="3" column="0" colspan="3">
<widget class="QGroupBox" name="checkIgnoreSlowTorrentsForQueueing"> <widget class="QGroupBox" name="checkIgnoreSlowTorrentsForQueueing">
<property name="title"> <property name="title">
@ -2386,19 +2378,6 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_13"> <layout class="QGridLayout" name="gridLayout_13">
<item row="2" column="2">
<spacer name="horizontalSpacer_21">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSpinBox" name="spinDownloadRateForSlowTorrents"> <widget class="QSpinBox" name="spinDownloadRateForSlowTorrents">
<property name="suffix"> <property name="suffix">
@ -2452,19 +2431,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="2">
<spacer name="horizontalSpacer_15">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="spinSlowTorrentsInactivityTimer"> <widget class="QSpinBox" name="spinSlowTorrentsInactivityTimer">
<property name="suffix"> <property name="suffix">
@ -2500,76 +2466,7 @@
<string>Share Ratio Limiting</string> <string>Share Ratio Limiting</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_91"> <layout class="QGridLayout" name="gridLayout_91">
<item row="0" column="0" rowspan="3" colspan="3"> <item row="2" column="1">
<widget class="QCheckBox" name="checkMaxRatio">
<property name="text">
<string>Seed torrents until their ratio reaches</string>
</property>
</widget>
</item>
<item row="1" column="6" rowspan="2">
<spacer name="horizontalSpacer_161">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>109</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="2">
<widget class="QLabel" name="label">
<property name="text">
<string>then</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="6">
<spacer name="horizontalSpacer_20">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>121</width>
<height>28</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="1">
<spacer name="horizontalSpacer_171">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>100</width>
<height>42</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="6">
<spacer name="horizontalSpacer_191">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="4">
<widget class="QSpinBox" name="spinMaxSeedingMinutes"> <widget class="QSpinBox" name="spinMaxSeedingMinutes">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -2588,36 +2485,24 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="4"> <item row="2" column="0">
<widget class="QDoubleSpinBox" name="spinMaxRatio"> <widget class="QCheckBox" name="checkMaxSeedingMinutes">
<property name="enabled"> <property name="text">
<bool>false</bool> <string>Seed torrents until their seeding time reaches</string>
</property>
<property name="alignment">
<set>Qt::AlignHCenter</set>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9998.000000000000000</double>
</property>
<property name="singleStep">
<double>0.050000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="4"> <item row="3" column="0">
<widget class="QCheckBox" name="checkMaxSeedingMinutes"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Seed torrents until their seeding time reaches</string> <string>then</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="4"> <item row="3" column="1">
<widget class="QComboBox" name="comboRatioLimitAct"> <widget class="QComboBox" name="comboRatioLimitAct">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -2634,17 +2519,50 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkMaxRatio">
<property name="text">
<string>Seed torrents until their ratio reaches</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="spinMaxRatio">
<property name="enabled">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignHCenter</set>
</property>
<property name="maximum">
<double>9998.000000000000000</double>
</property>
<property name="singleStep">
<double>0.050000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="checkEnableAddTrackers"> <widget class="QGroupBox" name="checkEnableAddTrackers">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title"> <property name="title">
<string>A&amp;utomatically add these trackers to new downloads:</string> <string>A&amp;utomatically add these trackers to new downloads:</string>
</property> </property>
@ -2736,8 +2654,15 @@
<property name="text"> <property name="text">
<string>Feeds refresh interval:</string> <string>Feeds refresh interval:</string>
</property> </property>
<property name="alignment"> </widget>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </item>
<item row="1" column="1">
<widget class="QSpinBox" name="spinRSSMaxArticlesPerFeed">
<property name="maximum">
<number>9999</number>
</property>
<property name="value">
<number>100</number>
</property> </property>
</widget> </widget>
</item> </item>
@ -2746,9 +2671,6 @@
<property name="text"> <property name="text">
<string>Maximum number of articles per feed:</string> <string>Maximum number of articles per feed:</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
@ -2767,17 +2689,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="2">
<widget class="QSpinBox" name="spinRSSMaxArticlesPerFeed">
<property name="maximum">
<number>9999</number>
</property>
<property name="value">
<number>100</number>
</property>
</widget>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer_6"> <spacer name="horizontalSpacer_6">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -3011,20 +2923,20 @@ Specify an IPv4 or IPv6 address. You can specify &quot;0.0.0.0&quot; for any IPv
<string>Authentication</string> <string>Authentication</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_10"> <layout class="QGridLayout" name="gridLayout_10">
<item row="0" column="1" rowspan="3"> <item row="5" column="1">
<widget class="QLineEdit" name="textWebUiUsername"> <widget class="QPushButton" name="IPSubnetWhitelistButton">
<property name="text"> <property name="sizePolicy">
<string/> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
</property> <horstretch>0</horstretch>
<property name="maxLength"> <verstretch>0</verstretch>
<number>1000</number> </sizepolicy>
</property> </property>
<property name="echoMode"> <property name="text">
<enum>QLineEdit::Normal</enum> <string>IP subnet whitelist...</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<widget class="QLineEdit" name="textWebUiPassword"> <widget class="QLineEdit" name="textWebUiPassword">
<property name="echoMode"> <property name="echoMode">
<enum>QLineEdit::Password</enum> <enum>QLineEdit::Password</enum>
@ -3034,47 +2946,37 @@ Specify an IPv4 or IPv6 address. You can specify &quot;0.0.0.0&quot; for any IPv
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2"> <item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="checkBypassLocalAuth"> <widget class="QCheckBox" name="checkBypassLocalAuth">
<property name="text"> <property name="text">
<string>Bypass authentication for clients on localhost</string> <string>Bypass authentication for clients on localhost</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="checkBypassAuthSubnetWhitelist"> <widget class="QCheckBox" name="checkBypassAuthSubnetWhitelist">
<property name="text"> <property name="text">
<string>Bypass authentication for clients in whitelisted IP subnets</string> <string>Bypass authentication for clients in whitelisted IP subnets</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="0" column="0" rowspan="2">
<widget class="QPushButton" name="IPSubnetWhitelistButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>IP subnet whitelist...</string>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="3">
<widget class="QLabel" name="lblWebUiUsername"> <widget class="QLabel" name="lblWebUiUsername">
<property name="text"> <property name="text">
<string>Username:</string> <string>Username:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QLabel" name="lblWebUiPassword"> <widget class="QLabel" name="lblWebUiPassword">
<property name="text"> <property name="text">
<string>Password:</string> <string>Password:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" rowspan="2">
<widget class="QLineEdit" name="textWebUiUsername"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -3089,15 +2991,15 @@ Specify an IPv4 or IPv6 address. You can specify &quot;0.0.0.0&quot; for any IPv
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_8"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<item row="0" column="0"> <item>
<widget class="QLabel" name="labelWebUIRootFolder"> <widget class="QLabel" name="labelWebUIRootFolder">
<property name="text"> <property name="text">
<string>Files location:</string> <string>Files location:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item>
<widget class="FileSystemPathLineEdit" name="textWebUIRootFolder" native="true"/> <widget class="FileSystemPathLineEdit" name="textWebUIRootFolder" native="true"/>
</item> </item>
</layout> </layout>
@ -3337,7 +3239,6 @@ Use ';' to split multiple entries. Can use wildcard '*'.</string>
<tabstop>checkShowSystray</tabstop> <tabstop>checkShowSystray</tabstop>
<tabstop>checkMinimizeToSysTray</tabstop> <tabstop>checkMinimizeToSysTray</tabstop>
<tabstop>checkCloseToSystray</tabstop> <tabstop>checkCloseToSystray</tabstop>
<tabstop>comboTrayIcon</tabstop>
<tabstop>checkAssociateTorrents</tabstop> <tabstop>checkAssociateTorrents</tabstop>
<tabstop>checkAssociateMagnetLinks</tabstop> <tabstop>checkAssociateMagnetLinks</tabstop>
<tabstop>checkPreventFromSuspendWhenDownloading</tabstop> <tabstop>checkPreventFromSuspendWhenDownloading</tabstop>
@ -3409,11 +3310,6 @@ Use ';' to split multiple entries. Can use wildcard '*'.</string>
<tabstop>spinMaxActiveDownloads</tabstop> <tabstop>spinMaxActiveDownloads</tabstop>
<tabstop>spinMaxActiveUploads</tabstop> <tabstop>spinMaxActiveUploads</tabstop>
<tabstop>spinMaxActiveTorrents</tabstop> <tabstop>spinMaxActiveTorrents</tabstop>
<tabstop>checkMaxRatio</tabstop>
<tabstop>spinMaxRatio</tabstop>
<tabstop>checkMaxSeedingMinutes</tabstop>
<tabstop>spinMaxSeedingMinutes</tabstop>
<tabstop>comboRatioLimitAct</tabstop>
<tabstop>checkWebUIUPnP</tabstop> <tabstop>checkWebUIUPnP</tabstop>
<tabstop>checkWebUiHttps</tabstop> <tabstop>checkWebUiHttps</tabstop>
<tabstop>checkBypassLocalAuth</tabstop> <tabstop>checkBypassLocalAuth</tabstop>

Write Preview
Loading…
Cancel
Save