diff options
| author | Antony Baker <jasperodus@zoho.com> | 2018-12-20 14:49:09 +0000 |
|---|---|---|
| committer | Papoteur <papoteur@mageia.org> | 2018-12-23 11:01:35 +0100 |
| commit | e01b48636da94ef1c0b3902fdbd341dee28b4b8d (patch) | |
| tree | 4ae1bc88d7ef22b839e5c74809b730759cf37f9b | |
| parent | 32b24d22e1c20b2c56fe2bb853cf767a8a5b408b (diff) | |
| download | mageiawelcome-e01b48636da94ef1c0b3902fdbd341dee28b4b8d.tar mageiawelcome-e01b48636da94ef1c0b3902fdbd341dee28b4b8d.tar.gz mageiawelcome-e01b48636da94ef1c0b3902fdbd341dee28b4b8d.tar.bz2 mageiawelcome-e01b48636da94ef1c0b3902fdbd341dee28b4b8d.tar.xz mageiawelcome-e01b48636da94ef1c0b3902fdbd341dee28b4b8d.zip | |
Media sources: 1. Increase L/R margins and decrease top margin. 2. Allow longer line lengths for repo descriptions. 3. Slight adjustment to text. 4 Reposition Password required.
| -rw-r--r-- | qml/mw-ui.qml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml index 0109e22..d690a31 100644 --- a/qml/mw-ui.qml +++ b/qml/mw-ui.qml @@ -84,8 +84,8 @@ Rectangle { Column { anchors.left: parent.left - anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: 10 + anchors.leftMargin: 20 + y:35 Label { text: qsTr("Configure software repositories"); font.bold: true; } Label { text: qsTr("Mageia official repositories contain:"); } GridLayout { @@ -135,7 +135,7 @@ Rectangle { Label { width: parent.width text: qsTr("- closed-source programs, e.g. Nvidia proprietary drivers, non-free drivers for some Wi-Fi cards, etc"); - Layout.maximumWidth: slideshow.width * .6 + Layout.maximumWidth: slideshow.width * .8 wrapMode: Text.WordWrap } Rectangle {id: taintedBg @@ -157,9 +157,9 @@ Rectangle { color: "white" } } Label { - text: qsTr("- these packages may infringe on patents or copyright laws in certain countries, eg audio and video codecs needed for certain multimedia files or commercial DVDs"); + text: qsTr("- these packages (eg audio and video codecs needed for certain multimedia files or commercial DVDs) may infringe on patents or copyright laws in certain countries. "); wrapMode: Text.WordWrap - Layout.maximumWidth: slideshow.width * .6 + Layout.maximumWidth: slideshow.width * .8 } Rectangle { color: "lightgrey" @@ -172,7 +172,7 @@ Rectangle { Label { text: qsTr("- includes software published after a Mageia release, or another version of software already present and not replaced."); wrapMode: Text.WordWrap - Layout.maximumWidth: slideshow.width * .6 + Layout.maximumWidth: slideshow.width * .8 } Button { Layout.maximumWidth: slideshow.width * .25 @@ -198,19 +198,20 @@ Rectangle { text: qsTr("Note! ") } } - Label { text: qsTr("If you enabled the online repositories during installation, some media sources should be installed already. If you didn't, we will now configure these online repositories. - If this computer will have access to the Internet, you can delete the <i>cdrom</i> entry from the list of repositories.")+"<BR />"+ + Label { text: qsTr("If you enabled the online repositories during installation, some media sources should be installed already. Otherwise, we will now configure these online repositories. + If this computer will have access to the Internet, you can delete the <i>cdrom</i> entry from the list of repositories.")+"<BR /><BR />"+ qsTr("Now, please enable or disable the online repositories of your choice: click on the <i>Edit software repositories</i> button. Select at least the <i>release</i> and <i>updates</i> pair. <i>Debug</i> and <i>Testing</i> are for special cases.")+"<BR />"+ - qsTr("After you have checked and enabled the repositories you need, you can go to the next slide."); + qsTr("After you have checked and enabled the repositories you need, you can go to the next slide.<BR />"); wrapMode: Text.WordWrap textFormat: Text.RichText Layout.fillWidth: true - Layout.maximumWidth: slideshow.width - 100 + Layout.maximumWidth: slideshow.width * .85 } } Label { - text: qsTr("(*) Administrator password is needed") + x: 84 + text: qsTr("(*) Administrator password is needed.") Layout.maximumWidth: slideshow.width * .25 wrapMode: Text.WordWrap font.italic: true |