Commit Graph

3396 Commits

Author SHA1 Message Date
thunder2
e282a55164 MessengerWindow
- cleaned include files
- changed menu for set the tree is decorated
- new check for sort rows by state
- saved the state of sort order, hide offline, sort by state and decorated state

PopupChatWindow:
- when setting "Grab Focus when chat arrives" not checked, the new chat window is opened minimized and flashed in taskbar

reworked start private chat and message to friend from PeersDialog and MessengerWindow:
- moved method for starting a private chat from PeersDialog and MessengerWindow to PopupChatDialog
- moved method for sending a message to a friend from PeersDialog to MessageComposer
- removed signal startChat

fixed bug in MessengerWindow:
- when peer is not online and private chat is not available, the message was send to the wrong peer (the current peer in PeersDialog)


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-17 17:39:32 +00:00
csoler
95c5c4b1a1 Added in RsItem a new virtual method queueType() that returns the type of the queue to
use for handling the packet: RsItem::DATA_QUEUE for data and RsItem::CONTROL_QUEUE for 
control packets, to be used in pqistreamer.

Up to now, File data chunks where the only packets that were going into the --less prioritized--
data queue. Now, the default in RsItem::queueType() being to return CONTROL_QUEUE, developpers can
choose which queue t use by simply overloading this method so that it returns a different value.

The first use of this was to make generic turtle tunnel packets use the data queue instead of 
the control queuem, which restores a correct balance between turtle downloads and friends downloads.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-16 21:09:58 +00:00
csoler
347c80fb1e Ported branch commits:
3148: modified the update system for address lists, so that the list is totally
      replaced (and not merged) when it comes from the peer itself. This helps
      cleaning wrong addresses

	  libretroshare/src/pqi/authssl.cc
	  libretroshare/src/pqi/p3connmgr.cc
	  libretroshare/src/pqi/p3connmgr.h
	  libretroshare/src/services/p3disc.cc

3149: removed uninitialized memory read
      
	  libretroshare/src/pqi/authgpg.cc

3151: corrected missed update of peer info when connected. Disabled setting
	  peer connexion IP from p3disc info (does not make sense, and leads to
	  errors)

      libretroshare/src/services/p3disc.cc



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3152 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-16 20:18:46 +00:00
thunder2
e9fabc34e9 saved the state of the "hide unconnected" button in settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3150 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-16 19:00:28 +00:00
defnax
fe6d44ecde fixed to export full certificate on networkDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3147 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-16 18:01:23 +00:00
leander-256
9033e4fa56 Bugfix on file manipulation
Corrects wrong logic when using Win32 API for handling the filesystem, Win32 functions return 0 for an error while POSIX functions return 0 for a success.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3146 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-16 16:18:08 +00:00
thunder2
8c1df60e49 show the complete certificate in the CryptoPage again
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3145 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-16 12:14:39 +00:00
csoler
b941d733cc Ported branch commit 3143: corrected bug responsible for mixing IP lists between peers of same GPG id (connection attempt to other peer responded with connection to oneself). Added additional debug info in p3disc.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3144 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-15 21:28:27 +00:00
thunder2
540e99bc48 - CryptoPage now shows and exports clean certificate, without sslid & co
- ConnectFriendWizard exports the certificate with additional informations like sslid & co

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3142 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-15 21:07:22 +00:00
thunder2
1585859896 fixed settings for tray message enable/disable
now it can be enabled and disabled at runtime

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-15 16:51:48 +00:00
defnax
6d3db4ae66 fixed some MessagesBox's to display a default Window Icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-15 15:13:47 +00:00
defnax
b1c838d991 fixed text alignment for Date Label
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3139 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-15 14:25:53 +00:00
defnax
373762398c fixed some margins and spacing for the subject,from,to labels
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-15 13:16:19 +00:00
defnax
db9dd0f04d added to settings for tray message enable/disable
fixed to get work Export Certificate on NetworkDialog
added to display on uploads extensions icons


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3137 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-15 11:34:58 +00:00
thunder2
f1da09ad93 save the window state only when the window was visible and the state was loaded
the problem was:
the state of the windows was set to the initial state on close, when it wasn't visible.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3136 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-14 20:15:51 +00:00
thunder2
5b1fae0123 all messages in MessagesDialog are now editable from context menu or with double click
changes from defnax with some corrections from me

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3135 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-14 18:16:32 +00:00
defnax
f4186fb7c8 Added a ProgressBar for Profile Generation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3134 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-14 13:35:38 +00:00
thunder2
927f8639b7 profile wasn't saved on first start
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3133 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-14 13:32:13 +00:00
leander-256
4dc30963cb Fix GCC 4.5 errors, which does not accept any more calling the constructor like
this: C::C()

For a more detailed and correct explanation see Harald van Dijk's comment here:
http://blog.flameeyes.eu/2010/06/02/tinderbox-summary-for-may-2010-gcc-4-5-berkeley-db-5-0-libpng-1-4


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-14 11:57:22 +00:00
defnax
2d839b031b Added to use QListWidget for Display signers, removed QTextBrowser
Added context menu for Signers QListWidget with Copy Peer Name.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3131 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 23:42:21 +00:00
thunder2
c5eade329b revert my last changes, because _thread_id is useful for debugging
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3130 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 21:12:25 +00:00
defnax
876e33dc0a fixed forgotten notify changes for MessageToaster
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3129 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 21:02:29 +00:00
thunder2
a5b7950065 moved the member _thread_id from class RsMutex inside the define RSTHREAD_SELF_LOCKING_GUARD
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3128 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 17:47:00 +00:00
thunder2
6f8e75c14f p3connmgr.cc: fixed compiler warning
p3distrib.cc: fixed compiling under windows

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3127 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 15:24:59 +00:00
chrisparker126
931b95bc58 message encryption
- uses joss's/ open ssl sealinit implementation. public key encryption 
- invoked by rs_group_encrypted group flag


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3126 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 13:59:00 +00:00
thunder2
0d1eaba890 p3StatusService::getStatusQueue
- memory leak -> "RsItem* item" was not freed, when "dynamic_cast<RsStatusItem*>" failed
- optimized return of std::list as parameter and not as return. return will copy the list and its not necessary

