Skip to content

Commit

Permalink
Add text attributes (#213)
Browse files Browse the repository at this point in the history 
* [SettingsPage.qml] Add `<strong>` to non-working `<big>`

* [AboutPage.qml] Try using paragraphs

* [SettingsPage.qml] Use `&nbsp;`
  • Loading branch information
@Olf0
Olf0 authored Sep 26, 2023
1 parent 23c49e7 commit 198ba80
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
28 changes: 14 additions & 14 deletions qml/pages/AboutPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,46 +82,46 @@ Page {
onLinkActivated: Qt.openUrlExternally(link)
}

// The formatting might look better, if paragraphs ('<p></p>') are used, instead
// of two consequtive breaks ('<br /><br />'); lacking motivation to try that now.
// Try if formatting looks better, when paragraphs ('<p></p>') are used, instead
// of two consequtive breaks ('<br /><br />').
// Reference: https://doc.qt.io/qt-5/richtext-html-subset.html#supported-tags
// But Qt5's Rich Text Engine suprises sometimes, hence test first!
Label {
//% "&nbsp;<br />"
//% "<p>&nbsp;<br />"
//% "The SailfishOS:Chum community repository provides a collection of "
//% "applications, tools and libraries compiled for various hardware "
//% "architectures and Sailfish&nbsp;OS release versions.<br />"
//% "<br />"
//% "architectures and Sailfish&nbsp;OS release versions."
//% "</p><p>"
//% "In contrast to the software distribution model of the Jolla Store or "
//% "OpenRepos, to which binary packages are uploaded by developers, at "
//% "SailfishOS:Chum software is compiled and packaged into RPMs in a "
//% "reproducible manner directly from its source code. The source code used "
//% "for compiling and packaging is submitted by developers to OBS (Open "
//% "Build Service), which generates multiple RPM files for different "
//% "combinations of hardware architectures and Sailfish&nbsp;OS release "
//% "versions.<br />"
//% "<br />"
//% "versions."
//% "</p><p>"
//% "This scheme ensures that the complete source code of all packages at "
//% "SailfishOS:Chum is available and inspectable there, and that all "
//% "packages are generated solely from this source code. Hence all software "
//% "packages at SailfishOS:Chum are created in a transparent and fully "
//% "traceable manner.<br />"
//% "<br />"
//% "traceable manner."
//% "</p><p>"
//% "By collecting software for Sailfish&nbsp;OS in a single automated build "
//% "system, collaboration between developers through common packaging of "
//% "shared libraries etc. is fostered, duplication of work for keeping these "
//% "common packages up-to-date is eliminated, and it becomes much easier to "
//% "determine which pieces of software exist and which are missing at the "
//% "Sailfish&nbsp;OS OBS. Additionally this eases tracing multiple and "
//% "potentially layered dependencies (&quot;dependency chains&quot;) which is crucial "
//% "for keeping the software supply chains of complex packages up-to-date.<br />"
//% "<br />"
//% "for keeping the software supply chains of complex packages up-to-date."
//% "</p><p>"
//% "The SailfishOS:Chum repository is located at the Sailfish&nbsp;OS OBS:<br />"
//% "<a href='https://build.merproject.org/project/show/sailfishos:chum'>build.merproject.org/project/show/sailfishos:chum</a><br />"
//% "<br />"
//% "<a href='https://build.merproject.org/project/show/sailfishos:chum'>build.merproject.org/project/show/sailfishos:chum</a>"
//% "</p><p>"
//% "For the etymological origin and meanings of the word &quot;chum&quot;, see "
//% "<a href='https://en.wikipedia.org/wiki/Chumming'>en.wikipedia.org:Chumming</a> "
//% "and <a href='https://en.wiktionary.org/wiki/chum'>en.wiktionary.org:chum</a>."
//% "and <a href='https://en.wiktionary.org/wiki/chum'>en.wiktionary.org:chum</a>.</p>"
text: qsTrId("chum-about-description")
textFormat: Text.StyledText
font.pixelSize: Theme.fontSizeSmall
Expand Down
18 changes: 9 additions & 9 deletions qml/pages/SettingsPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ Page {

if (Chum.manualVersion)
return Chum.repoTesting ?
//% "Subscribed to the SailfishOS:Chum:Testing repository with a manually set Sailfish OS version (%1)."
//% "Subscribed to the SailfishOS:Chum:Testing repository with a manually set Sailfish&nbsp;OS version (%1)."
qsTrId("chum-settings-status-repo-testing-manual").arg(Chum.manualVersion) :
//% "Subscribed to the regular SailfishOS:Chum repository with a manually set Sailfish OS version (%1)."
//% "Subscribed to the regular SailfishOS:Chum repository with a manually set Sailfish&nbsp;OS version (%1)."
qsTrId("chum-settings-status-repo-regular-manual").arg(Chum.manualVersion)
return Chum.repoTesting ?
//% "Subscribed to the SailfishOS:Chum:Testing repository with an automatically determined Sailfish OS version."
//% "Subscribed to the SailfishOS:Chum:Testing repository with an automatically determined Sailfish&nbsp;OS version."
qsTrId("chum-settings-status-repo-testing-auto") :
//% "Subscribed to the regular SailfishOS:Chum repository with an automatically determined Sailfish OS version."
//% "Subscribed to the regular SailfishOS:Chum repository with an automatically determined Sailfish&nbsp;OS version."
qsTrId("chum-settings-status-repo-regular-auto");

}
Expand Down Expand Up @@ -111,14 +111,14 @@ Page {
// '<big>' does not work, but should: https://doc.qt.io/qt-5/richtext-html-subset.html#supported-tags
TextFieldDesc {
id: txtRelease
//% "<big>Press Enter to apply.</big><br />"
//% "<big><strong>Press Enter to apply.</strong></big><br />"
//% "Usually a specific SailfishOS:Chum repository is automatically selected according to the "
//% "installed Sailfish OS release version. To manually select a SailfishOS:Chum repository "
//% "for a specific Sailfish OS release, specify this release here (for example, 4.3.0.12). "
//% "installed Sailfish&nbsp;OS release version. To manually select a SailfishOS:Chum repository "
//% "for a specific Sailfish&nbsp;OS release, specify this release here (for example, 4.3.0.12). "
//% "This is useful when the SailfishOS:Chum repository is not available for the installed "
//% "Sailfish OS version, as for Cbeta users."
//% "Sailfish&nbsp;OS version, as for Cbeta users."
description: qsTrId("chum-setings-override-release-description")
//% "Specify a Sailfish OS version"
//% "Specify a Sailfish&nbsp;OS version"
placeholderText: qsTrId("chum-setings-override-release-placeholder")
text: Chum.manualVersion
onEnterClicked: {
Expand Down

0 comments on commit 198ba80

Please sign in to comment.