Commit Graph

94 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
leander-256
2af2b056f4 Memory leak fix
Removes unnecessary conversion code as well as a malloc that was never freed


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-07 14:57:29 +00:00
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
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
thunder2
6baf56285b reworked settings
now there is only one global object for loading and saving settings

RshareSettings *Settings;

the class RSettings can be used too, but it is not prefered, because the default settings has no affect

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-20 21:53:27 +00:00
thunder2
a8c4b3b107 - moved the chat setting to the section [Chat]
- cleaned some comments of the settings classes

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2940 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-18 18:02:51 +00:00
csoler
5a65dabc09 - suppressed some errors in printf commands with uint64_t - apparently, the cap function in QRegExp takes a non const in some Qt versions. I had to copy the const parameter to a local variable.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-16 20:06:04 +00:00
thunder2
c3c6480f4b changed the usage of "QMenu*" to a local "QMenu"
removed usage of "new QMouseEvent", it was a memory leak
cleaned some includes

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 20:55:44 +00:00
leander-256
988c6c31f5 Fixes two problems in the current group chat:
- the parser fails to embed two links in the same sentence
- the parser can potentially put smileys in the middle of <a> tags

Solution:
Since the message is in HTML, it is parsed into a DOM tree, then that DOM tree
is traversed and only the text nodes are parsed (see HandleRichText.cpp for
details).

Bonus fixes:
- missing std:: for endl (which was falling back to its Qt counterpart)
- commenting useless code in PeersDialog::smileyWidgetgroupchat()
- replacing int by size_t
- RetroShare.pro now queries gpgme-config for its include path


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2888 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-12 00:17:10 +00:00
thunder2
0c46da0dd2 Changed settings to local variable, no more as pointer on all classes.
RshareSettings settings;
settings.value(...);

It should lower memory usage and removes memory leaks.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2886 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-11 20:02:52 +00:00
csoler
23a0b60e59 fixed chat bug that was truncating some messages, due to using a uint16_t to store a local size. Totally backward compatible. This fix might also affect blog messages.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2880 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-09 20:06:19 +00:00
defnax
8feeb2adb3 Added Chat Settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-03 21:17:36 +00:00
defnax
c91bc09c74 Added functionality to save a Privat Chat session and GroupChat History via ToolButton
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2807 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 22:08:38 +00:00
chrisparker126
76a4c34440 rsstatus
-implemented simple rsStatus for messenger window
- fixed minor bug with messenger window (starts new pop-up chat dialog when peer responds, if private chat started from messenger window) solution: messenger windows start peers dialogs pop-up chat dialog instead


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-15 12:02:23 +00:00
csoler
f8d6590952 ported v0.5.0 commits 2561,2562 and 2574 to trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-17 15:34:36 +00:00
csoler
a657def956 cleaned the RS link code, factorized the parsing into a single class. Still missing: copy/paste of multiple links
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2514 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-10 21:38:26 +00:00
defnax
0780e3a09e fixed to get click able the retroshare links in privat chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2481 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-04 14:15:30 +00:00
defnax
a32c4b74b4 Added actions for disable/enable Emoticons in Privat Chat and for Clear Chat History
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2374 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-19 22:31:32 +00:00
defnax
d9d1f15c7f disabled style Button, is not yet stable, can let crash
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2298 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-13 14:18:49 +00:00
joss17
b46cf457db further log cleanings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2271 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-10 10:56:54 +00:00
joss17
db225bdcb7 re implement chat parsing for urls. External web browser call might not work on some systems
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2224 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-07 12:36:37 +00:00
defnax
e6595f767c set a default Avatar when Friend has no Avatar for Privat Chat.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2199 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-05 19:30:18 +00:00
defnax
bb3a1ba8b1 use AttachFileItem for Forums and Chat too, use SubFileItem only for Channels
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2124 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-25 14:35:32 +00:00
joss17
f481dbef59 add include for latest gcc. Comment usleep fonction in tou_net.h
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2101 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-20 22:02:43 +00:00
joss17
c62daadacd improve peer chat and message composer
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-18 22:50:14 +00:00
csoler
e70e995894 added functionnality to complain when a download is initiated over a file already in download, or in the HD
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2055 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-16 15:42:26 +00:00
csoler
fee083e6b8 fixed downloading of links attached to forums
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2054 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-16 14:31:32 +00:00
joss17
e65bce7048 fix a small bug in popup chat dialog with V scroll
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1966 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-02 21:46:20 +00:00
defnax
bbe773b91c removed not needed old Preferences
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1876 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 17:13:10 +00:00
dondiimperial
d2665f9dd6 Fix for ticket #68
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-28 17:52:17 +00:00
joss17
97d8640f3a tweak the peer chat and group chat vertical scroll
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1848 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-27 22:05:38 +00:00
joss17
8128f0b2ea fix the chat scrollbar
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1819 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-12 17:17:21 +00:00
csoler
97400a74ef - fixed the update of avatars in the various chat dialogs
- added a "peer is typing" function to the group chat.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1706 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-30 22:30:57 +00:00
csoler
dee82c5f1b - fixed up avatar exchange between peers
- reverted preceding commit about PNG/JPG in popup chat dialog. This only concerns internal data representation and this string has nothing to do with accepted image formats.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1704 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-30 20:53:18 +00:00
joss17
a3e010b842 improve chat scrollbar
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1693 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-26 19:18:20 +00:00
defnax
758ba49ff1 store Avatar images as PNG format, to not lose the transparent of the pictures
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1609 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-07 13:59:38 +00:00
joss17
59692a9aa9 improve vertical scrollbar popupchatdialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1490 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-04 14:38:31 +00:00
csoler
2e680b1ed4 added smooth avatar scaling
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1241 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-15 14:31:37 +00:00
csoler
cd961bf49f Changed popup fchat focus for typingnotification
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1238 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-14 21:15:43 +00:00
joss17
3e3b90c95e Don't send the extrafil link when SubFileItem is cancel (ERROR mode). Improve chat url parsing.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1236 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-14 15:54:38 +00:00
defnax
b212f65f69 added tooltip for add file button
fixed icon size 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1224 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-12 22:12:57 +00:00
joss17
fc9ed005bf Refuse directory drop for extrafile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1220 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-11 14:35:50 +00:00
joss17
63be32ba4d add the drag'n drop file to popup chat, still a bug when adding a directory
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1216 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-11 14:27:45 +00:00
joss17
3698fc5a2c rolled back commit 1200 only for popupchatdialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1215 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-11 14:21:11 +00:00
drbob
65e02ba4de * Rolled back Modifications to SearchDialog and PopupChatDialog.
- unable to get windows to compile with PopupChat on windows.
	- not happy with new SearchDialog. Not an improvement on old dialog + uses Qt4.4

 * updated version numbers...
 * added a couple of windows scripts.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1200 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-08 23:07:08 +00:00
joss17
0c41943958 Make compatible with Qt 4.3.4
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1198 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-08 18:43:01 +00:00
joss17
46f7dd0047 Some work on the link of the chat dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1185 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-07 19:40:02 +00:00
joss17
dfad69de9f add a popup when file link is clicked, and a test if a file link is malformed
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1183 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-07 16:07:43 +00:00
defnax
aa0c678d67 enabled translation for "Chatting with "
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1182 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-07 13:45:37 +00:00
joss17
8e6f082025 add file button to general message; add extra file sending from chat dialog; Add a link when sending a file; Add a link for downloading in the reciever chat dialog; Little gui improvement
Merge branch 'extraFile'


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-06 21:15:12 +00:00