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

96 Commits

Author SHA1 Message Date
csoler
ccee594a28 half way through enabling GXS avatars into distant chat. Converted AvatarWidget to use a generic ChatId instead of RsPeerId. Still need to add own Id to PopupDistantChatDialog and properly compute own name. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7924 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-07 22:43:53 +00:00
csoler
4d26726a88 fixed unread chat cound in FriendsDialog, fix display of status in distant chat (Patch from electron) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-10 13:13:41 +00:00
csoler
13d7866171 simplification of the chat interface to libretroshare using a single unified class for chat IDs. Used a common chat widget for all chats including broadcast. Opens the way to having plugins send/recv chat messages. Patch from Electron. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-29 21:41:05 +00:00
defnax
dff43792b6 Set a minimum size for Status Button. 
Fixed when the FriendList columns are hidden, set header sizes to default.
Changed profile settings icon.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7790 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-24 01:40:08 +00:00
thunder2
3f3c1983c8 Fixed some typos (patch from Henry) 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-22 15:44:47 +00:00
defnax
3157bdff91 Set to display a placeholder text when status message is empty. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-15 15:53:10 +00:00
defnax
2036f379de * Disabled own location display on Friends Frame. 
* Removed the Fixed size for Messages ListWidget
* Update stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-14 15:46:20 +00:00
thunder2
d87778172e Set the list with buttons in MainWindow and friend list in FriendsDialog to fixed when resizing the window. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7749 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-12 19:44:45 +00:00
csoler
f511786a6a properly reset cursor block format in FriendsDialog (Patch from phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-29 18:46:18 +00:00
defnax
4cdd83cc89 * Enabled by default to display Friends Avatar on Friendslist 
* Changed for RS 0.6 the status icons
* beautify the status string which displays after nicknames

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7695 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-21 01:54:21 +00:00
defnax
38bc87412d hide by default the status column, enable from the display menu. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7663 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-06 16:15:23 +00:00
csoler
b593a918a0 optim: changed postfixed ++ into prefix++ for non trivial operators, replaced test on std::list::size() by std::list::empty() (Patch from Phenom, modified) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7627 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-21 22:33:02 +00:00
defnax
c074d3abc3 Removed Add Friend Button from Friends Dialog 
Removed Distant Chat page from Settings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7556 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-24 14:58:05 +00:00
thunder2
938b95c8fe Fixed compile with deactivated modules 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7521 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-10 08:37:27 +00:00
csoler
f490ff19a9 improved layout of FriendsDialog, changed some naming to make it appear as a network visualization tab 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7517 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-09 19:19:18 +00:00
csoler
e25a8eda97 fix broadcast own message (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7436 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-06 11:07:33 +00:00
csoler
15718cbca9 various utf8 fixed (patch from HM) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-04 18:50:27 +00:00
defnax
a573ac1bbd Fixed the layout, to add a top morgin for the ListWidget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7364 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-11 13:59:14 +00:00
defnax
bcff888eb7 Added new Gui Design changes from Pheonom, Added new ListWidget for Page selection, via settings can switch to use List or Toolbar AddFrameListeInsteadOfToolBar_v0.6_7357.patch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7360 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-10 02:38:47 +00:00
defnax
dacc60d28f Moved Circles & Identities to Network 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7349 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-07 23:45:53 +00:00
defnax
06fe72e0d8 Removed Left side ToolBar. 
Moved Info, About & Options to the Top ToolBar
Moved Add Friend Button to Friends Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-29 11:52:13 +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
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
1d19938295 added jpeg to the list of image extensions for messages/avatars/etc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 21:38:11 +00:00
thunder2
135a5e579a Code maintenance for Qt 5: 
- Replaced Qt::WFlags with Qt::WindowFlags.
- Removed path "QtCore/" and "QtGui/" from the includes.
- Replaced "QString::toAscii()" with "QString::toLatin1()".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-18 21:10:33 +00:00
csoler
695e417fd5 changed std::wstring for std::string+utf8 in chat, and messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 21:41:34 +00:00
thunder2
4f9a107e83 Hide ip column in friend list by default 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6728 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-10 22:04:39 +00:00
csoler
f474663fc2 removed tabs in help strings that caused translated text to show arrows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6718 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-08 15:08:36 +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
thunder2
495cc17da3 Moved service permission matrix to the left toolbar 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6678 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-02 21:48:23 +00:00
thunder2
cc92fdfc81 Moved the filter edit and the display button from FriendsDialog and MessengerWindow into FriendList. 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6649 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-30 12:24:39 +00:00
drbob
fd66a963d2 Improvements for ProgressDialog. 
- Launch progress dialog after connectWizard.
 - fix display of location on connectWizard.
 - add cleanup code to ProgressDialog.
 - Qt4.7 bugfix.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6616 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-26 07:24:37 +00:00
csoler
d1d2fbb869 added attach picture system to broadcast (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-25 20:41:50 +00:00
csoler
c007cb1051 link from hashed file is paste in edit window, not in sent messages (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6609 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-25 20:24:47 +00:00
csoler
9e7d6aa00b changed welcome message in broadcast chat 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6529 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-22 12:34:05 +00:00
csoler
15f1df9e63 added more help panels 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6519 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-19 18:36:09 +00:00
csoler
d7e25e24e5 Remorked GUI layout a little bit: 
- made all pages have a bar with full width
- added help button to each of them (needs adding text)
- improved help system so that it's easy to register a new help button
FriendsDialog still needs some cleaning.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6518 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-19 12:18:58 +00:00
csoler
7c6a7edfde Sorted out the mess in friends list: 
- removed entries from rightmost menu:
	* add friend: removed, already on the left bar
	* add group, recommendations and service perms => moved to context menu in friend list
	* create chat lobby: removed. Not relevant.
	* avatar and state string: removed. Can be done right at right, by clicking on the things.
- removed rightmost menu
- icons in context menu still need fixing.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6512 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-16 22:33:45 +00:00
csoler
d215ca1af9 renamed known people into keyring 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6508 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-16 20:00:46 +00:00
csoler
6e9d1beda9 fixed auto-raise of pages that are not in the top level 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-23 14:29:36 +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
968f72f303 Fixed missing seconds in time format. 
Added new basic class for date/time format.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 21:35:37 +00:00
csoler
f61a50c5a6 fixed permission of drap+dropped files. all attached files get added to extra list, but with different permission flags depending on the client. From that, we compute sharing permissions : turtle, or direct transfer only 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 21:17:00 +00:00
thunder2
a573211629 Added and modified patch from Henry 
Modified the date format according to the chosen language (locale).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-10 18:59:58 +00:00
thunder2
9b5ee85fd0 Removed context help button from the dialogs (currently not used) and added minimize/maximize buttons to the "floating" dialogs. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 23:26:47 +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
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
a6cb81fd43 Cleaned includes in FriendsDialog.cpp 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-24 13:22:14 +00:00
defnax
8efc8808f7 Added Search Filter for the FriendsList 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5691 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-18 22:30:32 +00:00