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
vladest
92a83328c0
Follow naming convention
2017-09-12 19:17:49 +02:00
vladest
08deba35ae
Take in account current WebEngine profile to make sure all features are in place, like download
2017-09-12 16:22:53 +02:00
vladest
17a923b9de
Temporarily disable WebView flickable until new solution will be investigated
2017-09-12 15:48:47 +02:00
Howard Stearns
54deef8f32
Merge pull request #11329 from davidkelly/dk/walletSSLFix
...
fix wallet for new openssl
2017-09-11 10:07:12 -07:00
Andrew Meadows
a9feca18ca
Merge pull request #11317 from vladest/fix_flickable_on_wheel
...
Add flickable on mouse wheel to web pages
2017-09-11 09:32:31 -07:00
David Kelly
1903f65e45
oops
2017-09-08 16:58:12 -07:00
David Kelly
0a3958f743
cr feedback
2017-09-08 16:06:30 -07:00
David Kelly
99cdbbe306
and lets fix the purchases flow too
2017-09-08 14:00:09 -07:00
David Kelly
db0ecb61fd
Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework
...
Use new hfc account endpoint
2017-09-08 09:03:53 -07:00
David Kelly
45c8dd9dd4
cr feedback
2017-09-08 05:28:41 -07:00
David Kelly
efdc340c5c
Use new hfc account endpoint
2017-09-07 18:15:04 -07:00
Brad Hefta-Gaub
c5098abfb9
Merge pull request #10937 from kencooke/zzmp-audio/peak-values
...
Add peak values for all input devices in selection dialog
2017-09-07 11:58:50 -07:00
Howard Stearns
a0ae9ee747
Merge pull request #11311 from davidkelly/dk/walletCleanup
...
wallet cleanup
2017-09-06 14:29:24 -07:00
anshuman64
94e1545e58
Merge pull request #11298 from ElderOrb/case7382
...
7382 Create Menu does not Work on Tablet
2017-09-06 14:09:41 -07:00
vladest
31a23acb1a
Add flickable on mouse wheel to web pages
2017-09-06 23:04:58 +02:00
David Kelly
89cda8d306
oops -- === not ==
2017-09-05 17:15:25 -07:00
David Kelly
1fd30b1e0f
fix passphrase reset
2017-09-05 17:03:11 -07:00
David Kelly
350cee5f35
Wallet cleanup
2017-09-05 16:33:16 -07:00
vladest
85a3771a98
Remove commented out code
2017-09-05 22:19:38 +02:00
vladest
dd6d530853
Merge branch 'master' into flickable_web_pages
2017-09-05 22:14:52 +02:00
Dante Ruiz
e69227aef8
Merge pull request #11209 from vladest/tablet_login_button
...
Added login button to Tablet
2017-09-05 12:59:02 -07:00
David Kelly
3bc45aefb1
Reset passphrase fix
2017-09-05 10:04:16 -07:00
beholder
b5faa8ac56
7382 Create Menu does not Work on Tablet
2017-09-02 18:20:00 +03:00
David Kelly
90316e275a
Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal
2017-09-01 13:33:23 -07:00
David Kelly
9fe6ce0337
working change passphrase. some cleanup to come
2017-09-01 13:11:56 -07:00
Zach Fox
3cf0df518f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal
2017-09-01 11:53:47 -07:00
Zach Fox
51699c9a6a
Minor changes to fonts and colors
2017-09-01 11:44:46 -07:00
Zach Fox
8fcdfa171d
Add debug button to clear passphrase
2017-08-31 16:51:39 -07:00
Zach Fox
1bfc767daf
Quick fixes
2017-08-31 16:42:14 -07:00
Zach Fox
fa25c434ca
Messages to marketplaces.js
2017-08-31 15:50:42 -07:00
Zach Fox
0a9e3e8967
Remove unnecessary code
2017-08-31 15:46:37 -07:00
Zach Fox
2c2500875f
Fixes and improvements
2017-08-31 15:39:58 -07:00
Zach Fox
eab2947d40
Auth flow
2017-08-31 15:16:29 -07:00
Zach Fox
ce32d2d420
Checkout and Purchases
2017-08-31 14:12:05 -07:00
David Kelly
cdadaa8c9c
missed one
2017-08-31 13:41:53 -07:00
David Kelly
de2ce1cd5f
warning
2017-08-31 13:23:38 -07:00
Zach Fox
21a73b2f39
Changes in what I think are the right direction
2017-08-31 13:16:10 -07:00
druiz17
98b1fe6138
Merge pull request #11266 from ElderOrb/case6819
...
6819 - Create button not disabled
2017-08-31 12:36:08 -07:00
Zach Fox
914a6bae00
Commerce: Wallet Passphrase Modal
2017-08-31 12:18:38 -07:00
David Kelly
8fbdd207c8
display hfc in "pennies"
2017-08-31 12:10:12 -07:00
vladest
6faab9fb1c
Switch flickable on by default for list and grid tabs
2017-08-31 19:21:38 +02:00
vladest
a80d9a22df
Added option to disable flickable for web view
2017-08-31 12:20:20 +02:00
David Kelly
962d1fc81d
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet
2017-08-30 15:30:29 -07:00
David Kelly
988ee8c8d1
fix image provider, couple other things
2017-08-30 15:23:54 -07:00
vladest
46ce512e3d
Merge branch 'master' into flickable_web_pages
2017-08-30 23:17:05 +02:00
vladest
b547b2573e
Added logged in property
2017-08-30 23:15:39 +02:00
Zach Fox
17d999e721
Fixes
2017-08-30 13:25:34 -07:00
vladest
903036a709
Merge branch 'master' into tablet_login_button
2017-08-30 22:12:03 +02:00