mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 18:56:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3343 from Chocobo1/tx_list

Browse source 
Minor style change in transfer list & filters
This commit is contained in:
sledgehammer999 2015-10-25 10:09:40 -05:00
commit cd3dc3d645
4 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/utils/misc.cpp
View file

@ -43,6 +43,7 @@
#else
#include <QApplication>
#include <QDesktopWidget>
#include <QStyle>
#endif
#ifdef Q_OS_WIN
@ -639,3 +640,12 @@ void Utils::Misc::msleep(unsigned long msecs)
{
SleeperThread::msleep(msecs);
}
#ifndef DISABLE_GUI
QSize Utils::Misc::smallIconSize()
{
// Get DPI scaled icon size (device-dependent), see QT source
int s = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
return QSize(s, s);
}
#endif

1
src/core/utils/misc.h
View file

@ -54,6 +54,7 @@ namespace Utils
void shutdownComputer(ShutdownAction action);
// Get screen center
QPoint screenCenter(QWidget *win);
QSize smallIconSize();
#endif
int pythonVersion();
QString pythonExecutable();

3
src/gui/mainwindow.cpp
View file

@ -179,7 +179,7 @@ MainWindow::MainWindow(QWidget *parent)
hSplitter = new QSplitter(Qt::Vertical, this);
hSplitter->setChildrenCollapsible(false);
hSplitter->setContentsMargins(0, 4, 0, 0);
hSplitter->setFrameShape(QFrame::NoFrame);
// Name filter
search_filter = new LineEdit(this);
@ -193,6 +193,7 @@ MainWindow::MainWindow(QWidget *parent)
// Transfer List tab
transferList = new TransferListWidget(hSplitter, this);
//transferList->setStyleSheet("QTreeView {border: none;}"); // borderless
properties = new PropertiesWidget(hSplitter, this, transferList);
transferListFilters = new TransferListFiltersWidget(vSplitter, transferList);
hSplitter->addWidget(transferList);

45
src/gui/transferlistfilterswidget.cpp
View file

@ -60,15 +60,20 @@ FiltersBase::FiltersBase(QWidget *parent, TransferListWidget *transferList)
: QListWidget(parent)
, transferList(transferList)
{
setStyleSheet("QListWidget { background: transparent; border: 0 }");
setFrameShape(QFrame::NoFrame);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
setUniformItemSizes(true);
setSpacing(0);
setIconSize(Utils::Misc::smallIconSize());
#if defined(Q_OS_MAC)
setAttribute(Qt::WA_MacShowFocusRect, false);
#endif
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setContextMenuPolicy(Qt::CustomContextMenu);
setIconSize(QSize(16, 16));
connect(this, SIGNAL(customContextMenuRequested(QPoint)), SLOT(showMenu(QPoint)));
connect(this, SIGNAL(currentRowChanged(int)), SLOT(applyFilter(int)));
@ -80,9 +85,9 @@ QSize FiltersBase::sizeHint() const
{
QSize size;
// Height should be exactly the height of the content
size.setHeight((sizeHintForRow(0) * count()) + (2 * frameWidth()) + 6);
// Width should be exactly the height of the content
size.setWidth(sizeHintForColumn(0) + (2 * frameWidth()));
size.setHeight(((sizeHintForRow(0) + 2 * spacing()) * (count() + 0.5)));
// Width should be exactly the width of the content
size.setWidth(sizeHintForColumn(0));
return size;
}
@ -105,11 +110,6 @@ void FiltersBase::toggleFilter(bool checked)
StatusFiltersWidget::StatusFiltersWidget(QWidget *parent, TransferListWidget *transferList)
: FiltersBase(parent, transferList)
{
setUniformItemSizes(true);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
// Height is fixed (sizeHint().height() is used)
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
setSpacing(0);
connect(BitTorrent::Session::instance(), SIGNAL(torrentsUpdated(const BitTorrent::TorrentStatusReport &)), SLOT(updateTorrentNumbers(const BitTorrent::TorrentStatusReport &)));
// Add status filters
@ -176,8 +176,6 @@ LabelFiltersList::LabelFiltersList(QWidget *parent, TransferListWidget *transfer
, m_totalTorrents(0)
, m_totalLabeled(0)
{
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
connect(BitTorrent::Session::instance(), SIGNAL(torrentLabelChanged(BitTorrent::TorrentHandle *const, QString)), SLOT(torrentChangedLabel(BitTorrent::TorrentHandle *const, QString)));
// Add Label filters
@ -420,8 +418,6 @@ TrackerFiltersList::TrackerFiltersList(QWidget *parent, TransferListWidget *tran
: FiltersBase(parent, transferList)
, m_totalTorrents(0)
{
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
QListWidgetItem *allTrackers = new QListWidgetItem(this);
allTrackers->setData(Qt::DisplayRole, QVariant(tr("All (0)", "this is for the label filter")));
allTrackers->setData(Qt::DecorationRole, GuiIconProvider::instance()->getIcon("network-server"));
@ -772,23 +768,20 @@ TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferLi
font.setBold(true);
font.setCapitalization(QFont::AllUppercase);
frame->setFrameShadow(QFrame::Plain);
frame->setFrameShape(QFrame::NoFrame);
scroll->setFrameShadow(QFrame::Plain);
scroll->setFrameShape(QFrame::NoFrame);
scroll->setStyleSheet("QFrame { background: transparent; }");
scroll->setWidgetResizable(true);
scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
vLayout->setContentsMargins(0, 4, 0, 0);
frameLayout->setContentsMargins(0, 4, 0, 0);
setStyleSheet("QFrame {background: transparent;}");
scroll->setStyleSheet("QFrame {border: none;}");
vLayout->setContentsMargins(0, 0, 0, 0);
frameLayout->setContentsMargins(0, 2, 0, 0);
frameLayout->setSpacing(2);
frameLayout->setAlignment(Qt::AlignLeft | Qt::AlignTop);
frame->setLayout(frameLayout);
scroll->setWidget(frame);
vLayout->addWidget(scroll);
setLayout(vLayout);
setContentsMargins(0,0,0,0);
QCheckBox * statusLabel = new QCheckBox(tr("Status"), this);
statusLabel->setChecked(pref->getStatusFilterState());
@ -814,8 +807,6 @@ TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferLi
trackerFilters = new TrackerFiltersList(this, transferList);
frameLayout->addWidget(trackerFilters);
frameLayout->addStretch();
connect(statusLabel, SIGNAL(toggled(bool)), statusFilters, SLOT(toggleFilter(bool)));
connect(statusLabel, SIGNAL(toggled(bool)), pref, SLOT(setStatusFilterState(const bool)));
connect(labelLabel, SIGNAL(toggled(bool)), labelFilters, SLOT(toggleFilter(bool)));