CMake: bump version number

- remove hide-close-button hack
 - refactor code in viewmanager for confirming quit
 - hook up confirm-and-quit to WM close button
 - also works for alt-F4 and other quit methods
 - while here, update copyright year

FIXES #870

CMakeLists.txt

@@ -114,6 +114,16 @@ find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core Gui Widgets LinguistTools S
 find_package( YAMLCPP 0.5.1 REQUIRED )
 find_package( PolkitQt5-1 REQUIRED )
 
+# Find ECM once, and add it to the module search path; Calamares
+# modules that need ECM can do
+#   find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE),
+# no need to mess with the module path after.
+set( ECM_VERSION 5.10.0 )
+find_package(ECM ${ECM_VERSION} NO_MODULE)
+if( ECM_FOUND )
+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
+endif()
+
 option( INSTALL_CONFIG "Install configuration files" ON )
 option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON )
 option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." OFF )
@@ -166,7 +176,7 @@ set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX
 ### Bump version here
 set( CALAMARES_VERSION_MAJOR 3 )
 set( CALAMARES_VERSION_MINOR 1 )
-set( CALAMARES_VERSION_PATCH 9 )
+set( CALAMARES_VERSION_PATCH 12 )
 set( CALAMARES_VERSION_RC 0 )
 
 set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )

CMakeModules/CalamaresAddModuleSubdirectory.cmake

@@ -3,15 +3,27 @@ include( CalamaresAddTranslations )
 
 set( MODULE_DATA_DESTINATION share/calamares/modules )
 
+# Convenience function to indicate that a module has been skipped
+# (optionally also why). Call this in the module's CMakeLists.txt
+macro( calamares_skip_module )
+    set( SKIPPED_MODULES ${SKIPPED_MODULES} ${ARGV} PARENT_SCOPE )
+endmacro()
+
 function( calamares_add_module_subdirectory )
     set( SUBDIRECTORY ${ARGV0} )
 
+    set( SKIPPED_MODULES )
     set( MODULE_CONFIG_FILES "" )
 
     # If this subdirectory has a CMakeLists.txt, we add_subdirectory it...
     if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" )
         add_subdirectory( ${SUBDIRECTORY} )
         file( GLOB MODULE_CONFIG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} "${SUBDIRECTORY}/*.conf" )
+        # Module has indicated it should be skipped, show that in
+        # the calling CMakeLists (which is src/modules/CMakeLists.txt normally).
+        if ( SKIPPED_MODULES )
+            set( SKIPPED_MODULES ${SKIPPED_MODULES} PARENT_SCOPE )
+        endif()
     # ...otherwise, we look for a module.desc.
     elseif( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/module.desc" )
         set( MODULES_DIR ${CMAKE_INSTALL_LIBDIR}/calamares/modules )

src/calamares/CalamaresApplication.cpp

@@ -55,14 +55,7 @@ CalamaresApplication::CalamaresApplication( int& argc, char* argv[] )
 
     QFont f = font();
 
-    cDebug() << "Default font ====="
-             << "\nPixel size:   " << f.pixelSize()
-             << "\nPoint size:   " << f.pointSize()
-             << "\nPoint sizeF:  " << f.pointSizeF()
-             << "\nFont family:  " << f.family()
-             << "\nMetric height:" << QFontMetrics( f ).height();
-    // The following line blocks for 15s on Qt 5.1.0
-    cDebug() << "Font height:" << QFontMetrics( f ).height();
+    cDebug() << "Default font size" << f.pointSize() << ';' << f.pixelSize() << "px";
     CalamaresUtils::setDefaultFontSize( f.pointSize() );
 
     cDebug() << "Available languages:" << QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' );

src/calamares/CalamaresWindow.cpp

@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 
 #include <QApplication>
 #include <QBoxLayout>
+#include <QCloseEvent>
 #include <QDesktopWidget>
 #include <QLabel>
 #include <QTreeView>
@@ -37,10 +38,8 @@
 CalamaresWindow::CalamaresWindow( QWidget* parent )
     : QWidget( parent )
     , m_debugWindow( nullptr )
+    , m_viewManager( nullptr )
 {
-    // Hide close button
-    setWindowFlags( Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint );
-
     CALAMARES_RETRANSLATE(
         setWindowTitle( tr( "%1 Installer" )
                         .arg( *Calamares::Branding::ProductName ) );
@@ -139,10 +138,10 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     CalamaresUtils::unmarginLayout( sideLayout );
     CalamaresUtils::unmarginLayout( mainLayout );
 
-    Calamares::ViewManager* vm = Calamares::ViewManager::instance( this );
-    connect( vm, &Calamares::ViewManager::enlarge, this, &CalamaresWindow::enlarge );
+    m_viewManager = Calamares::ViewManager::instance( this );
+    connect( m_viewManager, &Calamares::ViewManager::enlarge, this, &CalamaresWindow::enlarge );
 
-    mainLayout->addWidget( vm->centralWidget() );
+    mainLayout->addWidget( m_viewManager->centralWidget() );
 }
 
 void
@@ -156,3 +155,15 @@ CalamaresWindow::enlarge( QSize enlarge )
 
     resize( w, h );
 }
+
+void
+CalamaresWindow::closeEvent( QCloseEvent* event )
+{
+    if ( ( !m_viewManager ) || m_viewManager->confirmCancelInstallation() )
+    {
+        event->accept();
+        qApp->quit();
+    }
+    else
+        event->ignore();
+}

src/calamares/CalamaresWindow.h

@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 namespace Calamares
 {
 class DebugWindow;
+class ViewManager;
 }
 
 /**
@@ -46,8 +47,12 @@ public slots:
      */
     void enlarge( QSize enlarge );
 
+protected:
+    virtual void closeEvent( QCloseEvent* e ) override;
+
 private:
-    QPointer< Calamares::DebugWindow > m_debugWindow;
+    QPointer< Calamares::DebugWindow > m_debugWindow;  // Managed by self
+    Calamares::ViewManager* m_viewManager;
 };
 
 #endif //CALAMARESWINDOW_H

