File haruna-qt512_2.patch of Package haruna

From 2889f5dae4c1878096ed29adcc91806c5d34bcb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Florea=20B=C4=83nu=C8=99?= <georgefb899@gmail.com>
Date: Thu, 15 Oct 2020 21:49:07 +0300
Subject: [PATCH] Change import uri for settings types

---
 src/application.cpp                   | 14 +++++++-------
 src/qml/Actions.qml                   |  2 +-
 src/qml/HProgressBar.qml              |  2 +-
 src/qml/Header.qml                    |  3 ++-
 src/qml/MpvVideo.qml                  |  7 +------
 src/qml/Osd.qml                       |  4 ++--
 src/qml/PlayList.qml                  |  4 ++--
 src/qml/PlayListItem.qml              |  4 ++--
 src/qml/Settings/Audio.qml            |  3 ++-
 src/qml/Settings/General.qml          |  2 +-
 src/qml/Settings/Mouse.qml            |  3 ++-
 src/qml/Settings/Playback.qml         |  2 +-
 src/qml/Settings/Playlist.qml         |  3 ++-
 src/qml/Settings/SettingsEditor.qml   |  8 ++++----
 src/qml/Settings/Subtitles.qml        |  2 +-
 src/qml/Settings/SubtitlesFolders.qml |  1 +
 src/qml/Settings/VideoSettings.qml    |  3 ++-
 src/qml/VolumeSlider.qml              |  3 ++-
 src/qml/main.qml                      |  5 ++---
 19 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/application.cpp b/src/application.cpp
index c59505f..914bfe1 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -40,13 +40,13 @@ Application::Application(QObject *parent)
 
 void Application::setupQmlSettingsTypes()
 {
-    qmlRegisterSingletonType<AudioSettings>("AudioSettings", 1, 0, "AudioSettings", &AudioSettings::provider);
-    qmlRegisterSingletonType<GeneralSettings>("GeneralSettings", 1, 0, "GeneralSettings", &GeneralSettings::provider);
-    qmlRegisterSingletonType<MouseSettings>("MouseSettings", 1, 0, "MouseSettings", &MouseSettings::provider);
-    qmlRegisterSingletonType<PlaybackSettings>("PlaybackSettings", 1, 0, "PlaybackSettings", &PlaybackSettings::provider);
-    qmlRegisterSingletonType<PlaylistSettings>("PlaylistSettings", 1, 0, "PlaylistSettings", &PlaylistSettings::provider);
-    qmlRegisterSingletonType<SubtitlesSettings>("SubtitlesSettings", 1, 0, "SubtitlesSettings", &SubtitlesSettings::provider);
-    qmlRegisterSingletonType<VideoSettings>("VideoSettings", 1, 0, "VideoSettings", &VideoSettings::provider);
+    qmlRegisterSingletonType<AudioSettings>("com.georgefb.haruna", 1, 0, "AudioSettings", &AudioSettings::provider);
+    qmlRegisterSingletonType<GeneralSettings>("com.georgefb.haruna", 1, 0, "GeneralSettings", &GeneralSettings::provider);
+    qmlRegisterSingletonType<MouseSettings>("com.georgefb.haruna", 1, 0, "MouseSettings", &MouseSettings::provider);
+    qmlRegisterSingletonType<PlaybackSettings>("com.georgefb.haruna", 1, 0, "PlaybackSettings", &PlaybackSettings::provider);
+    qmlRegisterSingletonType<PlaylistSettings>("com.georgefb.haruna", 1, 0, "PlaylistSettings", &PlaylistSettings::provider);
+    qmlRegisterSingletonType<SubtitlesSettings>("com.georgefb.haruna", 1, 0, "SubtitlesSettings", &SubtitlesSettings::provider);
+    qmlRegisterSingletonType<VideoSettings>("com.georgefb.haruna", 1, 0, "VideoSettings", &VideoSettings::provider);
 }
 
 QString Application::formatTime(const double time)
