diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
index e5dd78685..bc6796570 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
@@ -44,11 +44,18 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
QWidget *parent, Qt::WFlags flags)
: QMainWindow(parent, flags), dialogId(id), dialogName(name),
lastChatTime(0), lastChatName("")
+
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
+
+ /* Hide ToolBox frame */
+ showAvatarFrame(true);
+ connect(ui.avatarFrameButton, SIGNAL(toggled(bool)), this, SLOT(showAvatarFrame(bool)));
connect(ui.lineEdit, SIGNAL(returnPressed( ) ), this, SLOT(sendChat( ) ));
+
+ connect(ui.sendButton, SIGNAL(clicked( ) ), this, SLOT(sendChat( ) ));
connect(ui.colorButton, SIGNAL(clicked()), this, SLOT(setColor()));
@@ -65,12 +72,24 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
ui.textBrowser->setOpenExternalLinks ( false );
QString title = "RS:" + tr("Chatting with") + " " + QString::fromStdString(name);
- setWindowTitle(title);
+ setWindowTitle(title);
+
+ //set the default avatar
+ ui.avatarlabel->setPixmap(QPixmap(":/images/retrosharelogo1.png"));
+
+ setWindowIcon(QIcon(QString(":/images/chat.png")));
+ ui.textboldButton->setIcon(QIcon(QString(":/images/edit-bold.png")));
+ ui.textunderlineButton->setIcon(QIcon(QString(":/images/edit-underline.png")));
+ ui.textitalicButton->setIcon(QIcon(QString(":/images/edit-italic.png")));
}
-
+/** Destructor. */
+PopupChatDialog::~PopupChatDialog()
+{
+
+}
/**
Overloads the default show() slot so we can set opacity*/
@@ -258,4 +277,20 @@ void PopupChatDialog::sendChat()
/* redraw send list */
}
-
+/**
+ Toggles the ToolBox on and off, changes toggle button text
+ */
+void PopupChatDialog::showAvatarFrame(bool show)
+{
+ if (show) {
+ ui.avatarframe->setVisible(true);
+ ui.avatarFrameButton->setChecked(true);
+ ui.avatarFrameButton->setToolTip(tr("Hide Avatar"));
+ ui.avatarFrameButton->setIcon(QIcon(tr(":images/hide_toolbox_frame.png")));
+ } else {
+ ui.avatarframe->setVisible(false);
+ ui.avatarFrameButton->setChecked(false);
+ ui.avatarFrameButton->setToolTip(tr("Show Avatar"));
+ ui.avatarFrameButton->setIcon(QIcon(tr(":images/show_toolbox_frame.png")));
+ }
+}
diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.h b/retroshare-gui/src/gui/chat/PopupChatDialog.h
index f115bb2c6..8051197e1 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.h
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.h
@@ -45,6 +45,7 @@ public:
PopupChatDialog(std::string id, std::string name,
QWidget *parent = 0, Qt::WFlags flags = 0);
/** Default destructor */
+ ~PopupChatDialog();
void updateChat();
void addChatMsg(ChatInfo *ci);
@@ -58,6 +59,8 @@ protected:
private slots:
+ void showAvatarFrame(bool show);
+
void setColor();
void textBold();
diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.ui b/retroshare-gui/src/gui/chat/PopupChatDialog.ui
index d080c7ae6..e06413c68 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.ui
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.ui
@@ -5,678 +5,245 @@
0
0
- 398
- 256
+ 560
+ 332
-
-
- 165
- 165
-
-
-
-
-
-
-
-
- 16
- 16
- 16
-
-
-
-
-
-
- 208
- 208
- 208
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 247
- 247
- 247
-
-
-
-
-
-
- 104
- 104
- 104
-
-
-
-
-
-
- 160
- 160
- 160
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 240
- 240
- 240
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 0
- 0
- 255
-
-
-
-
-
-
- 255
- 0
- 255
-
-
-
-
-
-
- 247
- 247
- 247
-
-
-
-
-
-
-
-
- 16
- 16
- 16
-
-
-
-
-
-
- 208
- 208
- 208
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 247
- 247
- 247
-
-
-
-
-
-
- 104
- 104
- 104
-
-
-
-
-
-
- 160
- 160
- 160
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 240
- 240
- 240
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 0
- 0
- 255
-
-
-
-
-
-
- 255
- 0
- 255
-
-
-
-
-
-
- 247
- 247
- 247
-
-
-
-
-
-
-
-
- 104
- 104
- 104
-
-
-
-
-
-
- 208
- 208
- 208
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 247
- 247
- 247
-
-
-
-
-
-
- 104
- 104
- 104
-
-
-
-
-
-
- 160
- 160
- 160
-
-
-
-
-
-
- 104
- 104
- 104
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 104
- 104
- 104
-
-
-
-
-
-
- 240
- 240
- 240
-
-
-
-
-
-
- 240
- 240
- 240
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 0
- 0
- 255
-
-
-
-
-
-
- 255
- 0
- 255
-
-
-
-
-
-
- 247
- 247
- 247
-
-
-
-
-
-
-
-
- Arial
- 8
- 50
- false
- false
- false
- false
-
-
-
- Qt::NoContextMenu
-
- RetroShare User Chat
-
-
- :/images/chat.png
+ MainWindow
-
-
- 1
-
-
- 1
-
- -
-
-
- Qt::Vertical
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
-
-
-
- 0
-
-
- 6
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- 0
-
-
- 6
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 321
- 20
-
-
-
-
- -
-
-
-
- 24
- 24
-
-
-
-
- 24
- 24
-
-
-
-
-
-
- :/images/edit-underline.png
-
-
- true
-
-
-
- -
-
-
-
- 24
- 24
-
-
-
-
- 24
- 24
-
-
-
-
-
-
- :/images/edit-italic.png
-
-
- true
-
-
-
- -
-
-
-
- 24
- 24
-
-
-
-
- 24
- 24
-
-
-
-
-
-
- :/images/edit-bold.png
-
-
- true
-
-
-
- -
-
-
-
- 24
- 24
-
-
-
-
- 24
- 24
-
-
-
-
-
-
-
-
-
-
-
-
+ -
+
+
-
+
+
+
+ 14
+ 31
+
+
+
+
+ 14
+ 31
+
+
+
+
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 16
+ 509
+
+
+
+
+
+
+ -
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 64
+ 64
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 121
+ 131
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 261
+ 20
+
+
+
+
+ -
+
+
+
+ 24
+ 24
+
+
+
+
+ 24
+ 24
+
+
+
+
+
+
+ C:/Dokumente und Einstellungen/Linux/.designer/backup
+
+
+ true
+
+
+
+ -
+
+
+
+ 24
+ 24
+
+
+
+
+ 24
+ 24
+
+
+
+
+
+
+ C:/Dokumente und Einstellungen/Linux/.designer/backup
+
+
+ true
+
+
+
+ -
+
+
+
+ 24
+ 24
+
+
+
+
+ 24
+ 24
+
+
+
+
+
+
+ C:/Dokumente und Einstellungen/Linux/.designer/backup
+
+
+ true
+
+
+
+ -
+
+
+
+ 24
+ 24
+
+
+
+
+ 24
+ 24
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ -
+
+
+ Send
+
+
+
+
+
-
- lineEdit
- textboldButton
- textunderlineButton
- textitalicButton
- colorButton
- textBrowser
-
-
-
-
+