d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 01:44:26 +00:00
Code Issues Projects Releases Wiki Activity

Improve status bar's style

Browse Source
This commit is contained in:
Christophe Dumez 2011-03-13 13:35:08 +00:00
parent 3b898c52d3
commit d67d4a38ce
5 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -10,6 +10,7 @@
- FEATURE: Torrent content list is now sortable - FEATURE: Torrent content list is now sortable
- BUGFIX: Fix compilation with namespaced Qt (Christian Kandeler) - BUGFIX: Fix compilation with namespaced Qt (Christian Kandeler)
- COSMETIC: Added monochrome tray icon - COSMETIC: Added monochrome tray icon
- COSMETIC: Improved status bar's style
- OTHER: Make QtDBus dependency optional (X11) - OTHER: Make QtDBus dependency optional (X11)
* Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0 * Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0

BIN
src/Icons/oxygen/arrow-down.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1006 B

BIN
src/Icons/oxygen/arrow-up.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 927 B

2
src/icons.qrc
View File

@ -303,12 +303,10 @@
<file>Icons/oxygen/user-group-delete.png</file> <file>Icons/oxygen/user-group-delete.png</file>
<file>Icons/oxygen/edit-find-user.png</file> <file>Icons/oxygen/edit-find-user.png</file>
<file>Icons/oxygen/media-playback-pause.png</file> <file>Icons/oxygen/media-playback-pause.png</file>
<file>Icons/oxygen/arrow-down.png</file>
<file>Icons/oxygen/tab-close.png</file> <file>Icons/oxygen/tab-close.png</file>
<file>Icons/oxygen/inode-directory.png</file> <file>Icons/oxygen/inode-directory.png</file>
<file>Icons/oxygen/tools-report-bug.png</file> <file>Icons/oxygen/tools-report-bug.png</file>
<file>Icons/oxygen/view-filter.png</file> <file>Icons/oxygen/view-filter.png</file>
<file>Icons/oxygen/arrow-up.png</file>
<file>Icons/oxygen/services.png</file> <file>Icons/oxygen/services.png</file>
<file>Icons/oxygen/view-preview.png</file> <file>Icons/oxygen/view-preview.png</file>
<file>Icons/oxygen/view-refresh.png</file> <file>Icons/oxygen/view-refresh.png</file>

48
src/statusbar.h
View File

