diff --git a/plugins/FeedReader/FeedReaderPlugin.cpp b/plugins/FeedReader/FeedReaderPlugin.cpp
index 6406dc034..24b602f9c 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 = (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()
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; }
-
+
diff --git a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui
index 3b52ca54b..2a00b14b0 100644
--- a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui
@@ -122,26 +122,6 @@
- -
-
-
-
- 0
- 0
-
-
-
- Qt::NoFocus
-
-
- Remove Item
-
-
-
- :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg
-
-
-
-
@@ -305,6 +285,26 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::NoFocus
+
+
+ Remove Item
+
+
+
+ :/icons/png/exit2.png:/icons/png/exit2.png
+
+
+
@@ -342,17 +342,17 @@
-
- StyledLabel
- QLabel
-
-
AvatarWidget
QLabel
gui/common/AvatarWidget.h
1
+
+ StyledLabel
+ QLabel
+
+
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
index e94938020..e722fa255 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
@@ -227,6 +227,9 @@
Qt::NoFocus
+
+ Copy RetroShare Link
+
:/icons/png/copy.png:/icons/png/copy.png
@@ -269,7 +272,7 @@
- :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg
+ :/icons/png/exit2.png:/icons/png/exit2.png
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
index 4807fb175..c166d115b 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
@@ -396,19 +396,21 @@ void GxsChannelPostItem::fill()
{
QPixmap thumbnail;
+ ui->logoLabel->setScaledContents(true);
+
GxsIdDetails::loadPixmapFromData(mPost.mThumbnail.mData, mPost.mThumbnail.mSize, thumbnail,GxsIdDetails::ORIGINAL);
// Wiping data - as its been passed to thumbnail.
- if( thumbnail.width() < 90 ){
- ui->logoLabel->setMaximumSize(82*f,108*f);
- }
- else if( thumbnail.width() < 109 ){
- ui->logoLabel->setMinimumSize(108*f,108*f);
- ui->logoLabel->setMaximumSize(108*f,108*f);
- }
- else{
- ui->logoLabel->setMinimumSize(156*f,108*f);
- ui->logoLabel->setMaximumSize(156*f,108*f);
- }
+// if( thumbnail.width() < 90 ){
+// ui->logoLabel->setMaximumSize(82*f,108*f);
+// }
+// else if( thumbnail.width() < 109 ){
+// ui->logoLabel->setMinimumSize(108*f,108*f);
+// ui->logoLabel->setMaximumSize(108*f,108*f);
+// }
+// else{
+// ui->logoLabel->setMinimumSize(156*f,108*f);
+// ui->logoLabel->setMaximumSize(156*f,108*f);
+// }
ui->logoLabel->setPixmap(thumbnail);
}
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
index e81b4ed78..0e0b7b57c 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
@@ -457,7 +457,7 @@
- :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg
+ :/icons/png/exit2.png:/icons/png/exit2.png
diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
index 066ea2121..a506efa7b 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
@@ -227,6 +227,9 @@
Qt::NoFocus
+
+ Copy RetroShare link
+
:/icons/png/copy.png:/icons/png/copy.png
@@ -269,7 +272,7 @@
- :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg
+ :/icons/png/exit2.png:/icons/png/exit2.png
diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
index 47b1457b2..5f8bfd262 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
@@ -283,7 +283,7 @@
- :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg
+ :/icons/png/exit2.png:/icons/png/exit2.png
diff --git a/retroshare-gui/src/gui/feeds/MsgItem.ui b/retroshare-gui/src/gui/feeds/MsgItem.ui
index 6e47331d9..0437b72b5 100644
--- a/retroshare-gui/src/gui/feeds/MsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/MsgItem.ui
@@ -256,7 +256,7 @@
- :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg
+ :/icons/png/exit2.png:/icons/png/exit2.png
diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui
index b7a18df71..df863f40b 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.ui
+++ b/retroshare-gui/src/gui/feeds/PeerItem.ui
@@ -31,72 +31,8 @@
0
-
-
-
-
-
-
- 159
- 206
- 96
-
-
-
-
-
-
- 157
- 206
- 96
-
-
-
-
-
-
-
-
- 159
- 206
- 96
-
-
-
-
-
-
- 157
- 206
- 96
-
-
-
-
-
-
-
-
- 240
- 240
- 240
-
-
-
-
-
-
- 157
- 206
- 96
-
-
-
-
-
-
- true
+ false
QFrame::Box
@@ -315,7 +251,7 @@
- :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg
+ :/icons/png/exit2.png:/icons/png/exit2.png
@@ -567,17 +503,17 @@
-
- StyledLabel
- QLabel
-
-
AvatarWidget
QLabel
gui/common/AvatarWidget.h
1
+
+ StyledLabel
+ QLabel
+
+
diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
index 3b3a3dbb4..2ebd46dbc 100644
--- a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
@@ -224,6 +224,9 @@
Qt::NoFocus
+
+ Copy RetroShare Link
+
:/icons/png/copy.png:/icons/png/copy.png
@@ -266,7 +269,7 @@
- :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg
+ :/icons/png/exit2.png:/icons/png/exit2.png
diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
index defbd39f1..c95532cc1 100644
--- a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
+++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
@@ -31,75 +31,11 @@
0
-
-
-
-
-
-
- 207
- 150
- 103
-
-
-
-
-
-
- 207
- 150
- 103
-
-
-
-
-
-
-
-
- 207
- 150
- 103
-
-
-
-
-
-
- 207
- 150
- 103
-
-
-
-
-
-
-
-
- 240
- 240
- 240
-
-
-
-
-
-
- 207
- 150
- 103
-
-
-
-
-
-
<html><head/><body><p>This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you're connected to will not see your external IP, but the attacker's IP. </p><p><br/></p><p>However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing's wrong in this case.</p><p><br/></p><p>You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options->Notify->News Feed.</p></body></html>
- true
+ false
QFrame::Box
@@ -254,7 +190,7 @@
- :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg
+ :/icons/png/exit2.png:/icons/png/exit2.png
@@ -474,17 +410,17 @@
-
- StyledLabel
- QLabel
-
-
AvatarWidget
QLabel
gui/common/AvatarWidget.h
1
+
+ StyledLabel
+ QLabel
+
+
RsBanListToolButton
QToolButton
diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.ui b/retroshare-gui/src/gui/feeds/SecurityItem.ui
index 6b62a5aff..8e4d10967 100644
--- a/retroshare-gui/src/gui/feeds/SecurityItem.ui
+++ b/retroshare-gui/src/gui/feeds/SecurityItem.ui
@@ -31,72 +31,8 @@
0
-
-
-
-
-
-
- 207
- 150
- 103
-
-
-
-
-
-
- 207
- 150
- 103
-
-
-
-
-
-
-
-
- 207
- 150
- 103
-
-
-
-
-
-
- 207
- 150
- 103
-
-
-
-
-
-
-
-
- 240
- 240
- 240
-
-
-
-
-
-
- 207
- 150
- 103
-
-
-
-
-
-
- true
+ false
QFrame::Box
@@ -251,7 +187,7 @@
Qt::ToolButtonTextBesideIcon
- true
+ false
@@ -277,7 +213,7 @@
Qt::ToolButtonTextBesideIcon
- true
+ false
@@ -401,7 +337,7 @@
- :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg
+ :/icons/png/exit2.png:/icons/png/exit2.png
@@ -629,17 +565,17 @@
-
- StyledLabel
- QLabel
-
-
AvatarWidget
QLabel
gui/common/AvatarWidget.h
1
+
+ StyledLabel
+ QLabel
+
+
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index de4edca3f..d95ab7cc9 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -409,20 +409,6 @@ GxsChannelPostItem QLabel#logoLabel {
background-color: black;
}
-ChatMsgItem > QFrame#frame {
- border: 2px solid black;
- background-color: #FEF6DE;
- border-radius: 10px;
-}
-
-ChatMsgItem QWidget#avatar {
- border: 2px solid black;
-}
-
-ChatMsgItem QLabel#peerNameLabel {
- color: #990033;
-}
-
ForumNewItem > QFrame#frame, ForumMsgItem > QFrame#frame {
border: 2px solid #CCCCCC;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);
@@ -444,54 +430,6 @@ ForumMsgItem QFrame#prevFrame {
border-radius: 10px;
}
-PeerItem > QFrame#frame {
- border: 2px solid green;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BDDF7D, stop: 1 #649C35);
- border-radius: 10px;
-}
-
-PeerItem QWidget#avatar {
- border: 2px solid green;
- background-color: #BDDF7D;
-}
-
-PeerItem QLabel#peerNameLabel {
- color: #990033
-}
-
-MsgItem QFrame#frame {
- border: 2px solid #0099cc;
- border-radius: 6px;
- background: white;
-}
-
-MsgItem QFrame#inviteFrame {
- border: 1px solid #DCDC41;
- border-radius: 6px;
- background: #FFFFD7;
- background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
-}
-
-MsgItem QWidget#avatar {
- background-color: #2291E0;
-}
-
-SecurityItem > QFrame#frame {
- border: 2px solid #FF9412;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FFE8A4, stop: 1 #FFB252);
- border-radius: 10px;
-}
-
-SecurityItem QLabel#peerNameLabel, SecurityItem QLabel#requestLabel {
- color: black;
-}
-
-SecurityIpItem > QFrame#frame {
- border: 2px solid #FF9412;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FFE8A4, stop: 1 #FFB252);
- border-radius: 10px;
-}
-
SubFileItem > QFrame#frame {
border: 2px solid #238;
background: white;