Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 07:25:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
84150 commits 71 branches 56 tags 1.2 GiB
Commit graph

375 commits

Author SHA1 Message Date
vladest
56150f8962 Merge branch 'master' into move_to_qqc2 2018-03-24 15:34:49 +01:00
John Conklin II
c61ed697df
Merge pull request #12552 from vladest/assetbrowser_cosmetics 
Wrap text in query dialogs. Add right margins for input field and but…
 2018-03-22 17:56:47 -07:00
vladest
387be7415f WIP: do not push 2018-03-14 19:00:19 +01:00
vladest
fe5d7463fe Merge branch 'master' into move_to_qqc2 2018-03-10 14:42:51 +01:00
Zach Fox
d0cc64f63d Fix font loading for MacOS via different font loading method 2018-03-08 11:19:49 -08:00
vladest
8723b317c9 Move Keyboard under input dialog makes sure it will no shift dialogs content 2018-03-06 13:09:08 +01:00
vladest
148faa3a93 Merge branch 'master' into move_to_qqc2 2018-03-04 14:16:21 +01:00
vladest
2a9bbfa808 Wrap text in query dialogs. Add right margins for input field and buttons 2018-03-04 13:19:56 +01:00
Zach Fox
67034274fa Improve font loading by using QRC instead of relative paths 2018-02-28 17:59:37 -08:00
vladest
1c63bcf02e Merge branch 'master' into move_to_qqc2 2018-01-31 22:13:52 +01:00
Seth Alves
50e6864988
Merge pull request #12138 from Triplelexx/21669_prompt_keyboard 
WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()
 2018-01-31 11:19:49 -08:00
Triplelexx
4c27538fa2 change file dialog keyboard navigation 
Allowed navigating with keyboard to home and up buttons in file dialog.
 2018-01-19 12:30:00 +00:00
Triplelexx
faf18fcaa8 improve file dialog navigation 2018-01-19 01:49:24 +00:00
Triplelexx
cede8ed597 add focused color 
keyboard navigation uses focusedColor
 2018-01-18 19:56:55 +00:00
vladest
b3b7a7636f Merge branch 'master' into move_to_qqc2 2018-01-16 21:08:49 +01:00
Zach Fox
6920e57613 Fix 'Browse Avatars' button from Avatar Settings 2018-01-12 13:31:58 -08:00
vladest
b5f3631c21 Merge branch 'master' into move_to_qqc2 2018-01-11 18:54:40 +01:00
Triplelexx
24f1fc3546 fix Ui keyboard navigation 
various fixes to allow some support for keyboard navigation in message boxes and dialogs
 2018-01-10 22:30:43 +00:00
Cain Kilgore
104ac0ffae
Indents, man 2018-01-10 20:30:41 +00:00
Cain Kilgore
057c708637
Spaces instead of Tabs 
(Damnit VS Re-install!)
 2018-01-10 19:24:52 +00:00
Cain Kilgore
f78ee7c167 WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel 2018-01-09 09:44:12 +00:00
vladest
2fbd0a41b1 Move Slider 2017-12-28 15:39:22 +01:00
vladest
dbd6ec0dff Port Edit.qml to QQC2 as well as some tablet preferences compinents 2017-11-17 20:46:21 +01:00
vladest
b4f6c25f4d Implement QQC1-compatible Action component 2017-11-16 19:04:35 +01:00
Brad Davis
1167be4102 Reverting tablet API rename, cleaning up duplicated code 2017-11-15 11:52:55 -08:00
vladest
2852375285 Make QueryDioalogs buttons works 2017-11-15 20:32:28 +01:00
vladest
0c13c2b6e2 Remove unused QQC1 imports 2017-11-13 16:37:28 +01:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
Zach Fox
14150c09ac Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-25 12:59:36 -07:00
Zach Fox
7998984d8e Missed tons of spots! 2017-10-24 14:30:47 -07:00
Dante Ruiz
0242e8e4ba fixed crash and login password 2017-10-23 16:33:49 -07:00
vladest
908d601a43 Code style fixes #1 2017-10-20 20:00:11 +02:00
vladest
fa349a694c Code style fixes 2017-10-20 15:12:09 +02:00
vladest
145149fedd Merge branch 'master' into tablet_extended_sounds 2017-10-12 18:01:23 +02:00
vladest
86e8076362 Fix puntuation mode 2017-10-04 20:30:25 +02:00
vladest
0a505617df Implemented single keyboard instance for all Tablet login dialog items 2017-10-04 19:33:36 +02:00
vladest
bf39eb9a77 Test Tablet keyboard specific 2017-10-02 20:02:55 +02:00
vladest
d3cd034d61 Cleanup 2017-09-29 16:33:52 +02:00
vladest
4023c40149 Cleanup 2017-09-28 22:55:01 +02:00
vladest
769c57208c Signup ready 2017-09-28 21:35:41 +02:00
vladest
4f907aba1e sign in reworked 2017-09-28 14:49:48 +02:00
vladest
b5f0c4d940 Added settings controls sounds 2017-09-25 16:46:36 +02:00
LaShonda Hopper
24b6cd71fc [Case 6107] Fixes Tablet import sorting (details below). 
This ports the fix from FileDialog to TabletFileDialog.

