From e0f03586b4b3c7a89abdd43a94276e9cdb83d415 Mon Sep 17 00:00:00 2001 From: Papoteur Date: Sun, 21 Jun 2020 22:42:18 +0200 Subject: New screens for live mode. --- qml/Install.qml | 72 +++++++++++------------------------------------ qml/InstallSoftware.qml | 75 +++++++++++++++++++++++++++++++++++++++++++++++++ qml/Live.qml | 46 ++++++++++++++++++++++++++++++ qml/mw-ui.qml | 5 +++- 4 files changed, 141 insertions(+), 57 deletions(-) create mode 100644 qml/InstallSoftware.qml create mode 100644 qml/Live.qml (limited to 'qml') diff --git a/qml/Install.qml b/qml/Install.qml index 22bfcd3..f715762 100644 --- a/qml/Install.qml +++ b/qml/Install.qml @@ -1,75 +1,35 @@ import QtQuick 2 import QtQuick.Controls 1 -// Install software page Rectangle { - property var title: qsTr("Install software") + //: the button in buttons bar + property var title: qsTr("Install") width: view.width; height: view.height Loader { sourceComponent: slidebackground ; anchors.fill: parent} Column { spacing: 10 + anchors.centerIn: parent + anchors.verticalCenter: parent.verticalCenter + Label { - text: qsTr("Install and remove software") - width: slideshow.width - topPadding: 30; leftPadding: 20; - padding: 10 - font.bold: true - wrapMode: Text.WordWrap - color: "white" - } - Label { - text: qsTr("With Mageia, you will find the software in the media repositories. Mageia users simply access these media via one of the Software Managers."); - width: slideshow.width - padding: 20 - wrapMode: Text.WordWrap + horizontalAlignment: TextInput.AlignHCenter + anchors.horizontalCenter: parent.horizontalCenter + text: qsTr("Are you ready for Installation?"); textFormat: Text.RichText color: "white" } - MButton { - anchors.left: parent.left; anchors.leftMargin: 20; - width: slideshow.width * .35 - objectName: "launch" - onMbuttonClicked: { launch.command(["rpmdrake",])} - buttonText: qsTr("RPMdrake")+" *" + + Image { + anchors.horizontalCenter: parent.horizontalCenter + source: "file:/usr/share/icons/draklive-install.png" } MButton { - anchors.left: parent.left; anchors.leftMargin: 20; - width: slideshow.width * .35 + anchors.horizontalCenter: parent.horizontalCenter objectName: "launch" - onMbuttonClicked: { launch.command(["dnfdragora",])} - 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.
"); - width: slideshow.width - padding: 20 - wrapMode: Text.WordWrap - textFormat: Text.RichText - color: "white" - } - Label { - text: qsTr("You can find a more detailed list here:"); - width: slideshow.width - padding: 20 - wrapMode: Text.WordWrap - textFormat: Text.RichText - color: "white" + onMbuttonClicked: { launch.command(["draklive-install",])} + buttonText: qsTr("Launch installation") } - MButton { - anchors.left: parent.left; anchors.leftMargin: 20 - width: slideshow.width * .35 - objectName: "link" - //: Translate only if the link is to a specific page for your language - onMbuttonClicked: { link.weblink(qsTr("https://wiki.mageia.org/en/List_of_applications"))} - buttonText: qsTr("List of applications (wiki)") - } - } - Label { - anchors {top: parent.bottom; topMargin: 3; horizontalCenter: parent.left; horizontalCenterOffset: parent.width * .4 } - text: qsTr("(*) Administrator password is needed") - wrapMode: Text.WordWrap - font.italic: true - color: "white" + } } diff --git a/qml/InstallSoftware.qml b/qml/InstallSoftware.qml new file mode 100644 index 0000000..22bfcd3 --- /dev/null +++ b/qml/InstallSoftware.qml @@ -0,0 +1,75 @@ +import QtQuick 2 +import QtQuick.Controls 1 + +// Install software page +Rectangle { + property var title: qsTr("Install software") + width: view.width; height: view.height + Loader { sourceComponent: slidebackground ; + anchors.fill: parent} + Column { + spacing: 10 + Label { + text: qsTr("Install and remove software") + width: slideshow.width + topPadding: 30; leftPadding: 20; + padding: 10 + font.bold: true + wrapMode: Text.WordWrap + color: "white" + } + Label { + text: qsTr("With Mageia, you will find the software in the media repositories. Mageia users simply access these media via one of the Software Managers."); + width: slideshow.width + padding: 20 + wrapMode: Text.WordWrap + textFormat: Text.RichText + color: "white" + } + MButton { + anchors.left: parent.left; anchors.leftMargin: 20; + width: slideshow.width * .35 + objectName: "launch" + onMbuttonClicked: { launch.command(["rpmdrake",])} + buttonText: qsTr("RPMdrake")+" *" + } + MButton { + anchors.left: parent.left; anchors.leftMargin: 20; + width: slideshow.width * .35 + objectName: "launch" + onMbuttonClicked: { launch.command(["dnfdragora",])} + 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.
"); + width: slideshow.width + padding: 20 + wrapMode: Text.WordWrap + textFormat: Text.RichText + color: "white" + } + Label { + text: qsTr("You can find a more detailed list here:"); + width: slideshow.width + padding: 20 + wrapMode: Text.WordWrap + textFormat: Text.RichText + color: "white" + } + MButton { + anchors.left: parent.left; anchors.leftMargin: 20 + width: slideshow.width * .35 + objectName: "link" + //: Translate only if the link is to a specific page for your language + onMbuttonClicked: { link.weblink(qsTr("https://wiki.mageia.org/en/List_of_applications"))} + buttonText: qsTr("List of applications (wiki)") + } + } + Label { + anchors {top: parent.bottom; topMargin: 3; horizontalCenter: parent.left; horizontalCenterOffset: parent.width * .4 } + text: qsTr("(*) Administrator password is needed") + wrapMode: Text.WordWrap + font.italic: true + color: "white" + } +} diff --git a/qml/Live.qml b/qml/Live.qml new file mode 100644 index 0000000..30355c8 --- /dev/null +++ b/qml/Live.qml @@ -0,0 +1,46 @@ +import QtQuick 2 +import QtQuick.Controls 1 + +Rectangle { + property var title: qsTr("Live mode") + width: view.width; height: view.height + Loader { sourceComponent: slidebackground ; + anchors.fill: parent + } + Column { + anchors.centerIn: parent + spacing: 10 + + Label { + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: TextInput.AlignHCenter + text: qsTr("Live mode") + font.weight: Font.DemiBold + font.pixelSize: Qt.application.font.pixelSize * 1.5 + color: "white" + } + Label { + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: TextInput.AlignHCenter + width: slideshow.width + text:qsTr('This support allows you to try out Mageia without having to actually install it, or make any changes to your computer. However, the Live media also includes an Installer, which can be started when booting the media, or after booting like now.') + wrapMode: Text.WordWrap;textFormat: Text.RichText + color: "white" + } + Label { + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: TextInput.AlignHCenter + width: slideshow.width + text:qsTr("Any customization or installed software will be kept when installing just after. But they won't survive to a reboot, except on a memory support and if you have added a persistent partition.") + wrapMode: Text.WordWrap;textFormat: Text.RichText + color: "white" + } + MButton { + anchors.horizontalCenter: parent.horizontalCenter + objectName: "link" + //: the link to the local file can be adapted to your language if the documentation is translated + onMbuttonClicked: { link.weblink(qsTr("file:///usr/share/doc/mageia-doc/draklive/en/index.html"))} + buttonText: qsTr("Documentation of installer") + } + } +} diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml index c1d0e6f..4c93854 100644 --- a/qml/mw-ui.qml +++ b/qml/mw-ui.qml @@ -85,7 +85,7 @@ Rectangle { Mcc {} // Install software page - Install {} + InstallSoftware {} // Applications page function update_list(group) { @@ -367,6 +367,9 @@ Rectangle { Mcc {} // Install software page + InstallSoftware {} + + // Install on HD Install {} // Documentation links -- cgit v1.2.1