From c12d63373022ccf64232a3a1eaec6155041f36ee Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 24 Nov 2019 16:54:24 +0100
Subject: [PATCH] Fixed FeedeReader compile & changed feed item icons

---
 plugins/FeedReader/FeedReaderPlugin.cpp       |  4 ++--
 plugins/FeedReader/gui/FeedReaderFeedItem.cpp |  4 ++--
 plugins/FeedReader/gui/FeedReaderFeedItem.ui  | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

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 @@
     <x>0</x>
     <y>0</y>
     <width>629</width>
-    <height>121</height>
+    <height>123</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
@@ -195,8 +195,8 @@ p, li { white-space: pre-wrap; }
                <string>Expand</string>
               </property>
               <property name="icon">
-               <iconset resource="../../../retroshare-gui/src/gui/images.qrc">
-                <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
+               <iconset resource="../../../retroshare-gui/src/gui/icons.qrc">
+                <normaloff>:/icons/png/down-arrow.png</normaloff>:/icons/png/down-arrow.png</iconset>
               </property>
              </widget>
             </item>
@@ -221,8 +221,8 @@ p, li { white-space: pre-wrap; }
                <string>Set as read and remove item</string>
               </property>
               <property name="icon">
-               <iconset resource="../../../retroshare-gui/src/gui/images.qrc">
-                <normaloff>:/images/cancel.png</normaloff>:/images/cancel.png</iconset>
+               <iconset resource="../../../retroshare-gui/src/gui/icons.qrc">
+                <normaloff>:/icons/png/correct.png</normaloff>:/icons/png/correct.png</iconset>
               </property>
              </widget>
             </item>
@@ -247,8 +247,8 @@ p, li { white-space: pre-wrap; }
                <string>Remove Item</string>
               </property>
               <property name="icon">
-               <iconset resource="../../../retroshare-gui/src/gui/images.qrc">
-                <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
+               <iconset resource="../../../retroshare-gui/src/gui/icons.qrc">
+                <normaloff>:/icons/png/exit2.png</normaloff>:/icons/png/exit2.png</iconset>
               </property>
              </widget>
             </item>
@@ -345,7 +345,7 @@ p, li { white-space: pre-wrap; }
  </customwidgets>
  <resources>
   <include location="FeedReader_images.qrc"/>
-  <include location="../../../retroshare-gui/src/gui/images.qrc"/>
+  <include location="../../../retroshare-gui/src/gui/icons.qrc"/>
  </resources>
  <connections/>
 </ui>