diff --git a/contents/ui/config.qml b/contents/ui/config.qml index 4399ad9..35700d6 100644 --- a/contents/ui/config.qml +++ b/contents/ui/config.qml @@ -164,6 +164,7 @@ ColumnLayout { } QtControls.Label { + id: shadowLabel width: iconLabel.width + iconComboBox.width - circleLabel.width - 2*circleColor.width - units.largeSpacing visible: !useTimer.checked anchors.verticalCenter: shadowColor.verticalCenter @@ -200,7 +201,7 @@ ColumnLayout { } QtControls.Label { - width: formAlignment - units.largeSpacing + width: shadowLabel.width - units.largeSpacing*2 anchors.verticalCenter: radiusValue.verticalCenter horizontalAlignment: Text.AlignRight text: "Size:" diff --git a/contents/ui/config.qmlc b/contents/ui/config.qmlc deleted file mode 100644 index 4d83796..0000000 Binary files a/contents/ui/config.qmlc and /dev/null differ diff --git a/contents/ui/main.qml b/contents/ui/main.qml index 10365b9..bc6d877 100644 --- a/contents/ui/main.qml +++ b/contents/ui/main.qml @@ -1,7 +1,6 @@ import QtQml 2.0 import QtQuick 2.7 import QtGraphicalEffects 1.0 -import org.kde.plasma.core 2.0 as PlasmaCore Item { id: root @@ -9,13 +8,6 @@ Item { property variant shadowColor: ["#BBFF0000", "#BBFF7F00", "#BBFFFF00", "#BB00FF00", "#BB0000FF", "#BB4B0082", "#BB9400D3"] property int last: 0 property int n: shadowColor.length - - Loader { - id: cuteLoader - anchors.fill: parent - active: false - source: "./wallpaper/wall.qml" - } Loader { id: wallLoader @@ -28,6 +20,7 @@ Item { id: staticImageC Image { anchors.fill: root + fillMode: Image.PreserveAspectCrop sourceSize: parent source: wallpaper.configuration.WallPath } @@ -74,34 +67,19 @@ Item { } } - PlasmaCore.SvgItem { + Image { id: logo + source: wallpaper.configuration.IconPath height: circle.height / 2 - width: height * naturalSize.height/naturalSize.width + width: height visible: !(wallpaper.configuration.HideLogo) - - anchors.centerIn: circle - svg: PlasmaCore.Svg { - id: wallpaperSvg - //FIXME: Svg doesn't support relative paths - imagePath: "icons/fedora.svg" //Qt.resolvedUrl("x.svg").substring(7) + sourceSize { + height: circle.height / 2 + width: height } - elementId: "iconID" + anchors.centerIn: parent } - // Image { - // id: logo - // source: wallpaper.configuration.IconPath - // height: circle.height / 2 - // width: height - // visible: !(wallpaper.configuration.HideLogo) - // sourceSize { - // height: circle.height / 2 - // width: height - // } - // anchors.centerIn: parent - // } - Timer { interval: wallpaper.configuration.TimerValue * 1000 running: wallpaper.configuration.UseTimer diff --git a/contents/ui/main.qmlc b/contents/ui/main.qmlc deleted file mode 100644 index bdeae40..0000000 Binary files a/contents/ui/main.qmlc and /dev/null differ