diff --git a/CMakeLists.txt b/CMakeLists.txt index 5adca05b6..6f4f23f07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(WEBSITE "https://github.com/psifidotos/Latte-Dock") set(BUG_ADDRESS "https://github.com/psifidotos/Latte-Dock/issues") set(FAQS "https://github.com/psifidotos/Latte-Dock/wiki/F.A.Q.") -set(QT_MIN_VERSION "5.7.0") +set(QT_MIN_VERSION "5.9.0") set(KF5_MIN_VERSION "5.38.0") set(KF5_LOCALE_PREFIX "") @@ -48,7 +48,6 @@ include(ECMQMLModules) ecm_find_qmlmodule(QtQuick 2.7) ecm_find_qmlmodule(QtQuick.Layouts 1.3) ecm_find_qmlmodule(QtQuick.Controls 1.4) -ecm_find_qmlmodule(QtQuick.Controls 2.0) ecm_find_qmlmodule(QtQuick.Controls.Styles.Plasma 2.0) ecm_find_qmlmodule(QtGraphicalEffects 1.0) ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0) diff --git a/README.md b/README.md index 96b1cec12..b49fdc8a4 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ We recommend that you use at least **Plasma 5.9.0** **development packages for:** ```bash - Qt5Core >= 5.7.0 - Qt5Gui >= 5.7.0 - Qt5Dbus >= 5.7.0 + Qt5Core >= 5.9.0 + Qt5Gui >= 5.9.0 + Qt5Dbus >= 5.9.0 KF5Plasma >= 5.38.0 KF5PlasmaQuick >= 5.38.0 diff --git a/shell/package/contents/configuration/AppearanceConfig.qml b/shell/package/contents/configuration/AppearanceConfig.qml index 27a7f0431..7a41b79a7 100644 --- a/shell/package/contents/configuration/AppearanceConfig.qml +++ b/shell/package/contents/configuration/AppearanceConfig.qml @@ -163,6 +163,7 @@ PlasmaComponents.Page { Layout.fillWidth: true value: plasmoid.configuration.iconSize from: 16 + to: 128 stepSize: (!plasmoid.configuration.autoDecreaseIconSize && (plasmoid.configuration.advanced || (plasmoid.configuration.iconSize % 8 !== 0))) || dialog.dockIsPanel ? 1 : 8 @@ -260,7 +261,7 @@ PlasmaComponents.Page { PlasmaComponents.Label { text: i18n("Screen Height Proportion:") horizontalAlignment: Text.AlignLeft - enabled: proportionSizeSlider.value >= proportionSizeSlider.realMinimum + enabled: proportionSizeSlider.value !== proportionSizeSlider.from } LatteExtraControls.Slider { @@ -271,11 +272,10 @@ PlasmaComponents.Page { to: 10 stepSize: 0.5 wheelEnabled: false - property real realMinimum: minimumValue + 0.5 function updateProportionIconSize() { if (!pressed) { - if(value=proportionSizeSlider.realMinimum ? + text: proportionSizeSlider.value !== proportionSizeSlider.from ? proportionSizeSlider.value.toFixed(1) + "%" : "---%" horizontalAlignment: Text.AlignRight Layout.minimumWidth: theme.mSize(theme.defaultFont).width * 4 - enabled: proportionSizeSlider.value >= proportionSizeSlider.realMinimum + enabled: proportionSizeSlider.value !== proportionSizeSlider.from } } diff --git a/shell/package/contents/controls/Slider.qml b/shell/package/contents/controls/Slider.qml index 6ec498cca..202adf484 100644 --- a/shell/package/contents/controls/Slider.qml +++ b/shell/package/contents/controls/Slider.qml @@ -32,7 +32,7 @@ T.Slider { Math.max(handle ? handle.implicitHeight : 0, handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) - padding: units.gridUnit + padding: 3*units.smallSpacing //5//units.gridUnit snapMode: T.Slider.SnapOnRelease PlasmaCore.Svg { @@ -80,8 +80,10 @@ T.Slider { prefix: "groove-highlight" x: parent.horizontal ? 0 : (parent.width - width) / 2 y: parent.horizontal ? (parent.height - height) / 2 : control.visualPosition * parent.height - width: parent.horizontal ? control.position * parent.width : parent.width - height: parent.horizontal ? parent.height : control.position * parent.height + width: parent.horizontal ? control.position * parent.width + invisibleSpacer : parent.width + height: parent.horizontal ? parent.height : control.position * parent.height + invisibleSpacer + + property int invisibleSpacer: control.position === 0 ? 4 : 0 } } }