src/libcalamares/PythonHelper.cpp

@@ -233,7 +233,7 @@ Helper::~Helper()
 {}
 
 
-boost::python::object
+boost::python::dict
 Helper::createCleanNamespace()
 {
     // To make sure we run each script with a clean namespace, we only fetch the

src/libcalamares/PythonHelper.h

@@ -51,7 +51,7 @@ public:
     explicit Helper( QObject* parent = nullptr );
     virtual ~Helper();
 
-    boost::python::object createCleanNamespace();
+    boost::python::dict createCleanNamespace();
 
     QString handleLastError();
 

src/libcalamares/PythonJob.cpp

@@ -216,10 +216,10 @@ BOOST_PYTHON_MODULE( libcalamares )
         "in the original string."
     );
 
-    
-    bp::def( 
-        "gettext_languages", 
-        &CalamaresPython::gettext_languages, 
+
+    bp::def(
+        "gettext_languages",
+        &CalamaresPython::gettext_languages,
         "Returns list of languages (most to least-specific) for gettext."
     );
 
@@ -296,7 +296,7 @@ PythonJob::exec()
 
     try
     {
-        bp::object scriptNamespace = helper()->createCleanNamespace();
+        bp::dict scriptNamespace = helper()->createCleanNamespace();
 
         bp::object calamaresModule = bp::import( "libcalamares" );
         bp::dict calamaresNamespace = bp::extract< bp::dict >( calamaresModule.attr( "__dict__" ) );
@@ -310,7 +310,7 @@ PythonJob::exec()
                                            scriptNamespace );
 
         bp::object entryPoint = scriptNamespace[ "run" ];
-        bp::object prettyNameFunc = bp::getattr(scriptNamespace, "pretty_name", bp::object());
+        bp::object prettyNameFunc = scriptNamespace.get("pretty_name", bp::object());
 
         cDebug() << "Job file" << scriptFI.absoluteFilePath();
         if ( !prettyNameFunc.is_none() )

src/libcalamares/utils/CalamaresUtilsSystem.cpp

@@ -256,5 +256,10 @@ System::getTotalMemoryB()
 #endif
 }
 
-
+bool
+System::doChroot() const
+{
+    return m_doChroot;
 }
+
+}  // namespace

src/libcalamares/utils/CalamaresUtilsSystem.h

@@ -114,6 +114,8 @@ public:
      */
     DLLEXPORT QPair<quint64, float> getTotalMemoryB();
 
+    DLLEXPORT bool doChroot() const;
+
 private:
     static System* s_instance;
 

src/libcalamaresui/ViewManager.cpp

@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -88,30 +88,8 @@ ViewManager::ViewManager( QObject* parent )
     connect( m_back, &QPushButton::clicked, this, &ViewManager::back );
     m_back->setEnabled( false );
 
-    connect( m_quit, &QPushButton::clicked,
-             this, [this]()
-    {
-        // If it's NOT the last page of the last step, we ask for confirmation
-        if ( !( m_currentStep == m_steps.count() -1 &&
-                m_steps.last()->isAtEnd() ) )
-        {
-            QMessageBox mb( QMessageBox::Question,
-                            tr( "Cancel installation?" ),
-                            tr( "Do you really want to cancel the current install process?\n"
-                                "The installer will quit and all changes will be lost." ),
-                            QMessageBox::Yes | QMessageBox::No,
-                            m_widget );
-            mb.setDefaultButton( QMessageBox::No );
-            mb.button( QMessageBox::Yes )->setText( tr( "&Yes" ) );
-            mb.button( QMessageBox::No )->setText( tr( "&No" ) );
-            int response = mb.exec();
-            if ( response == QMessageBox::Yes )
-                qApp->quit();
-        }
-        else // Means we're at the end, no need to confirm.
-            qApp->quit();
-    } );
-
+    connect( m_quit, &QPushButton::clicked, this,
+             [this]() { if ( this->confirmCancelInstallation() ) qApp->quit(); } );
     connect( JobQueue::instance(), &JobQueue::failed,
              this, &ViewManager::onInstallationFailed );
     connect( JobQueue::instance(), &JobQueue::finished,
@@ -302,4 +280,26 @@ ViewManager::back()
     }
 }
 
+bool ViewManager::confirmCancelInstallation()
+{
+    // If it's NOT the last page of the last step, we ask for confirmation
+    if ( !( m_currentStep == m_steps.count() -1 &&
+            m_steps.last()->isAtEnd() ) )
+    {
+        QMessageBox mb( QMessageBox::Question,
+                        tr( "Cancel installation?" ),
+                        tr( "Do you really want to cancel the current install process?\n"
+                            "The installer will quit and all changes will be lost." ),
+                        QMessageBox::Yes | QMessageBox::No,
+                        m_widget );
+        mb.setDefaultButton( QMessageBox::No );
+        mb.button( QMessageBox::Yes )->setText( tr( "&Yes" ) );
+        mb.button( QMessageBox::No )->setText( tr( "&No" ) );
+        int response = mb.exec();
+        return response == QMessageBox::Yes;
+    }
+    else // Means we're at the end, no need to confirm.
+        return true;
 }
+
+}  // namespace

src/libcalamaresui/ViewManager.h

@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -86,6 +86,13 @@ public:
      */
     int currentStepIndex() const;
 
