diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
index f619ddc79..2f3a21442 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
@@ -32,16 +32,16 @@
#define TYPE_FOLDER 0
#define TYPE_LOBBY 1
-#define IMAGE_CREATE ""
-#define IMAGE_PUBLIC ":/images/chat_x24.png"
-#define IMAGE_PRIVATE ":/images/chat_red24.png"
-#define IMAGE_UNSUBSCRIBE ""
-#define IMAGE_SUBSCRIBE ""
-#define IMAGE_PEER_ENTERING ":images/user/add_user24.png"
-#define IMAGE_PEER_LEAVING ":images/user/remove_user24.png"
-#define IMAGE_TYPING ":images/typing.png"
-#define IMAGE_MESSAGE ":images/chat.png"
-#define IMAGE_AUTOSUBSCRIBE ":images/accepted16.png"
+#define IMAGE_CREATE ""
+#define IMAGE_PUBLIC ":/images/chat_x24.png"
+#define IMAGE_PRIVATE ":/images/chat_red24.png"
+#define IMAGE_SUBSCRIBE ":/images/edit_add24.png"
+#define IMAGE_UNSUBSCRIBE ":/images/cancel.png"
+#define IMAGE_PEER_ENTERING ":images/user/add_user24.png"
+#define IMAGE_PEER_LEAVING ":images/user/remove_user24.png"
+#define IMAGE_TYPING ":images/typing.png"
+#define IMAGE_MESSAGE ":images/chat.png"
+#define IMAGE_AUTOSUBSCRIBE ":images/accepted16.png"
ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WFlags flags)
: RsAutoUpdatePage(5000, parent, flags)
@@ -173,7 +173,7 @@ void ChatLobbyWidget::lobbyTreeWidgetCustomPopupMenu(QPoint)
if (item->data(COLUMN_DATA, ROLE_AUTOSUBSCRIBE).toBool()) {
contextMnu.addAction(QIcon(IMAGE_AUTOSUBSCRIBE), tr("Remove Auto Subscribe"), this, SLOT(autoSubscribeItem()));
} else {
- contextMnu.addAction(QIcon(IMAGE_UNSUBSCRIBE), tr("Add Auto Subscribe"), this, SLOT(autoSubscribeItem()));
+ contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Add Auto Subscribe"), this, SLOT(autoSubscribeItem()));
}
}
diff --git a/retroshare-gui/src/gui/CreateMsgLinkDialog.cpp b/retroshare-gui/src/gui/CreateMsgLinkDialog.cpp
index ea32c6260..f4b280385 100644
--- a/retroshare-gui/src/gui/CreateMsgLinkDialog.cpp
+++ b/retroshare-gui/src/gui/CreateMsgLinkDialog.cpp
@@ -37,6 +37,9 @@ CreateMsgLinkDialog::CreateMsgLinkDialog()
setAttribute(Qt::WA_DeleteOnClose, false);
QObject::connect(_create_link_PB,SIGNAL(clicked()),this,SLOT(createLink())) ;
+
+ headerFrame->setHeaderImage(QPixmap(":/images/d-chat64.png"));
+ headerFrame->setHeaderText(tr("Create distant chat"));
friendSelectionWidget->setModus(FriendSelectionWidget::MODUS_SINGLE) ;
friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_NON_FRIEND_GPG | FriendSelectionWidget::SHOW_GPG) ;
diff --git a/retroshare-gui/src/gui/CreateMsgLinkDialog.ui b/retroshare-gui/src/gui/CreateMsgLinkDialog.ui
index 27a3572d3..c62f6aba1 100644
--- a/retroshare-gui/src/gui/CreateMsgLinkDialog.ui
+++ b/retroshare-gui/src/gui/CreateMsgLinkDialog.ui
@@ -13,9 +13,31 @@
Create distant chat invite
-
- -
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ -
+
+
+ Tahoma
+ 9
+
+
QFrame::StyledPanel
@@ -24,7 +46,12 @@
-
-
+
+
+
+ 10
+
+
<html><head/><body><p align="justify">To create a private chat invite for a non-friend person, select his key below and a validity time for your invite, then press "Create". The invite will contain the information required to open a tunnel to chat with you. </p><p align="justify">The invite is encrypted, and does not reveal your identity. Only the selected peer can decrypt the link, and use it to contact you.</p></body></html>
@@ -37,95 +64,113 @@
true
+
+ 2
+
- -
-
-
-
-
-
- Invite type:
-
-
-
- -
-
-
-
-
- Private chat
-
-
-
-
- -
-
-
- Validity time :
-
-
-
- -
-
-
- 1
-
-
- 30
-
-
- 5
-
-
-
- -
-
-
-
-
- hour
-
-
- -
-
- day
-
-
- -
-
- week
-
-
- -
-
- month
-
-
- -
-
- year
-
-
-
-
- -
-
-
- Create!
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
+
-
+
+
+ QFrame::StyledPanel
+
+ QFrame::Raised
+
+
+
+ 0
+
+
-
+
+
-
+
+
+ Invite type:
+
+
+
+ -
+
+
-
+
+ Private chat
+
+
+
+
+ -
+
+
+ Validity time :
+
+
+
+ -
+
+
+ 1
+
+
+ 30
+
+
+ 5
+
+
+
+ -
+
+
-
+
+ hour
+
+
+ -
+
+ day
+
+
+ -
+
+ week
+
+
+ -
+
+ month
+
+
+ -
+
+ year
+
+
+
+
+ -
+
+
+ Create!
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
@@ -137,6 +182,12 @@
gui/common/FriendSelectionWidget.h
1
+
+ HeaderFrame
+ QFrame
+
+ 1
+
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 213327dc9..57f68e1fa 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -3,6 +3,7 @@
images/add_chat24.png
images/inbox_22.png
images/blue_lock.png
+ images/d-chat64.png
images/edit_24.png
images/stock_signature_bad.png
images/stock_signature_ok.png
diff --git a/retroshare-gui/src/gui/images/d-chat64.png b/retroshare-gui/src/gui/images/d-chat64.png
new file mode 100644
index 000000000..8de20ed54
Binary files /dev/null and b/retroshare-gui/src/gui/images/d-chat64.png differ
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index fd93453cc..080fbb34d 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -91,6 +91,16 @@ MessengerWindow QFrame#logoFrame {
border: 1px solid #CCCCCC;
}
+/* Create Distant Chat Invite */
+
+CreateMsgLinkDialog QLabel#distantchatinfo_label
+{
+ 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);
+}
+
/* Chat lobby */
ChatLobbyDialog QFrame#participantsFrame {