Merge branch 'kpmcore-manager'

Introduces a "partitioning service" into libcalamares,
shuffles a bunch of things into it, tries to help out
with settling the system between partitioning actions.

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

diff --cc src/libcalamares/JobQueue.cpp
Simple merge

diff --cc src/libcalamares/PythonJobApi.cpp
Simple merge

diff --cc src/libcalamares/utils/CalamaresUtilsSystem.cpp
Simple merge

diff --cc src/libcalamares/utils/CalamaresUtilsSystem.h
Simple merge

diff --cc src/modules/partition/core/KPMHelpers.h
index bb510ca,5e18aaf..f2934c4
--- 1/src/modules/partition/core/KPMHelpers.h
--- 2/src/modules/partition/core/KPMHelpers.h
+++ b/src/modules/partition/core/KPMHelpers.h
@@@ -113,32 -79,6 +79,30 @@@ Partition* createNewEncryptedPartition
  
  Partition* clonePartition( Device* device, Partition* partition );
  
- QString prettyNameForFileSystemType( FileSystem::Type t );
- 
 +static inline QString
 +untranslatedFS( FileSystem& fs )
 +{
 +    return fs.name( { QStringLiteral( "C" ) } );
 +}
 +
 +static inline QString
 +untranslatedFS( FileSystem* fs )
 +{
 +    return fs ? untranslatedFS( *fs ) : QString();
 +}
 +
 +static inline QString
 +userVisibleFS( FileSystem& fs )
 +{
 +    return fs.name();
 +}
 +
 +static inline QString
 +userVisibleFS( FileSystem* fs )
 +{
 +    return fs ? userVisibleFS( *fs ) : QString();
 +}
 +
  }
  
  #endif /* KPMHELPERS_H */

diff --cc src/modules/partition/gui/CreatePartitionDialog.cpp
Simple merge

diff --cc src/modules/partition/gui/PartitionViewStep.cpp
Simple merge

diff --cc src/modules/partition/jobs/FillGlobalStorageJob.cpp
index 12faaf9,b991953..940c712
--- 1/src/modules/partition/jobs/FillGlobalStorageJob.cpp
--- 2/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@@ -18,22 -18,23 +18,25 @@@
   *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
   */
  
--#include "jobs/FillGlobalStorageJob.h"
++#include "FillGlobalStorageJob.h"
  
- #include "core/PartitionIterator.h"
 +#include "core/KPMHelpers.h"
 +#include "core/PartitionInfo.h"
 +
 +#include "Branding.h"
  #include "GlobalStorage.h"
  #include "JobQueue.h"
 -#include "core/PartitionInfo.h"
 -#include "core/KPMHelpers.h"
+ 
+ #include "partition/PartitionIterator.h"
  #include "utils/Logger.h"
  
+ #include "Branding.h"
+ 
  // KPMcore
- #include <core/device.h>
- #include <core/partition.h>
- #include <fs/filesystem.h>
- #include <fs/luks.h>
+ #include <kpmcore/core/device.h>
+ #include <kpmcore/core/partition.h>
+ #include <kpmcore/fs/filesystem.h>
+ #include <kpmcore/fs/luks.h>
  
  // Qt
  #include <QDebug>
@@@ -41,13 -42,12 +44,14 @@@
  #include <QFileInfo>
  #include <QProcess>
  
 +using KPMHelpers::untranslatedFS;
 +using KPMHelpers::userVisibleFS;
+ using CalamaresUtils::Partition::PartitionIterator;
  
 -typedef QHash<QString, QString> UuidForPartitionHash;
 +typedef QHash< QString, QString > UuidForPartitionHash;
  
  static UuidForPartitionHash
 -findPartitionUuids( QList < Device* > devices )
 +findPartitionUuids( QList< Device* > devices )
  {
      UuidForPartitionHash hash;
      foreach ( Device* device, devices )

diff --cc src/modules/partition/jobs/FormatPartitionJob.cpp
index c877343,69266c8..5798a0a
--- 1/src/modules/partition/jobs/FormatPartitionJob.cpp
--- 2/src/modules/partition/jobs/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@@ -24,16 -22,13 +24,16 @@@
  #include "utils/Logger.h"
  
  // KPMcore
- #include <core/device.h>
- #include <core/partition.h>
- #include <core/partitiontable.h>
- #include <fs/filesystem.h>
- #include <ops/createfilesystemoperation.h>
- #include <util/report.h>
+ #include <kpmcore/core/device.h>
+ #include <kpmcore/core/partition.h>
+ #include <kpmcore/core/partitiontable.h>
+ #include <kpmcore/fs/filesystem.h>
+ #include <kpmcore/ops/createfilesystemoperation.h>
+ #include <kpmcore/util/report.h>
  
 +using KPMHelpers::untranslatedFS;
 +using KPMHelpers::userVisibleFS;
 +
  FormatPartitionJob::FormatPartitionJob( Device* device, Partition* partition )
      : PartitionJob( partition )
      , m_device( device )

diff --cc src/modules/partition/jobs/SetPartitionFlagsJob.cpp
index 09380a2,b3fe52a..4e7636e
--- 1/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
--- 2/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
+++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
@@@ -27,15 -25,13 +27,15 @@@
  #include "utils/Units.h"
  
  // KPMcore
- #include <core/device.h>
- #include <core/partition.h>
- #include <fs/filesystem.h>
- #include <ops/setpartflagsoperation.h>
- #include <util/report.h>
+ #include <kpmcore/core/device.h>
+ #include <kpmcore/core/partition.h>
+ #include <kpmcore/fs/filesystem.h>
+ #include <kpmcore/ops/setpartflagsoperation.h>
+ #include <kpmcore/util/report.h>
  
  using CalamaresUtils::BytesToMiB;
 +using KPMHelpers::untranslatedFS;
 +using KPMHelpers::userVisibleFS;
  
  SetPartFlagsJob::SetPartFlagsJob( Device* device,
                                    Partition* partition,