Commit Graph

109 Commits

Author SHA1 Message Date
csoler
13d7866171 simplification of the chat interface to libretroshare using a single unified class for chat IDs. Used a common chat widget for all chats including broadcast. Opens the way to having plugins send/recv chat messages. Patch from Electron.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-12-29 21:41:05 +00:00
defnax
2036f379de * Disabled own location display on Friends Frame.
* Removed the Fixed size for Messages ListWidget
* Update stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-12-14 15:46:20 +00:00
thunder2
398f446300 Changed some more splitter behaviour when resizing the window.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-12-13 23:32:23 +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
thunder2
d20ce41c96 - Removed all usages of the old windows icon (rstray3.png) and used the standard icon of the application
- Added possibility to change the icon of the GxsGroupDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-07-24 23:26:04 +00:00
defnax
6d8f567a58 Added Patch from Phenom AddChatMutedIconActivity_v0.6_7355
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7390 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-05-29 15:19:19 +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
drbob
3b71e8e140 Improvements to enable Edit/Show of GxsGroups.
NB: The actual update doesn't happen yet - mainly just the display of info.
  - Fixed up Constructor, and loading of MetaData via TokenService.
  - Fixed up Enabled / ReadOnly for Show.
  - Updated children to match new functionality.
  - Fixed up Show in Circles Dialog too.
  - removed a few compile errors.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-28 07:57:58 +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
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
b9a79db9b0 removed some debug output
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6841 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-17 18:45:59 +00:00
thunder2
b49ba8b98f Changed the additional buttons of ChatLobbyDialog and AudioPopupChatDialog to QToolButton.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-04 12:13:09 +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
csoler
283785cd70 end of Phenom patch for chat Icon activity
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6606 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-25 20:13:51 +00:00
csoler
e74be8e484 added activity status in chat lobby participants list (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6604 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-24 15:07:31 +00:00
defnax
20c35ea27f changed and replaced some icons (needs fresh recompile)
changed the default headerframe colors

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-15 16:20:14 +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
thunder2
81874da2cc Fixed showing utf8 characters in chat lobby name
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-30 13:58:17 +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
0266329dc8 - Added a drop-down item to allow removing unused keys, in the Network dialog.
- added key removal method in OpenPGP-SDK
- improved FriendSelectionDialog/Widget to enable select all/none keys, and show non friend keys
- added safe key removal method in PGPHandler. Removed keys from other locations will not cause errors.
- added backup system to public keyring, impossibility to remove public parts of owned secret keys, etc.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6382 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-29 21:32:02 +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
64c5a7ece2 patch from AC to improve the list of participants in chat lobbies
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6253 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-19 21:37:38 +00:00
csoler
061a8113bb fixed icons in chat lobbies
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-27 22:17:49 +00:00
csoler
170c0c533d Removed tabs in chat lobbies:
- unsubscribed lobbies display complete info in a blank page, with some additional help
- double click to subscribe.
- added unsubscribe button to ChatLobbyDialog. Needs a more appropriate icon (e.g. An open door with a leaving arrow)
- the lobby list is now used to display typing status. It could be used to show all sorts of info, the exact same way, such as joining/leaving peers, etc, using various different icons.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6142 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-24 22:44:14 +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
3521bfb6de Added multiselective mute/unmute to chat lobby.
Added mute/unmute with double click on icon.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-16 00:53:13 +00:00
defnax
40b80c4e84 redesigned the Chatlobby participants list
- used now QTreeWidget instead of a QListWidget
- added icons for display the muted participants
- added context menu for "Mute participant" ( context menu fix from thunder)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-14 14:39:08 +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
thunder2
af2257b1a9 Added settings for the blinking icons
- private chat window/tab
- chat lobby tab
- all tray notifier

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-27 15:59:12 +00:00
csoler
a2b6b97ef9 added systray notifications for chat lobbies.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5357 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-07-30 13:27:40 +00:00
thunder2
50bc57b0fe Sort participants list in the chat lobby case insensitive.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5186 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-24 19:26:43 +00:00
thunder2
1855d19436 Added check for empty lobby nick name.
Moved notify of lobby nick name change from the gui to p3ChatService.
Added missing mutex locks for p3ChatService::_default_nick_name.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5184 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-23 22:33:45 +00:00
notdefine
5a3863d216 Improved mute feature, to update Blocklist, when the peer changes his name.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5159 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-11 20:53:27 +00:00
notdefine
5bdd490a4d Remove debug message
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-07 21:43:21 +00:00
notdefine
d5bdae7bd9 Display old and new nickname to Peers during nickname change in ChatLobby.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5151 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-06 22:57:08 +00:00
notdefine
22bfcb62bc Preparation for mute Peers in the Chat Lobby.
RS_CHAT_LOBBY_EVENT_PEER_CHANGE_NICKNAME is send, when changing nickname, so the blocklist can be updated (in future).

This will never wort for 100% as discussed in the developer forum, but should stop the most spam.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5150 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-06 22:19:59 +00:00
notdefine
94a6e1035a Add the function to Mute peers in ChatLobby via checkbox.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5142 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-05 14:22:21 +00:00
thunder2
37986e00a3 Added three new toasters - private chat, group chat and chat lobby.
Fixed some utf8 issues in toasters and feeds.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-30 23:02:52 +00:00
thunder2
bbdb3b9614 Added welcome message to the chat lobby.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-20 23:05:17 +00:00
csoler
d26be6c05c removed debug info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4931 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-12 20:45:42 +00:00
thunder2
74055ed834 Sort nick names by name in the chat lobby.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4914 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-09 21:24:51 +00:00
thunder2
d3e2eb1f54 Added new variant to the compact chat style with colored nicknames calculated from the name.
It's disabled by default. You can enable it with the define COLORED_NICKNAMES in ChatStyle.cpp.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4884 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-03 21:43:09 +00:00
thunder2
8431e7b3af Added change nick name to the chat lobby dialog.
Optimized layout of the chat dialogs.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-28 15:11:58 +00:00
csoler
fe156882ae added keep-alive packet to lobbies to maintain up-to-date list of listenners. Will need to play a bit with delays...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4839 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-23 22:49:47 +00:00
csoler
ecf49d0e14 update participant list when peer leaving/joining
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4837 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-23 21:10:34 +00:00
thunder2
912e5339ca Moved the chat lobby tabs to the FriendsDialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-18 20:02:19 +00:00
thunder2
1ec716175b Fixed shown name in chat list.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4810 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-18 00:32:15 +00:00
thunder2
35c7605704 Extracted a new widget ChatWidget for the basic chat handling from the PopupChatDialog and use it in ChatLobbyDialog too.
Added an own ui for the ChatLobbyDialog.
Saved settings of the ChatLobbyDialog.
Changed parameters of RsStatus interface from "std::string" to "const std::string&"
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-17 20:36:36 +00:00
csoler
036bd64811 - Added chat lobby privacy type to lobby invite => lobby type is propagated correctly to friends
that are invited.
- added auto-clean of nicknames
- added auto-clean of public lobby records.

Warning: this commit breaks one small bit of compatibility:
 * direct invitations from new versions will pass accross versions (private lobbies will need the new version)
 * but people can still join public lobbies accross versions.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4801 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-14 21:09:04 +00:00
thunder2
6c626e180f Chat lobby:
- added new notifier to p3ChatService
GUI:
- list all public and private chat lobbies
- added subscribe/unsubscribe
- added new basic widget ChatTabWidget and use it in PopupChatWindow and ChatLobbyDialog
- added a tabbed dialog for every subscribed chat lobby

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 00:13:25 +00:00
csoler
e9d6940b09 Improvements to chat lobbies:
- added generic methods and items for bouncing generic objects through lobbies
	- added handling of peer typing status
	- proper handling of peer join/leave lobby
	- added sub item ids to lobby messages to allow proper message splitting
	- made 2 different message splitting methods for normal chat vs. lobbies. In v0.6, we'll have to handle all messages the same way.
	- added parent id to RsChatLobbyMsgItem, to allow threaded chat.
	- added possibility to make a lobby public/private (not yet fully working)
	- added items for requesting/exchanging list of public lobbies at friends' (not yet fully working)
	- major cleaning of p3chatservice.cc

Next move:
	- gui for listing friend public lobbies, joining them, etc.
	- load/save of persistent lobbies.
	- autoremove of inactive lobbies

Warning: lobby message items of this version are incompatible with previous versions. It won't crash, but
messages will not pass through.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4755 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-06 22:17:08 +00:00
thunder2
3ac5ead40e Fixed lobby names with utf8 characters.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4748 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-02 00:25:43 +00:00
csoler
94608c8467 added list of participants in lobby, handled large messages using splitted display (cannot ensure rebuilt message yet.)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4745 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-29 14:19:53 +00:00
csoler
4236ad59a5 fixed display of peer nicknames in chat lobby
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4742 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-28 09:15:28 +00:00
csoler
3addb36e4c added unsubscribe protocol, updated GUI
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4738 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-27 13:47:37 +00:00
csoler
cc57ab2462 added load/save of default nickname, plus some debugging
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-26 22:43:54 +00:00
csoler
a0e3522273 debugged basic chat lobby communication
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4708 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-04 14:31:48 +00:00
csoler
6c93253050 - derived new class of PopupChatDialog to handle chat lobbies
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4694 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-11-27 21:04:10 +00:00