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/About.qml | 2 +- mobile-widgets/qml/CloudCredentials.qml | 2 +- mobile-widgets/qml/DiveDetails.qml | 2 +- mobile-widgets/qml/DiveDetailsEdit.qml | 2 +- mobile-widgets/qml/DiveDetailsView.qml | 2 +- mobile-widgets/qml/DiveList.qml | 2 +- mobile-widgets/qml/DownloadFromDiveComputer.qml | 2 +- mobile-widgets/qml/DownloadedDiveDelegate.qml | 2 +- mobile-widgets/qml/GpsList.qml | 2 +- mobile-widgets/qml/HintsTextEdit.qml | 2 +- mobile-widgets/qml/Log.qml | 2 +- mobile-widgets/qml/Settings.qml | 2 +- mobile-widgets/qml/SsrfButton.qml | 2 +- mobile-widgets/qml/SsrfCheckBox.qml | 2 +- mobile-widgets/qml/SsrfSwitch.qml | 2 +- mobile-widgets/qml/StartPage.qml | 2 +- mobile-widgets/qml/ThemeTest.qml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'mobile-widgets/qml') diff --git a/mobile-widgets/qml/About.qml b/mobile-widgets/qml/About.qml index 4ff6372d3..2bf51b61d 100644 --- a/mobile-widgets/qml/About.qml +++ b/mobile-widgets/qml/About.qml @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 import QtQuick 2.3 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami import org.subsurfacedivelog.mobile 1.0 Kirigami.ScrollablePage { diff --git a/mobile-widgets/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml index 19ae9e2fc..2d45b4f23 100644 --- a/mobile-widgets/qml/CloudCredentials.qml +++ b/mobile-widgets/qml/CloudCredentials.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.0 as Controls import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami import org.subsurfacedivelog.mobile 1.0 Item { diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index 7a57bd30c..4f2f70829 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.0 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami Kirigami.Page { id: diveDetailsPage // but this is referenced as detailsWindow diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml index bd9af7cc7..be31babab 100644 --- a/mobile-widgets/qml/DiveDetailsEdit.qml +++ b/mobile-widgets/qml/DiveDetailsEdit.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.0 as Controls import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami Item { id: detailsEdit diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml index 3197bb922..c0afc6779 100644 --- a/mobile-widgets/qml/DiveDetailsView.qml +++ b/mobile-widgets/qml/DiveDetailsView.qml @@ -7,7 +7,7 @@ import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 as Controls import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami Item { id: detailsView diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml index d7dc0116a..e4145b900 100644 --- a/mobile-widgets/qml/DiveList.qml +++ b/mobile-widgets/qml/DiveList.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.0 as Controls import QtQuick.Layouts 1.2 import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami import org.subsurfacedivelog.mobile 1.0 Kirigami.ScrollablePage { diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index e80f67e5f..d1ee08f86 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -5,7 +5,7 @@ import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami Kirigami.Page { id: diveComputerDownloadWindow diff --git a/mobile-widgets/qml/DownloadedDiveDelegate.qml b/mobile-widgets/qml/DownloadedDiveDelegate.qml index b88561b17..dd011d952 100644 --- a/mobile-widgets/qml/DownloadedDiveDelegate.qml +++ b/mobile-widgets/qml/DownloadedDiveDelegate.qml @@ -4,7 +4,7 @@ import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami Kirigami.AbstractListItem { id: innerListItem diff --git a/mobile-widgets/qml/GpsList.qml b/mobile-widgets/qml/GpsList.qml index 53249990d..011321c9e 100644 --- a/mobile-widgets/qml/GpsList.qml +++ b/mobile-widgets/qml/GpsList.qml @@ -6,7 +6,7 @@ import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 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: gpsListWindow diff --git a/mobile-widgets/qml/HintsTextEdit.qml b/mobile-widgets/qml/HintsTextEdit.qml index ff6dc75cb..0f843bf43 100644 --- a/mobile-widgets/qml/HintsTextEdit.qml +++ b/mobile-widgets/qml/HintsTextEdit.qml @@ -3,7 +3,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 import QtGraphicalEffects 1.0 import QtQuick.Layouts 1.2 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami TextField { id: root 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 diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml index 34041246c..2410b082d 100644 --- a/mobile-widgets/qml/Settings.qml +++ b/mobile-widgets/qml/Settings.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.0 as Controls import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami import org.subsurfacedivelog.mobile 1.0 Kirigami.ScrollablePage { diff --git a/mobile-widgets/qml/SsrfButton.qml b/mobile-widgets/qml/SsrfButton.qml index 1584198fa..1b9e86198 100644 --- a/mobile-widgets/qml/SsrfButton.qml +++ b/mobile-widgets/qml/SsrfButton.qml @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 import QtQuick 2.3 import QtQuick.Controls 2.2 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami Button { id: root diff --git a/mobile-widgets/qml/SsrfCheckBox.qml b/mobile-widgets/qml/SsrfCheckBox.qml index 6fafd87da..9002c02e0 100644 --- a/mobile-widgets/qml/SsrfCheckBox.qml +++ b/mobile-widgets/qml/SsrfCheckBox.qml @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 import QtQuick 2.3 import QtQuick.Controls 2.2 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami CheckBox { id: root diff --git a/mobile-widgets/qml/SsrfSwitch.qml b/mobile-widgets/qml/SsrfSwitch.qml index a88b94aea..baa492065 100644 --- a/mobile-widgets/qml/SsrfSwitch.qml +++ b/mobile-widgets/qml/SsrfSwitch.qml @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 import QtQuick 2.3 import QtQuick.Controls 2.2 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami Switch { id: root diff --git a/mobile-widgets/qml/StartPage.qml b/mobile-widgets/qml/StartPage.qml index 067384e5f..b8617c38f 100644 --- a/mobile-widgets/qml/StartPage.qml +++ b/mobile-widgets/qml/StartPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 as Controls -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami import org.subsurfacedivelog.mobile 1.0 diff --git a/mobile-widgets/qml/ThemeTest.qml b/mobile-widgets/qml/ThemeTest.qml index 3abfa42ca..aff45bb32 100644 --- a/mobile-widgets/qml/ThemeTest.qml +++ b/mobile-widgets/qml/ThemeTest.qml @@ -3,7 +3,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 as Controls import QtQuick.Window 2.2 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.2 as Kirigami Kirigami.Page { -- cgit v1.2.3-70-g09d2