Commit Graph

1848 Commits

Author SHA1 Message Date
defnax
c9fe6dee6b moved Horizontal text Splitter to Insert Menu and added Paragraph ComboBox instead of Lists ComboBox, Lists needs a own Format Menu not more use as ComboBox.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-25 17:18:12 +00:00
defnax
ff32924d73 removed one Blockquoute Button
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-25 16:16:28 +00:00
defnax
b99617d523 clean up unused functions in PeersDialog and set minimum size for items to 26.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2998 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-25 15:47:12 +00:00
defnax
18aa8bca8e store by default for Save File menu and Save Button to draft
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2997 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-25 13:22:42 +00:00
thunder2
12af62d54f disabled the new read/unread state in MessagesDialog
reason: the member msgId is not static yet

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-25 12:05:14 +00:00
defnax
097caf6e98 Added File Menu entry Save as Draft for MessageComposer.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2995 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-25 10:41:26 +00:00
thunder2
b0c1467abe improvement MessagesDialog:
- enabled draft box

bugfix MessagesDialog:
- correct from and to in list and message header

changes MessageComposer:
- cleaned channel part


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2994 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-25 09:32:14 +00:00
defnax
6b76aa81b0 moved Reply Forum Message Button to right Frame Header
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2988 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-24 01:00:47 +00:00
defnax
d0ef2c335d Added Search Friend Filter for Messenger Window
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2987 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-24 00:59:12 +00:00
defnax
b4a4ce07af Enabled Post to Forum for ForumNewItem
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2985 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-23 23:02:15 +00:00
defnax
c3e1a71279 cleaning up source code removed GeneralMsgDialog and ConnectDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2984 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-23 22:35:51 +00:00
thunder2
591a141a18 - removed MessagesPopupDialog
- click in MessageToaster shows the MainWindow and activates the MessagesDialog


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-23 21:32:58 +00:00
defnax
1fb7fb005c rename class and source ChanMsgDialog to MessageComposer
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-23 19:13:41 +00:00
defnax
75349f4fe8 fixed to use ", " instead ";" to for distance to next peer name
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2977 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-23 18:31:40 +00:00
defnax
718ed562ca set for Attachments column to display a icon and fixed size
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2976 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-23 18:17:08 +00:00
thunder2
cef2c1218f improvements MessagesDialog:
- new read/unread state - stored locally
- show all recipients in Outbox, Sentbox and Draftbox


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2975 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-23 17:21:30 +00:00
defnax
a5cc8d7ba2 Added for Peer name own Label to display bether Friend's names for News Feed's PeerItem
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2973 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-22 00:23:13 +00:00
defnax
f79afbf7c3 Added to use now only the default Message Composer for MsgItem and PeerItem too, GeneralMessage needs to be removed soon.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2971 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-21 23:49:01 +00:00
defnax
5b9b0aba96 fixed to attach multiple links for Create Forum Message
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2970 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-21 23:45:25 +00:00
csoler
0634e461fb implemented a safety check for low disc space, and safe drop of disk access if too low
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2968 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-21 20:49:48 +00:00
defnax
4d99495361 when no channel selected display default channel logo.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2967 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-21 15:50:29 +00:00
defnax
df6dfd9f3c Added Message settings Page
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2966 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-21 13:54:40 +00:00
defnax
a387ff5ae1 enabled Blogs checkbox in Notify settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-21 12:48:58 +00:00
thunder2
6baf56285b reworked settings
now there is only one global object for loading and saving settings

RshareSettings *Settings;

