Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,792 Commits 63 Branches 22 Tags 194 MiB
8da8f24683
Commit Graph

2447 Commits

Author SHA1 Message Date
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
e2746efb85 Optimized RsCollectionDialog (still without thread). 
Enabled extended selection and mark with the key 'space'.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5173 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-16 18:58:52 +00:00
csoler
6c9d701506 forgot ifs in notifyQt 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5170 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-15 20:32:36 +00:00
csoler
c0088f3e8f removed data race in QObject::connect() vs. NotifyQt signals by enabling notification signals only after GUI is created 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-15 20:25:53 +00:00
defnax
39c3d013f5 Improved the default recommendation text 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5166 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-14 14:14:38 +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
defnax
438651f693 update language strings and corrected connect attempt message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5155 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-09 13:49:23 +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
defnax
e23f7e1055 update translation strings, 
changed recommend friend context menu icon

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5152 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-07 14:43:25 +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
csoler
7382f7552b utf8 patch for notifyqt from AsamK 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5147 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-06 11:48:02 +00:00
thunder2
78fd91ce4a Fixed update (repaint) of the placeholder text of the quick view items in MessagesDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5146 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-05 22:29:59 +00:00
thunder2
b81a911793 Friend recommendation message 
- renamed subject
- added to system message
Recompile needed


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5145 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-05 22:20:05 +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
defnax
173ce82099 Added a title label to Friend Request Toaster, little design changes. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-04 14:42:06 +00:00
defnax
08e74f2dba * Removed hide/show Quickview function and moved Quickview little bit to the top. 
* Disabled to not stretch last column

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5137 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-03 15:42:43 +00:00
defnax
5b23a0e112 update icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5134 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-03 09:44:48 +00:00
thunder2
c99fa5f342 Added patch from braindead 
- Added empty entry to stylesheet-choice for "no stylesheet" and moved method "loadStyleSheet" from MainWindow to Rshare


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5133 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-02 20:19:51 +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
thunder2
c331098203 Added new message flag for system messages like friend request. 
Show "RetroShare" as sender of system messages to myself.
Added new quick view in MessagesDialog to filter system messages.
Changed RetroShare link in friend request message to certificate.
Added new subject image for the system messages (defnax).
Removed not used notify in message service.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5129 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-01 09:18:55 +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
d28ffb9c0d Added new notify on connect attempt by the local message system. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5124 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-26 23:41:14 +00:00
defnax
e8b1c08ace Removed not needed field in FriendRequest Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5121 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-26 09:42:35 +00:00
thunder2
9501a4fe2c Added new friend request toaster from defnax. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5120 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-25 19:19:16 +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
83f49ac143 Added threaded loading of channels (GUI). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5115 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-21 13:00:17 +00:00
thunder2
10400faf4c Removed minimal version. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5113 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-20 15:17:52 +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
defnax
722bade918 Fixed, hide "Accept Friend Request" Button for Unknown Peers 
Update translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5094 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-12 22:50:44 +00:00
csoler
2f749e2bf5 Improved Search Dialog (Patch from AsamK) 
-don't add friend sources count to anonymous count each time a result for the same file is received!, this could lead to enormously large sources numbers
  -don't readd search in summary list if it was already removed by the user
  -don't clear the filter when new search results are added
  -when using the file name filter only show result from the current search, not also from previous searches
  -fixed adding only file types which were searched for, for this I created a new hidden column in summary list to store the file type
  -fixed sorting by file size/age, pad string with '0' instead of ' ' Search feature: a quirk I've found
  -decrease gui hanging:
     -when adding search results temporarily disable sorting
     -only add 250 instead of 500 items in one go
     -don't call selectSearchResults() for each item added to the result list; instead call hideOrShowSearchResult() which only sets the hidden status of the added item, not the complete list
     -replace std::string with QString, removes unnecessary conversions


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5093 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-12 19:30:41 +00:00
defnax
68c07321ea Added a label for Connect Attempt after nickname "wants to be friends with you on RetroShare" 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5091 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-12 15:30:14 +00:00
defnax
57260853b7 removed not used items 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-12 15:20:06 +00:00
defnax
6aa7cd1e14 Added "You have a friend request" label to FriendRequest Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5088 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-10 15:55:12 +00:00
thunder2
681ec848e0 Fixed clickable links in forum message feed. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5085 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-09 15:01:25 +00:00
defnax
665b7fbf47 removed not needed button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5083 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-07 11:19:42 +00:00
defnax
70af1eccf5 Renamed "Accept Friend Request" Button to "Confirm", 
set correct stylesheet for new forum item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-06 21:29:09 +00:00
defnax
d0a9874c54 Added stylesheet for the Friend Request Buttons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-05 21:20:28 +00:00
thunder2
7756b093bf Added new basic class for a QLineEdit with a clear button - LineEditClear. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-05 21:03:03 +00:00
thunder2
1df5582e1c Enabled file preview on Windows. 
The link file to preview a not finished download is created in temp directory.
Added a messagebox when preview a not finished download to remove the link file.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-04 22:45:40 +00:00
defnax
70a7d6ce40 Added Friend Request Dialog for SecurityItem 
Fixed the horizontal spacers

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5077 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-04 15:44:35 +00:00
thunder2
af48bb9555 Removed the max length from the ip fields in ProfileWidget to display all 15 digits. 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5076 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-03 19:35:11 +00:00
csoler
2cd1df7484 enabled disabling autodownload for channel admin (patch from asamK) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-03 18:56:29 +00:00
defnax
fb47f06d24 Some Layout changes for MsgItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-02 15:57:44 +00:00
defnax
61f5ff5180 Improved PeerItem and SecurityItem layout 
Added icon for "Not Yet Friends"

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5069 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-31 23:05:30 +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
csoler
0778e8f691 3 patches from AsamK: 
* fixed utf8 in dropping links to channels
	* fixed pasting cert links in the friend list
	* added code to allow pasting GPG certificates missing a newline at the end.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5064 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-30 19:43:39 +00:00
