From 86f0c22864a837fba40f21f406ec92ad9f8884d4 Mon Sep 17 00:00:00 2001
From: Dorian Zedler <dorian@itsblue.de>
Date: Tue, 26 May 2020 17:45:07 +0200
Subject: [PATCH] changed import path of QML Components

---
 ScStwStyling/resources/qml/ScStwStylingQml.qrc       | 12 ++++++------
 .../ScStw/Styling/Components}/BusyIndicator.qml      |  5 +++++
 .../ScStw/Styling/Components}/FadeAnimation.qml      |  0
 .../itsblue/ScStw/Styling/Components}/Icon.qml       |  0
 .../itsblue/ScStw/Styling/Components}/Test.qml       |  0
 .../ScStw/Styling/Components}/TimerColumn.qml        |  0
 .../itsblue/ScStw/Styling/Components}/qmldir         |  2 +-
 7 files changed, 12 insertions(+), 7 deletions(-)
 rename ScStwStyling/resources/qml/lib/{ScStwQmlComponents => de/itsblue/ScStw/Styling/Components}/BusyIndicator.qml (64%)
 rename ScStwStyling/resources/qml/lib/{ScStwQmlComponents => de/itsblue/ScStw/Styling/Components}/FadeAnimation.qml (100%)
 rename ScStwStyling/resources/qml/lib/{ScStwQmlComponents => de/itsblue/ScStw/Styling/Components}/Icon.qml (100%)
 rename ScStwStyling/resources/qml/lib/{ScStwQmlComponents => de/itsblue/ScStw/Styling/Components}/Test.qml (100%)
 rename ScStwStyling/resources/qml/lib/{ScStwQmlComponents => de/itsblue/ScStw/Styling/Components}/TimerColumn.qml (100%)
 rename ScStwStyling/resources/qml/lib/{ScStwQmlComponents => de/itsblue/ScStw/Styling/Components}/qmldir (73%)

diff --git a/ScStwStyling/resources/qml/ScStwStylingQml.qrc b/ScStwStyling/resources/qml/ScStwStylingQml.qrc
index af57435..279cc27 100644
--- a/ScStwStyling/resources/qml/ScStwStylingQml.qrc
+++ b/ScStwStyling/resources/qml/ScStwStylingQml.qrc
@@ -1,10 +1,10 @@
 <RCC>
     <qresource prefix="/">
-        <file>lib/ScStwQmlComponents/qmldir</file>
-        <file>lib/ScStwQmlComponents/Test.qml</file>
-        <file>lib/ScStwQmlComponents/BusyIndicator.qml</file>
-        <file>lib/ScStwQmlComponents/Icon.qml</file>
-        <file>lib/ScStwQmlComponents/TimerColumn.qml</file>
-        <file>lib/ScStwQmlComponents/FadeAnimation.qml</file>
+        <file>lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml</file>
+        <file>lib/de/itsblue/ScStw/Styling/Components/FadeAnimation.qml</file>
+        <file>lib/de/itsblue/ScStw/Styling/Components/Icon.qml</file>
+        <file>lib/de/itsblue/ScStw/Styling/Components/qmldir</file>
+        <file>lib/de/itsblue/ScStw/Styling/Components/Test.qml</file>
+        <file>lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml</file>
     </qresource>
 </RCC>
diff --git a/ScStwStyling/resources/qml/lib/ScStwQmlComponents/BusyIndicator.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml
similarity index 64%
rename from ScStwStyling/resources/qml/lib/ScStwQmlComponents/BusyIndicator.qml
rename to ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml
index a0b7b40..a911dac 100644
--- a/ScStwStyling/resources/qml/lib/ScStwQmlComponents/BusyIndicator.qml
+++ b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml
@@ -5,6 +5,11 @@ import QtQuick.Controls 2.0
 T.BusyIndicator {
     id: control
 
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             implicitContentHeight + topPadding + bottomPadding)
+
     contentItem: Item {
         Image {
             id: holdImage
diff --git a/ScStwStyling/resources/qml/lib/ScStwQmlComponents/FadeAnimation.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/FadeAnimation.qml
similarity index 100%
rename from ScStwStyling/resources/qml/lib/ScStwQmlComponents/FadeAnimation.qml
rename to ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/FadeAnimation.qml
diff --git a/ScStwStyling/resources/qml/lib/ScStwQmlComponents/Icon.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Icon.qml
similarity index 100%
rename from ScStwStyling/resources/qml/lib/ScStwQmlComponents/Icon.qml
rename to ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Icon.qml
diff --git a/ScStwStyling/resources/qml/lib/ScStwQmlComponents/Test.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Test.qml
similarity index 100%
rename from ScStwStyling/resources/qml/lib/ScStwQmlComponents/Test.qml
rename to ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Test.qml
diff --git a/ScStwStyling/resources/qml/lib/ScStwQmlComponents/TimerColumn.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml
similarity index 100%
rename from ScStwStyling/resources/qml/lib/ScStwQmlComponents/TimerColumn.qml
rename to ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml
diff --git a/ScStwStyling/resources/qml/lib/ScStwQmlComponents/qmldir b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/qmldir
similarity index 73%
rename from ScStwStyling/resources/qml/lib/ScStwQmlComponents/qmldir
rename to ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/qmldir
index 7ae4338..64f7890 100644
--- a/ScStwStyling/resources/qml/lib/ScStwQmlComponents/qmldir
+++ b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/qmldir
@@ -1,4 +1,4 @@
-module ScStwQmlComponents
+module de.itsblue.ScStw.Styling.Components
 BusyIndicator 1.0 BusyIndicator.qml
 Icon 1.0 Icon.qml
 TimerColumn 1.0 TimerColumn.qml