the class RSettings can be used too, but it is not prefered, because the default settings has no affect

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-20 21:53:27 +00:00
defnax
e68e6b54ef fixed Blogs border colors for the logo label and added a new stylesheet when no Blog is selected
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-20 21:21:13 +00:00
defnax
d2baf4902d Added Blog New Item to News Feed.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2962 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-20 21:00:59 +00:00
defnax
5df17295b8 added to display on New Channel Feed Item Channel logo when available
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2959 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-19 22:43:13 +00:00
chrisparker126
ee1477df10 added restore admin/publ keys to channels (todo: forums, blogs)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2958 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-19 22:43:07 +00:00
defnax
3e1c18fac3 added search icon label for Messages Filter Line Edit.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2956 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-19 21:33:10 +00:00
defnax
8de48d3b74 added for search filter own frame header
moved the new forum search filter to the top Header

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2955 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-19 21:02:43 +00:00
thunder2
c2f7f7935e improved ForumsDialog:
- new filter for threads tree
- saved layout of dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2954 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-19 20:17:43 +00:00
thunder2
8673924374 removed unnecessary method
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2950 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-19 19:44:06 +00:00
thunder2
4cf10ee99a fixed compiling error, damn case sensitive file names
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2947 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-18 22:41:44 +00:00
thunder2
71b3783a9a improved MessagesDialog:
- saved state of files view, filter column, state of message tree and splitter position
- initial selection of inbox
- new filter mode: content

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2946 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-18 22:37:18 +00:00
thunder2
6fbf0d4bbe removed unused default font for chat, now using the default font from the system
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-18 19:22:07 +00:00
thunder2
70f4846061 fixed compiling error of last commit
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-18 18:50:55 +00:00
defnax
d357459d96 set a default size for Links Cloud tree items
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-18 18:09:35 +00:00
thunder2
a8c4b3b107 - moved the chat setting to the section [Chat]
- cleaned some comments of the settings classes

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2940 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-18 18:02:51 +00:00
defnax
3e968b68c3 removed sectionGroup for Chat settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2939 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-18 10:48:21 +00:00
defnax
e981dffc8c redesigned SubFileItem Layout.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2938 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-17 23:21:32 +00:00
thunder2
42f728a483 removed call to :clone in refill of threads in ForumsDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2937 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-17 21:42:18 +00:00
defnax
4380251c08 moved Post Button to header and fixed Subscribe Buttons Icon to not stretch the Button in cleanlooks style.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2936 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-17 21:30:56 +00:00
defnax
bea26895ef set minimum size for channel items to 22 for bether display and moved Post Button to top header
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-17 21:20:11 +00:00
defnax
daa363409f changed some stylesheet colors for Blogs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2930 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-17 20:05:38 +00:00
defnax
ab0bc5ccf9 added display Blog logo's for BlogsDialog, and stylesheet color switch when its own, subscribed or public Blogs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2929 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-17 18:10:48 +00:00
thunder2
84a48d2c80 fixed load and save of window state again, i used the wrong class, now it's ok
please delete following files if exist
- MainWindow
- MessengerWindow
- BandwidthGraph
- HelpBrowser

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2926 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-17 10:48:59 +00:00
defnax
7e409c0b79 fixed Mispelling in Wizard
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2921 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-16 22:06:49 +00:00
csoler
5a65dabc09 - suppressed some errors in printf commands with uint64_t - apparently, the cap function in QRegExp takes a non const in some Qt versions. I had to copy the const parameter to a local variable.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-16 20:06:04 +00:00
thunder2
48d2007f81 MessengerWindow::insertPeers:
- memory leak - return of takeTopLevelItem and takeChild are not deleted
- possible crash, when child has disappeared

fixed load and save of window state, i forgot to give the name of the window to the settings class

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2916 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-16 11:10:13 +00:00
defnax
93cd5e67f8 renaming Button string
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2915 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-16 11:04:58 +00:00
csoler
5b119ca4ba Corrected typo, Replaced Ok Button by anabled Apply button in settings, suppressed double click action for download in Shared File lists
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2914 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-16 09:54:21 +00:00
thunder2
9606dce758 removed QMenu*
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2912 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-15 18:31:16 +00:00
defnax
0ea28c37ce fixed some wrong spelling errors
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2911 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-15 13:47:19 +00:00
thunder2
c3c6480f4b changed the usage of "QMenu*" to a local "QMenu"
removed usage of "new QMouseEvent", it was a memory leak
cleaned some includes

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 20:55:44 +00:00
defnax
91dde5b8b8 added [Chat]group category when store/load Chat settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2908 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 17:58:13 +00:00
defnax
24e4058bee store the font change on PeersDialog too
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2907 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 16:54:30 +00:00
defnax
07a9d1c0ae added to display channel logo's for each channel item's
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2906 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 16:33:35 +00:00
chrisparker126
26a808b3e7 added group icon support for blogs and channels
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2905 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 13:06:58 +00:00
defnax
47de2af50c added storing and loading Chat Font
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 12:42:31 +00:00
csoler
bed286030e suppressed weird characters at the beginnign of this file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2902 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 11:48:20 +00:00
thunder2
e8f5bb5167 PeersDialog: "QPixmap picture" not needed as member
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2900 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 11:17:19 +00:00
thunder2
84a87fa11b New methods for calculating the count of peers and messages. It should be faster than getting all data in std::list.
Now used in MainWindow.cpp, MessagesDialog.cpp and peerstatus.cpp

