Commit Graph

138 Commits

Author SHA1 Message Date
csoler
6edb9eb4f8 Merged branch that provide group-based file permissions.
Now users can sort peers into groups in the friend list, and attribute flags and parent groups to the
directories in the share manager.

Flags are B-B-N, meaning in order:
- browsable for peers in the parent groups
- browsable for everyone
- network wide for everyone
Backward compatibility makes previously BN flags been interpreted as -BN, meaning browsable/network wide for everyone.

Be careful with this new feature. It has been tested, but it's a bit early to rely on it for highly sensitive data.

The merge also includes a significant improvement of the naming of flags with incompatible types
which should sort out some existing bugs as well, since inconsistencies in flag usage have been
found during the process.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-07 20:03:16 +00:00
csoler
ef09075170 gui tweaks
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-06 21:24:49 +00:00
csoler
a2f958b956 disabled flag DIR_FLAGS_NETWORK_WIDE_GROUPS for consistency reasons. We might extend it to rsCircles later.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-06 20:46:56 +00:00
thunder2
adee9517c1 Removed some unnecessary filter icons and added some new placeholder for the filter.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-06 00:28:11 +00:00
csoler
6b6f961e94 added contextual message to explain current group sharing permissions
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-03 17:15:47 +00:00
csoler
d77c73adf4 loading/saving parent groups for directories.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-03 15:25:25 +00:00
csoler
b616b2cabd tried to fix gui layout
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5768 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-03 14:15:03 +00:00
csoler
ccd08df35d added widget for group selection. Used it in share dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5761 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-02 17:26:20 +00:00
csoler
e753f22909 fixed flags conflicts
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-02 13:52:29 +00:00
csoler
dc82cee700 First shot of file sharing permissions. Compiles, but needs some testing/debugging.
- added type-safe flags in retroshare/rsflags.h. This should be used to make new flags types in order to prevent mixing flags up in function prototypes.
- group handling is left to rsPeers. We'll move it to rsCircles later.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-01 10:06:12 +00:00
defnax
aadb408533 Added icons for the Channel TreeWidget
Added placeholder text for Search Filter items on Group TreeWidget
Added placeholder text for Search Filter items in Messages Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5746 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-30 02:44:14 +00:00
thunder2
a7c29c0f24 Removed the filter comboboxes and replaced it with a menu in LineEditClear.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-29 10:59:26 +00:00
thunder2
af2257b1a9 Added settings for the blinking icons
- private chat window/tab
- chat lobby tab
- all tray notifier

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-27 15:59:12 +00:00
defnax
c7c695600f Added a find Icon Button for the class LineEditClear
Removed all not needed find icons from the Dialogs.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-26 15:14:40 +00:00
thunder2
7272b7e768 Added blinking of the chat icon for private chat window and chat lobby.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-25 18:06:33 +00:00
thunder2
179618edbf Added blinking of the systray icon for the notifier and enabled it for private chat.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-24 13:24:38 +00:00
thunder2
9953b3b640 Fixed switching between combined and not combined tray icon notify with available messages.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5719 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-24 08:34:42 +00:00
csoler
03d4936b12 improved display in share manager. Updated RemoteDirModel to show groups.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5706 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 19:39:56 +00:00
csoler
56e26ba00a First bit of group sharing permissions
- Added icons for share flags
- added new class to handle sharing permission widget
- Updated share manager
to be continued...



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5701 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 14:06:33 +00:00
thunder2
bc41be1f9a Added patch from Henry
Removed hardcoded fonts

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-14 12:25:12 +00:00
defnax
886f84b929 patch from Henry Morgan to correct spelling mistakes in source
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-11 10:28:24 +00:00
thunder2
805f64808e Added patch from braindead
- Added new base class MimeTextEdit to paste images from the clipboard into a QTextEdit and added this in MessageComposer and private chat.
- Disabled paste of images for the next stable release.

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

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5521 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-07 17:30:23 +00:00
thunder2
fb71387a47 Enabled the RetroShare icon of the collection file dialogs.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5493 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-31 14:07:15 +00:00
thunder2
5d482b9a6f Moved some internal stylesheets to the file Standard.qss.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5474 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-26 20:31:10 +00:00
thunder2
9279838d65 Added two internal stylesheets:
- qss.default - This file is used as default for all stylesheets (e.g. the frames of the AvatarWidget) and can be overloaded from the selected stylesheet
- Standard.qss - The standard stylesheet for the current look of RetroShare. More internal stylesheets can be added.
The plan is to move nearly all internal stylesheets to the files Standard.qss/qss.default. After that the "empty" stylesheet should represent the system theme of the os.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5467 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-24 23:35:57 +00:00
thunder2
3f2ab9259d Added new base class HeaderFrame - image and text at top of the windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5464 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-24 10:49:08 +00:00
thunder2
70cbd3c84d Cleaned some ui files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5457 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-22 13:44:23 +00:00
thunder2
4ad73afbad Removed some unnecessary style sheets.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-21 23:15:27 +00:00
thunder2
1cefe1123a Removed some unnecessary style sheets.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5448 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-21 13:02:44 +00:00
csoler
a9d19528a0 fixed uninitialized memory read
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5428 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-15 19:03:14 +00:00
thunder2
2921cbaf23 Show count of new messages in the toolbar.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5394 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-08 10:48:29 +00:00
thunder2
b21e66241b Reworked notification code in system tray.
Added a base class and a possibility for the main dialogs and the plugins (derived from MainPage) to provide a notifier.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5381 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-05 20:12:55 +00:00
drbob
bec1407648 Merged Code from: /branches/v0.5-new_cache_system/ into main trunk.
- Revisions 4771 => 5334

 * This merge brings a lot of unfinished code for GXS (new cache system)
 	- See branch commits for more details.
 * Code is disabled, and should have minimal effect on trunk build.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5338 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-07-27 15:03:16 +00:00
