Andrew Meadows
2ea10428c8
properly wrap XMPP stuff with "#ifdef HAVE_XMPP"
2014-05-06 09:34:44 -07:00
Stojce Slavkovski
0b03421046
trivial commit - trigger build
2014-05-06 08:37:49 +02:00
Stojce Slavkovski
14fee3b727
trivial commit - trigger build
2014-05-06 08:27:46 +02:00
Stojce Slavkovski
56e7900aa6
Merge fix
2014-05-05 21:36:05 +02:00
Stojce Slavkovski
37664d3877
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-05-04 18:32:01 +02:00
Stojce Slavkovski
4d8e1b5bd4
repled audio files
2014-05-02 23:52:12 +02:00
Stephen Birarda
4936fb3857
expose access token from AccountManager
2014-05-02 10:34:29 -07:00
Stojce Slavkovski
785c9a3024
improved mention positioning
...
removed achive manager
2014-04-30 00:25:27 +02:00
Stojce Slavkovski
029e20edda
Added XMPP archive manager
2014-04-29 20:40:12 +02:00
Stojce Slavkovski
963ad64d07
Fixed online user presence in chat window
2014-04-28 23:49:59 +02:00
Stojce Slavkovski
5c7fb3eca5
Add chat mention notifications
2014-04-26 22:19:33 +02:00
Stojce Slavkovski
91d7bd252d
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-04-26 08:03:52 +02:00
Stojce Slavkovski
b02883f84d
add limits to QXmppArchiveManager
2014-04-24 22:47:42 +02:00
Stojce Slavkovski
c968a4bdb6
set QXmppArchiveManager limits
2014-04-24 22:45:25 +02:00
Stojce Slavkovski
2c35fe433d
Try to load past messages with QXmppArchiveManager
2014-04-24 22:44:52 +02:00
Ryan Huffman
1774f6c9bd
Add threshold to auto scroll
2014-04-23 15:37:28 -07:00
Ryan Huffman
5fd585aab1
Fix error with cursor format getting reset when sending chat message
2014-04-23 12:26:59 -07:00
Ryan Huffman
9bea70ac54
Revert "Add emoticons to chat"
...
This reverts commit 3c9b6264a8
2014-04-23 10:49:22 -07:00
Ryan Huffman
3c9b6264a8
Add emoticons to chat
2014-04-17 19:51:25 -07:00
Ryan Huffman
6437f76ed2
Update username/location match in chat to be more lenient
2014-04-17 15:50:40 -07:00
Ryan Huffman
4f236c6bf4
Add hifi link handling in chat for usernames and locations
2014-04-17 15:20:12 -07:00
Ryan Huffman
795ddbc7bf
Update ChatMessageArea to open urls via Menu::openUrl
2014-04-17 15:19:13 -07:00
Ryan Huffman
e2954f8614
Fix color and size of font in timestamp chat messages
2014-04-17 13:49:10 -07:00
Ryan Huffman
48a7561644
Fix chat messages not being html escaped
2014-04-17 13:38:13 -07:00
Ryan Huffman
7a25d0661f
Update style of chat messages
2014-04-17 13:20:00 -07:00
Ryan Huffman
c1fa6b41e4
Update chat window to use vertical layout
2014-04-17 13:19:36 -07:00
Ryan Huffman
23d68d538c
Fix bug where multiple user/location popups appear
2014-04-16 14:05:38 -07:00
Ryan Huffman
e8b6b7ab4d
Update style of chat message links
2014-04-16 13:22:22 -07:00
Ryan Huffman
bfb879d3e6
Update chat textbox to use correct line height
2014-04-16 10:03:22 -07:00
Ryan Huffman
8aee81ae7c
Update username in chat to use correct line height
2014-04-16 10:02:54 -07:00
Ryan Huffman
cb1408d26d
Update chat window to use new Frameless Dialog
...
The new dialog class needed to be updated to handle windows in different
positions and windows that don't delete on close.
2014-04-16 10:01:35 -07:00
Ryan Huffman
4afea2d228
Remove chat window docking
2014-04-16 09:55:12 -07:00
Ryan Huffman
06235decae
Move ChatWindow isAtBottom and moveToBottom outside of HAVE_QXMPP
2014-04-14 14:10:12 -07:00
Ryan Huffman
4ae148ff19
Update chat window to not allow movement while docked
2014-04-14 11:34:35 -07:00
Ryan Huffman
aaddecd024
Merge remote-tracking branch 'upstream/master' into 19554
...
Conflicts:
interface/resources/resources.qrc
interface/ui/chatWindow.ui
2014-04-14 11:20:49 -07:00
Ryan Huffman
2c10b55858
Remove extraneous debug messages
2014-04-12 01:09:29 -07:00
Ryan Huffman
45402336ac
Add chat window dragging
...
This was originally implemented by Mohammed Nafees, shared on Basecamp.
I've noticed an issue with dragging across screens (monitors) where the
chat window will jump vertically. I've tried debugging it, and
ultimately it looks like an issue with the `move` method. The
coordinates are valid (I tried using global coordinates as well), and
the amount to move is correct, but when moving to coordinates on a
different screen it doesn't do the right thing.
2014-04-12 00:25:58 -07:00
Ryan Huffman
13cf0c80e6
Fix chat message formatting and word wrapping
...
By switching from a QLabel to a QTextBrowser widget more formatting
options and word wrapping that breaks words is possible. It comes with
an issue I have been unable to resolve
* Selecting text and going down with the cursor will cause it to
scroll. It's possible to increase padding to remove this behavior,
but it doesn't look great.
2014-04-12 00:20:43 -07:00
Thijs Wenker
f0463a5679
Fixed docking of ChatWindow
...
Temporary Pin Icon, replace with a nice looking one please
2014-04-11 00:45:38 +02:00
Ryan Huffman
16a2367b29
Update chat window to only scroll when at the bottom
...
It can be frustrating when scrolling up to read a message to have the
window forcibly scrolled to the bottom when a new message appears.
2014-04-10 12:34:45 -07:00
Ryan Huffman
37f9f47488
Fix odd resizing of chat messages
...
When calling updateGeometry on the message labels the layout system
seems to resize the widgets in weird ways. There may be a different way
to keep it from doing this.
2014-04-10 12:09:06 -07:00
Ryan Huffman
ff3ebd1eda
Fix centering of timestamp in chat window
2014-04-10 12:04:30 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
Andrzej Kapolka
df4fd9df5f
Remove translations for now, but use correct translation keys for the only
...
translations we had (days/weeks/etc.)
2014-04-03 11:30:06 -07:00
Dimitar Dobrev
716858e6f6
Informed users who want to chat they have to log in first.
2014-04-03 20:09:54 +03:00
Dimitar Dobrev
f9cee2ccfa
Fixed a typo that resulted in a wrong padding of a widget.
2014-03-28 22:21:55 +02:00
Dimitar Dobrev
6fd1bf7edb
Simplified the new goToUser function.
2014-03-28 18:44:06 +02:00
Dimitar Dobrev
4374e28e9c
Changed the highlighting of own messages to occupy the whole row.
2014-03-28 18:36:53 +02:00
Dimitar Dobrev
e27f191413
Changed the dock widget for the chat so that it replicates the agreed
...
upon design.
2014-03-28 18:36:53 +02:00
Dimitar Dobrev
5073439007
Highlighted the user's own chat messages.
2014-03-28 18:36:53 +02:00