+    /**
+     * @ brief Called when "Cancel" is clicked; asks for confirmation.
+     * Other means of closing Calamares also call this method, e.g. alt-F4.
+     * At the end of installation, no confirmation is asked. Returns true
+     * if the user confirms closing the window.
+     */
+    bool confirmCancelInstallation();
 
 public slots:
     /**

src/modules/CMakeLists.txt

@@ -1,5 +1,11 @@
 include( CMakeColors )
 
+# The variable SKIP_MODULES can be set to skip particular modules;
+# individual modules can also decide they must be skipped (e.g. OS-specific
+# modules, or ones with unmet dependencies). Collect the skipped modules
+# in this list.
+set( LIST_SKIPPED_MODULES "" )
+
 if( BUILD_TESTING )
     add_executable( test_conf test_conf.cpp )
     target_link_libraries( test_conf ${YAMLCPP_LIBRARY} )
@@ -13,11 +19,24 @@ foreach( SUBDIRECTORY ${SUBDIRECTORIES} )
     if( NOT DO_SKIP EQUAL -1 )
         message( "${ColorReset}-- Skipping module ${BoldRed}${SUBDIRECTORY}${ColorReset}." )
         message( "" )
+        list( APPEND LIST_SKIPPED_MODULES "${SUBDIRECTORY} (user request)" )
     elseif( ( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" ) AND
             ( DO_SKIP EQUAL -1 ) )
+        set( SKIPPED_MODULES )
         calamares_add_module_subdirectory( ${SUBDIRECTORY} )
+        if ( SKIPPED_MODULES )
+            list( APPEND LIST_SKIPPED_MODULES "${SKIPPED_MODULES}" )
+        endif()
     endif()
 endforeach()
 
+if ( LIST_SKIPPED_MODULES )
+    message( "${ColorReset}-- Skipped modules:" )
+    foreach( SUBDIRECTORY ${LIST_SKIPPED_MODULES} )
+        message( "${ColorReset}--   Skipped ${BoldRed}${SUBDIRECTORY}${ColorReset}." )
+    endforeach()
+    message( "" )
+endif()
+
 include( CalamaresAddTranslations )
 add_calamares_python_translations( ${CALAMARES_TRANSLATION_LANGUAGES} )

src/modules/hwclock/main.py

@@ -5,7 +5,8 @@
 #
 #   Copyright 2014 - 2015, Philip Müller <philm@manjaro.org>
 #   Copyright 2014, Teo Mrnjavac <teo@kde.org>
-#   Copyright 2017. Alf Gaida <agaida@siduction.org>
+#   Copyright 2017, Alf Gaida <agaida@siduction.org>
+#   Copyright 2017, Gabriel Craciunescu <crazy@frugalware.org>
 #
 #   Calamares is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -20,26 +21,33 @@
 #   You should have received a copy of the GNU General Public License
 #   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
 
-import subprocess
-import shutil
-
 import libcalamares
 
-
 def run():
     """
     Set hardware clock.
     """
+    hwclock_rtc = ["hwclock", "--systohc", "--utc"]
+    hwclock_isa = ["hwclock", "--systohc", "--utc", "--directisa"]
+    is_broken_rtc = False
+    is_broken_isa = False
 
-    root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
-    try:
-        subprocess.check_call(["hwclock", "--systohc", "--utc"])
-    except subprocess.CalledProcessError as e:
-        return (
-            "Cannot set hardware clock.",
-            "hwclock terminated with exit code {}.".format(e.returncode)
-            )
-
-    shutil.copy2("/etc/adjtime", "{!s}/etc/".format(root_mount_point))
+    ret = libcalamares.utils.target_env_call(hwclock_rtc)
+    if ret != 0:
+        is_broken_rtc = True
+        libcalamares.utils.debug("Hwclock returned error code {}".format(ret))
+        libcalamares.utils.debug("  .. RTC method failed, trying ISA bus method.")
+    else:
+        libcalamares.utils.debug("Hwclock set using RTC method.")
+    if is_broken_rtc:
+        ret = libcalamares.utils.target_env_call(hwclock_isa)
+        if  ret != 0:
+            is_broken_isa = True
+            libcalamares.utils.debug("Hwclock returned error code {}".format(ret))
+            libcalamares.utils.debug("  .. ISA bus method failed.")
+        else:
+            libcalamares.utils.debug("Hwclock set using ISA bus methode.")
+    if is_broken_rtc and is_broken_isa:
+        libcalamares.utils.debug("BIOS or Kernel BUG: Setting hwclock failed.")
 
     return None

src/modules/interactiveterminal/CMakeLists.txt

@@ -1,5 +1,4 @@
-find_package(ECM 5.10.0 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
+find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
 
 include(KDEInstallDirs)
 include(GenerateExportHeader)

src/modules/packages/main.py

@@ -55,8 +55,12 @@ def _change_mode(mode):
 
 def pretty_name():
     if not group_packages:
-        # Outside the context of an operation
-        s = _("Processing packages (%(count)d / %(total)d)")
+        if (total_packages > 0):
+            # Outside the context of an operation
+            s = _("Processing packages (%(count)d / %(total)d)")
+        else:
+            s = _("Install packages.")
+
     elif mode_packages is INSTALL:
         s = _n("Installing one package.",
                "Installing %(num)d packages.", group_packages)
@@ -422,6 +426,11 @@ def run():
     else:
         return "Bad backend", "backend=\"{}\"".format(backend)
 
+    skip_this = libcalamares.job.configuration.get("skip_if_no_internet", False)
+    if skip_this and not libcalamares.globalstorage.value("hasInternet"):
+        libcalamares.utils.debug( "WARNING: packages installation has been skipped: no internet" )
+        return None
+
     update_db = libcalamares.job.configuration.get("update_db", False)
     if update_db and libcalamares.globalstorage.value("hasInternet"):
         pkgman.update_db()

src/modules/packages/packages.conf

@@ -14,9 +14,20 @@
 #
 backend: dummy
 
-# If set to true, a package-manager specific update procedure
-# is run first (only if there is internet) to update the list
-# of packages and dependencies.
+# Often package installation needs an internet connection.
+# Since you may allow system installation without a connection
+# and want to offer **optional** package installation, it's
+# possible to have no internet, yet have this packages module
+# enabled in settings.
+#
+# You can skip the whole module when there is no internet
+# by setting *skip_if_no_internet* to true.
+#
+# You can run a package-manager specific update procedure
+# before installing packages (for instance, to update the
+# list of packages and dependencies); this is done only if there
+# is an internet connection. Set *update_db* to true to do so.
+skip_if_no_internet: false
 update_db: true
 
 #
@@ -29,9 +40,10 @@ update_db: true
 # packages that need to be installed or removed can run before
 # this one. Distro developers may want to install locale packages
 # or remove drivers not needed on the installed system.
-# This job will populate a list of dictionaries in the global
-# storage called "packageOperations" and it is processed
-# after the static list in the job configuration.
+# Such a job would populate a list of dictionaries in the global
+# storage called "packageOperations" and that list is processed
+# after the static list in the job configuration (i.e. the list
+# that is in this configuration file).
 #
 # Allowed package operations are:
 #  - install, try_install: will call the package manager to
@@ -49,7 +61,7 @@ update_db: true
 #       while try_remove carries on. Packages may be listed as
 #       (localized) names.
 #
-# There are two formats for naming packages: as a name # or as package-data,
+# There are two formats for naming packages: as a name or as package-data,
 # which is an object notation providing package-name, as well as pre- and
 # post-install scripts.
 #
@@ -74,15 +86,16 @@ update_db: true
 #
 # - if the system locale is English (generally US English; en_GB is a valid
 #   localization), then the package is not installed at all,
-# - otherwise LOCALE is replaced by the Bcp47 name of the selected system
-#   locale, e.g. nl_BE.
+# - otherwise $LOCALE or ${LOCALE} is replaced by the Bcp47 name of the selected
+#   system locale, e.g. nl_BE. Note that just plain LOCALE will not be replaced,
+#   so foo-LOCALE will be unchanged, while foo-$LOCALE will be changed.
 #
 # The following installs localizations for vi, if they are relevant; if
 # there is no localization, installation continues normally.
 #
 # - install
-#   - vi-LOCALE
-#   - package: vi-LOCALE
+#   - vi-$LOCALE
+#   - package: vi-${LOCALE}
 #     pre-script: touch /tmp/installing-vi
 #     post-script: rm -f /tmp/installing-vi
 #

src/modules/partition/CMakeLists.txt

@@ -1,5 +1,4 @@
-find_package(ECM 5.10.0 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
+find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
 
 include(KDEInstallDirs)
 include(GenerateExportHeader)

src/modules/plasmalnf/CMakeLists.txt

@@ -0,0 +1,41 @@
+find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
+
+# Requires a sufficiently recent Plasma framework, but also
+# needs a runtime support component (which we don't test for).
+set( lnf_ver 5.41 )
+
+find_package( KF5Plasma ${lnf_ver} )
+find_package( KF5Package ${lnf_ver} )
+set_package_properties(
+    KF5Plasma PROPERTIES
+    PURPOSE "For Plasma Look-and-Feel selection"
+)
+set_package_properties(
+    KF5Package PROPERTIES
+    PURPOSE "For Plasma Look-and-Feel selection"
+)
+
+if ( KF5Plasma_FOUND AND KF5Package_FOUND )
+    find_package( KF5 ${lnf_ver} REQUIRED CoreAddons Plasma Package )
+
+    calamares_add_plugin( plasmalnf
+        TYPE viewmodule
+        EXPORT_MACRO PLUGINDLLEXPORT_PRO
+        SOURCES
+            PlasmaLnfViewStep.cpp
+            PlasmaLnfPage.cpp
+            PlasmaLnfJob.cpp
+            ThemeWidget.cpp
+        RESOURCES
+            page_plasmalnf.qrc
+        UI
+            page_plasmalnf.ui
+        LINK_PRIVATE_LIBRARIES
+            calamaresui
+            KF5::Package
+            KF5::Plasma
+        SHARED_LIB
+    )
+else()
+    calamares_skip_module( "plasmalnf (missing requirements)" )
+endif()

src/modules/plasmalnf/PlasmaLnfJob.cpp

@@ -0,0 +1,78 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "PlasmaLnfJob.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+
+PlasmaLnfJob::PlasmaLnfJob( const QString& lnfPath, const QString& id )
+    : m_lnfPath( lnfPath )
+    , m_id( id )
+{
+}
+
+
+PlasmaLnfJob::~PlasmaLnfJob()
+{
+}
+
+
+QString
+PlasmaLnfJob::prettyName() const
+{
+    return tr( "Plasma Look-and-Feel Job" );
+}
+
+QString
+PlasmaLnfJob::prettyDescription() const
+{
+    return prettyName();
+}
+
+QString PlasmaLnfJob::prettyStatusMessage() const
+{
+    return prettyName();
+}
+
+
+Calamares::JobResult
+PlasmaLnfJob::exec()
+{
+    cDebug() << "Plasma Look-and-Feel Job";
+
+    auto system = CalamaresUtils::System::instance();
+    Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
+
+    QStringList command(
+    {
+        "sudo", "-E", "-H", "-u", gs->value( "username" ).toString(),
+        m_lnfPath, "-platform", "minimal", "--resetLayout", "--apply", m_id
+    } );
+
+    int r = system->targetEnvCall( command );
+    if ( r )
+        return Calamares::JobResult::error(
+                   tr( "Could not select KDE Plasma Look-and-Feel package" ),
+                   tr( "Could not select KDE Plasma Look-and-Feel package" ) );
+
+    return Calamares::JobResult::ok();
+}
+

src/modules/plasmalnf/PlasmaLnfJob.h

@@ -0,0 +1,46 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PLASMALNFJOB_H
+#define PLASMALNFJOB_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include <Job.h>
+
+class PlasmaLnfJob : public Calamares::Job
+{
+    Q_OBJECT
+
+public:
+    explicit PlasmaLnfJob( const QString& lnfPath, const QString& id );
+    virtual ~PlasmaLnfJob() override;
+
+    QString prettyName() const override;
+    QString prettyDescription() const override;
+    QString prettyStatusMessage() const override;
+
+    Calamares::JobResult exec() override;
+
+private:
+    QString m_lnfPath;
+    QString m_id;
+};
+
+#endif // PLASMALNFJOB_H

src/modules/plasmalnf/PlasmaLnfPage.cpp

@@ -0,0 +1,167 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "PlasmaLnfPage.h"
+
+#include "ui_page_plasmalnf.h"
+
+#include "utils/Logger.h"
+#include "utils/Retranslator.h"
+
+#include <KPackage/Package>
+#include <KPackage/PackageLoader>
+
+ThemeInfo::ThemeInfo( const KPluginMetaData& data )
+    : id( data.pluginId() )
+    , name( data.name() )
+    , description( data.description() )
+    , widget( nullptr )
+{
+}
+
+static ThemeInfoList plasma_themes()
+{
+    ThemeInfoList packages;
+
+    QList<KPluginMetaData> pkgs = KPackage::PackageLoader::self()->listPackages( "Plasma/LookAndFeel" );
+
+    for ( const KPluginMetaData& data : pkgs )
+    {
+        if ( data.isValid() && !data.isHidden() && !data.name().isEmpty() )
+        {
+            packages << ThemeInfo{ data };
+        }
+    }
+
+    return packages;
+}
+
+
+PlasmaLnfPage::PlasmaLnfPage( QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::PlasmaLnfPage )
+    , m_buttonGroup( nullptr )
+{
+    ui->setupUi( this );
+    CALAMARES_RETRANSLATE(
+    {
+        ui->retranslateUi( this );
+        ui->generalExplanation->setText( tr( "Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed." ) );
+        updateThemeNames();
+        fillUi();
+    }
+    )
+}
+
+void
+PlasmaLnfPage::setLnfPath( const QString& path )
+{
+    m_lnfPath = path;
+}
+
+void
+PlasmaLnfPage::setEnabledThemes(const ThemeInfoList& themes)
+{
+    m_enabledThemes = themes;
+
+    updateThemeNames();
+    winnowThemes();
+    fillUi();
+}
+
+void
+PlasmaLnfPage::setEnabledThemesAll()
+{
+    setEnabledThemes( plasma_themes() );
+}
+
+
+void PlasmaLnfPage::updateThemeNames()
+{
+    auto plasmaThemes = plasma_themes();
+    for ( auto& enabled_theme : m_enabledThemes )
+    {
+        ThemeInfo* t = plasmaThemes.findById( enabled_theme.id );
+        if ( t != nullptr )
+        {
+            enabled_theme.name = t->name;
+            enabled_theme.description = t->description;
+        }
+    }
+}
+
+void PlasmaLnfPage::winnowThemes()
+{
+    auto plasmaThemes = plasma_themes();
+    bool winnowed = true;
+    int winnow_index = 0;
+    while ( winnowed )
+    {
+        winnowed = false;
+        winnow_index = 0;
+
+        for ( auto& enabled_theme : m_enabledThemes )
+        {
+            ThemeInfo* t = plasmaThemes.findById( enabled_theme.id );
+            if ( t == nullptr )
+            {
+                cDebug() << "Removing" << enabled_theme.id;
+                winnowed = true;
+                break;
+            }
+            ++winnow_index;
+        }
+
+        if ( winnowed )
+        {
+            m_enabledThemes.removeAt( winnow_index );
+        }
+    }
+}
+
+void PlasmaLnfPage::fillUi()
+{
+    if ( m_enabledThemes.isEmpty() )
+    {
+        return;
+    }
+
+    if ( !m_buttonGroup )
+    {
+        m_buttonGroup = new QButtonGroup( this );
+        m_buttonGroup->setExclusive( true );
+    }
+
+    int c = 1; // After the general explanation
+    for ( auto& theme : m_enabledThemes )
+    {
+        if ( !theme.widget )
+        {
+            ThemeWidget* w = new ThemeWidget( theme );
+            m_buttonGroup->addButton( w->button() );
+            ui->verticalLayout->insertWidget( c, w );
+            connect( w, &ThemeWidget::themeSelected, this, &PlasmaLnfPage::plasmaThemeSelected);
+            theme.widget = w;
+        }
+        else
+        {
+            theme.widget->updateThemeName( theme );
+        }
+        ++c;
+    }
+}

src/modules/plasmalnf/PlasmaLnfPage.h

@@ -0,0 +1,73 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PLASMALNFPAGE_H
+#define PLASMALNFPAGE_H
+
+#include <QButtonGroup>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+
+#include "ThemeInfo.h"
+#include "ThemeWidget.h"
+
+namespace Ui
+{
+class PlasmaLnfPage;
+}
+
+/** @brief Page for selecting a Plasma Look-and-Feel theme.
+ *
+ * You must call setEnabledThemes -- either overload -- once
+ * to get the selection widgets. Note that calling that with
+ * an empty list will result in zero (0) selectable themes.
+ */
+class PlasmaLnfPage : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit PlasmaLnfPage( QWidget* parent = nullptr );
+
+    void setLnfPath( const QString& path );
+    /** @brief enable only the listed themes. */
+    void setEnabledThemes( const ThemeInfoList& themes );
+    /** @brief enable all installed plasma themes. */
+    void setEnabledThemesAll();
+
+signals:
+    void plasmaThemeSelected( const QString& id );
+
+private:
+    /** @brief Intersect the list of enabled themes with the installed ones. */
+    void winnowThemes();
+    /** @brief Get the translated names for all enabled themes. */
+    void updateThemeNames();
+    /** @brief show enabled themes in the UI. */
+    void fillUi();
+
+    Ui::PlasmaLnfPage* ui;
+    QString m_lnfPath;
+    ThemeInfoList m_enabledThemes;
+
+    QButtonGroup *m_buttonGroup;
+    QList< ThemeWidget* > m_widgets;
+};
+
+#endif //PLASMALNFPAGE_H

