Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-16 11:24:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
953 Commits 63 Branches 22 Tags 195 MiB
02fc02d23c
Commit Graph

53 Commits

Author SHA1 Message Date
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
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
beardog_uk
32c12542dc feature: since now smilie widget will appear near smile button (as it usually is in all messengers). Both in group and private chats 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1073 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-03-12 17:57:30 +00:00
csoler
56b3370cd1 added a forgotten time(NULL) in notifyqt.cpp 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1061 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-03-01 15:18:34 +00:00
defnax
171a5bef0d * set Qt::IgnoreAspectRatio for pictures 
* added for MessengerWindow the new getAvatar and updateAvatar function


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@961 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-01-30 23:51:59 +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
csoler
b6019d193b Fixed directory problem wirh emoticons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@950 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-01-25 19:05:53 +00:00
defnax
30b6e6c423 added if defined for Windows use emoticons from extern 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@948 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-01-25 18:25:36 +00:00
csoler
2682400bbe qrc compilance for emoticons. Final move ;-) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@947 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-01-25 14:32:44 +00:00
csoler
71b9391c20 Put emoticon images and .acs file into qrc image file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@945 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-01-25 14:00:45 +00:00
defnax
f9dcdec18f * changend from toPlainText to toHtml 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@927 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-01-11 11:42:31 +00:00
defnax
e6367a2947 * removed frame 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@921 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-01-08 18:28:18 +00:00
defnax
e3775fceda * enabled again Chat Style, seems under linux now stable 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@917 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-01-06 23:11:56 +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
b1f727d080 * added a QFrame for the Background of the PushButtons in ChatWindow 
* some updates for stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-10-23 23:37:15 +00:00
defnax
f02d66b752 update/Change icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@656 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-07-31 15:29:14 +00:00
drbob
67a27744f8 * Cleaned up more debug output. 
* Fixed Popup Chats with new Peer Dialog.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@645 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-07-10 18:52:56 +00:00
drbob
8103b0c372 Restored 'Peer Offline' notification to Chat Window. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-06-07 17:52:53 +00:00
drbob
22bfc3e821 Final Changes for V0.4.08a release: 
* Updated Version numbers.
 * Added chat styles to installer.
 * Fixed .at() call on map -> doesn't work on windows/MacOSX.
 * Tweaked default font back to 10 for chat.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@564 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-05-24 23:11:37 +00:00
ewensun
807472f427 enable new popupchat style. Default style will be provided if no style file exist. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-05-17 17:40:22 +00:00
drbob
aa393dcc72 disbled new popupchat style stuff - until it works without style files. 
removed release flag from mainwindow.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@507 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-04-16 12:35:01 +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
a8386b454c fixed windowtile of smileyWidget 
enabled formating feature to groupchat


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-04-03 21:32:45 +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
852e7cd04f removed old Chat Window experiments 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@455 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-03-31 21:56:23 +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
c633819aab fixed myavatar label to not go to top 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-03-30 18:21:37 +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
e69da57ec9 Added for Timestamp own color 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@431 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-03-28 14:53:33 +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
7c10e395b6 fixed some layout of the Avatar frame an the layout of the Chat Dialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@402 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-03-22 19:11:32 +00:00
defnax
562aa4f34d fixed Chatdialog windowtitle 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-03-22 15:01:51 +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
defnax
08bdd8f567 fixed some not need things for Chatting which does destroy the Chat format when Chatting, removed lastname and not needed lines which makes chatting bad 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@395 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2008-03-21 14:56:41 +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