mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-24 00:31:32 -04:00
-Changend QLineEdit with QTextEdit to can write now multiple lines .
-Added a Send Button git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@418 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
6b2ca17d28
commit
c3048346f2
5 changed files with 82 additions and 58 deletions
|
@ -30,11 +30,12 @@
|
|||
#include "chat/PopupChatDialog.h"
|
||||
#include <sstream>
|
||||
|
||||
#include <QTextCodec>
|
||||
#include <QTextEdit>
|
||||
#include <QToolBar>
|
||||
#include <QTextCursor>
|
||||
#include <QTextCodec>
|
||||
#include <QTextEdit>
|
||||
#include <QTextCursor>
|
||||
#include <QTextList>
|
||||
#include <QTextStream>
|
||||
#include <QTextDocumentFragment>
|
||||
|
||||
#include <QContextMenuEvent>
|
||||
#include <QMenu>
|
||||
|
@ -51,8 +52,10 @@ ChatDialog::ChatDialog(QWidget *parent)
|
|||
/* Invoke the Qt Designer generated object setup routine */
|
||||
ui.setupUi(this);
|
||||
|
||||
connect(ui.lineEdit, SIGNAL(returnPressed( ) ), this, SLOT(sendMsg( ) ));
|
||||
|
||||
//connect(ui.lineEdit, SIGNAL(returnPressed( ) ), this, SLOT(sendMsg( ) ));
|
||||
connect(ui.Sendbtn, SIGNAL(clicked()), this, SLOT(sendMsg()));
|
||||
connect(ui.actionSend, SIGNAL( triggered (bool)), this, SLOT( sendMsg( ) ) );
|
||||
ui.actionSend->setShortcut(Qt::CTRL + Qt::SHIFT);
|
||||
|
||||
connect( ui.msgSendList, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( msgSendListCostumPopupMenu( QPoint ) ) );
|
||||
|
||||
|
@ -62,7 +65,7 @@ ChatDialog::ChatDialog(QWidget *parent)
|
|||
connect(ui.textunderlineChatButton, SIGNAL(clicked()), this, SLOT(insertUnderline()));
|
||||
connect(ui.textitalicChatButton, SIGNAL(clicked()), this, SLOT(insertItalic()));
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
// connect(ui.msgSendList, SIGNAL(itemChanged( QTreeWidgetItem *, int ) ),
|
||||
// this, SLOT(toggleSendItem( QTreeWidgetItem *, int ) ));
|
||||
|
@ -154,7 +157,7 @@ void ChatDialog::insertChat()
|
|||
QString timestamp = "[" + QDateTime::currentDateTime().toString("hh:mm:ss") + "]";
|
||||
QString name = QString::fromStdString(it->name);
|
||||
QString line = "<span style=\"color:#C00000\"><strong>" + timestamp + "</strong></span>" +
|
||||
"<span style=\"color:#2D84C9\"><strong>" + " " + name + "</strong></span> <br>";
|
||||
"<span style=\"color:#2D84C9\"><strong>" + " " + name + "</strong></span>";
|
||||
|
||||
extraTxt += line;
|
||||
|
||||
|
@ -176,7 +179,7 @@ void ChatDialog::insertChat()
|
|||
|
||||
void ChatDialog::sendMsg()
|
||||
{
|
||||
QLineEdit *lineWidget = ui.lineEdit;
|
||||
QTextEdit *lineWidget = ui.lineEdit;
|
||||
|
||||
QFont font = QFont("Comic Sans MS", 10);
|
||||
font.setBold(ui.textboldChatButton->isChecked());
|
||||
|
@ -184,18 +187,19 @@ void ChatDialog::sendMsg()
|
|||
font.setItalic(ui.textitalicChatButton->isChecked());
|
||||
|
||||
ChatInfo ci;
|
||||
ci.msg = lineWidget->text().toStdWString();
|
||||
//ci.msg = lineWidget->Text().toStdWString();
|
||||
ci.msg = lineWidget->toHtml().toStdWString();
|
||||
ci.chatflags = RS_CHAT_PUBLIC;
|
||||
//ci.messageFont = font;
|
||||
//ci.messageColor = textColor;
|
||||
|
||||
rsMsgs -> ChatSend(ci);
|
||||
lineWidget -> setText(QString(""));
|
||||
//lineWidget -> setText(QString(""));
|
||||
ui.lineEdit->clear();
|
||||
|
||||
/* redraw send list */
|
||||
insertSendList();
|
||||
|
||||
|
||||
}
|
||||
|
||||
void ChatDialog::insertSendList()
|
||||
|
@ -342,6 +346,7 @@ void ChatDialog::insertBold()
|
|||
|
||||
}
|
||||
|
||||
|
||||
void ChatDialog::insertItalic()
|
||||
{
|
||||
|
||||
|
@ -368,10 +373,10 @@ void ChatDialog::insertStrike()
|
|||
|
||||
void ChatDialog::insertAutour(QString leftTruc,QString rightTruc)
|
||||
{
|
||||
int p0 = ui.lineEdit->cursorPosition();
|
||||
/*int p0 = */ui.lineEdit->textCursor();
|
||||
QString stringToInsert = leftTruc ;
|
||||
stringToInsert.append(rightTruc);
|
||||
ui.lineEdit->insert(stringToInsert);
|
||||
ui.lineEdit->setCursorPosition(p0 + leftTruc.size());
|
||||
ui.lineEdit->insertPlainText(stringToInsert);
|
||||
//ui.lineEdit->setCursorPosition(p0 + leftTruc.size());
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue