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
@@ -115,6 +115,17 @@ MyStackViewPage {
                       }
                   }

+                   MyPushButton {
+                       id: desktopOverlayButton
+                       activationSoundEnabled: false
+                       text: "Desktop Overlay"
+                       Layout.fillWidth: true
+                       onClicked: {
+                           MyResources.playFocusChangedSound()
+                           mainView.push(desktopOverlayPage)
+                       }
+                   }
+
                   MyPushButton {
                       id: statisticsButton
                       activationSoundEnabled: false