diff --git a/src/qml/Actions.qml b/src/qml/Actions.qml
index 516b4a9..72557a0 100644
--- a/src/qml/Actions.qml
+++ b/src/qml/Actions.qml
@@ -7,7 +7,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 
-import GeneralSettings 1.0
+import com.georgefb.haruna 1.0
 
 QtObject {
     id: root
diff --git a/src/qml/HProgressBar.qml b/src/qml/HProgressBar.qml
index ae11868..3b0dee0 100644
--- a/src/qml/HProgressBar.qml
+++ b/src/qml/HProgressBar.qml
@@ -11,7 +11,7 @@ import QtQuick.Layouts 1.12
 import QtQuick.Shapes 1.12
 import org.kde.kirigami 2.11 as Kirigami
 
-import PlaybackSettings 1.0
+import com.georgefb.haruna 1.0
 
 Slider {
     id: root
diff --git a/src/qml/Header.qml b/src/qml/Header.qml
index 273cf16..b21dc38 100644
--- a/src/qml/Header.qml
+++ b/src/qml/Header.qml
@@ -8,8 +8,9 @@ import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
 import QtQml 2.12
+
 import org.kde.kirigami 2.11 as Kirigami
-import GeneralSettings 1.0
+import com.georgefb.haruna 1.0
 
 import "Menus"
 
diff --git a/src/qml/MpvVideo.qml b/src/qml/MpvVideo.qml
index a5c22cd..8a8db7f 100644
--- a/src/qml/MpvVideo.qml
+++ b/src/qml/MpvVideo.qml
@@ -8,12 +8,7 @@ import QtQuick 2.12
 import QtQuick.Window 2.12
 import mpv 1.0
 
-import AudioSettings 1.0
-import GeneralSettings 1.0
-import MouseSettings 1.0
-import PlaybackSettings 1.0
-import SubtitlesSettings 1.0
-import VideoSettings 1.0
+import com.georgefb.haruna 1.0
 
 MpvObject {
     id: root
diff --git a/src/qml/Osd.qml b/src/qml/Osd.qml
index a5fdebc..3d15f39 100644
--- a/src/qml/Osd.qml
+++ b/src/qml/Osd.qml
@@ -6,9 +6,9 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import org.kde.kirigami 2.11 as Kirigami
 
-import GeneralSettings 1.0
+import org.kde.kirigami 2.11 as Kirigami
+import com.georgefb.haruna 1.0
 
 Item {
     id: root
diff --git a/src/qml/PlayList.qml b/src/qml/PlayList.qml
index 0b08522..ee35c4b 100644
--- a/src/qml/PlayList.qml
+++ b/src/qml/PlayList.qml
@@ -9,9 +9,9 @@ import QtQuick.Controls 2.12
 import QtQuick.Window 2.12
 import QtQuick.Layouts 1.12
 import QtGraphicalEffects 1.12
-import org.kde.kirigami 2.11 as Kirigami
 
-import PlaylistSettings 1.0
+import org.kde.kirigami 2.11 as Kirigami
+import com.georgefb.haruna 1.0
 
 Rectangle {
     id: root
diff --git a/src/qml/PlayListItem.qml b/src/qml/PlayListItem.qml
index 1a20622..89ff8ac 100644
--- a/src/qml/PlayListItem.qml
+++ b/src/qml/PlayListItem.qml
@@ -9,9 +9,9 @@ import QtQuick.Controls 2.12
 import QtQuick.Window 2.12
 import QtQuick.Layouts 1.12
 import QtGraphicalEffects 1.12
-import org.kde.kirigami 2.11 as Kirigami
 
-import PlaylistSettings 1.0
+import org.kde.kirigami 2.11 as Kirigami
+import com.georgefb.haruna 1.0
 
 Kirigami.BasicListItem {
     id: root
diff --git a/src/qml/Settings/Audio.qml b/src/qml/Settings/Audio.qml
index c9899f8..09a57d1 100644
--- a/src/qml/Settings/Audio.qml
+++ b/src/qml/Settings/Audio.qml
@@ -7,7 +7,8 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12
-import AudioSettings 1.0
+
+import com.georgefb.haruna 1.0
 
 Item {
     id: root
diff --git a/src/qml/Settings/General.qml b/src/qml/Settings/General.qml
index a4ea985..0972355 100644
--- a/src/qml/Settings/General.qml
+++ b/src/qml/Settings/General.qml
@@ -9,7 +9,7 @@ import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12
 import org.kde.kirigami 2.11 as Kirigami
 
-import GeneralSettings 1.0
+import com.georgefb.haruna 1.0
 
 Item {
     id: root
diff --git a/src/qml/Settings/Mouse.qml b/src/qml/Settings/Mouse.qml
index 43cde97..2b16f14 100644
--- a/src/qml/Settings/Mouse.qml
+++ b/src/qml/Settings/Mouse.qml
@@ -9,7 +9,8 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12
 import org.kde.kirigami 2.11 as Kirigami
-import MouseSettings 1.0
+
+import com.georgefb.haruna 1.0
 
 Item {
     id: root
diff --git a/src/qml/Settings/Playback.qml b/src/qml/Settings/Playback.qml
index 30d1983..9027d80 100644
--- a/src/qml/Settings/Playback.qml
+++ b/src/qml/Settings/Playback.qml
@@ -9,7 +9,7 @@ import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12
 import org.kde.kirigami 2.11 as Kirigami
 
-import PlaybackSettings 1.0
+import com.georgefb.haruna 1.0
 
 Item {
     id: root
diff --git a/src/qml/Settings/Playlist.qml b/src/qml/Settings/Playlist.qml
index b3e3aa4..e17e7b2 100644
--- a/src/qml/Settings/Playlist.qml
+++ b/src/qml/Settings/Playlist.qml
@@ -7,7 +7,8 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12
-import PlaylistSettings 1.0
+
+import com.georgefb.haruna 1.0
 
 Item {
     id: root
diff --git a/src/qml/Settings/SettingsEditor.qml b/src/qml/Settings/SettingsEditor.qml
index c0eee63..659d9db 100644
--- a/src/qml/Settings/SettingsEditor.qml
+++ b/src/qml/Settings/SettingsEditor.qml
@@ -9,9 +9,9 @@ import QtQuick.Window 2.1
 import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12
 import QtGraphicalEffects 1.12
-import org.kde.kirigami 2.11 as Kirigami
 
-import GeneralSettings 1.0
+import org.kde.kirigami 2.11 as Kirigami
+import com.georgefb.haruna 1.0 as Haruna
 
 Pane {
     id: root
@@ -97,12 +97,12 @@ Pane {
 
                         MenuItem {
                             text: qsTr("Folder")
-                            onTriggered: Qt.openUrlExternally(GeneralSettings.configFolderPath)
+                            onTriggered: Qt.openUrlExternally(Haruna.GeneralSettings.configFolderPath)
                         }
 
                         MenuItem {
                             text: qsTr("File")
-                            onTriggered: Qt.openUrlExternally(GeneralSettings.configFilePath)
+                            onTriggered: Qt.openUrlExternally(Haruna.GeneralSettings.configFilePath)
                         }
                     }
                 }
diff --git a/src/qml/Settings/Subtitles.qml b/src/qml/Settings/Subtitles.qml
index 4c32141..3a5811f 100644
--- a/src/qml/Settings/Subtitles.qml
+++ b/src/qml/Settings/Subtitles.qml
@@ -8,7 +8,7 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12
 
-import SubtitlesSettings 1.0
+import com.georgefb.haruna 1.0
 
 Item {
     id: root
diff --git a/src/qml/Settings/SubtitlesFolders.qml b/src/qml/Settings/SubtitlesFolders.qml
index ea07ed9..9e81659 100644
--- a/src/qml/Settings/SubtitlesFolders.qml
+++ b/src/qml/Settings/SubtitlesFolders.qml
@@ -7,6 +7,7 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12
+
 import org.kde.kirigami 2.11 as Kirigami
 
 // Subtitles Folders
diff --git a/src/qml/Settings/VideoSettings.qml b/src/qml/Settings/VideoSettings.qml
index ff9593f..356b580 100644
--- a/src/qml/Settings/VideoSettings.qml
+++ b/src/qml/Settings/VideoSettings.qml
@@ -7,8 +7,9 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12
+
 import org.kde.kirigami 2.11 as Kirigami
-import VideoSettings 1.0
+import com.georgefb.haruna 1.0
 
 Item {
     id: root
diff --git a/src/qml/VolumeSlider.qml b/src/qml/VolumeSlider.qml
index 5bf0ad1..f77230b 100644
--- a/src/qml/VolumeSlider.qml
+++ b/src/qml/VolumeSlider.qml
@@ -10,8 +10,9 @@ import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
 import QtQuick.Shapes 1.12
 import QtGraphicalEffects 1.12
+
 import org.kde.kirigami 2.11 as Kirigami
-import GeneralSettings 1.0
+import com.georgefb.haruna 1.0
 
 Slider {
     id: root
diff --git a/src/qml/main.qml b/src/qml/main.qml
index 6351406..c50b9d1 100644
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -10,10 +10,9 @@ import QtQuick.Window 2.12
 import QtQuick.Layouts 1.12
 import QtGraphicalEffects 1.12
 import Qt.labs.platform 1.0 as Platform
-import org.kde.kirigami 2.11 as Kirigami
 
-import GeneralSettings 1.0
-import PlaybackSettings 1.0
+import org.kde.kirigami 2.11 as Kirigami
+import com.georgefb.haruna 1.0
 
 import mpv 1.0
 import "Menus"