Commit Graph

2892 Commits

Author SHA1 Message Date
thunder2
1fc5347fd4 Show current state after the name and location in MessengerWindow.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-11 18:08:38 +00:00
thunder2
1c2db7eb9b Added missing return to p3turtle::loadList.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3467 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-11 11:11:58 +00:00
thunder2
061cb2a6a8 Fixed saving new message to draft.
When you write a new message and save it to draft more than once, a new message in draft is created everytime you save.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-11 10:39:40 +00:00
thunder2
d85ec3acf2 Fixed fill of the items in PeersDialog
- First fill is made again by showEvent and not from the timer. I overloaded showEvent in one of my last commit and forgot to call the base class.
- Add the items directly after the "new" to the tree, because for "setHidden" the item must be added.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3465 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-10 20:43:11 +00:00
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
7c126f24ba Add define WINDOWS_SYS for windows compile in RetroShare.pro.
Now the idle functions for windows are used.
Removed unused file idle_mac.cpp.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-09 11:09:40 +00:00
defnax
87d2cec44c Added Cancel Buttons for Chat and Peer feed Items, and disable the Send Buttons by default, added for PeerItem to check if TextEdit is empty or not too.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3462 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-08 22:46:26 +00:00
thunder2
a66816ff33 Changed the display of the location in the gpg item in MessengerWindow to the state string - Online, Away, Busy, Idle
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3461 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-08 22:32:11 +00:00
thunder2
cb1bee3318 Enable/disable the send button for quick message in the ChatMsgItem with textChanged signal of the QTextBrowser and not with updateItem.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-08 19:04:24 +00:00
defnax
2fa6afd36d Added for PeerItem too "Quick Message"
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3459 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-08 18:46:30 +00:00
thunder2
196e9cbf2d PeersDialog:
- Show the highest state of the ssl item in the gpg item.

MessengerWindow:
- Show the location and the custom state string in the gpg item of the ssl item with the highest state and existing custom state string.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3458 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-08 18:36:36 +00:00
defnax
3ffbcb5569 Added "Write a Quick Message" functionality to answer faster from the ChatMsgItem.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3457 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-08 16:27:13 +00:00
thunder2
20887fc93b Changed the path for additional styles to "stylesheets" for Linux in "~/.retroshare" (untested), for Windows in "%APPDATA%\RetroShare" and for the portable version in the appdir.
Added variants for styles. Variants are files in the subdir "variants" of the style with the extension .css. The file <variant>.css and main.css are matched together.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3456 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-07 23:19:27 +00:00
thunder2
f254a7ae24 Changed the icon of the PopupChatDialog when the friend is typing.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3455 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-07 17:35:08 +00:00
thunder2
948a583465 Remove compiler warning and commit missing file.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-07 16:08:39 +00:00
thunder2
6bd6c50502 Styles for public chat, private chat and history.
RetroShare has a standard style for each type, but the user can define their own styles.
The external directories "style/public", "style/private" and "style/history" are scanned for subdirs with user defined style informations.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3453 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-07 15:49:31 +00:00
defnax
452faffa4b Added a pixmap Label for display the typing icon for Private Chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3452 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-06 20:54:48 +00:00
defnax
a3fc110a82 forget this to commit
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3451 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-06 19:32:44 +00:00
defnax
a88140824f removed the "[]" from timestamp thats not needed on private chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3450 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-06 18:05:37 +00:00
defnax
a0c120662a improved the History Browser layout design
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3449 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-06 17:20:22 +00:00
thunder2
4753e540ba Fixed close of RetroShare when closing MessengerWindow.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3448 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-05 22:15:50 +00:00
thunder2
bacf1f5a80 Added remove, copy to clipboard and resend of messages in History Browser.
Clear history in PeersDialog don't remove messages from the History Keeper.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3447 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-05 20:50:34 +00:00
thunder2
c63905fefc Show date in chat messages and small style changes.
Save and restore window position of the Historiy Browser.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3446 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-05 10:32:32 +00:00
defnax
e635e5a026 fixed close buttonbox
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3445 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-05 01:21:44 +00:00
thunder2
2011d897ee These damn new files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3444 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-05 00:14:42 +00:00
thunder2
1f8017d06a Redesigned history browser of group chat.
New chat style for history browser.

There's more to come.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3443 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-04 23:59:08 +00:00
thunder2
b067ab5560 Forgot these files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-04 14:36:49 +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
csoler
73f3fa3223 suppressed some warnings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3440 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-03 19:23:49 +00:00
csoler
180f833df3 added a tab to display the certificate of friends, in peer details
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3439 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-03 19:23:24 +00:00
defnax
1d957f3674 renaming Persons to Friends
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-03 17:04:27 +00:00
defnax
bfb7d4d908 forget the translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3437 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-03 16:57:53 +00:00
defnax
1bcaeebdaa enabled to display the Avatar Frame by default, and optimized the labels
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3436 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-03 16:46:47 +00:00
defnax
f1ae5766dd update German translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3435 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-03 15:36:28 +00:00
defnax
ccedb323df update icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3434 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-03 13:09:49 +00:00
defnax
27c94be8fd improving the Private Chat layout, fixes for plastique/cleanlooks design to hide the frame borders.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3433 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-02 19:53:31 +00:00
csoler
b3f27e13db corrected compilation bug
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3432 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-02 18:58:10 +00:00
defnax
a26547effb Added to display for Attached Audio,Video and Archive files a default icon in Private Chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3431 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-02 17:26:29 +00:00
defnax
92f5d37712 update strings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3430 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-02 15:06:27 +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
thunder2
80764a1ff7 Fixed display of status icon in PeersDialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3428 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-02 08:25:30 +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
defnax
d5ea522eb0 set correct Avatar size for the Label.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-01 21:57:05 +00:00
defnax
c8de865e1a Redesign the Message Item feed
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3425 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-01 21:54:07 +00:00
chrisparker126
ea810034c9 added USE_CMD_ARGS to enable cmd console args in rsinit
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3424 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-01 21:10:55 +00:00
chrisparker126
fd76e2ec4b checked in fix to cmd console rsinit.cc, pls test and get back to me
use USE_CMD_ARGS define in windows which enables use of cmd 
line console args 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3423 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-01 21:08:08 +00:00
thunder2
e67412cc8c New setting for adding the feeds at the end in friend storm.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3422 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-01 20:54:24 +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
defnax
7dd99a0c35 Added a History Browser for GroupChat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3420 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-01 14:15:50 +00:00
thunder2
af4667232b Don't add a ChatMsgItem as feed on own public chat message.
Moved the handling of the avatar from PeerItem::updateItem and ChatMsgItem::updateItem called with QTimer to connect to the signal peerHasNewAvatar.
Fixed compiler warning.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3419 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-31 22:42:40 +00:00