15 commits

Author	SHA1	Message	Date
Zach Fox	d0cc64f63d	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
Zach Fox	67034274fa	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08: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
Brad Davis	86f8b57841	Highlight controls based on activeFocus, not focus	2016-06-30 15:16:28 -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
David Rowe	17d41dd7b9	HiFi glyphs font file update with fixed up/down carats ... Update QML and HTML spinboxes accordingly.	2016-05-18 13:25:11 +12:00
David Rowe	43f843f731	Retrofit updated margins and spacing to QML dialogs	2016-04-13 16:39:52 +12:00
Triplelexx	11af0a421b	Merge branch 'master' into 20769	2016-04-03 22:57:55 +01: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	e79427bb3b	Make some settings dialogs have collapsible sections	2016-03-02 19:41:50 +13:00
David Rowe	20bf07550a	Update to new HiFi-Glyphs font file	2016-03-02 13:10:52 +13:00
David Rowe	b62bd682ed	Tidying	2016-02-27 11:03:57 +13:00
David Rowe	bf0bcbe2ec	Style spinbox control	2016-02-27 10:48:53 +13:00