Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,666 Commits 63 Branches 22 Tags 196 MiB
28277c53df
Commit Graph

201 Commits

Author SHA1 Message Date
defnax
4eed106579 fixed strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7563 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-26 11:02:51 +00:00
defnax
0697f29289 fixed naming 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7552 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-21 13:53:52 +00:00
defnax
8b1df1d555 changed video icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7550 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-21 12:31:16 +00:00
defnax
2350837bc6 Fixed to hide the Hangup Button by default, only when call is started show 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7547 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-20 16:44:26 +00:00
defnax
6f96443813 Hide Video Chat widget by default, only show when Video Chat is started. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7546 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-20 16:28:26 +00:00
thunder2
99b55fbe65 Changed plugins to the new interface 
rs_pqi_service -> p3_service

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7496 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-26 22:16:32 +00:00
defnax
906efa6f6c renaming tool tip 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7491 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-13 13:19:22 +00:00
thunder2
1485361a1e Fixed Windows compile of VOIP with Qt 5.3.1 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-26 11:38:34 +00:00
thunder2
6792348402 - Moved settings for user notify into the base class 
- Removed defines TRAYNOTIFY_...

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-24 20:01:12 +00:00
csoler
c6103b7535 added bandwidth measurement for video. Still needs codec to accound for it 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-20 20:50:36 +00:00
csoler
ee0c48b912 fixed bug due to deleting video capture device 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7456 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-17 14:13:02 +00:00
thunder2
6dace62abe Fixed Windows compile of VOIP 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 21:12:10 +00:00
csoler
5df440b1bb bug fix in video sending 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7453 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 20:49:57 +00:00
csoler
01c467c4c0 added serialisation/transmission of video data 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7452 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 20:04:31 +00:00
csoler
b6089f3b91 Started implementation of Video Chat (not working yet!). 
- GUI part is done
- implemented a very basic JPEG codec
- added echo frame in configuration panel
- created a video capture object that uses OpenCV (should be cross systems)
Remains to do:
- serialise and send frames through p3VoRS
- use a serious codec (e.g. Theora+x264)
- add icons to reflect camera state (failure/working/sending/...)
- compilation on windows 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7449 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-13 13:57:25 +00:00
thunder2
d8ed978b28 Merged revision 7410 from v0.5.5 
Fixed Windows compile with MinGW 4.8.2

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-06-21 21:12:27 +00:00
thunder2
4c6ab35867 Updated external library to openssl-1.0.1h 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-06-05 23:51:48 +00:00
thunder2
31962ea0c5 FeedReader plugin: 
- Added check of feed parent id in loadList
- Trimmed downloaded xml string to process xml strings with leading spaces

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7359 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-09 23:12:03 +00:00
csoler
71a02003be fixed compilation of FeedReader plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7301 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-23 20:48:02 +00:00
csoler
33abca82e5 - removed LinksCloud from plugins (based on obsolete cache system) 
- removed copy constructor of RsGenericId from std::string as it allowed many inconsistencies and double transforms of IDs from/to strings


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7289 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-20 16:34:26 +00:00
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
thunder2
9ea4ab24e0 Updated external library to openssl-1.0.1g for Windows compile (merged from v0.5.5) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7262 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-10 23:15:24 +00:00
thunder2
f818bb8e9a Fixed Windows compile with Qt 5 (Merged from branch v0.5.5) 
- Revert change of revision 7063 in openpgpsdk.pro for Windows compile
- Changed order of the libraries in FeedReader plugin

Fixed Windows compile with MinGW 4.8.0
- Added missing include

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7111 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-12 22:03:20 +00:00
thunder2
cedbd051ac Deactivated code for old forum handling in FeedReader plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7091 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-04 22:06:33 +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
741424dd72 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 21:23:56 +00:00
thunder2
9eaea5de12 Updated english translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-14 11:41:34 +00:00
thunder2
57b906bdd2 Removed include of "pqinotify.h" in VOIP. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6997 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-08 11:13:01 +00:00
thunder2
76b3ccc1a5 Added service pointer for forums to the plugin interface. 
FeedReader:
- Used the forums pointer from the plugin interface instead of the global pointer

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6982 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-03 15:05:48 +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
thunder2
dddc4356f1 Changes for Windows compile: 
- removed some unnecessary libraries from retroshare_plugin.pri
- FeedReader
  - updated external libraries to libxml2-2.9.1 and curl-7.34.0
  - enabled ssl in libcurl
  - removed debug output

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6976 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-28 23:49:50 +00:00
thunder2
dbfe3f6c51 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-20 18:51:12 +00:00
thunder2
607458dad7 Added missing language files. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 16:12:16 +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
thunder2
0ad20e6911 Updated german and french language from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6876 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-24 07:42:13 +00:00
thunder2
758b5d0079 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-23 11:07:17 +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
41e22a1b21 update voip strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-21 12:45:20 +00:00
thunder2
5b6aa594c6 Code maintenance for Qt 5: 
- Renamed CacheData to RsCacheData, MinGW-w64 has already a class with the same name

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-21 12:07:33 +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
30103ef5f2 Added display of Qt version in AboutDialog. 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-18 22:12:31 +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
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