Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-14 08:26:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40096 commits 6 branches 1 tag 1.1 GiB
Commit graph

99 commits

Author SHA1 Message Date
David Rowe
edc50f102d Fix "duplicate bookmark" dialog 2016-03-09 11:55:09 +13:00
David Rowe
10e4e5e3a7 Use OffscreenUI icon enum instead of QMessageBox icon enum 2016-03-09 11:33:55 +13:00
David Rowe
03fb6b1444 Add ability to have icons in query dialogs 
Add icon to bookmark dialogs' titles.
 2016-03-09 10:45:14 +13:00
David Rowe
ba1e8db34a Add QML UI test dialogs for creating and deleting bookmarks 2016-03-08 13:51:13 +13:00
David Rowe
4cc36d1df0 Update QML UI test environment for Settings > General dialog 2016-02-25 17:13:48 +13:00
David Rowe
49c229897f Give the "change avatar?" confirmation dialog a default action 2016-02-23 17:55:36 +13:00
David Rowe
26a46207c2 Set up QML tests for message box modal dialog restyling 2016-02-22 17:03:48 +13:00
David Rowe
54b27f3ac3 Merge branch 'master' into 20805 2016-02-18 23:35:37 +13:00
David Rowe
c07b1f9b1e Tidying 2016-02-18 23:06:26 +13:00
David Rowe
42a44e0f67 First pass at restyling dialog frame 
"Pin" button is implemented but disabled (as it was before).
 2016-02-13 15:15:01 +13:00
David Rowe
b3233c2d21 Add Running Scripts dialog to UI tests 2016-02-12 10:13:28 +13:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Bradley Austin Davis
dc0e038535 Add drive selection to the file dialog 2016-02-04 13:51:43 -08:00
Brad Hefta-Gaub
721a911cf1 Merge pull request #6972 from jherico/qml 
Small QML Fixes
 2016-01-29 09:57:15 -08:00
Brad Davis
afd3ddf534 Cleaning up message box 2016-01-28 21:17:05 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
Brad Davis
18d6a09dc9 Better preferences dialog initial state 2016-01-28 09:20:31 -08:00
Brad Davis
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00
Brad Davis
fee920723a Cleaning up test project 2016-01-26 17:25:20 -08:00
Brad Davis
e52e35df8c Better initial window positioning 2016-01-23 22:06:13 -08:00
Brad Davis
71ae36f5c0 Button prefs and conditionally enabled prefs 2016-01-22 19:06:30 -08:00
Brad Davis
858bbbf987 Adding OffscreenUI API for QInputDialog functionality 2016-01-22 17:31:03 -08:00
Brad Davis
c7186590ea Support for directory browsing 2016-01-22 17:30:09 -08:00
Brad Davis
205ab05506 First pass on preferences dialog 
Conflicts:
	tests/ui/qmlscratch.pro
 2016-01-22 17:30:07 -08:00
Brad Davis
f343598d91 Focus hack for menu fix 2016-01-22 00:55:32 -08:00
Brad Davis
3d46eda165 Frame construction in onCompleted was messing up the browser keyboard focus 2016-01-22 00:55:31 -08:00
Brad Davis
d2900200a1 More cleanup & menu fixing 2016-01-20 11:23:56 -08:00
Brad Davis
5aa8398adb Working on keyboard focus issues 2016-01-17 20:56:07 -08:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
Brad Davis
88b88a3306 Fixing warnings 2015-12-18 14:32:35 -08:00
Brad Davis
82c865af2c Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine 2015-12-17 12:20:38 -08:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Leonardo Murillo
9ad865c7f0 checkpoint 2015-11-20 15:19:45 -06:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Stephen Birarda
7bd98354d8 add override to supress warnings in ui-test 2015-10-05 15:53:52 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Stephen Birarda
fd43c48eac resolve conflicts on merge with birarda/protocol 2015-08-18 11:48:36 -07:00
Brad Hefta-Gaub
31a49a551a Merge pull request #5556 from jherico/bart 
QML framerate improvments
 2015-08-14 11:11:14 -07:00
Brad Davis
0fa3044231 QML framerate improvments 2015-08-12 16:24:34 -07:00
David Rowe
e6473fc8b9 Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
 2015-08-11 12:34:28 -07:00
David Rowe
b70c1a4960 Merge branch 'master' into 20639 2015-08-07 12:33:13 -07:00
Bradley Austin Davis
7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
 2015-08-06 11:03:37 -07:00
David Rowe
d7b42e264e Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
 2015-08-05 16:49:06 -07:00
Atlante45
3dc8bd47ae Fix warning and remove unused headers 2015-08-05 16:46:44 -07:00