Commit graph

192 commits

Author SHA1 Message Date
stojce
8d45a53af9 Merge branch 'master' of https://github.com/worklist/hifi into 19507
Conflicts:
	interface/interface_en.ts
2014-04-09 19:53:48 +02:00
Mohammed Nafees
136b91feb5 Align the buttons text properly 2014-04-05 01:32:21 +05:30
Mohammed Nafees
7b5c733d9e Fixed spacing of number and script name in recently loaded list. 2014-04-05 01:10:02 +05:30
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
Mohammed Nafees
eae95a57b7 UI alignment changes 2014-04-04 23:12:56 +05:30
Mohammed Nafees
1ecdec7a5e Minor changes. Added a sweet tooltip :) 2014-04-04 19:52:37 +05:30
Mohammed Nafees
f3121e1bf6 Removed the animation, placed UI elements according to mockup 2014-04-03 22:33:45 +05:30
Mohammed Nafees
e5d9812742 Major changes to the running scripts widget 2014-04-03 13:21:27 +05:30
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
Mohammed Nafees
d85d4fea5d Added the new Running Scripts widget 2014-04-02 12:46:57 +05:30
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
9f05d71796 fixed QTextEdit border color 2014-03-26 21:30:02 +01:00
stojce
b223d10e70 Layout fixes 2014-03-26 21:24:18 +01:00
stojce
e5a66ddb90 New layout behaviour 2014-03-25 21:56:20 +01:00
stojce
63a29cad0a layout fixes 2014-03-24 20:39:13 +01:00
stojce
0a0515b652 layout / font changes 2014-03-24 20:35:28 +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
e2eb34b6c9 Layout setup
image ratio fixed
image centre position
2014-03-23 07:03:20 +01:00
stojce
6520a76f0c Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-03-21 22:53:20 +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
af8f93830a Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-03-13 18:50:14 +01: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
5f73b76be7 Share dialog 2014-03-02 14:36:01 +01: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