From 0afc0f298ee2495cbdb2139f98c6f5e8815b5246 Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 24 Aug 2010 15:28:50 +0000 Subject: [PATCH] Added close Button for the Info Frame. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3393 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/chat/PopupChatDialog.cpp | 5 +++ retroshare-gui/src/gui/chat/PopupChatDialog.h | 1 + .../src/gui/chat/PopupChatDialog.ui | 36 +++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp index 7a862ebb9..aa6944e94 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp @@ -572,6 +572,11 @@ void PopupChatDialog::showAvatarFrame(bool show) } } +void PopupChatDialog::on_closeInfoFrameButton_clicked() +{ + ui.infoframe->setVisible(false); +} + void PopupChatDialog::setColor() { bool ok; diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.h b/retroshare-gui/src/gui/chat/PopupChatDialog.h index 358cfcaad..7c6b55810 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.h +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.h @@ -92,6 +92,7 @@ private slots: void addExtraFile(); void addExtraPicture(); void showAvatarFrame(bool show); + void on_closeInfoFrameButton_clicked(); void setColor(); void getFont(); diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.ui b/retroshare-gui/src/gui/chat/PopupChatDialog.ui index f9bc40eed..82f9558e8 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.ui +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.ui @@ -245,6 +245,40 @@ stop:0 #FFFFD7, stop:1 #FFFFB2);} + + + + + 16 + 16 + + + + Close + + + QToolButton +{ + border-image: url(:/images/closenormal.png) +} + +QToolButton:hover +{ +border-image: url(:/images/closehover.png) +} + +QToolButton:pressed { +border-image: url(:/images/closepressed.png) +} + + + + + + true + + + @@ -774,6 +808,8 @@ border: 1px solid #CCCCCC; + +