void p3Peers::getPeerCount (unsigned int *pnFriendCount, unsigned int *pnOnlineCount);
void p3Msgs::getMessageCount(unsigned int *pnInbox, unsigned int *pnInboxNew, unsigned int *pnOutbox, unsigned int *pnDraftbox, unsigned int *pnSentbox);


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2898 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-13 19:20:40 +00:00
defnax
e5667a915d fixed bug with ShareDialog loading
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2894 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-13 12:11:03 +00:00
defnax
604fd1872a fixed to add a new line when retroshare link is added
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2893 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-13 09:38:24 +00:00
thunder2
946d09cb72 Fixed crash and endles loop with refill in forums
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2892 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-12 22:23:05 +00:00
thunder2
b242b73f31 Memory leaks:
- ftController::copyFile -> buffer and file pointer leaks in case of error
- PeersDialog::insertSendList -> new QTreeWidgetItem for all online peers, this function is not ready yet
- PeersDialog::insertPeers -> gpg_item = new QTreeWidgetItem(0); in case of no more accept connection
- pqissl::reset -> missing SSL_free of ssl_connection

Missing return:
- IntroPage::nextId


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2891 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-12 20:10:22 +00:00
leander-256
faace1f322 Memory leak fix
Instantiate the smiley pop-up window (and all its buttons) only once.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2890 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-12 19:03:30 +00:00
leander-256
988c6c31f5 Fixes two problems in the current group chat:
- the parser fails to embed two links in the same sentence
- the parser can potentially put smileys in the middle of <a> tags

Solution:
Since the message is in HTML, it is parsed into a DOM tree, then that DOM tree
is traversed and only the text nodes are parsed (see HandleRichText.cpp for
details).

Bonus fixes:
- missing std:: for endl (which was falling back to its Qt counterpart)
- commenting useless code in PeersDialog::smileyWidgetgroupchat()
- replacing int by size_t
- RetroShare.pro now queries gpgme-config for its include path


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2888 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-12 00:17:10 +00:00
thunder2
6b3f51c626 Bugfix: Attach a file in message dialog inserts the link at current cursor position and does not overwrite the whole message text
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2887 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-11 20:53:21 +00:00
thunder2
0c46da0dd2 Changed settings to local variable, no more as pointer on all classes.
RshareSettings settings;
settings.value(...);

It should lower memory usage and removes memory leaks.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2886 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-11 20:02:52 +00:00
defnax
2f8d21ab76 clean up some compile warnings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2885 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-10 20:38:59 +00:00
thunder2
c5cebce587 MessagesDialog:
- columns in messages list in MessagesDialog changed to defines
- fixed sort of a non date column with same id, date is used as second compare

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2884 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-10 19:55:59 +00:00
thunder2
465cd42463 Memory leak:
- getLocalInterfaces -> iptable = (MIB_IPADDRTABLE *) malloc(dwSize);
- main -> RshareSettings  *_settings = new RshareSettings();

ExtAddrFinder::~ExtAddrFinder - use free for pointer allocated with malloc


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2882 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-09 21:58:28 +00:00
csoler
23a0b60e59 fixed chat bug that was truncating some messages, due to using a uint16_t to store a local size. Totally backward compatible. This fix might also affect blog messages.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2880 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-09 20:06:19 +00:00
thunder2
20908b2c48 Count of new messages in systemtray tooltip corrected
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2872 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-09 08:01:52 +00:00
chrisparker126
4a410fbfb6 removed references to qblogs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2869 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-08 17:03:28 +00:00
chrisparker126
c5e8669ec0 Channels
- removed settings button 
 - deals with hashing of its own files
 
 subfileitem
 
 - absolved from file hashing responsibility 
 - added play button functionality(taken from transfer dialog, thanks)
 
 blog
  
  - removed file attachments feature (only for blogging ), will add pic support later
  
 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-08 16:21:57 +00:00
thunder2
a640995298 Memomry leak:
- Member _settings on some settings pages was not deleted


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2864 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-07 23:58:17 +00:00
thunder2
f239e7e4d4 Improved MessagesDialog:
- corrected calculation of message counts
- p3MsgService::checkOutgoingMessages -> notify when message was sent
- refill of message list without clear, selected messages and scroll position are not changed
- corrected sorting of date with only time for today
- changed context menu in message list

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-07 22:23:38 +00:00
defnax
c611cdf6b9 set GroupChat default font size to 11 pt.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-06 17:22:30 +00:00
defnax
5de5cf2fa5 Added a MessagesBox Question when removing a Friend
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2859 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-06 17:04:09 +00:00
thunder2
aae947ecd8 Workaround for erroneously accept of Qt::Key_Delete on QAbstractItemView
see http://bugreports.qt.nokia.com/browse/QTBUG-8270

