Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

-removed not realy working bold/italic/underline/color functions

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@266 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2007-11-28 00:45:16 +00:00
parent 0a32122ada
commit 28a47501ee
2 changed files with 30 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
retroshare-gui/src/gui/ChatDialog.cpp
View File

@ -52,12 +52,6 @@ ChatDialog::ChatDialog(QWidget *parent)
connect(ui.colorChatButton, SIGNAL(clicked()), this, SLOT(setColor()));
connect(ui.textboldChatButton, SIGNAL(clicked()), this, SLOT(textBold()));
connect(ui.textunderlineChatButton, SIGNAL(clicked()), this, SLOT(textUnderline()));
connect(ui.textitalicChatButton, SIGNAL(clicked()), this, SLOT(textItalic()));
connect( ui.msgSendList, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( msgSendListCostumPopupMenu( QPoint ) ) );
// connect(ui.msgSendList, SIGNAL(itemChanged( QTreeWidgetItem *, int ) ),
@ -71,6 +65,9 @@ ChatDialog::ChatDialog(QWidget *parent)
/* to hide the header */
ui.msgSendList->header()->hide();
textColor = Qt::black;
/* Hide platform specific features */
#ifdef Q_WS_WIN
@ -120,8 +117,13 @@ void ChatDialog::insertChat()
rsiface->unlockData(); /* Unlock Interface */
static std::string lastChatName("");
static int lastChatTime = 0;
static std::string lastChatName("");
static int lastChatTime = 0;
//QString color = ci.messageColor.name();
//QString nickColor;
//QString font = ci.messageFont.family();
//QString fontSize = QString::number(ci.messageFont.pointSize());
/* determine how many spaces to add */
@ -177,7 +179,7 @@ static int lastChatTime = 0;
{
out << spaces;
}
QString timestamp = "(" + QDateTime::currentDateTime().toString("hh:mm:ss") + ") ";
QString timestamp = "[" + QDateTime::currentDateTime().toString("hh:mm:ss") + "]";
QString name = QString::fromStdString(it->name);
//QString line = "<span style=\"color:#1D84C9\">" + timestamp +
// " " + name + "</span> \n<br>";
@ -185,6 +187,7 @@ static int lastChatTime = 0;
" " + name + "</strong></span> \n<br>";
out << line.toStdString();
}
out << it -> msg;
@ -222,9 +225,16 @@ void ChatDialog::sendMsg()
{
QLineEdit *lineWidget = ui.lineEdit;
//QFont font = QFont("Comic Sans MS", 10);
//font.setBold(ui.textboldChatButton->isChecked());
//font.setUnderline(ui.textunderlineChatButton->isChecked());
//font.setItalic(ui.textitalicChatButton->isChecked());
ChatInfo ci;
ci.msg = lineWidget->text().toStdString();
ci.chatflags = RS_CHAT_PUBLIC;
//ci.messageFont = font;
//ci.messageColor = textColor;
rsicontrol -> ChatSend(ci);
lineWidget -> setText(QString(""));
@ -335,69 +345,10 @@ void ChatDialog::toggleSendItem( QTreeWidgetItem *item, int col )
void ChatDialog::setColor()
{
QColor col = QColorDialog::getColor(Qt::green, this);
if (col.isValid()) {
ui.colorChatButton->setPalette(QPalette(col));
QTextCharFormat fmt;
fmt.setForeground(col);
mergeFormatOnWordOrSelection(fmt);
colorChanged(col);
}
}
void ChatDialog::textBold()
{
QTextCharFormat fmt;
fmt.setFontWeight(ui.textboldChatButton->isChecked() ? QFont::Bold : QFont::Normal);
mergeFormatOnWordOrSelection(fmt);
}
void ChatDialog::textUnderline()
{
QTextCharFormat fmt;
fmt.setFontUnderline(ui.textunderlineChatButton->isChecked());
mergeFormatOnWordOrSelection(fmt);
}
void ChatDialog::textItalic()
{
QTextCharFormat fmt;
fmt.setFontItalic(ui.textitalicChatButton->isChecked());
mergeFormatOnWordOrSelection(fmt);
}
void ChatDialog::currentCharFormatChanged(const QTextCharFormat &format)
{
fontChanged(format.font());
colorChanged(format.foreground().color());
}
void ChatDialog::mergeFormatOnWordOrSelection(const QTextCharFormat &format)
{
QTextCursor cursor = ui.msgText->textCursor();
if (!cursor.hasSelection())
cursor.select(QTextCursor::WordUnderCursor);
cursor.mergeCharFormat(format);
ui.msgText->mergeCurrentCharFormat(format);
}
void ChatDialog::fontChanged(const QFont &f)
{
//comboFont->setCurrentIndex(comboFont->findText(QFontInfo(f).family()));
//comboSize->setCurrentIndex(comboSize->findText(QString::number(f.pointSize())));
ui.textboldChatButton->setChecked(f.bold());
ui.textunderlineChatButton->setChecked(f.italic());
ui.textitalicChatButton->setChecked(f.underline());
}
void ChatDialog::colorChanged(const QColor &c)
{
QPixmap pix(16, 16);
pix.fill(c);
ui.colorChatButton->setIcon(pix);
textColor = QColorDialog::getColor(Qt::black, this);
QPixmap pxm(24,24);
pxm.fill(textColor);
ui.colorChatButton->setIcon(pxm);
}

14
retroshare-gui/src/gui/ChatDialog.h
View File

@ -54,13 +54,6 @@ void toggleSendItem( QTreeWidgetItem *item, int col );
void msgSendListCostumPopupMenu( QPoint point );
void setColor();
void textBold();
void textUnderline();
void textItalic();
void currentCharFormatChanged(const QTextCharFormat &format);
void insertSendList();
void sendMsg();
@ -68,10 +61,6 @@ void toggleSendItem( QTreeWidgetItem *item, int col );
private:
void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
void fontChanged(const QFont &f);
void colorChanged(const QColor &c);
QAction *actionTextBold;
QAction *actionTextUnderline;
@ -84,6 +73,9 @@ private:
QTreeView *msgSendList;
QColor textColor;
std::map<std::string, PopupChatDialog *> chatDialogs;