diff --git a/advancedSettings.pro b/advancedSettings.pro index 4c17b2a..84d1f91 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -158,6 +158,6 @@ DISTFILES += \ src/res/qml/SettingsPage.qml \ src/res/qml/StatisticsPage.qml \ src/res/qml/SteamVRPage.qml \ - src/res/qml/UtilitiesPage.qml \ - src/res/qml/media_keys/* \ + src/res/qml/utilities_page/* \ + src/res/qml/utilities_page/media_keys/* \ src/res/qml/LineSeparator.qml diff --git a/src/res/qml/RootPage.qml b/src/res/qml/RootPage.qml index 1580e3f..04162b4 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 "utilities_page" MyStackViewPage { id: rootPage diff --git a/src/res/qml/mainwidget.qml b/src/res/qml/mainwidget.qml index 01fd8f0..e5f8f54 100644 --- a/src/res/qml/mainwidget.qml +++ b/src/res/qml/mainwidget.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.0 - +import "utilities_page" Rectangle { id: root diff --git a/src/res/qml/UtilitiesPage.qml b/src/res/qml/utilities_page/UtilitiesPage.qml similarity index 99% rename from src/res/qml/UtilitiesPage.qml rename to src/res/qml/utilities_page/UtilitiesPage.qml index 7a10d02..609a839 100644 --- a/src/res/qml/UtilitiesPage.qml +++ b/src/res/qml/utilities_page/UtilitiesPage.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 import matzman666.advsettings 1.0 import "media_keys" +import ".." MyStackViewPage { headerText: "Utilities" diff --git a/src/res/qml/media_keys/MediaButton.qml b/src/res/qml/utilities_page/media_keys/MediaButton.qml similarity index 98% rename from src/res/qml/media_keys/MediaButton.qml rename to src/res/qml/utilities_page/media_keys/MediaButton.qml index f9cb7c0..6536290 100644 --- a/src/res/qml/media_keys/MediaButton.qml +++ b/src/res/qml/utilities_page/media_keys/MediaButton.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 import matzman666.advsettings 1.0 // Necessary for the project specific Components. -import ".." +import "../.." MyPushButton2 { // Public properties diff --git a/src/res/qml/media_keys/MediaControllerKeys.qml b/src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml similarity index 99% rename from src/res/qml/media_keys/MediaControllerKeys.qml rename to src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml index d81da5f..0e0f094 100644 --- a/src/res/qml/media_keys/MediaControllerKeys.qml +++ b/src/res/qml/utilities_page/media_keys/MediaControllerKeys.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 import matzman666.advsettings 1.0 // Necessary for the project specific Components. -import ".." +import "../.." GroupBox { id: mediaKeysGroupBox diff --git a/src/res/qml/media_keys/outline_play_pause_white_24dp.svg b/src/res/qml/utilities_page/media_keys/outline_play_pause_white_24dp.svg similarity index 100% rename from src/res/qml/media_keys/outline_play_pause_white_24dp.svg rename to src/res/qml/utilities_page/media_keys/outline_play_pause_white_24dp.svg diff --git a/src/res/qml/media_keys/outline_skip_next_white_24dp.svg b/src/res/qml/utilities_page/media_keys/outline_skip_next_white_24dp.svg similarity index 100% rename from src/res/qml/media_keys/outline_skip_next_white_24dp.svg rename to src/res/qml/utilities_page/media_keys/outline_skip_next_white_24dp.svg diff --git a/src/res/qml/media_keys/outline_skip_previous_white_24dp.svg b/src/res/qml/utilities_page/media_keys/outline_skip_previous_white_24dp.svg similarity index 100% rename from src/res/qml/media_keys/outline_skip_previous_white_24dp.svg rename to src/res/qml/utilities_page/media_keys/outline_skip_previous_white_24dp.svg diff --git a/src/res/qml/media_keys/outline_stop_white_24dp.svg b/src/res/qml/utilities_page/media_keys/outline_stop_white_24dp.svg similarity index 100% rename from src/res/qml/media_keys/outline_stop_white_24dp.svg rename to src/res/qml/utilities_page/media_keys/outline_stop_white_24dp.svg