mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-20 06:45:27 +00:00
QML UI: make back key work for all pages
Reported by a beta tester for the GPS preferences, but affects a couple more. We need to make sure that any page on the page stack is actually a MobileComponents.Page, other wise the Android back key doesn't close the page. This commit changes GPS preferences, the theme test, and the currently disabled download from divecomputer. it contains only the actual change (wrap the current content in a page). The reindentation is a separate commit for readability. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
82a982b903
commit
ab36a3dad1
3 changed files with 7 additions and 1 deletions
|
@ -5,7 +5,9 @@ import QtQuick.Window 2.2
|
|||
import QtQuick.Dialogs 1.2
|
||||
import QtQuick.Layouts 1.1
|
||||
import org.subsurfacedivelog.mobile 1.0
|
||||
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
|
||||
|
||||
MobileComponents.Page {
|
||||
Item {
|
||||
id: diveComputerDownloadWindow
|
||||
anchors.top:parent.top
|
||||
|
@ -109,3 +111,4 @@ Item {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@ import QtQuick.Layouts 1.1
|
|||
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
|
||||
import org.subsurfacedivelog.mobile 1.0
|
||||
|
||||
|
||||
MobileComponents.Page {
|
||||
GridLayout {
|
||||
|
||||
signal accept
|
||||
|
@ -75,3 +75,4 @@ GridLayout {
|
|||
Layout.fillHeight: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@ import QtQuick 2.5
|
|||
import QtQuick.Layouts 1.1
|
||||
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
|
||||
|
||||
MobileComponents.Page {
|
||||
GridLayout {
|
||||
id: themetest
|
||||
columns: 2
|
||||
|
@ -95,3 +96,4 @@ GridLayout {
|
|||
Layout.fillHeight: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue