Commit Graph

279 Commits

Author SHA1 Message Date
thunder2
e20e9a529a Add spacing again for forums, messages and channels.
Added a new base class "RSItemDelegate" for adding a spacing for the item and remove the focus rectangle of the empty text for items with only an icon.
Removed existing classes "ForumsItemDelegate" and "MessagesItemDelegate".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-11-09 23:56:02 +00:00
drbob
33282bfc77 * Tweaks to switch DHT On/Off, (coupled with Discovery)
* display of DHT size.
	* Added CoreFoundation to .pro file.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3723 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-31 14:02:33 +00:00
defnax
5809e25a60 added back dhtstatus label to StatusBar
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-27 12:49:46 +00:00
thunder2
0be24268f7 Fixed resizing of the MainWindow when hashing files with long names.
Moved the hash strings of notifyHashingInfo from the librs to the GUI for translating.
Fixed german translation.

Recompile of GUI needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3659 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-09 18:35:34 +00:00
thunder2
de16f6c72d New class for working with peer names (rsid, name + location, ...) - PeerDefs.
Show the location in brackets - "name (location)" (defined now in PeerDefs).
Renamed head of context menu in PeersDialog for ssl items.
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3553 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-28 20:33:34 +00:00
thunder2
077b2871f1 Groups for friends in PeersDialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3523 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-22 22:37:57 +00:00
defnax
ad9f981ab0 Added CreateGroup Dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3519 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-21 16:11:19 +00:00
thunder2
a51bf3da67 Added new class RSTreeWidgetItem derived from QTreeWidgetItem for sorting strings case insensitive without proxy model.
Sort strings case insensitive in NetworkDialog, PeersDialog (changed to RSTreeWidgetItem), MessengerWindow (changed to RSTreeWidgetItem) and SharedFilesDialog (with folders first).
Sort the columns size and age in SharedFilesDialog by internal data and not by the shown string.
Save and load layout of the SharedFilesDialog in profile.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3515 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-20 00:10:51 +00:00
thunder2
dbb21e0b16 The forum details (name and description) can be edited by the owner.
Recompile of the gui needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3488 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-14 19:38:47 +00:00
thunder2
0b63a4be86 New class for the work with emoticons - Emoticons
Redesigned emoticons window
- flat buttons
- 9 icons in a row
- moved the window to the direction of the input object

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3487 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-14 17:47:11 +00:00
thunder2
5e2921ae98 Cleaned ForumsDialog and MessagesDialog and updated german translation.
New class for working with tag translation - TagDefs.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3476 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-12 22:17:17 +00:00
thunder2
64ff88ce72 Fixed compile minimal version.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-12 15:20:46 +00:00
thunder2
60746b5702 New class "StatusDefs" for status information like strings, images, fonts and colors.
Removed the status string function from the lib.
Removed static strings like " - " and " : " from translation.
Removed not needed images.
Fixed german translation in MessengerWindow, PeersDialog and PopupChatDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-12 14:10:28 +00:00
thunder2
cbdb717e51 Fixed choose of the font in PopupChatDialog with the font dialog.
New class RsharePeerSettings and a global variable PeerSettings for read and write settings of a peer (gpg id).
Save font and color in PopupChatDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3464 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-10 18:38:46 +00:00
thunder2
7c126f24ba Add define WINDOWS_SYS for windows compile in RetroShare.pro.
Now the idle functions for windows are used.
Removed unused file idle_mac.cpp.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-09 11:09:40 +00:00
thunder2
1f8017d06a Redesigned history browser of group chat.
New chat style for history browser.

There's more to come.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3443 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-04 23:59:08 +00:00
thunder2
8213a2aa77 Chat service:
- Added send time to ChatInfo.

Chat:
- Reworked IMHistoryKeeper to save only needed data as raw data (not formatted from PeersDialog).
- Renamed the public chat history file from "his1.xml" to "chatPublic.xml" and moved it from data dir to config dir. The current history is lost. Please delete the file "his1.xml" manually.
- Optimized save of the history. Save only when changed, also during the runtime.
- Clear the history in PeersDialog clears the IMHistoryKeeper too.
- New setting to send chat message with Ctrl+Return. Changed the check for Enter in PeersDialog and PopupChatDialog from textChanged to eventFilter.
- Smileys are inserted at the current cursor position, not added at the end.
- Don't send emty messages.

New class ChatStyle:
- Created a new class for the work with chat styles and smileys.
- Currently only two internal styles are available - private and public. Later more external styles planned.
- Moved functions for loading and showing the emoticons from PeersDialog and PopupChatDialog to the new class.

