From 76507bd6029c131c8d828f0982bd8b1dd8500506 Mon Sep 17 00:00:00 2001 From: Vasily Date: Sat, 2 Feb 2019 13:31:02 +0100 Subject: [PATCH] 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. --- advancedSettings.pro | 1 + src/main.cpp | 2 +- src/res/qml/AccessibilityPage.qml | 2 +- src/res/qml/ChaperonePage.qml | 1 + src/res/qml/ChaperoneWarningsPage.qml | 1 + src/res/qml/FixFloorPage.qml | 2 +- src/res/qml/PlayspacePage.qml | 2 +- src/res/qml/RevivePage.qml | 2 +- src/res/qml/RootPage.qml | 1 + src/res/qml/SettingsPage.qml | 2 +- src/res/qml/StatisticsPage.qml | 2 +- src/res/qml/SteamVRPage.qml | 1 + src/res/qml/audio_page/AudioPage.qml | 2 +- .../qml/audio_page/device_selector/AudioDeviceSelector.qml | 2 +- src/res/qml/audio_page/device_selector/MicDeviceSelector.qml | 2 +- src/res/qml/audio_page/device_selector/MicVolumeSlider.qml | 2 +- .../qml/audio_page/device_selector/MirrorDeviceSelector.qml | 2 +- .../qml/audio_page/device_selector/MirrorVolumeSlider.qml | 2 +- .../qml/audio_page/dialog_boxes/AudioDeleteProfileDialog.qml | 2 +- src/res/qml/audio_page/dialog_boxes/AudioMessageDialog.qml | 2 +- .../qml/audio_page/dialog_boxes/AudioNewProfileDialog.qml | 2 +- .../qml/audio_page/dialog_boxes/PttDeleteProfileDialog.qml | 2 +- src/res/qml/audio_page/dialog_boxes/PttNewProfileDialog.qml | 2 +- src/res/qml/audio_page/profiles/ProfileButtons.qml | 2 +- src/res/qml/audio_page/proximity/ProximityToggle.qml | 2 +- src/res/qml/audio_page/push_to_talk/PttButtons.qml | 3 ++- src/res/qml/{ => common}/LineSeparator.qml | 0 src/res/qml/{ => common}/MyComboBox.qml | 0 src/res/qml/{ => common}/MyDialogOkCancelPopup.qml | 0 src/res/qml/{ => common}/MyDialogOkPopup.qml | 0 src/res/qml/{ => common}/MyPushButton.qml | 0 src/res/qml/{ => common}/MyPushButton2.qml | 0 src/res/qml/{ => common}/MyResources.qml | 0 src/res/qml/{ => common}/MySlider.qml | 0 src/res/qml/{ => common}/MyStackViewPage.qml | 2 ++ src/res/qml/{ => common}/MyText.qml | 0 src/res/qml/{ => common}/MyTextField.qml | 0 src/res/qml/{ => common}/MyToggleButton.qml | 3 ++- src/res/qml/{ => common}/PttControllerConfigDialog.qml | 0 src/res/qml/{ => common}/backarrow.svg | 0 src/res/qml/{ => common}/check.svg | 0 src/res/qml/{ => common}/mainwidget.qml | 5 +++-- src/res/qml/qmldir | 2 +- src/res/qml/utilities_page/UtilitiesPage.qml | 2 +- src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml | 2 +- .../qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml | 2 +- .../qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml | 2 +- src/res/qml/utilities_page/media_keys/MediaButton.qml | 3 +-- .../qml/utilities_page/media_keys/MediaControllerKeys.qml | 3 +-- 49 files changed, 41 insertions(+), 33 deletions(-) rename src/res/qml/{ => common}/LineSeparator.qml (100%) rename src/res/qml/{ => common}/MyComboBox.qml (100%) rename src/res/qml/{ => common}/MyDialogOkCancelPopup.qml (100%) rename src/res/qml/{ => common}/MyDialogOkPopup.qml (100%) rename src/res/qml/{ => common}/MyPushButton.qml (100%) rename src/res/qml/{ => common}/MyPushButton2.qml (100%) rename src/res/qml/{ => common}/MyResources.qml (100%) rename src/res/qml/{ => common}/MySlider.qml (100%) rename src/res/qml/{ => common}/MyStackViewPage.qml (97%) rename src/res/qml/{ => common}/MyText.qml (100%) rename src/res/qml/{ => common}/MyTextField.qml (100%) rename src/res/qml/{ => common}/MyToggleButton.qml (95%) rename src/res/qml/{ => common}/PttControllerConfigDialog.qml (100%) rename src/res/qml/{ => common}/backarrow.svg (100%) rename src/res/qml/{ => common}/check.svg (100%) rename src/res/qml/{ => common}/mainwidget.qml (97%) diff --git a/advancedSettings.pro b/advancedSettings.pro index d17cf62..4a48a5a 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -169,3 +169,4 @@ DISTFILES += \ src/res/qml/audio_page/proximity/* \ src/res/qml/audio_page/push_to_talk/* \ src/res/qml/audio_page/profiles/* \ + src/res/qml/common/* \ diff --git a/src/main.cpp b/src/main.cpp index cbc85c6..19d7670 100644 --- a/src/main.cpp +++ b/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(); diff --git a/src/res/qml/AccessibilityPage.qml b/src/res/qml/AccessibilityPage.qml index 7e59d8b..0a458eb 100644 --- a/src/res/qml/AccessibilityPage.qml +++ b/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 { diff --git a/src/res/qml/ChaperonePage.qml b/src/res/qml/ChaperonePage.qml index 6fbe5ef..a7e60a2 100644 --- a/src/res/qml/ChaperonePage.qml +++ b/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" diff --git a/src/res/qml/ChaperoneWarningsPage.qml b/src/res/qml/ChaperoneWarningsPage.qml index 1064838..426b45b 100644 --- a/src/res/qml/ChaperoneWarningsPage.qml +++ b/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" diff --git a/src/res/qml/FixFloorPage.qml b/src/res/qml/FixFloorPage.qml index aa1704f..6e2889a 100644 --- a/src/res/qml/FixFloorPage.qml +++ b/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 { diff --git a/src/res/qml/PlayspacePage.qml b/src/res/qml/PlayspacePage.qml index bd58685..a60b094 100644 --- a/src/res/qml/PlayspacePage.qml +++ b/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 { diff --git a/src/res/qml/RevivePage.qml b/src/res/qml/RevivePage.qml index 46f1c93..b85783b 100644 --- a/src/res/qml/RevivePage.qml +++ b/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" diff --git a/src/res/qml/RootPage.qml b/src/res/qml/RootPage.qml index af391c7..257eaed 100644 --- a/src/res/qml/RootPage.qml +++ b/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" diff --git a/src/res/qml/SettingsPage.qml b/src/res/qml/SettingsPage.qml index 9f067e2..250edf3 100644 --- a/src/res/qml/SettingsPage.qml +++ b/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" diff --git a/src/res/qml/StatisticsPage.qml b/src/res/qml/StatisticsPage.qml index 5d2773e..fb18b40 100644 --- a/src/res/qml/StatisticsPage.qml +++ b/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 { diff --git a/src/res/qml/SteamVRPage.qml b/src/res/qml/SteamVRPage.qml index 4119631..7230f55 100644 --- a/src/res/qml/SteamVRPage.qml +++ b/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 diff --git a/src/res/qml/audio_page/AudioPage.qml b/src/res/qml/audio_page/AudioPage.qml index dbec66b..54c6efa 100644 --- a/src/res/qml/audio_page/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 ".." //common imports +import "../common" import "device_selector" import "proximity" import "push_to_talk" diff --git a/src/res/qml/audio_page/device_selector/AudioDeviceSelector.qml b/src/res/qml/audio_page/device_selector/AudioDeviceSelector.qml index 0313b16..34b8861 100644 --- a/src/res/qml/audio_page/device_selector/AudioDeviceSelector.qml +++ b/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 diff --git a/src/res/qml/audio_page/device_selector/MicDeviceSelector.qml b/src/res/qml/audio_page/device_selector/MicDeviceSelector.qml index 8f0179a..53e8613 100644 --- a/src/res/qml/audio_page/device_selector/MicDeviceSelector.qml +++ b/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 diff --git a/src/res/qml/audio_page/device_selector/MicVolumeSlider.qml b/src/res/qml/audio_page/device_selector/MicVolumeSlider.qml index d78f8a1..ce0a684 100644 --- a/src/res/qml/audio_page/device_selector/MicVolumeSlider.qml +++ b/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 diff --git a/src/res/qml/audio_page/device_selector/MirrorDeviceSelector.qml b/src/res/qml/audio_page/device_selector/MirrorDeviceSelector.qml index 51dd936..d27acde 100644 --- a/src/res/qml/audio_page/device_selector/MirrorDeviceSelector.qml +++ b/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 diff --git a/src/res/qml/audio_page/device_selector/MirrorVolumeSlider.qml b/src/res/qml/audio_page/device_selector/MirrorVolumeSlider.qml index 8709f4b..7add052 100644 --- a/src/res/qml/audio_page/device_selector/MirrorVolumeSlider.qml +++ b/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 { diff --git a/src/res/qml/audio_page/dialog_boxes/AudioDeleteProfileDialog.qml b/src/res/qml/audio_page/dialog_boxes/AudioDeleteProfileDialog.qml index 32fc49c..7067252 100644 --- a/src/res/qml/audio_page/dialog_boxes/AudioDeleteProfileDialog.qml +++ b/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 diff --git a/src/res/qml/audio_page/dialog_boxes/AudioMessageDialog.qml b/src/res/qml/audio_page/dialog_boxes/AudioMessageDialog.qml index c9cc549..1753410 100644 --- a/src/res/qml/audio_page/dialog_boxes/AudioMessageDialog.qml +++ b/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 diff --git a/src/res/qml/audio_page/dialog_boxes/AudioNewProfileDialog.qml b/src/res/qml/audio_page/dialog_boxes/AudioNewProfileDialog.qml index d899de1..1b03952 100644 --- a/src/res/qml/audio_page/dialog_boxes/AudioNewProfileDialog.qml +++ b/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 diff --git a/src/res/qml/audio_page/dialog_boxes/PttDeleteProfileDialog.qml b/src/res/qml/audio_page/dialog_boxes/PttDeleteProfileDialog.qml index 9d53ea5..ad28477 100644 --- a/src/res/qml/audio_page/dialog_boxes/PttDeleteProfileDialog.qml +++ b/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 diff --git a/src/res/qml/audio_page/dialog_boxes/PttNewProfileDialog.qml b/src/res/qml/audio_page/dialog_boxes/PttNewProfileDialog.qml index 45ef8d3..a2d293f 100644 --- a/src/res/qml/audio_page/dialog_boxes/PttNewProfileDialog.qml +++ b/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 diff --git a/src/res/qml/audio_page/profiles/ProfileButtons.qml b/src/res/qml/audio_page/profiles/ProfileButtons.qml index 87c6cae..b7c3d84 100644 --- a/src/res/qml/audio_page/profiles/ProfileButtons.qml +++ b/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 { diff --git a/src/res/qml/audio_page/proximity/ProximityToggle.qml b/src/res/qml/audio_page/proximity/ProximityToggle.qml index 1ce982f..d6734c8 100644 --- a/src/res/qml/audio_page/proximity/ProximityToggle.qml +++ b/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 diff --git a/src/res/qml/audio_page/push_to_talk/PttButtons.qml b/src/res/qml/audio_page/push_to_talk/PttButtons.qml index 9378cde..37e84e6 100644 --- a/src/res/qml/audio_page/push_to_talk/PttButtons.qml +++ b/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 { diff --git a/src/res/qml/LineSeparator.qml b/src/res/qml/common/LineSeparator.qml similarity index 100% rename from src/res/qml/LineSeparator.qml rename to src/res/qml/common/LineSeparator.qml diff --git a/src/res/qml/MyComboBox.qml b/src/res/qml/common/MyComboBox.qml similarity index 100% rename from src/res/qml/MyComboBox.qml rename to src/res/qml/common/MyComboBox.qml diff --git a/src/res/qml/MyDialogOkCancelPopup.qml b/src/res/qml/common/MyDialogOkCancelPopup.qml similarity index 100% rename from src/res/qml/MyDialogOkCancelPopup.qml rename to src/res/qml/common/MyDialogOkCancelPopup.qml diff --git a/src/res/qml/MyDialogOkPopup.qml b/src/res/qml/common/MyDialogOkPopup.qml similarity index 100% rename from src/res/qml/MyDialogOkPopup.qml rename to src/res/qml/common/MyDialogOkPopup.qml diff --git a/src/res/qml/MyPushButton.qml b/src/res/qml/common/MyPushButton.qml similarity index 100% rename from src/res/qml/MyPushButton.qml rename to src/res/qml/common/MyPushButton.qml diff --git a/src/res/qml/MyPushButton2.qml b/src/res/qml/common/MyPushButton2.qml similarity index 100% rename from src/res/qml/MyPushButton2.qml rename to src/res/qml/common/MyPushButton2.qml diff --git a/src/res/qml/MyResources.qml b/src/res/qml/common/MyResources.qml similarity index 100% rename from src/res/qml/MyResources.qml rename to src/res/qml/common/MyResources.qml diff --git a/src/res/qml/MySlider.qml b/src/res/qml/common/MySlider.qml similarity index 100% rename from src/res/qml/MySlider.qml rename to src/res/qml/common/MySlider.qml diff --git a/src/res/qml/MyStackViewPage.qml b/src/res/qml/common/MyStackViewPage.qml similarity index 97% rename from src/res/qml/MyStackViewPage.qml rename to src/res/qml/common/MyStackViewPage.qml index b30140a..e2c8202 100644 --- a/src/res/qml/MyStackViewPage.qml +++ b/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" diff --git a/src/res/qml/MyText.qml b/src/res/qml/common/MyText.qml similarity index 100% rename from src/res/qml/MyText.qml rename to src/res/qml/common/MyText.qml diff --git a/src/res/qml/MyTextField.qml b/src/res/qml/common/MyTextField.qml similarity index 100% rename from src/res/qml/MyTextField.qml rename to src/res/qml/common/MyTextField.qml diff --git a/src/res/qml/MyToggleButton.qml b/src/res/qml/common/MyToggleButton.qml similarity index 95% rename from src/res/qml/MyToggleButton.qml rename to src/res/qml/common/MyToggleButton.qml index 0dd6961..15bc180 100644 --- a/src/res/qml/MyToggleButton.qml +++ b/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 diff --git a/src/res/qml/PttControllerConfigDialog.qml b/src/res/qml/common/PttControllerConfigDialog.qml similarity index 100% rename from src/res/qml/PttControllerConfigDialog.qml rename to src/res/qml/common/PttControllerConfigDialog.qml diff --git a/src/res/qml/backarrow.svg b/src/res/qml/common/backarrow.svg similarity index 100% rename from src/res/qml/backarrow.svg rename to src/res/qml/common/backarrow.svg diff --git a/src/res/qml/check.svg b/src/res/qml/common/check.svg similarity index 100% rename from src/res/qml/check.svg rename to src/res/qml/common/check.svg diff --git a/src/res/qml/mainwidget.qml b/src/res/qml/common/mainwidget.qml similarity index 97% rename from src/res/qml/mainwidget.qml rename to src/res/qml/common/mainwidget.qml index 91953b5..3853a84 100644 --- a/src/res/qml/mainwidget.qml +++ b/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 diff --git a/src/res/qml/qmldir b/src/res/qml/qmldir index ec338c0..0c28c5d 100644 --- a/src/res/qml/qmldir +++ b/src/res/qml/qmldir @@ -1 +1 @@ -singleton MyResources 1.0 MyResources.qml \ No newline at end of file +singleton MyResources 1.0 common/MyResources.qml diff --git a/src/res/qml/utilities_page/UtilitiesPage.qml b/src/res/qml/utilities_page/UtilitiesPage.qml index 146d60d..bbbe178 100644 --- a/src/res/qml/utilities_page/UtilitiesPage.qml +++ b/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" diff --git a/src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml b/src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml index 445c25f..0a24306 100644 --- a/src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml +++ b/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 diff --git a/src/res/qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml b/src/res/qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml index b43a0c2..e05cfd7 100644 --- a/src/res/qml/utilities_page/desktop_size/SteamDesktopGroupBox.qml +++ b/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 diff --git a/src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml b/src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml index 9100064..6d912af 100644 --- a/src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml +++ b/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 diff --git a/src/res/qml/utilities_page/media_keys/MediaButton.qml b/src/res/qml/utilities_page/media_keys/MediaButton.qml index 6536290..c1f94bc 100644 --- a/src/res/qml/utilities_page/media_keys/MediaButton.qml +++ b/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 diff --git a/src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml b/src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml index 0e0f094..a22c4ae 100644 --- a/src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml +++ b/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