[calamares] Load QML navigation

This commit is contained in:
Adriaan de Groot 2020-04-01 15:06:11 +02:00
parent d4f903b95c
commit 02fc4ce806
3 changed files with 53 additions and 1 deletions

View File

@ -177,7 +177,11 @@ CalamaresWindow::getWidgetNavigation()
QWidget* QWidget*
CalamaresWindow::getQmlNavigation() CalamaresWindow::getQmlNavigation()
{ {
return nullptr; CalamaresUtils::registerCalamaresModels();
QQuickWidget* w = new QQuickWidget( this );
w->setSource( QUrl(
CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-navigation" ) ) ) );
return w;
} }
CalamaresWindow::CalamaresWindow( QWidget* parent ) CalamaresWindow::CalamaresWindow( QWidget* parent )

View File

@ -0,0 +1,47 @@
import io.calamares.ui 1.0
import io.calamares.core 1.0
import QtQuick 2.3
import QtQuick.Controls 2.10
import QtQuick.Layouts 1.3
import org.kde.kirigami 2.7 as Kirigami
Row {
id: buttonBar
height: 64
Button
{
Layout.fillWidth: true
text: qsTr("Back")
icon.name: "next"
Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
Kirigami.Theme.textColor: Kirigami.Theme.textColor
visible: true
onClicked: { }
}
Button
{
Layout.fillWidth: true
text: qsTr("Next")
icon.name: "next"
Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
Kirigami.Theme.textColor: Kirigami.Theme.textColor
visible: true
onClicked: { }
}
Button
{
Layout.fillWidth: true
text: qsTr("Quit")
icon.name: "quit"
Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
Kirigami.Theme.textColor: Kirigami.Theme.textColor
visible: true
onClicked: { }
}
}

View File

@ -1,5 +1,6 @@
<!DOCTYPE RCC><RCC version="1.0"> <!DOCTYPE RCC><RCC version="1.0">
<qresource> <qresource>
<file alias="calamares-sidebar.qml">calamares-sidebar.qml</file> <file alias="calamares-sidebar.qml">calamares-sidebar.qml</file>
<file alias="calamares-navigation.qml">calamares-navigation.qml</file>
</qresource> </qresource>
</RCC> </RCC>