71 commits

Author	SHA1	Message	Date
David Rowe	8e56e0bf18	Fix QML warning	2016-08-10 10:41:37 +12:00
Brad Hefta-Gaub	b8d79ec263	Merge pull request #8179 from SamGondelman/snapshotFix3 ... Various snapshot improvements	2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub	bcee128de0	Merge pull request #6959 from Triplelexx/20769 ... CR for Job #20769 - Touchscreen camera input for Interface	2016-07-11 14:24:52 -07:00
SamGondelman	b3513b543c	fixed snapshot path setting	2016-07-05 18:23:59 -07:00
Ryan Downe Karpf	7eb07cba4c	Merge pull request #8171 from jherico/qml_fixes ... Keyboard focus polish for Vive UI	2016-07-01 16:20:36 -07:00
SamGondelman	218b26b521	removed snapshot share dialog, ctrl s shouldn't leave you moving	2016-07-01 10:58:55 -07:00
SamGondelman	69ffd63ba7	fix snapshot sharing window	2016-06-30 15:42:48 -07:00
Brad Davis	167cb72a0e	Don't auto-focus the filter field in running scripts	2016-06-30 15:18:59 -07:00
Triplelexx	fd4d9761ce	merge master and resolve conflicts ... * remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping	2016-06-24 03:34:39 +01:00
Bradley Austin Davis	ec615caa80	Support toolbar API	2016-06-17 13:06:42 -07:00
Brad Davis	472a3540d7	Merge remote-tracking branch 'upstream/master' into vive-ui ... Conflicts: scripts/system/controllers/handControllerGrab.js	2016-06-10 10:43:09 -07:00
David Rowe	5352bd4b76	Fix height of Load Defaults button	2016-06-09 17:15:17 +12:00
Brad Davis	ca6e86e767	Merge remote-tracking branch 'upstream/master' into vive-ui ... Conflicts: interface/resources/qml/hifi/dialogs/RunningScripts.qml	2016-06-07 21:51:47 -07:00
David Rowe	b6af46cac9	Add "Load Defaults" button to Running Scripts dialog ... And rename "Stop All" to "Remove All".	2016-06-07 11:30:07 +12:00
Brad Davis	8c13ff4ee1	Pinned UI support	2016-06-02 17:24:25 -07:00
David Rowe	b6fcb77d6f	Update Running Scripts list to use updated QML table control	2016-05-12 17:16:56 +12:00
Brad Hefta-Gaub	4ab7b660d4	fix a bunch of bugs in qml window placement	2016-04-25 20:19:54 -07:00
Brad Hefta-Gaub	f4e4f217e8	Merge pull request #7642 from ctrlaltdavid/20872 ... Further restyling of edit.js	2016-04-22 13:46:26 -07:00
David Rowe	7b9e6b52fb	Merge branch 'master' into 20872 ... Conflicts: interface/resources/qml/hifi/dialogs/RunningScripts.qml	2016-04-22 13:19:47 +12:00
David Rowe	a7b82e8cae	Decouple ui and shared libraries	2016-04-22 12:58:47 +12:00
David Rowe	266e4c998b	Don't show "Reveal Scripts Folder" link when open Running Scripts in HMD	2016-04-22 12:29:22 +12:00
David Rowe	6c5335cfa7	Replace button with icon and text	2016-04-21 15:17:06 +12:00
David Rowe	9c9bca546c	Add button that opens scripts directory window	2016-04-21 11:52:03 +12:00
David Rowe	43f843f731	Retrofit updated margins and spacing to QML dialogs	2016-04-13 16:39:52 +12:00
David Rowe	4e3cdf6569	Update Running Scripts' search to have rounded ends and a search icon	2016-04-07 12:32:27 +12:00
Triplelexx	11af0a421b	Merge branch 'master' into 20769	2016-04-03 22:57:55 +01: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
David Rowe	51728d14a7	Miscellaneous improvements to Attachments dialog	2016-03-24 21:17:36 +13:00
Stephen Birarda	34fb06a7bd	changes to attachments dialog from contractor	2016-03-23 13:52:47 -07:00
timemarkov	160b4e7ba2	Implement new design of attachment dialog	2016-03-18 12:11:00 +01:00
David Rowe	1eb6fa425c	Fix up Running Scripts dialog	2016-03-03 20:09:50 +13:00
David Rowe	4d53dee29c	Rename section control	2016-03-02 19:46:26 +13:00
David Rowe	e79427bb3b	Make some settings dialogs have collapsible sections	2016-03-02 19:41:50 +13:00
David Rowe	16fbf60bae	Update preferences dialog titles to match menu items	2016-03-02 11:52:58 +13:00
David Rowe	a25702535b	Style snapshots section	2016-02-26 14:01:57 +13:00
David Rowe	d255ad3805	Improve property naming	2016-02-26 10:17:36 +13:00
David Rowe	09029e4edd	Change name of dialog to match menu item	2016-02-25 20:37:54 +13:00
David Rowe	10efbd996f	Update General Settings dialog to use new window frame style	2016-02-25 20:26:36 +13:00
David Rowe	bac703b29e	Adjust height of Running Scripts now that fonts are consistently sized	2016-02-24 12:36:46 +13:00
David Rowe	e30135a89d	Increase height of dialog to avoid scrollbars	2016-02-23 20:05:45 +13:00
David Rowe	54b27f3ac3	Merge branch 'master' into 20805	2016-02-18 23:35:37 +13:00
David Rowe	b68837277c	Fix default focus	2016-02-18 22:12:43 +13:00
David Rowe	d32f743f52	Style running scripts and available scripts tables	2016-02-18 16:35:51 +13:00
David Rowe	b2314d33ba	Style and lay out text fields	2016-02-17 20:44:09 +13:00
David Rowe	61d359a9b5	Style Button controls	2016-02-17 16:12:11 +13:00
David Rowe	1164e3e303	Set up window pane's content width so that can right-align	2016-02-17 15:35:35 +13:00
David Rowe	386a247f78	Put Running Scripts content into sections	2016-02-16 17:48:21 +13:00
David Rowe	4d74bb04b0	Style scrollbar	2016-02-16 09:48:09 +13:00
David Rowe	9a536b3b33	Specify a minimum Running Scripts window size	2016-02-15 18:02:59 +13:00
David Rowe	a5da678d6e	Make Running Scripts dialog content scrollable when needed	2016-02-15 18:02:20 +13:00