Private chat:
- Split private chat style into incoming.htm and outgoing.htm.
- Removed style change.

Public chat:
- New chat style incoming.htm, outgoing.htm, hincoming.htm and houtgoing.htm.

Chat feed:
- Show links and emoticons if they are enabled for public chat.

PeersDialog:
- Show the own name and location only once at start and not with QTimer every 1.5 second.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3441 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-04 14:23:30 +00:00
defnax
7dd99a0c35 Added a History Browser for GroupChat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3420 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-01 14:15:50 +00:00
thunder2
8832f7dfc5 Introduced a minimal version of RetroShare.
You can enable it in libretroshare.pro and RetroShare.pro by uncomment
CONFIG += minimal

This enables two new defines for stripping all not needed things
- libretroshare: MINIMAL_LIBRS
- GUI:           MINIMAL_RSGUI

and removes not needed files from build (see end of the files libretroshare.pro and RetroShare.pro).

Beware: All data of the stripped services are lost

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3414 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-31 20:00:49 +00:00
thunder2
b6b5fa5cd6 Changed the chat service from a timer tick from the gui to a service tick.
Created a new notifier for new chat available - NOTIFY_LIST_CHAT. Removed the QTimer in PeersDialog and connect the signal.
Created news feed for public chat (prework of defnax, need still some gui changes)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3413 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-31 17:13:52 +00:00
thunder2
86ae9983d1 New read status for forum messages.
New mail messages are marked with a new icon in front of the title.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3352 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-08 22:58:10 +00:00
thunder2
6000233267 Fixed compile of libbitdht on Windows
Enabled bitdht in RetroShare.pro and retroshare-nogui.pro too
Fixed link of RetroShare on Windows
-> added ws2_32 after bitdht, maybe someone has a better solution

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-03 12:15:20 +00:00
drbob
6a9be43f31 Changes for bitdht compilation.
* disabled BlogItems, when BLOGS not defined.
 * added bitdht compile option to Retroshare.pro.
 * disabled BLOGS until it can compile in libretroshare



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-31 18:19:12 +00:00
chrisparker126
ddb1094f68 added share key ui to .pro
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3165 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-19 15:37:31 +00:00
chrisparker126
fe98568329 added edit chan info dialog files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3063 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-04 22:56:06 +00:00
thunder2
5b4985e3d3 tag feature in MessagesDialog
its disabled until the msgId is static

uncomment the define STATIC_MSGID in MessagesDialog.h for testing 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3010 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-27 19:48:52 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
defnax
323b96cc04 added BlogDetails to Blogs, added context menu actions for subscribe/unsubscribe
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-28 21:26:46 +00:00
defnax
1ee9a6ae0d added for blogs own define to project file and set on MainWindow the defines for Blogs, added to function for Messages icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2423 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-25 13:12:18 +00:00
defnax
7cba8b3b6b clean up blogs from project file added to the unfinished section for compiling
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2413 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-24 12:58:24 +00:00
drbob
f2f23e7ece Modifications to get it compiling under MacOSX.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2345 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-16 23:08:48 +00:00
csoler
5db2d85ad6 restored this file in proper workign state
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2320 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-14 15:50:10 +00:00
joss17
94aa902a95 clean the qmake files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2318 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-14 14:18:53 +00:00
andrewsteinborn
be92a7941a added "make install" target -- configurable at qmake run w/ PREFIX=/whatever qmake -o Makefile before build
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2270 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-10 08:00:31 +00:00
defnax
57454e0486 removed not needed sources
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2226 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-07 14:24:51 +00:00
chrisparker126
f9a66766bf script for blogs to .pro file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2184 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-03 23:09:55 +00:00
defnax
309e88e6b7 Added to send own Shared File as link to Public Chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-01 14:47:54 +00:00
defnax
fb5bbf2e96 Added TransferPage to Settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-27 20:24:49 +00:00
defnax
6cb925016a little improvements for Compose Messsage,
added Blockquote,Increase font size,Decrease font size,text font to code style Buttons
added when reply to a message set TextCursor to End.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2123 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-25 14:03:38 +00:00
defnax
28a1244a1b Added Attach File feature for Messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2099 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-20 21:39:27 +00:00
defnax
3a1c6ed76f Added ChannelDetails for Channel Informations
Added Context Menu for Channelist for open ChannelDetails


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2095 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-20 00:29:40 +00:00
defnax
a44d28d7de Added a new CreateChannelMsg Dialog as replacement for GeneralMessage for Channels.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2070 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-18 21:02:16 +00:00
defnax
b05dbc80e4 Added Quick Start Wizard
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1982 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-08 13:00:00 +00:00
defnax
5008cfdf25 Added DetailsDialog for Transfers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-06 00:10:15 +00:00
defnax
65b35e8c53 Added Forum Details Dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1961 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-02 15:47:07 +00:00
defnax
e919981e00 * added a about dialog
* quit RetroShare with rApp not more use qApp for quit, shutdown is now faster.
* added first retranslateUi for MainWindow
* changend Add Share string.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1944 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-31 02:23:02 +00:00
csoler
f4a2eaecce - implemented a visualisation for currently handled chunks, availability maps, and transfer info
- implemented transfer protocol for chunk availability maps between peers (not enabled yet though)
- suppressed rsiface directory from retroshare-gui
- moved notifyqt.{h,cpp} to gui/

