Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AboutPage.qml] Another take at relative icon paths #59

Merged
merged 14 commits into from
Feb 13, 2024
Merged

[AboutPage.qml] Another take at relative icon paths #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
946dd47
[AboutPage.qml] Another take at relative icon paths
Olf0 Feb 12, 2024
aa4932a
[flowplayer.ts] Adopt line numbers from `AboutPage.qml`
Olf0 Feb 12, 2024
77fc64c
[AboutPage.qml] Fix relative paths to icons
Olf0 Feb 12, 2024
194dabd
Merge branch 'devel' into relative-icon-paths-again
Olf0 Feb 12, 2024
99893a2
[AboutPage.qml] Enlarge PayPal image
Olf0 Feb 13, 2024
0b1eb1e
[AboutPage.qml] Trying to optimise layout
Olf0 Feb 13, 2024
8eba6b0
[flowplayer.ts] Adapt to updated `AboutPage.qml`
Olf0 Feb 13, 2024
534de0e
[AboutPage.qml] Do not confuse "vertical" with "horizontal"
Olf0 Feb 13, 2024
3b8613e
[AboutPage.qml] Play with font sizes
Olf0 Feb 13, 2024
5d8f92c
Update AboutPage.qml
Olf0 Feb 13, 2024
e1f361c
[AboutPage.qml] Link to `translations/README.md`
Olf0 Feb 13, 2024
97870ba
[AboutPage.qml] Play with fonts
Olf0 Feb 13, 2024
ca6d1e2
[AboutPage.qml] Swap lines
Olf0 Feb 13, 2024
20ccbdf
[flowplayer.ts] Adopt new line numbers from `AboutPage.qml`
Olf0 Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions qml/pages/AboutPage.qml
View file
Open in desktop
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: "../../../icons/hicolor/86x86/apps/flowplayer.png"
}

Column {
Expand All @@ -44,7 +44,9 @@ Page {
Label {
id: main
color: Theme.highlightColor
text: "FlowPlayer"
text: "<b>FlowPlayer</b>"
font.pixelSize: Theme.fontSizeMedium
textFormat: Text.RichText
}

Label {
Expand All @@ -68,13 +70,6 @@ Page {
font.pixelSize: Theme.fontSizeSmall
}

Label {
color: Theme.secondaryColor
text: "&nbsp;"
textFormat: Text.RichText
font.pixelSize: Theme.fontSizeSmall
}

Label {
color: Theme.secondaryColor
text: qsTr("Contributors:")
Expand All @@ -97,17 +92,19 @@ Page {
Label {
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>"
text: colored +
"<a href='https://github.com/sailfishos-applications/flowplayer/blob/master/translations/README.md#translations-l10n--i18n'>" +
"<b>Translations README</b></a>"
onLinkActivated: Qt.openUrlExternally(link)
font.pixelSize: Theme.fontSizeLarge
textFormat: Text.RichText
wrapMode: Text.WordWrap
width: parent.width
anchors.horizontalCenter: parent.horizontalCenter
}

Separator {
Expand All @@ -124,10 +121,11 @@ Page {
}

Image {
source: "file:///usr/share/flowplayer/qml/paypal.png"
height: Theme.itemSizeMedium
source: "../paypal.png"
height: Theme.itemSizeHuge
fillMode: Image.PreserveAspectFit
smooth: true
anchors.horizontalCenter: parent.horizontalCenter

MouseArea {
anchors.fill: parent
Expand Down
8 changes: 4 additions & 4 deletions translations/flowplayer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/AboutPage.qml" line="61"/>
<location filename="../qml/pages/AboutPage.qml" line="63"/>
<source>Original author:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/AboutPage.qml" line="80"/>
<location filename="../qml/pages/AboutPage.qml" line="75"/>
<source>Contributors:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/AboutPage.qml" line="98"/>
<location filename="../qml/pages/AboutPage.qml" line="93"/>
<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="119"/>
<location filename="../qml/pages/AboutPage.qml" line="116"/>
<source>You can support the original author of FlowPlayer by donating:</source>
<translation type="unfinished"></translation>
</message>
Expand Down
Loading