Commit graph

198 commits

Author SHA1 Message Date
Dante Ruiz
d823093ddb fixed merge conflict 2017-04-11 16:58:25 +01:00
Dante Ruiz
4e94aaa9e8 finished allowing to go back to previous app 2017-04-10 20:58:10 +01:00
Vladyslav Stelmakhovskyi
7628916db6 Check if dialog was opened from StackView and then pop or just go to home menu 2017-04-09 20:09:15 +02:00
Dante Ruiz
86c67a3017 tablet pages 2017-04-08 02:01:21 +01:00
Vladyslav Stelmakhovskyi
209de29b2a Intial commit. Basically works. Need some testing 2017-03-29 17:36:05 +02:00
Vladyslav Stelmakhovskyi
696825580e Merge branch 'tablet-ui' into tablet-ui-login-logout 2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi
5e162a6447 Implemented login facility for tablet UI 2017-03-18 14:38:49 +01:00
David Rowe
1080e21afd Tidying 2017-03-16 19:28:28 +13:00
David Rowe
89eb073855 Fix dialog height changing as drop-down value is changed 2017-03-16 19:28:12 +13:00
David Rowe
74db9dc573 Fix drop-down hiding behind buttons 2017-03-16 19:27:47 +13:00
David Rowe
3c1506237a Fix not all warning text displaying 2017-03-16 19:27:27 +13:00
David Rowe
7efda8bead Make clicking on dialog background defocus current control 2017-03-16 19:27:06 +13:00
David Rowe
9e458fd180 Fix keyboard in tablet custom query dialog 2017-03-16 19:26:41 +13:00
Seth Alves
f8a6a82371 Merge pull request #9881 from ctrlaltdavid/21197
Browse for avatar in Marketplace from tablet avatar settings dialog
2017-03-14 05:33:11 -08:00
David Rowe
d141d5b683 Add keyboard 2017-03-14 21:36:57 +13:00
David Rowe
f3a99a2437 Implement avatar browser for tablet avatar settings 2017-03-14 15:36:51 +13:00
David Rowe
05e4c2a1bb MyAvatar is available in tablet now 2017-03-12 09:59:52 +13:00
David Rowe
189eee01a6 Refactor TabletComboBox.qml into ComboBox.qml 2017-03-11 11:02:09 +13:00
Vladyslav Stelmakhovskyi
e27ccab2f4 Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click 2017-03-10 19:53:20 +01:00
druiz17
0069569e96 Merge branch 'tablet-ui' into 21197 2017-03-09 09:31:15 -08:00
Vladyslav Stelmakhovskyi
6d9e7de6dc Implemented AssetBrowser in Tablet view 2017-03-06 21:45:55 +01:00
David Rowe
09ecb12510 Merge branch 'tablet-ui-edit-js' into 21197
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-07 08:59:40 +13:00
Dante Ruiz
88c0db969c added tabletComboBox to tabletFileDialog 2017-03-03 17:14:00 +00:00
Dante Ruiz
5ba89e67af fixed message dialog bug 2017-03-02 16:50:42 +00:00
David Rowe
62f91b4af6 Work around MyAvatar not being available in avatar preference control 2017-03-02 15:01:31 +13:00
Dante Ruiz
835b23832f some modal clean up 2017-02-25 00:40:38 +00:00
Dante Ruiz
4a5be4238e messages and file dialogs in tablet 2017-02-24 00:19:32 +00:00
Dante Ruiz
3ba605bf23 saving work 2017-02-23 00:28:30 +00:00
Anthony J. Thibault
cbf514a738 PreferenceDialogs now preserve the sort order of their showCategories.
Specifically, this was to fix the issue with the Neuron plugin preferences being
the top section in the General Preferences dialog, now it is the last.
2016-11-23 10:11:28 -08:00
howard-stearns
84eb1721e7 fix numeric keyboard for hmd Window.prompt 2016-11-04 17:02:14 -07:00
howard-stearns
e7392acb10 directory picker works when choosing the initial value 2016-10-17 13:50:23 -07:00
David Rowe
a359626316 Merge branch 'master' into 21070 2016-10-13 09:54:59 +13:00
David Rowe
18f19b07d4 Fix checkbox not being disabled per dropdown default
And tweak checkbox position.
2016-10-13 08:37:30 +13:00
David Rowe
86f6cee2ad Fix Asset Browser add-to-world drop-down 2016-10-12 20:08:33 +13:00
David Rowe
31b35f0a35 Only raise keyboard if in HMD display mode 2016-10-12 09:43:33 +13:00
David Rowe
552f276a06 Load avatar browser dialog such that JavaScript EventBridge works 2016-10-11 11:12:57 +13:00
David Rowe
d0900ec75e Add keyboard to avatar browser dialog 2016-10-11 10:11:36 +13:00
David Rowe
827c2b015b Update other dialogs to use single keyboard QML file 2016-10-09 11:52:30 +13:00
David Rowe
b954852ba9 Use temporary copy of keyboard QML file while refactoring 2016-10-08 15:23:11 +13:00
David Rowe
302c8ede60 Miscellaneous fixes 2016-09-26 15:34:39 +13:00
David Rowe
7d1d71084d Add keyboard to custom query dialog 2016-09-26 14:32:29 +13:00
David Rowe
023efe05f0 Move keyboard QML files 2016-09-25 09:54:48 +13:00
David Rowe
52137cb3c1 Put keyboard at bottom of scrolling dialogs rather than under controls 2016-09-24 11:40:38 +12:00
Seth Alves
dff567054d qml keyboard for avatar preferences dialog 2016-09-13 11:17:00 -07:00
Seth Alves
161424afaf qml keyboard for browsable preferences 2016-09-12 21:39:52 -07:00
Seth Alves
b841e3094d qml keyboard for file dialog 2016-09-12 16:23:05 -07:00
Seth Alves
4c370d0d32 qml keyboard for query-dialog 2016-09-12 15:31:07 -07:00
SamGondelman
9903e464d8 fix error in FileDialog.qml 2016-09-06 17:36:53 -07:00
Atlante45
205df0cf51 login UI first draft 2016-08-08 15:39:25 -07:00
David Rowe
800c2b9ec0 Refresh file dialog when directory content changes 2016-07-30 11:21:40 +12:00