Commit graph

137 commits

Author SHA1 Message Date
David Rowe
8f42a3fe9e Fix keyboard state in browser when switching focus to/from dialog frame 2016-10-14 12:14:23 +13:00
David Rowe
64c54f9c6b Fix keyboard in new browser window opened from Web view 2016-10-14 10:03:52 +13:00
David Rowe
a75925d1e3 Add numeric shift 2016-10-13 14:18:21 +13:00
David Rowe
2ef974f729 Fix alphabetic shift 2016-10-13 12:16:02 +13:00
David Rowe
4dfe290d4a Add comma and period keys to last row of keyboard 2016-10-13 12:02:36 +13:00
David Rowe
5d390b4722 Revise positions of keys in keyboard 2016-10-13 11:45:14 +13:00
David Rowe
a359626316 Merge branch 'master' into 21070 2016-10-13 09:54:59 +13:00
David Rowe
86f6cee2ad Fix Asset Browser add-to-world drop-down 2016-10-12 20:08:33 +13:00
David Rowe
827c2b015b Update other dialogs to use single keyboard QML file 2016-10-09 11:52:30 +13:00
David Rowe
5a4665b02f Combine numeric keys into alpha keyboard QML file for scrolling windows 2016-10-08 16:27:51 +13:00
David Rowe
b954852ba9 Use temporary copy of keyboard QML file while refactoring 2016-10-08 15:23:11 +13:00
David Rowe
bdff71151d Updates from code review 2016-10-07 13:35:44 +13:00
David Rowe
52f2d36096 Move "," and "." to numeric keyboard for ready use with numeric fields 2016-09-29 10:17:31 +13:00
David Rowe
875566d956 Raise and lower keyboard for HTML fields in Browser window 2016-09-28 16:40:38 +13:00
David Rowe
023efe05f0 Move keyboard QML files 2016-09-25 09:54:48 +13:00
David Rowe
5b6835fbdb Fix defocusing 2016-09-24 21:23:30 +12:00
David Rowe
8663455d01 Unfocus field and hide keyboard when click in blank part of dialog 2016-09-24 17:34:02 +12:00
howard-stearns
ebf280fd6f Handle window.open requests from web pages in WebView following QT upgrade.
Handle window.close requests in the browser.
2016-09-08 13:06:33 -07:00
howard-stearns
8824507523 new smaller WebView.qml 2016-08-30 14:37:08 -07:00
howard-stearns
564769f7d3 move WebView.qml to baseWebView.qml 2016-08-30 14:07:34 -07:00
howard-stearns
232ac74b26 back to master version 2016-08-30 14:06:20 -07:00
howard-stearns
11f00ed46c add a hook so that clients can gain access to the new component, window,
and request
2016-08-29 14:44:48 -07:00
howard-stearns
6272db42da restore onNewViewRequested 2016-08-29 13:53:08 -07:00
James B. Pollack
d9ebad7976 Merge pull request #8372 from elisa-lj11/zip_project
Added Clara.io to the marketplace
2016-08-24 15:53:58 -07:00
elisa-lj11
8bc9a92429 removed extraneous debug prints 2016-08-19 11:32:13 -07:00
elisa-lj11
4c434e875e fixed merge conflicts in Application.cpp 2016-08-19 09:46:22 -07:00
howard-stearns
2b75240771 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-16 11:14:36 -07:00
howard-stearns
747c43d065 basic user story card 2016-08-11 16:43:29 -07:00
elisa-lj11
b8f5a9d22f CR changes 2016-08-10 10:26:58 -07:00
Atlante45
205df0cf51 login UI first draft 2016-08-08 15:39:25 -07:00
elisa-lj11
b39c8c52ab Included combobox in marketplace view 2016-08-04 17:02:04 -07:00
elisa-lj11
d63d0ba870 In process of creating combobox for marketplace with qml 2016-08-04 17:02:04 -07:00
elisa-lj11
a9a8710689 Switched saving download/upload to temporary directory 2016-08-04 17:01:19 -07:00
elisa-lj11
b1b2ea48b2 Made code more QA; extra browser and download widget close upon download 2016-08-04 17:01:19 -07:00
elisa-lj11
615627e981 Working download and unpackage from Clara.io 2016-08-04 16:59:38 -07:00
elisa-lj11
49712060ed switching to the main site progress 2016-08-04 16:59:38 -07:00
elisa-lj11
c36fc29363 Zip download works 2016-08-04 16:59:03 -07:00
elisa-lj11
6152fa28b7 Download through QML
It kind of works, not crashing like before, but the weird ghost
file/type error is still happening with multiple downloads
2016-08-04 16:58:31 -07:00
elisa-lj11
eab7714d70 working within webview to access url 2016-08-04 16:57:19 -07:00
Zander Otavka
3c30743d0d Remove url change debug info for WebView 2016-08-02 16:48:39 -07:00
James B. Pollack
ea1c21e685 resolve merge 2016-07-24 18:51:00 -07:00
James B. Pollack
8acb30da8e add permissions bar 2016-07-24 16:54:00 -07:00
Zander Otavka
5394c092d0 Fix bug with dropdown 2016-07-20 13:07:45 -07:00
Zander Otavka
c27e1d6fdb Polish dialog behavior and spacing 2016-07-15 17:35:55 -07:00
James B. Pollack
c3c9c0cb10 update so HTML5 media apis work again 2016-07-13 14:37:41 -07:00
Brad Hefta-Gaub
bcee128de0 Merge pull request #6959 from Triplelexx/20769
CR for Job #20769 - Touchscreen camera input for Interface
2016-07-11 14:24:52 -07:00
Brad Davis
86f8b57841 Highlight controls based on activeFocus, not focus 2016-06-30 15:16:28 -07:00
Triplelexx
fd4d9761ce merge master and resolve conflicts
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
2016-06-24 03:34:39 +01:00
Brad Davis
0ddee876c3 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-13 13:03:46 -07:00
David Rowe
3780b18cc0 Fix a QML error 2016-06-09 15:15:32 +12:00