Commit Graph

73 Commits

Author SHA1 Message Date
thunder2
06ef59856f - Revert remove of forum settings
- Added process of description in GxsGroupDialog (forum, wiki, channel, posted)
- Show forum description in GsxForumThreadWidget when no thread is selected
- Updated some todo's

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7277 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-04-14 22:36:10 +00:00
csoler
1042744685 merged remaining of v0.6-IdCleaning branch (7180->7213) to incorporate global router stuff in trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-29 14:18:05 +00:00
drbob
057939270f Fixed double increment bug, enabled GXS in gui by default.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7202 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-23 03:33:04 +00:00
chrisparker126
0f29d28b1b merge of branch v0.6-idclean 7180
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-17 20:56:06 +00:00
drbob
740de02489 Added ServicePermissions Settings page.
This just presents dummy data at the moment.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7172 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-07 13:48:33 +00:00
drbob
a4f0221d89 Added in Icons to GxsIDs.
Can support:
	- "Unique" Icon based of GxsID.
	- Icon indicating PGP/Anon.
	- Icons for RecognTags.

Needs more work to Make Unique Icons look good.
and Add Icon sets.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-02 11:25:11 +00:00
drbob
c0738eec7f Merging branches/v0.6-initdev into trunk.
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 14:16:15 +00:00
csoler
91c49fa992 added ElidedLabel to be used in places where labels might be too long and therefore trigger an unwanted window resize. This is currently used as forum thread titles (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-20 20:03:24 +00:00
chrisparker126
39909b705f merging rs_gxs-finale to v0.6 branch
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6953 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-21 18:20:47 +00:00
thunder2
3d48e8b4cb - Added language Catalan (ca_ES)
- Updated english translation
- Updated languages from Transifex

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-13 15:08:36 +00:00
drbob
2ce92da8ad GUI modifications to incorporate RecognTags.
- Enable EditDialog for own Ids.
	- Addition, parsing and removal of Tags in IdEditDialog.
	- Display of Tags (only text) in GxsId Label/Chooser/TreewidgetItem ..

TODO:
	- Add icon sets for RecognTags.
	- display of Tags as Icons.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6855 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-20 09:56:12 +00:00
thunder2
f10f029d45 Code maintenance for Qt 5:
- Added usage of QUrlQuery
- Removed QSound::isAvailable()
- Changed Qt::escape() to QString::toHtmlEscaped()
- Changed QAbstractItemModel::setSupportedDragActions() to virtual QAbstractItemModel::supportedDragActions()

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6851 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-19 20:59:55 +00:00
thunder2
6dbcc3e99b Code maintenance for Qt 5:
- Added new options to retroshare-gui.pro for Qt 5
- Added new file QtVersion.h with macros to compile with Qt 4 and Qt 5
  - QHeaderView::setResizeMode -> QHeaderView::setSectionResizeMode
  - QHeaderView::setMovable -> QHeaderView::setSectionsMovable

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-19 13:25:06 +00:00
thunder2
a50c899ff3 Moved help browser from MainPage to a new base class named FloatingHelpBrowser for global usage.
Added FloatingHelpBrowser to the option window (help text not including).
The help text can be specified for the ConfigPages in the method "helpText".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-09 09:31:40 +00:00
thunder2
bf9270dd54 Removed the external library pthreads 2.8.0 on Windows build and used the library of MinGW (version 2.8.0 too). This fixes header mixup of both versions.
Switched to the release version of pthread so the name of the dll changes from pthreadGC2d.dll to pthreadGC2.dll. The new dll can be found in the bin directory of MinGW.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-03 16:23:02 +00:00
thunder2
959c9c2aca Fixed compile on Windows when using shadow build.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-01 13:50:34 +00:00
drbob
ba157e4891 Fixes for visState -> vs_disc & vs_dht.
Added RTT Gui.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6775 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-29 07:10:19 +00:00
thunder2
6b1613d8bb - Added blocking of embedded images (+ settings) to forums and messages
- Added image support for forum messages
- Renamed LinkTextBrowser to RSTextBrowser
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-23 19:53:26 +00:00
drbob
683e75aeef Removed Forums / Channels / Blogs stuff.
and made GUI recompile.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 04:21:48 +00:00
thunder2
e5d8860e21 Moved friend recommendations into the ConnectFriendWizard
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6679 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-02 22:51:26 +00:00
csoler
1554e17f48 patch from Stefan Sperling to allow compilation on OpenBSD
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6613 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-25 21:06:29 +00:00
drbob
b566d6d69c Added ConnectProgressDialog - to help people workout why RS is not connecting.
- Pops up when you do a "Connect Attempt" from the FriendList.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6590 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-22 07:30:54 +00:00
csoler
a07e8d889a added help system to the MainPage class. Each page can now derive its own help string and show it using a two-states help button. To try it, I have implemented it on the NewsFeed page
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6514 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-18 19:32:12 +00:00
thunder2
11d2701edc GxsForums:
- added automatic refresh after subscribe/unsubscribe
- removed some debug output
- moved GxsForumsDialog.* to gui/gxsforums

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6505 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-15 14:22:33 +00:00
thunder2
621c8037bc GXS:
- added three new classes for automatic refresh of ui
  - RsGxsUpdateBroadcastBase
  - RsGxsUpdateBroadcastWidget
  - RsGxsUpdateBroadcastPage
- prevent call to :singleShot on RsProtectedTimer
- extend RsGxsUpdateBroadcast
- added automatic refresh to Identity and Forums (except subscribe/unsubscribe)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6503 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-14 18:48:40 +00:00
csoler
2e32892a27 moved all files related to file transfer in gui/FileTransfer/
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6501 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-14 12:53:38 +00:00
thunder2
f02cc51409 Identity:
- Redesigned dialog
- Fixed high CPU usage when showing reputation list
- Added todo button

UIStateHelper:
- Added new base class for easier handling of ui elements with token request (show "Loading", set enable state, ...)

RsProtectedTimer:
- Fixed compile on Windows

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6495 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-10 21:57:23 +00:00
csoler
e36557d542 added Specific protected timer class RsProtectedTimer to avoid passwd deadlock.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6494 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-10 21:11:11 +00:00
thunder2
4ce08bee38 Renamed the lib of sqlcipher to libsqlcipher.a for Windows too.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6482 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-06 00:58:17 +00:00
csoler
fa3cc82790 latest version of sqlcipher has changed the lib name to libsqlcipher.a
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6481 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-05 18:57:56 +00:00
chrisparker126
c1dddadb91 disabled photoshare
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6479 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-04 22:48:49 +00:00
csoler
9e91664ef0 fixed sqlite3.a path so that we use the correct .a (the one that really encrypts the database)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6461 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-25 19:05:59 +00:00
thunder2
233953cab9 Set path to sqlcipher instead of sqlite for Windows compile.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6457 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-23 00:00:40 +00:00
thunder2
766bd9c6ae - Fixed fill of news feed.
- Added display of feed count in main action.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-22 00:05:02 +00:00
csoler
dc2521cf71 Merged branch v0.5-GenericTunneling into trunk (Rev. 6284 to 6410).
- adds turtle router as a generic tunneling service
- made ftServer a client of the service. Now turtle file items are handled in ftServer
- added new client: p3MsgService to send/recv pgp-encrypted distant messages
- added new client: p3ChatService to perform private (AES-encrypted) distant chat through tunnels.
- The GUI is disabled for now, since it needs some polishing before being fully usable.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-06 19:58:30 +00:00
thunder2
d44d3055c7 Added new languages - Greek and Dutch.
Update languages from transiflex.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6402 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-04 23:39:07 +00:00
csoler
dc0193ae66 added popup chat window for distant chat, decryption code for private chat links. (W) does not compile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6310 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-16 21:13:42 +00:00
thunder2
6590167475 Fixed compile with disabled Circles and PhotoShare.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-15 09:23:24 +00:00
csoler
9e8b9b6c05 added first brand of chat/msg link creator/editor. Not functional yet
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6304 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-13 13:12:13 +00:00
chrisparker126
9a37bde4c8 user test version
- disabled circles and photoshare

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6291 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-04 17:23:10 +00:00
drbob
c5a323f3cc GXS Improvements:
- Added Basic CreateCircle Dialog.
 - Fixed up subscribe in both Posted and GxsChannels, tweaks to GxsForums too.
 - added update checks in GxsChannels.
 - made subscribe changes refresh Group List too.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6277 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-24 16:29:08 +00:00
thunder2
0e10205c0b Renamed VoteHolder constants to avoid compile problems under Windows because of doubled defined name ERROR when including wingdi.h.
Added missing files GxsFeedItem.* to retroshare-gui.pro.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6235 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-16 17:20:56 +00:00
drbob
da4c1e0f7f Added New Services to GUI.
- Added GxsChannels 
 - Added New Common Comments GUI elements.
 - Moved Posted over to use Comments.
 
Lots done, but lots to do!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6212 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-11 20:53:15 +00:00
csoler
50db473329 Merged branch for GUI improvements into trunk. The improvement phase is not finsihed yet. The work on GUI will continue into trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-22 21:42:27 +00:00
thunder2
439ccc94f4 Added new dialog to set service permissions for friends.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6085 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-23 00:22:17 +00:00
thunder2
ef49000b9a FeedReader:
- Added error handling to xml functions
- Added xslt transformation
- Added retransform of existing messages
- Redesigned preview dialog
- Enabled embed images for forum feeds
- Changed config format, switching back to an older version results in a loss of all data of the FeedReader

Added new base class RSPlainTextEdit with placeholder text.
New library libxslt needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-22 00:11:43 +00:00
thunder2
a60422069c Added api for news feeds to the plugin interface.
Added news feeds to the FeedReader plugin.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-08 22:07:52 +00:00
thunder2
1c7e374fcd Added new method to GxsGroupDialog to allow the service group dialogs to set own string for the gui elements.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-07 00:00:46 +00:00
thunder2
f764a82408 Fixed compile of gxs on Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 22:39:58 +00:00
drbob
d8e327afcc * Patched for Arch.
* Disabled FeedReader until is compiles properly.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5997 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 21:12:26 +00:00