mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: Kirigami to 2.2

Browse source 
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 <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2017-10-14 21:13:01 +02:00 • committed by Dirk Hohndel
parent bde7caa621
commit 3b5375d553
17 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mobile-widgets/qml/About.qml
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Layouts 1.1 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 import org.subsurfacedivelog.mobile 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {

2
mobile-widgets/qml/CloudCredentials.qml
View file

@ -4,7 +4,7 @@ import QtQuick.Controls 2.0 as Controls
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1 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 import org.subsurfacedivelog.mobile 1.0
Item { Item {

2
mobile-widgets/qml/DiveDetails.qml
View file

@ -4,7 +4,7 @@ import QtQuick.Controls 2.0
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import org.subsurfacedivelog.mobile 1.0 import org.subsurfacedivelog.mobile 1.0
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
Kirigami.Page { Kirigami.Page {
id: diveDetailsPage // but this is referenced as detailsWindow id: diveDetailsPage // but this is referenced as detailsWindow

2
mobile-widgets/qml/DiveDetailsEdit.qml
View file

@ -4,7 +4,7 @@ import QtQuick.Controls 2.0 as Controls
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import org.subsurfacedivelog.mobile 1.0 import org.subsurfacedivelog.mobile 1.0
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
Item { Item {
id: detailsEdit id: detailsEdit

2
mobile-widgets/qml/DiveDetailsView.qml
View file

@ -7,7 +7,7 @@ import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0 as Controls import QtQuick.Controls 2.0 as Controls
import org.subsurfacedivelog.mobile 1.0 import org.subsurfacedivelog.mobile 1.0
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
Item { Item {
id: detailsView id: detailsView

2
mobile-widgets/qml/DiveList.qml
View file

@ -4,7 +4,7 @@ import QtQuick.Controls 2.0 as Controls
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import QtQuick.Dialogs 1.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 import org.subsurfacedivelog.mobile 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {

2
mobile-widgets/qml/DownloadFromDiveComputer.qml
View file

@ -5,7 +5,7 @@ import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import org.subsurfacedivelog.mobile 1.0 import org.subsurfacedivelog.mobile 1.0
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
Kirigami.Page { Kirigami.Page {
id: diveComputerDownloadWindow id: diveComputerDownloadWindow

2
mobile-widgets/qml/DownloadedDiveDelegate.qml
View file

@ -4,7 +4,7 @@ import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import org.subsurfacedivelog.mobile 1.0 import org.subsurfacedivelog.mobile 1.0
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
Kirigami.AbstractListItem { Kirigami.AbstractListItem {
id: innerListItem id: innerListItem

2
mobile-widgets/qml/GpsList.qml
View file

@ -6,7 +6,7 @@ import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import org.subsurfacedivelog.mobile 1.0 import org.subsurfacedivelog.mobile 1.0
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
Kirigami.ScrollablePage { Kirigami.ScrollablePage {
id: gpsListWindow id: gpsListWindow

2
mobile-widgets/qml/HintsTextEdit.qml
View file

@ -3,7 +3,7 @@ import QtQuick 2.6
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
TextField { TextField {
id: root id: root

2
mobile-widgets/qml/Log.qml
View file

@ -6,7 +6,7 @@ import QtQuick.Layouts 1.1
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import QtQuick.Controls 2.1 import QtQuick.Controls 2.1
import org.subsurfacedivelog.mobile 1.0 import org.subsurfacedivelog.mobile 1.0
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
Kirigami.ScrollablePage { Kirigami.ScrollablePage {
id: logWindow id: logWindow

2
mobile-widgets/qml/Settings.qml
View file

@ -4,7 +4,7 @@ import QtQuick.Controls 2.0 as Controls
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1 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 import org.subsurfacedivelog.mobile 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {

2
mobile-widgets/qml/SsrfButton.qml
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
Button { Button {
id: root id: root

2
mobile-widgets/qml/SsrfCheckBox.qml
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
CheckBox { CheckBox {
id: root id: root

2
mobile-widgets/qml/SsrfSwitch.qml
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
Switch { Switch {
id: root id: root

2
mobile-widgets/qml/StartPage.qml
View file

@ -2,7 +2,7 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0 as Controls 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 import org.subsurfacedivelog.mobile 1.0

2
mobile-widgets/qml/ThemeTest.qml
View file

@ -3,7 +3,7 @@ import QtQuick 2.5
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0 as Controls import QtQuick.Controls 2.0 as Controls
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.2 as Kirigami
Kirigami.Page { Kirigami.Page {