diff --git a/retroshare-gui/src/gui/common/SubscribeToolButton.cpp b/retroshare-gui/src/gui/common/SubscribeToolButton.cpp
index cd7321b6f..69de79e47 100644
--- a/retroshare-gui/src/gui/common/SubscribeToolButton.cpp
+++ b/retroshare-gui/src/gui/common/SubscribeToolButton.cpp
@@ -61,7 +61,7 @@ void SubscribeToolButton::updateUi()
} else {
setPopupMode(QToolButton::DelayedPopup);
setMenu(NULL);
- setIcon(QIcon());
+ setIcon(QIcon(":/images/RSS_004_32.png"));
setText(tr("Subscribe"));
#ifndef USE_MENUBUTTONPOPUP
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
index 22a1407f3..c59d12ec0 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
@@ -171,4 +171,9 @@ void GxsForumsDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo,
if (descriptionIt != forumData->mDescription.end()) {
groupItemInfo.description = descriptionIt.value();
}
+
+ if (IS_GROUP_ADMIN(groupInfo.mSubscribeFlags)) {
+ groupItemInfo.icon = QIcon(":images/konv_message2.png");
+ }
+
}
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index b2e191e84..c842b242f 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -115,6 +115,7 @@
images/channelsblue.png
images/copyrslink.png
images/contacts24.png
+ images/contactsclosed24.png
images/connection.png
images/contact_new.png
images/contact_new22.png
diff --git a/retroshare-gui/src/gui/images/contactsclosed24.png b/retroshare-gui/src/gui/images/contactsclosed24.png
new file mode 100644
index 000000000..4698bb08a
Binary files /dev/null and b/retroshare-gui/src/gui/images/contactsclosed24.png differ
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index c42a7fbc2..992b7da78 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -130,14 +130,16 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
m_compareRole->setRole(COLUMN_CONTACT_NAME, ROLE_CONTACT_SORT);
m_completer = NULL;
+
+ ui.distantFrame->hide();
Settings->loadWidgetInformation(this);
setAttribute ( Qt::WA_DeleteOnClose, true );
ui.hashBox->hide();
- ui.signMessage_CB->setChecked(true) ;
- ui.signMessage_CB->setEnabled(false) ;
+ ui.signMessage_CB->setChecked(true) ;
+ ui.signMessage_CB->setEnabled(false) ;
// connect up the buttons.
connect( ui.actionSend, SIGNAL( triggered (bool)), this, SLOT( sendMessage( ) ) );
@@ -1457,6 +1459,8 @@ void MessageComposer::setRecipientToRow(int row, enumType type, destinationType
name = tr("%2 <%2@%1>").arg(QString::fromStdString(gid.toStdString())).arg(QString::fromUtf8(detail.mNickname.c_str())) ;
icon = QIcon(identicon);
+
+ ui.distantFrame->show();
}
break ;
@@ -2181,11 +2185,22 @@ bool MessageComposer::maybeSave()
void MessageComposer::toggleContacts()
{
ui.contactsdockWidget->setVisible(!ui.contactsdockWidget->isVisible());
+ updatecontactsviewicons();
}
void MessageComposer::on_contactsdockWidget_visibilityChanged(bool visible)
{
contactSidebarAction->setChecked(visible);
+ updatecontactsviewicons();
+}
+
+void MessageComposer::updatecontactsviewicons()
+{
+ if(!ui.contactsdockWidget->isVisible()){
+ ui.actionContactsView->setIcon(QIcon(":/images/contactsclosed24.png"));
+ }else{
+ ui.actionContactsView->setIcon(QIcon(":/images/contacts24.png"));
+ }
}
void MessageComposer::addImage()
@@ -2473,3 +2488,8 @@ void MessageComposer::showTagLabels()
ui.tagLayout->addStretch();
}
}
+
+void MessageComposer::on_closeInfoFrameButton_clicked()
+{
+ ui.distantFrame->setVisible(false);
+}
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h
index c93680da8..ee5b3db0e 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.h
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.h
@@ -93,6 +93,8 @@ private slots:
void on_contactsdockWidget_visibilityChanged(bool visible);
void toggleContacts();
void buildCompleter();
+ void updatecontactsviewicons();
+
void fileNew();
void fileOpen();
@@ -147,6 +149,8 @@ private slots:
void tagAboutToShow();
void tagSet(int tagId, bool set);
void tagRemoveAll();
+
+ void on_closeInfoFrameButton_clicked();
private:
static QString buildReplyHeader(const MessageInfo &msgInfo);
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui
index 14aef61cb..bb6929a87 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.ui
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui
@@ -6,7 +6,7 @@
0
0
- 892
+ 814
682
@@ -646,7 +646,7 @@
- -
+
-
@@ -789,6 +789,148 @@
+ -
+
+
+
+
+
+
+
+ 255
+ 255
+ 255
+
+
+
+
+
+
+ 255
+ 255
+ 178
+
+
+
+
+
+
+
+
+ 255
+ 255
+ 255
+
+
+
+
+
+
+ 255
+ 255
+ 178
+
+
+
+
+
+
+
+
+ 255
+ 255
+ 178
+
+
+
+
+
+
+ 255
+ 255
+ 178
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+ QFrame::Box
+
+
+
+ 6
+
+
-
+
+
+
+ 16
+ 16
+
+
+
+
+
+
+ :/images/info16.png
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+ Distant messages stay into your Outbox until an acknowledgement of receipt has been received.
+
+
+
+ -
+
+
+
+ 16
+ 16
+
+
+
+ Qt::NoFocus
+
+
+ Close
+
+
+ QToolButton
+{
+ border-image: url(:/images/closenormal.png)
+}
+
+QToolButton:hover
+{
+border-image: url(:/images/closehover.png)
+}
+
+QToolButton:pressed {
+border-image: url(:/images/closepressed.png)
+}
+
+
+ true
+
+
+
+
+
+
@@ -868,8 +1010,8 @@
0
0
- 892
- 25
+ 814
+ 21
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index 1f585c272..acfd85864 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -584,4 +584,12 @@ QLabel#subscribersLabel{
border: 1px solid #CCCCCC;
border-radius: 6px;
-}
\ No newline at end of file
+}
+
+QFrame#distantFrame{
+ 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);
+}
+
diff --git a/retroshare-gui/src/gui/qss/stylesheet/qss.default b/retroshare-gui/src/gui/qss/stylesheet/qss.default
index 171749a48..9302d6b43 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/qss.default
+++ b/retroshare-gui/src/gui/qss/stylesheet/qss.default
@@ -138,7 +138,7 @@ ForumsDialog, GxsForumThreadWidget
GroupTreeWidget
{
qproperty-textColorCategory: rgb(79, 79, 79);
- qproperty-textColorPrivateKey: blue;
+ qproperty-textColorPrivateKey: rgb(35,91,159);
}
FriendSelectionWidget
@@ -156,7 +156,7 @@ FriendList
qproperty-textColorStatusOffline: black;
qproperty-textColorStatusAway: gray;
qproperty-textColorStatusBusy: gray;
- qproperty-textColorStatusOnline: darkBlue;
+ qproperty-textColorStatusOnline: darkGreen;
qproperty-textColorStatusInactive: gray;
qproperty-textColorGroup: rgb(123, 123, 123);
}