Commit Graph

44 Commits

Author SHA1 Message Date
thunder2
cbdb717e51 Fixed choose of the font in PopupChatDialog with the font dialog.
New class RsharePeerSettings and a global variable PeerSettings for read and write settings of a peer (gpg id).
Save font and color in PopupChatDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3464 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-10 18:38:46 +00:00
thunder2
8213a2aa77 Chat service:
- Added send time to ChatInfo.

Chat:
- Reworked IMHistoryKeeper to save only needed data as raw data (not formatted from PeersDialog).
- Renamed the public chat history file from "his1.xml" to "chatPublic.xml" and moved it from data dir to config dir. The current history is lost. Please delete the file "his1.xml" manually.
- Optimized save of the history. Save only when changed, also during the runtime.
- Clear the history in PeersDialog clears the IMHistoryKeeper too.
- New setting to send chat message with Ctrl+Return. Changed the check for Enter in PeersDialog and PopupChatDialog from textChanged to eventFilter.
- Smileys are inserted at the current cursor position, not added at the end.
- Don't send emty messages.

New class ChatStyle:
- Created a new class for the work with chat styles and smileys.
- Currently only two internal styles are available - private and public. Later more external styles planned.
- Moved functions for loading and showing the emoticons from PeersDialog and PopupChatDialog to the new class.

Private chat:
- Split private chat style into incoming.htm and outgoing.htm.
- Removed style change.

Public chat:
- New chat style incoming.htm, outgoing.htm, hincoming.htm and houtgoing.htm.

Chat feed:
- Show links and emoticons if they are enabled for public chat.

PeersDialog:
- Show the own name and location only once at start and not with QTimer every 1.5 second.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3441 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-04 14:23:30 +00:00
thunder2
48acd856af Added the peers custom state string to NotifyBase::notifyCustomState and to the signal NotifyQt::notifyCustomState.
Changed the display of the peers custom state string in PopupChatDialog from QTimer to signal.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3429 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-02 10:15:13 +00:00
defnax
d417a143b5 Added new Frame and Labels to Private Chat Window to display Friend name, status and status message.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3427 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-02 01:37:47 +00:00
thunder2
7f837e9778 Splitted queue of chat messages in chat service into public and private queue.
Reworked the interface of the chat service. So full recomile is needed.
With disabled flags for private chat (RS_CHAT_OPEN_NEW and RS_CHAT_REOPEN), the incoming private chat messages are queued (only for the runtime) until the user shows the private chat dialog.
When a new chat message is available, the icon of the gpg and ssl contact changed in MessengerWindow and PeersDialog and a new tray icon is shown.
Fixed compiler warning.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-01 17:56:15 +00:00
thunder2
77418bd4b6 Removed peer name from "is typing..." message of the sender and add it of the receiver side.
Now the "is typing..." message can be translated.
It is still not a good solution, but it works for now.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3408 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-30 18:33:19 +00:00
defnax
0afc0f298e Added close Button for the Info Frame.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3393 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-24 15:28:50 +00:00
thunder2
340982b996 p3ConnectMgr::connectResult
- added "mStatusChanged = true" on disconnect of a peer - the statusChange was not notified in time

MessengerWindow
- removed unused method updatePeersAvatar

Changes in status service:
- removed unused method statusAvailable
- new notifier for status change
- enabled the tick for receiving items
  - always up to date status map
  - no huge memory usage, if no list is visible who call getStatus and processed the received items
  - send notify on status change
- renamed getStatus to getStatusList and created a new method getStatus to get status of one peer
- fixed: send status directly after the connect of a peer

Now the frame around the avatar in private chat changes when the peer change the state.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3380 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-20 18:45:44 +00:00
defnax
d8e4bc86b8 Added to switch background border picture for Friend's Avatar Label .
Set window title little bit more simple.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3376 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-18 12:02:36 +00:00
defnax
0abfbbb911 Added a splitter to Privat Chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3345 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-06 14:58:53 +00:00
defnax
cfc17398dd added Picture Preview Thumbnail patch for Privat Chat from xiaohan and fixed little design improvements
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3344 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-06 12:30:06 +00:00
thunder2
569ac25843 cleaned include files
- removed some dependencies between other header files
- removed many includes of <QtGui> and replaced it with only needed files

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3312 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-23 18:52:58 +00:00
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
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
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
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
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
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
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
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
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
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
csoler
e144e75ba6 Added "peer is typing" functionality to private chat. This shoudld be extended to additional stuff like "idle", and to public chat. Also the display is the status bar of the chat window could be made nicer, e.g. directly in the msg window. Suppressed ChatDialog class that is not more used
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1164 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-05 13:18:53 +00:00
csoler
cdd7377280 added protocol for Avatar exchange in private chat. See http://retroshare.sourceforge.net/wiki/index.php/Chat.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@959 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-30 19:52:47 +00:00
defnax
2637b88e8b * redesigned to load emoticons
* removed old method emoticons 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@913 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-06 02:33:15 +00:00
defnax
d2e64551c2 * added basic set avatar picture for MessengerWindow and Privat Chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@907 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-04 02:28:30 +00:00
drbob
c05acf2f95 Added NewsFeed / Popup / Chat Configuration options.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@870 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-07 14:19:13 +00:00
defnax
a20ff44567 added for Privat chat html and css feature to can make styles for Chat Window.
added first basic default style.
style Button disabled need to be fix.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@500 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-12 14:19:08 +00:00
drbob
65bb6a65d7 * Fixed Colors and Fonts for Private and Group Chat.
* Fixed Chat Delay.
 * Cleaned up Options->Server, removing unneccessary stuff.
 * Cleaned up Config Friend, removing stuff.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-05 12:14:49 +00:00
defnax
d51af63d51 added QTextCursor for color, fixed color cursor problem when color is selected and cursor is not aktive
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@457 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-01 06:15:02 +00:00
defnax
2cb92f2d5a fixed setColor function
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-03-31 21:35:29 +00:00
drbob
1c73d22eef Added check to catch <return> to ChatDialog and PopupChatDialog.
Removed Save Check on ChanMsgDialog.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@451 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-03-31 21:02:12 +00:00
defnax
b55eb395a3 Added first Emoteicons feature
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@436 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-03-29 18:21:17 +00:00
defnax
9001ee6d24 fixed up Chat Dialogs Formating features, cleaned up Formating codes and removed not needed experiments with formating.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-03-27 01:29:04 +00:00
defnax
ba87009a25 fixed color Buttons with basic html functions
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-03-23 14:55:05 +00:00
defnax
9652da42b4 fixed declarations and actions
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@404 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-03-23 02:21:17 +00:00
defnax
351559becd fixed resize size of MessagesDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@403 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-03-23 01:13:09 +00:00
defnax
22aff3aa60 added send button and a avatar frame
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@396 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-03-21 17:30:15 +00:00
drbob
215e3386f2 Fixed up GUI side of retroshare messages.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-02-04 17:55:59 +00:00
drbob
935745a08e Created V0.3.x branch and moved the head into the trunk directory.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@246 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2007-11-15 03:18:48 +00:00