Qt client accessibility improvements (part 1) (#6518)

* Details dialog Information tab a11y improvements

* Details dialog Options tab a11y improvements

* Make torrent dialog a11y improvements

* Relocate torrent data dialog a11y improvements

* Statistics dialog a11y improvements

* Session dialog a11y improvements

* Trackers dialog a11y improvements

* Preferences dialog Speed tab a11y improvements

* Preferences dialog Downloading tab a11y improvements

* Preferences dialog Seeding tab a11y improvements

* Preferences dialog Privacy tab a11y improvements

* Preferences dialog Network tab a11y improvements

* Preferences dialog Desktop tab a11y improvements

* Preferences dialog Remote tab a11y improvements

* Fix filterbar tab order (depends on construction order if not explicit)
This commit is contained in:
Mike Gelfand 2024-01-10 21:01:03 +00:00 committed by GitHub
parent 33f11f8679
commit 852fa6d169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 2121 additions and 2343 deletions

View File

@ -262,7 +262,7 @@ DetailsDialog::DetailsDialog(Session& session, Prefs& prefs, TorrentModel const&
initOptionsTab();
adjustSize();
ui_.commentBrowser->setMaximumHeight(QWIDGETSIZE_MAX);
ui_.commentTextEdit->setMaximumHeight(QWIDGETSIZE_MAX);
ui_.tabs->setCurrentIndex(prev_tab_index_);
static std::array<int, 2> constexpr InitKeys = {
@ -900,7 +900,7 @@ void DetailsDialog::refreshUI()
if (torrents.empty())
{
labels_baseline_.clear();
ui_.labelsTextEdit->setText({});
ui_.labelsTextEdit->setPlainText({});
ui_.labelsTextEdit->setPlaceholderText(none);
ui_.labelsTextEdit->setReadOnly(true);
ui_.labelsTextEdit->setEnabled(true);
@ -911,7 +911,7 @@ void DetailsDialog::refreshUI()
[&baseline](auto const* tor) { return tor->labels() == baseline; }))
{
labels_baseline_ = baseline.join(QStringLiteral(", "));
ui_.labelsTextEdit->setText(labels_baseline_);
ui_.labelsTextEdit->setPlainText(labels_baseline_);
ui_.labelsTextEdit->setPlaceholderText(none);
ui_.labelsTextEdit->setReadOnly(false);
ui_.labelsTextEdit->setEnabled(true);
@ -919,7 +919,7 @@ void DetailsDialog::refreshUI()
else // mixed
{
labels_baseline_.clear();
ui_.labelsTextEdit->setText({});
ui_.labelsTextEdit->setPlainText({});
ui_.labelsTextEdit->setPlaceholderText(mixed);
ui_.labelsTextEdit->setEnabled(false);
}
@ -944,12 +944,12 @@ void DetailsDialog::refreshUI()
}
}
if (ui_.commentBrowser->toPlainText() != string)
if (ui_.commentTextEdit->toPlainText() != string)
{
ui_.commentBrowser->setText(string);
ui_.commentTextEdit->setPlainText(string);
}
ui_.commentBrowser->setEnabled(!is_comment_mixed && !string.isEmpty());
ui_.commentTextEdit->setEnabled(!is_comment_mixed && !string.isEmpty());
// myOriginLabel
string = none;
@ -1044,7 +1044,7 @@ void DetailsDialog::refreshUI()
}
}
ui_.addedLabelValue->setText(string);
ui_.addedValueLabel->setText(string);
///
/// Options Tab
@ -1324,12 +1324,12 @@ void DetailsDialog::setEnabled(bool enabled)
void DetailsDialog::initInfoTab()
{
int const cbh = QFontMetrics{ ui_.commentBrowser->font() }.lineSpacing() * 4;
ui_.commentBrowser->setFixedHeight(cbh);
int const cbh = QFontMetrics{ ui_.commentTextEdit->font() }.lineSpacing() * 4;
ui_.commentTextEdit->setFixedHeight(cbh);
int const lteh = QFontMetrics{ ui_.labelsTextEdit->font() }.lineSpacing() * 2;
ui_.labelsTextEdit->setFixedHeight(lteh);
ui_.labelsTextEdit->setText(QStringLiteral("Initializing..."));
ui_.labelsTextEdit->setPlainText(QStringLiteral("Initializing..."));
auto* cr = new ColumnResizer{ this };
cr->addLayout(ui_.activitySectionLayout);
@ -1550,8 +1550,7 @@ void DetailsDialog::initOptionsTab()
auto* cr = new ColumnResizer{ this };
cr->addLayout(ui_.speedSectionLayout);
cr->addLayout(ui_.seedingLimitsSectionRatioLayout);
cr->addLayout(ui_.seedingLimitsSectionIdleLayout);
cr->addLayout(ui_.seedingLimitsSectionLayout);
cr->addLayout(ui_.peerConnectionsSectionLayout);
cr->update();

View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>505</width>
<height>581</height>
<height>661</height>
</rect>
</property>
<property name="windowTitle">
@ -31,25 +31,19 @@
</attribute>
<layout class="QVBoxLayout" name="infoTabLayout">
<item>
<widget class="QLabel" name="activitySectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="activitySection">
<property name="title">
<string>Activity</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="activitySectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="haveLabel">
<property name="text">
<string>Have:</string>
</property>
<property name="buddy">
<cstring>haveValueLabel</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
@ -60,6 +54,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -67,7 +64,7 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -76,6 +73,9 @@
<property name="text">
<string>Availability:</string>
</property>
<property name="buddy">
<cstring>availabilityValueLabel</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
@ -86,6 +86,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -93,7 +96,7 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -102,6 +105,9 @@
<property name="text">
<string>Uploaded:</string>
</property>
<property name="buddy">
<cstring>uploadedValueLabel</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
@ -112,6 +118,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -119,7 +128,7 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -128,6 +137,9 @@
<property name="text">
<string>Downloaded:</string>
</property>
<property name="buddy">
<cstring>downloadedValueLabel</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
@ -138,6 +150,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -145,7 +160,7 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -154,6 +169,9 @@
<property name="text">
<string>State:</string>
</property>
<property name="buddy">
<cstring>stateValueLabel</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
@ -164,6 +182,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -171,7 +192,7 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -180,6 +201,9 @@
<property name="text">
<string>Running time:</string>
</property>
<property name="buddy">
<cstring>runningTimeValueLabel</cstring>
</property>
</widget>
</item>
<item row="5" column="1">
@ -190,6 +214,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -197,7 +224,7 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -206,6 +233,9 @@
<property name="text">
<string>Remaining time:</string>
</property>
<property name="buddy">
<cstring>remainingTimeValueLabel</cstring>
</property>
</widget>
</item>
<item row="6" column="1">
@ -216,6 +246,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -223,7 +256,7 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -232,6 +265,9 @@
<property name="text">
<string>Last activity:</string>
</property>
<property name="buddy">
<cstring>lastActivityValueLabel</cstring>
</property>
</widget>
</item>
<item row="7" column="1">
@ -242,6 +278,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -249,7 +288,7 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -258,6 +297,9 @@
<property name="text">
<string>Error:</string>
</property>
<property name="buddy">
<cstring>errorValueLabel</cstring>
</property>
</widget>
</item>
<item row="8" column="1">
@ -268,6 +310,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -275,43 +320,29 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="detailsSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="detailsSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<string>Details</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="detailsSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
<widget class="QGroupBox" name="detailsSection">
<property name="title">
<string>Details</string>
</property>
<layout class="QGridLayout" name="detailsSectionLayout" columnstretch="0,1">
<item row="0" column="0">
<widget class="QLabel" name="sizeLabel">
<property name="text">
<string>Size:</string>
</property>
<property name="buddy">
<cstring>sizeValueLabel</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="SqueezeLabel" name="sizeValueLabel">
<property name="sizePolicy">
@ -320,6 +351,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -327,7 +361,17 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="locationLabel">
<property name="text">
<string>Location:</string>
</property>
<property name="buddy">
<cstring>locationValueLabel</cstring>
</property>
</widget>
</item>
@ -339,6 +383,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -346,7 +393,7 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -355,71 +402,8 @@
<property name="text">
<string>Hash:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="privacyLabel">
<property name="text">
<string>Privacy:</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="originLabel">
<property name="text">
<string>Origin:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="SqueezeLabel" name="originValueLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="SqueezeLabel" name="privacyValueLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="sizeLabel">
<property name="text">
<string>Size:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="locationLabel">
<property name="text">
<string>Location:</string>
<property name="buddy">
<cstring>hashValueLabel</cstring>
</property>
</widget>
</item>
@ -431,6 +415,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
@ -438,7 +425,71 @@
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="privacyLabel">
<property name="text">
<string>Privacy:</string>
</property>
<property name="buddy">
<cstring>privacyValueLabel</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="SqueezeLabel" name="privacyValueLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="originLabel">
<property name="text">
<string>Origin:</string>
</property>
<property name="buddy">
<cstring>originValueLabel</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="SqueezeLabel" name="originValueLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -447,12 +498,24 @@
<property name="text">
<string>Added:</string>
</property>
<property name="buddy">
<cstring>addedValueLabel</cstring>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="addedLabelValue">
<widget class="SqueezeLabel" name="addedValueLabel">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string></string>
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -467,9 +530,9 @@
</widget>
</item>
<item row="6" column="1">
<widget class="QTextEdit" name="labelsTextEdit">
<property name="readOnly">
<bool>false</bool>
<widget class="QPlainTextEdit" name="labelsTextEdit">
<property name="tabChangesFocus">
<bool>true</bool>
</property>
</widget>
</item>
@ -479,18 +542,25 @@
<string>Comment:</string>
</property>
<property name="buddy">
<cstring>commentBrowser</cstring>
<cstring>commentTextEdit</cstring>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QTextBrowser" name="commentBrowser">
<widget class="QPlainTextEdit" name="commentTextEdit">
<property name="tabChangesFocus">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@ -644,20 +714,11 @@
</attribute>
<layout class="QVBoxLayout" name="optionsTabLayout">
<item>
<widget class="QLabel" name="speedSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="speedSection">
<property name="title">
<string>Speed</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="speedSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="sessionLimitCheck">
<property name="text">
@ -719,38 +780,14 @@
<widget class="QComboBox" name="bandwidthPriorityCombo"/>
</item>
</layout>
</item>
<item>
<spacer name="seedingLimitsSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="seedingLimitsSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<string>Seeding Limits</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="seedingLimitsSectionRatioLayout" columnstretch="0,1,0">
<property name="leftMargin">
<number>18</number>
<widget class="QGroupBox" name="seedingLimitsSection">
<property name="title">
<string>Seeding Limits</string>
</property>
<layout class="QGridLayout" name="seedingLimitsSectionLayout" columnstretch="0,1">
<item row="0" column="0">
<widget class="QLabel" name="ratioLabel">
<property name="text">
@ -762,9 +799,11 @@
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="seedingLimitsSectionRatioLayout" stretch="1,0">
<item>
<widget class="QComboBox" name="ratioCombo"/>
</item>
<item row="0" column="2">
<item>
<widget class="QDoubleSpinBox" name="ratioSpin">
<property name="maximum">
<double>999999999.000000000000000</double>
@ -776,12 +815,7 @@
</item>
</layout>
</item>
<item>
<layout class="QGridLayout" name="seedingLimitsSectionIdleLayout" columnstretch="0,1,0">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0">
<item row="1" column="0">
<widget class="QLabel" name="idleLabel">
<property name="text">
<string>&amp;Idle:</string>
@ -791,10 +825,12 @@
</property>
</widget>
</item>
<item row="0" column="1">
<item row="1" column="1">
<layout class="QHBoxLayout" name="seedingLimitsSectionIdleLayout" stretch="1,0">
<item>
<widget class="QComboBox" name="idleCombo"/>
</item>
<item row="0" column="2">
<item>
<widget class="QSpinBox" name="idleSpin">
<property name="suffix">
<string notr="true"> minute(s)</string>
@ -812,37 +848,15 @@
</item>
</layout>
</item>
<item>
<spacer name="peerConnectionsSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="peerConnectionsSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<string>Peer Connections</string>
</property>
</layout>
</widget>
</item>
<item>
<layout class="QGridLayout" name="peerConnectionsSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
<widget class="QGroupBox" name="peerConnectionsSection">
<property name="title">
<string>Peer Connections</string>
</property>
<layout class="QGridLayout" name="peerConnectionsSectionLayout" columnstretch="0,1">
<item row="0" column="0">
<widget class="QLabel" name="peerLimitLabel">
<property name="text">
@ -867,6 +881,7 @@
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="optionsTabBottomSpacer">
@ -918,8 +933,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>26</x>
<y>563</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
@ -934,8 +949,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>26</x>
<y>563</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
@ -950,12 +965,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>35</x>
<y>99</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>247</x>
<y>93</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -966,12 +981,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>35</x>
<y>131</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>247</x>
<y>125</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>

View File

@ -223,25 +223,21 @@ FilterBar::FilterBar(Prefs& prefs, TorrentModel const& torrents, TorrentFilter c
, prefs_{ prefs }
, torrents_{ torrents }
, filter_{ filter }
, count_label_{ new QLabel{ tr("Show:"), this } }
, is_bootstrapping_{ true }
{
auto* h = new QHBoxLayout{ this };
h->setContentsMargins(3, 3, 3, 3);
count_label_ = new QLabel{ tr("Show:"), this };
h->addWidget(count_label_);
h->addWidget(activity_combo_);
tracker_combo_ = createTrackerCombo(tracker_model_);
h->addWidget(tracker_combo_);
h->addStretch();
h->addWidget(line_edit_, 1);
line_edit_->setClearButtonEnabled(true);
line_edit_->setPlaceholderText(tr("Search…"));
line_edit_->setMaximumWidth(250);
h->addWidget(line_edit_, 1);
connect(line_edit_, &QLineEdit::textChanged, this, &FilterBar::onTextChanged);
// listen for changes from the other players

View File

@ -56,13 +56,15 @@ private:
TorrentModel const& torrents_;
TorrentFilter const& filter_;
std::map<QString, int> sitename_counts_;
FilterBarComboBox* const activity_combo_ = createActivityCombo();
FilterBarComboBox* tracker_combo_ = {};
QLabel* count_label_ = {};
QStandardItemModel* const tracker_model_ = new QStandardItemModel{ this };
QTimer recount_timer_;
QLabel* const count_label_ = {};
FilterBarComboBox* const activity_combo_ = createActivityCombo();
FilterBarComboBox* const tracker_combo_ = createTrackerCombo(tracker_model_);
QLineEdit* const line_edit_ = new QLineEdit{ this };
std::map<QString, int> sitename_counts_;
QTimer recount_timer_;
Pending pending_ = {};
bool is_bootstrapping_ = {};

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>566</width>
<height>426</height>
<width>503</width>
<height>472</height>
</rect>
</property>
<property name="acceptDrops">
@ -18,20 +18,11 @@
</property>
<layout class="QVBoxLayout" name="dialogLayout">
<item>
<widget class="QLabel" name="filesSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="filesSection">
<property name="title">
<string>Files</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="filesSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="destinationLabel">
<property name="text">
@ -79,6 +70,16 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="pieceSizeLabel">
<property name="text">
<string>Piece s&amp;ize:</string>
</property>
<property name="buddy">
<cstring>pieceSizeSlider</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSlider" name="pieceSizeSlider">
<property name="minimum">
@ -95,49 +96,15 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="pieceSizeLabel">
<property name="text">
<string>Piece s&amp;ize:</string>
</property>
<property name="buddy">
<cstring>pieceSizeSlider</cstring>
</property>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="propertiesSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="propertiesSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="propertiesSection">
<property name="title">
<string>Properties</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="propertiesSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="trackersLabel">
<property name="text">
@ -205,6 +172,7 @@ To add another primary URL, add it after a blank line.</string>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="dialogButtons">
@ -234,12 +202,12 @@ To add another primary URL, add it after a blank line.</string>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>76</x>
<y>333</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>360</x>
<y>333</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -250,12 +218,12 @@ To add another primary URL, add it after a blank line.</string>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>72</x>
<y>83</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>360</x>
<y>82</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -266,12 +234,12 @@ To add another primary URL, add it after a blank line.</string>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>72</x>
<y>119</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>360</x>
<y>118</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -282,12 +250,12 @@ To add another primary URL, add it after a blank line.</string>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>75</x>
<y>347</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>342</x>
<y>347</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>

View File

@ -31,20 +31,11 @@
</attribute>
<layout class="QVBoxLayout" name="speedTabLayout">
<item>
<widget class="QLabel" name="speedLimitsSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="speedLimitsSection">
<property name="title">
<string>Speed Limits</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="speedLimitsSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="uploadSpeedLimitCheck">
<property name="text">
@ -86,38 +77,16 @@
</widget>
</item>
</layout>
</item>
<item>
<spacer name="altSpeedLimitsSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="altSpeedLimitsSectionTitleLayout" stretch="0,1">
<property name="spacing">
<number>2</number>
</property>
<item>
<widget class="QLabel" name="altSpeedLimitsSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<string>Alternative Speed Limits</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="altSpeedLimitsSection">
<property name="title">
<string>Alternative Speed Limits</string>
</property>
<layout class="QGridLayout" name="altSpeedLimitsSectionLayout" columnstretch="0,1">
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
<item>
<widget class="QLabel" name="altSpeedLimitsSectionIconLabel">
<property name="pixmap">
@ -125,20 +94,15 @@
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QGridLayout" name="altSpeedLimitsSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="altSpeedLimitsSectionDescriptionLabel">
<property name="text">
<string>&lt;small&gt;Override normal speed limits manually or at scheduled times&lt;/small&gt;</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="altUploadSpeedLimitLabel">
<property name="text">
@ -237,6 +201,7 @@
<widget class="QComboBox" name="altSpeedLimitDaysCombo"/>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="speedTabBottomSpacer">
@ -259,27 +224,11 @@
</attribute>
<layout class="QVBoxLayout" name="downloadingTabLayout">
<item>
<widget class="QLabel" name="addingSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="addingSection">
<property name="title">
<string>Adding</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="addingSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="5" column="0">
<widget class="QLabel" name="downloadDirLabel">
<property name="text">
<string>Save to &amp;Location:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="watchDirCheck">
<property name="text">
@ -290,37 +239,6 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="startAddedTorrentsCheck">
<property name="text">
<string>&amp;Start added torrents</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="FreeSpaceLabel" name="downloadDirFreeSpaceLabel">
<property name="text">
<string notr="true">...</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="showTorrentOptionsDialogCheck">
<property name="text">
<string>Show the Torrent Options &amp;dialog</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="trashTorrentFileCheck">
<property name="text">
<string>Mo&amp;ve the .torrent file to the trash</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QStackedWidget" name="watchDirStack">
<property name="sizePolicy">
@ -333,6 +251,44 @@
<widget class="QLineEdit" name="watchDirEdit"/>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="showTorrentOptionsDialogCheck">
<property name="text">
<string>Show the Torrent Options &amp;dialog</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="startAddedTorrentsCheck">
<property name="text">
<string>&amp;Start added torrents</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="detectTorrentFromClipboard">
<property name="toolTip">
<string>Reads user clipboard content for torrents</string>
</property>
<property name="text">
<string>Detect new torrents from clipboard</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="trashTorrentFileCheck">
<property name="text">
<string>Mo&amp;ve the .torrent file to the trash</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="downloadDirLabel">
<property name="text">
<string>Save to &amp;Location:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QStackedWidget" name="downloadDirStack">
<property name="sizePolicy">
@ -345,49 +301,25 @@
<widget class="QLineEdit" name="downloadDirEdit"/>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="detectTorrentFromClipboard">
<property name="toolTip">
<string>Reads user clipboard content for torrents</string>
</property>
<item row="6" column="0" colspan="2">
<widget class="FreeSpaceLabel" name="downloadDirFreeSpaceLabel">
<property name="text">
<string>Detect new torrents from clipboard</string>
<string notr="true">...</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="downloadQueueSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="downloadQueueSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<string>Download Queue</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="downloadQueueSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
<widget class="QGroupBox" name="downloadQueueSection">
<property name="title">
<string>Download Queue</string>
</property>
<layout class="QGridLayout" name="downloadQueueSectionLayout" columnstretch="0,1">
<item row="0" column="0">
<widget class="QLabel" name="downloadQueueSizeLabel">
<property name="text">
@ -435,38 +367,14 @@
</widget>
</item>
</layout>
</item>
<item>
<spacer name="incompleteSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="incompleteSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<string>Incomplete</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="incompleteSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
<widget class="QGroupBox" name="incompleteSection">
<property name="title">
<string>Incomplete</string>
</property>
<layout class="QGridLayout" name="incompleteSectionLayout" columnstretch="0,1">
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="renamePartialFilesCheck">
<property name="text">
@ -519,6 +427,7 @@
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="downloadingTabBottomSpacer">
@ -541,20 +450,11 @@
</attribute>
<layout class="QVBoxLayout" name="seedingTabLayout">
<item>
<widget class="QLabel" name="limitsSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="limitsSection">
<property name="title">
<string>Limits</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="limitsSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="ratioLimitCheck">
<property name="text">
@ -624,6 +524,7 @@
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="seedingTabBottomSpacer">
@ -646,20 +547,11 @@
</attribute>
<layout class="QVBoxLayout" name="privacyTabLayout">
<item>
<widget class="QLabel" name="encryptionSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="encryptionSection">
<property name="title">
<string>Encryption</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="encryptionSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="encryptionModeLabel">
<property name="text">
@ -674,38 +566,14 @@
<widget class="QComboBox" name="encryptionModeCombo"/>
</item>
</layout>
</item>
<item>
<spacer name="blocklistSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="blocklistSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<string>Blocklist</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="blocklistSectionLayout" columnstretch="0,1,0">
<property name="leftMargin">
<number>18</number>
<widget class="QGroupBox" name="blocklistSection">
<property name="title">
<string>Blocklist</string>
</property>
<layout class="QGridLayout" name="blocklistSectionLayout" columnstretch="0,1,0">
<item row="0" column="0">
<widget class="QCheckBox" name="blocklistCheck">
<property name="text">
@ -744,6 +612,7 @@
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="privacyTabBottomSpacer">
@ -766,20 +635,11 @@
</attribute>
<layout class="QVBoxLayout" name="networkTabLayout">
<item>
<widget class="QLabel" name="incomingPeersSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="incomingPeersSection">
<property name="title">
<string>Incoming Peers</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="incomingPeersSectionLayout" columnstretch="0,1,0">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="peerPortLabel">
<property name="text">
@ -832,38 +692,14 @@
</widget>
</item>
</layout>
</item>
<item>
<spacer name="peerLimitsSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="peerLimitsSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<string>Peer Limits</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="peerLimitsSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
<widget class="QGroupBox" name="peerLimitsSection">
<property name="title">
<string>Peer Limits</string>
</property>
<layout class="QGridLayout" name="peerLimitsSectionLayout" columnstretch="0,1">
<item row="0" column="0">
<widget class="QLabel" name="torrentPeerLimitLabel">
<property name="text">
@ -911,38 +747,14 @@
</widget>
</item>
</layout>
</item>
<item>
<spacer name="optionsSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="optionsSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<string>Options</string>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="optionsSectionLayout">
<property name="leftMargin">
<number>18</number>
<widget class="QGroupBox" name="optionsSection">
<property name="title">
<string>Options</string>
</property>
<layout class="QVBoxLayout" name="optionsSectionLayout">
<item>
<widget class="QCheckBox" name="enableUtpCheck">
<property name="toolTip">
@ -984,45 +796,21 @@
</widget>
</item>
</layout>
</item>
<item>
<spacer name="defaultTrackersSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="defaultTrackersLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Default Public Trackers</string>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="defaultTrackersLayout">
<property name="leftMargin">
<number>18</number>
<widget class="QGroupBox" name="defaultTrackersSection">
<property name="title">
<string>Default Public Trackers</string>
</property>
<layout class="QVBoxLayout" name="defaultTrackersSectionLayout">
<item>
<widget class="QPlainTextEdit" name="defaultTrackersPlainTextEdit">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Trackers to use on all public torrents.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;To add a backup URL, add it on the next line after a primary URL.&lt;/p&gt;&lt;p&gt;To add a new primary URL, add it after a blank line.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Trackers to use on all public torrents.
To add a backup URL, add it on the next line after a primary URL.
To add a new primary URL, add it after a blank line.</string>
</property>
<property name="tabChangesFocus">
<bool>true</bool>
@ -1036,6 +824,7 @@
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="networkTabBottomSpacer">
@ -1058,20 +847,11 @@
</attribute>
<layout class="QVBoxLayout" name="desktopTabLayout">
<item>
<widget class="QLabel" name="desktopSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="desktopSection">
<property name="title">
<string>Desktop</string>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="desktopSectionLayout">
<property name="leftMargin">
<number>18</number>
</property>
<item>
<widget class="QCheckBox" name="showTrayIconCheck">
<property name="text">
@ -1087,38 +867,14 @@
</widget>
</item>
</layout>
</item>
<item>
<spacer name="notificationSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="notificationSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<string>Notification</string>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="notificationSectionLayout">
<property name="leftMargin">
<number>18</number>
<widget class="QGroupBox" name="notificationSection">
<property name="title">
<string>Notification</string>
</property>
<layout class="QVBoxLayout" name="notificationSectionLayout">
<item>
<widget class="QCheckBox" name="notifyOnTorrentAddedCheck">
<property name="text">
@ -1141,6 +897,7 @@
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="desktopTabBottomSpacer">
@ -1163,20 +920,11 @@
</attribute>
<layout class="QVBoxLayout" name="remoteTabLayout">
<item>
<widget class="QLabel" name="remoteControlSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="remoteControlSection">
<property name="title">
<string>Remote Control</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="remoteControlSectionLayout" columnstretch="0,1,0">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="enableRpcCheck">
<property name="text">
@ -1281,6 +1029,7 @@
<widget class="QLineEdit" name="rpcWhitelistEdit"/>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="remoteTabBottomSpacer">
@ -1334,12 +1083,12 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -1350,12 +1099,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>94</x>
<y>79</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>323</x>
<y>79</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -1366,12 +1115,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>94</x>
<y>113</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>323</x>
<y>113</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -1382,12 +1131,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>129</x>
<y>79</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>359</x>
<y>79</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -1398,12 +1147,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>129</x>
<y>113</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>359</x>
<y>113</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -1414,12 +1163,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>167</x>
<y>80</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>392</x>
<y>80</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -1430,12 +1179,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>169</x>
<y>411</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>395</x>
<y>411</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -1446,12 +1195,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>169</x>
<y>447</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>395</x>
<y>447</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -1462,12 +1211,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>69</x>
<y>69</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>69</x>
<y>69</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>333</width>
<height>155</height>
<width>275</width>
<height>170</height>
</rect>
</property>
<property name="windowTitle">
@ -18,20 +18,11 @@
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QLabel" name="setLocationSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="setLocationSection">
<property name="title">
<string>Set Location</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="setLocationSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="newLocationLabel">
<property name="text">
@ -60,6 +51,7 @@
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="dialogButtons">

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>250</width>
<height>265</height>
<width>248</width>
<height>297</height>
</rect>
</property>
<property name="windowTitle">
@ -18,20 +18,11 @@
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QLabel" name="sourceSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="sourceSection">
<property name="title">
<string>Source</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="sourceSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QRadioButton" name="localSessionRadio">
<property name="text">
@ -117,6 +108,7 @@
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="dialogButtons">
@ -139,12 +131,12 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>124</x>
<y>244</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>124</x>
<y>132</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
@ -155,12 +147,12 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>124</x>
<y>244</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>124</x>
<y>132</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>138</width>
<height>315</height>
<width>139</width>
<height>316</height>
</rect>
</property>
<property name="windowTitle">
@ -18,32 +18,35 @@
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QLabel" name="currentSessionSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="currentSessionSection">
<property name="title">
<string>Current Session</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="currentSessionSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="currentUploadedLabel">
<property name="text">
<string>Uploaded:</string>
</property>
<property name="buddy">
<cstring>currentUploadedValueLabel</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="currentUploadedValueLabel">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="1" column="0">
@ -51,13 +54,25 @@
<property name="text">
<string>Downloaded:</string>
</property>
<property name="buddy">
<cstring>currentDownloadedValueLabel</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="currentDownloadedValueLabel">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="2" column="0">
@ -65,13 +80,25 @@
<property name="text">
<string>Ratio:</string>
</property>
<property name="buddy">
<cstring>currentRatioValueLabel</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="currentRatioValueLabel">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="3" column="0">
@ -79,53 +106,50 @@
<property name="text">
<string>Duration:</string>
</property>
<property name="buddy">
<cstring>currentDurationValueLabel</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="currentDurationValueLabel">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="totalSectionSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="totalSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<string>Total</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="totalSectionLayout" columnstretch="0,1">
<property name="leftMargin">
<number>18</number>
<widget class="QGroupBox" name="totalSection">
<property name="title">
<string>Total</string>
</property>
<layout class="QGridLayout" name="totalSectionLayout" columnstretch="0,1">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="startCountLabel">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="1" column="0">
@ -133,13 +157,25 @@
<property name="text">
<string>Uploaded:</string>
</property>
<property name="buddy">
<cstring>totalUploadedValueLabel</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="totalUploadedValueLabel">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="2" column="0">
@ -147,13 +183,25 @@
<property name="text">
<string>Downloaded:</string>
</property>
<property name="buddy">
<cstring>totalDownloadedValueLabel</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="totalDownloadedValueLabel">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="3" column="0">
@ -161,13 +209,25 @@
<property name="text">
<string>Ratio:</string>
</property>
<property name="buddy">
<cstring>totalRatioValueLabel</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="totalRatioValueLabel">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="4" column="0">
@ -175,16 +235,29 @@
<property name="text">
<string>Duration:</string>
</property>
<property name="buddy">
<cstring>totalDurationValueLabel</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="totalDurationValueLabel">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="dialogButtons">
@ -207,12 +280,12 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>71</x>
<y>282</y>
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>71</x>
<y>151</y>
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>

View File

@ -18,20 +18,18 @@
</property>
<layout class="QVBoxLayout" name="dialogLayout">
<item>
<widget class="QLabel" name="filesSectionLabel">
<property name="styleSheet">
<string notr="true">font-weight:bold</string>
</property>
<property name="text">
<widget class="QGroupBox" name="filesSection">
<property name="title">
<string>Tracker Announce URLs</string>
</property>
<layout class="QGridLayout" name="filesSectionLayout">
<item row="0" column="0">
<widget class="QLabel" name="backupLabel">
<property name="text">
<string>To add a backup URL, add it on the next line after a primary URL.</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="filesSectionLayout" columnstretch="0">
<property name="leftMargin">
<number>18</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="primaryLabel">
<property name="text">
@ -46,13 +44,6 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="backupLabel">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To add a backup URL, add it on the next line after a primary URL.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="defaultsLabel">
<property name="text">
@ -61,6 +52,7 @@
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="dialogButtons">