Merge branch 'about'

This commit is contained in:
Anton Thomasson 2019-12-15 12:04:20 +01:00
commit 941dbb0891
4 changed files with 125 additions and 1 deletions

View file

@ -23,6 +23,7 @@ SOURCES += src/harbour-seaprint.cpp \
DISTFILES += qml/harbour-seaprint.qml \ DISTFILES += qml/harbour-seaprint.qml \
qml/cover/CoverPage.qml \ qml/cover/CoverPage.qml \
qml/components/AboutLabel.qml \
qml/pages/*.qml \ qml/pages/*.qml \
qml/pages/*.js \ qml/pages/*.js \
qml/pages/*svg \ qml/pages/*svg \
@ -43,7 +44,8 @@ CONFIG += sailfishapp_i18n
# planning to localize your app, remember to comment out the # planning to localize your app, remember to comment out the
# following TRANSLATIONS line. And also do not forget to # following TRANSLATIONS line. And also do not forget to
# modify the localized app name in the the .desktop file. # modify the localized app name in the the .desktop file.
TRANSLATIONS += translations/harbour-seaprint-de.ts TRANSLATIONS += translations/harbour-seaprint-de.ts \
translations/harbour-seaprinter-zh_CN
HEADERS += \ HEADERS += \
src/ippdiscovery.h \ src/ippdiscovery.h \

View file

@ -0,0 +1,9 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
Label {
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width - 2*Theme.horizontalPageMargin
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.Wrap
}

109
qml/pages/AboutPage.qml Normal file
View file

@ -0,0 +1,109 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
import "../components"
Page {
id: aboutPage
allowedOrientations: Orientation.Portrait | Orientation.Landscape | Orientation.LandscapeInverted
SilicaFlickable {
id: aboutFlickable
anchors.fill: parent
contentHeight: column.height
PullDownMenu
{
MenuItem
{
text: qsTr("GitHub repository")
onClicked: Qt.openUrlExternally("https://github.com/attah/harbour-seaprint")
}
MenuItem
{
text: qsTr("Report an Issue")
onClicked: Qt.openUrlExternally("https://github.com/attah/harbour-seaprint/issues")
}
}
Column {
id: column
anchors {
top: parent.top
horizontalCenter: parent.horizontalCenter
}
width: Math.min(Screen.width, aboutFlickable.width)
spacing: Theme.paddingLarge
Item {
width: parent.width
height: Theme.paddingLarge
}
SectionHeader { text: qsTr("About") + " SeaPrint" }
Image {
anchors.horizontalCenter: parent.horizontalCenter
source: Qt.resolvedUrl("/usr/share/icons/hicolor/172x172/apps/harbour-seaprint.png")
width: Theme.iconSizeExtraLarge
height: Theme.iconSizeExtraLarge
smooth: true
asynchronous: true
}
AboutLabel {
font.pixelSize: Theme.fontSizeLarge
color: Theme.highlightColor
text: "SeaPrint 0.2-1"
}
AboutLabel {
font.pixelSize: Theme.fontSizeSmall
color: Theme.primaryColor
text: "© 2019 Anton Thomasson"
}
AboutLabel {
font.pixelSize: Theme.fontSizeSmall
color: Theme.primaryColor
text: qsTr("Network printing for Sailfish OS.")
}
SectionHeader { text: qsTr("Icons") }
AboutLabel {
font.pixelSize: Theme.fontSizeSmall
text: qsTr("Icon made by Gregguh.")
}
SectionHeader { text: qsTr("General contributions") }
AboutLabel {
font.pixelSize: Theme.fontSizeSmall
text: qsTr("Rudi Timmermans - Code and Testing")
}
SectionHeader { text: qsTr("Translations") }
AboutLabel {
font.pixelSize: Theme.fontSizeSmall
text: qsTr("Chinese")+" - dashinfantry"
}
SectionHeader { text: qsTr("Licensing") }
AboutLabel {
font.pixelSize: Theme.fontSizeSmall
text: qsTr("Source code is available at GitHub. Translations, bug reports and other contributions are welcome!")
}
Button {
text: "GitHub"
anchors.horizontalCenter: parent.horizontalCenter
onClicked: Qt.openUrlExternally("https://github.com/attah/harbour-seaprint")
}
AboutLabel {
font.pixelSize: Theme.fontSizeSmall
color: Theme.primaryColor
text: qsTr("SeaPrint licencing is TBD, but will be some flavor of open.")
}
}
}
}

View file

@ -42,6 +42,10 @@ Page {
// PullDownMenu and PushUpMenu must be declared in SilicaFlickable, SilicaListView or SilicaGridView // PullDownMenu and PushUpMenu must be declared in SilicaFlickable, SilicaListView or SilicaGridView
PullDownMenu { PullDownMenu {
MenuItem {
text: qsTr("About SeaPrint")
onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
}
MenuItem { MenuItem {
text: qsTr("Add by URL") text: qsTr("Add by URL")
enabled: wifi.connected enabled: wifi.connected