Subject: [PATCH 3/3] [PATCH] Mobile. Update downloadfromdivecomputer screen.
1) Insert spacer to make space for silly button at screen bottom. 2) Adjust column widths of table of downloaded dives. 3) Simplification and general cleanup of QML code for this page. Signed-off-by: Willem Ferguson <[email protected]> I attach a screenshot of what it looks like on my computer. Kind regards, willem
>From e4a827f86526c752a4c42d8517ff8b25adca6bb1 Mon Sep 17 00:00:00 2001 From: Willem Ferguson <[email protected]> Date: Mon, 1 Feb 2016 21:07:36 +0200 Subject: [PATCH 3/3] [PATCH] Mobile. Update downloadfromdivecomputer screen. Insert spacer to make space for silly button. Adjust column widths of table. General cleanup of QML code for this page. Signed-off-by: Willem Ferguson <[email protected]> --- qt-mobile/qml/DownloadFromDiveComputer.qml | 206 ++++++++++++++--------------- 1 file changed, 101 insertions(+), 105 deletions(-) diff --git a/qt-mobile/qml/DownloadFromDiveComputer.qml b/qt-mobile/qml/DownloadFromDiveComputer.qml index d18c37b..3fa95b3 100644 --- a/qt-mobile/qml/DownloadFromDiveComputer.qml +++ b/qt-mobile/qml/DownloadFromDiveComputer.qml @@ -1,118 +1,114 @@ import QtQuick 2.3 import QtQuick.Controls 1.2 +import QtQuick.Controls.Styles 1.2 import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import org.subsurfacedivelog.mobile 1.0 Item { - id: diveComputerDownloadWindow - anchors.top: parent.top - width: parent.width - height: parent.height + id: diveComputerDownloadWindow + anchors.top:parent.top + width: parent.width + height: parent.height + Layout.fillWidth: true; - GridLayout { - columns: 2 - anchors.top: parent.top - width: parent.width - height: parent.height - ColumnLayout { - height: parent.height - width: parent.width - ColumnLayout { - width: parent.width - Layout.fillHeight: true - ColumnLayout { - Layout.fillHeight: true - Layout.fillWidth: true - ColumnLayout { - height: parent.height - Layout.fillWidth: true - RowLayout { - Text { text: " Vendor name : " } - ComboBox { Layout.fillWidth: true } - } - RowLayout { - Text { text: " Dive Computer:" } - ComboBox { Layout.fillWidth: true } - } -// Text { text: "Device or mount point" } -// RowLayout { -// Layout.fillWidth: true -// TextField { Layout.fillWidth: true } -// SubsurfaceButton { text: "..." } -// } -// GridLayout { -// columns: 2 -// CheckBox { text: "Force download of all dives" } -// CheckBox { text: "Always prefer downloaded dives" } -// CheckBox { text: "Download into new trip" } -// CheckBox { text: "Save libdivecomputer logfile" } -// CheckBox { text: "Save libdivecomputer dumpfile" } -// CheckBox { text: "Choose Bluetooth download mode" } -// } - - RowLayout { - Text { text: " Progress:" } - Layout.fillWidth: true - ProgressBar { Layout.fillWidth: true } - } - RowLayout { - SubsurfaceButton { - text: "Download" - onClicked: { - stackView.pop(); - } - } - SubsurfaceButton { - text: "Quit" - onClicked: { - stackView.pop(); - } - } - } - } - } - ColumnLayout { - height: parent.height - Layout.fillWidth: true - RowLayout { - Text { - text: " Downloaded dives" - } - } - TableView { - Layout.fillWidth: true - Layout.fillHeight: true - } - } - } - GridLayout { + ColumnLayout { + anchors.top: parent.top + height: parent.height + width: parent.width + Layout.fillWidth: true + RowLayout { + anchors.top:parent.top + Layout.fillWidth: true + Text { text: " Vendor name : " } + ComboBox { Layout.fillWidth: true } + } + RowLayout { + Text { text: " Dive Computer:" } + ComboBox { Layout.fillWidth: true } + } + RowLayout { + Text { text: " Progress:" } + Layout.fillWidth: true + ProgressBar { Layout.fillWidth: true } + } + RowLayout { + SubsurfaceButton { + text: "Download" + onClicked: { + text: "Retry" + stackView.pop(); + } + } + SubsurfaceButton { + id:quitbutton + text: "Quit" + onClicked: { + stackView.pop(); + } + } + } + RowLayout { + Text { + text: " Downloaded dives" + } + } + ColumnLayout { + width: parent.width + Layout.fillWidth: true + TableView { Layout.fillWidth: true - columns: 5 - SubsurfaceButton { - text: "Accept" - onClicked: { - stackView.pop(); - } - } - SubsurfaceButton { - text: "Quit" - onClicked: { - stackView.pop(); - } - } - Text { - text: "" - Layout.fillWidth: true - } - SubsurfaceButton { - text: "Select All" + Layout.fillHeight: true + height: parent.height + TableViewColumn { + width: parent.width / 2 + role: "datetime" + title: "Date / Time" + } + TableViewColumn { + width: parent.width / 4 + role: "duration" + title: "Duration" + } + TableViewColumn { + width: parent.width / 4 + role: "depth" + title: "Depth" + } + } + RowLayout { + Layout.fillWidth: true + SubsurfaceButton { + text: "Accept" + onClicked: { + stackView.pop(); } - SubsurfaceButton { - text: "Unselect All" + } + SubsurfaceButton { + text: "Quit" + onClicked: { + stackView.pop(); } - } - } - } + } + Text { + text: "" // Spacer between 2 button groups + Layout.fillWidth: true + } + SubsurfaceButton { + text: "Select All" + } + SubsurfaceButton { + id: unselectbutton + text: "Unselect All" + } + } + RowLayout { // spacer to make space for silly button + Layout.minimumHeight: 1.2 * unselectbutton.height + Text { + text:"" + } + } + } // columnlayout + } } -- 2.5.0
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
