From 70e7556de846b899ad68abfe61b6e119c856e5de Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sat, 26 Jan 2019 22:30:38 +0100
Subject: [PATCH] Move components into their own directories

This prevents the import "utilities_page" from also importing the
subcomponents. They should not be in the global namespace.
---
 advancedSettings.pro                                        | 6 +++---
 src/res/qml/utilities_page/UtilitiesPage.qml                | 4 +++-
 .../qml/utilities_page/{ => alarm_clock}/AlarmGroupBox.qml  | 3 +--
 .../{ => desktop_size}/SteamDesktopGroupBox.qml             | 3 +--
 .../{ => keyboard_utils}/KeyboardGroupBox.qml               | 3 +--
 5 files changed, 9 insertions(+), 10 deletions(-)
 rename src/res/qml/utilities_page/{ => alarm_clock}/AlarmGroupBox.qml (99%)
 rename src/res/qml/utilities_page/{ => desktop_size}/SteamDesktopGroupBox.qml (99%)
 rename src/res/qml/utilities_page/{ => keyboard_utils}/KeyboardGroupBox.qml (98%)

diff --git a/advancedSettings.pro b/advancedSettings.pro
index 5abe543..a9485ea 100644
--- a/advancedSettings.pro
+++ b/advancedSettings.pro
@@ -161,6 +161,6 @@ DISTFILES += \
     src/res/qml/utilities_page/* \
     src/res/qml/utilities_page/media_keys/* \
     src/res/qml/LineSeparator.qml \
-    src/res/qml/utilities_page/KeyboardGroupBox.qml \
-    src/res/qml/utilities_page/AlarmGroupBox.qml \
-    src/res/qml/utilities_page/SteamDesktopGroupBox.qml
+    src/res/qml/utilities_page/keyboard_utils/* \
+    src/res/qml/utilities_page/desktop_size/* \
+    src/res/qml/utilities_page/alarm_clock/*
diff --git a/src/res/qml/utilities_page/UtilitiesPage.qml b/src/res/qml/utilities_page/UtilitiesPage.qml
index 6a8fcc7..146d60d 100644
--- a/src/res/qml/utilities_page/UtilitiesPage.qml
+++ b/src/res/qml/utilities_page/UtilitiesPage.qml
@@ -3,6 +3,9 @@ import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
 import "media_keys"
+import "alarm_clock"
+import "desktop_size"
+import "keyboard_utils"
 import ".."
 
 MyStackViewPage {
@@ -11,7 +14,6 @@ MyStackViewPage {
     content: ColumnLayout {
         spacing: 18
 
-
         KeyboardGroupBox {
             id: keyboardGroupBox
         }
diff --git a/src/res/qml/utilities_page/AlarmGroupBox.qml b/src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml
similarity index 99%
rename from src/res/qml/utilities_page/AlarmGroupBox.qml
rename to src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml
index 64ecab2..445c25f 100644
--- a/src/res/qml/utilities_page/AlarmGroupBox.qml
+++ b/src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml
@@ -2,8 +2,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
-import "media_keys"
-import ".."
+import "../.."
 
 GroupBox {
     id: alarmGroupBox
diff --git a/src/res/qml/utilities_page/SteamDesktopGroupBox.qml b/src/res/qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml
similarity index 99%
rename from src/res/qml/utilities_page/SteamDesktopGroupBox.qml
rename to src/res/qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml
index 7d08bc3..b43a0c2 100644
--- a/src/res/qml/utilities_page/SteamDesktopGroupBox.qml
+++ b/src/res/qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml
@@ -2,8 +2,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
-import "media_keys"
-import ".."
+import "../.."
 
 GroupBox {
     id: steamDesktopGroupBox
diff --git a/src/res/qml/utilities_page/KeyboardGroupBox.qml b/src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml
similarity index 98%
rename from src/res/qml/utilities_page/KeyboardGroupBox.qml
rename to src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml
index f664c4b..9100064 100644
--- a/src/res/qml/utilities_page/KeyboardGroupBox.qml
+++ b/src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml
@@ -2,8 +2,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
-import "media_keys"
-import ".."
+import "../.."
 
 GroupBox {
     id: keyboardGroupBox