Move common elements into /common/ and change imports

Elements work like they've always done, this just moves the commonly
used components away from the global namespace.

The qmldir file still does something, although at this point it is
unknown exactly how it's used and whether or not it could be changed to
simplify imports across the block.

src/main.cpp

@@ -425,7 +425,7 @@ int main( int argc, char* argv[] )
 
         QString path = QStandardPaths::locate(
             QStandardPaths::AppDataLocation,
-            QStringLiteral( "res/qml/mainwidget.qml" ) );
+            QStringLiteral( "res/qml/common/mainwidget.qml" ) );
 
         QQmlComponent component( &qmlEngine, QUrl::fromLocalFile( path ) );
         auto errors = component.errors();

src/res/qml/AccessibilityPage.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 "common"
 
 
 MyStackViewPage {

src/res/qml/ChaperonePage.qml

@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.3
 import QtQuick.Dialogs 1.2
 import matzman666.advsettings 1.0
 import "." // QTBUG-34418, singletons require explicit import to load qmldir file
+import "common"
 
 MyStackViewPage {
     headerText: "Chaperone Settings"

src/res/qml/ChaperoneWarningsPage.qml

@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.3
 import QtQuick.Dialogs 1.2
 import matzman666.advsettings 1.0
 import "." // QTBUG-34418, singletons require explicit import to load qmldir file
+import "common"
 
 MyStackViewPage {
     headerText: "Chaperone Proximity Warning Settings"

src/res/qml/FixFloorPage.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 "common"
 
 
 MyStackViewPage {

src/res/qml/PlayspacePage.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 "common"
 
 
 MyStackViewPage {

src/res/qml/RevivePage.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 "common"
 
 MyStackViewPage {
     headerText: "Revive Settings"

src/res/qml/RootPage.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
 import "." // QTBUG-34418, singletons require explicit import to load qmldir file
+import "common"
 import "utilities_page"
 import "audio_page"
 

src/res/qml/SettingsPage.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 "common"
 
 MyStackViewPage {
     headerText: "Application Settings"

src/res/qml/StatisticsPage.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 "common"
 
 
 MyStackViewPage {

src/res/qml/SteamVRPage.qml

@@ -2,6 +2,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
+import "common"
 
 MyStackViewPage {
     id: myStackViewPage1

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 ".." //common imports
+import "../common"
 import "device_selector"
 import "proximity"
 import "push_to_talk"

src/res/qml/audio_page/device_selector/AudioDeviceSelector.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 "../.." // common imports
+import "../../common"
 
 RowLayout {
     id: audioPlaybackNameCombo

src/res/qml/audio_page/device_selector/MicDeviceSelector.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 "../.." //common imports
+import "../../common"
 
 RowLayout {
     id: audioMicNameCombo

src/res/qml/audio_page/device_selector/MicVolumeSlider.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 "../.." //common imports
+import "../../common"
 
 ColumnLayout {
     spacing: 18

src/res/qml/audio_page/device_selector/MirrorDeviceSelector.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 "../.." //common imports
+import "../../common"
 
 RowLayout {
     id: audioMirrorNameCombo

src/res/qml/audio_page/device_selector/MirrorVolumeSlider.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 "../.." //common imports
+import "../../common"
 import "."
 
 ColumnLayout {

src/res/qml/audio_page/dialog_boxes/AudioDeleteProfileDialog.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 "../.." //common imports
+import "../../common"
 
 MyDialogOkCancelPopup {
     id: audioDeleteProfileDialog

src/res/qml/audio_page/dialog_boxes/AudioMessageDialog.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 "../.." //common imports
+import "../../common"
 
 MyDialogOkPopup {
     id: audioMessageDialog

src/res/qml/audio_page/dialog_boxes/AudioNewProfileDialog.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 "../.." //common imports
+import "../../common"
 
 MyDialogOkCancelPopup {
     id: audioNewProfileDialog

src/res/qml/audio_page/dialog_boxes/PttDeleteProfileDialog.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 "../.." //common imports
+import "../../common"
 
 MyDialogOkCancelPopup {
     id: pttDeleteProfileDialog

src/res/qml/audio_page/dialog_boxes/PttNewProfileDialog.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 "../.." //common imports
+import "../../common"
 
 MyDialogOkCancelPopup {
     id: pttNewProfileDialog

src/res/qml/audio_page/profiles/ProfileButtons.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 "../.." //common imports
+import "../../common"
 import "../dialog_boxes"
 
 ColumnLayout {

src/res/qml/audio_page/proximity/ProximityToggle.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 "../.." //common imports
+import "../../common"
 
 MyToggleButton {
     id: audioMuteProximitySensorToggle

src/res/qml/audio_page/push_to_talk/PttButtons.qml

@@ -2,7 +2,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
-import "../.." //common imports
+import "../../common"
+
 ColumnLayout {
     RowLayout {
         PttControllerConfigDialog {

src/res/qml/common/MyStackViewPage.qml

@@ -2,6 +2,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.2
 import "." // QTBUG-34418, singletons require explicit import to load qmldir file
+// Needed for MyResources in the default folder.
+import ".."
 
 Rectangle {
     color: "#1b2939"

src/res/qml/common/MyToggleButton.qml

@@ -1,7 +1,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.0
 import "." // QTBUG-34418, singletons require explicit import to load qmldir file
-
+// Needed for MyResources in the default folder.
+import ".."
 
 CheckBox {
     checkState: Qt.Checked

src/res/qml/common/mainwidget.qml

@@ -1,8 +1,9 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.0
-import "utilities_page"
-import "audio_page"
+import ".."
+import "../utilities_page"
+import "../audio_page"
 
 Rectangle {
     id: root

src/res/qml/qmldir

@@ -1 +1 @@
-singleton MyResources 1.0 MyResources.qml
+singleton MyResources 1.0 common/MyResources.qml

src/res/qml/utilities_page/UtilitiesPage.qml

@@ -6,7 +6,7 @@ import "media_keys"
 import "alarm_clock"
 import "desktop_size"
 import "keyboard_utils"
-import ".."
+import "../common"
 
 MyStackViewPage {
     headerText: "Utilities"

src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.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 "../.."
+import "../../common"
 
 GroupBox {
     id: alarmGroupBox

src/res/qml/utilities_page/desktop_size/SteamDesktopGroupBox.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 "../.."
+import "../../common"
 
 GroupBox {
     id: steamDesktopGroupBox

src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.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 "../.."
+import "../../common"
 
 GroupBox {
     id: keyboardGroupBox

src/res/qml/utilities_page/media_keys/MediaButton.qml

@@ -2,8 +2,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
-// Necessary for the project specific Components.
-import "../.."
+import "../../common"
 
 MyPushButton2 {
     // Public properties

src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml

@@ -2,8 +2,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
-// Necessary for the project specific Components.
-import "../.."
+import "../../common"
 
 GroupBox {
     id: mediaKeysGroupBox