src/modules/plasmalnf/PlasmaLnfViewStep.cpp

@@ -0,0 +1,196 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "PlasmaLnfViewStep.h"
+
+#include "PlasmaLnfJob.h"
+#include "PlasmaLnfPage.h"
+#include "ThemeInfo.h"
+
+#include "utils/Logger.h"
+
+#include <QProcess>
+#include <QVariantMap>
+
+CALAMARES_PLUGIN_FACTORY_DEFINITION( PlasmaLnfViewStepFactory, registerPlugin<PlasmaLnfViewStep>(); )
+
+PlasmaLnfViewStep::PlasmaLnfViewStep( QObject* parent )
+    : Calamares::ViewStep( parent )
+    , m_widget( new PlasmaLnfPage )
+{
+    connect( m_widget, &PlasmaLnfPage::plasmaThemeSelected, this, &PlasmaLnfViewStep::themeSelected );
+    emit nextStatusChanged( false );
+}
+
+
+PlasmaLnfViewStep::~PlasmaLnfViewStep()
+{
+    if ( m_widget && m_widget->parent() == nullptr )
+        m_widget->deleteLater();
+}
+
+
+QString
+PlasmaLnfViewStep::prettyName() const
+{
+    return tr( "Look-and-Feel" );
+}
+
+
+QWidget*
+PlasmaLnfViewStep::widget()
+{
+    return m_widget;
+}
+
+
+void
+PlasmaLnfViewStep::next()
+{
+    emit done();
+}
+
+
+void
+PlasmaLnfViewStep::back()
+{}
+
+
+bool
+PlasmaLnfViewStep::isNextEnabled() const
+{
+    return true;
+}
+
+
+bool
+PlasmaLnfViewStep::isBackEnabled() const
+{
+    return true;
+}
+
+
+bool
+PlasmaLnfViewStep::isAtBeginning() const
+{
+    return true;
+}
+
+
+bool
+PlasmaLnfViewStep::isAtEnd() const
+{
+    return true;
+}
+
+
+void PlasmaLnfViewStep::onLeave()
+{
+}
+
+
+QList<Calamares::job_ptr>
+PlasmaLnfViewStep::jobs() const
+{
+    QList<Calamares::job_ptr> l;
+
+    cDebug() << "Creating Plasma LNF jobs ..";
+    if ( !m_themeId.isEmpty() )
+    {
+        if ( !m_lnfPath.isEmpty() )
+            l.append( Calamares::job_ptr( new PlasmaLnfJob( m_lnfPath, m_themeId ) ) );
+        else
+            cDebug() << "WARNING: no lnftool given for plasmalnf module.";
+    }
+    return l;
+}
+
+
+void
+PlasmaLnfViewStep::setConfigurationMap( const QVariantMap& configurationMap )
+{
+    QString lnfPath;
+    if ( configurationMap.contains( "lnftool" ) && configurationMap.value( "lnftool" ).type() == QVariant::String )
+        lnfPath = configurationMap.value( "lnftool" ).toString();
+    m_lnfPath = lnfPath;
+    m_widget->setLnfPath( m_lnfPath );
+
+    if ( m_lnfPath.isEmpty() )
+        cDebug() << "WARNING: no lnftool given for plasmalnf module.";
+
+    QString liveUser;
+    if ( configurationMap.contains( "liveuser" ) && configurationMap.value( "liveuser" ).type() == QVariant::String )
+        liveUser = configurationMap.value( "liveuser" ).toString();
+    m_liveUser = liveUser;
+
+    if ( configurationMap.contains( "themes" ) &&
+        configurationMap.value( "themes" ).type() == QVariant::List )
+    {
+        ThemeInfoList allThemes;
+        auto themeList = configurationMap.value( "themes" ).toList();
+        // Create the ThemInfo objects for the listed themes; information
+        // about the themes from Plasma (e.g. human-readable name and description)
+        // are filled in by update_names() in PlasmaLnfPage.
+        for ( const auto& i : themeList )
+            if ( i.type() == QVariant::Map )
+            {
+                auto iv = i.toMap();
+                allThemes.append( ThemeInfo( iv.value( "theme" ).toString(), iv.value( "image" ).toString() ) );
+            }
+            else if ( i.type() == QVariant::String )
+                allThemes.append( ThemeInfo( i.toString() ) );
+
+        if ( allThemes.length() == 1 )
+            cDebug() << "WARNING: only one theme enabled in plasmalnf";
+        m_widget->setEnabledThemes( allThemes );
+    }
+    else
+        m_widget->setEnabledThemesAll();  // All of them
+}
+
+void
+PlasmaLnfViewStep::themeSelected( const QString& id )
+{
+    m_themeId = id;
+    if ( m_lnfPath.isEmpty() )
+    {
+        cDebug() << "WARNING: no lnftool given for plasmalnf module.";
+        return;
+    }
+
+    QProcess lnftool;
+    if ( !m_liveUser.isEmpty() )
+        lnftool.start( "sudo", {"-E", "-H", "-u", m_liveUser, m_lnfPath, "--resetLayout", "--apply", id} );
+    else
+        lnftool.start( m_lnfPath, {"--resetLayout", "--apply", id} );
+
+    if ( !lnftool.waitForStarted( 1000 ) )
+    {
+        cDebug() << "WARNING: could not start look-and-feel" << m_lnfPath;
+        return;
+    }
+    if ( !lnftool.waitForFinished() )
+    {
+        cDebug() << "WARNING:" << m_lnfPath << "timed out.";
+        return;
+    }
+
+    if ( ( lnftool.exitCode() == 0 ) && ( lnftool.exitStatus() == QProcess::NormalExit ) )
+        cDebug() << "Plasma look-and-feel applied" << id;
+    else
+        cDebug() << "WARNING: could not apply look-and-feel" << id;
+}