next moves: 
	- send availability maps to clients; 
	- connect turtle search to unfinished files;
	- test multisource download with unfinished files.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1939 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-28 21:11:00 +00:00
defnax
bbe773b91c removed not needed old Preferences
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1876 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 17:13:10 +00:00
joss17
61c570b0f0 remove DHT from the gui
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1873 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 13:47:04 +00:00
joss17
fdb3673ce2 Add the tunneling connection. Warning, encryption is not implemented yet for tunnel connection, use only for testing.
Redesign the udp connection
Remove the rsiface duplicates from retroshare-gui.
Add some randomness in timings for connect manager

Merge branch 'connectionTunneling'

Conflicts:
	libretroshare/src/libretroshare.pro
	libretroshare/src/pqi/p3connmgr.cc
	retroshare-gui/src/RetroShare.pro
	retroshare-gui/src/rsiface/rsfiles.h
	retroshare-gui/src/rsiface/rstypes.h

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-13 21:59:26 +00:00
defnax
ff8befbb2c fixed RetroShare.pro
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1861 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-06 12:03:29 +00:00
defnax
ecac6008bc added unfinished section to compile unfinished examples and prototypes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-05 13:42:24 +00:00
defnax
5b35308f81 clean up, removed not needed old sources
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-23 20:46:03 +00:00
csoler
506f14eb2f - Added a parent page widget (class RsAutoUpdatePage) to handle auto-update. The page updates using a timer, only wh
en visible, and each time it gets showed. I already made some RS pages derive from this page.
- Modified and renamed the taskGraphPainterWidget to display info about currently selected file transfers. For know, it only shows file chunks info, but we should use it to display additional info about the transfer. Warning: in its
 current state, only fake chunk info is displayed.
 - Suppressed p3files.h, because it is not used.

 Remains to do (in order):
 - Implement a chunk map class in ft/ to properly manage which chunks should be downloaded 
 - Display correct chunk info by requesting the transfer's chunk map
 - Add check-sum verification of chunks
 - allow RS to import a partially downloaded file by force re-checking chunks
 - Add chunk map exchange from file source peer id to file destination peer id.
 - Manage chunks from different peers.
 - Allow search (turtle search) for partially downloaded files 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-17 12:45:06 +00:00
joss17
5a776b1eff removed unused library links for linux make
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-16 10:52:59 +00:00
defnax
97770a16f2 forget commit this
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1829 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-15 20:40:56 +00:00
defnax
e26c14573f added taskGraphPainterWidet
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-15 19:26:34 +00:00
joss17
efa84ef24d remove zlib dependance
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1815 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-11 22:13:36 +00:00
joss17
9df3b567e7 add gpgme and gpg error includes for win32
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 21:27:06 +00:00
joss17
6e225dec47 Change the unix to linux-* qtcreator files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 01:41:16 +00:00
joss17
e6fd8be204 put shared instruction under unix scope for qtcreator project file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1788 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:47:13 +00:00
joss17
6fba28ee0d Solve windows gpg bug and modify windows .pro project files qtcreator
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:46:58 +00:00
joss17
4fe1bd8801 Remove miniupnp and add libupnp code
Conflicts:

	libretroshare/src/libretroshare.pro

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:33:40 +00:00
joss17
090bab6b28 add the RS_USE_PGPSSL flag
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1733 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-27 20:46:31 +00:00
defnax
2319711d9d removed not needed games dir
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1714 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-04 15:41:46 +00:00
defnax
25f888b8c6 removed not needed old channels sources
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1710 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-04 15:17:06 +00:00
defnax
0f27feea63 Added StatusMessage Dialog
Added functionality to store own status to chat.cfg and to gui settings
Added timers for update own status/avatar faster
Edited ProfileWidget to open from there the StatusMessage Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1697 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-29 22:52:46 +00:00
defnax
966c900ff0 Added ProfileWidget as Tab to show own Profile Details
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1690 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-26 01:10:25 +00:00
defnax
c9f295a760 added InfoDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1669 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-22 17:23:41 +00:00
alexandrut
e26829e76a few changes added to channel gui - list of groups and channels was replaced with a tree view
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1636 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-12 10:55:40 +00:00
defnax
5bcaa270ca added includepath for gpgme/libgpg-error on windows section
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-07 13:35:34 +00:00
defnax
5d393e2b61 added -lgpgme
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1606 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-07 00:10:38 +00:00
csoler
0573171e6f fixed win32-x-g++ compilation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-05 18:15:23 +00:00
alexandrut
1c93c63ba4 add new settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-19 22:19:35 +00:00
csoler
128aa9ceda added missing AddLinksDialog files in .pro
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1549 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-18 07:37:22 +00:00
csoler
a293a39d1b - Integrated the turtle search and download to the gui. Now the search handles both friend and turtle searching.
- added a console in config->server->F2F routing to be able to visualize turtle routing statistics

