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
6,724 Commits 63 Branches 22 Tags 194 MiB
26f93c2a55
Commit Graph

40 Commits

Author SHA1 Message Date
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
thunder2
894addedb4 Fixed some compiler warnings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7590 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-09 15:17:42 +00:00
thunder2
50fcd401b1 Show "Add group" action in context menu of FriendList without groups. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7273 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-13 14:54:49 +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
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
csoler
57c66bd06f forgot to commit this: show correct connect address (local or global) depending on the current status 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 14:12:02 +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
csoler
40ed94f7fb removed copy/paste of links of type PERSON in friendlist. This caused confusion and did not provide anything useful since the creation of the full certificate links 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-27 21:40:51 +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
defnax
b5c6875706 Added default icon for the Status Message Button 
changed some default context menu icons

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6643 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-28 23:27:46 +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
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
defnax
ebbf6d9e26 Added a headerFrame to Service Permissions Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6583 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-21 16:26:34 +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
940ffd6d9c make friendlist fully resizable (Patch from phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6490 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-06 21:45:18 +00:00
csoler
66d38ff1bb added column with IP for connected peers (modified patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-04 20:11:36 +00:00
thunder2
09f42dbc3c Added new level gpg id to FriendSelectionWidget (groups, gpg id, ssl id). 
Added friend selection to the group dialog for better assigning of friends to groups.
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5881 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-24 14:48:31 +00:00
thunder2
a8d1d05405 Moved most of the hardcoded colors of lists and trees to the file qss.default (with help from braindead). 
Now the stylesheet can redefine these colors.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 16:01:21 +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
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
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
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
thunder2
6de8541a4e Added (make functional) the lobby menu in the context menu of the gpg and group item in FriendList. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-27 20:53:17 +00:00
thunder2
cb9111ad88 Changed the recommendation of friends from person link to certificate link. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-23 22:38:50 +00:00
csoler
51cfb0c5fe added retroshare certificate links: allows to paste certificates everywhere. Users need to click on them to launch the make friend wizard on the certificate. Certificates can be copied from each location of the Friends list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-18 20:31:30 +00:00
thunder2
35c7605704 Extracted a new widget ChatWidget for the basic chat handling from the PopupChatDialog and use it in ChatLobbyDialog too. 
Added an own ui for the ChatLobbyDialog.
Saved settings of the ChatLobbyDialog.
Changed parameters of RsStatus interface from "std::string" to "const std::string&"
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-17 20:36:36 +00:00
csoler
3addb36e4c added unsubscribe protocol, updated GUI 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4738 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-27 13:47:37 +00:00
csoler
71a079b55f added chat lobby creation window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-04 22:03:54 +00:00
csoler
46f1e2b562 added invitation system 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4696 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-28 22:36:13 +00:00
csoler
b01470c639 small corrections. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4695 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-27 21:46:49 +00:00
csoler
cd30487898 Added send and forward methods. Improved data structures. 
Next: serialization of ChatLobbyItems



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4690 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-25 21:31:52 +00:00
csoler
5cdc36d730 Basic methods and a bit of interface for chat lobby. 
Next:
- chat lobby algorithmics (cache+broadcast system)
- invitation handling
- specification of chat lobby window with list of known/unknown participants


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4685 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-23 22:10:37 +00:00
thunder2
e181127a30 Added new column "Last Contact" to the FriendsDialog and MessengerWindow. Moved some more basic functions to FriendsList and optimized the exisiting code. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4669 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-12 01:26:26 +00:00
csoler
78955270e2 corrected bug about wrong layout of friend list (patch from asamK) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-24 16:10:24 +00:00
csoler
521e9cb7c2 added missing files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4646 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-20 22:48:50 +00:00