p3StatusService::getStatus
- memory leak -> items in "std::list<RsStatusItem* > status_items" was not freed
- potential crash, when receiving a status for an unknown peer

p3Peers::getPeerDetails
- optimized - call to "AuthSSL::getAuthSSL()->OwnId()" only once
- optimized - add ip addresses directly to "d.ipAddressList"

PeersDialog::insertPeers
- fixed possible crash, when ssl child has disappeared and was removed from tree, there was a missing continue

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3125 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 12:26:23 +00:00
ruchijain
61f2c14663 - UI changes to Message Toaster to display Subject and Content for the messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3124 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 10:22:55 +00:00
ruchijain
39c6af6638 - Changes to MessageToaster - display Subject and Content of incoming messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3123 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 10:21:46 +00:00
ruchijain
52b8e37295 - Changes for Message Toaster
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3122 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 10:20:28 +00:00
ruchijain
ea1a83d842 - Changes for Message Toaster
- Fixed bug for "Welcome Retroshare" msg going to Sent Box

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3121 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 10:17:50 +00:00
ruchijain
21ee08c974 - Changes for Message Toaster
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3120 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 10:15:00 +00:00
ruchijain
9b91590cbf - Changes for Message Toaster
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3119 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 10:14:04 +00:00
ruchijain
5107fbdd0a - Changes for Message Toaster
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3118 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-13 10:12:56 +00:00
ruchijain
5b0aa33995 git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3117 b45a01b8-16f6-495d-af2f-9b41ad6348cc 2010-06-13 10:10:04 +00:00
defnax
c5c3e4494c fixed text alignment for Local Address Label
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3116 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-12 23:30:23 +00:00
defnax
2b02e35a9e Set minimum size for RemoteDirModel items and fixed Text Alignment role for File Size column, cleaned some code style.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3115 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-12 18:10:39 +00:00
defnax
1d4a02141f Added to use only one Label for Total Count, count selected Box on Total Label
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3114 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-12 15:11:42 +00:00
thunder2
b715a577b0 changed sort to case insensitive in peers tree
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3113 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-11 23:28:05 +00:00
leander-256
c3c607ec80 Small bug and compiler warning fixes:
- gui/forums/CreateForumMsg.cpp used endl instead of std::endl
- constructor's initializer in the wrong order
- temporary variables type causing signedness warnings


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3107 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 14:13:20 +00:00
defnax
d48035385b fixed translation for a transfers column, there was a enter after translation text.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3105 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 13:43:52 +00:00
csoler
0d14351b8a Ported branch commits:
3099: libretroshare/src/tcponudp/udplayer.cc 
      libretroshare/src/tcponudp/udplayer.h 	
      libretroshare/src/util/rsnet.cc 	
      libretroshare/src/util/rsnet.h

	moved operator<<(ostream&,sockaddr_in) to rsnet.h, as it is used at
	different places

3100: libretroshare/src/util/rsdiscspace.cc
	suppressed debug mode

3101: libretroshare/src/serialiser/rsdiscitems.cc

	put correct (i.e. non conservative) size for RsDiscReply packets

3102: libretroshare/src/services/p3disc.cc

	Made a pass on the code in p3disc. Corrected some bugs:
		- suppressed an unwanted return in packet treatment
		- prevented sending info to a peer about itself
		- changed askInfoToAllPeers() such as not to discard info
		  from peers with NODISC flag (because we especially need
		  info for these)
		- enabled receiving p3disc info even if p3discovery is
		  disabled. Indeed, disabeling p3disc is a measure of
		  protection, so it should limit the export of p3disc info,
		  not the import.
		- removed test discarding info about dummy friends, because
		  it is useless
		- don't discard info about peers that have the NODISC flag
		  (meaning that we especially need info for them)
		- added safety check about received GPG keys. Before we
		  relied on this test being performed by
		  p3ConnMgr::addFriend()
		- added some debug info

3103: libretroshare/src/ft/ftcontroller.cc
	removed debug info



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 13:42:49 +00:00
defnax
f22753a586 removed release defines from Connect Friend Wizard
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3098 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 12:35:13 +00:00
defnax
37560129c8 fixed string for translation support
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3097 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 11:45:51 +00:00
defnax
5df30d555b update translation strings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3096 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 11:44:48 +00:00
thunder2
5c92cc4a0d removed unused variables
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3095 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 07:50:14 +00:00
defnax
e78ed75d36 * Added Drag and Drop feature for CertificatePage, you can now drag and drop friends key file in a easy way.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3094 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 23:46:24 +00:00
thunder2
04aaceaf4d CertificatePage
- enable export of own certificate to file
- enable import certificate of friend from file

read and write of file is done in the gui, because the methods for load from file and save to file on p3Peers are not implemented yet

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3093 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 22:28:55 +00:00
thunder2
c3b6da6386 cleaned some compiler warnings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3092 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 19:51:46 +00:00
defnax
ead1228535 cleaning some code style
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3091 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 15:56:07 +00:00
defnax
ee05917d30 changed color of the MessengerWindow's idle icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 13:02:55 +00:00