mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-15 12:32:37 -04:00
Merged branch for GUI improvements into trunk. The improvement phase is not finsihed yet. The work on GUI will continue into trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
c23cfd4a0f
commit
50db473329
46 changed files with 2536 additions and 2984 deletions
|
@ -387,15 +387,21 @@ bool ChatWidget::isActive()
|
|||
return true;
|
||||
}
|
||||
|
||||
void ChatWidget::pasteText(const QString& S)
|
||||
{
|
||||
//std::cerr << "In paste link" << std::endl;
|
||||
ui->chatTextEdit->insertHtml(S);
|
||||
}
|
||||
|
||||
void ChatWidget::pasteLink()
|
||||
{
|
||||
std::cerr << "In paste link" << std::endl;
|
||||
//std::cerr << "In paste link" << std::endl;
|
||||
ui->chatTextEdit->insertHtml(RSLinkClipboard::toHtml());
|
||||
}
|
||||
|
||||
void ChatWidget::pasteOwnCertificateLink()
|
||||
{
|
||||
std::cerr << "In paste own certificate link" << std::endl;
|
||||
//std::cerr << "In paste own certificate link" << std::endl;
|
||||
RetroShareLink link ;
|
||||
std::string ownId = rsPeers->getOwnId() ;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue