Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-25 14:56:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,295 Commits 63 Branches 22 Tags
Commit Graph

605 Commits

Author SHA1 Message Date
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
2611da2f72 Changed style of the reply/forwarded message. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-04 23:39:36 +00:00
thunder2
8bd1b7aa4a Added (and modified) patch from Imanuel 
- Added ability to style the system messages in chat (e.g. Lobby management)
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5130 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-01 12:58:28 +00:00
csoler
32ac7efb42 added paste own certificate to chat/forum context menu (patch from AC) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5125 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-27 12:04:40 +00:00
thunder2
586e8bc042 Added patch from Imanuel 
- Fixed base path for the external stylesteets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5119 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-24 19:43:38 +00:00
thunder2
3dca71330c Optimized channel loading and layout. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5118 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-24 15:34:22 +00:00
thunder2
f2f5d60a8a Added modified patch from AC 
- don't remove color and font when the last char is deleted from the chat text entry box

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5095 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-12 23:00:39 +00:00
thunder2
25a266bcbf Added new flags to the html optimizer to remove font and color from html and used this for displaying the message in the toaster. 
Fixed layout of the toasters.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5068 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-31 15:20:19 +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
65cde95fba - added/fixed patch from defnax to allow setting up a topic for each chat lobby. The topic is displayed to friends. 
- handled backward compatibility by keeping/sending old LobbyList item. Should be remove in the near future.
- removed constraint to have at least one friends invited when creating a new lobby.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5024 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-16 22:47:49 +00:00
thunder2
7ab5b54266 Fixed clear of "is typing...". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-15 13:18:47 +00:00
thunder2
fedba02d18 Fixed display of the friend status in chat window. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5014 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-11 00:22:25 +00:00
csoler
96fd780502 added ability for plugins to return their own PopupChatDialog class 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4988 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-25 12:17:36 +00:00
thunder2
9ab7920a7a Fixed scroll position of the text browser in the chat dialog when the friend changes the status and the info frame is shown or hidden. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4983 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-23 23:30:53 +00:00
thunder2
56b9fe49ea Reworked the start of a chat with a gpg id (doubleclick in friends tree). 
Removed the question to send a message when a chat with an offline friend is started.

Start the chat when
- only one ssl id exist (online or offline)
- only one ssl id is online
Show a messagebox when more than one ssl ids are online or all are offline.

Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4981 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-23 00:09:41 +00:00
thunder2
970d88200d Removed some more compiler warnings from Windows compile (GCC 4.4). 
Added -Wextra to the Windows compile.
Added new define in libbitdht for snprintf and fprintf to proper handling of "%ll" under Windows.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4951 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-17 10:03:38 +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
d828d23ca7 The standard font is now used for new chat lobbies. 
Added a new menu item to set the font of a private chat and chat lobby to the default font.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4926 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-11 21:41:41 +00:00
thunder2
340a313fea Fixed bug when the user clicks on a link without http:// in a QTextBrowser. This link was opened directly in RetroShare. 
Show clickable links in the channel feed message.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4923 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-11 13:42: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
92275e8e85 Switched the used chat style for the lobbies from private to public. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4893 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-06 16:58:45 +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
20b00401ec Fixed handling of utf8 characters in lobby nick name. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4878 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-03 13:29:16 +00:00
thunder2
602ae72d7d Added new compact style for chat. 
Improved the HTML optimizer.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-31 00:06:24 +00:00
thunder2
55d53e6dd4 Start the CreateLobbyDialog from the list of chat lobbies with the privacy level of the selected item. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4866 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-30 23:20:42 +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
thunder2
2aa1ede192 Changed some internals in the chat dialog handling (private chat and lobby). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4855 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-27 14:49:48 +00:00
thunder2
e6816c9d6f Added new common widget FriendSelectionWidget for selecting friends and use it in CreateLobbyDialog, ShareKey (forums and channels) and MessageComposer. 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4850 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-27 00:32:17 +00:00
thunder2
a3a0690cb4 Fixed crash when closing a chat window. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-26 21:30:57 +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
fadc86b189 Removed scroll to the end in ChatWidget (private chat and chat lobby) when the scrollbar is not at the end. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4835 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-23 19:57:06 +00:00
thunder2
3cba51abf4 Reworked SoundManager and SoundPage in the settings. 
Added new icon in the statusbar to switch off the sound.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-22 22:58:23 +00:00
thunder2
80a20b41a3 Fixed message reply and forward. 
The new lines were removed falsely.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4815 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-18 23:00:50 +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
defnax
da69e1f1ad little design fixes for Create Lobby 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4747 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-30 21:23:35 +00:00
defnax
78130fd635 fixed Chat Lobby Dialog Layout 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4746 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-29 22:39:31 +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
ed395fe061 fixed compilation for Qt<4.7 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4741 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-27 21:06:43 +00:00
csoler
60bb76e3df Imported chat lobby function from branch v0.5-ChatLobby (merged commits 4682-4739) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4740 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-27 16:32:19 +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