73 commits

Author	SHA1	Message	Date
Bradley Austin Davis	ec615caa80	Support toolbar API	2016-06-17 13:06:42 -07:00
Brad Davis	0565d3aea1	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-08 14:59:58 -07:00
David Rowe	a87483dfff	Fix colors of buttons in Asset Browser dialog	2016-06-08 10:55:14 +12:00
Brad Davis	8c13ff4ee1	Pinned UI support	2016-06-02 17:24:25 -07:00
Brad Hefta-Gaub	4ab7b660d4	fix a bunch of bugs in qml window placement	2016-04-25 20:19:54 -07:00
David Rowe	43f843f731	Retrofit updated margins and spacing to QML dialogs	2016-04-13 16:39:52 +12:00
Seth Alves	5fa9f662fc	Merge pull request #7542 from birarda/refresh-on-asset-connect ... refresh/close the asset browser dialog on domain switch	2016-04-01 18:08:59 -07:00
Stephen Birarda	194226103c	refresh the Asset Browser when switching domains	2016-04-01 11:13:59 -07:00
David Rowe	13ab854a9d	Reduce space between collapsed sections ... In settings dialogs as well as entities editor.	2016-03-31 15:02:16 +13:00
Atlante45	03efde5b3c	Change text in case of drag and drop.	2016-03-15 13:53:13 -07:00
Atlante45	4a90ec303c	Fix drag&drop	2016-03-15 11:22:42 -07:00
Clément Brisset	17e5b441cf	Merge pull request #111 from huffman/atp-manager-name ... Add atp filename to entities added to world	2016-03-15 10:19:53 -07:00
Ryan Huffman	1b81b4f01b	Merge branch 'atp' of github.com:birarda/hifi into atp-upload	2016-03-15 10:19:20 -07:00
Atlante45	07d2213628	Remove debug	2016-03-15 09:14:22 -07:00
Atlante45	9b8b1d41e3	Edit in place	2016-03-15 09:14:22 -07:00
Ryan Huffman	7823882aa1	Add atp filename to entities added to world	2016-03-14 16:13:33 -07:00
Ryan Huffman	4b6dd4636f	Merge branch 'atp' of github.com:birarda/hifi into atp-upload	2016-03-13 21:32:25 -07:00
Ryan Huffman	960047f412	Remove right click selection	2016-03-13 21:06:52 -07:00
Ryan Huffman	6c27bd9eb2	Update upload flow and make asset list dynamically sized	2016-03-13 21:04:07 -07:00
Stephen Birarda	188712a55b	select a right-clicked item in asset browser	2016-03-11 15:45:57 -08:00
Stephen Birarda	31f0e4a919	disable the rename and delete buttons if nothing selected	2016-03-11 15:45:57 -08:00
Stephen Birarda	6d6a53a69a	use timer for upload click handle to avoid focus issue	2016-03-11 15:45:57 -08:00
Stephen Birarda	e51aedeb35	fix error handling for diff request types	2016-03-11 11:36:52 -08:00
Stephen Birarda	7ccba8b406	remove debug for selected index crash	2016-03-10 18:36:12 -08:00
Stephen Birarda	7675c83f92	clear selection on reload	2016-03-10 18:34:28 -08:00
Stephen Birarda	8e2b06a8e5	use an explicit selection model for treeview	2016-03-10 18:32:18 -08:00
Stephen Birarda	39e869fdfd	append a trailing slash for folder rename	2016-03-10 17:54:38 -08:00
Stephen Birarda	625032f748	fix for add to world after upload name change	2016-03-10 17:10:49 -08:00
Stephen Birarda	52ee2499fc	add trim prior to rename in AssetServer	2016-03-10 16:57:39 -08:00
Stephen Birarda	ed4df72eed	cleanup logging for asset browser	2016-03-10 16:57:39 -08:00
Atlante45	4a9d88d213	CR	2016-03-10 16:55:51 -08:00
Atlante45	16287b7040	Disable add to world for uncompatible files	2016-03-10 16:44:39 -08:00
Atlante45	35f5ebb938	Don't allow folder overwrite	2016-03-10 16:44:39 -08:00
Stephen Birarda	2fb478ff3c	Merge pull request #99 from huffman/atp-more ... Atp more	2016-03-10 16:22:05 -08:00
Ryan Huffman	2d4864ed33	Merge branch 'atp' of github.com:birarda/hifi into atp-more	2016-03-10 15:40:07 -08:00
Ryan Huffman	76ed16314a	Add prepended slash on rename if missing	2016-03-10 15:38:20 -08:00
Stephen Birarda	e29565a717	don't default to yes when prompted for overwrite	2016-03-10 15:32:12 -08:00
Atlante45	a6ccfb1685	CR	2016-03-10 15:11:39 -08:00
Atlante45	63571a7c36	Make sure Upload is not clicked several times	2016-03-10 14:59:20 -08:00
Atlante45	548d826a4e	Couple bug fixes	2016-03-10 14:59:20 -08:00
Atlante45	7d7a683b18	Add uploadFile method that prompts the user	2016-03-10 14:59:20 -08:00
Stephen Birarda	7f0917ea00	add to world in front of MyAvatar	2016-03-10 14:49:07 -08:00
Stephen Birarda	e227f68353	tweak wording for overwrite dialog	2016-03-10 14:49:07 -08:00
Stephen Birarda	5167cf69b2	fix for add to world and delete dialog	2016-03-10 14:49:07 -08:00
Stephen Birarda	c65b5b63f0	better error handling for asset browser	2016-03-10 14:48:44 -08:00
Stephen Birarda	8cc0ae3148	menu and naming changes for asset server directory	2016-03-10 14:48:44 -08:00
Ryan Huffman	c93ba2752b	Remove rowDelegate styling for asset window	2016-03-10 14:44:53 -08:00
Ryan Huffman	e4b5c14a4c	Merge branch 'atp' of github.com:birarda/hifi into atp-more	2016-03-10 14:20:22 -08:00
Ryan Huffman	ef8c66c1be	Remove commented out code	2016-03-10 14:18:09 -08:00
Ryan Huffman	71bc937533	Remove copy URL button	2016-03-10 13:56:54 -08:00