thunder2
0989897696 Fixed sorting (case insensitive, numbers) in SearchDialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5207 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-06-09 14:14:04 +00:00
csoler
40b1f6f053 fixed incompatibility with Qt < 4.6
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5190 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-25 19:29:09 +00:00
thunder2
50bc57b0fe Sort participants list in the chat lobby case insensitive.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5186 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-24 19:26:43 +00:00
thunder2
22a0f89751 Redesigned ConnectFriendWizard as ui file.
Added new base class DropLineEdit.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-22 22:24:10 +00:00
thunder2
a7eda64872 Fixed compile on Linux.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-20 16:53:28 +00:00
thunder2
b344aebbe6 Added changes from braindead:
- simplified avatarwidget
- prepared property-dependend stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5176 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-19 22:18:15 +00:00
thunder2
e2746efb85 Optimized RsCollectionDialog (still without thread).
Enabled extended selection and mark with the key 'space'.

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


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-12 00:40:53 +00:00
defnax
e23f7e1055 update translation strings,
changed recommend friend context menu icon

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5152 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-07 14:43:25 +00:00
thunder2
78fd91ce4a Fixed update (repaint) of the placeholder text of the quick view items in MessagesDialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5146 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-05 22:29:59 +00:00
thunder2
7756b093bf Added new basic class for a QLineEdit with a clear button - LineEditClear.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-05 21:03:03 +00:00
csoler
0778e8f691 3 patches from AsamK:
* fixed utf8 in dropping links to channels
	* fixed pasting cert links in the friend list
	* added code to allow pasting GPG certificates missing a newline at the end.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5064 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-30 19:43:39 +00:00
thunder2
fae86aff3b Added two new images from defnax to SecurityItem for SEC_TYPE_CONNECT_ATTEMPT and SEC_TYPE_UNKNOWN_IN.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5060 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-29 20:23:18 +00:00
thunder2
4cb844c44d Removed most of the usages of std::ostringstream in the gui.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5056 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-28 18:02:49 +00:00
csoler
ee5dcd1a8c - moved RsAutoUpdatePage into retroshare-gui/ directory, to allow plugins to use it
- removed VOIP code from main executable. Moved it into VOIP plugin (c.f next commit)



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




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4933 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-13 18:43:15 +00:00