From d9fd60ee75a64537a8394991f48303ce51e9957a Mon Sep 17 00:00:00 2001
From: defnax <defnator@gmail.com>
Date: Sun, 30 Aug 2015 03:48:45 +0200
Subject: [PATCH] Moved Id Chooser to Tool Menu Added a place holder text.

---
 retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp  | 13 ++++++++++---
 retroshare-gui/src/gui/chat/ChatLobbyDialog.h    |  4 +++-
 retroshare-gui/src/gui/chat/CreateLobbyDialog.ui |  6 +++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
index b695cc62e..7bc1e8c1f 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
@@ -25,6 +25,7 @@
 #include <QMessageBox>
 #include <QInputDialog>
 #include <QMenu>
+#include <QWidgetAction>
 
 #include "ChatLobbyDialog.h"
 #include "gui/ChatLobbyWidget.h"
@@ -81,8 +82,8 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
 	// Add a button to invite friends.
 	//
 	inviteFriendsButton = new QToolButton ;
-    inviteFriendsButton->setMinimumSize(QSize(2*S,2*S)) ;
-    inviteFriendsButton->setMaximumSize(QSize(2*S,2*S)) ;
+  inviteFriendsButton->setMinimumSize(QSize(2*S,2*S)) ;
+  inviteFriendsButton->setMaximumSize(QSize(2*S,2*S)) ;
 	inviteFriendsButton->setText(QString()) ;
 	inviteFriendsButton->setAutoRaise(true) ;
 	inviteFriendsButton->setToolTip(tr("Invite friends to this lobby"));
@@ -106,8 +107,14 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
 
     ownIdChooser = new GxsIdChooser() ;
     ownIdChooser->loadIds(IDCHOOSER_ID_REQUIRED,current_id) ;
+    
+    QWidgetAction *checkableAction = new QWidgetAction(this);
+    checkableAction->setDefaultWidget(ownIdChooser);
+
+    ui.chatWidget->addToolsAction(checkableAction);
+    //getChatWidget()->addChatBarWidget(ownIdChooser);
+    
 
-    getChatWidget()->addChatBarWidget(ownIdChooser) ;
 
     connect(ownIdChooser,SIGNAL(currentIndexChanged(int)),this,SLOT(changeNickname())) ;
 
diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h
index 1aa742573..7729abba8 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h
@@ -29,6 +29,7 @@
 
 class GxsIdChooser ;
 class QToolButton;
+class QWidgetAction;
 
 class ChatLobbyDialog: public ChatDialog
 {
@@ -55,7 +56,7 @@ private slots:
 signals:
 	void lobbyLeave(ChatLobbyId) ;
 	void typingEventReceived(ChatLobbyId) ;
-	void messageReceived(bool incoming, ChatLobbyId lobby_id, QDateTime time, QString senderName, QString msg) ;
+	void messageReceived(bool incoming, ChatLobbyId lobby_id, QDateTime time, QString senderName, QString msg) ;
 	void peerJoined(ChatLobbyId) ;
 	void peerLeft(ChatLobbyId) ;
 
@@ -102,6 +103,7 @@ private:
 
 	QAction *muteAct;
     QAction *distantChatAct;
+    QWidgetAction *checkableAction;
 
     GxsIdChooser *ownIdChooser ;
 };
diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui b/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui
index 1d2340e08..4877a5f71 100644
--- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui
+++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui
@@ -71,7 +71,11 @@
               </widget>
              </item>
              <item row="1" column="2">
-              <widget class="QLineEdit" name="lobbyTopic_LE"/>
+              <widget class="QLineEdit" name="lobbyTopic_LE">
+               <property name="placeholderText">
+                <string>Set a descriptive topic here</string>
+               </property>
+              </widget>
              </item>
              <item row="2" column="0">
               <widget class="QLabel" name="label_4">