Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-03 02:29:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66242 commits 74 branches 59 tags 1.2 GiB
Commit graph

278 commits

Author SHA1 Message Date
vladest
001b6d23ff Merge branch 'master' into move_to_qqc2 2018-03-28 20:16:26 +02:00
Seth Alves
4f7d856a1c don't free dialogs to avoid crash in setKeyboardRaised 2018-03-27 09:28:55 -07:00
vladest
096b56395e Fix crash on startup 2018-03-27 18:22:56 +02:00
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