Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-22 12:56:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed windowtile of smileyWidget

Browse source 
enabled formating feature to groupchat


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-04-03 21:32:45 +00:00
parent 7f48353193
commit a8386b454c
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
retroshare-gui/src/gui/ChatDialog.cpp
View file

@ -65,16 +65,11 @@ ChatDialog::ChatDialog(QWidget *parent)
connect( ui.msgSendList, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( msgSendListCostumPopupMenu( QPoint ) ) ); connect( ui.msgSendList, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( msgSendListCostumPopupMenu( QPoint ) ) );
connect( ui.msgText, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayInfoChatMenu(const 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.textboldChatButton, SIGNAL(clicked()), this, SLOT(setFont()));
connect(ui.textunderlineChatButton, SIGNAL(clicked()), this, SLOT(setFont())); connect(ui.textunderlineChatButton, SIGNAL(clicked()), this, SLOT(setFont()));
connect(ui.textitalicChatButton, SIGNAL(clicked()), this, SLOT(setFont())); connect(ui.textitalicChatButton, SIGNAL(clicked()), this, SLOT(setFont()));
connect(ui.fontsButton, SIGNAL(clicked()), this, SLOT(getFont())); connect(ui.fontsButton, SIGNAL(clicked()), this, SLOT(getFont()));
connect(ui.colorChatButton, SIGNAL(clicked()), this, SLOT(setColor())); 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"))); ui.fontsButton->setIcon(QIcon(QString(":/images/fonts.png")));
@ -423,7 +418,7 @@ void ChatDialog::smileyWidgetgroupchat()
{ {
qDebug("MainWindow::smileyWidget()"); qDebug("MainWindow::smileyWidget()");
QWidget *smWidget = new QWidget; QWidget *smWidget = new QWidget;
smWidget->setWindowTitle("Emoteicons"); smWidget->setWindowTitle("Emoticons");
smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png"))); smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png")));
smWidget->setFixedSize(256,256); smWidget->setFixedSize(256,256);

6
retroshare-gui/src/gui/PeersDialog.cpp
View file

@ -50,7 +50,7 @@
#define IMAGE_REMOVEFRIEND ":/images/removefriend16.png" #define IMAGE_REMOVEFRIEND ":/images/removefriend16.png"
#define IMAGE_EXPIORTFRIEND ":/images/exportpeers_16x16.png" #define IMAGE_EXPIORTFRIEND ":/images/exportpeers_16x16.png"
#define IMAGE_CHAT ":/images/chat.png" #define IMAGE_CHAT ":/images/chat.png"
#define IMAGE_MSG ":/images/message.png" #define IMAGE_MSG ":/images/message-mail.png"
/* Images for Status icons */ /* Images for Status icons */
#define IMAGE_ONLINE ":/images/donline.png" #define IMAGE_ONLINE ":/images/donline.png"
#define IMAGE_OFFLINE ":/images/dhidden.png" #define IMAGE_OFFLINE ":/images/dhidden.png"
@ -82,10 +82,10 @@ PeersDialog::PeersDialog(QWidget *parent)
_header->resizeSection ( 0, 25 ); _header->resizeSection ( 0, 25 );
_header->resizeSection ( 1, 100 ); _header->resizeSection ( 1, 100 );
_header->resizeSection ( 2, 100 ); _header->resizeSection ( 2, 100 );
_header->resizeSection ( 3, 100 ); _header->resizeSection ( 3, 120 );
_header->resizeSection ( 4, 100 ); _header->resizeSection ( 4, 100 );
_header->resizeSection ( 5, 230 ); _header->resizeSection ( 5, 230 );
_header->resizeSection ( 6, 100 ); _header->resizeSection ( 6, 120 );
_header->resizeSection ( 7, 220 ); _header->resizeSection ( 7, 220 );

3
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View file

@ -60,7 +60,6 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
showAvatarFrame(true); showAvatarFrame(true);
connect(ui.avatarFrameButton, SIGNAL(toggled(bool)), this, SLOT(showAvatarFrame(bool))); 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.chattextEdit, SIGNAL(textChanged ( ) ), this, SLOT(checkChat( ) ));
connect(ui.sendButton, SIGNAL(clicked( ) ), this, SLOT(sendChat( ) )); connect(ui.sendButton, SIGNAL(clicked( ) ), this, SLOT(sendChat( ) ));
@ -343,7 +342,7 @@ void PopupChatDialog::smileyWidget()
{ {
qDebug("MainWindow::smileyWidget()"); qDebug("MainWindow::smileyWidget()");
QWidget *smWidget = new QWidget; QWidget *smWidget = new QWidget;
smWidget->setWindowTitle("Emoteicons"); smWidget->setWindowTitle("Emoticons");
smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png"))); smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png")));
smWidget->setFixedSize(256,256); smWidget->setFixedSize(256,256);