From ff67d2957352dd1b744341e8f10135a220054e94 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 5 Nov 2015 18:36:45 +0800 Subject: [PATCH 1/4] Cleanup "Trackers" page layout --- src/gui/properties/propertieswidget.cpp | 2 + src/gui/properties/propertieswidget.ui | 63 ++++++------------------- 2 files changed, 16 insertions(+), 49 deletions(-) diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index f65f6a544..16b8d1266 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -126,7 +126,9 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra // Tracker list trackerList = new TrackerList(this); trackerUpButton->setIcon(GuiIconProvider::instance()->getIcon("go-up")); + trackerUpButton->setIconSize(Utils::Misc::smallIconSize()); trackerDownButton->setIcon(GuiIconProvider::instance()->getIcon("go-down")); + trackerDownButton->setIconSize(Utils::Misc::smallIconSize()); connect(trackerUpButton, SIGNAL(clicked()), trackerList, SLOT(moveSelectionUp())); connect(trackerDownButton, SIGNAL(clicked()), trackerList, SLOT(moveSelectionDown())); horizontalLayout_trackers->insertWidget(0, trackerList); diff --git a/src/gui/properties/propertieswidget.ui b/src/gui/properties/propertieswidget.ui index 920f003ec..dce87819f 100644 --- a/src/gui/properties/propertieswidget.ui +++ b/src/gui/properties/propertieswidget.ui @@ -33,9 +33,6 @@ - - 0 - 0 @@ -912,6 +909,18 @@ + + 0 + + + 0 + + + 0 + + + 0 + @@ -928,54 +937,10 @@ - - - - 31 - 27 - - - - - 31 - 27 - - - - - 31 - 27 - - - - - - + - - - - 31 - 27 - - - - - 31 - 27 - - - - - 31 - 27 - - - - - - + From 7005af3047330fe81a33937946834bcffd7fa9a4 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 5 Nov 2015 18:40:35 +0800 Subject: [PATCH 2/4] Cleanup "Peers" page layout Cleanup "HTTP Sources" page layout Cleanup "Speed" page layout --- src/gui/properties/propertieswidget.ui | 53 +++++++++++++++++++++----- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/src/gui/properties/propertieswidget.ui b/src/gui/properties/propertieswidget.ui index dce87819f..5521c00a4 100644 --- a/src/gui/properties/propertieswidget.ui +++ b/src/gui/properties/propertieswidget.ui @@ -11,9 +11,6 @@ - - 0 - 0 @@ -31,7 +28,7 @@ 0 - + 0 @@ -959,11 +956,36 @@ - - + + + + 0 + + + 0 + + + 0 + + + 0 + + - + + + 0 + + + 0 + + + 0 + + + 0 + @@ -1043,8 +1065,21 @@ - - + + + + 0 + + + 0 + + + 0 + + + 0 + + From af90eadf7118b9fc6aac40ba103c0f0db683ed83 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 5 Nov 2015 21:00:13 +0800 Subject: [PATCH 3/4] Cleanup "Content" page layout Limit lineEdit maximum size --- src/gui/properties/propertieswidget.cpp | 3 ++- src/gui/properties/propertieswidget.ui | 30 +++++++++++-------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index 16b8d1266..f9eb9913d 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -79,8 +79,9 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra // Torrent content filtering m_contentFilterLine = new LineEdit(this); m_contentFilterLine->setPlaceholderText(tr("Filter files...")); + m_contentFilterLine->setMaximumSize(300, m_contentFilterLine->size().height()); connect(m_contentFilterLine, SIGNAL(textChanged(QString)), this, SLOT(filterText(QString))); - contentFilterLayout->insertWidget(4, m_contentFilterLine); + contentFilterLayout->insertWidget(3, m_contentFilterLine); // SIGNAL/SLOTS connect(filesList, SIGNAL(clicked(const QModelIndex&)), filesList, SLOT(edit(const QModelIndex&))); diff --git a/src/gui/properties/propertieswidget.ui b/src/gui/properties/propertieswidget.ui index 5521c00a4..01d4e2faf 100644 --- a/src/gui/properties/propertieswidget.ui +++ b/src/gui/properties/propertieswidget.ui @@ -998,8 +998,20 @@ - + + + 0 + + + 0 + + + 0 + + + 0 + @@ -1029,22 +1041,6 @@ - - - - - 75 - true - - - - Torrent content: - - - Qt::AlignVCenter - - - From b2bf1b3425117944611db0ec19d6deb46e37f5ca Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 29 Nov 2015 00:05:49 +0800 Subject: [PATCH 4/4] Reduce mainwindow border width --- src/gui/mainwindow.cpp | 2 +- src/gui/mainwindow.ui | 36 ++++++++++++------------------------ 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 1ead855db..8343b4c3f 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -215,7 +215,7 @@ MainWindow::MainWindow(QWidget *parent) connect(BitTorrent::Session::instance(), SIGNAL(trackerError(BitTorrent::TorrentHandle *const, const QString &)), transferListFilters, SLOT(trackerError(BitTorrent::TorrentHandle *const, const QString &))); connect(BitTorrent::Session::instance(), SIGNAL(trackerWarning(BitTorrent::TorrentHandle *const, const QString &)), transferListFilters, SLOT(trackerWarning(BitTorrent::TorrentHandle *const, const QString &))); - vboxLayout->addWidget(tabs); + centralWidgetLayout->addWidget(tabs); prioSeparator = toolBar->insertSeparator(actionTopPriority); prioSeparatorMenu = menu_Edit->insertSeparator(actionTopPriority); diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index f6ef90af0..7f48e98aa 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -13,11 +13,17 @@ Qt::CustomContextMenu - - - - - + + + + 7 + + + 3 + + + 5 + 0 @@ -29,7 +35,7 @@ 0 0 914 - 20 + 22 @@ -152,17 +158,11 @@ E&xit - - Exit - &Options... - - Options - @@ -173,25 +173,16 @@ &Resume - - Resume - &Pause - - Pause - &Delete - - Delete - @@ -319,9 +310,6 @@ Lock - - Lock qBittorrent - Ctrl+L