Move subsurface-core to core and qt-mobile to mobile-widgets

Having subsurface-core as a directory name really messes with
autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an
autocomplete conflict and also was inconsistent with the desktop-widget
name for the directory containing the "other" UI.

And while cleaning up the resulting change in the path name for include
files, I decided to clean up those even more to make them consistent
overall.

This could have been handled in more commits, but since this requires a
make clean before the build, it seemed more sensible to do it all in one.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-04 22:02:03 -07:00
parent 2d760a7bff
commit 7be962bfc2
254 changed files with 572 additions and 582 deletions

View file

@ -0,0 +1,125 @@
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
import org.kde.kirigami 1.0 as Kirigami
Kirigami.Page {
id: diveComputerDownloadWindow
anchors.top:parent.top
width: parent.width
height: parent.height
Layout.fillWidth: true;
title: "Dive Computer"
/* this can be done by hitting the back key
contextualActions: [
Action {
text: "Close Preferences"
iconName: "dialog-cancel"
onTriggered: {
stackView.pop()
contextDrawer.close()
}
}
]
*/
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"
}
}
TableView {
width: parent.width
Layout.fillWidth: true // The tableview should fill
Layout.fillHeight: true // all remaining vertical space
height: parent.height // on this screen
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: "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:""
}
}
}
}