WARNING: this is not complete yet. The fllowing still needs to be done:
- detect duplicates in search results between turtle and friends search
- RegExpr search does ot work with turtle (still to code).
- search does not search own files. Is this really needed after all ?



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1540 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-16 20:10:53 +00:00
joss17
eef31ea805 Revert "now retrieve version for gui directly from lib"
This reverts commit 0aa0d500c001730e05ffecd69cf3068d87138557.

The GUI and LIB could have two different version when compiling, so we
need to keep both version info.

Conflicts:

	retroshare-gui/src/version_detail.sh

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1531 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-13 15:11:08 +00:00
defnax
a2e9054cac Clean up rsiface folder, moved RemoteDirModel to gui folder.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1515 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-10 23:28:15 +00:00
alexandrut
a78013b131 now retrieve version for gui directly from lib
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-10 21:25:16 +00:00
defnax
8f2085c9a4 moved version_detail_bash_script to linux section doesnt works with windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1480 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-02 17:51:15 +00:00
joss17
96f2d92ee7 rewrite script to include them in the make file. Use both util/rsversion.h and gui/help/version.html for gui version information
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-01 13:53:47 +00:00
defnax
0d33e14147 added rsversion for MainWindow again its usefull to know on MainWindow Title which version im running.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 22:24:08 +00:00
joss17
48b1cd0a0c fix qmake script
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1467 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 19:20:28 +00:00
joss17
c05fb7669d improved svn revision script
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 18:33:15 +00:00
joss17
40f18ff5b2 fix version parsing sript
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 18:27:01 +00:00
joss17
6bd87814ea remove old version display
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1459 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 18:26:19 +00:00
drbob
246927ac46 GUI side of the v0.5.0 modifications.
* Changes to startup / login function to handle multiple accounts.
 * Switched on OpenPGP version by default.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1452 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-30 21:48:54 +00:00
defnax
1df1039d44 Fixed some correct language namings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1422 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-24 20:03:11 +00:00
defnax
6abadc6375 Added new settings which will be replace soon as possible Preferences
Changend Quit RetroShare MessageBox with "Yes" and not more with "OK"

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1412 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-23 17:11:51 +00:00
joss17
a36475a167 Add a static and a build time version information
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1409 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-22 22:03:34 +00:00
defnax
8a1ae827b9 Added SoundDialog for Preferences which uses QSound supports wav files, where can set wav files.
Added SoundManager for the events, at the moment there is no connect for a event to use it.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1386 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-17 11:21:40 +00:00
ammorais
2eccbce332 Updated the RetroShare.pro, fixed problem in p3face-startup, and upnputil.c with UPNP_AddPortMapping number of parameters when compiled with miniupnpc-1.0
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-08 14:49:20 +00:00
drbob
100cf75439 * minor changes required to get the gui working with PGP,
* improved NetworkView to show signatures, and friends.

I expect these will be cleaned up later - these were purely functional so i could test pgp.

Enable using RS_USE_PGPSSL in rsiface/rsinit.h
   


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1266 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-23 15:13:01 +00:00
defnax
30e4d8d078 added Copy/Paste/Send retroshare//: file urls/links
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1257 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-18 14:23:55 +00:00
defnax
b7290c67ed clean up project file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1256 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-17 22:12:57 +00:00
csoler
02a56a10e1 forgot to commit changes related to Settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1253 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-17 13:59:39 +00:00
defnax
b0845d9d8b clean up the project file, translation .ts files will be not useable when disabling not used headers,sources with a #
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1204 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-09 02:13:21 +00:00
drbob
65e02ba4de * Rolled back Modifications to SearchDialog and PopupChatDialog.
- unable to get windows to compile with PopupChat on windows.
	- not happy with new SearchDialog. Not an improvement on old dialog + uses Qt4.4

 * updated version numbers...
 * added a couple of windows scripts.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1200 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-08 23:07:08 +00:00
