Merge pull request #703 from RetroShare/v0.6-ImprovedGUI

V0.6 improved gui
This commit is contained in:
csoler 2017-02-26 20:14:34 +01:00 committed by GitHub
commit 99cf69a98c
118 changed files with 4891 additions and 3492 deletions

View file

@ -1006,10 +1006,10 @@ void ChatWidget::pasteText(const QString& S)
setColorAndFont(false);
}
void ChatWidget::pasteCreateMsgLink()
{
RSettingsWin::showYourself(this, RSettingsWin::Chat);
}
//void ChatWidget::pasteCreateMsgLink()
//{
// RSettingsWin::showYourself(this, RSettingsWin::Chat);
//}
void ChatWidget::contextMenuTextBrowser(QPoint point)
{
@ -1088,8 +1088,8 @@ void ChatWidget::updateStatusTyping()
#ifdef ONLY_FOR_LINGUIST
tr("is typing...");
#endif
rsMsgs->sendStatusString(chatId, "is typing...");
if(!Settings->getChatDoNotSendIsTyping())
rsMsgs->sendStatusString(chatId, "is typing...");
lastStatusSendTime = time(NULL) ;
}
}