* There appears to be 2 versions of this file:
    * qml/dialogs/TabletFileDialog.qml
    * qml/hifi/tablet/tabletWindows/TabletFileDialog.qml

Testing the tablet within desktop mode works without this fix most
likely because it uses qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
which didn't receive the same refactor pass via d3282a4e.

Tested on Vive:  Menu -> Edit -> Import Entities

Changes Committed:
	modified:   interface/resources/qml/dialogs/TabletFileDialog.qml
 2017-09-14 14:49:49 -04:00
LaShonda Hopper
33c8e90e34 [QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below). 
Looking through the log revealed the following warning:
".../qml/dialogs/FileDialog.qml:489: Error: Cannot assign to non-existent property 'sortOrder'"

There was some refactoring to address some HMD functionality in 51b44d90
which resulted in an update to fileTableView's model.  This appears to be the point
at which sorting stopped working.

This updates the fileTableView's sorting methods to use fileTableModel as opposed
to fileTableView's model(filesModel).  This appears safe given fileTableModel internally wraps
around filesModel and is responsible for updating its value.  I'm relatively new
to QML/Qt; any comments or suggestions are welcome.

Tagging @vladest since they may want to be aware given 51b44d90.

Case Link:
https://highfidelity.fogbugz.com/f/cases/6107

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/resources/qml/dialogs/FileDialog.qml
 2017-09-13 16:25:36 -04:00
Cain Kilgore
280a7a7e42 Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning 2017-07-25 01:48:55 +01:00
Cain Kilgore
9c152ddc6f Ticking left will keep it on left, not right 2017-07-24 22:30:43 +01:00
Cain Kilgore
e6fd85f45a Some code cleanup 2017-07-24 19:02:40 +01:00
Cain Kilgore
42742ba1f9 Changed the Return to a String "left/right" instead. 2017-07-24 18:31:16 +01:00
Cain Kilgore
a4cf27402d Tabs and Cleanup of Code 2017-07-24 06:27:14 +01:00
Cain Kilgore
630922dd95 Dominant Hands Branch Initial Commit 
Adds a new option in the Avatar Basics section of the Avatar Settings.

API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()

Defaults to false (Right Hand). Will return True if set to Left Hand.
 2017-07-24 06:18:24 +01:00
