Skip to content

Commit

Permalink
This is how far I got but it fails during startup.
Browse files Browse the repository at this point in the history 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
  • Loading branch information
@atdotde
atdotde committed Aug 9, 2018
1 parent e3008c8 commit 1cbaff3
Show file tree
Hide file tree
Showing 4 changed files with 133 additions and 82 deletions.
10 changes: 10 additions & 0 deletions mobile-widgets/qml/About.qml
View file
Expand Up @@ -65,5 +65,15 @@ Kirigami.ScrollablePage {
rootItem.returnTopPage()
}
}
SsrfButton {
id: reportBug
Layout.alignment: Qt.AlignHCenter
text: qsTr("Report a bug")
onClicked: {
rootItem.returnTopPage()
stackView.push(reportBugPage)
}
}
}

}
16 changes: 16 additions & 0 deletions mobile-widgets/qml/main.qml
View file
Expand Up @@ -370,6 +370,17 @@ if you have network connectivity and want to sync your data to cloud storage."),
detailsWindow.endEditMode()
}
},
Kirigami.Action {
icon {
name: ":/icons/ic_settings.svg"
}
text: qsTr("Report a bug")
onTriggered: {
globalDrawer.close()
stackView.push(ReportBug)
detailsWindow.endEditMode()
}
},
Kirigami.Action {
icon {
name: ":/icons/ic_adb.svg"
Expand Down Expand Up @@ -573,6 +584,11 @@ if you have network connectivity and want to sync your data to cloud storage."),
visible: false
}

ReportBug {
id: reportBugWindow
visible: false
}

About {
id: aboutWindow
visible: false
Expand Down
152 changes: 70 additions & 82 deletions mobile-widgets/qml/mobile-resources.qrc
View file
@@ -1,84 +1,72 @@
<RCC>
<qresource prefix="/qml">
<!-- ********** qml ********** -->
<file>About.qml</file>
<file>CloudCredentials.qml</file>
<file>DiveDetails.qml</file>
<file>DiveDetailsEdit.qml</file>
<file>DiveDetailsView.qml</file>
<file>DiveList.qml</file>
<file>DownloadFromDiveComputer.qml</file>
<file>DownloadedDiveDelegate.qml</file>
<file>GpsList.qml</file>
<file>HintsTextEdit.qml</file>
<file>Log.qml</file>
<file>main.qml</file>
<file>MapPage.qml</file>
<file>Settings.qml</file>
<file>ThemeTest.qml</file>
<file>StartPage.qml</file>
<file>SsrfButton.qml</file>
<file>SsrfCheckBox.qml</file>
<file>SsrfSwitch.qml</file>

<!-- ********** pictures ********** -->
<file>icons/dive.jpg</file>
<file alias="nocloud.svg">icons/nocloud.svg</file>
<file alias="subsurface-mobile-icon.png">../../icons/subsurface-mobile-icon.png</file>
</qresource>

<qresource prefix="/">
<!-- ********** qtQuick.2 configuration ********** -->
<file>qtquickcontrols2.conf</file>
</qresource>

<qresource>
<!-- ********** icons ********** -->
<file>icons/Blue_gps.svg</file>
<file>icons/cloud_sync.svg</file>
<file>icons/Dark_gps.svg</file>
<file alias="icons/downloadDC.svg">icons/button-download-dc_icon.svg</file>
<file alias="icons/downloadDC-black.svg">icons/button-download-dc-black_icon.svg</file>
<file>icons/ic_adb.svg</file>
<file>icons/ic_add.svg</file>
<file>icons/ic_add_location.svg</file>
<file>icons/ic_clear.svg</file>
<file>icons/ic_cloud_done.svg</file>
<file>icons/ic_cloud_download.svg</file>
<file>icons/ic_cloud_off.svg</file>
<file>icons/ic_cloud_upload.svg</file>
<file>icons/ic_gps_fixed.svg</file>
<file>icons/ic_help_outline.svg</file>
<file>icons/ic_home.svg</file>
<file>icons/ic_info_outline.svg</file>
<file>icons/ic_location_off.svg</file>
<file>icons/ic_place.svg</file>
<file>icons/ic_settings.svg</file>
<file>icons/ic_star.svg</file>
<file>icons/ic_star_border.svg</file>
<file>icons/ic_sync.svg</file>
<file>icons/Pink_gps.svg</file>

<!-- ********** kirigami icons ********** -->
<file alias="icons/application-menu.svg">kirigami/icons/application-menu.svg</file>
<file alias="icons/dialog-cancel.svg">kirigami/icons/dialog-cancel.svg</file>
<file alias="icons/distribute-horizontal-x.svg">kirigami/icons/distribute-horizontal-x.svg</file>
<file alias="icons/document-edit.svg">kirigami/icons/document-edit.svg</file>
<file alias="icons/document-save.svg">kirigami/icons/document-save.svg</file>
<file alias="icons/go-up.svg">kirigami/icons/go-up.svg</file>
<file alias="icons/gps.svg">kirigami/icons/gps.svg</file>
<file alias="icons/handle-left.svg">kirigami/icons/handle-left.svg</file>
<file alias="icons/handle-right.svg">kirigami/icons/handle-right.svg</file>
<file alias="icons/map-globe.svg">kirigami/icons/map-globe.svg</file>
<file alias="icons/list-add.svg">kirigami/icons/list-add.svg</file>
<file alias="icons/overflow-menu.svg">kirigami/icons/overflow-menu.svg</file>
<file alias="icons/trash-empty.svg">kirigami/icons/trash-empty.svg</file>
<file alias="icons/view-readermode.svg">kirigami/icons/view-readermode.svg</file>
</qresource>

<qresource prefix="/org/kde/kirigami/icons/">
<!-- ********** kirigami icons ********** -->
<file alias="go-next-symbolic.svg">kirigami/icons/go-next.svg</file>
<file alias="go-previous-symbolic.svg">kirigami/icons/go-previous.svg</file>
</qresource>
<qresource prefix="/qml">
<file>About.qml</file>
<file>CloudCredentials.qml</file>
<file>DiveDetails.qml</file>
<file>DiveDetailsEdit.qml</file>
<file>DiveDetailsView.qml</file>
<file>DiveList.qml</file>
<file>DownloadFromDiveComputer.qml</file>
<file>DownloadedDiveDelegate.qml</file>
<file>GpsList.qml</file>
<file>HintsTextEdit.qml</file>
<file>Log.qml</file>
<file>main.qml</file>
<file>MapPage.qml</file>
<file>Settings.qml</file>
<file>ThemeTest.qml</file>
<file>StartPage.qml</file>
<file>SsrfButton.qml</file>
<file>SsrfCheckBox.qml</file>
<file>SsrfSwitch.qml</file>
<file>icons/dive.jpg</file>
<file alias="nocloud.svg">icons/nocloud.svg</file>
<file alias="subsurface-mobile-icon.png">../../icons/subsurface-mobile-icon.png</file>
<file>reportBugPage.qml</file>
</qresource>
<qresource prefix="/">
<file>qtquickcontrols2.conf</file>
<file>icons/Blue_gps.svg</file>
<file>icons/cloud_sync.svg</file>
<file>icons/Dark_gps.svg</file>
<file alias="icons/downloadDC.svg">icons/button-download-dc_icon.svg</file>
<file alias="icons/downloadDC-black.svg">icons/button-download-dc-black_icon.svg</file>
<file>icons/ic_adb.svg</file>
<file>icons/ic_add.svg</file>
<file>icons/ic_add_location.svg</file>
<file>icons/ic_clear.svg</file>
<file>icons/ic_cloud_done.svg</file>
<file>icons/ic_cloud_download.svg</file>
<file>icons/ic_cloud_off.svg</file>
<file>icons/ic_cloud_upload.svg</file>
<file>icons/ic_gps_fixed.svg</file>
<file>icons/ic_help_outline.svg</file>
<file>icons/ic_home.svg</file>
<file>icons/ic_info_outline.svg</file>
<file>icons/ic_location_off.svg</file>
<file>icons/ic_place.svg</file>
<file>icons/ic_settings.svg</file>
<file>icons/ic_star.svg</file>
<file>icons/ic_star_border.svg</file>
<file>icons/ic_sync.svg</file>
<file>icons/Pink_gps.svg</file>
<file alias="icons/application-menu.svg">kirigami/icons/application-menu.svg</file>
<file alias="icons/dialog-cancel.svg">kirigami/icons/dialog-cancel.svg</file>
<file alias="icons/distribute-horizontal-x.svg">kirigami/icons/distribute-horizontal-x.svg</file>
<file alias="icons/document-edit.svg">kirigami/icons/document-edit.svg</file>
<file alias="icons/document-save.svg">kirigami/icons/document-save.svg</file>
<file alias="icons/go-up.svg">kirigami/icons/go-up.svg</file>
<file alias="icons/gps.svg">kirigami/icons/gps.svg</file>
<file alias="icons/handle-left.svg">kirigami/icons/handle-left.svg</file>
<file alias="icons/handle-right.svg">kirigami/icons/handle-right.svg</file>
<file alias="icons/map-globe.svg">kirigami/icons/map-globe.svg</file>
<file alias="icons/list-add.svg">kirigami/icons/list-add.svg</file>
<file alias="icons/overflow-menu.svg">kirigami/icons/overflow-menu.svg</file>
<file alias="icons/trash-empty.svg">kirigami/icons/trash-empty.svg</file>
<file alias="icons/view-readermode.svg">kirigami/icons/view-readermode.svg</file>
</qresource>
<qresource prefix="/org/kde/kirigami/icons">
<file alias="go-next-symbolic.svg">kirigami/icons/go-next.svg</file>
<file alias="go-previous-symbolic.svg">kirigami/icons/go-previous.svg</file>
</qresource>
</RCC>
37 changes: 37 additions & 0 deletions mobile-widgets/qml/reportBugPage.qml
View file
@@ -0,0 +1,37 @@
// SPDX-License-Identifier: GPL-2.0
import QtQuick 2.6
import org.subsurfacedivelog.mobile 1.0
import org.kde.kirigami 2.2 as Kirigami

Kirigami.Page {
id: reportBug
objectName: "reportBug"
title: qsTr("Report a Bug")
leftPadding: 0
topPadding: 0
rightPadding: 0
bottomPadding: 0
property bool firstRun: true

Controls.Label {
Layout.alignment: Qt.AlignRight
text: qsTr("Bug description:")
font.pointSize: subsurfaceTheme.smallPointSize
}
Controls.TextField {
id: txtBug;
Layout.fillWidth: true
onEditingFinished: {
focus = false
}
}
SsrfButton {
id: sendBugReport
Layout.alignment: Qt.AlignHCenter
text: qsTr("SendBugReport")
onClicked: {
rootItem.returnTopPage()
}
}

}

0 comments on commit 1cbaff3

Please sign in to comment.