Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-18 22:10:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved Id Chooser to Tool Menu

Browse source 
Added a place holder text.
This commit is contained in:
defnax 2015-08-30 03:48:45 +02:00
parent b11baa7a65
commit d9fd60ee75
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View file

@ -25,6 +25,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QInputDialog> #include <QInputDialog>
#include <QMenu> #include <QMenu>
#include <QWidgetAction>
#include "ChatLobbyDialog.h" #include "ChatLobbyDialog.h"
#include "gui/ChatLobbyWidget.h" #include "gui/ChatLobbyWidget.h"
@ -81,8 +82,8 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
// Add a button to invite friends. // Add a button to invite friends.
// //
inviteFriendsButton = new QToolButton ; inviteFriendsButton = new QToolButton ;
inviteFriendsButton->setMinimumSize(QSize(2*S,2*S)) ; inviteFriendsButton->setMinimumSize(QSize(2*S,2*S)) ;
inviteFriendsButton->setMaximumSize(QSize(2*S,2*S)) ; inviteFriendsButton->setMaximumSize(QSize(2*S,2*S)) ;
inviteFriendsButton->setText(QString()) ; inviteFriendsButton->setText(QString()) ;
inviteFriendsButton->setAutoRaise(true) ; inviteFriendsButton->setAutoRaise(true) ;
inviteFriendsButton->setToolTip(tr("Invite friends to this lobby")); 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 = new GxsIdChooser() ;
ownIdChooser->loadIds(IDCHOOSER_ID_REQUIRED,current_id) ; 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())) ; connect(ownIdChooser,SIGNAL(currentIndexChanged(int)),this,SLOT(changeNickname())) ;

4
retroshare-gui/src/gui/chat/ChatLobbyDialog.h
View file

@ -29,6 +29,7 @@
class GxsIdChooser ; class GxsIdChooser ;
class QToolButton; class QToolButton;
class QWidgetAction;
class ChatLobbyDialog: public ChatDialog class ChatLobbyDialog: public ChatDialog
{ {
@ -55,7 +56,7 @@ private slots:
signals: signals:
void lobbyLeave(ChatLobbyId) ; void lobbyLeave(ChatLobbyId) ;
void typingEventReceived(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 peerJoined(ChatLobbyId) ;
void peerLeft(ChatLobbyId) ; void peerLeft(ChatLobbyId) ;
@ -102,6 +103,7 @@ private:
QAction *muteAct; QAction *muteAct;
QAction *distantChatAct; QAction *distantChatAct;
QWidgetAction *checkableAction;
GxsIdChooser *ownIdChooser ; GxsIdChooser *ownIdChooser ;
}; };

6
retroshare-gui/src/gui/chat/CreateLobbyDialog.ui
View file

@ -71,7 +71,11 @@
</widget> </widget>
</item> </item>
<item row="1" column="2"> <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>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">