solved for PeersDialog, MessagesDialog and TransfersDialog


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-06 14:39:50 +00:00
leander-256
47f97e20b9 Missing include for uint32_t type with GCC 4.4.3
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2857 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-06 13:01:40 +00:00
thunder2
086c5f8e53 Bugfix: show correct signed / unsigned state of forum messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2853 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-05 23:06:05 +00:00
thunder2
c3d92dc472 Source code maintenance
Memory leaks:
- NotifyQt::UpdateGUI -> popup messages (toaster) stay hidden in memory
- p3disc::handleIncoming -> item was not deleted when RsDiscHeartbeat (memory leak every tick)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-05 22:03:43 +00:00
defnax
03fa79eda0 disabled not working sound events
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2851 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-05 12:56:51 +00:00
defnax
199074ec53 added some few sounds
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2850 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-05 11:49:39 +00:00
defnax
c720a32610 Added Sound Notifications changes by callix, for Friend Connects and Chat Messages, need to be set a *.wav file on Sound Settings.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-05 11:47:29 +00:00
defnax
8b9b8e9f6b Added stylesheet for MsgItem
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2848 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-05 00:28:20 +00:00
thunder2
5bb023104d Source code maintenance
Memory leaks:
- SharedFilesDialog::sendLinkToCloud -> new AddLinksDialog
- SharedFilesDialog::addLinkToCloud -> new AddLinksDialog
- ChannelFeed::channelListCustomPopupMenu -> new QAction
- ChannelFeed::createChannel -> new CreateChannel
- ChannelFeed::openMsg -> new GeneralMsgDialog
- ChannelFeed::createMsg -> new CreateChannelMsg
- NewsFeed::openMsg -> new GeneralMsgDialog
- BlogsDialog::openMsg -> new GeneralMsgDialog
- BlogsDialog::createBlog -> new CreateBlog
- BlogsDialog::openMsg -> new GeneralMsgDialog
- BlogsDialog::createMsg -> new CreateBlogMsg
- NewsFeed::deleteFeedItem -> Feed items are not deleted, just switched to hidden

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2847 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-05 00:05:36 +00:00
thunder2
4e1395a14a Source code maintenance
Memory leaks:
- TransfersDialog::insertTransfers -> takeRow

Improvement:
- updating display of DetailsDialog in TransferDialog
  todo: maybe show summary of all selected files, calculating in TransfersDialog::updateDetailsDialog


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2846 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-03 22:44:53 +00:00
defnax
8feeb2adb3 Added Chat Settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-03 21:17:36 +00:00
defnax
73a64c9269 fixed Settings icon on ChannelFeed
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-03 21:04:36 +00:00
csoler
8f4c6894ce correct bug with selection with human readable delegate.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-03 20:22:38 +00:00
thunder2
fb58beef4f Source code maintenance
Memory leaks:
- PeersDialog::insertPeers -> takeTopLevelItem, takeChild

- activate correct page on creating a new forum or channel from PeersDialog (problems with RS_RELEASE_VERSION)
  new static method to activate a page MainWindow::activatePage

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-03 00:09:55 +00:00
csoler
bffcbfe467 fixed the sorting of SearchDialog by age and by size, by using proper delegates for displaying the numbers. Removed the SR_REALSIZE_COL column, that is no longer necessary.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2840 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 21:37:54 +00:00
defnax
996e930f70 removed newsettings define from project file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 20:15:02 +00:00
defnax
e0f99aef65 added to display Tooltip's for Previous and Next Button
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2837 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 19:51:35 +00:00
defnax
d2c3c1b64c Fixed Channel Detail Labels, forget some renaming
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2836 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 16:18:51 +00:00
defnax
d516dfbfa8 Set back Unsubscribe Button on ChannelMsgItem only visible for NewsFeed
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2834 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 14:11:56 +00:00
thunder2
8ce338c49c Source code maintenance
Memory leaks:
- NetworkDialog::loadcert -> new QFileDialog
- NetworkDialog::insertConnect -> takeTopLevelItem
- NetworkDialog::on_actionAddFriend_activated -> new QFileDialog
- main -> new StartDialog, new GenCertDialog

to be continued

Info:
Pointer from takeTopLevelItem must be deleted

