[libcalamaresui] Add spinner to QmlViewStep

- view step now has a widget, doesn't load QML yet
This commit is contained in:
Adriaan de Groot 2020-01-10 13:10:55 +01:00
parent 60c1d40b20
commit 44b250809f
2 changed files with 21 additions and 1 deletions

View File

@ -18,13 +18,22 @@
#include "QmlViewStep.h" #include "QmlViewStep.h"
#include "widgets/WaitingWidget.h"
#include <QVBoxLayout>
#include <QWidget>
namespace Calamares namespace Calamares
{ {
QmlViewStep::QmlViewStep( const QString& name, QObject* parent ) QmlViewStep::QmlViewStep( const QString& name, QObject* parent )
: ViewStep( parent ) : ViewStep( parent )
, m_name( name ) , 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() {} QmlViewStep::~QmlViewStep() {}
@ -83,5 +92,5 @@ Calamares::QmlViewStep::onLeave()
QWidget* QWidget*
Calamares::QmlViewStep::widget() Calamares::QmlViewStep::widget()
{ {
return nullptr; return m_widget;
} }

View File

@ -21,6 +21,11 @@
#include "viewpages/ViewStep.h" #include "viewpages/ViewStep.h"
class QQmlComponent;
class QQuickItem;
class QQuickWidget;
class WaitingWidget;
namespace Calamares namespace Calamares
{ {
@ -55,6 +60,12 @@ public:
private: private:
QString m_name; 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 } // namespace Calamares