Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-11 08:54:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,504 Commits 63 Branches 22 Tags 195 MiB
c9ef2a77b5
Commit Graph

37 Commits

Author SHA1 Message Date
csoler
160e04fe9a fixed VOIP plugin to work with v0.6 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7288 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-20 14:21:53 +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
thunder2
92fabf4c56 Modified the patch from electron. 
Moved the calls to the plugin to ChatWidget for use with all types of chats (private chat, chat lobby and distant chat).
Recompile needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-02 00:56:46 +00:00
defnax
7b0a6afa56 patch "chatdialog_allow_buttons_from_different_plugins_3" from electron. ChatDialog allows now Buttons from different Plugins. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-01 22:25:49 +00:00
defnax
3ba5a72787 added the toaster files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-22 12:04:11 +00:00
defnax
06f6f1949d changed the voip icons, disable the voip buttons when friend is offline. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6857 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-20 16:59:29 +00:00
thunder2
41ba665813 Code maintenance for Qt 5: 
- LinksCloud
- VOIP
- FeedReader


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6853 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-20 00:56:34 +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
defnax
8f6f7b50d6 added some icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6840 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-17 14:56:53 +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
b49ba8b98f Changed the additional buttons of ChatLobbyDialog and AudioPopupChatDialog to QToolButton. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-04 12:13:09 +00:00
defnax
9ca0775933 added some sound files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 22:50:36 +00:00
defnax
a4524485ad changed the voip icons and the tooltips 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 22:00:16 +00:00
drbob
90b4a20e5d updated VoIP to use new Fast packet sending. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 13:15:10 +00:00
csoler
cb9f174efa added tunnel state light to distant chat popup dialog. Added proper peer name. Changed method for adding widgets in the chat bar 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6337 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 22:43:19 +00:00
defnax
7339af3a21 corrected string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5933 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 15:55:01 +00:00
defnax
9721b5a924 renamed translation string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 14:21:22 +00:00
thunder2
232af8e71e Changed SoundManger to allow the plugins to play sounds. 
Added example to VOIP (commented out).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-21 21:38:55 +00:00
defnax
50351b6b27 Added to display tooltip's for the Voip button's 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5687 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-17 12:08:30 +00:00
thunder2
9aa6478910 VOIP: Fixed some compiler warnings and removed unnecessary translations. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5622 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-30 09:38:13 +00:00
thunder2
e6db506cb2 Fixed crash and memory leak in the AudioWizard of the VOIP plugin. 
Please use at least Qt 4.6.4 when compiling RetrosShare with the VOIP plugin because of the fix of the bug QTBUG-11883.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5603 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-25 23:08:46 +00:00
defnax
54f0c208df Removed html code on some QLabels 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5601 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-25 12:58:30 +00:00
defnax
d353cc375f fixed some spelling errors 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5598 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-24 22:37:14 +00:00
csoler
c5a5c1654f fixed small issues. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5596 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-24 19:53:53 +00:00
csoler
afca515165 removed debug msgs and compilation warnings. Added missing include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5488 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-30 16:14:55 +00:00
thunder2
fedba02d18 Fixed display of the friend status in chat window. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5014 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-11 00:22:25 +00:00
thunder2
96199fabc5 Fixed linking of the VOIP plugin on Windows. 
Exports all symbols from RetroShare.exe and import it in the plugins.
Removed the direct linking of the libretroshare and libbitdht from the plugins.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5003 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-28 21:59:01 +00:00
thunder2
30564fe6ad Fixed utf8 characters in the transfer tab name of plugins. 
Added Q_OBJECT to the VoipStatistics classes.
Removed compiler warnings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5002 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-28 18:25:57 +00:00
csoler
c843a047ff patch from thunder to fixed compilation on windows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-27 09:02:34 +00:00
csoler
e9b53f0a12 patch 1d83f7b from joss to VOIP plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-26 20:31:16 +00:00
csoler
af1b90707a patch from joss to correct some bugs in VOIP plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4994 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-26 16:10:27 +00:00
csoler
b748f1a3f1 added logic for handling invitations 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4993 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-26 15:49:07 +00:00
csoler
528e822d8e added transmission of data from voip service to audio popup chat dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4991 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-25 21:03:06 +00:00
csoler
db07053214 added communitation between service and GUI part of VOIP plugin. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4990 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-25 18:15:36 +00:00
csoler
12b3ed02f1 added special VOIP buttons to chat dialog through plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4989 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-25 12:18:40 +00:00
csoler
2f38506763 merged existing p3VoRS service with VOIP plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-19 15:07:47 +00:00
csoler
0d4feb89b4 cleaned directory structure 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4962 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-19 08:32:47 +00:00