Commit graph

34 commits

Author SHA1 Message Date
David Rowe
cfde36c9f5 Fix up scrollbars and separators 2020-01-23 11:25:48 +13:00
David Rowe
6c81f597af Display vertical scrollbar in Settings dialogs that scroll 2020-01-22 20:55:50 +13:00
dante ruiz
b478a22ed2 fix edge case 2019-09-20 15:25:10 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus
Keyboard interaction menus
2018-12-12 17:53:59 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Dante Ruiz
deaf3e8e44 adding option to disable teleportring 2018-12-11 11:06:13 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Alexander Ivash
27bb8a0de7 rename stylues-uit => stylesUit & controls-uit => controlsUit
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -07:00
Alexander Ivash
740123b853 rename stylues-uit => stylesUit & controls-uit => controlsUit
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-10-18 21:05:20 +03:00
David Rowe
4813f4d042 Show/hide jumping & flying checkbox depending on movement mode 2018-09-28 13:02:27 +12:00
David Rowe
5ab22a1f40 Change play area option text for Oculus 2018-09-27 17:07:42 +12:00
Dante Ruiz
ff52639bc3 fix update 2018-09-14 14:10:36 -07:00
Dante Ruiz
4eb5c9714b fix snapshot settings 2018-09-14 12:59:28 -07:00
David Rowe
398724de73 Make Save in HMD settings dialogs return to previous dialog
Same as Cancel key does.
2018-09-06 10:23:45 +12:00
David Rowe
c29c9f98c1 Make Cancel in HMD settings dialogs return to Settings dialog 2018-08-28 11:15:57 +12:00
Alexander Ivash
fb1a2037e3 move specifying custom properties for preferences dialog from C++ to QML (per Dante's request) 2018-07-06 21:00:55 +03:00
Dante Ruiz
82422edb59 fixinig the controller settings page and have menu option on by default 2018-05-14 18:51:39 -07:00
vladest
0c13c2b6e2 Remove unused QQC1 imports 2017-11-13 16:37:28 +01:00
Dante Ruiz
a45bea2c90 fixed merge conflicts 2017-05-27 00:57:09 +01:00
Dante Ruiz
4365907462 drop down puck configuration for gernal settings 2017-05-10 22:12:11 +01:00
Dante Ruiz
4e94aaa9e8 finished allowing to go back to previous app 2017-04-10 20:58:10 +01:00
druiz17
92bb7f2329 saving work 2017-04-09 18:55:53 -07:00
David Rowe
f1947769d6 Fix tablet settings dialogs' titles and make QML consistent 2017-03-17 11:15:56 +13:00
David Rowe
4dd7667fd7 Merge branch 'tablet-ui' into 21209
# Conflicts:
#	interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
#	interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-14 08:50:01 +13:00
David Rowe
6a8d0b1064 Refactor some tablet dialog headers 2017-03-11 16:55:22 +13:00
Dante Ruiz
b63ab05eec improved general settting coloring 2017-03-10 19:33:14 +00:00
David Rowe
0333122b23 Make Save and Cancel buttons close preferences dialog 2017-03-04 15:27:31 +13:00
David Rowe
53cfad65cd Add keyboard to preferences dialogs 2017-03-04 13:01:02 +13:00
David Rowe
ebe41bb443 Add a title to the tablet settings dialogs 2017-03-02 14:11:56 +13:00
Dante Ruiz
948352cdb6 general preferences work on tablet 2017-02-14 07:46:33 -08:00
Dante Ruiz
888d4ff706 basic prefreneces done 2017-02-14 07:46:32 -08:00
Dante Ruiz
46cfa7cf13 saving work 2017-02-14 07:46:31 -08:00