src/modules/plasmalnf/PlasmaLnfViewStep.h

@@ -0,0 +1,71 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2017, Adriaan de Groot <groot@kde..org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PLASMALNFVIEWSTEP_H
+#define PLASMALNFVIEWSTEP_H
+
+#include <utils/PluginFactory.h>
+#include <viewpages/ViewStep.h>
+#include <PluginDllMacro.h>
+
+#include <QObject>
+#include <QUrl>
+#include <QVariantMap>
+
+class PlasmaLnfPage;
+
+class PLUGINDLLEXPORT PlasmaLnfViewStep : public Calamares::ViewStep
+{
+    Q_OBJECT
+
+public:
+    explicit PlasmaLnfViewStep( QObject* parent = nullptr );
+    virtual ~PlasmaLnfViewStep() override;
+
+    QString prettyName() const override;
+
+    QWidget* widget() override;
+
+    void next() override;
+    void back() override;
+
+    bool isNextEnabled() const override;
+    bool isBackEnabled() const override;
+
+    bool isAtBeginning() const override;
+    bool isAtEnd() const override;
+
+    void onLeave() override;
+
+    QList<Calamares::job_ptr> jobs() const override;
+
+    void setConfigurationMap( const QVariantMap& configurationMap ) override;
+
+public slots:
+    void themeSelected( const QString& id );
+
+private:
+    PlasmaLnfPage* m_widget;
+    QString m_lnfPath;
+    QString m_themeId;
+    QString m_liveUser;
+};
+
+CALAMARES_PLUGIN_FACTORY_DECLARATION( PlasmaLnfViewStepFactory )
+
+#endif // PLASMALNFVIEWSTEP_H

