156 Commits

Author SHA1 Message Date
thunder2
ad6b10272b Added setting for the count of messages to load from the history for group and private chat
Restore the last active page in MainWindow on startup
Removed not needed methods RshareSettings::getChatAvatar and RshareSettings::setChatAvatar


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3747 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-11-04 11:14:47 +00:00
thunder2
8852ca3c79 Fixed display of the correct name in private Chat for offline chat messages.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-31 21:53:41 +00:00
defnax
1f6225f778 corrected wrong object name
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3656 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-08 16:41:20 +00:00
defnax
e2a5cff5ee forget to commit this, set own object name for statusbar in Private Chat, needed for stylesheets
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3655 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-08 16:36:32 +00:00
thunder2
0e063f9a1b Fixed font handling in PeersDialog.
Fixed Qt bug in PeersDialog and PopupChatDialog with a workaround.
- QTextEdit::clear() does not reset the CharFormat if document contains hyperlinks that have been accessed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-08 00:07:44 +00:00
defnax
2dbb37854f removed the default private chat styles, moved to the default qss file.
renamed some object names.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3643 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-07 20:16:16 +00:00
defnax
a0b7bb29e4 changed the object name of the Chat ToolBar,
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3636 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-07 16:05:59 +00:00
thunder2
cfa10c6f80 Added receive time to ChatInfo - recompile of gui needed.
Use receive time for chat information to have the right order in the history (problem of time zones and wrong clocks).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3593 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-03 10:08:58 +00:00
thunder2
7664a82fd6 Reworked design of offline chat messages in PopupChatDialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3592 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-10-02 22:42:30 +00:00
thunder2
de16f6c72d New class for working with peer names (rsid, name + location, ...) - PeerDefs.
Show the location in brackets - "name (location)" (defined now in PeerDefs).
Renamed head of context menu in PeersDialog for ssl items.
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3553 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-28 20:33:34 +00:00
thunder2
627b0ca54a Reworked MessageComposer
- Added To, Cc, Bcc and Recommend friends
- Added group support
- Show state of the friends in real time
- Save state of the window in profile
- Translated into german

Added "Message group" to PeersDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3541 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-27 21:05:52 +00:00
csoler
b0f0e4c380 Added sources to RS link download (now works for copy links from browsable only files). Removed unused optional list of sources from RetroShareLink::process()
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3539 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-24 21:01:13 +00:00
defnax
f84b6ff501 corrected the Offline info text for PopupChatDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3521 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-21 20:05:27 +00:00
thunder2
37fe5ff3a3 Save incoming not read private chat messages in config and delete it after reading.
Added queue for outgoing private offline chat messages. The queue is also saved until the private chat message could be delivered.
It does not work in the short time between the shutdown of the peer and the switch of the state to offline for that peer. For this we need a response of the peer.
Need recompile.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3517 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-21 00:08:06 +00:00
thunder2
5277ca61e2 Some more changes for utf8 in Windows.
Changes in RetroShareLink and drag'n'drop of files.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3511 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-17 21:54:25 +00:00
thunder2
a719cbce7b Removed date from incoming and outgoing chat style.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3507 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-16 12:48:43 +00:00
thunder2
8348e2a556 Fixed endless loop at startup of RetroShare, with a wrong definition of a smiley string in emotes.acs.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3498 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-15 14:32:09 +00:00
thunder2
0b63a4be86 New class for the work with emoticons - Emoticons
Redesigned emoticons window
- flat buttons
- 9 icons in a row
- moved the window to the direction of the input object

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3487 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-14 17:47:11 +00:00
thunder2
690194d38f Cleaned PopupChatDialog, NetworkDialog, SearchDialog, TransfersDialog, SharedFilesDialog, ChannelFeeds and updated german translation.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-13 00:27:50 +00:00
thunder2
1e3a1d7ddb Rework some translations.
Removed the translation of gui elements, that does not need to be translated.
Especially in feed items.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3475 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-12 20:27:03 +00:00
thunder2
60746b5702 New class "StatusDefs" for status information like strings, images, fonts and colors.
Removed the status string function from the lib.
Removed static strings like " - " and " : " from translation.
Removed not needed images.
Fixed german translation in MessengerWindow, PeersDialog and PopupChatDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-09-12 14:10:28 +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
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
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
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
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
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
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
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
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
b6b5fa5cd6 Changed the chat service from a timer tick from the gui to a service tick.
Created a new notifier for new chat available - NOTIFY_LIST_CHAT. Removed the QTimer in PeersDialog and connect the signal.
Created news feed for public chat (prework of defnax, need still some gui changes)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3413 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-31 17:13:52 +00:00
defnax
3d2d347032 Added to change own Avatar Background too for Private Chat when own status has changed.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-30 21:41:19 +00:00
thunder2
d9744ea979 Extend the status service to notify on own status change.
Prepared PopupChatDialog for receive this notify event.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3410 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-30 20:14:58 +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
7b20984574 added a new no avatar background picture for privat Chat.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-30 16:06:06 +00:00
defnax
4d9eaac22d changed Avatar pixel size, and added for Privat Chat's Avatar background new images.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3405 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-30 15:43:07 +00:00
defnax
a0e426a527 Added a Status Label for typing..., to display on top of the textedit and not more on statusbar.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-28 14:59:49 +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
defnax
2e92496aab changed the infolabel's layout margins
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3392 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-24 14:43:52 +00:00
defnax
57bd81f5b6 corrected info string
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3390 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-24 14:32:40 +00:00
defnax
64c9dcba0d changed status infolabel's text informations
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3388 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-24 14:04:06 +00:00
defnax
da2a2821c3 Added more infos to display on infolabel when Friend's status has changed.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3387 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-24 13:27:31 +00:00
defnax
db41ffd764 removed the unused variable
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3386 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-23 20:41:31 +00:00
defnax
a4a63fb004 added info logo and changed the background stylesheet for the infolabel.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3385 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-23 20:39:07 +00:00
defnax
7470c72042 Added a info Frame when friend is offline for Private Chat.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3384 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-23 19:09:16 +00:00