Skip to content

Commit

Permalink
Rectify AboutPage.qml (#58)
Browse files Browse the repository at this point in the history
* [README.md] Add smokku to contributors

* [AboutPage.qml] Fix path of Paypal icon
  Correct absolute path would have been `file:///usr/share/flowplayer/qml/paypal.png` (instead of `file:///usr/share/flowplayer/icon/paypal.png`), but reverting back to relative path `file://../paypal.png`.

* [AboutPage.qml] Make icon path relative
  As a consequence of the preceding [commit f002ccb](f002ccb), the other icon path here should also be a relative one, due to [`rpm/flowplayer.spec` lines 116-118](https://github.com/sailfishos-applications/flowplayer/blob/master/rpm/flowplayer.spec#L116-L118): All these paths reside in `%{datadir}`.

* [AboutPage.qml] Trying to enhance formatting

* [flowplayer.ts] Adopt line numbers from `AboutPage.qml`

* [AboutPage.qml] "at" --> @
  • Loading branch information
Olf0 authored Feb 12, 2024
1 parent c11d164 commit 15cd417
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 12 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ In 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects,
#### Contributors
- [Damien Caliste (dcaliste)](https://github.com/dcaliste)
- [olf (Olf0)](https://github.com/Olf0)
- [Tomasz Sterna (smokku)](https://github.com/smokku)
<br />

### License: [MPL 2.0](https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.html)
Expand Down
27 changes: 18 additions & 9 deletions qml/pages/AboutPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Page {
spacing: Theme.paddingLarge

Image {
source: "file:///usr/share/icons/hicolor/86x86/apps/flowplayer.png"
source: "file://../../icons/hicolor/86x86/apps/flowplayer.png"
}

Column {
Expand All @@ -49,7 +49,7 @@ Page {

Label {
color: Theme.secondaryHighlightColor
text: "version " + appVersion
text: "Version " + appVersion
font.pixelSize: Theme.fontSizeSmall
}
}
Expand All @@ -68,9 +68,10 @@ Page {
font.pixelSize: Theme.fontSizeSmall
}

Separator {
width: parent.width
Label {
color: Theme.secondaryColor
text: "&nbsp;"
font.pixelSize: Theme.fontSizeSmall
}

Label {
Expand All @@ -82,7 +83,8 @@ Page {
Label {
color: Theme.secondaryColor
text: "(C) 2022-2024 olf (Olf0)" + "<br />" +
"(C) 2023-2024 Damien Caliste (dcaliste)"
"(C) 2023, 2024 Damien Caliste (dcaliste)" + "<br />" +
"(C) 2024 Tomasz Sterna (smokku)"
font.pixelSize: Theme.fontSizeSmall
}

Expand All @@ -92,15 +94,22 @@ Page {
}

Label {
text: colored + qsTr("If you want to create a new translation or improve an extant one:") + "<br>" +
"<a href='https://app.transifex.com/olf/flowplayer/'>" + "Transifex - FlowPlayer</a>"
onLinkActivated: Qt.openUrlExternally(link)
text: colored + qsTr("If you want to create a new translation or improve an extant one:")
font.pixelSize: Theme.fontSizeSmall
textFormat: Text.RichText
wrapMode: Text.WordWrap
width: parent.width
}

Label {
text: colored + "<a href='https://app.transifex.com/olf/flowplayer/'>" + "FlowPlayer@Transifex</a>"
onLinkActivated: Qt.openUrlExternally(link)
font.pixelSize: Theme.fontSizeLarge
textFormat: Text.RichText
wrapMode: Text.WordWrap
width: parent.width
}

Separator {
width: parent.width
color: Theme.secondaryColor
Expand All @@ -115,7 +124,7 @@ Page {
}

Image {
source: "file:///usr/share/flowplayer/icons/paypal.png"
source: "file://../paypal.png"
height: Theme.itemSizeMedium
fillMode: Image.PreserveAspectFit
smooth: true
Expand Down
6 changes: 3 additions & 3 deletions translations/flowplayer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/AboutPage.qml" line="78"/>
<location filename="../qml/pages/AboutPage.qml" line="79"/>
<source>Contributors:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/AboutPage.qml" line="95"/>
<location filename="../qml/pages/AboutPage.qml" line="97"/>
<source>If you want to create a new translation or improve an extant one:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/AboutPage.qml" line="110"/>
<location filename="../qml/pages/AboutPage.qml" line="119"/>
<source>You can support the original author of FlowPlayer by donating:</source>
<translation type="unfinished"></translation>
</message>
Expand Down

0 comments on commit 15cd417

Please sign in to comment.