src/modules/plasmalnf/ThemeInfo.h

@@ -0,0 +1,97 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PLASMALNF_THEMEINFO_H
+#define PLASMALNF_THEMEINFO_H
+
+#include <QList>
+#include <QString>
+
+class KPluginMetaData;
+class ThemeWidget;
+
+/** @brief describes a single plasma LnF theme.
+ *
+ * A theme description has an id, which is really the name of the desktop
+ * file (e.g. org.kde.breeze.desktop), a name which is human-readable and
+ * translated, and an optional image Page, which points to a local screenshot
+ * of that theme.
+ */
+struct ThemeInfo
+{
+    QString id;
+    QString name;
+    QString description;
+    QString imagePath;
+    ThemeWidget* widget;
+
+    ThemeInfo()
+        : widget( nullptr )
+    {}
+
+    explicit ThemeInfo( const QString& _id )
+        : id( _id )
+        , widget( nullptr )
+    {
+    }
+
+    explicit ThemeInfo( const QString& _id, const QString& image )
+        : id( _id )
+        , imagePath( image )
+        , widget( nullptr )
+    {}
+
+    // Defined in PlasmaLnfPage.cpp
+    explicit ThemeInfo( const KPluginMetaData& );
+
+    bool isValid() const { return !id.isEmpty(); }
+} ;
+
+class ThemeInfoList : public QList< ThemeInfo >
+{
+public:
+    /** @brief Looks for a given @p id in the list of themes, returns nullptr if not found. */
+    ThemeInfo* findById( const QString& id )
+    {
+        for ( ThemeInfo& i : *this )
+        {
+            if ( i.id == id )
+                return &i;
+        }
+        return nullptr;
+    }
+
+    /** @brief Looks for a given @p id in the list of themes, returns nullptr if not found. */
+    const ThemeInfo* findById( const QString& id ) const
+    {
+        for ( const ThemeInfo& i : *this )
+        {
+            if ( i.id == id )
+                return &i;
+        }
+        return nullptr;
+    }
+
+    /** @brief Checks if a given @p id is in the list of themes. */
+    bool contains( const QString& id ) const
+    {
+        return findById( id ) != nullptr;
+    }
+} ;
+
+#endif

src/modules/plasmalnf/ThemeWidget.cpp

@@ -0,0 +1,85 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ThemeWidget.h"
+
+#include "ThemeInfo.h"
+
+#include "utils/Logger.h"
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QRadioButton>
+
+ThemeWidget::ThemeWidget(const ThemeInfo& info, QWidget* parent)
+    : QWidget( parent )
+    , m_check( new QRadioButton( info.name.isEmpty() ? info.id : info.name, parent ) )
+    , m_description( new QLabel( info.description, parent ) )
+    , m_id( info.id )
+{
+    QHBoxLayout* layout = new QHBoxLayout( this );
+    this->setLayout( layout );
+
+    layout->addWidget( m_check, 1 );
+
+    constexpr QSize image_size{120, 80};
+
+    QPixmap image( info.imagePath );
+    if ( info.imagePath.isEmpty() )
+    {
+        // Image can't possibly be valid
+        image = QPixmap( ":/view-preview.png" );
+    }
+    else if ( image.isNull() )
+    {
+        // Not found or not specified, so convert the name into some (horrible, likely)
+        // color instead.
+        image = QPixmap( image_size );
+        uint hash_color = qHash( info.imagePath.isEmpty() ? info.id : info.imagePath );
+        cDebug() << "Theme image" << info.imagePath << "not found, hash" << hash_color;
+        image.fill( QColor( QRgb( hash_color ) ) );
+    }
+    else
+        image.scaled( image_size );
+
+    QLabel* image_label = new QLabel( this );
+    image_label->setPixmap( image );
+    layout->addWidget( image_label, 1 );
+    layout->addWidget( m_description, 3 );
+
+    connect( m_check, &QRadioButton::clicked, this, &ThemeWidget::clicked );
+}
+
+void
+ThemeWidget::clicked( bool checked )
+{
+    if ( checked )
+        emit themeSelected( m_id );
+}
+
+QAbstractButton*
+ThemeWidget::button() const
+{
+    return m_check;
+}
+
+void ThemeWidget::updateThemeName(const ThemeInfo& info)
+{
+    m_check->setText( info.name );
+    m_description->setText( info.description );
+}

src/modules/plasmalnf/ThemeWidget.h

@@ -0,0 +1,53 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PLASMALNF_THEMEWIDGET_H
+#define PLASMALNF_THEMEWIDGET_H
+
+#include <QWidget>
+
+class QAbstractButton;
+class QLabel;
+class QRadioButton;
+
+struct ThemeInfo;
+
+class ThemeWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit ThemeWidget( const ThemeInfo& info, QWidget* parent = nullptr );
+
+    QAbstractButton* button() const;
+
+    void updateThemeName( const ThemeInfo& info );
+
+signals:
+    void themeSelected( const QString& id );
+
+public slots:
+    void clicked( bool );
+
+private:
+    QString m_id;
+    QRadioButton* m_check;
+    QLabel* m_description;
+} ;
+
+#endif
+

src/modules/plasmalnf/page_plasmalnf.qrc

@@ -0,0 +1,5 @@
+<RCC>
+<qresource>
+  <file>view-preview.png</file>
+</qresource>
+</RCC>

