diff --git a/CMakeLists.txt b/CMakeLists.txt index 612f7e43e..7efc4c29a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(BUG_ADDRESS "https://bugs.kde.org/enter_bug.cgi?product=lattedock") set(FAQS "https://userbase.kde.org/LatteDock/FAQ") set(QT_MIN_VERSION "5.9.0") -set(KF5_MIN_VERSION "5.38.0") +set(KF5_MIN_VERSION "5.48.0") set(KF5_LOCALE_PREFIX "") diff --git a/README.md b/README.md index fac753a36..bdce9fd23 100644 --- a/README.md +++ b/README.md @@ -30,34 +30,34 @@ Minimum requirements: **development packages for:** ``` - Qt5Core >= 5.9.0 - Qt5Gui >= 5.9.0 - Qt5Dbus >= 5.9.0 - - KF5Plasma >= 5.38.0 - KF5PlasmaQuick >= 5.38.0 - KF5Activities >= 5.38.0 - KF5CoreAddons >= 5.38.0 - KF5GuiAddons >= 5.38.0 - KF5DBusAddons >= 5.38.0 - KF5Declarative >= 5.38.0 - KF5Kirigami2 >= 5.38.0 - KF5Wayland >= 5.38.0 - KF5Package >= 5.38.0 - KF5XmlGui >= 5.38.0 - KF5IconThemes >= 5.38.0 - KF5KIO >= 5.38.0 - KF5I18n >= 5.38.0 - KF5Notifications >= 5.38.0 - KF5NewStuff >= 5.38.0 - KF5Archive >= 5.38.0 - KF5GlobalAccel >= 5.38.0 - KF5Crash >= 5.38.0 + Qt5Core >= 5.12.0 + Qt5Gui >= 5.12.0 + Qt5Dbus >= 5.12.0 + + KF5Plasma >= 5.48.0 + KF5PlasmaQuick >= 5.48.0 + KF5Activities >= 5.48.0 + KF5CoreAddons >= 5.48.0 + KF5GuiAddons >= 5.48.0 + KF5DBusAddons >= 5.48.0 + KF5Declarative >= 5.48.0 + KF5Kirigami2 >= 5.48.0 + KF5Wayland >= 5.48.0 + KF5Package >= 5.48.0 + KF5XmlGui >= 5.48.0 + KF5IconThemes >= 5.48.0 + KF5KIO >= 5.48.0 + KF5I18n >= 5.48.0 + KF5Notifications >= 5.48.0 + KF5NewStuff >= 5.48.0 + KF5Archive >= 5.48.0 + KF5GlobalAccel >= 5.48.0 + KF5Crash >= 5.48.0 KSysGuard [reguired only for kf5<=5.61] For X11 support: - KF5WindowSystem >= 5.38.0 + KF5WindowSystem >= 5.48.0 Qt5X11Extras >= 5.7.0 libxcb libxcb-randr diff --git a/plasmoid/package/contents/ui/task/TaskIcon.qml b/plasmoid/package/contents/ui/task/TaskIcon.qml index 196facf5e..afb74e140 100644 --- a/plasmoid/package/contents/ui/task/TaskIcon.qml +++ b/plasmoid/package/contents/ui/task/TaskIcon.qml @@ -25,6 +25,8 @@ import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.private.taskmanager 0.1 as TaskManagerApplet +import org.kde.kirigami 2.0 as Kirigami + import org.kde.latte.core 0.2 as LatteCore import org.kde.latte.components 1.0 as LatteComponents @@ -74,13 +76,13 @@ Item { } } - PlasmaCore.IconItem { + Kirigami.Icon { id: taskIconItem anchors.fill: parent - roundToIconSize: false + //roundToIconSize: false //! Trying to provide crisp icons for regular and zoomed size and smooth appearance in-between //! bug:432477 - smooth: size !== taskItem.abilities.metrics.iconSize && size !== (taskItem.abilities.metrics.iconSize*taskItem.abilities.parabolic.zoom) + //smooth: size !== taskItem.abilities.metrics.iconSize && size !== (taskItem.abilities.metrics.iconSize*taskItem.abilities.parabolic.zoom) source: decoration visible: !badgesLoader.active @@ -160,13 +162,13 @@ Item { enabled: false anchors.fill: parent property var source: ShaderEffectSource { - sourceItem: PlasmaCore.IconItem{ - width: taskIconContainer.width - height: taskIconContainer.height + sourceItem: Kirigami.Icon{ + width: taskIconItem.width + height: taskIconItem.height smooth: taskIconItem.smooth source: taskIconItem.source - roundToIconSize: taskIconItem.roundToIconSize - active: taskIconItem.roundToIconSize + //roundToIconSize: taskIconItem.roundToIconSize + active: taskIconItem.active Loader{ anchors.fill: parent @@ -390,7 +392,6 @@ Item { lightness:0 } - // Rely on PlasmaCore.IconItem hovering animation for now BrightnessContrast{ id:hoveredImage anchors.fill: parent