From a8386b454c40804ec728f5b75847cc66b6535203 Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 3 Apr 2008 21:32:45 +0000 Subject: [PATCH] fixed windowtile of smileyWidget enabled formating feature to groupchat git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@468 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/ChatDialog.cpp | 7 +------ retroshare-gui/src/gui/PeersDialog.cpp | 6 +++--- retroshare-gui/src/gui/chat/PopupChatDialog.cpp | 3 +-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/retroshare-gui/src/gui/ChatDialog.cpp b/retroshare-gui/src/gui/ChatDialog.cpp index bc5da2615..6709e3d80 100644 --- a/retroshare-gui/src/gui/ChatDialog.cpp +++ b/retroshare-gui/src/gui/ChatDialog.cpp @@ -65,16 +65,11 @@ ChatDialog::ChatDialog(QWidget *parent) connect( ui.msgSendList, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( msgSendListCostumPopupMenu( QPoint ) ) ); connect( ui.msgText, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayInfoChatMenu(const QPoint&))); -#ifdef CHAT_IMPROVEMENTS connect(ui.textboldChatButton, SIGNAL(clicked()), this, SLOT(setFont())); connect(ui.textunderlineChatButton, SIGNAL(clicked()), this, SLOT(setFont())); connect(ui.textitalicChatButton, SIGNAL(clicked()), this, SLOT(setFont())); connect(ui.fontsButton, SIGNAL(clicked()), this, SLOT(getFont())); connect(ui.colorChatButton, SIGNAL(clicked()), this, SLOT(setColor())); -#endif - connect(ui.colorChatButton, SIGNAL(clicked()), this, SLOT(setColor())); - - connect(ui.actionSend, SIGNAL(triggered()), this, SLOT(returnPressed())); ui.fontsButton->setIcon(QIcon(QString(":/images/fonts.png"))); @@ -423,7 +418,7 @@ void ChatDialog::smileyWidgetgroupchat() { qDebug("MainWindow::smileyWidget()"); QWidget *smWidget = new QWidget; - smWidget->setWindowTitle("Emoteicons"); + smWidget->setWindowTitle("Emoticons"); smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png"))); smWidget->setFixedSize(256,256); diff --git a/retroshare-gui/src/gui/PeersDialog.cpp b/retroshare-gui/src/gui/PeersDialog.cpp index 20ef0c7e2..597d2001c 100644 --- a/retroshare-gui/src/gui/PeersDialog.cpp +++ b/retroshare-gui/src/gui/PeersDialog.cpp @@ -50,7 +50,7 @@ #define IMAGE_REMOVEFRIEND ":/images/removefriend16.png" #define IMAGE_EXPIORTFRIEND ":/images/exportpeers_16x16.png" #define IMAGE_CHAT ":/images/chat.png" -#define IMAGE_MSG ":/images/message.png" +#define IMAGE_MSG ":/images/message-mail.png" /* Images for Status icons */ #define IMAGE_ONLINE ":/images/donline.png" #define IMAGE_OFFLINE ":/images/dhidden.png" @@ -82,10 +82,10 @@ PeersDialog::PeersDialog(QWidget *parent) _header->resizeSection ( 0, 25 ); _header->resizeSection ( 1, 100 ); _header->resizeSection ( 2, 100 ); - _header->resizeSection ( 3, 100 ); + _header->resizeSection ( 3, 120 ); _header->resizeSection ( 4, 100 ); _header->resizeSection ( 5, 230 ); - _header->resizeSection ( 6, 100 ); + _header->resizeSection ( 6, 120 ); _header->resizeSection ( 7, 220 ); diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp index 85b687213..ce1f3e2fe 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp @@ -60,7 +60,6 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name, showAvatarFrame(true); connect(ui.avatarFrameButton, SIGNAL(toggled(bool)), this, SLOT(showAvatarFrame(bool))); - //connect(ui.chattextEdit, SIGNAL(returnPressed( ) ), this, SLOT(sendChat( ) )); connect(ui.chattextEdit, SIGNAL(textChanged ( ) ), this, SLOT(checkChat( ) )); connect(ui.sendButton, SIGNAL(clicked( ) ), this, SLOT(sendChat( ) )); @@ -343,7 +342,7 @@ void PopupChatDialog::smileyWidget() { qDebug("MainWindow::smileyWidget()"); QWidget *smWidget = new QWidget; - smWidget->setWindowTitle("Emoteicons"); + smWidget->setWindowTitle("Emoticons"); smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png"))); smWidget->setFixedSize(256,256);