Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-21 04:44:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
12206 commits 63 branches 22 tags 207 MiB
Commit graph

169 commits

Author SHA1 Message Date
defnax
981df0c7e0 * Enabled Minimize/Maximize Button for File Transfer details dialog. 
* Clean up Buttons on ChatWidget, for Fonts use now Font Button.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7717 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-28 16:33:56 +00:00
csoler
fd20f629dc fixed GUI for distant chat: correct display of peer names, chat window on client shows up when chat is openned. Window on server only shows up when first message is received. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7688 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-17 21:56:41 +00:00
csoler
b593a918a0 optim: changed postfixed ++ into prefix++ for non trivial operators, replaced test on std::list::size() by std::list::empty() (Patch from Phenom, modified) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7627 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-21 22:33:02 +00:00
csoler
9006c567a1 added method to add new widget in chatWidget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7451 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 15:59:12 +00:00
csoler
8667cf9f92 add changing state for Send button in chat when msg size exceeds allowed size (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-06 11:33:04 +00:00
thunder2
a68211e65c Fixed compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7396 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-06-01 13:17:30 +00:00
defnax
f93d41991e Changed the QFrame of QScrollArea on Settings to noFrame 
Added Search and Marker Feature for the Chat Widget, thx to Phenom for the Patch (AddSearchAndMarkerOnChatWidget_v0.6_7377.patch)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7380 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-26 21:51:53 +00:00
csoler
b6c68d1812 - started changing distant chat so that it works with GXS ids instead of PGP ids. Something is still broken in 
service control. Crypto is not done yet => distant chat is unencrypted.
- changed GUI for distant chat. Removed invitation system.
- added menu item to distant chat GXS ids from IdentityItem (only entry point for now).
- fixed bug in chat lobbies causing re-connexion of lobbies not to happen everytime (bug reported bu Lain)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7378 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-25 21:43:05 +00:00
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
drbob
c0738eec7f Merging branches/v0.6-initdev into trunk. 
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 14:16:15 +00:00
csoler
1d19938295 added jpeg to the list of image extensions for messages/avatars/etc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 21:38:11 +00:00
thunder2
dacec52e4f Fixed display of the nickname for the chat lobbies. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6998 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-08 11:37:16 +00:00
thunder2
92fabf4c56 Modified the patch from electron. 
Moved the calls to the plugin to ChatWidget for use with all types of chats (private chat, chat lobby and distant chat).
Recompile needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-02 00:56:46 +00:00
thunder2
abd6b46ca0 Added a custom context menu for pasting RS-links to the base class MimeTextEdit and removed the custom context menu from derived classes. 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6977 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-30 19:12:16 +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
695e417fd5 changed std::wstring for std::string+utf8 in chat, and messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 21:41:34 +00:00
defnax
6ae9178712 Added a new frame for the Plugin Buttons, add the plugin buttons before the send button. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-01 20:21:57 +00:00
csoler
e21d869006 - added history parameters for chat lobbies 
- added max storage time for items in chat history. Avoids filling up the history with chat from volatile peers.
- worked out the layout in config->ChatPage in a more compact design and added help
- set the max size of chat messages to 6000 bytes instead of 2000 which was a bit too low
- default max number of lobby messages saved in each lobby is 20. Avoids flooding for peers who havn't configured it yet.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-27 21:18:44 +00:00
csoler
477c05e71f reset block format for text (Patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6640 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-28 20:36:37 +00:00
csoler
08a8868865 patch from phenom to fix date display in chat history 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6638 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-28 20:25:06 +00:00
csoler
5bf1ce8f07 hability to delete some lines in chat history browser (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-25 20:45:59 +00:00
csoler
4db4742f00 fixed up completer for nicknames in chat lobbies (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-25 20:22:41 +00:00
csoler
38d875fa7f avoid auto-sending text when a file is pasted in chat. The text is copied to the edit window instead (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6602 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-23 20:51:21 +00:00
csoler
0b0010ff59 improved completion for chat (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6515 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-18 21:50:32 +00:00
csoler
36ea99da03 add date to chat msg if it is mroe than 1 day old 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6510 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-16 21:14:48 +00:00
thunder2
dc29793da6 Disabled completer in private chat. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-06 15:37:22 +00:00
csoler
90e7a3cd54 added completer to MimeTextEdit and ChatWidget (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6475 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-04 19:36:12 +00:00
thunder2
30c4a6ef93 Added quick fix to show the plain name and title in the chat lobby. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-01 20:35:07 +00:00
csoler
b8239abf40 fixed small bug that prevented online status in chat window to be updated 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6449 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-20 20:19:10 +00:00
csoler
771ae5ba58 fixed transfer of color when pasting text (patch from AC) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6441 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-18 21:24:27 +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
69bf523c7a Enabled distant chat system. 
Added system to collect and create chat invites from pgp keys.
Finished the GUI (some layouts need fixing, especially the link creation window).
Still needed: QoS on generic turtle data items. Will need a new item class for any anyway.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6433 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-16 14:39:44 +00:00
csoler
dc2521cf71 Merged branch v0.5-GenericTunneling into trunk (Rev. 6284 to 6410). 
- adds turtle router as a generic tunneling service
- made ftServer a client of the service. Now turtle file items are handled in ftServer
- added new client: p3MsgService to send/recv pgp-encrypted distant messages
- added new client: p3ChatService to perform private (AES-encrypted) distant chat through tunnels.
- The GUI is disabled for now, since it needs some polishing before being fully usable.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-06 19:58:30 +00:00
csoler
1450ae8a5e disabled distant chat/msg by default before merge 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6410 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-05 20:18:48 +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
thunder2
6be253e9f8 Fixed sending of status typing in chat. Modifier keys does not send typing anymore. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-21 20:18:58 +00:00
thunder2
be34ede8fd Enabled history for chat lobbies (not saved to disc) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6322 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-21 16:43:49 +00:00
csoler
9e8b9b6c05 added first brand of chat/msg link creator/editor. Not functional yet 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6304 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-13 13:12:13 +00:00
csoler
17f2d2e8a5 Patch from AC to enable completion over chat lobby participants 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6193 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-06 19:41:08 +00:00
csoler
50db473329 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
 2013-02-22 21:42:27 +00:00
thunder2
138a35b2a2 Enabled embedded images in private chat and messages (only for QT version 4.7.0 and higher) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6083 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-22 00:14:10 +00:00
thunder2
224ece5795 Added patch from Henry 
- renamed own/your to my
- renamed gpg to pgp
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5907 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-28 19:58:14 +00:00
csoler
f61a50c5a6 fixed permission of drap+dropped files. all attached files get added to extra list, but with different permission flags depending on the client. From that, we compute sharing permissions : turtle, or direct transfer only 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 21:17:00 +00:00
csoler
929f872544 Added new link type: EXTRA_FILE, to allow sendign links with sources included so as to trigger direct transfer. 
This makes possible to send files through chat without permitting tunnel access to the files. The client requests
the file as a direct transfer only, using the supplied source.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-10 22:59:51 +00:00
defnax
886f84b929 patch from Henry Morgan to correct spelling mistakes in source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-11 10:28:24 +00:00
thunder2
b40a716e87 Fixed sensitivity of the action in the context menu to copy a link from the chat text when scrollbars are visible. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-26 17:52:58 +00:00
thunder2
28ec721c1b Added patch from Anonymous Coward - readable chat 
Added new options to the Chat settings window:
- Enable custom fonts
- Enable custom font size
- Enable bold
- Enable italics
- Minimum text contrast

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-21 21:23:14 +00:00
thunder2
b95ecd1109 Disabled embedded images for the next stable release. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5570 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-18 23:32:38 +00:00
thunder2
02892d4ae5 Added patch from braindead 
Embedded images in private chat and messages (only for QT version 4.7.0 and higher)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5569 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-18 22:59:23 +00:00
thunder2
fb389f6116 Enabled the menu item in the context menu again to copy the link when right clicking on a link. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5522 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-07 21:28:25 +00:00