diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index 52fd01ad8..ae135ab00 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -292,6 +292,11 @@ void ChatWidget::addTitleBarWidget(QWidget *w) ui->pluginTitleFrame->layout()->addWidget(w) ; } +void ChatWidget::addTopBarWidget(QWidget *w) +{ + ui->pluginTopFrame->layout()->addWidget(w) ; +} + void ChatWidget::hideChatText(bool hidden) { ui->chatTextFrame->setHidden(hidden); ; diff --git a/retroshare-gui/src/gui/chat/ChatWidget.h b/retroshare-gui/src/gui/chat/ChatWidget.h index 39dc88181..b90cceb28 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.h +++ b/retroshare-gui/src/gui/chat/ChatWidget.h @@ -115,6 +115,7 @@ public: // small enough in size. void addChatBarWidget(QWidget *w) ; void addTitleBarWidget(QWidget *w); + void addTopBarWidget(QWidget *w); void hideChatText(bool hidden); RSButtonOnText* getNewButtonOnTextBrowser(); RSButtonOnText* getNewButtonOnTextBrowser(QString text); diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui index f4d070c11..7ecbcfdc2 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.ui +++ b/retroshare-gui/src/gui/chat/ChatWidget.ui @@ -26,6 +26,322 @@ 2 + + + + QLayout::SetMaximumSize + + + + + + 0 + 0 + + + + + 16777215 + 64 + + + + QFrame::NoFrame + + + QFrame::Plain + + + + 2 + + + 2 + + + 2 + + + 2 + + + + + 3 + + + 2 + + + 3 + + + 3 + + + 3 + + + + + + + + 75 + true + + + + Title + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + (Status) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + Status message + + + + + + + + + QFrame::NoFrame + + + QFrame::Plain + + + + 3 + + + 2 + + + 0 + + + 2 + + + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 28 + + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + Qt::CustomContextMenu + + + + :/icons/png/search.png:/icons/png/search.png + + + + 28 + 28 + + + + true + + + true + + + + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + + :/icons/png/highlight.png:/icons/png/highlight.png + + + + 28 + 28 + + + + true + + + true + + + + + + + Qt::NoFocus + + + + :/icons/png/arrow-left.png:/icons/png/arrow-left.png + + + + 28 + 28 + + + + true + + + + + + + Qt::NoFocus + + + + :/icons/png/arrow-right.png:/icons/png/arrow-right.png + + + + 28 + 28 + + + + true + + + + + + + Qt::NoFocus + + + + :/icons/png/chat-bubble-notify.png:/icons/png/chat-bubble-notify.png + + + + 28 + 28 + + + + true + + + + + + + Qt::NoFocus + + + <html><head/><body><p>Chat menu</p></body></html> + + + + :/icons/png/menu.png:/icons/png/menu.png + + + + 28 + 28 + + + + QToolButton::InstantPopup + + + true + + + + + + + QFrame::NoFrame + + + QFrame::Plain + + + + 3 + + + 2 + + + 0 + + + 2 + + + 0 + + + + + + + + + @@ -561,295 +877,6 @@ border-image: url(:/images/closepressed.png) - - - - QLayout::SetMaximumSize - - - - - - 0 - 0 - - - - - 16777215 - 64 - - - - QFrame::NoFrame - - - QFrame::Plain - - - - 2 - - - 2 - - - 2 - - - 2 - - - - - 3 - - - 2 - - - 3 - - - 3 - - - 3 - - - - - - - - 75 - true - - - - Title - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - (Status) - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - Status message - - - - - - - - - Qt::Horizontal - - - - 40 - 28 - - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - Qt::CustomContextMenu - - - - :/icons/png/search.png:/icons/png/search.png - - - - 28 - 28 - - - - true - - - true - - - - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - - :/icons/png/highlight.png:/icons/png/highlight.png - - - - 28 - 28 - - - - true - - - true - - - - - - - Qt::NoFocus - - - - :/icons/png/arrow-left.png:/icons/png/arrow-left.png - - - - 28 - 28 - - - - true - - - - - - - Qt::NoFocus - - - - :/icons/png/arrow-right.png:/icons/png/arrow-right.png - - - - 28 - 28 - - - - true - - - - - - - Qt::NoFocus - - - - :/icons/png/chat-bubble-notify.png:/icons/png/chat-bubble-notify.png - - - - 28 - 28 - - - - true - - - - - - - Qt::NoFocus - - - <html><head/><body><p>Chat menu</p></body></html> - - - - :/icons/png/menu.png:/icons/png/menu.png - - - - 28 - 28 - - - - QToolButton::InstantPopup - - - true - - - - - - - QFrame::NoFrame - - - QFrame::Plain - - - - 3 - - - 2 - - - 0 - - - 2 - - - 0 - - - - - - - - - diff --git a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp index f78b5cc30..c5ab40cbf 100644 --- a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp @@ -62,7 +62,7 @@ PopupDistantChatDialog::PopupDistantChatDialog(const DistantChatPeerId& tunnel_i _update_timer->start() ; - getChatWidget()->addChatBarWidget(_status_label) ; + getChatWidget()->addTopBarWidget(_status_label) ; updateDisplay() ; }