Commit Graph

37 Commits

Author SHA1 Message Date
csoler
0c1e6301b3 merged with latest upstream trunk 2015-12-05 16:49:00 -05:00
csoler
39f4878244 incorporated changed from defnax 2015-12-04 22:42:56 -05:00
Phenom
3f155b9b75 Add minimum font size in chat. 2015-09-13 17:35:19 +02:00
csoler
e40460bdcc new notify capability of chat lobbies: message counting, nickname occurrence counting and specific text counting. Also sorts out notify tab in Settings (Patch from Phenom, slightly modified: gui layout/text + added a flag to enable/disable user defined text grep)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-03-26 22:17:48 +00:00
csoler
f9c78ebd61 merged in new lobbies with GXS ids. Old peers and new peers cannot see each others lobby lists. Invitations still work and can be used to transfer a lobby ID between versions. Messages of old and new peers will not be visible to each other
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-03-06 21:13:23 +00:00
thunder2
4bb15cd211 Added patch from Henry
- Changed string for translation
- Fixed utf8 issue in ServicePermissionsPage
Updated english translation


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-12-22 21:54:49 +00:00
thunder2
a3b844da6b Fixed some typos (patch from Henry)
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-12-17 18:02:52 +00:00
thunder2
6c2cc75f2b Set standard style of public/lobby chat to compact colored.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7639 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-10-25 17:09:06 +00:00
defnax
c074d3abc3 Removed Add Friend Button from Friends Dialog
Removed Distant Chat page from Settings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7556 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-09-24 14:58:05 +00:00
defnax
f93d41991e Changed the QFrame of QScrollArea on Settings to noFrame
Added Search and Marker Feature for the Chat Widget, thx to Phenom for the Patch (AddSearchAndMarkerOnChatWidget_v0.6_7377.patch)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7380 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-05-26 21:51:53 +00:00
csoler
b6c68d1812 - started changing distant chat so that it works with GXS ids instead of PGP ids. Something is still broken in
service control. Crypto is not done yet => distant chat is unencrypted.
- changed GUI for distant chat. Removed invitation system.
- added menu item to distant chat GXS ids from IdentityItem (only entry point for now).
- fixed bug in chat lobbies causing re-connexion of lobbies not to happen everytime (bug reported bu Lain)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7378 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-05-25 21:43:05 +00:00
defnax
1d83754385 fixed to show the General tab by default
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-08 14:24:21 +00:00
csoler
4e259fecfd allow max storage duration to be 0, in which case we keep all history
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-29 12:10:59 +00:00
csoler
e21d869006 - added history parameters for chat lobbies
- added max storage time for items in chat history. Avoids filling up the history with chat from volatile peers.
- worked out the layout in config->ChatPage in a more compact design and added help
- set the max size of chat messages to 6000 bytes instead of 2000 which was a bit too low
- default max number of lobby messages saved in each lobby is 20. Avoids flooding for peers who havn't configured it yet.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-27 21:18:44 +00:00
thunder2
e1ee7cca9c Fixed layout of distant chat page in settings.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6445 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-20 18:09:13 +00:00
thunder2
c6e2034b66 - Fixed typo (patch from Henry)
- Updated english translation.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6443 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-19 16:24:07 +00:00
thunder2
cac96b8317 - Added some performance optimizations in FriendSelectionWidget::peerStatusChanged
- Fixed some ui design

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-19 13:18:15 +00:00
csoler
69bf523c7a Enabled distant chat system.
Added system to collect and create chat invites from pgp keys.
Finished the GUI (some layouts need fixing, especially the link creation window).
Still needed: QoS on generic turtle data items. Will need a new item class for any anyway.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6433 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-16 14:39:44 +00:00
thunder2
af2257b1a9 Added settings for the blinking icons
- private chat window/tab
- chat lobby tab
- all tray notifier

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-27 15:59:12 +00:00
thunder2
03e521c024 Moved settings for private chat from NotifyPage to ChatPage.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5728 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-27 15:51:34 +00:00
defnax
886f84b929 patch from Henry Morgan to correct spelling mistakes in source
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-11 10:28:24 +00:00
thunder2
91710adfac Disabled fix color of chat messages for Qt 4.5 and lower because of missing methods on QColor.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5592 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-24 11:32:11 +00:00
thunder2
28ec721c1b Added patch from Anonymous Coward - readable chat
Added new options to the Chat settings window:
- Enable custom fonts
- Enable custom font size
- Enable bold
- Enable italics
- Minimum text contrast

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-21 21:23:14 +00:00
thunder2
dd42738b3c Moved some internal stylesheets to the file Standard.qss.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5479 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-27 23:38:27 +00:00
thunder2
70cbd3c84d Cleaned some ui files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5457 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-22 13:44:23 +00:00
csoler
cc57ab2462 added load/save of default nickname, plus some debugging
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-26 22:43:54 +00:00
thunder2
29c090fb44 Moved the chat history into the libretroshare.
Now the history is saved encrypted. Please delete all files with "chat*.xml" in your profile folder.
Added new config p3HistoryMgr and interface p3History.
Added new option to limit the count of the saved history items.
Added new simple html optimizer "RsHtml::optimizeHtml" to reduce the size of the html strings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4623 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-09-29 09:20:09 +00:00
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
defnax
5a6456ebf1 added spinbox's for Chat History to settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3746 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-11-04 00:27:29 +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
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
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
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
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
47de2af50c added storing and loading Chat Font
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 12:42:31 +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