aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2016-04-19 05:30:36 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-04-19 10:34:40 -0700
commit1e86662e4a30ceebca0faf4a12169ce25740c4d4 (patch)
treecdb6ff707f1b96780f105aff6c4aded1da0b851c
parenta807a5e8cd5473c8bacf5b6299755899f613a1dd (diff)
downloadsubsurface-1e86662e4a30ceebca0faf4a12169ce25740c4d4.tar.gz
Remove QML files that are no longer used
The TextButton was what we used for actions very early on, and the TopBar has now been replaced by the Kirigami header bar. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--mobile-widgets/qml/TextButton.qml37
-rw-r--r--mobile-widgets/qml/TopBar.qml59
-rw-r--r--mobile-widgets/qml/main.qml6
-rw-r--r--mobile-widgets/qml/mobile-resources.qrc2
4 files changed, 0 insertions, 104 deletions
diff --git a/mobile-widgets/qml/TextButton.qml b/mobile-widgets/qml/TextButton.qml
deleted file mode 100644
index 3e5a36735..000000000
--- a/mobile-widgets/qml/TextButton.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import QtQuick 2.3
-
-Rectangle {
- id: container
-
- property alias text: label.text
-
- signal clicked
-
- width: label.width + 20; height: label.height + 6
- smooth: true
- radius: 10
-
- gradient: Gradient {
- GradientStop { id: gradientStop; position: 0.0; color: palette.light }
- GradientStop { position: 1.0; color: palette.button }
- }
-
- SystemPalette { id: palette }
-
- MouseArea {
- id: mouseArea
- anchors.fill: parent
- onClicked: { container.clicked() }
- }
-
- Text {
- id: label
- anchors.centerIn: parent
- }
-
- states: State {
- name: "pressed"
- when: mouseArea.pressed
- PropertyChanges { target: gradientStop; color: palette.dark }
- }
-}
diff --git a/mobile-widgets/qml/TopBar.qml b/mobile-widgets/qml/TopBar.qml
deleted file mode 100644
index 024b818b0..000000000
--- a/mobile-widgets/qml/TopBar.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-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 QtQuick.Window 2.2
-import org.kde.kirigami 1.0 as Kirigami
-import org.subsurfacedivelog.mobile 1.0
-
-Rectangle {
- id: topPart
-
- color: subsurfaceTheme.accentColor
- Layout.minimumHeight: Math.round(Kirigami.Units.gridUnit * 1.5)
- Layout.fillWidth: true
- Layout.margins: 0
- RowLayout {
- anchors.verticalCenter: topPart.verticalCenter
- Item {
- Layout.preferredHeight: subsurfaceLogo.height
- Layout.leftMargin: Kirigami.Units.gridUnit / 4
- Image {
- id: subsurfaceLogo
- source: "qrc:/qml/subsurface-mobile-icon.png"
- anchors {
- verticalCenter: parent.Center
- left: parent.left
- }
- width: Math.round(Kirigami.Units.gridUnit)
- height: width
- }
- Kirigami.Label {
- text: qsTr("Subsurface-mobile")
- font.pointSize: Math.round(Kirigami.Theme.defaultFont.pointSize)
- height: subsurfaceLogo.height
- anchors {
- left: subsurfaceLogo.right
- leftMargin: Math.round(Kirigami.Units.gridUnit / 2)
- }
- font.weight: Font.Light
- verticalAlignment: Text.AlignVCenter
- Layout.fillWidth: false
- color: subsurfaceTheme.accentTextColor
- }
- }
- Item {
- Layout.fillWidth: true
- }
- }
- MouseArea {
- anchors.fill: topPart
- onClicked: {
- if (stackView.depth == 1 && showingDiveList) {
- scrollToTop()
- }
- }
- }
-}
diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml
index 62a94bd0e..8497e7e53 100644
--- a/mobile-widgets/qml/main.qml
+++ b/mobile-widgets/qml/main.qml
@@ -288,12 +288,6 @@ Kirigami.ApplicationWindow {
property color diveListTextColor: "#000000" // the Kirigami theme text color is too light
property int columnWidth: Math.round(rootItem.width/(Kirigami.Units.gridUnit*30)) > 0 ? Math.round(rootItem.width / Math.round(rootItem.width/(Kirigami.Units.gridUnit*30))) : rootItem.width
}
-/*
- toolBar: TopBar {
- width: parent.width
- height: Layout.minimumHeight
- }
- */
property Item stackView: pageStack
pageStack.initialPage: DiveList {
diff --git a/mobile-widgets/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc
index e54e1e458..0592c1119 100644
--- a/mobile-widgets/qml/mobile-resources.qrc
+++ b/mobile-widgets/qml/mobile-resources.qrc
@@ -1,7 +1,6 @@
<RCC>
<qresource prefix="/qml">
<file>main.qml</file>
- <file>TextButton.qml</file>
<file>Preferences.qml</file>
<file>About.qml</file>
<file>CloudCredentials.qml</file>
@@ -12,7 +11,6 @@
<file>DownloadFromDiveComputer.qml</file>
<file>GpsList.qml</file>
<file>Log.qml</file>
- <file>TopBar.qml</file>
<file>ThemeTest.qml</file>
<file>StartPage.qml</file>
<file>StyledTextField.qml</file>