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

Mobile. Modify DownloadFromDiveComputer.qml

Browse source 
1) Create space for sillybutton at bottom of screen
        2) Reformat columns in tableview
        3) General cleanup and simplification of code.

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Willem Ferguson 2016-02-02 21:48:43 +02:00 • committed by Dirk Hohndel
parent 520f505d20
commit 545b106d5c
1 changed files with 91 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

208
qt-mobile/qml/DownloadFromDiveComputer.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2
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
@ -7,130 +8,103 @@ import org.subsurfacedivelog.mobile 1.0
Item { Item {
id: diveComputerDownloadWindow id: diveComputerDownloadWindow
anchors.top: parent.top anchors.top:parent.top
width: parent.width width: parent.width
height: parent.height height: parent.height
Layout.fillWidth: true;
GridLayout { ColumnLayout {
columns: 2
anchors.top: parent.top anchors.top: parent.top
width: parent.width
height: parent.height height: parent.height
ColumnLayout { width: parent.width
height: parent.height Layout.fillWidth: true
width: parent.width RowLayout {
ColumnLayout { anchors.top:parent.top
width: parent.width Layout.fillWidth: true
Layout.fillHeight: true Text { text: " Vendor name : " }
ColumnLayout { ComboBox { Layout.fillWidth: true }
Layout.fillHeight: true }
Layout.fillWidth: true RowLayout {
ColumnLayout { Text { text: " Dive Computer:" }
height: parent.height ComboBox { Layout.fillWidth: true }
Layout.fillWidth: true }
RowLayout { RowLayout {
Text { text: " Vendor name : " } Text { text: " Progress:" }
ComboBox { Layout.fillWidth: true } Layout.fillWidth: true
} ProgressBar { Layout.fillWidth: true }
RowLayout { }
Text { text: " Dive Computer:" } RowLayout {
ComboBox { Layout.fillWidth: true } SubsurfaceButton {
} text: "Download"
// Text { text: "Device or mount point" } onClicked: {
// RowLayout { text: "Retry"
// Layout.fillWidth: true stackView.pop();
// 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
TableViewColumn {
width: 50
role: "isChecked"
title: "Select"
}
TableViewColumn {
role: "datetime"
title: "Date / Time"
}
TableViewColumn {
width: 80
role: "duration"
title: "Duration"
}
TableViewColumn {
width: 50
role: "depth"
title: "Depth"
}
}
} }
} }
GridLayout { SubsurfaceButton {
Layout.fillWidth: true id:quitbutton
columns: 5 text: "Quit"
SubsurfaceButton { onClicked: {
text: "Accept" stackView.pop();
onClicked: { }
stackView.pop(); }
} }
} RowLayout {
SubsurfaceButton { Text {
text: "Quit" text: " Downloaded dives"
onClicked: { }
stackView.pop(); }
} TableView {
} width: parent.width
Text { Layout.fillWidth: true // The tableview should fill
text: "" Layout.fillHeight: true // all remaining vertical space
Layout.fillWidth: true height: parent.height // on this screen
} TableViewColumn {
SubsurfaceButton { width: parent.width / 2
text: "Select All" role: "datetime"
} title: "Date / Time"
SubsurfaceButton { }
text: "Unselect All" 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: "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:""
} }
} }
} }