Can someone convert the StartDialog from QMainWindow to QDialog ?


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2833 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 13:12:46 +00:00
chrisparker126
8957fb919c - added creatchannelmsg source to pro file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 13:07:26 +00:00
defnax
36573c459d fixed images.qrc path
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2831 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 12:32:42 +00:00
chrisparker126
d4d09c2d87 - removed auto download combo-box
- channels service now will be explicit download if you subscribe
  - the same way with you cannot selectively choose the news that appears
  
 - added settings 
  - aim is where user can choose max d/l size permitable
  

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 12:27:27 +00:00
chrisparker126
352c4559ad removed support for channels
- this is now explicitly only for forums

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2829 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 12:21:20 +00:00
chrisparker126
bfa2da61f5 new create channel ui - essentailly a copy of createforums explicitly for channels
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 12:20:30 +00:00
chrisparker126
bb1fe255d3 - removed play adn d/l button (channels is now geared toward auto d/l of files)
- enabled unsubscribe on item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2827 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 12:17:43 +00:00
chrisparker126
5b24a2c50f added channel id for other channels groups so context menu can work for them (already worked for 'own' channel group)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 11:43:04 +00:00
chrisparker126
564e25908e - create channel now uses own createchannel widget rather than forums
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 11:41:23 +00:00
joss17
5a98d72376 add the dyndns settings to own profile display tab
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-01 19:26:55 +00:00
thunder2
9cf20fd9fd Changes in ForumsDialog:
- modal window for creating new forum
- refill forum and thread tree
- enabled next and previous button
- set enable/disable state of menu items

