diff --git a/retroshare-gui/src/gui/TheWire/TheWire_images.qrc b/retroshare-gui/src/gui/TheWire/TheWire_images.qrc
index 7919a4500..f6cf0b441 100644
--- a/retroshare-gui/src/gui/TheWire/TheWire_images.qrc
+++ b/retroshare-gui/src/gui/TheWire/TheWire_images.qrc
@@ -1,15 +1,5 @@
- images/kuickshow.png
- images/kview_24.png
- images/kview_64.png
- images/album_64.png
- images/album_subscribe.png
- images/album_unsubscribe.png
- images/album_create_64.png
- images/album_default_128.png
- images/my_album_48.png
- images/subscribed_album_48.png
- images/friends_album_48.png
+ images/compose.png
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.ui b/retroshare-gui/src/gui/TheWire/WireDialog.ui
index 0c0ab6f75..eb1f91d2a 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.ui
@@ -40,6 +40,13 @@
Create Account
+
+
+ :/icons/png/add.png:/icons/png/add.png
+
+
+ Qt::ToolButtonTextBesideIcon
+
-
@@ -47,6 +54,13 @@
Post Pulse
+
+
+ :/images/compose.png:/images/compose.png
+
+
+ Qt::ToolButtonTextBesideIcon
+
-
@@ -143,7 +157,7 @@
-
- Subscribed
+ Following
-
@@ -153,6 +167,20 @@
+ -
+
+
+
+ 10
+ 75
+ true
+
+
+
+ Who to Follow
+
+
+
-
@@ -163,8 +191,8 @@
0
0
- 231
- 435
+ 228
+ 421
@@ -291,8 +319,8 @@
0
0
- 429
- 435
+ 431
+ 443
@@ -339,6 +367,7 @@
+
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
index d09a9e1e5..ea771df5f 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
@@ -24,6 +24,7 @@
#include
#include "WireGroupItem.h"
+#include "gui/gxs/GxsIdDetails.h"
#include
#include
@@ -49,6 +50,16 @@ void WireGroupItem::setup()
label_groupName->setText(QString::fromStdString(mGroup.mMeta.mGroupName));
label_authorId->setId(mGroup.mMeta.mAuthorId);
frame_details->setVisible(false);
+
+ RsIdentityDetails idDetails ;
+ rsIdentity->getIdDetails(mGroup.mMeta.mAuthorId,idDetails);
+
+ QPixmap pixmap ;
+
+ if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL))
+ pixmap = GxsIdDetails::makeDefaultIcon(mGroup.mMeta.mAuthorId,GxsIdDetails::SMALL);
+
+ label_avatar->setPixmap(pixmap);
connect(toolButton_show, SIGNAL(clicked()), this, SLOT(show()));
connect(toolButton_subscribe, SIGNAL(clicked()), this, SLOT(subscribe()));
@@ -64,13 +75,13 @@ void WireGroupItem::setGroupSet()
}
else if (mGroup.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)
{
- toolButton_type->setText("Subcribed");
- toolButton_subscribe->setText("Unsubcribe");
+ toolButton_type->setText("Following");
+ toolButton_subscribe->setText("Unfollow");
}
else
{
toolButton_type->setText("Other");
- toolButton_subscribe->setText("Subcribe");
+ toolButton_subscribe->setText("Follow");
}
}
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.ui b/retroshare-gui/src/gui/TheWire/WireGroupItem.ui
index a71e1ed23..bf1f162a4 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupItem.ui
+++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.ui
@@ -25,6 +25,22 @@
-
+
-
+
+
+
+ 32
+ 32
+
+
+
+ Avatar
+
+
+ true
+
+
+
-
diff --git a/retroshare-gui/src/gui/TheWire/images/compose.png b/retroshare-gui/src/gui/TheWire/images/compose.png
new file mode 100644
index 000000000..3a033462b
Binary files /dev/null and b/retroshare-gui/src/gui/TheWire/images/compose.png differ
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 8806741ee..a5d6838ae 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -1240,7 +1240,8 @@ gxsthewire {
gui/TheWire/WireGroupItem.cpp \
gui/TheWire/WireGroupDialog.cpp \
gui/TheWire/PulseAddDialog.cpp \
-
+
+ RESOURCES += gui/TheWire/TheWire_images.qrc
}
identities {