Commit Graph

415 Commits

Author SHA1 Message Date
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
56e71b51fa added notifications so that the distant chat window pops up
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6319 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-19 22:24:25 +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
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
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
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
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
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
9cfe660e11 Removed toaster for muted participant of a chat lobby.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6059 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-03 16:20:14 +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
thunder2
09f42dbc3c Added new level gpg id to FriendSelectionWidget (groups, gpg id, ssl id).
Added friend selection to the group dialog for better assigning of friends to groups.
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5881 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-24 14:48:31 +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
thunder2
968f72f303 Fixed missing seconds in time format.
Added new basic class for date/time format.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-15 21:35:37 +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
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
thunder2
a573211629 Added and modified patch from Henry
Modified the date format according to the chosen language (locale).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-10 18:59:58 +00:00
thunder2
9b5ee85fd0 Removed context help button from the dialogs (currently not used) and added minimize/maximize buttons to the "floating" dialogs.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-06 23:26:47 +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
thunder2
7272b7e768 Added blinking of the chat icon for private chat window and chat lobby.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-25 18:06:33 +00:00
thunder2
179618edbf Added blinking of the systray icon for the notifier and enabled it for private chat.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-24 13:24:38 +00:00
thunder2
232af8e71e Changed SoundManger to allow the plugins to play sounds.
Added example to VOIP (commented out).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 21:38:55 +00:00
defnax
e45d6e8853 set a minimum spacing on ChatWidget
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5690 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-18 11:52:17 +00:00
defnax
5bded75b0c Moved the Send Button to right side of the Chat LineEdit for better look.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5679 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-15 13:49:47 +00:00
thunder2
bc41be1f9a Added patch from Henry
Removed hardcoded fonts

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-14 12:25:12 +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
b67f9f88fe Changed the standard dialog buttons from single buttons to buttonbox to have a standard layout and a standard translation.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5657 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-10 10:51:53 +00:00
thunder2
805f64808e Added patch from braindead
- Added new base class MimeTextEdit to paste images from the clipboard into a QTextEdit and added this in MessageComposer and private chat.
- Disabled paste of images for the next stable release.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5613 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-26 23:32:53 +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
thunder2
3d341b3817 Moved some internal stylesheets to the file Standard.qss.
Reworked some elements in the standard gui.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5521 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-07 17:30:23 +00:00
thunder2
a82e2960e1 Moved some internal stylesheets to the file Standard.qss.
Set the built-in stylesheet "Standard" as default for new profiles.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-29 22:40:16 +00:00
thunder2
6675bfe35e Moved some internal stylesheets to the file Standard.qss.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-27 21:48:00 +00:00
thunder2
3f2ab9259d Added new base class HeaderFrame - image and text at top of the windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5464 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-24 10:49:08 +00:00
thunder2
70cbd3c84d Cleaned some ui files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5457 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-22 13:44:23 +00:00
thunder2
28def71b4e Added clear chat history to the context menu of the message text browser.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5456 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-22 08:19:46 +00:00
defnax
3a75ccde09 redesign the Create Lobby Dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5446 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-21 11:15:46 +00:00
defnax
abbdf5c4eb enabled colored nicknames
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5392 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-08 09:50:55 +00:00
thunder2
b21e66241b Reworked notification code in system tray.
Added a base class and a possibility for the main dialogs and the plugins (derived from MainPage) to provide a notifier.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5381 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-05 20:12:55 +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
e5a25b94f0 Added "file:///" to "%style-dir%" for the chat styles.
Renamed "RetorShare" to "RetroShare".
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5206 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-06-08 22:06:28 +00:00
thunder2
ff6276e920 Changed chatstyle structure from
[RS-Dir] / stylesheets / {public | private | history} / my_chatstyle /
to
[RS-Dir] / stylesheets / my_chatstyle / {public | private | history} /

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-06-01 21:48:53 +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
thunder2
917f9913df Added patch from Imanuel
- Added new placeholder %style-dir% for ChatStyles.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5183 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-23 13:24:04 +00:00
thunder2
56e156a65a Fixed replacing of %color% in ChatStyle. It should not be replaced after %message%.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5182 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-23 09:19:50 +00:00
thunder2
a7eda64872 Fixed compile on Linux.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-20 16:53:28 +00:00
thunder2
b344aebbe6 Added changes from braindead:
- simplified avatarwidget
- prepared property-dependend stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5176 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-19 22:18:15 +00:00
thunder2
dc2d6c975e - Moved HandleRichText from the folder "chat" to "util" and redesigned the source
- Extended RsHtml::formatText to replace the RetroShare links with an image and enabled this for the certificate links in the system messages (friend recommendation and user request)
- Added new ObjectPainter for painting a button on a pixmap


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-12 00:40:53 +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
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
thunder2
0ee35b55f4 Added new widget for hashing files.
Added new common class FilesDefs to handle informations of file types like icons and names.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4713 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-07 13:08:12 +00:00
csoler
816a477806 bug corrections
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4712 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-07 00:12:17 +00:00
csoler
0086e182ec bug fixes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4710 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-04 22:22:15 +00:00
csoler
71a079b55f added chat lobby creation window
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-04 22:03: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
csoler
5cdc36d730 Basic methods and a bit of interface for chat lobby.
Next:
- chat lobby algorithmics (cache+broadcast system)
- invitation handling
- specification of chat lobby window with list of known/unknown participants


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4685 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-11-23 22:10:37 +00:00
thunder2
7a98e83df1 Fixed some more utf8 issues with umlauts in the Windows user name.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4636 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-10-12 23:36:25 +00:00
csoler
6addc80e99 fixed link passed issue due to usin self-closign links (Patch from Asamk #3418941)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4631 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-10-05 16:57:33 +00:00
thunder2
b3bcfe9d30 Fixed compile on Linux.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4624 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-09-29 09:52:01 +00:00
thunder2
29c090fb44 Moved the chat history into the libretroshare.
Now the history is saved encrypted. Please delete all files with "chat*.xml" in your profile folder.
Added new config p3HistoryMgr and interface p3History.
Added new option to limit the count of the saved history items.
Added new simple html optimizer "RsHtml::optimizeHtml" to reduce the size of the html strings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4623 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-09-29 09:20:09 +00:00
thunder2
62b2de63b7 Added new widget to display an avatar with or without the status frame - AvatarWidget.
Changed all existing avatars to AvatarWidget.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4589 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-09-05 21:19:07 +00:00
thunder2
b35d32ef15 Added avatar image to ConfCertDialog (defnax).
Added new class AvatarDefs to get the avatar for a ssl id or gpg id.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-09-02 10:22:44 +00:00
thunder2
0fbada0eba Applied patch from AsamK and fixed german translation.
Reduced code duplication with avatar picture loading, by creating two new functions that handle image choosing and thumbnail creation.

two new functions:
bool misc::getOpenAvatarPicture(QWidget *parent, QByteArray &image_data)
QPixmap misc::getOpenThumbnailedPicture(QWidget *parent, const QString &caption, int width, int height)

getOpenThumbnailedPicture opens a QFileDialog to let the user choose a picture file. This picture is converted to a thumbnail and returned as a QPixmap.

getOpenAvatarPicture calls getOpenThumbnailedPicture and converts the result to a PNG byte array.

All three avatar loading functions now call getOpenAvatarPicture
Furthermore Channel Logo and Channel Msg thumbnail functions now use getOpenThumbnailedPicture

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4561 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-08-12 20:27:05 +00:00
thunder2
70d02c718d Removed unused parameter warnings in retroshare-gui.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-08-12 14:06:29 +00:00
drbob
b082362c58 Updated retroshare-gui to match libretroshare interface changes.
* remove calls to rsPeers->setAcceptToConnectGPGCertificate();
 * these are replaced with addFriend() / removeFriend().
 * renamed rsPeers->getSSLChildListOfGPGId() => rsPeers->getAssociatedSSLIds().



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4543 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-08-07 21:14:09 +00:00
thunder2
8d4a4db027 Changed the generation of the gpg key and location to utf8.
The existing gpg keys and locations with umlauts are now shown wrong. The changes are not backward compatible.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-17 23:07:29 +00:00
thunder2
b86407f395 Added a new image to the private chat window to set the window always on top.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4409 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-08 22:33:26 +00:00
thunder2
ec12fcff6e Optimized layout of the private chat window.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-07 23:24:48 +00:00
thunder2
2efa6b5b06 Moved the fill function of the ForumsDialog to a QThread.
Fixed memory leak of the fill thread of the history browser.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4240 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-06-07 22:28:07 +00:00
thunder2
650ef12af6 Added a new button in the forums dialog to download all links in the selected forum message.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4202 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-05-15 20:21:14 +00:00
thunder2
0619463948 Fixed some more utf8 handling in the GUI.
Optimized creation of the RetroShare links for forum and channel messages.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4194 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-05-08 23:11:27 +00:00
defnax
ed3fa92096 Enabled on Private Chat to display for the status string smileys, when there is smiley codes used.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4186 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-05-04 15:07:03 +00:00
thunder2
cd8188bf09 Added new RetroShare link format to start a search
retroshare://search?keywords=...
Enabled key "delete" to remove search results.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4185 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-05-04 10:22:49 +00:00
thunder2
60138e0137 Added title to the RetroShare file links shown as toolhelp "hash (size)".
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-05-01 22:26:41 +00:00
thunder2
0fbde70e32 New dialog for defining own colors for the private chat window.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4150 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-04-09 22:52:52 +00:00
thunder2
4d9f07e797 Saved the visible state of the avatar picture in private chat for the friend.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4105 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-03-26 23:19:28 +00:00
thunder2
c42b326315 Added a basic description of the chat style.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4092 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-03-12 21:09:53 +00:00
thunder2
b245ad7cf7 Messages with plain text (like the welcome message) are shown correctly.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-03-06 12:58:18 +00:00
thunder2
6bb4854925 Removed tab focus from the toolbar and image buttons.
Fixd german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4071 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-03-02 22:16:04 +00:00
thunder2
28ebbf0b2e Added a confirm to the delete history action.
Added the RetroShare icon to the password input window.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-02-27 21:47:49 +00:00
thunder2
17a57e0509 Reworked clear and delete of public and private chat history.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4022 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-02-08 21:59:17 +00:00
chrisparker126
dbe0890974 restored channel key restore
created new action for delete channel history

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4017 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-02-06 20:41:15 +00:00
chrisparker126
9b0a0b6c28 clear chat history bug fix (2992786)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4014 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-02-05 18:37:29 +00:00
thunder2
ad67844c7a Enabled clickable links in forums and messages.
Added new translation in messages (count of recommended files).
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3946 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-12-30 17:09:32 +00:00
thunder2
f7252fd693 Added three new methods on misc: getOpenFileName, getOpenFileNames and getSaveFileName. Please use this rather than QFileDialog.
Added save and restore of the last used directories for the following types
- Extra files
- Certificates
- History
- Images
- Messages
- Blogs (not tested)
It is easy to change.

Added attach of multiple files at once in CreateForumMsg.
The RetroShare links of the added files in CreateForumMsg are added with new style and as anchor with size information.
Added translation to some file dialogs.
Removed (commented out) not needed methods in NetworkDialog.
Fixed handling of filenames with umlauts when adding extra files.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3894 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-12-03 00:54:40 +00:00
thunder2
e7813892bc Unicode support for status message.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-11-24 19:25:53 +00:00
defnax
0b9a5e5b2b Added to display for attached pictures in Private Chat a default icon for the rs link.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-11-22 20:10:12 +00:00
thunder2
064b619f70 Added standard context menu to the input text in private chat, group chat and create forum message.
Added paste RetroShare link to the context menu of the text edit and file list in message composer.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3846 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-11-21 21:12:35 +00:00
thunder2
7bcebc8e2b Fixed add attachment per drag and drop.
Added the size after the link in group chat too.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3833 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-11-20 01:40:24 +00:00