Commit Graph

8 Commits

Author SHA1 Message Date
chrisparker126
0f29d28b1b merge of branch v0.6-idclean 7180
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-17 20:56:06 +00:00
thunder2
135a5e579a Code maintenance for Qt 5:
- Replaced Qt::WFlags with Qt::WindowFlags.
- Removed path "QtCore/" and "QtGui/" from the includes.
- Replaced "QString::toAscii()" with "QString::toLatin1()".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-18 21:10:33 +00:00
csoler
491438055d added proper naming functions for distant chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6439 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-18 20:13:58 +00:00
csoler
b21fae52d0 improved status display for distant chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6437 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-17 21:58:26 +00:00
csoler
42db43e590 - fixed a few bugs in PopupDistantChatDialog (Possible deadlock, wrong window for private chat)
- added method to properly close distant chat conversation (Still needs some work)
- improved chat link creation window + clipboard copy



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-12 21:10:09 +00:00
csoler
cb9f174efa added tunnel state light to distant chat popup dialog. Added proper peer name. Changed method for adding widgets in the chat bar
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6337 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-23 22:43:19 +00:00
csoler
ff867d0fe5 most of the protocol for distant chat works! Still needs some testing.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6315 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-18 21:41:13 +00:00
csoler
dc0193ae66 added popup chat window for distant chat, decryption code for private chat links. (W) does not compile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6310 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-16 21:13:42 +00:00