@ -41,6 +41,7 @@
#include <QFontMetrics> #include <QFontMetrics>
#include "qbtsession.h" #include "qbtsession.h"
#include "speedlimitdlg.h" #include "speedlimitdlg.h"
#include "iconprovider.h"
#include "preferences.h" #include "preferences.h"
#include "misc.h" #include "misc.h"
@ -52,19 +53,20 @@ public:
Preferences pref; Preferences pref;
connect(QBtSession::instance(), SIGNAL(alternativeSpeedsModeChanged(bool)), this, SLOT(updateAltSpeedsBtn(bool))); connect(QBtSession::instance(), SIGNAL(alternativeSpeedsModeChanged(bool)), this, SLOT(updateAltSpeedsBtn(bool)));
container = new QWidget(bar); container = new QWidget(bar);
layout = new QGridLayout(container); layout = new QHBoxLayout(container);
layout->setVerticalSpacing(0);
layout->setContentsMargins(0,0,0,0); layout->setContentsMargins(0,0,0,0);
container->setLayout(layout); container->setLayout(layout);
connecStatusLblIcon = new QPushButton(bar); connecStatusLblIcon = new QPushButton(bar);
connecStatusLblIcon->setFlat(true); connecStatusLblIcon->setFlat(true);
connecStatusLblIcon->setFocusPolicy(Qt::NoFocus); connecStatusLblIcon->setFocusPolicy(Qt::NoFocus);
connecStatusLblIcon->setFixedWidth(22); connecStatusLblIcon->setFixedWidth(32);
connecStatusLblIcon->setCursor(Qt::PointingHandCursor); connecStatusLblIcon->setCursor(Qt::PointingHandCursor);
connecStatusLblIcon->setIcon(QIcon(":/Icons/skin/firewalled.png")); connecStatusLblIcon->setIcon(QIcon(":/Icons/skin/firewalled.png"));
connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection status:")+QString::fromUtf8("</b><br>")+QString::fromUtf8("<i>")+tr("No direct connections. This may indicate network configuration problems.")+QString::fromUtf8("</i>")); connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection status:")+QString::fromUtf8("</b><br>")+QString::fromUtf8("<i>")+tr("No direct connections. This may indicate network configuration problems.")+QString::fromUtf8("</i>"));
dlSpeedLbl = new QPushButton(tr("D: %1 B/s - T: %2", "Download speed: x B/s - Transferred: x MiB").arg("0.0").arg(misc::friendlyUnit(0)), bar); dlSpeedLbl = new QPushButton(bar);
dlSpeedLbl->setIconSize(QSize(16,16));
dlSpeedLbl->setIcon(QIcon(":/Icons/skin/download.png"));
//dlSpeedLbl->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); //dlSpeedLbl->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
connect(dlSpeedLbl, SIGNAL(clicked()), this, SLOT(capDownloadSpeed())); connect(dlSpeedLbl, SIGNAL(clicked()), this, SLOT(capDownloadSpeed()));
dlSpeedLbl->setFlat(true); dlSpeedLbl->setFlat(true);
@ -72,7 +74,7 @@ public:
dlSpeedLbl->setCursor(Qt::PointingHandCursor); dlSpeedLbl->setCursor(Qt::PointingHandCursor);
altSpeedsBtn = new QPushButton(bar); altSpeedsBtn = new QPushButton(bar);
altSpeedsBtn->setFixedWidth(32); altSpeedsBtn->setFixedWidth(36);
altSpeedsBtn->setIconSize(QSize(32,32)); altSpeedsBtn->setIconSize(QSize(32,32));
altSpeedsBtn->setFlat(true); altSpeedsBtn->setFlat(true);
altSpeedsBtn->setFocusPolicy(Qt::NoFocus); altSpeedsBtn->setFocusPolicy(Qt::NoFocus);
@ -81,7 +83,9 @@ public:
connect(altSpeedsBtn, SIGNAL(clicked()), this, SLOT(toggleAlternativeSpeeds())); connect(altSpeedsBtn, SIGNAL(clicked()), this, SLOT(toggleAlternativeSpeeds()));
upSpeedLbl = new QPushButton(tr("U: %1 B/s - T: %2", "Upload speed: x B/s - Transferred: x MiB").arg("0.0").arg(misc::friendlyUnit(0)), bar); upSpeedLbl = new QPushButton(bar);
upSpeedLbl->setIconSize(QSize(16,16));
upSpeedLbl->setIcon(QIcon(":/Icons/skin/seeding.png"));
//upSpeedLbl->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); //upSpeedLbl->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
connect(upSpeedLbl, SIGNAL(clicked()), this, SLOT(capUploadSpeed())); connect(upSpeedLbl, SIGNAL(clicked()), this, SLOT(capUploadSpeed()));
upSpeedLbl->setFlat(true); upSpeedLbl->setFlat(true);
@ -105,22 +109,15 @@ public:
statusSep4->setFixedSize(3, dlSpeedLbl->fontMetrics().height()); statusSep4->setFixedSize(3, dlSpeedLbl->fontMetrics().height());
statusSep4->setFrameStyle(QFrame::VLine); statusSep4->setFrameStyle(QFrame::VLine);
statusSep4->setFrameShadow(QFrame::Raised); statusSep4->setFrameShadow(QFrame::Raised);
layout->addWidget(DHTLbl, 0, 0, Qt::AlignLeft); layout->addWidget(DHTLbl);
//layout->setColumnStretch(0, 10); layout->addWidget(statusSep1);
layout->addWidget(statusSep1, 0, 1, Qt::AlignRight); layout->addWidget(connecStatusLblIcon);
//layout->setColumnStretch(1, 1); layout->addWidget(statusSep2);
layout->addWidget(connecStatusLblIcon, 0, 2); layout->addWidget(altSpeedsBtn);
//layout->setColumnStretch(2, 1); layout->addWidget(statusSep4);
layout->addWidget(statusSep2, 0, 3, Qt::AlignLeft); layout->addWidget(dlSpeedLbl);
//layout->setColumnStretch(3, 1); layout->addWidget(statusSep3);
layout->addWidget(dlSpeedLbl, 0, 4, Qt::AlignLeft); layout->addWidget(upSpeedLbl);
//layout->setColumnStretch(4, 10);
layout->addWidget(statusSep3, 0, 5, Qt::AlignRight);
layout->addWidget(altSpeedsBtn, 0, 6);
layout->addWidget(statusSep4, 0, 7, Qt::AlignLeft);
//layout->setColumnStretch(5, 10);
layout->addWidget(upSpeedLbl, 0, 8, Qt::AlignLeft);
//layout->setColumnStretch(6, 10);
bar->addPermanentWidget(container); bar->addPermanentWidget(container);
container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
@ -133,6 +130,7 @@ public:
// Is DHT enabled // Is DHT enabled
DHTLbl->setVisible(pref.isDHTEnabled()); DHTLbl->setVisible(pref.isDHTEnabled());
refreshTimer = new QTimer(bar); refreshTimer = new QTimer(bar);
refreshStatusBar();
connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refreshStatusBar())); connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refreshStatusBar()));
refreshTimer->start(1500); refreshTimer->start(1500);
} }
@ -190,8 +188,8 @@ public slots:
//statusSep1->setVisible(false); //statusSep1->setVisible(false);
} }
// Update speed labels // Update speed labels
dlSpeedLbl->setText(tr("D: %1/s - T: %2", "Download speed: x KiB/s - Transferred: x MiB").arg(misc::friendlyUnit(sessionStatus.payload_download_rate)).arg(misc::friendlyUnit(sessionStatus.total_payload_download))); dlSpeedLbl->setText(tr("%1/s", "Per second").arg(misc::friendlyUnit(sessionStatus.payload_download_rate))+" ("+misc::friendlyUnit(sessionStatus.total_payload_download)+")");
upSpeedLbl->setText(tr("U: %1/s - T: %2", "Upload speed: x KiB/s - Transferred: x MiB").arg(misc::friendlyUnit(sessionStatus.payload_upload_rate)).arg(misc::friendlyUnit(sessionStatus.total_payload_upload))); upSpeedLbl->setText(tr("%1/s", "Per second").arg(misc::friendlyUnit(sessionStatus.payload_upload_rate))+" ("+misc::friendlyUnit(sessionStatus.total_payload_upload)+")");
} }
void updateAltSpeedsBtn(bool alternative) { void updateAltSpeedsBtn(bool alternative) {
@ -259,7 +257,7 @@ private:
QPushButton *altSpeedsBtn; QPushButton *altSpeedsBtn;
QTimer *refreshTimer; QTimer *refreshTimer;
QWidget *container; QWidget *container;
QGridLayout *layout; QHBoxLayout *layout;
}; };