[libcalamaresui] Add spinner to QmlViewStep

- view step now has a widget, doesn't load QML yet
main
Adriaan de Groot 5 years ago
parent 60c1d40b20
commit 44b250809f

@ -18,13 +18,22 @@
#include "QmlViewStep.h"
#include "widgets/WaitingWidget.h"
#include <QVBoxLayout>
#include <QWidget>
namespace Calamares
{
QmlViewStep::QmlViewStep( const QString& name, QObject* parent )
: ViewStep( parent )
, m_name( name )
, m_widget( new QWidget )
, m_spinner( new WaitingWidget( tr( "Loading ..." ) ) )
{
QVBoxLayout* layout = new QVBoxLayout( m_widget );
layout->addWidget( m_spinner );
}
QmlViewStep::~QmlViewStep() {}
@ -83,5 +92,5 @@ Calamares::QmlViewStep::onLeave()
QWidget*
Calamares::QmlViewStep::widget()
{
return nullptr;
return m_widget;
}

@ -21,6 +21,11 @@
#include "viewpages/ViewStep.h"
class QQmlComponent;
class QQuickItem;
class QQuickWidget;
class WaitingWidget;
namespace Calamares
{
@ -55,6 +60,12 @@ public:
private:
QString m_name;
QWidget* m_widget = nullptr;
WaitingWidget* m_spinner = nullptr;
QQuickWidget* m_qmlShow = nullptr;
QQmlComponent* m_qmlComponent = nullptr;
QQuickItem* m_qmlObject = nullptr;
};
} // namespace Calamares

Loading…
Cancel
Save