From 3b5375d553a0e7d328d732457989a4ca97bab4fc Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Sat, 14 Oct 2017 21:13:01 +0200 Subject: QML UI: Kirigami to 2.2 When first tested this commit, especially the dive list was looking terrible. However, after including newer SHA's from libkirigami, and correcting lots of spacing/margin issue, a retest of this commit shows no strange artifact any more, and the amount of warnings in the log output is reduced significantly. So now, it appears save to upgrade. Notice that main.qml still uses Kirigami 2.0. and is not updated in this commit. With version 2.2, there is a new way of theming, that is not (yet) compatible with our current code. Blindly upgrading to 2.2 leads to a almost black dive list, wrong button colors, and runtime errors in the log, due to the fact the direct setting from QML Kirigami's Theme colors is not allowed any more. Signed-off-by: Jan Mulder --- mobile-widgets/qml/Log.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mobile-widgets/qml/Log.qml') diff --git a/mobile-widgets/qml/Log.qml b/mobile-widgets/qml/Log.qml index c31f5df32..8ac894774 100644 --- a/mobile-widgets/qml/Log.qml +++ b/mobile-widgets/qml/Log.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 import QtQuick.Controls 2.1 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami Kirigami.ScrollablePage { id: logWindow -- cgit v1.2.3-70-g09d2