drbob
0734fb3e72 Separated Qt4.4 features, so Qt4.3 builds can be done.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1186 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-07 19:54:40 +00:00
csoler
70f0253e54 suppressed ChatDialog entries from Retroshare.pro
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1165 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-05 13:21:36 +00:00
defnax
69914204db generated for statusRates own class to clean more MainWindow
clean up some namings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1157 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-02 22:14:20 +00:00
defnax
3e2993536e cleaned up MainWindow
Added to pro file  DEFINES += RS_RELEASE_VERSION enable it for release versions.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1151 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-01 16:17:24 +00:00
defnax
255b5dca39 added the basic natstatus feature for statusbar,
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1150 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-01 12:45:27 +00:00
defnax
cfbfb9b148 added support for CN and TW languages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1135 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-20 13:24:56 +00:00
beardog_uk
22c2974466 Feature: user can set commands fo opening shared files with some external applications. First revision. TODO: test on Windows, add additional functionality(see trac)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1119 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-07 08:08:03 +00:00
beardog_uk
b3f433b5f2 - Deleted AddFriendDialog, InviteDialog and AddFriendWizard files. They are not used in current version, so it was beter not to keep them. We can always restore them, if any need.
- Removed "Invite friend" button from main window. 

- Also  changed some comments  to the wizard code.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1102 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-28 10:41:49 +00:00
beardog_uk
afcc1d76d2 Wizard for adding friends. Almost stable, but code needs cleanup.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1101 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-26 16:58:06 +00:00
csoler
7b84b125df turtle search is now working. Next task: update search gui
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-15 22:45:40 +00:00
beardog_uk
c35c60bbb1 history in group chat appeared
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1071 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-12 14:28:33 +00:00
csoler
56b3370cd1 added a forgotten time(NULL) in notifyqt.cpp
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1061 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-01 15:18:34 +00:00
defnax
f018bf0f85 fixed .pro -lgdi32
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1051 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-02-24 21:39:17 +00:00
beardog_uk
ba1befd560 plugin system: plugin management features added (loading and unloading)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1008 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-02-05 15:29:43 +00:00
defnax
e36aee2663 added smplayer_plugin
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-02-02 22:02:42 +00:00
defnax
88a32c67fc * Added qcheckers as plugin
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@984 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-02-02 19:19:02 +00:00
defnax
ed2d622ded * Removed lqcheckers and lsmplayer from win32
* Set rsversion to 0.4.12a

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@981 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-02-02 14:56:27 +00:00
csoler
0a6f1bbe87 Added target for linux-g++-64
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-02-02 13:47:53 +00:00
defnax
8d38e51536 * Move plugin Demo to ApplicationWindow
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@973 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-02-02 12:07:07 +00:00
beardog_uk
04b2d33430 plugin system: first demo version
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@968 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-02-01 16:18:10 +00:00
csoler
ebe43a2079 Updated the .pro so as to do cross-compilation for windows on ubuntu. Sorry, I had to move the libraries in a different directory for consistency.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-02-01 14:05:24 +00:00
csoler
b6019d193b Fixed directory problem wirh emoticons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@950 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-25 19:05:53 +00:00
defnax
c3f610c519 * Added MessagesPopupDialog
* Added for Messenger Window Share Manager Button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@920 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-08 17:29:01 +00:00
defnax
5459a536be * Added a Basic Share Manager for the replacement "Add Share" on MainWindow
* Fixed SharedFilesDialog columns

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@883 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-11 01:19:34 +00:00
drbob
c05acf2f95 Added NewsFeed / Popup / Chat Configuration options.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@870 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-07 14:19:13 +00:00
defnax
27cfb255eb * Added Formating for File Size KIB,MIB,GIB and for AGE 1d2h3m
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-18 01:42:17 +00:00
csoler
941e59f6e9 Implemented a big trust table where people can see who trusts who, and who is trusted by who. This makes trust discrepencies really easy to catch
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@805 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-15 14:29:34 +00:00
defnax
8dab34d350 added stylesheet to src
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-07 22:11:33 +00:00
defnax
622914c923 * removed old config path
* added FindWindow for Library Dialog
* Fixed Cancel Button of ShareFiles


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-20 21:39:03 +00:00