From c4fda447fd9d26f9d4dc9400648ebcbc6c2c9ad7 Mon Sep 17 00:00:00 2001 From: Grace Karanja Date: Fri, 10 Jul 2015 11:45:20 +0300 Subject: QML UI: show dive details in TextBoxes Show the dive details in editable text boxes. This will make it easier for the user to edit the displayed information. Signed-off-by: Grace Karanja --- qt-mobile/DiveList.qml | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) (limited to 'qt-mobile/DiveList.qml') diff --git a/qt-mobile/DiveList.qml b/qt-mobile/DiveList.qml index f6a91de32..3ba2de3c7 100644 --- a/qt-mobile/DiveList.qml +++ b/qt-mobile/DiveList.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 1.2 import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 import org.subsurfacedivelog.mobile 1.0 +import QtQuick.Layouts 1.0 Rectangle { id: page @@ -69,16 +70,35 @@ Rectangle { id: flick width: parent.width anchors { top: detailsTitle.bottom; bottom: parent.bottom } - contentHeight: detailsView.height + contentHeight: editorDetails.height clip: true - Row { - Text { text: - 'Location: ' + location + - '
Air temp: ' + airtemp + ' Water temp: ' + watertemp + - '
Suit: ' + suit + - '
Buddy: ' + buddy + - '
Dive Master: ' + divemaster + - '
Notes:
' + notes; wrapMode: Text.WordWrap; width: details.width } + + GridLayout { + id: editorDetails + width: detailsPage.width + columns: 2 + Text { text: "Location:"; font.bold: true } + TextField { id: txtLocation; text: location; Layout.fillWidth: true } + Text { text: "Air Temp:"; font.bold: true } + TextField { id: txtAirTemp; text: airtemp; Layout.fillWidth: true } + Text { text: "Water Temp:"; font.bold: true } + TextField { id: txtWaterTemp; text: watertemp; Layout.fillWidth: true } + Text { text: "Suit:"; font.bold: true } + TextField { id: txtSuit; text: suit; Layout.fillWidth: true } + Text { text: "Buddy:"; font.bold: true } + TextField { id: txtBuddy; text: buddy; Layout.fillWidth: true } + Text { text: "Dive Master:"; font.bold: true } + TextField { id: txtDiveMaster; text: divemaster; Layout.fillWidth: true} + Text { text: "Notes:"; font.bold: true } + TextEdit{ + id: txtNotes + text: notes + focus: true + Layout.fillWidth: true + Layout.fillHeight: true + selectByMouse: true + wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere + } } } } -- cgit v1.2.3-70-g09d2