Cain Kilgore
c60c8c7b13 Missed two tabs.. 2017-07-14 00:59:25 +01:00
Cain Kilgore
4f8d958831 Some code cleaning, added comment for reasoning of specifying min and max in the qml 2017-07-14 00:56:42 +01:00
Cain Kilgore
d74c834f12 Fixed colour scheming and changed to a reload icon 2017-07-13 22:40:37 +01:00
Cain Kilgore
60300f5d7b changed to icon (hopefully) 2017-07-13 22:06:44 +01:00
Cain Kilgore
f91a8c0f53 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler 2017-07-13 21:25:39 +01:00
Cain Kilgore
092725ad1a a thing 2017-07-13 19:24:30 +01:00
Cain Kilgore
5329c1ce42 Fixed Indentation, removed old debug code 2017-07-13 19:23:28 +01:00
Cain Kilgore
521babb6bd Avatar Scaler - should be PR Ready. 2017-07-13 19:18:51 +01:00
Cain Kilgore
43782a29c7 Avatar Scaler - WIP 2017-07-12 22:04:58 +01:00
Vladyslav Stelmakhovskyi
51b44d9021 Implement same for HMD mode 2017-06-28 16:36:25 +02:00
Vladyslav Stelmakhovskyi
d3282a4ed0 Cleanup 2017-06-28 15:56:35 +02:00
Vladyslav Stelmakhovskyi
241231c00c file lists works, but not initial yet 2017-06-27 22:14:58 +02:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
David Rowe
9088d1ef9c Tablet version of recordings browser dialog 2017-04-19 16:15:22 +12:00
David Rowe
00b6b2a2c0 Implement desktop recordings browser dialog 2017-04-19 12:34:59 +12:00
Zach Fox
7505b82189 Merge pull request #10046 from Triplelexx/21224 
21224 - Allow people to save avatar bookmarks
 2017-04-18 11:10:50 -07:00
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
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
Lexx
af95741a7e Merge branch 'master' into 21224 2017-04-04 18:24:49 +01:00
Triplelexx
aa9a2532a9 fix for displaying "Bookmark Avatar" dialog in tablet ui 2017-03-30 13:54:33 +01:00
Triplelexx
50e35a220b Merge remote-tracking branch 'upstream/master' into 21224 2017-03-30 01:25:27 +01:00
Vladyslav Stelmakhovskyi
209de29b2a Intial commit. Basically works. Need some testing 2017-03-29 17:36:05 +02:00
Triplelexx
07e6b766b5 rename FILENAME constants 2017-03-26 23:10:50 +01:00
Triplelexx
8f507942cf change storage location 
still unsure what is best. this is consistent and doesn't require login
 2017-03-25 19:10:12 +00:00
humbletim
5d5d947ddb updates per discussion with triplelexx 2017-03-25 04:01:02 -04:00
humbletim
630afb716f consolidate QML->C++ triggering workaround to help compartmentalize the problem for later fixin' 2017-03-25 03:01:35 -04:00
humbletim
96f905362b alternative way to connect the button? 2017-03-25 01:17:27 -04:00
Triplelexx
bda1d54209 create AvatarBookmarks 
derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass
at integration, QML issues noted
 2017-03-24 22:58:36 +00: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
Zander Otavka
acf4539f4f Return a JSON string from QML instead of JS object 
Idk why QML can't return a JS object, but it can't.  Strings work, so I
use a string.
 2016-07-19 13:21:08 -07:00
Zander Otavka
b8398944ac Fix QML warnings 2016-07-18 13:09:32 -07:00
Zander Otavka
06985f9278 Make combo box go by index, add default values 2016-07-18 12:06:11 -07:00
Zander Otavka
6bd7034c1a Improve scaling of components in dialog 
CustomQueryDialog now better handles the absence of one or more input
fields and scales appropriately.
 2016-07-18 11:14:45 -07:00
Zander Otavka
c27e1d6fdb Polish dialog behavior and spacing 2016-07-15 17:35:55 -07:00
Zander Otavka
71f62c02fc Add basic implementation of customPrompt 
Still missing the warning and diabling of dynamic checkbox when the
static mesh is selected.
 2016-07-15 17:35:55 -07:00
David Rowe
759b3065fc Distinguish between file name and directory as prompt in file chooser 2016-06-30 20:48:19 +12:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
Bradley Austin Davis
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -07:00
David Rowe
3c2b98b15a Let user choose an existing file in the file save dialog 2016-06-15 11:28:38 +12:00
Brad Davis
0ddee876c3 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-13 13:03:46 -07:00
David Rowe
f7578f084f Fix buttons on warning message box when can't export a file 2016-06-13 15:21:59 +12:00
David Rowe
546699da03 When choosing a directory default selection to default directory 2016-06-13 15:06:10 +12:00
David Rowe
d74f1c8b5d Fix default directory for Settings directory preference fields 2016-06-13 14:51:14 +12:00
David Rowe
cf6945b403 Fix selecting directory directly from dropdown 2016-06-09 17:11:00 +12:00
David Rowe
4176940e24 Don't highlight first drive in table when choose "This PC" from dropdown 2016-06-09 17:02:43 +12:00
David Rowe
d346d4c731 When choosing a directory make the dropdown update the path value 2016-06-09 16:41:51 +12:00
David Rowe
b4543cc579 Unhighlight directory in table when type filename to save 2016-06-09 16:29:15 +12:00
David Rowe
0ef13e6c01 Fix action button label to be "Save" when saving a file 2016-06-09 15:15:31 +12:00
David Rowe
4ae018400d Give table focus after using dropdown 2016-06-09 15:15:30 +12:00
David Rowe
358355cfbf Clear file selection and disabled Open button when change directory 2016-06-09 15:15:29 +12:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00