defnax
6fa38e7d18 changed Avatar icons for SecurityItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-30 09:30:52 +00:00
thunder2
fae86aff3b Added two new images from defnax to SecurityItem for SEC_TYPE_CONNECT_ATTEMPT and SEC_TYPE_UNKNOWN_IN. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5060 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-29 20:23:18 +00:00
defnax
9951b36092 added icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5058 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-29 13:22:02 +00:00
thunder2
4cb844c44d Removed most of the usages of std::ostringstream in the gui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5056 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-28 18:02:49 +00:00
defnax
9ef7d08d2b Fixed Download link for Email Invite 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5055 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-28 15:48:42 +00:00
thunder2
c82c4ea8eb Set the default page of CreateChannelMsg back to the first page. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5054 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-28 12:23:42 +00:00
thunder2
343dced111 Removed unused member 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5051 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-27 19:40:49 +00:00
csoler
c174ad913f fixed crying smiley (Patch from AC) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-24 12:21:43 +00:00
thunder2
67cf9c5f3c Changed display of the own name in FriendsDialog from "Name (me) Location" to "Name (Location)". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-22 09:01:17 +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
thunder2
d765721e83 Modified some defaults: 
- set auto check of shared directories to 15 minutes
- set time to idle mode to 5 minutes
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5041 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-20 21:05:59 +00:00
defnax
d869b51fe5 Added icons for the Buttons in Profile Widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5040 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-20 10:30:36 +00:00
csoler
dc22171166 added placeholder texts (Qt>4.7) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-18 12:26:15 +00:00
thunder2
117d10eb44 Fixed crash in TransfersDialog when right clicking on a download without "#define USE_NEW_CHUNK_CHECKING_CODE". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5032 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-17 23:52:10 +00:00
defnax
5ab6c5decc Added Copy Certificate Button to ProfileWidget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5026 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-16 23:14:57 +00:00
csoler
40b9e17a2e fixed small issue in sorting information from different peers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5025 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-16 23:07:28 +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
defnax
42372c4223 fixed the icon size in forums 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5022 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-16 11:48:47 +00:00
thunder2
a5f8aa3077 Fixed display of the location with utf8 characters in ConnectFriendWizard. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-15 21:12:02 +00:00
csoler
889a2b2433 Added deferred check of chunks during file transfer. Chunk sha1 sums are requested to the sources and checked for downloaded data. 
Validated chunks are shared to other peers. Force check is now very simple since it just turns all chunks into "needs checking" mode
and sums are asked to sources. Sources maintain a temporary cache of chunks. Since sums are requested sparsely, this should not 
affect the sources in terms of performance. We can still imagine precomputing and saving sha1 of chunks while hashing them.

For backward compatibility reasons, the following has been setup *temporarily* in this version:
- unvalidated chunks are still considered as already obtained, and are shared and saved
- force check has been disabled
- final file check is maintained
- in case of file fail, the old checking mode will be used.

