From e6367a2947eb0b0ed2b110dac97531bdb4b872ce Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 8 Jan 2009 18:28:18 +0000 Subject: [PATCH] * removed frame git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@921 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MessengerWindow.ui | 130 ++++++------------ .../src/gui/chat/PopupChatDialog.cpp | 2 +- 2 files changed, 42 insertions(+), 90 deletions(-) diff --git a/retroshare-gui/src/gui/MessengerWindow.ui b/retroshare-gui/src/gui/MessengerWindow.ui index 3472fd305..7bf9064da 100644 --- a/retroshare-gui/src/gui/MessengerWindow.ui +++ b/retroshare-gui/src/gui/MessengerWindow.ui @@ -5,8 +5,8 @@ 0 0 - 282 - 534 + 270 + 511 @@ -45,16 +45,16 @@ - 0 + 6 - 0 + 6 - 0 + 6 - 0 + 2 0 @@ -62,26 +62,8 @@ 0 - + - - 4 - - - 4 - - - 4 - - - 4 - - - 6 - - - 6 - @@ -224,73 +206,43 @@ p, li { white-space: pre-wrap; } - - - QFrame::StyledPanel + + + Share Files for your Friends - - QFrame::Raised + + + + + ... + + + :/images/friendsfolder24.png + + + + 24 + 24 + + + + true - - - 2 - - - 0 - - - 2 - - - 0 - - - 0 - - - 0 - - - - - Share Files for your Friends - - - - - - ... - - - :/images/friendsfolder24.png - - - - 24 - 24 - - - - true - - - - - - - Qt::Horizontal - - - - 211 - 34 - - - - - + + + + Qt::Horizontal + + + + 221 + 20 + + + + @@ -380,7 +332,7 @@ p, li { white-space: pre-wrap; } 0 0 - 282 + 270 30 diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp index cfd8ff5cf..0026483fa 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp @@ -239,7 +239,7 @@ void PopupChatDialog::addChatMsg(ChatInfo *ci) .replace(font) .replace(fontSize)*/ .replace("%timestamp%", timestamp) - .replace("%name%", name) + .replace("%name%", name) .replace("%message%", message); ui.textBrowser->setHtml(ui.textBrowser->toHtml() + formatMsg + "\n");