mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-03 06:35:08 -04:00
fixed color Buttons with basic html functions
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
06cb4cf01f
commit
ba87009a25
3 changed files with 17 additions and 4 deletions
|
@ -97,7 +97,8 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
|
|||
fontmenu->addAction(ui.actionUnderline);
|
||||
fontmenu->addAction(ui.actionItalic);
|
||||
fontmenu->addAction(ui.actionStrike);
|
||||
ui.fontButton->setMenu(fontmenu);
|
||||
ui.fontButton->setMenu(fontmenu);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -117,7 +118,7 @@ void PopupChatDialog::show()
|
|||
if(!this->isVisible()) {
|
||||
QMainWindow::show();
|
||||
} else {
|
||||
//QMainWindow::activateWindow();
|
||||
QMainWindow::activateWindow();
|
||||
setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
|
||||
QMainWindow::raise();
|
||||
}
|
||||
|
@ -136,6 +137,9 @@ void PopupChatDialog::setColor()
|
|||
if (col.isValid()) {
|
||||
|
||||
ui.colorButton->setPalette(QPalette(col));
|
||||
ui.lineEdit->setText(QString(tr("<a style=\"color:")) + (col.name()));
|
||||
this->insertAutour(tr("\">"), tr("</style>"));
|
||||
this->ui.lineEdit->setFocus();
|
||||
QTextCharFormat fmt;
|
||||
fmt.setForeground(col);
|
||||
colorChanged(col);
|
||||
|
@ -316,3 +320,5 @@ void PopupChatDialog::insertAutour(QString leftTruc,QString rightTruc)
|
|||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue