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
2,738 Commits 63 Branches 22 Tags 194 MiB
e40c469aa4
Commit Graph

2738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leander-256
5f2f87537b Because some versions of Qt require a non-const QRegExp, we copy _embedInfos to 
a non-const variable:

EmbedInHtml embedInfos(_embedInfos) ;

However, since EmbedInHtml is the base class we lose any information added in
the derived class, which causes a problem with EmbedInHtmlImg when we do a
static_cast to what should have been the proper type here:

const EmbedInHtmlImg& embedImg = static_cast<const EmbedInHtmlImg&>(embedInfos);

embedInfos is not an EmbedInHtmlImg any more, just a mere EmbedInHtml.

We could const_cast the QRegExp object instead but let's keep it simple and
remove the embedInfos constness from the method's signature.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-07 00:49:26 +00:00
defnax
749945dda8 added a idle icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3076 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-05 23:27:08 +00:00
defnax
3056ec0875 Added to display Friends rsstatus on PeersDialog, icon and color change when Friend is Idle, Away or Busy 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-05 22:42:32 +00:00
defnax
619a2d7491 improvements with user friendly words for Profile Generation labels. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-05 21:17:46 +00:00
defnax
7331d17b16 removed the icon for Folders Button and set text-align to left. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3073 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-05 19:48:04 +00:00
csoler
7b0757c4bc Merged branch commits: 
3068: added verification for file size computation (bug correction)

3069: set heartbeat values to intermediate values

3070: suppressed uninitialised memory read

3071: automatic removal of file lists from deleted peers, at restart (After
      double check that this does not alter exchange of file lists in any way)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3072 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-05 19:16:39 +00:00
chrisparker126
0470477bcc group modifications now propagate 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-05 11:19:04 +00:00
defnax
2d087cea4c some improvements for Generating Profile Dialog, change Label and Button strings when switching to generate a new Profile or new Location. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-05 00:44:43 +00:00
thunder2
342768e626 improvements messages: 
- save msgId in configuration file
- enable previous improvements read/unread state and tags

new function for creating backups of a file
bool createBackup (std::string sFilename, unsigned int nCount = 5);

currently its only available for windows compile. maybe there is a linux developer who change it for linux.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3064 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-04 23:39:33 +00:00
chrisparker126
fe98568329 added edit chan info dialog files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3063 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-04 22:56:06 +00:00
chrisparker126
478c4e1c29 edit channel info dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-04 22:52:54 +00:00
chrisparker126
ef56b199b8 added edit channel info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3061 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-04 22:52:01 +00:00
chrisparker126
458eb34fb6 added edit channel info feature and edit distrib group info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3060 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-04 22:51:18 +00:00
chrisparker126
163c0e96a7 added edit channel info feature 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3059 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-04 22:50:39 +00:00
defnax
dd7e074791 added TabWidget to Messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3058 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-03 23:41:46 +00:00
thunder2
08ea7232f7 bugfix in MessageDialog, rs could crash when removing two or more messages at once 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3057 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-03 22:12:07 +00:00
defnax
5264f46f9e update the windows bat files, to not close the cmd box when there is a error on compiling. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3056 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-03 18:41:26 +00:00
defnax
d951674f64 Added Trust settings and Signing informations to HelpBrowser 
Added Trust info Button to call HelpBrowser for Trust Settings and Signing informations.
Clean up Peer Details Trust TabWidget, removed not needed Labels.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3055 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-03 18:34:43 +00:00
thunder2
f06ed5fbed the default tags can be reset to standard in the settings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3053 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-02 12:11:09 +00:00
defnax
141fdbe6fe reorder the default tags 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3052 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-02 00:26:15 +00:00
defnax
d7816689e4 added for tag list items default folder icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3051 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-01 23:27:34 +00:00
defnax
b30c142592 added for windows compile and revision bat files, and template rsversion.in 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3050 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-01 23:03:12 +00:00
defnax
ca56bee921 added svn_revision.bat file to update easier the rsversion.h under Windows, and modifyd the mingw32make.bat before compiling write the latest revision to rsversion.h 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3049 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-01 22:46:56 +00:00
thunder2
7c73ecef47 improvements MessagesDialog: 
- filled tag list and filter the messages after the selected tag
- state of tag list is saved in settings

bugfix MessagesDialog:
- remove tag with uncheck of menu item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3048 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-01 22:14:52 +00:00
csoler
860f3a0568 augmented the heartbeat parameters, to reduce the stress on connections. Seems to help a lot when the traffic is high. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3047 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-01 20:33:27 +00:00
defnax
626947a7a1 update version 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3046 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-06-01 20:15:44 +00:00
defnax
2088ff808d Set icons for Signed and none signed Forum Messages, set a default minimum size for thread items. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-31 23:02:45 +00:00
defnax
9eb5af1f0b removed unused old im icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-31 22:20:14 +00:00
defnax
647c08c8da Added Folders and Tags Header Buttons, and moved "Total Inbox" and "Total Sent" to the Bottom into a QLabel. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-31 21:27:57 +00:00
thunder2
c23ea03190 comment out unused method AuthGPG::updateTrustAllKeys_locked 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-31 19:20:52 +00:00
defnax
bed4cb1d4a possible fix for search line edit for macos 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3041 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-31 00:14:57 +00:00
defnax
4f4bad4d5a moved Forum Title Column as First column 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3040 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-30 23:49:20 +00:00
chrisparker126
f36f92eb24 fixed file rename error 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-30 07:11:19 +00:00
thunder2
3fdd570f62 the tags are colored in the menu with style cleanlooks 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3033 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-30 00:00:15 +00:00
defnax
f746306975 added to use on xp default style windows xp 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3032 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-29 23:44:23 +00:00
thunder2
74978b77b7 some optimizations in PeersDialog::insertPeers 
do not call too much into the libretroshare

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3031 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-29 21:56:34 +00:00
defnax
d7b8e9cb7c Added Search Filter for Contacts View 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-29 19:05:10 +00:00
defnax
3d09acf96b added splitter to channelFeed and changed the minimum size for the channel tree 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3029 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-29 16:25:37 +00:00
thunder2
334c9b61d3 moved rsGlobalShutDown from MainWindow::doQuit to main 
rsGlobalShutDown now cleans the threads and some memory on exit

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-29 15:14:25 +00:00
csoler
b80aef1228 Suppressed the possibility for browsable only files to be searched by hash from turtle router. 
This avoids that an attacker that captures a broadcast hash request can also ask for the file.

This needed to add back explicit sources in SearchDialog and private chat transfer. I dynamically search
for sources in file lists just before calling FileRequest.

When RS links anchorClick() will work properly with Qt, we can remove the search flag "EXTRA" from the
tunnel digging in p3turtle.cc, otherwise, people having this bug can't transfer files in private chat by
copy+paste of a RS link.
    
	Also:
	    - added missing mutexes in search requests into fimonitor.cc
		- suppressed some debug info in connect manager
		- added check for write fails when dumping config files



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3027 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-29 13:17:09 +00:00
chrisparker126
39356c9918 added extra constructor to allow distrib cache service item grpkey to be used with p3service. 
- key sharing now enabled for channels and distrib service

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3024 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-29 12:05:54 +00:00
chrisparker126
c957fb7988 forgot to pass correct inherited service type 
- caused problems with distrib service information dispersal

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3023 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-29 08:07:44 +00:00
defnax
6dd4e0e617 fixed wrong spelling 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-28 17:29:21 +00:00
thunder2
c8a805b8e7 added trash in msgservice and trash folder in MessagesDialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-28 14:42:54 +00:00
csoler
a3a75b7aea Ported branch commit 3017: 
- added failure tests for fwrite. Some where missing.
	- added a test against the IP 1.0.0.0, which pops up on MacOS (when the peer is not connected to the internet?)
	- put some additional debug messages.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-28 14:00:35 +00:00
defnax
c366c5cc93 some changes for rsversion 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3016 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-28 00:03:03 +00:00
defnax
6179470511 revision number testing 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3015 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-27 23:56:36 +00:00
defnax
2f2f761043 change rs revision number 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3014 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-27 23:54:58 +00:00
defnax
3196f1d0e7 when Edit is called then set Window Title "Edit Tag" 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3013 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-27 23:21:18 +00:00
drbob
0b31b54be3 * Debugging for MacOSX, print out NET_RESET stuff. 
* Fix discspace for OSX.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-27 22:34:45 +00:00