Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 18:12:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11871 commits 73 branches 59 tags 1.2 GiB
Commit graph

34 commits

Author SHA1 Message Date
Ryan Huffman
4afea2d228 Remove chat window docking 2014-04-16 09:55:12 -07:00
Ryan Huffman
f698f3375a Update resource urls for chat window close button 2014-04-14 11:34:27 -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
Atlante45
c39434f4e3 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources 
Conflicts:
	interface/resources/resources.qrc
 2014-04-11 12:08:17 -07:00
Atlante45
100c3f8da4 Modify UIs that were using the qrc 2014-04-11 11:59:23 -07:00
Philip Rosedale
8ccc0a2081 Merge pull request #2650 from thoys/chatwindow-docking-feature 
Fixed docking of ChatWindow
 2014-04-11 07:21:53 -07:00
Stojce Slavkovski
3af3b29588 removed dependency on QT resource 2014-04-11 00:54:54 +02: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
de475ee46c Update behavior of chat window close button 
Use a stylesheet to suppress highlighting of the background when
pressing the button down.  Instead, it will change the image.

Unfortunately I wasn't able to find a way to do this without requiring
an extra image, or by doing it through the icon system.  The different
icon states didn't seem to take effect for button presses, and using
opacity in the stylesheet doesn't work yet for `QPushButton`s.
 2014-04-10 12:19:27 -07:00
stojce
8dc6ca75a4 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
	interface/resources/resources.qrc
	interface/src/Menu.cpp
 2014-04-04 21:16:29 +02:00
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
Dimitar Dobrev
3907c563df Put the chat window above the 3D view and animated its showing. 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
d764ef79ed Gave more space to the user in sent messages so that resizing of the 
column for messages occurs for really long user names.
 2014-03-28 18:36:53 +02:00
stojce
8b6db350da Switched to QDockWidget 2014-03-27 21:50:41 +01:00
stojce
32502d7b0d layout improvements 2014-03-23 16:20:29 +01:00
stojce
7c36c4a2b7 Layout fixes 2014-03-23 13:20:24 +01:00
stojce
9077a05f9d - Layout fix 
- Model browsers
- merge
 2014-03-21 22:34:10 +01:00
stojce
913783c0f1 resizing 
- fixed layout
 2014-03-16 22:47:03 +01:00
stojce
6d15fb548c Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
 2014-03-14 21:05:30 +01:00
Dimitar Dobrev
85a15a2284 Moved the chat from a window to a built-in panel. 2014-03-14 01:12:25 +02:00
Dimitar Dobrev
881ecb07cd Changed the font of the entire chat window to Helvetica/Arial. 2014-03-14 01:07:21 +02:00
stojce
939c17d0be Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/src/Menu.h
 2014-03-13 18:41:58 +01:00
Dimitar Dobrev
442ca145da Hid the chat window rather than close it in order to preserve sent 
messages.
 2014-03-13 14:07:21 +02:00
Dimitar Dobrev
727903b216 Changed the chat window to a popup with a custom closing button. 2014-03-13 04:07:33 +02:00
Dimitar Dobrev
6d4d61c38a Removed the double border between the sent messages and the entry. 2014-03-13 01:06:11 +02:00
Dimitar Dobrev
d67381d85e Changed the font used in the chat to Helvetica, with Arial as a 
fallback.
 2014-03-12 23:45:10 +02:00
Dimitar Dobrev
acb4047b54 Increased the right margin of sent messages for better visibility. 2014-03-12 17:33:25 +02:00
Dimitar Dobrev
ed90e45c96 Ensured messages are always aligned at the top to user names, and users 
onine are deleted.
 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
9eb217794c Added time stamps to the chat. Enabled translations. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
437cadf360 Added a basic version of the chat window. 2014-03-12 01:24:30 +02:00
stojce
1e2cd0c1a2 UI changes 2014-02-25 20:36:14 +01:00
stojce
ec73edb8d8 restyled preferences dialog 
- Frameless dialog super class
 2014-02-23 13:54:22 +01:00
Stephen Birarda
d2e02c15d8 repair the UpdateDialog so it is a QDialog with no child QWidget 2014-01-22 14:17:56 -08:00