diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ce4e211d..0a00d137 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -225,7 +225,7 @@ ecm_add_app_icon(kasts ICONS ${kasts_ICONS_PNG} ../icons/128-apps-kasts.png ) -kconfig_add_kcfg_files(kasts settingsmanager.kcfgc GENERATE_MOC) +kconfig_target_kcfg_file(kasts FILE settingsmanager.kcfg CLASS_NAME SettingsManager MUTATORS GENERATE_PROPERTIES DEFAULT_VALUE_GETTERS PARENT_IN_CONSTRUCTOR SINGLETON GENERATE_MOC QML_REGISTRATION) target_include_directories(kasts PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/utils ${CMAKE_CURRENT_SOURCE_DIR}/sync) target_link_libraries(kasts PRIVATE Qt::Core Qt::Qml Qt::Quick Qt::QuickControls2 Qt::Sql Qt::Svg Qt::Xml Qt::Network KF6::Kirigami KF6::Syndication KF6::CoreAddons KF6::ConfigGui KF6::I18n Taglib::Taglib ${QTKEYCHAIN_LIBRARIES} KF6::ThreadWeaver KF6::ColorScheme KMediaSession) diff --git a/src/main.cpp b/src/main.cpp index 30acdd5c..07a5491c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -129,8 +129,6 @@ int main(int argc, char *argv[]) } about.processCommandLine(&parser); - qmlRegisterSingletonInstance("org.kde.kasts.settings", 1, 0, "SettingsManager", SettingsManager::self()); - if (!SettingsManager::self()->colorScheme().isEmpty()) { ColorSchemer::instance().apply(SettingsManager::self()->colorScheme()); } diff --git a/src/qml/ChapterListDelegate.qml b/src/qml/ChapterListDelegate.qml index 52e2448a..b6398621 100644 --- a/src/qml/ChapterListDelegate.qml +++ b/src/qml/ChapterListDelegate.qml @@ -14,7 +14,6 @@ import org.kde.kirigamiaddons.delegates as AddonDelegates import org.kde.kmediasession import org.kde.kasts -import org.kde.kasts.settings AddonDelegates.RoundedItemDelegate { id: root diff --git a/src/qml/ConnectionCheckAction.qml b/src/qml/ConnectionCheckAction.qml index e27e1df1..9f4a182e 100644 --- a/src/qml/ConnectionCheckAction.qml +++ b/src/qml/ConnectionCheckAction.qml @@ -12,7 +12,6 @@ import org.kde.kirigami as Kirigami import org.kde.kirigamiaddons.delegates as Delegates import org.kde.kasts -import org.kde.kasts.settings Kirigami.Dialog { id: overlay diff --git a/src/qml/Desktop/DesktopPlayerControls.qml b/src/qml/Desktop/DesktopPlayerControls.qml index 513d3337..0d33bac9 100644 --- a/src/qml/Desktop/DesktopPlayerControls.qml +++ b/src/qml/Desktop/DesktopPlayerControls.qml @@ -13,7 +13,6 @@ import org.kde.kirigami as Kirigami import org.kde.kmediasession import org.kde.kasts -import org.kde.kasts.settings import ".." diff --git a/src/qml/EntryPage.qml b/src/qml/EntryPage.qml index fba682af..e5cdb5c3 100644 --- a/src/qml/EntryPage.qml +++ b/src/qml/EntryPage.qml @@ -13,7 +13,6 @@ import org.kde.kirigami as Kirigami import org.kde.kmediasession import org.kde.kasts -import org.kde.kasts.settings Kirigami.ScrollablePage { id: page diff --git a/src/qml/GenericEntryDelegate.qml b/src/qml/GenericEntryDelegate.qml index 4dffaa22..c5d88bb5 100644 --- a/src/qml/GenericEntryDelegate.qml +++ b/src/qml/GenericEntryDelegate.qml @@ -14,7 +14,6 @@ import org.kde.kirigamiaddons.delegates as AddonDelegates import org.kde.kmediasession import org.kde.kasts -import org.kde.kasts.settings AddonDelegates.RoundedItemDelegate { id: listItem diff --git a/src/qml/ImageWithFallback.qml b/src/qml/ImageWithFallback.qml index 9b52b747..18213059 100644 --- a/src/qml/ImageWithFallback.qml +++ b/src/qml/ImageWithFallback.qml @@ -13,7 +13,6 @@ import QtQuick.Window import org.kde.kirigami as Kirigami import org.kde.kasts -import org.kde.kasts.settings Item { id: root diff --git a/src/qml/Main.qml b/src/qml/Main.qml index 84ca658d..7ecbb985 100644 --- a/src/qml/Main.qml +++ b/src/qml/Main.qml @@ -15,7 +15,6 @@ import org.kde.kirigami as Kirigami import org.kde.config as KConfig import org.kde.kasts -import org.kde.kasts.settings import "Desktop" import "Mobile" diff --git a/src/qml/Mobile/MobilePlayerControls.qml b/src/qml/Mobile/MobilePlayerControls.qml index 3a23d069..41e06979 100644 --- a/src/qml/Mobile/MobilePlayerControls.qml +++ b/src/qml/Mobile/MobilePlayerControls.qml @@ -14,7 +14,6 @@ import org.kde.kirigami as Kirigami import org.kde.kmediasession import org.kde.kasts -import org.kde.kasts.settings import ".." diff --git a/src/qml/PlaybackRateCustomizerDialog.qml b/src/qml/PlaybackRateCustomizerDialog.qml index b6612bfc..c24f46bd 100644 --- a/src/qml/PlaybackRateCustomizerDialog.qml +++ b/src/qml/PlaybackRateCustomizerDialog.qml @@ -10,7 +10,6 @@ import QtQuick.Layouts import org.kde.kirigami as Kirigami import org.kde.kasts -import org.kde.kasts.settings Kirigami.Dialog { id: customizeRatesDialog diff --git a/src/qml/PlaybackRateMenu.qml b/src/qml/PlaybackRateMenu.qml index 671eaea8..a5c8f463 100644 --- a/src/qml/PlaybackRateMenu.qml +++ b/src/qml/PlaybackRateMenu.qml @@ -10,7 +10,6 @@ import QtQuick.Layouts import org.kde.kirigami as Kirigami import org.kde.kasts -import org.kde.kasts.settings Controls.Menu { id: playbackRateMenu diff --git a/src/qml/Settings/AppearanceSettingsPage.qml b/src/qml/Settings/AppearanceSettingsPage.qml index 2a6ba61c..74dbc610 100644 --- a/src/qml/Settings/AppearanceSettingsPage.qml +++ b/src/qml/Settings/AppearanceSettingsPage.qml @@ -14,7 +14,6 @@ import org.kde.kirigamiaddons.formcard as FormCard import org.kde.kmediasession import org.kde.kasts -import org.kde.kasts.settings FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/GeneralSettingsPage.qml b/src/qml/Settings/GeneralSettingsPage.qml index c3b83212..d7df7e43 100644 --- a/src/qml/Settings/GeneralSettingsPage.qml +++ b/src/qml/Settings/GeneralSettingsPage.qml @@ -14,7 +14,6 @@ import org.kde.kirigamiaddons.formcard as FormCard import org.kde.kmediasession import org.kde.kasts -import org.kde.kasts.settings FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/NetworkSettingsPage.qml b/src/qml/Settings/NetworkSettingsPage.qml index dada517d..540bfbd4 100644 --- a/src/qml/Settings/NetworkSettingsPage.qml +++ b/src/qml/Settings/NetworkSettingsPage.qml @@ -15,7 +15,6 @@ import org.kde.kirigamiaddons.formcard as FormCard import org.kde.kirigamiaddons.labs.components as Addons import org.kde.kasts -import org.kde.kasts.settings FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/StorageSettingsPage.qml b/src/qml/Settings/StorageSettingsPage.qml index 38c77b9b..c5c19d6a 100644 --- a/src/qml/Settings/StorageSettingsPage.qml +++ b/src/qml/Settings/StorageSettingsPage.qml @@ -13,7 +13,6 @@ import org.kde.kirigami as Kirigami import org.kde.kirigamiaddons.formcard as FormCard import org.kde.kasts -import org.kde.kasts.settings FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/SynchronizationSettingsPage.qml b/src/qml/Settings/SynchronizationSettingsPage.qml index 7bed8a09..97337cb7 100644 --- a/src/qml/Settings/SynchronizationSettingsPage.qml +++ b/src/qml/Settings/SynchronizationSettingsPage.qml @@ -14,7 +14,6 @@ import org.kde.kirigamiaddons.delegates as Delegates import org.kde.kirigamiaddons.formcard as FormCard import org.kde.kasts -import org.kde.kasts.settings import ".." diff --git a/src/qml/SleepTimerDialog.qml b/src/qml/SleepTimerDialog.qml index 9967f211..b2e7ac26 100644 --- a/src/qml/SleepTimerDialog.qml +++ b/src/qml/SleepTimerDialog.qml @@ -10,7 +10,6 @@ import QtQuick.Layouts import org.kde.kirigami as Kirigami import org.kde.kasts -import org.kde.kasts.settings Kirigami.Dialog { id: sleepTimerDialog diff --git a/src/qml/SyncPasswordOverlay.qml b/src/qml/SyncPasswordOverlay.qml index 8c50ff1f..a2fc2056 100644 --- a/src/qml/SyncPasswordOverlay.qml +++ b/src/qml/SyncPasswordOverlay.qml @@ -11,7 +11,6 @@ import QtQuick.Layouts import org.kde.kirigami as Kirigami import org.kde.kasts -import org.kde.kasts.settings Kirigami.Dialog { id: syncPasswordOverlay diff --git a/src/settingsmanager.kcfgc b/src/settingsmanager.kcfgc deleted file mode 100644 index fd84cc33..00000000 --- a/src/settingsmanager.kcfgc +++ /dev/null @@ -1,7 +0,0 @@ -File=settingsmanager.kcfg -ClassName=SettingsManager -Mutators=true -DefaultValueGetters=true -GenerateProperties=true -ParentInConstructor=true -Singleton=true