merged master to brightness

2019-04-12 18:25:14 -05:00
parent e2e68ecc89 b32d621994
commit 9de14e20cb
34 changed files with 1059 additions and 478 deletions
@@ -6,6 +6,7 @@ import "../utilities_page"
 import "../audio_page"
 import "../motion_page"
 import "../video_page"
+import "../desktop_overlay_page"

 Rectangle {
    id: root
@@ -76,6 +77,10 @@ Rectangle {
        stackView: mainView
        visible:false
    }
+    property DesktopOverlayPage desktopOverlayPage: DesktopOverlayPage {
+        stackView: mainView
+        visible: false
+    }

    StackView {
        id: mainView