Merge branch 'master' into wip/install-step2

src/libcalamaresui/viewpages/ViewStep.h

@@ -22,6 +22,7 @@
 #include <QObject>
 
 #include "../UiDllMacro.h"
+#include "Typedefs.h"
 
 namespace Calamares
 {
@@ -46,6 +47,8 @@ public:
     virtual bool isAtBeginning() const = 0;
     virtual bool isAtEnd() const = 0;
 
+    virtual QList< Calamares::job_ptr > jobs() const = 0;
+
 signals:
     void nextStatusChanged( bool status );
     void done();

src/modules/greeting/GreetingViewStep.cpp

@@ -81,3 +81,10 @@ GreetingViewStep::isAtEnd() const
     return true;
 }
 
+
+QList< Calamares::job_ptr >
+GreetingViewStep::jobs() const
+{
+    return QList< Calamares::job_ptr >();
+}
+

src/modules/greeting/GreetingViewStep.h

@@ -49,6 +49,8 @@ public:
     bool isAtBeginning() const override;
     bool isAtEnd() const override;
 
+    QList< Calamares::job_ptr > jobs() const override;
+
 private:
     GreetingPage* m_widget;
 };

src/modules/keyboard/KeyboardViewStep.cpp

@@ -85,3 +85,10 @@ KeyboardViewStep::isAtEnd() const
 {
     return true;
 }
+
+
+QList< Calamares::job_ptr >
+KeyboardViewStep::jobs() const
+{
+    return QList< Calamares::job_ptr >();
+}

src/modules/keyboard/KeyboardViewStep.h

@@ -49,6 +49,8 @@ public:
     bool isAtBeginning() const override;
     bool isAtEnd() const override;
 
+    QList< Calamares::job_ptr > jobs() const override;
+
 private:
     KeyboardPage* m_widget;
     bool m_nextEnabled;

src/modules/locale/LocaleViewStep.cpp

@@ -142,3 +142,10 @@ LocaleViewStep::isAtEnd() const
 {
     return true;
 }
+
+
+QList< Calamares::job_ptr >
+LocaleViewStep::jobs() const
+{
+    return QList< Calamares::job_ptr >();
+}

src/modules/locale/LocaleViewStep.h

@@ -51,6 +51,8 @@ public:
     bool isAtBeginning() const override;
     bool isAtEnd() const override;
 
+    QList< Calamares::job_ptr > jobs() const override;
+
 private:
     QWidget* m_widget;
     QFutureWatcher< void > m_initWatcher;

src/modules/partition/PartitionViewStep.cpp

@@ -20,7 +20,6 @@
 
 #include <PartitionPage.h>
 #include <PartitionCoreModule.h>
-#include <JobQueue.h>
 
 PartitionViewStep::PartitionViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
@@ -49,7 +48,6 @@ PartitionViewStep::widget()
 void
 PartitionViewStep::next()
 {
-    Calamares::JobQueue::instance()->enqueue( m_core->jobs() );
     emit done();
 }
 
@@ -78,3 +76,10 @@ PartitionViewStep::isAtEnd() const
 {
     return true;
 }
+
+
+QList< Calamares::job_ptr >
+PartitionViewStep::jobs() const
+{
+    return m_core->jobs();
+}

src/modules/partition/PartitionViewStep.h

@@ -48,6 +48,8 @@ public:
     bool isAtBeginning() const override;
     bool isAtEnd() const override;
 
+    QList< Calamares::job_ptr > jobs() const override;
+
 private:
     PartitionCoreModule* m_core;
     PartitionPage* m_widget;