Merge branch 'master' into requirements-checking

diff --cc src/calamares/CalamaresApplication.cpp
index 0516606,f668722..c9a171f
--- 1/src/calamares/CalamaresApplication.cpp
--- 2/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@@ -339,8 -348,13 +348,15 @@@ voi
  CalamaresApplication::initViewSteps()
  {
      cDebug() << "STARTUP: loadModules for all modules done";
-     m_mainwindow->show();
 +    m_moduleManager->checkRequirements();
+     if ( Calamares::Branding::instance()->windowMaximize() )
+     {
+         m_mainwindow->setWindowFlag( Qt::FramelessWindowHint );
+         m_mainwindow->showMaximized();
+     }
+     else
+         m_mainwindow->show();
++
      ProgressTreeModel* m = new ProgressTreeModel( nullptr );
      ProgressTreeView::instance()->setModel( m );
      cDebug() << "STARTUP: Window now visible and ProgressTreeView populated";

diff --cc src/libcalamaresui/CMakeLists.txt
Simple merge

diff --cc src/libcalamaresui/modulesystem/Module.cpp
Simple merge

diff --cc src/modules/partition/gui/PartitionViewStep.cpp
index 09717a5,a152db1..5ec99bf
--- 1/src/modules/partition/gui/PartitionViewStep.cpp
--- 2/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@@ -553,8 -645,17 +648,17 @@@ PartitionViewStep::setConfigurationMap
      } );
  
      QFuture< void > future =
 -            QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
 -    watcher->setFuture( future );
 +        QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
 +    m_future->setFuture( future );
+ 
+     if ( configurationMap.contains( "partitionLayout" ) )
+     {
+         m_core->initLayout( configurationMap.values( "partitionLayout" ).at(0).toList() );
+     }
+     else
+     {
+         m_core->initLayout();
+     }
  }
  
  

diff --cc src/modules/partition/gui/PartitionViewStep.h
index 2716918,f231083..47f8fa1
--- 1/src/modules/partition/gui/PartitionViewStep.h
--- 2/src/modules/partition/gui/PartitionViewStep.h
+++ b/src/modules/partition/gui/PartitionViewStep.h
@@@ -80,7 -79,8 +83,9 @@@ private
      PartitionPage*    m_manualPartitionPage;
  
      QWidget*          m_waitingWidget;
 +    QFutureWatcher<void>* m_future;
+ 
+     QSet< PartitionActions::Choices::SwapChoice > m_swapChoices;
  };
  
  CALAMARES_PLUGIN_FACTORY_DECLARATION( PartitionViewStepFactory )

diff --cc src/modules/welcome/WelcomePage.cpp
Simple merge