15 commits

Author	SHA1	Message	Date
Ryan Huffman	606a48d555	Fix issue with pref dialog disappearing ... With the frameless dialog being updated to support different types of window, the pref dialog was no longer able to rely on it to keep itself open in certain cases. The window flags were also updated to update after a "browse" call rather than in the slot so that it would still execute in the case of cancelled selection.	2014-04-17 09:36:17 -07:00
Ryan Huffman	2de9848a37	Merge remote-tracking branch 'upstream/master' into 19554-2	2014-04-16 14:42:20 -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
Stojce Slavkovski	1a3e6595c5	Allow users to set the destination of Snapshots	2014-04-15 19:36:02 +02:00
Andrew Meadows	5ac7be8945	merge upstream/master -> andrew/inertia	2014-04-11 12:20:00 -07:00
stojce	9ab61faacb	additional CR fixes	2014-04-09 22:32:15 +02:00
stojce	a1c6843bd4	CR Fixes	2014-04-09 22:14:35 +02:00
stojce	dd5a198740	Models browser fixes	2014-04-06 16:13:15 +02: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
stojce	32502d7b0d	layout improvements	2014-03-23 16:20:29 +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	6383457e4e	styling ... bad merge fix	2014-02-26 22:15:12 +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