diff --git a/plugins/FeedReader/FeedReaderPlugin.cpp b/plugins/FeedReader/FeedReaderPlugin.cpp index 6406dc034..d068240d8 100644 --- a/plugins/FeedReader/FeedReaderPlugin.cpp +++ b/plugins/FeedReader/FeedReaderPlugin.cpp @@ -55,7 +55,7 @@ extern "C" { #ifdef WIN32 __declspec(dllexport) #endif - uint32_t RETROSHARE_PLUGIN_revision = 0; + uint32_t RETROSHARE_PLUGIN_revision = abs(atoi(RS_EXTRA_VERSION)) ; // This symbol contains the svn revision number grabbed from the executable. // It will be tested by RS to load the plugin automatically, since it is safe to load plugins @@ -72,7 +72,7 @@ void FeedReaderPlugin::getPluginVersion(int& major, int& minor, int &build, int& major = RS_MAJOR_VERSION; minor = RS_MINOR_VERSION; build = RS_MINI_VERSION; - svn_rev = 0; + svn_rev = abs(atoi(RS_EXTRA_VERSION)) ; } FeedReaderPlugin::FeedReaderPlugin() diff --git a/plugins/FeedReader/gui/FeedReaderFeedItem.cpp b/plugins/FeedReader/gui/FeedReaderFeedItem.cpp index d813a5f7a..8e1ef4db5 100644 --- a/plugins/FeedReader/gui/FeedReaderFeedItem.cpp +++ b/plugins/FeedReader/gui/FeedReaderFeedItem.cpp @@ -107,13 +107,13 @@ void FeedReaderFeedItem::doExpand(bool open) if (open) { ui->expandFrame->show(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); ui->expandButton->setToolTip(tr("Hide")); setMsgRead(); } else { ui->expandFrame->hide(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); ui->expandButton->setToolTip(tr("Expand")); } diff --git a/plugins/FeedReader/gui/FeedReaderFeedItem.ui b/plugins/FeedReader/gui/FeedReaderFeedItem.ui index f2b7431c5..37c2df915 100644 --- a/plugins/FeedReader/gui/FeedReaderFeedItem.ui +++ b/plugins/FeedReader/gui/FeedReaderFeedItem.ui @@ -7,7 +7,7 @@ 0 0 629 - 121 + 123 @@ -195,8 +195,8 @@ p, li { white-space: pre-wrap; } Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -221,8 +221,8 @@ p, li { white-space: pre-wrap; } Set as read and remove item - - :/images/cancel.png:/images/cancel.png + + :/icons/png/correct.png:/icons/png/correct.png @@ -247,8 +247,8 @@ p, li { white-space: pre-wrap; } Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/png/exit2.png:/icons/png/exit2.png @@ -345,7 +345,7 @@ p, li { white-space: pre-wrap; } - +