All changes for next version are kept in the define 'USE_NEW_CHUNK_CHECKING_CODE' that will be made the default in a few weeks.
At start, I expect most chunk to stya yellow during download, until most sources are able to provide chunk hashs.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5019 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-15 19:55:43 +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
c918ac84af Fixed update of the forum message state and the summary in ForumsDialog when the message is read in the news feed. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5015 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-12 00:27:18 +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
thunder2
a646f52671 Optimized layout of the newsfeed items. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5005 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-04 22:00:28 +00:00
thunder2
50c8ce261f Fixed hanging notification star in tray icon. 
After reading a message the notifier was not cleared.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5004 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-29 23:03:09 +00:00
thunder2
30564fe6ad Fixed utf8 characters in the transfer tab name of plugins. 
Added Q_OBJECT to the VoipStatistics classes.
Removed compiler warnings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5002 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-28 18:25:57 +00:00
thunder2
160a895c47 Fixed layout of the PluginPage. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4998 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-26 21:45:52 +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
45ac04e2e7 Count the friends (gpg id's) instead of the locations (ssl id's) in the statusbar. 
Moved update of the friends from QTimer to signals.
Combined p3LinkMgr::getFriendCount and p3LinkMgr::getOnlineCount and moved to p3PeerMgr.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-25 01:48:56 +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
csoler
826e8f3728 - added ability to plugins to add a tab in transfers dialog 
- improved VOIP plugin to add RTT statistics tab to RS gui.
- added comments in rsplugins.h
- added big tooltip in transfers that would be stuck in checking... mode



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-21 21:53:25 +00:00
thunder2
c907a5846c Added check for required location during gpg key generation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-21 19:17:38 +00:00
thunder2
0538c45fef Fixed compiler warnings. 
Fixed tab order in config pages Directories and Server.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4972 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-20 00:24:40 +00:00
csoler
afb0a1ba42 corrected stupid bug in settings causing crash when a plugin is ot loaded correctly 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4970 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-19 21:28:07 +00:00
csoler
ee5dcd1a8c - moved RsAutoUpdatePage into retroshare-gui/ directory, to allow plugins to use it 
- removed VOIP code from main executable. Moved it into VOIP plugin (c.f next commit)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-19 15:03:07 +00:00
csoler
2c6a2b4ee7 improved plugin management to allow services to be used, and config pages to be added 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4960 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-18 20:29:03 +00:00
csoler
5679a30e67 Improvement to plugin system: 
- made config page system more automatic, to allow addign config pages from plugins
- added (disabled) checkbox and function to allow all plugins for development
- added config page methods to RsPlugin class



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4957 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-18 14:55:50 +00:00
thunder2
5c75b3933a Mark local existing files in SearchDialog with red text color. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4955 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-18 01:50:33 +00:00
thunder2
5073913686 Fixed compile on Windows with enabled shadow build of Qt Creator. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-17 11:14:06 +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
thunder2
8f0f6a9f3e Moved the news feed tab to the first position. 
Added icon to the ConnectFriendWizard.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4944 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-15 21:13:16 +00:00
thunder2
5bacc13eba Renamed "Dht" to "DHT". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-15 20:40:41 +00:00
thunder2
bdc8a11203 Added patch from James Vasile. 
Replaced string "Authemticated Messages" by "Authenticated Messages".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-15 00:27:47 +00:00
thunder2
363c7d8f41 DownloadToaster: 
- Fixed handling of utf8 characters in the file name
- Replaced QDesktopServices by RsUrlHandler to handle collections
- Fixed crash after opening a collection

Thanks to AsamK

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4936 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-13 23:26:56 +00:00
thunder2
dcf23e0ccb Fixed usage of utf8 characters in certificate links (gpg and location name) (Patch from Asamk) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4935 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-13 21:09:38 +00:00
thunder2
8675eb9225 Added translation for "[ ... Missing Message ... ]". 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-13 20:40:36 +00:00
drbob
1eb82bd676 * Added two new Services to RS GUI. 
- The Wire, this is not at all functional yet - just a gui shell.
	- Identity, Basics of the GUI complete. talks via rsIdentity to the backend.
 * Fixed the Photo Drag and Drop under Linux.
 * Resurrected the Application Window - for Unfinished Service.
 * Moved Photos, Wire, Identity & Wiki to the Unfinished Window.
 * Added "Experimental Services" option in Settings -> though this is not yet saved / used.
 * changed #ifdef UNFINISHED -> #ifdef UNFINISHED_FD for bits in FriendList, which didn't compile.
 * removed old Unfinished Applications from Window.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4933 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-13 18:43:15 +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