Open problem:
- last post time not updated

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2822 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-01 19:03:35 +00:00
csoler
401dac86e9 improved readability of cert generation dialog. Added tooltips, information, and wait cursor
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-01 15:17:23 +00:00
csoler
fdedc400dc corrected bug in search: files with size > 2Gb would not be added to transfers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2819 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-30 22:17:14 +00:00
thunder2
f88cd1c0aa Show correct state of subscribe button in forum feed
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-29 19:00:27 +00:00
defnax
caaf7884f8 When QutBox is selected then Display header item "Recipient" instead of "From"
Added to Count Total Inbox and Total Sent on Messages.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-28 21:05:11 +00:00
chrisparker126
7f8cafa8a9 changed idle time to 30 secs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-28 16:37:27 +00:00
thunder2
b3ccf3f07d crash with second open of HelpDialog solved
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-28 12:49:43 +00:00
thunder2
e8b428a911 RetroShare stopped responding during signing a key and asking for password.
The QSingleShotTimer of ConfCertDialog wants to update the gui and stopped in  PeerItem::updateItem.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2810 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-28 11:25:12 +00:00
chrisparker126
3c14705b39 win_idle, in idle_platform.cpp now as with linux, and mac.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2809 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-28 08:20:41 +00:00
defnax
e9ed5a1532 Added Commandline Options to Help Browser
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 23:21:35 +00:00
defnax
c91bc09c74 Added functionality to save a Privat Chat session and GroupChat History via ToolButton
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2807 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 22:08:38 +00:00
thunder2
9d5db08b7a MessagesDialog:
- enabled navigation through the messages with cursor keys
- used timer for better handling after keypress

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2804 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 21:46:28 +00:00
chrisparker126
b2213e15e6 new idle status feature added
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 12:30:46 +00:00
chrisparker126
aef6787517 changed connection from insertpeers when friendchanged() signal emmited to updateMessengerWindow
also added connection for idle feature to messenger window

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 12:25:12 +00:00
chrisparker126
d37ae260f8 added inactive png to qrc
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 12:22:10 +00:00
chrisparker126
8993ebb8aa - added idle status
- insert peers is now under the same qtimer as save status

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 12:21:39 +00:00
chrisparker126
926c0dc284 enabled idle monitor
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 12:19:44 +00:00
chrisparker126
5cc59d6e77 added idle status and connection to messenger window
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 12:18:44 +00:00
chrisparker126
eed3de92a9 removed MessengerWindow::insertpeer() from rsautoupdate::update()
- update of messenger window is delayed if rs window is not visible. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 12:14:57 +00:00
chrisparker126
37aa76f28d added new inactive png
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2793 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 12:03:25 +00:00
thunder2
906cca8012 Forwarding a message keep the attached recommended files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2788 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-26 21:11:19 +00:00
defnax
31fb4ce06a Profile View some changes for testing
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-26 11:33:16 +00:00
thunder2
38e06135a4 - The settings in the settings window are only loaded once.
- Saving the settings without changing the network settings doesn't shutdown the connections

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-25 23:28:10 +00:00
joss17
fa53e8b55c fix a gui bug
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2781 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-25 17:07:04 +00:00
defnax
f2644d5a06 update Changelog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-25 10:20:04 +00:00
csoler
0773e92f85 Ported patch from thunder2 (http://sourceforge.net/tracker/index.php?func=detail&aid=2991827&group_id=178712&atid=886241)
- Bug fix: Checkbox for automatic share of the incoming directory doesn't correctly set with setDown, use setChecked
- ShareManager and RSettingsWin doesn't need to be created all the time
- RSettingsWin: Save the last active page for the current runtime
- ShareManager and DirectoryPage: Show changed shared directories direct after the change




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-24 22:09:47 +00:00
joss17
c3b4b576ad ad missing code for dyndns details
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2767 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-23 18:50:32 +00:00
joss17
d70e7a3b71 Add the setDynDNS to the confcertdialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 18:49:51 +00:00
joss17
948e4fb61d Commmit the code from Thunder
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 18:49:08 +00:00
defnax
c79d55a7a7 fixed MessengerWindow TreeWidget stylesheet
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2753 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 14:55:25 +00:00
chrisparker126
c3f8af66e5 forgot to add back qtimer after experimenting with deriving rsAutoupdatepage
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 13:16:40 +00:00
defnax
fbd46c062e disabled version_detail_bash_script from project file, this makes lots of trouble for new Developers or which want compile first time RetroShare.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2751 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-21 11:45:22 +00:00
defnax
aefd492b86 Use fixed header size for Avatar Item and display autoconnect attempt after location.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-20 16:37:53 +00:00
defnax
7e4eaa4ae3 changed default avatar icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2743 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-20 14:50:45 +00:00
defnax
26a5d6d11a display Avatar icons on second item in MessengerWindow, when no Avatar pictures is available show a default one.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2742 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-20 14:34:44 +00:00
chrisparker126
080e10e89d connection for messenger chat to peer dialog (fixes minor bug
where calling messenger window chat leads to two chat windows opening)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2736 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-20 08:44:51 +00:00
chrisparker126
ab477885c3 restored open messenger to main window left hand panel
replaced messenger peer icons with avatars




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2735 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-20 08:42:45 +00:00
csoler
38463c905e ported branch commit 2732: fixed deadlock in passwd callback
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2734 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-19 21:50:03 +00:00
chrisparker126
9fb3770066 -sendstatus is now on qtimer - think of replacing with rs notify call back
- hack to load file status from previous rs session
- also removed 'offline' status

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2728 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-18 19:59:41 +00:00
chrisparker126
e6848bb615 enabled messenger on the side of rs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-18 19:54:19 +00:00
defnax
3083ed9db9 update translations
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2724 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-18 11:29:45 +00:00
defnax
4883f59b17 added icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2723 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-15 22:31:04 +00:00
defnax
4c3651d597 Added to count new messages on Tray icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-15 14:35:27 +00:00
chrisparker126
76a4c34440 rsstatus
-implemented simple rsStatus for messenger window
- fixed minor bug with messenger window (starts new pop-up chat dialog when peer responds, if private chat started from messenger window) solution: messenger windows start peers dialogs pop-up chat dialog instead


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-15 12:02:23 +00:00
defnax
a02289a611 update translations to the latest
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2710 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-14 12:58:59 +00:00
defnax
76cb8733af Fixed new message string
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2707 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-12 22:31:14 +00:00
defnax
83272d7900 show rs version on WindowTitle for About Dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2706 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-11 15:10:47 +00:00
defnax
21cf74c320 update version
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2705 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-11 14:55:50 +00:00
csoler
c6c8e63e91 ported branch commits 2666-2668, 2670-2672, 2679, 2682-2683 into trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-10 14:56:34 +00:00
defnax
063a366d12 removed double definition
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2700 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-10 10:58:55 +00:00
defnax
92df7037b2 Added ShareDialog for ShareManager
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2693 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-08 16:33:10 +00:00
chrisparker126
c30e0c071e added gpg initialization for autologin
- your friends are not authenticated if not

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2692 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-08 15:51:10 +00:00
chrisparker126
6b8f62d8f0 Added support for Auto-login
- added checkbox in start dialog including warning (autologin not safe)
- added check box in gen setting to disable autologin on shutdown

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2689 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-08 11:55:10 +00:00
defnax
f38c060fb6 update Changelog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2687 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-05 23:58:47 +00:00
defnax
66736d9d24 Fixed Russian translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2681 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-05 13:19:40 +00:00
defnax
e315d2efc7 Fixed translations on StatusBar display.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2677 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-03 20:33:10 +00:00
defnax
523956c0bf removed formating for the textlabel in SharedFiles.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-03 18:42:03 +00:00
defnax
69d6b67673 Fixed translation support for few strings in TurtleRouterDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2673 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-03 18:29:25 +00:00
defnax
bbf220dc41 set username column by default little bit bigger
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2664 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-29 18:11:17 +00:00
defnax
a79c5eca10 Fixed to display when Peer name is not avaible with a default string.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2663 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-29 15:27:37 +00:00
defnax
128f3dd454 removed comma display on To Label, wont work properly
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-29 13:39:23 +00:00
csoler
08065b4298 ported branch v0.5.0 commits 2623, 2624, 2626, 2633, 2634, 2643, 2644, 2646, 2651 and 2654 to trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-28 20:46:45 +00:00
nishant
12536efd16 sorting on date in messages and showing time only for same day messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2659 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-28 19:48:32 +00:00
defnax
8971102bde Fixed some labels font display problem
Improved Display Messages Labels: From,Date,Subject,To, redesign the To Label to display it more user friendly

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2653 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-28 15:56:38 +00:00
nishant
27c2382d8c bug fixed for deleting selected messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-28 15:03:20 +00:00
defnax
904ecffe1f Count unsend Messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2649 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-27 18:08:43 +00:00
defnax
0ffdde5c29 update Turkish translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2648 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-27 17:52:56 +00:00
defnax
9acfe64d97 enabled updated Danish translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2641 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-26 16:20:12 +00:00
defnax
c645530ea8 update Japanese translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2639 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-26 12:15:46 +00:00
defnax
f27b21cc42 update Japanese translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2636 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-26 11:16:40 +00:00
defnax
220d9039bb reset only ComboBox when close all search results
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2632 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-25 19:20:16 +00:00
defnax
7b6962499a Fixed age (time stamp) of directories
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2631 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-25 18:00:43 +00:00
defnax
df61d8d018 added to display text for Dir counts
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2630 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-25 16:18:22 +00:00
defnax
a3e8bea22e Fixed to display Dir Count in search, fixed by Jimigor
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2629 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-25 12:34:44 +00:00
defnax
a58d8aa5f6 Fixed: enabled translation for Hide/Expand Button in Messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2628 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-24 23:40:46 +00:00
defnax
4d0cc50197 restored
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2626 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-24 23:13:56 +00:00
defnax
8b3f8efe8d restored back Folder Age with min_age
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2622 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-24 18:22:58 +00:00
defnax
36427a5d15 Added textcolors for Age Indicator
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2620 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-24 16:47:34 +00:00
defnax
6b7bc7085f Added to display filesize in Bytes for Details
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2618 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-24 13:35:26 +00:00
defnax
11a8a71204 restored wrong changes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2617 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-24 13:05:57 +00:00
defnax
210a9e9c0c fixed frame header stretching in Messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2615 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-24 10:52:52 +00:00
defnax
8a5863af1d fixed to display filesize formated in Messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2613 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-23 13:27:36 +00:00
defnax
04607c1205 restore back changes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2610 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-23 11:48:34 +00:00
defnax
6b2292e64f fixed header misc
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2609 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-23 00:36:47 +00:00
defnax
56da9a0f65 Fixed Messages Compose->Contacts SideBar, now disabled DockWidgetMovable
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2607 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-23 00:21:37 +00:00
defnax
beec507b1c enabled Paste Links Full for Forum Posts, fixed Turkish translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2605 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-23 00:02:51 +00:00
defnax
594defb1bd disabled set Command action not realy useful and not working.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2603 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-22 23:26:44 +00:00
defnax
e97a9b540b fixed geometry of Details
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-22 23:01:05 +00:00
defnax
1fdb4a31e6 forget to add this
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2598 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-22 22:06:08 +00:00
defnax
6b71666284 update translation strings, and add section to project file to update unfinished translations files easy
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2597 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-22 21:59:33 +00:00
csoler
a5e0006b69 forgot to commmit this one
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2595 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-22 19:46:58 +00:00
csoler
b000245ef5 merged branch 0.5.0 commits 2576, 2579, 2581-2583 into trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2592 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-21 21:07:12 +00:00
joss17
294f4207ed small label change
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2590 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-21 17:24:52 +00:00
joss17
4589974f13 add the ability to copy file details text
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2589 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-21 17:24:33 +00:00
joss17
b1d6e2606b Change the status bar network display
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2588 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-21 17:24:15 +00:00
defnax
64d75f3ab7 update translations
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-21 12:00:16 +00:00
defnax
a80399245f changed stylesheet
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2578 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-19 14:48:45 +00:00
csoler
f8d6590952 ported v0.5.0 commits 2561,2562 and 2574 to trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-17 15:34:36 +00:00
defnax
12a0f45625 update Swedish translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-17 13:33:58 +00:00
defnax
26afeccacb clean up unfinished, removed not useful sources
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2572 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-17 12:52:42 +00:00
defnax
9634f5e6fc disabled unfinished translations.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2571 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-17 12:30:57 +00:00
defnax
907eca965b update translations
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2570 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-17 11:51:10 +00:00
defnax
456ee0d803 clean up ApplicationWindow
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2568 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-17 11:23:07 +00:00
defnax
3cf90e6ae1 update Russian translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2567 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-16 21:58:58 +00:00
joss17
ca9d3d38d1 Added info and consistency for gpg sign and trust signification
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2565 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-16 18:53:52 +00:00
defnax
8071f0d055 There was a spelling mistake on pageConnection dicovery instead of discovery and pageShares had some sizing problems which cut out some text, fixed by Jarrah
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2560 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-16 11:18:17 +00:00
defnax
0f5ceb388b Added more languages to installer
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-15 23:25:10 +00:00
defnax
276ff5caea update Korean language translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2553 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-15 18:09:16 +00:00
csoler
0c40f5f7ae trunk/branch uniformisation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2552 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-15 16:26:41 +00:00
defnax
1a7f4a4760 fixed to work Status icons on all languages and moved Pause/Resume to the correct context menu place
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2551 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-15 16:22:21 +00:00
defnax
f422756176 update changes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2550 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-15 14:06:52 +00:00
defnax
3fa407c71b update changes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2548 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-15 13:54:47 +00:00
csoler
cc17744ee3 ported branch v0.5.0 commits 2529 and 2544 to trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-15 12:57:08 +00:00
defnax
ac5eabad77 fixed QUEUE menu to work on multiple languages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2541 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-14 17:17:46 +00:00
defnax
470803a5c8 added new Japanese translation, update Chinese and Korean languages, and new strings updates for all languages from TrustView changes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2539 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-13 23:22:57 +00:00
defnax
363d46ca75 removed not needed more
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2521 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-12 00:19:18 +00:00
defnax
42184efe70 fixed to get work again Chinese language , and load now Qt translations for widgets
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2520 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-12 00:16:39 +00:00
csoler
ebcc7e4c1c add/del
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2517 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-10 23:16:21 +00:00
csoler
0705d9dfc7 added paste multiple links
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2516 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-10 23:09:35 +00:00
defnax
ff0b797248 added Timestamps for forum message feeds to know the date for each Forum Message.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2515 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-10 22:41:10 +00:00
csoler
a657def956 cleaned the RS link code, factorized the parsing into a single class. Still missing: copy/paste of multiple links
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2514 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-10 21:38:26 +00:00
joss17
d3018c4538 small code change
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2511 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-10 16:18:33 +00:00
defnax
0b4bc0f2eb added some actions for photo view
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2509 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-10 13:35:58 +00:00
defnax
f400d8f4cc fixed sharemanager closing
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2508 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-09 22:42:39 +00:00
defnax
f58b245018 fixed to enable translation suppor for Trustview strings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2507 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-09 21:12:07 +00:00
defnax
d0a772f5d9 use QPushButton for some dialogs fixes translation problems, QButtonBox default translations are only available for few languages.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2506 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-09 20:56:57 +00:00
defnax
0ea171e237 fixed mainwindow title
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2505 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-09 13:22:58 +00:00
defnax
0c92a8b417 update language
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2504 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-09 13:21:24 +00:00
defnax
9e11f833e8 added for Queue actions own icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2503 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-08 21:07:53 +00:00
defnax
24ac53dcc9 clean up turkish translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2502 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-08 16:13:56 +00:00
defnax
85e4a796dc clean up korean translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2501 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-08 01:03:51 +00:00
defnax
b850d75d5d remove translations with wrong naming
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2500 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-07 22:45:22 +00:00
defnax
edb4562ae4 clean up languages and corrected few languages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2499 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-07 22:42:41 +00:00
csoler
5f7486f160 added proper dynamic suppression of sources from chunkmap, and updated the gui
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2498 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-07 14:42:13 +00:00
csoler
1c2683f613 suppressed bug in dynamic removal of sources. suppressed bug in string search. Suppressed some warnings.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2497 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-07 14:10:51 +00:00
defnax
ade3e50b3d added to show bytes and formates size FileTranferInfoWidget
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2496 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-07 12:56:24 +00:00
defnax
c635091c78 fixed the popularity icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2495 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-07 02:26:35 +00:00
csoler
9e469d8baf Added proper dl queue behavior
- suppressed old DwlQueue class
	- turned mDownloads into a list of pointers to allow easy cross-info update between queue and std::map of downloads
	- added queue functionality for moving files top/bottom/up/down
	- added the necessary functions in rsFiles

Put back display of exact sizes in FileTransferInfoWidget

Suppressed some warnings.

**Warning**: this commit requires a make clean.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2493 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-06 23:29:47 +00:00
joss17
6c686496a9 reengineered the network dialog insert connect method
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2492 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-06 21:30:18 +00:00
joss17
f362daea0b small design change of confcertdialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2491 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-06 21:30:00 +00:00