From 43bced2e0435805f8e8c38b60d2155e12a5c24e1 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sun, 15 Apr 2007 14:53:38 +0000 Subject: [PATCH] - Improved refresh icon - Added tooltips on rss buttons - Fixed a compiling warning --- src/Icons/exec.png | Bin 0 -> 1408 bytes src/Icons/loading.gif | Bin 592 -> 0 bytes src/icons.qrc | 1 + src/rss.h | 18 +++++++++--------- src/rss.ui | 9 +++++++++ src/rss_imp.cpp | 8 ++++---- 6 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 src/Icons/exec.png delete mode 100644 src/Icons/loading.gif diff --git a/src/Icons/exec.png b/src/Icons/exec.png new file mode 100644 index 0000000000000000000000000000000000000000..14dc7455cd999636c38f46c3b90e2a951dd78b99 GIT binary patch literal 1408 zcmV-`1%LX9P)|>NTNpY!5247&_qRIBA6hFiN>f= z6XQlSQ3LXVA<-HIWl=*6f-Fsqm9V!33Imj-ovzc));n{Tv-r>@NF^A*r}J>m@0|bk z9fF(m?B1N^Q}ResClBhb7}EL&HbD#LAk{MN^ERpI#l0^?^SF)3=wkH&#{{7Jo{Ypf z+toH%yC>uef7-R7eTG9iJIaiwl`p!By0Tl4PJP+%+AMxs@ahAOX*2SfP4KAhihb8I z?6KB5BdWrHnG-6U;WAsu7#Klq%fJ<*rEPT}T6a+hr8T`?)p1Mk^ZT8pEhhW@d>ONf za}qh7AVYv~TN+lvf#wSkQ-dh8fB-`{;a)Lpc^NJjtZ(p*G&sy2pW~ z0FMZX{yqv-4uoS_lyFyS5#B95w~uOim=>7Tgb)L85go`NNC~bM8q|04dMefs7?+Bb zd+diDkdM$Eg_VeI@6G` z3K8$J?Sc!}-_%58r;@5awy}-_fR+|y*{Ps0uP?#?0Mt`ZLL_<{_iXEF*nAj(JMxHQ zbKkCSm@sF_S~FVw7NOKC6AA;>k>H>{ZKKs?zslM#uL96G%*mq4OA{auzyTyD5P?8( zuy#@D4Nw3;^9QREUaI4BEkrk)r2$z`qMcs|3or2{QXotsTD#HOx0062p(OFUG zqmT(`Nd*i64%Lw;DVZ0VI{%&fH#A4bwUTMZ38f8`5KaUE$x8%!x?;}R9X|rd0su8c zroO^HwQhlV;hUNw+opL1sM?aSg`V^tT_taUP+|JNe2euUrhoY zr^uI=&(s&KTN{1+V9|{uU9jZcrn__HGj^T}7FBUV0Rj*O6ceuM48OfPsG5QS)~FS* zgl^DDL!eJK_v5~^NiePeA`}AceXen|aZPI9%I~!iu&XMkFYK|biJVhF0APTkzyR0C zQCF*NvDMV5sh+ZQB6EVUK?j=6K@{lSfWeRQ-d*eE#Ou-PkH@XQJSOw+;c z{hu5jJiTLYaryFNlv)pDtHMz@fSz{|y3#wOC-Tz2!_p8U(0XmfE?zz9wQk)ivzIym z$T1Tdo2*Y4+ZY~|k+3T|l|&AA0%V$kwX-j!9Xj|0E32KrHTtp$FrqhKJHwA}`H;td zivjTe;cmB*6w=i@bLpae-Fc}|s-HafOXk$3-PWRy^2VWf6;EC7=dHW<_?^F=1d#dH zujy7Qs90!P)1O#MgVi$MU}whwS0geK7=R!?v^kQ~L)sw@1$!sndNiSTz%dsL9jV*#4S2ZRjFx)H04f3G)P!J&DH zbK{z$w~mS4+uEU=X(#q0Qm1z4sXwe7BYR@H`l50z1M*TtE}FB6g`B0=nqB zMD8>JWEVMxa5IRk<33&VH|$5wVb(}RMpO?$9H0}iOY~rXrFgeMt{B5LgojQUg!H^V zwASakxwF8}efRC;0wO$-d;kg&E^vrwM(koeaC)bx)8tjxyiL!Dsc^&__TBefmL19C z%z5~}j4+Gy;~&SL?~7qVww?vbevHSRSr;b$Od+ z43D$n?ytSiO-|{zA955zHh}|ZJIMdq5e!%VwX8TguX|!x^oAH26-&nhyv?E0_`B>@ zYjU*CKJ>|Ff8xT+dynf(0lS|QEk+F@cHQ~+K~U)CoY2@=-0w~sG%UI?_3=zCh6fx@ cm$&io7;lzlX_bAvOZGjR;3uoy?o15U06?S2&Hw-a diff --git a/src/icons.qrc b/src/icons.qrc index f739c9e48..2db423761 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -27,6 +27,7 @@ Icons/refresh.png Icons/add_folder.png Icons/loading.png + Icons/exec.png Icons/flags/portugal.png Icons/flags/france.png Icons/flags/ukraine.png diff --git a/src/rss.h b/src/rss.h index f003de122..e33b72ff3 100644 --- a/src/rss.h +++ b/src/rss.h @@ -156,7 +156,7 @@ class RssStream : public QObject{ emit refreshFinished(url, NEWS); } - void displayIcon(const QString&, const QString& file_path, int return_code, const QString&) { + void displayIcon(const QString&, const QString& file_path, int, const QString&) { /*if(QFile::exists(iconPath) && iconPath!=":/Icons/rss.png") { QFile::remove(iconPath); } @@ -166,7 +166,7 @@ class RssStream : public QObject{ //iconPath = ":/Icons/rss.png"; //iconPath = "/tmp/favicon.gif"; - + if(return_code){ // Download failed qDebug("(download failure) "+iconPath.toUtf8()); @@ -180,7 +180,7 @@ class RssStream : public QObject{ openIcon(); emit refreshFinished(url, ICON);*/ qDebug("******************Icone downloaded"+file_path.toUtf8()); - } + } public: RssStream(const QString& _url) { @@ -192,7 +192,7 @@ class RssStream : public QObject{ connect(downloaderRss, SIGNAL(downloadFinished(const QString&, const QString&, int, const QString&)), this, SLOT(processDownloadedFile(const QString&, const QString&, int, const QString&))); downloaderRss->downloadUrl(url); // XXX: remove it when gif can be displayed - iconPath = ":/Icons/rss.png"; + iconPath = ":/Icons/rss.png"; //getIcon(); lastRefresh.start(); } @@ -256,7 +256,7 @@ class RssStream : public QObject{ QString getIconPath() const{ return iconPath; - } + } RssItem* getItem(unsigned int index) const{ return listItem.at(index); @@ -310,7 +310,7 @@ class RssStream : public QObject{ for(unsigned short i=0; iSTREAM_MAX_ITEM) { listItem.removeAt(STREAM_MAX_ITEM); } - + } // existing and opening test after download @@ -411,7 +411,7 @@ class RssStream : public QObject{ // global class, manage the whole rss stream class RssManager : public QObject{ Q_OBJECT - + private : QList streamList; QStringList streamListUrl; @@ -423,7 +423,7 @@ class RssManager : public QObject{ void streamNeedRefresh(const QString& _url, const unsigned short& type) { emit(streamNeedRefresh(hasStream(_url), type)); } - + public : RssManager(){ loadStreamList(); diff --git a/src/rss.ui b/src/rss.ui index b2f5aebdd..4fdeee915 100644 --- a/src/rss.ui +++ b/src/rss.ui @@ -90,6 +90,9 @@ 22 + + Delete selected streams + @@ -109,6 +112,9 @@ 22 + + Refresh RSS streams + @@ -128,6 +134,9 @@ 22 + + Add a new RSS stream + diff --git a/src/rss_imp.cpp b/src/rss_imp.cpp index 725c013d2..97781a0a3 100644 --- a/src/rss_imp.cpp +++ b/src/rss_imp.cpp @@ -211,7 +211,7 @@ } // when news are refreshed, update all informations if(type == NEWS) { - //qDebug("###################"+rssmanager.getStream(i)->getIconPath().toUtf8()); + //qDebug("###################"+rssmanager.getStream(i)->getIconPath().toUtf8()); unsigned short nbitem = rssmanager.getStream(i)->getListSize(); listStreams->item(i)->setText(rssmanager.getStream(i)->getAlias().toUtf8()+" ("+QString::number(nbitem,10).toUtf8()+")"); if(nbitem==0) @@ -220,14 +220,14 @@ listStreams->item(i)->setData(Qt::ForegroundRole, QVariant(QColor("orange"))); else listStreams->item(i)->setData(Qt::ForegroundRole, QVariant(QColor("green"))); - + if(!rssmanager.getStream(i)->isRead()) listStreams->item(i)->setData(Qt::BackgroundRole, QVariant(QColor(0, 255, 0, 20))); if(listStreams->currentRow()==i) { listNews->clear(); refreshNewsList(); } - listStreams->item(i)->setData(Qt::DecorationRole, QVariant(QIcon(rssmanager.getStream(i)->getIconPath()))); + listStreams->item(i)->setData(Qt::DecorationRole, QVariant(QIcon(rssmanager.getStream(i)->getIconPath()))); } } @@ -235,7 +235,7 @@ setupUi(this); addStream_button->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/add.png"))); delStream_button->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/remove.png"))); - refreshAll_button->setIcon(QIcon(QString::fromUtf8(":/Icons/refresh.png"))); + refreshAll_button->setIcon(QIcon(QString::fromUtf8(":/Icons/exec.png"))); connect(listStreams, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayFinishedListMenu(const QPoint&))); connect(actionDelete, SIGNAL(triggered()), this, SLOT(deleteStream())); connect(actionRename, SIGNAL(triggered()), this, SLOT(renameStream()));