diff --git a/ScStwStyling/ScStwStyling.pri b/ScStwStyling/ScStwStyling.pri index 7285b4e..f15a69e 100644 --- a/ScStwStyling/ScStwStyling.pri +++ b/ScStwStyling/ScStwStyling.pri @@ -16,5 +16,6 @@ android { ANDROID_EXTRA_LIBS += $$SCSTWSTYLING_LIB_OUTPUT_DIR/libScStwStyling.so } +QML_IMPORT_PATH = "$$PWD/resources/qml/lib" INCLUDEPATH += "$$PWD" INCLUDEPATH += "$$PWD"/headers diff --git a/ScStwStyling/ScStwStyling.pro b/ScStwStyling/ScStwStyling.pro index 6564768..2ad5850 100644 --- a/ScStwStyling/ScStwStyling.pro +++ b/ScStwStyling/ScStwStyling.pro @@ -1,4 +1,4 @@ -QT += gui +QT += gui qml TEMPLATE = lib DEFINES += SCSTWSTYLING_LIBRARY @@ -25,9 +25,8 @@ HEADERS += \ headers/scstwappthememanager.h RESOURCES += \ - resources/ScStwStylingShared.qrc - -DISTFILES += + resources/qml/ScStwStylingQml.qrc \ + resources/shared/ScStwStylingShared.qrc \ #DEPENDS CONFIG(release, debug|release): { diff --git a/ScStwStyling/resources/qml/ScStwStylingQml.qrc b/ScStwStyling/resources/qml/ScStwStylingQml.qrc new file mode 100644 index 0000000..1316ee8 --- /dev/null +++ b/ScStwStyling/resources/qml/ScStwStylingQml.qrc @@ -0,0 +1,7 @@ + + + lib/ScStwQmlComponents/qmldir + lib/ScStwQmlComponents/Test.qml + lib/ScStwQmlComponents/BusyIndicator.qml + + diff --git a/ScStwStyling/resources/qml/lib/ScStwQmlComponents/BusyIndicator.qml b/ScStwStyling/resources/qml/lib/ScStwQmlComponents/BusyIndicator.qml new file mode 100644 index 0000000..ba6631f --- /dev/null +++ b/ScStwStyling/resources/qml/lib/ScStwQmlComponents/BusyIndicator.qml @@ -0,0 +1,65 @@ +import QtQuick 2.3 +import QtQuick.Controls 2.4 +import QtQuick.Controls.Styles 1.2 + +BusyIndicator { + id: control + + property double animationSpeed: 1000 + property double formFactor: 4.5 + + property color lineColor: "#21be2b" + + contentItem: Item { + implicitWidth: 64 + implicitHeight: 64 + + Item { + id: item + + anchors.fill: parent + + property int currentHeight: 0 + + SequentialAnimation { + running: control.running + loops: Animation.Infinite + + NumberAnimation { + target: item + property: "currentHeight" + from: 0 + to: 800 + duration: control.animationSpeed + } + } + + Row { + + anchors.fill: parent + + spacing: item.width / 9 + + Repeater { + id: repeater + model: 5 + + Rectangle { + + property double heightMultiplier: Math.abs( Math.sin( ( ((item.currentHeight/100) + (index*(control.formFactor/repeater.model)))) * (Math.PI/8) ) ) + + anchors.verticalCenter: parent.verticalCenter + + width: item.width / 9 + height: ( heightMultiplier ) * ( item.height - 1 ) + 1 + + radius: width * 0.5 + + color: control.lineColor + + } + } + } + } + } +} diff --git a/ScStwStyling/resources/qml/lib/ScStwQmlComponents/Test.qml b/ScStwStyling/resources/qml/lib/ScStwQmlComponents/Test.qml new file mode 100644 index 0000000..dc79e1f --- /dev/null +++ b/ScStwStyling/resources/qml/lib/ScStwQmlComponents/Test.qml @@ -0,0 +1,5 @@ +import QtQuick 2.12 + +Item { + +} diff --git a/ScStwStyling/resources/qml/lib/ScStwQmlComponents/qmldir b/ScStwStyling/resources/qml/lib/ScStwQmlComponents/qmldir new file mode 100644 index 0000000..a7d59c0 --- /dev/null +++ b/ScStwStyling/resources/qml/lib/ScStwQmlComponents/qmldir @@ -0,0 +1,3 @@ +module ScStwQmlComponents +Test 1.0 Test.qml +BusyIndicator 1.0 BusyIndicator.qml diff --git a/ScStwStyling/resources/ScStwStylingShared.qrc b/ScStwStyling/resources/shared/ScStwStylingShared.qrc similarity index 100% rename from ScStwStyling/resources/ScStwStylingShared.qrc rename to ScStwStyling/resources/shared/ScStwStylingShared.qrc diff --git a/ScStwStyling/resources/fonts/fa5brands.woff b/ScStwStyling/resources/shared/fonts/fa5brands.woff similarity index 100% rename from ScStwStyling/resources/fonts/fa5brands.woff rename to ScStwStyling/resources/shared/fonts/fa5brands.woff diff --git a/ScStwStyling/resources/fonts/fa5regular.woff b/ScStwStyling/resources/shared/fonts/fa5regular.woff similarity index 100% rename from ScStwStyling/resources/fonts/fa5regular.woff rename to ScStwStyling/resources/shared/fonts/fa5regular.woff diff --git a/ScStwStyling/resources/fonts/fa5solid.woff b/ScStwStyling/resources/shared/fonts/fa5solid.woff similarity index 100% rename from ScStwStyling/resources/fonts/fa5solid.woff rename to ScStwStyling/resources/shared/fonts/fa5solid.woff diff --git a/ScStwStyling/resources/images/BaseStationBlack.png b/ScStwStyling/resources/shared/images/BaseStationBlack.png similarity index 100% rename from ScStwStyling/resources/images/BaseStationBlack.png rename to ScStwStyling/resources/shared/images/BaseStationBlack.png diff --git a/ScStwStyling/resources/images/BaseStationWhite.png b/ScStwStyling/resources/shared/images/BaseStationWhite.png similarity index 100% rename from ScStwStyling/resources/images/BaseStationWhite.png rename to ScStwStyling/resources/shared/images/BaseStationWhite.png diff --git a/ScStwStyling/test.qrc b/ScStwStyling/test.qrc deleted file mode 100644 index 90f4a83..0000000 --- a/ScStwStyling/test.qrc +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/favicon.png b/favicon.png index 0b3888c..f89826e 100644 Binary files a/favicon.png and b/favicon.png differ diff --git a/favicon.xcf b/favicon.xcf index 06d097f..a2c5522 100644 Binary files a/favicon.xcf and b/favicon.xcf differ diff --git a/faviconNoOutline.png b/faviconNoOutline.png index ad6a158..bce4e96 100644 Binary files a/faviconNoOutline.png and b/faviconNoOutline.png differ