[welcomeq] make release notes part of welcome window
use Loader option for those notes too, commented out file shows it is possible to load from anywhere
This commit is contained in:
parent
249150dd1b
commit
828448b2ff
100
src/modules/welcomeq/release_notes.qml
Normal file
100
src/modules/welcomeq/release_notes.qml
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
||||||
|
*
|
||||||
|
* Copyright 2020, Anke Boersma <demm@kaosx.us>
|
||||||
|
*
|
||||||
|
* Calamares is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Calamares is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import io.calamares.ui 1.0
|
||||||
|
|
||||||
|
import QtQuick 2.7
|
||||||
|
import QtQuick.Controls 2.2
|
||||||
|
import QtQuick.Window 2.2
|
||||||
|
import QtQuick.Layouts 1.3
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
width: parent.width
|
||||||
|
height: parent.height
|
||||||
|
focus: true
|
||||||
|
color: "#f2f2f2"
|
||||||
|
|
||||||
|
Flickable {
|
||||||
|
id: flick
|
||||||
|
anchors.fill: parent
|
||||||
|
contentHeight: 3500
|
||||||
|
|
||||||
|
ScrollBar.vertical: ScrollBar {
|
||||||
|
id: fscrollbar
|
||||||
|
width: 10
|
||||||
|
policy: ScrollBar.AlwaysOn
|
||||||
|
}
|
||||||
|
|
||||||
|
TextArea {
|
||||||
|
id: intro
|
||||||
|
x: 130
|
||||||
|
y: 8
|
||||||
|
width: 640
|
||||||
|
font.pointSize: 14
|
||||||
|
textFormat: Text.RichText
|
||||||
|
antialiasing: true
|
||||||
|
activeFocusOnPress: false
|
||||||
|
wrapMode: Text.WordWrap
|
||||||
|
|
||||||
|
text: qsTr("<h3>%1</h3>
|
||||||
|
<p>This an example QML file, showing options in RichText with Flickable content.</p>
|
||||||
|
|
||||||
|
<p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p>
|
||||||
|
|
||||||
|
<p><b>This is bold text</b></p>
|
||||||
|
<p><i>This is italic text</i></p>
|
||||||
|
<p><u>This is underlined text</u></p>
|
||||||
|
<p><center>This text will be center-aligned.</center></p>
|
||||||
|
<p><s>This is strikethrough</s></p>
|
||||||
|
|
||||||
|
<p>Code example:
|
||||||
|
<code>ls -l /home</code></p>
|
||||||
|
|
||||||
|
<p><b>Lists:</b></p>
|
||||||
|
<ul>
|
||||||
|
<li>Intel CPU systems</li>
|
||||||
|
<li>AMD CPU systems</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<p>The vertical scrollbar is adjustable, current width set to 10.</p>").arg(Branding.string(Branding.VersionedName))
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ToolButton {
|
||||||
|
id: toolButton
|
||||||
|
x: 19
|
||||||
|
y: 29
|
||||||
|
width: 105
|
||||||
|
height: 48
|
||||||
|
text: qsTr("Back")
|
||||||
|
hoverEnabled: true
|
||||||
|
onClicked: load.source = ""
|
||||||
|
|
||||||
|
Image {
|
||||||
|
id: image1
|
||||||
|
x: 0
|
||||||
|
y: 13
|
||||||
|
width: 22
|
||||||
|
height: 22
|
||||||
|
source: "img/chevron-left-solid.svg"
|
||||||
|
fillMode: Image.PreserveAspectFit
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -110,7 +110,8 @@ Page
|
|||||||
Kirigami.Theme.textColor: Kirigami.Theme.textColor
|
Kirigami.Theme.textColor: Kirigami.Theme.textColor
|
||||||
|
|
||||||
visible: config.releaseNotesUrl !== ""
|
visible: config.releaseNotesUrl !== ""
|
||||||
onClicked: Qt.openUrlExternally(config.releaseNotesUrl)
|
onClicked: load.source = "release_notes.qml"
|
||||||
|
//onClicked: load.source = "file:/usr/share/calamares/release_notes.qml"
|
||||||
}
|
}
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
<qresource>
|
<qresource>
|
||||||
<file alias="welcomeq.qml">welcomeq.qml</file>
|
<file alias="welcomeq.qml">welcomeq.qml</file>
|
||||||
<file alias="about.qml">about.qml</file>
|
<file alias="about.qml">about.qml</file>
|
||||||
|
<file alias="release_notes.qml">release_notes.qml</file>
|
||||||
<file>img/squid.png</file>
|
<file>img/squid.png</file>
|
||||||
<file>img/chevron-left-solid.svg</file>
|
<file>img/chevron-left-solid.svg</file>
|
||||||
<file>img/language-icon-48px.png</file>
|
<file>img/language-icon-48px.png</file>
|
||||||
|
Loading…
Reference in New Issue
Block a user