mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-03 06:35:08 -04:00
fixed Chatdialog windowtitle
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
246bd80190
commit
562aa4f34d
2 changed files with 77 additions and 53 deletions
|
@ -71,13 +71,13 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
|
|||
statusBar()->showMessage(QString::fromStdString(statusstr.str()));
|
||||
ui.textBrowser->setOpenExternalLinks ( false );
|
||||
|
||||
QString title = "RS:" + tr("Chatting with") + " " + QString::fromStdString(name);
|
||||
QString title = QString::fromStdString(name) + " :" + tr(" RetroShare - Chat") ;
|
||||
setWindowTitle(title);
|
||||
|
||||
//set the default avatar
|
||||
ui.avatarlabel->setPixmap(QPixmap(":/images/retrosharelogo1.png"));
|
||||
|
||||
setWindowIcon(QIcon(QString(":/images/chat.png")));
|
||||
setWindowIcon(QIcon(QString(":/images/rstray3.png")));
|
||||
ui.textboldButton->setIcon(QIcon(QString(":/images/edit-bold.png")));
|
||||
ui.textunderlineButton->setIcon(QIcon(QString(":/images/edit-underline.png")));
|
||||
ui.textitalicButton->setIcon(QIcon(QString(":/images/edit-italic.png")));
|
||||
|
@ -100,7 +100,7 @@ void PopupChatDialog::show()
|
|||
if(!this->isVisible()) {
|
||||
QMainWindow::show();
|
||||
} else {
|
||||
QMainWindow::activateWindow();
|
||||
//QMainWindow::activateWindow();
|
||||
setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
|
||||
QMainWindow::raise();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue