From d67d4a38ce1de52861309cd70c28a5e2fd2532f8 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sun, 13 Mar 2011 13:35:08 +0000 Subject: [PATCH] Improve status bar's style --- Changelog | 1 + src/Icons/oxygen/arrow-down.png | Bin 1006 -> 0 bytes src/Icons/oxygen/arrow-up.png | Bin 927 -> 0 bytes src/icons.qrc | 2 -- src/statusbar.h | 48 +++++++++++++++----------------- 5 files changed, 24 insertions(+), 27 deletions(-) delete mode 100644 src/Icons/oxygen/arrow-down.png delete mode 100644 src/Icons/oxygen/arrow-up.png diff --git a/Changelog b/Changelog index 792b85c9f..7d91bcf2f 100644 --- a/Changelog +++ b/Changelog @@ -10,6 +10,7 @@ - FEATURE: Torrent content list is now sortable - BUGFIX: Fix compilation with namespaced Qt (Christian Kandeler) - COSMETIC: Added monochrome tray icon + - COSMETIC: Improved status bar's style - OTHER: Make QtDBus dependency optional (X11) * Sun Jan 9 2011 - Christophe Dumez - v2.6.0 diff --git a/src/Icons/oxygen/arrow-down.png b/src/Icons/oxygen/arrow-down.png deleted file mode 100644 index 7c9274f30c627b15bd8bb867ffc7a5180000e3a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1006 zcmV3n@jf>Vp&zse#g9O-SqQNonv@vQCQY(CnVmB;XU;kE zdNOCRTcf3BNxg9Qs<;gy zeMNSS0k)TMq^JUT`Jp36*Q2ls2P-k(3*R&DC~-glj4^*6%=g^�ubu^2Vz)_ZT;H}(07!B@cxmnkEF}<%P?e+Z%T7 z4Ybv(-ziW=Ayp}o%$e2Btd_;^D%6FEd(--tnfVX@F@!Wq7vm&8H1y37%Bg5y1QAXK| zGEb|x$OV{XUN|f8;&F?C1Sn@^bk}+j%9ShhiT>!xUc=wa`!P`MdW9yfC?A z;sq>ckBTQv1Cc}ee(TBrmTJpW7&C7@@jO6P%Fu;fmw&pvaQC;nUYrVfaPmF399(li z{Y6|pG_Xx>$AkGr7a08pohS9LCL$W484&iLxpXECmqS1J)Wmv7Q!&IyS`B#ml70mD zLQO$_fR5ADI%Yy2O0D(hqnAd>Dhr--hZh${fE0l%zDB$!?SWY$%EI&uI%dwcH5EG( zgSD_Wa`pSGtKvoYgcab1gJsMcXb~^PB~)Y&qkyv`-2FZ7C5E1fK;#s1(GvLKQ6bNl^a^p~VO7gGiBDv%1~cd$02& z><>#Q)igoabNI6Jc0Qarune7Z*vS%U27m$J{|jK9qJFZjb_BpTI6d}Q_1fft+V$#c z_2F#=a5psszuYB9r+>cw)A)_`-@f21^|k@^^o;L`r-{o@l86R^_e z>$l1lfCxpJ4lu5Qin`1f>2DbTGx)6bU~PVGb`DnLgNtYjmI##4K`2k49L0~~ad~M= z0DOsODnpg!`ZM)>xREAH4sf1>^=$^|AlhLYiEJV)mlpZ9{NO(Uc$kY?>$M{Xk5KwD z0~C=qzX1k>4Q$^A5ChGi2^EuiI9TPXTKZQ2zRD>O7nTk#1?7=4Y}U*HoefYEiB5nJ zJ%}QI__r{$EB06s=lLf0+ykI{bcdckG+vvj<%10k(k>9vb`B8%GC)5fE^worT2)LYU5LaLNHbfS?!9AFnD<86Me#1@+Zk0NtaT z9GhG|{_=4oF3E;>k~g~$Cmf*Bi|B43DnLn);Py}haa4YR?|UC^0_YxHDJ-p>di@ls z32QBkHN_T+?%M_=0F}l|qx%p=!UES&4R~cTh{Ct{t~!REQoaA}i1EqU6K8|b-J@9l za~)c0_`*j^wh*N4=s-n?v}M+QnwA7T<_P)(ODuj30RqAZpbeNL!PMwO-VeC;5rB(# z0Pro`%Ev3b`r}ocJAZCNmB#-^vSDgtm=d5AfFPjKNEXjR04xBY1RP*MH2mMQ=UeEh zzV8AqQ=oxiXl#A8P}JAB>3W6^K1>FH0bs`ge*@hA6<0(7Ze#!e002ovPDHLkV1j#5 Bmqq{p diff --git a/src/icons.qrc b/src/icons.qrc index 4ea915026..9d0d69eb8 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -303,12 +303,10 @@ Icons/oxygen/user-group-delete.png Icons/oxygen/edit-find-user.png Icons/oxygen/media-playback-pause.png - Icons/oxygen/arrow-down.png Icons/oxygen/tab-close.png Icons/oxygen/inode-directory.png Icons/oxygen/tools-report-bug.png Icons/oxygen/view-filter.png - Icons/oxygen/arrow-up.png Icons/oxygen/services.png Icons/oxygen/view-preview.png Icons/oxygen/view-refresh.png diff --git a/src/statusbar.h b/src/statusbar.h index 4087a939c..84e8b39d4 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -41,6 +41,7 @@ #include #include "qbtsession.h" #include "speedlimitdlg.h" +#include "iconprovider.h" #include "preferences.h" #include "misc.h" @@ -52,19 +53,20 @@ public: Preferences pref; connect(QBtSession::instance(), SIGNAL(alternativeSpeedsModeChanged(bool)), this, SLOT(updateAltSpeedsBtn(bool))); container = new QWidget(bar); - layout = new QGridLayout(container); - layout->setVerticalSpacing(0); + layout = new QHBoxLayout(container); layout->setContentsMargins(0,0,0,0); container->setLayout(layout); connecStatusLblIcon = new QPushButton(bar); connecStatusLblIcon->setFlat(true); connecStatusLblIcon->setFocusPolicy(Qt::NoFocus); - connecStatusLblIcon->setFixedWidth(22); + connecStatusLblIcon->setFixedWidth(32); connecStatusLblIcon->setCursor(Qt::PointingHandCursor); connecStatusLblIcon->setIcon(QIcon(":/Icons/skin/firewalled.png")); connecStatusLblIcon->setToolTip(QString::fromUtf8("")+tr("Connection status:")+QString::fromUtf8("
")+QString::fromUtf8("")+tr("No direct connections. This may indicate network configuration problems.")+QString::fromUtf8("")); - 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); connect(dlSpeedLbl, SIGNAL(clicked()), this, SLOT(capDownloadSpeed())); dlSpeedLbl->setFlat(true); @@ -72,7 +74,7 @@ public: dlSpeedLbl->setCursor(Qt::PointingHandCursor); altSpeedsBtn = new QPushButton(bar); - altSpeedsBtn->setFixedWidth(32); + altSpeedsBtn->setFixedWidth(36); altSpeedsBtn->setIconSize(QSize(32,32)); altSpeedsBtn->setFlat(true); altSpeedsBtn->setFocusPolicy(Qt::NoFocus); @@ -81,7 +83,9 @@ public: 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); connect(upSpeedLbl, SIGNAL(clicked()), this, SLOT(capUploadSpeed())); upSpeedLbl->setFlat(true); @@ -105,22 +109,15 @@ public: statusSep4->setFixedSize(3, dlSpeedLbl->fontMetrics().height()); statusSep4->setFrameStyle(QFrame::VLine); statusSep4->setFrameShadow(QFrame::Raised); - layout->addWidget(DHTLbl, 0, 0, Qt::AlignLeft); - //layout->setColumnStretch(0, 10); - layout->addWidget(statusSep1, 0, 1, Qt::AlignRight); - //layout->setColumnStretch(1, 1); - layout->addWidget(connecStatusLblIcon, 0, 2); - //layout->setColumnStretch(2, 1); - layout->addWidget(statusSep2, 0, 3, Qt::AlignLeft); - //layout->setColumnStretch(3, 1); - layout->addWidget(dlSpeedLbl, 0, 4, Qt::AlignLeft); - //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); + layout->addWidget(DHTLbl); + layout->addWidget(statusSep1); + layout->addWidget(connecStatusLblIcon); + layout->addWidget(statusSep2); + layout->addWidget(altSpeedsBtn); + layout->addWidget(statusSep4); + layout->addWidget(dlSpeedLbl); + layout->addWidget(statusSep3); + layout->addWidget(upSpeedLbl); bar->addPermanentWidget(container); container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); @@ -133,6 +130,7 @@ public: // Is DHT enabled DHTLbl->setVisible(pref.isDHTEnabled()); refreshTimer = new QTimer(bar); + refreshStatusBar(); connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refreshStatusBar())); refreshTimer->start(1500); } @@ -190,8 +188,8 @@ public slots: //statusSep1->setVisible(false); } // 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))); - 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))); + dlSpeedLbl->setText(tr("%1/s", "Per second").arg(misc::friendlyUnit(sessionStatus.payload_download_rate))+" ("+misc::friendlyUnit(sessionStatus.total_payload_download)+")"); + upSpeedLbl->setText(tr("%1/s", "Per second").arg(misc::friendlyUnit(sessionStatus.payload_upload_rate))+" ("+misc::friendlyUnit(sessionStatus.total_payload_upload)+")"); } void updateAltSpeedsBtn(bool alternative) { @@ -259,7 +257,7 @@ private: QPushButton *altSpeedsBtn; QTimer *refreshTimer; QWidget *container; - QGridLayout *layout; + QHBoxLayout *layout; };