Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 16:39:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1716 from defnax/Fixed-feedreader-compile-and-changed-icons-for-the-feed-item

Browse Source 
Fixed feedreader compile and changed icons for the feed item
This commit is contained in:
csoler 2019-11-26 22:06:05 +01:00 committed by GitHub
commit a591289ec2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/FeedReader/FeedReaderPlugin.cpp
View File

@ -55,7 +55,7 @@ extern "C" {
#ifdef WIN32
__declspec(dllexport)
#endif
uint32_t RETROSHARE_PLUGIN_revision = 0;
uint32_t RETROSHARE_PLUGIN_revision = (uint32_t)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()

4
plugins/FeedReader/gui/FeedReaderFeedItem.cpp
View File

@ -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"));
}

16
plugins/FeedReader/gui/FeedReaderFeedItem.ui
View File

@ -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>