diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
index 5611e7b49..afdfeb8a9 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
@@ -123,14 +123,14 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
{
QIcon icon ;
- icon.addPixmap(QPixmap(":/images/edit_add24.png")) ;
+ icon.addPixmap(QPixmap(":/images/user/add_user24.png")) ;
inviteFriendsButton->setIcon(icon) ;
inviteFriendsButton->setIconSize(QSize(2*S,2*S)) ;
}
connect(inviteFriendsButton, SIGNAL(clicked()), this , SLOT(inviteFriends()));
- getChatWidget()->addChatBarWidget(inviteFriendsButton) ;
+ getChatWidget()->addTitleBarWidget(inviteFriendsButton) ;
RsGxsId current_id;
rsMsgs->getIdentityForChatLobby(lobbyId, current_id);
@@ -159,7 +159,7 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
QIcon icon ;
icon.addPixmap(QPixmap(":/images/door_in.png")) ;
unsubscribeButton->setIcon(icon) ;
- unsubscribeButton->setIconSize(QSize(1.5*S,1.5*S)) ;
+ unsubscribeButton->setIconSize(QSize(2*S,2*S)) ;
}
/* Initialize splitter */
@@ -168,7 +168,7 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
connect(unsubscribeButton, SIGNAL(clicked()), this , SLOT(leaveLobby()));
- getChatWidget()->addChatBarWidget(unsubscribeButton) ;
+ getChatWidget()->addTitleBarWidget(unsubscribeButton) ;
}
void ChatLobbyDialog::leaveLobby()
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index 0fdc133f7..985907f7f 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -99,10 +99,6 @@ ChatWidget::ChatWidget(QWidget *parent) :
ui->addFileButton->setIconSize(iconSize);
ui->pushtoolsButton->setFixedSize(buttonSize);
ui->pushtoolsButton->setIconSize(iconSize);
- ui->sendAsPlainTextButton->setFixedSize(buttonSize);
- ui->sendAsPlainTextButton->setIconSize(iconSize);
- ui->noEmbedButton->setFixedSize(buttonSize);
- ui->noEmbedButton->setIconSize(iconSize);
ui->notifyButton->setFixedSize(buttonSize);
ui->notifyButton->setIconSize(iconSize);
ui->markButton->setFixedSize(buttonSize);
@@ -125,6 +121,7 @@ ChatWidget::ChatWidget(QWidget *parent) :
ui->actionSearchWithoutLimit->setText(tr("Don't stop to color after")+" "+QString::number(uiMaxSearchLimitColor)+" "+tr("items found (need more CPU)"));
+ ui->markButton->setVisible(false);
ui->leSearch->setVisible(false);
ui->searchBefore->setVisible(false);
ui->searchBefore->setToolTip(tr("Find Previous
Ctrl+Shift+G"));
@@ -187,6 +184,8 @@ ChatWidget::ChatWidget(QWidget *parent) :
menu->addAction(ui->actionChooseFont);
menu->addAction(ui->actionChooseColor);
menu->addAction(ui->actionResetFont);
+ menu->addAction(ui->actionNoEmbed);
+ menu->addAction(ui->actionSendAsPlainText);
ui->fontButton->setMenu(menu);
menu = new QMenu();
@@ -195,8 +194,8 @@ ChatWidget::ChatWidget(QWidget *parent) :
menu->addAction(ui->actionSaveChatHistory);
menu->addAction(ui->actionMessageHistory);
ui->pushtoolsButton->setMenu(menu);
- ui->sendAsPlainTextButton->setChecked(Settings->getChatSendAsPlainTextByDef());
-
+ ui->actionSendAsPlainText->setChecked(Settings->getChatSendAsPlainTextByDef());
+
ui->textBrowser->installEventFilter(this);
ui->textBrowser->viewport()->installEventFilter(this);
ui->chatTextEdit->installEventFilter(this);
@@ -1140,11 +1139,11 @@ void ChatWidget::sendChat()
}
QString text;
- if (ui->sendAsPlainTextButton->isChecked()){
+ if (ui->actionSendAsPlainText->isChecked()){
text = chatWidget->toPlainText();
text.replace(QChar(-4),"");//Char used when image on text.
} else {
- RsHtml::optimizeHtml(chatWidget, text, (ui->noEmbedButton->isChecked() ? RSHTML_FORMATTEXT_NO_EMBED : 0));
+ RsHtml::optimizeHtml(chatWidget, text, (ui->actionNoEmbed->isChecked() ? RSHTML_FORMATTEXT_NO_EMBED : 0));
}
std::string msg = text.toUtf8().constData();
@@ -1199,7 +1198,7 @@ void ChatWidget::on_searchButton_clicked(bool bValue)
qtcCurrent=QTextCursor(qtdDocument);
}
ui->leSearch->setVisible(bValue);
-
+ ui->markButton->setVisible(bValue);
}
void ChatWidget::on_searchBefore_clicked()
{
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui
index f63985182..87a3d442b 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.ui
+++ b/retroshare-gui/src/gui/chat/ChatWidget.ui
@@ -513,42 +513,6 @@ border-image: url(:/images/closepressed.png)
- -
-
-
- Send as plain text without font.
-
-
-
- :/images/ColoredText.png
- :/images/SimpleText.png:/images/ColoredText.png
-
-
- true
-
-
- true
-
-
-
- -
-
-
- Don't replace tag with Emote Icon.
-
-
-
- :/images/emoticons/kopete/kopete020.png
- :/images/SmileyText.png:/images/emoticons/kopete/kopete020.png
-
-
- true
-
-
- true
-
-
-
-
@@ -1070,6 +1034,36 @@ border-image: url(:/images/closepressed.png)
Save image
+
+
+ true
+
+
+
+ :/images/SimpleText.png:/images/SimpleText.png
+
+
+ Send as PlainText
+
+
+ Send as plain text without font.
+
+
+
+
+ true
+
+
+
+ :/images/SmileyText.png:/images/SmileyText.png
+
+
+ Don't replace tag with Emote Icon.
+
+
+ Don't replace tag with Emote Icon.
+
+
diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
index d651fb6df..0d34ca4bb 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
+++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
@@ -27,7 +27,7 @@
-
- 2
+ 0
@@ -175,7 +175,16 @@
-
-
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
6
-
@@ -296,19 +305,12 @@ p, li { white-space: pre-wrap; }
-
-
-
-
- 0
- 0
-
+
+
+ Below is the node's PGP key. It identifies the node and all its locations. A "Retroshare certificate" that you can exchange in order to make friends, is in the the "details" of each separate location.
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Below is the node's PGP key. It identifies the node and all its locations. A "Retroshare certificate" that you can exchange in order to make friends, is in the the "details" of each separate location.</p></body></html>
+
+ true