From 33768028b48fb03ae252fde8c06bb928fcbd66d6 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 27 Jan 2019 14:56:00 +0100
Subject: [PATCH] Move AudioPage.qml into separate directory

This encapsulates the page and separates it and the files it uses from
the rest of the application.
---
 advancedSettings.pro                         | 2 +-
 src/res/qml/RootPage.qml                     | 3 ++-
 src/res/qml/{ => audio_page}/AudioPage.qml   | 2 +-
 src/res/qml/{ => audio_page}/mic_off.svg     | 0
 src/res/qml/{ => audio_page}/mic_on.svg      | 0
 src/res/qml/{ => audio_page}/speaker_off.svg | 0
 src/res/qml/{ => audio_page}/speaker_on.svg  | 0
 src/res/qml/mainwidget.qml                   | 1 +
 8 files changed, 5 insertions(+), 3 deletions(-)
 rename src/res/qml/{ => audio_page}/AudioPage.qml (99%)
 rename src/res/qml/{ => audio_page}/mic_off.svg (100%)
 rename src/res/qml/{ => audio_page}/mic_on.svg (100%)
 rename src/res/qml/{ => audio_page}/speaker_off.svg (100%)
 rename src/res/qml/{ => audio_page}/speaker_on.svg (100%)

diff --git a/advancedSettings.pro b/advancedSettings.pro
index a9485ea..9630f15 100644
--- a/advancedSettings.pro
+++ b/advancedSettings.pro
@@ -135,7 +135,7 @@ DISTFILES += \
     src/res/qml/speaker_on.svg \
     src/res/qml/qmldir \
     src/res/qml/AccessibilityPage.qml \
-    src/res/qml/AudioPage.qml \
+    src/res/qml/audio_page/* \
     src/res/qml/ChaperonePage.qml \
     src/res/qml/ChaperoneWarningsPage.qml \
     src/res/qml/FixFloorPage.qml \
diff --git a/src/res/qml/RootPage.qml b/src/res/qml/RootPage.qml
index 1a02e6b..af391c7 100644
--- a/src/res/qml/RootPage.qml
+++ b/src/res/qml/RootPage.qml
@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
 import "." // QTBUG-34418, singletons require explicit import to load qmldir file
 import "utilities_page"
+import "audio_page"
 
 MyStackViewPage {
     id: rootPage
@@ -342,7 +343,7 @@ MyStackViewPage {
                            Layout.leftMargin: 12
                            checkable: true
                            contentItem: Image {
-                               source: parent.checked ? "mic_off.svg" : "mic_on.svg"
+                               source: parent.checked ? "audio_page/mic_off.svg" : "audio_page/mic_on.svg"
                                sourceSize.width: 32
                                sourceSize.height: 32
                                anchors.fill: parent
diff --git a/src/res/qml/AudioPage.qml b/src/res/qml/audio_page/AudioPage.qml
similarity index 99%
rename from src/res/qml/AudioPage.qml
rename to src/res/qml/audio_page/AudioPage.qml
index d8ea895..8561b21 100644
--- a/src/res/qml/AudioPage.qml
+++ b/src/res/qml/audio_page/AudioPage.qml
@@ -2,7 +2,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
-
+import ".."
 
 MyStackViewPage {
     width: 1200
diff --git a/src/res/qml/mic_off.svg b/src/res/qml/audio_page/mic_off.svg
similarity index 100%
rename from src/res/qml/mic_off.svg
rename to src/res/qml/audio_page/mic_off.svg
diff --git a/src/res/qml/mic_on.svg b/src/res/qml/audio_page/mic_on.svg
similarity index 100%
rename from src/res/qml/mic_on.svg
rename to src/res/qml/audio_page/mic_on.svg
diff --git a/src/res/qml/speaker_off.svg b/src/res/qml/audio_page/speaker_off.svg
similarity index 100%
rename from src/res/qml/speaker_off.svg
rename to src/res/qml/audio_page/speaker_off.svg
diff --git a/src/res/qml/speaker_on.svg b/src/res/qml/audio_page/speaker_on.svg
similarity index 100%
rename from src/res/qml/speaker_on.svg
rename to src/res/qml/audio_page/speaker_on.svg
diff --git a/src/res/qml/mainwidget.qml b/src/res/qml/mainwidget.qml
index e5f8f54..91953b5 100644
--- a/src/res/qml/mainwidget.qml
+++ b/src/res/qml/mainwidget.qml
@@ -2,6 +2,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.0
 import "utilities_page"
+import "audio_page"
 
 Rectangle {
     id: root