diff --git a/src/Icons/exec.png b/src/Icons/exec.png
new file mode 100644
index 000000000..14dc7455c
Binary files /dev/null and b/src/Icons/exec.png differ
diff --git a/src/Icons/loading.gif b/src/Icons/loading.gif
deleted file mode 100644
index dfbfc5707..000000000
Binary files a/src/Icons/loading.gif and /dev/null differ
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()));