07ea6829b6 The channel message (in channels) is set to read when the user clicks on the show more button. 
The forum/channel news feed is removed when the user reads the message in forums/channels.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4927 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-12 00:58:47 +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
csoler
98086e125b added missing IPs to certificate links 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4924 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-11 14:49:04 +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
drbob
6a44342e4f fixed reference to tryNetMode. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4922 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-11 12:49:09 +00:00
csoler
fd83e5950f added control over TR forward rate, so that we can experiment with it on large bandwidth servers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-10 22:23:06 +00:00
thunder2
f6c88667c4 Changed the color of the time of the compact chat style from red to gray. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4917 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-10 22:07:03 +00:00
csoler
2bfd0bad42 disabled autodownload when subscribing to a channel. This is a response to a heavy demand from users annoyed by the need to cancel many downloads and the wish to be able to select what to DL in a channel. We could create a popup with a autdownload checkbox (unchecked by default) possibly asking what to DL in the subscribed channel (everything/only last post/nothing) when subscribing to make auto-download a little more visible 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4916 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-10 20:59:57 +00:00
defnax
01899b85f9 set a icon for Friend Recommendation menu action 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4915 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-10 13:28:51 +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
3b314e3a69 Added multi friend recommendation dialog. 
You can start it from the tools menu in FriendsDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4913 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-09 19:18:15 +00:00
thunder2
d5479940d1 Fixed RetroShare links with " characters in the name. 
Removed not used plugins from the .pro file.
Removed some warnings from lupdate.
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-08 12:11:15 +00:00
thunder2
886faa89ba Fixed RetroShare links with "#" and "&" characters in the name. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4901 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-07 22:56:19 +00:00
defnax
fb7bc3e832 updated the help page, added few more infos 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4899 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-07 16:33:54 +00:00
thunder2
2cdb36fda1 Fixed layout of the CryptoPage and german language. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4896 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-06 21:21:30 +00:00
thunder2
b4d9828438 Added new translation for chat lobby invitation. 
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4894 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-06 18:48:23 +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
04dedf5ce0 Fix some source code for better translation, added some new words to translate and removed some words not to be translated. 
Fixed german translation.
Please review the other languages.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4892 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-05 21:05:11 +00:00
thunder2
3b1c26de35 Set the focus the subject input when creating a new forum/channel or channel message. 
Set the forum/channel message to read when expanding the message feed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4891 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-05 14:56:27 +00:00
drbob
35ab646aa2 Added PhotoShare Plugin to Retroshare. 
- Like the Wiki, this is GUI without a backend.... so we can get this part right first.
	- Added Bits to compile into Retroshare too.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4888 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-04 14:06:37 +00:00
drbob
42acb5007e Added Wiki GUI Elements. 
- This is a new Plugin, for development with the new cache system.
	- We want to get the GUI right before finalising the back-end.
	- This will start life here, then be moved to the Plugin section.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4887 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-04 13:47:36 +00:00
thunder2
91809abd56 Replaced std::string by QString in GetStartedDialog for easier translation and to prevent problems with utf8 chars. 
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4886 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-04 00:55:55 +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
drbob
a1806bb04f Fixed up Email Invite Text... 
* Unified Text Source.
 * Added "Cut Below Here" line



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4883 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-03 20:38:45 +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
drbob
15ea61caa3 More changes for V0.5.3a 
- Updated English Email Invite (sorry guys, you'll have to redo translations).
 - Set OSX default style to "Cleanlooks" - as AQUA style hides some windows.
 - Updated Version strings to V0.5.3a. / 4874
 - Fixed missing headers for plugin manager.
 - Disabled ZEROCONF for OSX.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-03 00:15:49 +00:00
thunder2
ff0d6ff25a Optimized some internals in the news feed items 
- std::string -> const std::string&
- QObjectList -> QSet<QObject*>

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4870 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-01 12:21:14 +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
defnax
75f152a21f fixed to display the the correct help icon on MainWindow 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4865 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-30 10:52:08 +00:00
csoler
b8816c8622 fixed small bug in certificate correction 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4864 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-29 16:49:35 +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
6c7535a3aa suppressed debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-28 13:20:01 +00:00
thunder2
6de8541a4e Added (make functional) the lobby menu in the context menu of the gpg and group item in FriendList. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-27 20:53:17 +00:00
thunder2
0cf53e993e Added doubleclick to join a lobby. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4857 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-27 18:51:27 +00:00
defnax
cf5d88ab8b Removed DynDns from Quick Start Wizard 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4856 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-27 15:02:56 +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
defnax
522729bae4 Fixed Auto-Download Button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4846 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-26 08:46:22 +00:00
thunder2
4433872cb6 Fixed wrong display of the news feed notify in FriendsDialog when the tabs were moved. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-25 21:45:23 +00:00
defnax
69dea0e845 little changes for Getting Started Tab 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-24 23:01:43 +00:00
csoler
a139700de4 added button to add/remove signatures and button to copy RS cert link to clipboard 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4841 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-24 22:31:53 +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
thunder2
cb9111ad88 Changed the recommendation of friends from person link to certificate link. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-23 22:38:50 +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
csoler
a8456a2332 Plugged-in method for removing signatures in PGP keys => now RS has small and constant-sized certificates. 
- added checkbox in ConfCertDialog to allow adding/removing signatures
- enabled again key signature button in friend wizard
- RS cert links now use small keys.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4836 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-23 20:55:08 +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
5529588a1f Removed compiler warnings. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4833 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-22 23:29:11 +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