diff options
| author | Papoteur <papoteur@mageia.org> | 2020-08-16 07:37:28 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageia.org> | 2020-08-16 07:37:28 +0200 |
| commit | e7408155372c25231e3313fd971f2bcabb13db91 (patch) | |
| tree | 08134c9f0b74b190d180bc317661253bd72a6e54 /qml | |
| parent | 4620f92633181153b525f3d772843614f2db7aff (diff) | |
| download | mageiawelcome-e7408155372c25231e3313fd971f2bcabb13db91.tar mageiawelcome-e7408155372c25231e3313fd971f2bcabb13db91.tar.gz mageiawelcome-e7408155372c25231e3313fd971f2bcabb13db91.tar.bz2 mageiawelcome-e7408155372c25231e3313fd971f2bcabb13db91.tar.xz mageiawelcome-e7408155372c25231e3313fd971f2bcabb13db91.zip | |
Continue previous improvement
Diffstat (limited to 'qml')
| -rw-r--r-- | qml/Install.qml | 1 | ||||
| -rw-r--r-- | qml/InstallSoftware.qml | 4 | ||||
| -rw-r--r-- | qml/Welcome.qml | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/qml/Install.qml b/qml/Install.qml index b8da993..28333e5 100644 --- a/qml/Install.qml +++ b/qml/Install.qml @@ -17,6 +17,7 @@ Rectangle { anchors.horizontalCenter: parent.horizontalCenter text: qsTr("Here you can choose to permanently install this Mageia system on your computer. Any customizations you have made before launching the installer will be included."); textFormat: Text.RichText + wrapMode: Text.WordWrap color: "white" } diff --git a/qml/InstallSoftware.qml b/qml/InstallSoftware.qml index 22bfcd3..f3972c9 100644 --- a/qml/InstallSoftware.qml +++ b/qml/InstallSoftware.qml @@ -41,7 +41,7 @@ Rectangle { buttonText: qsTr("Dnfdragora") } Label { - text: qsTr("The next slide shows a small selection of popular applications - any of which may be installed at this point.<BR/>"); + text: (user == 'live' ? "": qsTr("The next slide shows a small selection of popular applications - any of which may be installed at this point.<BR/>")); width: slideshow.width padding: 20 wrapMode: Text.WordWrap @@ -49,7 +49,7 @@ Rectangle { color: "white" } Label { - text: qsTr("You can find a more detailed list here:"); + text: (user == 'live' ? qsTr("You can find a detailed list here:") : qsTr("You can find a more detailed list here:")); width: slideshow.width padding: 20 wrapMode: Text.WordWrap diff --git a/qml/Welcome.qml b/qml/Welcome.qml index 8d9ea7d..6851b52 100644 --- a/qml/Welcome.qml +++ b/qml/Welcome.qml @@ -24,10 +24,12 @@ import QtQuick.Controls 1 Label { horizontalAlignment: TextInput.AlignHCenter anchors.horizontalCenter: parent.horizontalCenter + width: slideshow.width * .6 text: (user == 'live' ? qsTr("We are going to guide you through a few important pieces of information and<BR />help you to go further with Mageia.<BR /><BR />Now, click on <i> %1 </i> to go to the first step.").arg(qsTr("Live mode")) : qsTr("We are going to guide you through some important steps and help<BR />you with the configuration of your newly installed system.<BR /><BR />Now, click on <i>%1</i> to go to the first step.").arg(qsTr("Media sources"))); - wrapMode: Text.WordWrap;textFormat:textFormat: Text.RichText + wrapMode: Text.WordWrap + textFormat: Text.RichText color: "white" } } |