src/modules/plasmalnf/page_plasmalnf.ui

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PlasmaLnfPage</class>
+ <widget class="QWidget" name="PlasmaLnfPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>799</width>
+    <height>400</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
+   <item>
+    <widget class="QLabel" name="generalExplanation">
+     <property name="text">
+      <string>Placeholder</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="page_plasmalnf.qrc"/>
+ </resources>
+ <connections/>
+</ui>

src/modules/plasmalnf/plasmalnf.conf

@@ -0,0 +1,29 @@
+---
+# Full path to the Plasma look-and-feel tool (CLI program
+# for querying and applying Plasma themes). If this is not
+# set, no LNF setting will happen.
+lnftool:	"/usr/bin/lookandfeeltool"
+
+# For systems where the user Calamares runs as (usually root,
+# via either sudo or pkexec) has a clean environment, set this
+# to the originating username; the lnftool will be run through
+# "sudo -H -u <liveuser>" instead of directly.
+#
+# liveuser:	"live"
+
+# You can limit the list of Plasma look-and-feel themes by listing ids
+# here. If this key is not present, all of the installed themes are listed.
+# If the key is present, only installed themes that are *also* included
+# in the list are shown (could be none!).
+#
+# Themes may be listed by id, (e.g. fluffy-bunny, below) or as a theme
+# and an image (e.g. breeze) which will be used to show a screenshot.
+# Themes with no image get a "missing screenshot" image; if the
+# image file is not found, they get a color swatch based on the image name.
+themes:
+    - org.kde.fuzzy-pig.desktop
+    - theme: org.kde.breeze.desktop
+      image: "breeze.png"
+    - theme: org.kde.breezedark.desktop
+      image: "breeze-dark.png"
+    - org.kde.fluffy-bunny.desktop

src/modules/plasmalnf/view-preview.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="m4 4v24h24v-24zm1 1h22v22h-22zm6 2a4 4 0 0 0 -4 4 4 4 0 0 0 4 4 4 4 0 0 0 4 -4 4 4 0 0 0 -4 -4m0 1a3 3 0 0 1 3 3 3 3 0 0 1 -3 3 3 3 0 0 1 -3 -3 3 3 0 0 1 3 -3m9.5 6.793l-5 5-2-2-6.5 6.5.707.707 5.793-5.793 2 2 5-5 3.793 3.793.707-.707z"
+     class="ColorScheme-Text"
+     />
+</svg>

src/modules/users/CMakeLists.txt

@@ -1,6 +1,5 @@
-find_package(ECM 5.10.0 NO_MODULE)
+find_package(ECM ${ECM_VERSION} NO_MODULE)
 if( ECM_FOUND )
-    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
     include( ECMAddTests )
 endif()
 

src/modules/welcome/checker/RequirementsChecker.cpp

@@ -213,12 +213,16 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
         bool ok = false;
         m_requiredStorageGB = configurationMap.value( "requiredStorage" ).toDouble( &ok );
         if ( !ok )
+        {
+            cDebug() << "WARNING: RequirementsChecker entry 'requiredStorage' is invalid.";
             m_requiredStorageGB = 3.;
+        }
 
         Calamares::JobQueue::instance()->globalStorage()->insert( "requiredStorageGB", m_requiredStorageGB );
     }
     else
     {
+        cDebug() << "WARNING: RequirementsChecker entry 'requiredStorage' is missing.";
         m_requiredStorageGB = 3.;
         incompleteConfiguration = true;
     }
@@ -231,12 +235,14 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
         m_requiredRamGB = configurationMap.value( "requiredRam" ).toDouble( &ok );
         if ( !ok )
         {
+            cDebug() << "WARNING: RequirementsChecker entry 'requiredRam' is invalid.";
             m_requiredRamGB = 1.;
             incompleteConfiguration = true;
         }
     }
     else
     {
+        cDebug() << "WARNING: RequirementsChecker entry 'requiredRam' is missing.";
         m_requiredRamGB = 1.;
         incompleteConfiguration = true;
     }
@@ -248,7 +254,7 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
         if ( m_checkHasInternetUrl.isEmpty() ||
              !QUrl( m_checkHasInternetUrl ).isValid() )
         {
-            cDebug() << "Invalid internetCheckUrl in welcome.conf" << m_checkHasInternetUrl
+            cDebug() << "WARNING: RequirementsChecker entry 'internetCheckUrl' is invalid in welcome.conf" << m_checkHasInternetUrl
                      << "reverting to default (http://example.com).";
             m_checkHasInternetUrl = "http://example.com";
             incompleteConfiguration = true;
@@ -256,8 +262,9 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
     }
     else
     {
-        cDebug() << "internetCheckUrl is undefined in welcome.conf, "
+        cDebug() << "WARNING: RequirementsChecker entry 'internetCheckUrl' is undefined in welcome.conf,"
                     "reverting to default (http://example.com).";
+
         m_checkHasInternetUrl = "http://example.com";
         incompleteConfiguration = true;
     }
@@ -269,7 +276,10 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
         m_entriesToCheck.append( configurationMap.value( "check" ).toStringList() );
     }
     else
+    {
+        cDebug() << "WARNING: RequirementsChecker entry 'check' is incomplete.";
         incompleteConfiguration = true;
+    }
 
     if ( configurationMap.contains( "required" ) &&
          configurationMap.value( "required" ).type() == QVariant::List )
@@ -278,18 +288,13 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
         m_entriesToRequire.append( configurationMap.value( "required" ).toStringList() );
     }
     else
+    {
+        cDebug() << "WARNING: RequirementsChecker entry 'required' is incomplete.";
         incompleteConfiguration = true;
+    }
 
     if ( incompleteConfiguration )
-    {
-        cDebug() << "WARNING: The RequirementsChecker configuration map provided by "
-                    "the welcome module configuration file is incomplete or "
-                    "incorrect.\n"
-                    "Startup will continue for debugging purposes, but one or "
-                    "more checks might not function correctly.\n"
-                    "RequirementsChecker configuration map:\n"
-                 << configurationMap;
-    }
+        cDebug() << "WARNING: RequirementsChecker configuration map:\n" << configurationMap;
 }