Merge branch 'branding'

Documentation lives both in Calamares and in the calamares-branding
repo. Whether a slideshow has navigation arrows or not is up to the
slideshow / branding component author, but Calamares now ships some
support QML to make that easy.

FIXES #841
FIXES #904

.gitignore

@@ -21,6 +21,7 @@ __pycache__
 *.pro.user
 *.pro.user.*
 *.moc
+*.qmlc
 moc_*.cpp
 qrc_*.cpp
 ui_*.h

CMakeModules/CalamaresAddBrandingSubdirectory.cmake

@@ -1,43 +1,136 @@
+# === This file is part of Calamares - <https://github.com/calamares> ===
+#
+#   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/>.
+#
+#   SPDX-License-Identifier: GPL-3.0+
+#   License-Filename: LICENSE
+#
+###
+#
+# Support macros for creating Calamares branding components.
+#
+# Calamares branding components have two parts:
+# - a branding.desc file that tells Calamares how to describe the product
+#   (e.g. strings like "Generic GNU/Linux") and the name of a QML file
+#   (the "slideshow") that is displayed during installation.
+# - the QML files themselves, plus supporting images etc.
+#
+# Branding components can be created inside the Calamares source tree
+# (there is one example the `default/` branding, which is also connected
+# to the default configuration shipped with Calamares), but they can be
+# built outside of, and largely independently of, Calamares by using
+# these CMake macros.
+#
+# See the calamares-examples repository for more examples.
+#
+include( CMakeParseArguments)
+
 include( CMakeColors )
 
-function( calamares_add_branding_subdirectory )
+# Usage calamares_add_branding( <name> [DIRECTORY <dir>] [SUBDIRECTORIES <dir> ...])
-    set( SUBDIRECTORY ${ARGV0} )
+#
+# Adds a branding component to the build:
+# - the component's top-level files are copied into the build-dir;
+#   CMakeLists.txt is excluded from the glob.
+# - the component's top-level files are installed into the component branding dir
+#
+# The branding component lives in <dir> if given, otherwise the
+# current source directory. The branding component is installed
+# with the given <name>, which is usually the name of the
+# directory containing the component, and which must match the
+# *componentName* in `branding.desc`.
+#
+# If SUBDIRECTORIES are given, then those are copied (each one level deep)
+# to the installation location as well, preserving the subdirectory name.
+function( calamares_add_branding NAME )
+    set( _CABT_DIRECTORY "." )
+    cmake_parse_arguments( _CABT "" "DIRECTORY" "SUBDIRECTORIES" ${ARGN} )
+    set( SUBDIRECTORY ${_CABT_DIRECTORY} )
+    set( _brand_dir ${_CABT_DIRECTORY} )
 
-    if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" )
-        add_subdirectory( $SUBDIRECTORY )
-        message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} branding component: ${BoldRed}${SUBDIRECTORY}${ColorReset}" )
-
-    elseif( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/branding.desc" )
     set( BRANDING_DIR share/calamares/branding )
-        set( BRANDING_COMPONENT_DESTINATION ${BRANDING_DIR}/${SUBDIRECTORY} )
+    set( BRANDING_COMPONENT_DESTINATION ${BRANDING_DIR}/${NAME} )
 
-        if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang" )
+    foreach( _subdir "" ${_CABT_SUBDIRECTORIES} )
-            message( "-- ${BoldYellow}Warning:${ColorReset} branding component ${BoldRed}${SUBDIRECTORY}${ColorReset} has a translations subdirectory but no CMakeLists.txt." )
+        file( GLOB BRANDING_COMPONENT_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_brand_dir} "${_brand_dir}/${_subdir}/*" )
-            message( "" )
+        message(STATUS "${BRANDING_COMPONENT_FILES}")
-            return()
-        endif()
-
-        # We glob all the files inside the subdirectory, and we make sure they are
-        # synced with the bindir structure and installed.
-        file( GLOB BRANDING_COMPONENT_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} "${SUBDIRECTORY}/*" )
         foreach( BRANDING_COMPONENT_FILE ${BRANDING_COMPONENT_FILES} )
-            if( NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${BRANDING_COMPONENT_FILE} )
+            set( _subpath ${_brand_dir}/${BRANDING_COMPONENT_FILE} )
-                configure_file( ${SUBDIRECTORY}/${BRANDING_COMPONENT_FILE} ${SUBDIRECTORY}/${BRANDING_COMPONENT_FILE} COPYONLY )
+            if( NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_subpath} )
+                configure_file( ${_subpath} ${_subpath} COPYONLY )
 
-                install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${BRANDING_COMPONENT_FILE}
+                install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_subpath}
-                         DESTINATION ${BRANDING_COMPONENT_DESTINATION} )
+                            DESTINATION ${BRANDING_COMPONENT_DESTINATION}/${_subdir}/ )
             endif()
         endforeach()
+    endforeach()
 
-        message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} branding component: ${BoldRed}${SUBDIRECTORY}${ColorReset}" )
+    message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} branding component: ${BoldRed}${NAME}${ColorReset}" )
     if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
         message( "   ${Green}TYPE:${ColorReset} branding component" )
-#            message( "   ${Green}FILES:${ColorReset} ${BRANDING_COMPONENT_FILES}" )
         message( "   ${Green}BRANDING_COMPONENT_DESTINATION:${ColorReset} ${BRANDING_COMPONENT_DESTINATION}" )
-            message( "" )
+    endif()
+endfunction()
+
+# Usage calamares_add_branding_translations( <name> [DIRECTORY <dir>])
+#
+# Adds the translations for a branding component to the build:
+# - the component's lang/ directory is scanned for .ts files
+# - the component's translations are installed into the component branding dir
+#
+# Translation files must be called calamares-<name>_<lang>.ts . Optionally
+# the lang/ dir is found in the given <dir> instead of the current source
+# directory.
+function( calamares_add_branding_translations NAME )
+    set( _CABT_DIRECTORY "." )
+    cmake_parse_arguments( _CABT "" "DIRECTORY" "" ${ARGN} )
+    set( SUBDIRECTORY ${_CABT_DIRECTORY} )
+    set( _brand_dir ${_CABT_DIRECTORY} )
+
+    set( BRANDING_DIR share/calamares/branding )
+    set( BRANDING_COMPONENT_DESTINATION ${BRANDING_DIR}/${NAME} )
+
+    file( GLOB BRANDING_TRANSLATION_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${SUBDIRECTORY}/lang/calamares-${NAME}_*.ts" )
+    if ( BRANDING_TRANSLATION_FILES )
+        qt5_add_translation( QM_FILES ${BRANDING_TRANSLATION_FILES} )
+        add_custom_target( branding-translation-${NAME} ALL DEPENDS ${QM_FILES} )
+        install( FILES ${QM_FILES} DESTINATION ${BRANDING_COMPONENT_DESTINATION}/lang/ )
+        list( LENGTH BRANDING_TRANSLATION_FILES _branding_count )
+        message( "   ${Green}BRANDING_TRANSLATIONS:${ColorReset} ${_branding_count} language(s)" )
+    endif()
+endfunction()
+
+# Usage calamares_add_branding_subdirectory( <dir> [SUBDIRECTORIES <dir> ...])
+#
+# Adds a branding component from a subdirectory:
+# - if there is a CMakeLists.txt, use that
+# - otherwise assume a "standard" setup with top-level files and a lang/ dir for translations
+#
+# If SUBDIRECTORIES are given, they are relative to <dir>, and are
+# copied (one level deep) to the install location as well.
+function( calamares_add_branding_subdirectory SUBDIRECTORY )
+    cmake_parse_arguments( _CABS "" "" "SUBDIRECTORIES" ${ARGN} )
+
+    if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" )
+        add_subdirectory( ${SUBDIRECTORY} )
+    elseif( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/branding.desc" )
+        calamares_add_branding( ${SUBDIRECTORY} DIRECTORY ${SUBDIRECTORY} SUBDIRECTORIES ${_CABS_SUBDIRECTORIES} )
+        if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang" )
+            calamares_add_branding_translations( ${SUBDIRECTORY} DIRECTORY ${SUBDIRECTORY} )
         endif()
     else()
         message( "-- ${BoldYellow}Warning:${ColorReset} tried to add branding component subdirectory ${BoldRed}${SUBDIRECTORY}${ColorReset} which has no branding.desc." )
-        message( "" )
     endif()
+    message( "" )
 endfunction()

CMakeModules/CalamaresAddLibrary.cmake

@@ -1,3 +1,25 @@
+# === This file is part of Calamares - <https://github.com/calamares> ===
+#
+#   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/>.
+#
+#   SPDX-License-Identifier: GPL-3.0+
+#   License-Filename: LICENSE
+#
+###
+#
+# Support functions for building plugins.
+
 include( CMakeParseArguments )
 
 function(calamares_add_library)

CMakeModules/CalamaresAddModuleSubdirectory.cmake

@@ -1,3 +1,26 @@
+# === This file is part of Calamares - <https://github.com/calamares> ===
+#
+#   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/>.
+#
+#   SPDX-License-Identifier: GPL-3.0+
+#   License-Filename: LICENSE
+#
+###
+#
+# Function and support code for adding a Calamares module (either a Qt / C++ plugin,
+# or a Python module, or whatever) to the build.
+#
 include( CalamaresAddTranslations )
 
 set( MODULE_DATA_DESTINATION share/calamares/modules )

CMakeModules/CalamaresAddPlugin.cmake

@@ -1,3 +1,23 @@
+# === This file is part of Calamares - <https://github.com/calamares> ===
+#
+#   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/>.
+#
+#   SPDX-License-Identifier: GPL-3.0+
+#   License-Filename: LICENSE
+#
+###
+#
 # Convenience function for creating a C++ (qtplugin) module for Calamares.
 # This function provides cmake-time feedback about the plugin, adds
 # targets for compilation and boilerplate information, and creates

CMakeModules/CalamaresAddTranslations.cmake

@@ -1,3 +1,25 @@
+# === This file is part of Calamares - <https://github.com/calamares> ===
+#
+#   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/>.
+#
+#   SPDX-License-Identifier: GPL-3.0+
+#   License-Filename: LICENSE
+#
+###
+#
+# This file has not yet been documented for use outside of Calamares itself.
+
 include( CMakeParseArguments )
 
 # Internal macro for adding the C++ / Qt translations to the

CalamaresConfig.cmake.in

@@ -1,8 +1,16 @@
-# - Config file for the Calamares package
+# Config file for the Calamares package
+#
 # It defines the following variables
 #  CALAMARES_INCLUDE_DIRS - include directories for Calamares
 #  CALAMARES_LIBRARIES    - libraries to link against
-#  CALAMARES_EXECUTABLE   - the bar executable
+#  CALAMARES_USE_FILE     - name of a convenience include
+#  CALAMARES_APPLICATION_NAME - human-readable application name
+#
+# Typical use is:
+#
+#    find_package(Calamares REQUIRED)
+#    include("${CALAMARES_USE_FILE}")
+#
 
 # Compute paths
 get_filename_component(CALAMARES_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
@@ -18,4 +26,7 @@ include("${CALAMARES_CMAKE_DIR}/CalamaresLibraryDepends.cmake")
 
 # These are IMPORTED targets created by CalamaresLibraryDepends.cmake
 set(CALAMARES_LIBRARIES calamares)
+
+# Convenience variables
 set(CALAMARES_USE_FILE "${CALAMARES_CMAKE_DIR}/CalamaresUse.cmake")
+set(CALAMARES_APPLICATION_NAME  "Calamares")

CalamaresUse.cmake.in

@@ -20,7 +20,7 @@ if( NOT CALAMARES_CMAKE_DIR )
 endif()
 set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CALAMARES_CMAKE_DIR} )
 
-find_package( Qt5 @QT_VERSION@ CONFIG REQUIRED Core Widgets )
+find_package( Qt5 @QT_VERSION@ CONFIG REQUIRED Core Widgets LinguistTools )
 
 include( CalamaresAddLibrary )
 include( CalamaresAddModuleSubdirectory )

ci/txpush.sh

@@ -33,7 +33,10 @@ fi
 # sources, then push to Transifex
 
 export QT_SELECT=5
-lupdate src/ -ts -no-obsolete lang/calamares_en.ts
+# Don't pull branding translations in,
+# those are done separately.
+_srcdirs="src/calamares src/libcalamares src/libcalamaresui src/modules src/qml"
+lupdate $_srcdirs -ts -no-obsolete lang/calamares_en.ts
 
 tx push --source --no-interactive -r calamares.calamares-master
 tx push --source --no-interactive -r calamares.fdo

src/branding/README.md

@@ -7,11 +7,33 @@ file, containing brand-specific strings in a key-value structure, plus
 brand-specific images or QML. Such a subdirectory, when placed here, is
 automatically picked up by CMake and made available to Calamares.
 
+It is recommended to package branding separately, so as to avoid
+forking Calamares just for adding some files. Calamares installs
+CMake support macros to help create branding packages. See the
+calamares-branding repository for examples of stand-alone branding.
+
+## Examples
+
+There is one example of a branding component included with Calamares,
+so that it can be run directly from the build directory for testing purposes:
+
+ - `default/` is a sample brand for the Generic Linux distribution. It uses
+   the default Calamares icons and a as start-page splash it provides a
+   tag-cloud view of languages. The slideshow is a basic one with a few
+   slides of text and a single image. No translations are provided.
+
+Since the slideshow can be **any** QML, it is limited only by your designers
+imagination and your QML experience. For straightforward presentations,
+see the documentation below. There are more examples in the *calamares-branding*
+repository.
+
+## Translations
+
 QML files in a branding component can be translated. Translations should
 be placed in a subdirectory `lang/` of the branding component directory.
 Qt translation files are supported (`.ts` sources which get compiled into
 `.qm`). Inside the `lang` subdirectory all translation files must be named
-according to the scheme `calamares-<component name>_<language>.qm`.
+according to the scheme `calamares-<component name>_<language>.ts`.
 
 Text in your `show.qml` (or whatever *slideshow* is set to in the descriptor
 file) should be enclosed in this form for translations
@@ -20,15 +42,92 @@ file) should be enclosed in this form for translations
     text: qsTr("This is an example text.")
 ```
 
-## Examples
+## Presentation
 
-There are two examples of branding content:
+The default QML classes provided by Calamares can be used for a simple
+and straightforward "slideshow" presentation with static text and
+pictures. To use the default slideshow classes, start with a `show.qml`
+file with the following content:
 
- - `default/` is a sample brand for the Generic Linux distribution. It uses
+```
-   the default Calamares icons and a as start-page splash it provides a
+import QtQuick 2.5;
-   tag-cloud view of languages. The slideshow is a basic one with a few
+import calamares.slideshow 1.0;
-   slides of text and a single image. No translations are provided.
+
- - `samegame/` is a similarly simple branding setup for Generic Linux,
+Presentation
-   but instead of a slideshow, it lets the user play Same Game (clicking
+{
-   colored balls) during the installation. The game is taken from the
+    id: presentation
-   QML examples provided by the Qt Company.
+}
+```
+
+After the *id*, set properties of the presentation as a whole. These include:
+ - *loopSlides* (default true) When set, clicking past the last slide
+   returns to the very first slide.
+ - *mouseNavigation*, *arrowNavigation*, *keyShortcutsEnabled* (all default
+   true) enable different ways to navigate the slideshow.
+ - *titleColor*, *textColor* change the look of the presentation.
+ - *fontFamily*, *codeFontFamily* change the look of text in the presentation.
+
+After setting properties, you can add elements to the presentation.
+Generally, you will add a few presentation-level elements first,
+then slides.
+ - For visible navigation arrows, add elements of class *ForwardButton* and
+   *BackwardButton*. Set the *source* property of each to a suitable
+   image. See the `fancy/` example. It is recommended to turn off other
+   kinds of navigation when visible navigation is used.
+ - To indicate where the user is, add an element of class *SlideCounter*.
+   This indicates in "n / total" form where the user is in the slideshow.
+ - To automatically advance the presentation (for a fully passive slideshow),
+   add a timer that calls the `goToNextSlide()` function of the presentation.
+   See the `default/` example -- remember to start the timer when the
+   presentation is completely loaded.
+
+After setting the presentation elements, add one or more Slide elements.
+The presentation framework will make a slideshow out of the Slide
+elements, displaying only one at a time. Each slide is an element in itself,
+so you can put whatever visual elements you like in the slide. They have
+standard properties for a boring "static text" slideshow, though:
+ - *title* is text to show as slide title
+ - *centeredText* is displayed in a large-ish font
+ - *writeInText* is displayed by "writing it in" to the slide,
+   one letter at a time.
+ - *content* is a list of things which are displayed as a bulleted list.
+
+The presentation classes can be used to produce a fairly dry slideshow
+for the installation process; it is recommended to experiment with the
+visual effects and classes available in QtQuick.
+
+## Project Layout
+
+A branding component that is created and installed outside of Calamares
+will have a top-level `CMakeLists.txt` that includes some boilerplate
+to find Calamares, and then adds a subdirectory which contains the
+actual branding component.
+
+Adding the subdirectory can be done as follows:
+
+ - If the directory contains files only, and optionally has a single
+   subdirectory lang/ which contains the translation files for the
+   component, then `calamares_add_branding_subdirectory()` can be
+   used, which takes only the name of the subdirectory.
+
+The file layout in a typical branding component repository is:
+
+```
+ /
+ - CMakeLists.txt
+ - componentname/
+   - show.qml
+   - image1.png
+   ...
+   - lang/
+     - calamares-componentname_en.ts
+     - calamares-componentname_de.ts
+     ...
+```
+
+ - If the branding component has many files which are organized into
+   subdirectories, use the SUBDIRECTORIES argument to the CMake function
+   to additionally install files from those subdirectories. For example,
+   if the component places all of its images in an `img/` subdirectory,
+   then call `calamares_add_branding_subdirectory( ... SUBDIRECTORIES img)`.
+   It is a bad idea to include `lang/` in the SUBDIRECTORIES list.

src/branding/default/show.qml

@@ -24,6 +24,7 @@ Presentation
     id: presentation
 
     Timer {
+        id: advanceTimer
         interval: 5000
         running: false
         repeat: true
@@ -48,7 +49,7 @@ Presentation
                   "To create a Calamares presentation in QML, import calamares.slideshow,<br/>"+
                   "define a Presentation element with as many Slide elements as needed."
             wrapMode: Text.WordWrap
-            width: root.width
+            width: presentation.width
             horizontalAlignment: Text.Center
         }
     }
@@ -60,4 +61,6 @@ Presentation
     Slide {
         centeredText: "This is a third Slide element."
     }
+
+    Component.onCompleted: advanceTimer.running = true
 }

src/branding/samegame/Block.qml

@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//![0]
-import QtQuick 2.0
-
-Item {
-    id: block
-
-    property int type: 0
-
-    Image {
-        id: img
-
-        anchors.fill: parent
-        source: {
-            if (type == 0)
-                return "redStone.png";
-            else if (type == 1)
-                return "blueStone.png";
-            else
-                return "greenStone.png";
-        }
-    }
-}
-//![0]

src/branding/samegame/Button.qml

@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    id: container
-
-    property string text: "Button"
-
-    signal clicked
-
-    width: buttonLabel.width + 20; height: buttonLabel.height + 5
-    border { width: 1; color: Qt.darker(activePalette.button) }
-    antialiasing: true
-    radius: 8
-
-    // color the button with a gradient
-    gradient: Gradient {
-        GradientStop {
-            position: 0.0
-            color: {
-                if (mouseArea.pressed)
-                    return activePalette.dark
-                else
-                    return activePalette.light
-            }
-        }
-        GradientStop { position: 1.0; color: activePalette.button }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        onClicked: container.clicked();
-    }
-
-    Text {
-        id: buttonLabel
-        anchors.centerIn: container
-        color: activePalette.buttonText
-        text: container.text
-    }
-}

src/branding/samegame/Dialog.qml

@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//![0]
-import QtQuick 2.0
-
-Rectangle {
-    id: container
-
-    function show(text) {
-        dialogText.text = text;
-        container.opacity = 1;
-    }
-
-    function hide() {
-        container.opacity = 0;
-    }
-
-    width: dialogText.width + 20
-    height: dialogText.height + 20
-    opacity: 0
-
-    Text {
-        id: dialogText
-        anchors.centerIn: parent
-        text: ""
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: hide();
-    }
-}
-//![0]

src/branding/samegame/branding.desc

@@ -1,76 +0,0 @@
----
-componentName:  samegame
-
-# This selects between different welcome texts. When false, uses
-# the traditional "Welcome to the %1 installer.", and when true,
-# uses "Welcome to the Calamares installer for %1." This allows
-# to distinguish this installer from other installers for the
-# same distribution.
-welcomeStyleCalamares:   false
-
-# These are strings shown to the user in the user interface.
-# There is no provision for translating them -- since they
-# are names, the string is included as-is.
-#
-# The four Url strings are the Urls used by the buttons in
-# the welcome screen, and are not shown to the user. Clicking
-# on the "Support" button, for instance, opens the link supportUrl.
-# If a Url is empty, the corresponding button is not shown.
-#
-# bootloaderEntryName is how this installation / distro is named
-# in the boot loader (e.g. in the GRUB menu).
-strings:
-    productName:         Generic GNU/Linux
-    shortProductName:    Generic
-    version:             2018.1 LTS
-    shortVersion:        2018.1
-    versionedName:       Generic GNU/Linux 2018.1 LTS "Tasseled Tambourine"
-    shortVersionedName:  Generic 2018.1
-    bootloaderEntryName: Generic
-    productUrl:          https://calamares.io/
-    supportUrl:          https://github.com/calamares/calamares/issues
-    knownIssuesUrl:      https://calamares.io/about/
-    releaseNotesUrl:     https://calamares.io/about/
-
-# Should the welcome image (productWelcome, below) be scaled
-# up beyond its natural size? If false, the image does not grow
-# with the window but remains the same size throughout (this
-# may have surprising effects on HiDPI monitors).
-welcomeExpandingLogo:   true
-
-# These images are loaded from the branding module directory.
-#
-# productIcon is used as the window icon, and will (usually) be used
-#       by the window manager to represent the application. This image
-#       should be square, and may be displayed by the window manager
-#       as small as 16x16 (but possibly larger).
-# productLogo is used as the logo at the top of the left-hand column
-#       which shows the steps to be taken. The image should be square,
-#       and is displayed at 80x80 pixels (also on HiDPI).
-# productWelcome is shown on the welcome page of the application in
-#       the middle of the window, below the welcome text. It can be
-#       any size and proportion, and will be scaled to fit inside
-#       the window. Use `welcomeExpandingLogo` to make it non-scaled.
-#       Recommended size is 320x150.
-images:
-    productLogo:         "squidball.png"
-    productIcon:         "squidball.png"
-    productWelcome:      "languages.png"
-
-# The slideshow is displayed during execution steps (e.g. when the
-# installer is actually writing to disk and doing other slow things).
-slideshow:               "samegame.qml"
-
-# Colors for text and background components.
-#
-#  - sidebarBackground is the background of the sidebar
-#  - sidebarText is the (foreground) text color
-#  - sidebarTextHighlight sets the background of the selected (current) step.
-#    Optional, and defaults to the application palette.
-#  - sidebarSelect is the text color of the selected step.
-#
-style:
-   sidebarBackground:    "#292F34"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#292F34"
-   sidebarTextHighlight: "#D35400"

src/branding/samegame/samegame.js

@@ -1,174 +0,0 @@
-/* This script file handles the game logic */
-var maxColumn = 10;
-var maxRow = 15;
-var maxIndex = maxColumn * maxRow;
-var board = new Array(maxIndex);
-var component;
-
-//Index function used instead of a 2D array
-function index(column, row) {
-    return column + (row * maxColumn);
-}
-
-function startNewGame() {
-    //Calculate board size
-    maxColumn = Math.floor(gameCanvas.width / gameCanvas.blockSize);
-    maxRow = Math.floor(gameCanvas.height / gameCanvas.blockSize);
-    maxIndex = maxRow * maxColumn;
-
-    //Close dialogs
-    dialog.hide();
-
-    //Initialize Board
-    board = new Array(maxIndex);
-    gameCanvas.score = 0;
-    for (var column = 0; column < maxColumn; column++) {
-        for (var row = 0; row < maxRow; row++) {
-            board[index(column, row)] = null;
-            createBlock(column, row);
-        }
-    }
-}
-
-function createBlock(column, row) {
-    if (component == null)
-        component = Qt.createComponent("Block.qml");
-
-    // Note that if Block.qml was not a local file, component.status would be
-    // Loading and we should wait for the component's statusChanged() signal to
-    // know when the file is downloaded and ready before calling createObject().
-    if (component.status == Component.Ready) {
-        var dynamicObject = component.createObject(gameCanvas);
-        if (dynamicObject == null) {
-            console.log("error creating block");
-            console.log(component.errorString());
-            return false;
-        }
-        dynamicObject.type = Math.floor(Math.random() * 3);
-        dynamicObject.x = column * gameCanvas.blockSize;
-        dynamicObject.y = row * gameCanvas.blockSize;
-        dynamicObject.width = gameCanvas.blockSize;
-        dynamicObject.height = gameCanvas.blockSize;
-        board[index(column, row)] = dynamicObject;
-    } else {
-        console.log("error loading block component");
-        console.log(component.errorString());
-        return false;
-    }
-    return true;
-}
-
-var fillFound; //Set after a floodFill call to the number of blocks found
-var floodBoard; //Set to 1 if the floodFill reaches off that node
-
-//![1]
-function handleClick(xPos, yPos) {
-    var column = Math.floor(xPos / gameCanvas.blockSize);
-    var row = Math.floor(yPos / gameCanvas.blockSize);
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return;
-    if (board[index(column, row)] == null)
-        return;
-    //If it's a valid block, remove it and all connected (does nothing if it's not connected)
-    floodFill(column, row, -1);
-    if (fillFound <= 0)
-        return;
-    gameCanvas.score += (fillFound - 1) * (fillFound - 1);
-    shuffleDown();
-    victoryCheck();
-}
-//![1]
-
-function floodFill(column, row, type) {
-    if (board[index(column, row)] == null)
-        return;
-    var first = false;
-    if (type == -1) {
-        first = true;
-        type = board[index(column, row)].type;
-
-        //Flood fill initialization
-        fillFound = 0;
-        floodBoard = new Array(maxIndex);
-    }
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return;
-    if (floodBoard[index(column, row)] == 1 || (!first && type != board[index(column, row)].type))
-        return;
-    floodBoard[index(column, row)] = 1;
-    floodFill(column + 1, row, type);
-    floodFill(column - 1, row, type);
-    floodFill(column, row + 1, type);
-    floodFill(column, row - 1, type);
-    if (first == true && fillFound == 0)
-        return;     //Can't remove single blocks
-    board[index(column, row)].opacity = 0;
-    board[index(column, row)] = null;
-    fillFound += 1;
-}
-
-function shuffleDown() {
-    //Fall down
-    for (var column = 0; column < maxColumn; column++) {
-        var fallDist = 0;
-        for (var row = maxRow - 1; row >= 0; row--) {
-            if (board[index(column, row)] == null) {
-                fallDist += 1;
-            } else {
-                if (fallDist > 0) {
-                    var obj = board[index(column, row)];
-                    obj.y += fallDist * gameCanvas.blockSize;
-                    board[index(column, row + fallDist)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-    //Fall to the left
-    var fallDist = 0;
-    for (var column = 0; column < maxColumn; column++) {
-        if (board[index(column, maxRow - 1)] == null) {
-            fallDist += 1;
-        } else {
-            if (fallDist > 0) {
-                for (var row = 0; row < maxRow; row++) {
-                    var obj = board[index(column, row)];
-                    if (obj == null)
-                        continue;
-                    obj.x -= fallDist * gameCanvas.blockSize;
-                    board[index(column - fallDist, row)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-}
-
-//![2]
-function victoryCheck() {
-    //Award bonus points if no blocks left
-    var deservesBonus = true;
-    for (var column = maxColumn - 1; column >= 0; column--)
-        if (board[index(column, maxRow - 1)] != null)
-        deservesBonus = false;
-    if (deservesBonus)
-        gameCanvas.score += 500;
-
-    //Check whether game has finished
-    if (deservesBonus || !(floodMoveCheck(0, maxRow - 1, -1)))
-        dialog.show("Game Over. Your score is " + gameCanvas.score);
-}
-//![2]
-
-//only floods up and right, to see if it can find adjacent same-typed blocks
-function floodMoveCheck(column, row, type) {
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return false;
-    if (board[index(column, row)] == null)
-        return false;
-    var myType = board[index(column, row)].type;
-    if (type == myType)
-        return true;
-    return floodMoveCheck(column + 1, row, myType) || floodMoveCheck(column, row - 1, board[index(column, row)].type);
-}
-

src/branding/samegame/samegame.qml

@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//![0]
-import QtQuick 2.0
-import "samegame.js" as SameGame
-
-Rectangle {
-    id: screen
-
-    width: 490; height: 720
-
-    SystemPalette { id: activePalette }
-
-    Item {
-        width: parent.width
-        anchors { top: parent.top; bottom: toolBar.top }
-
-        Image {
-            id: background
-            anchors.fill: parent
-            source: "background.jpg"
-            fillMode: Image.PreserveAspectCrop
-        }
-
-//![1]
-        Item {
-            id: gameCanvas
-
-            property int score: 0
-            property int blockSize: 40
-
-            width: parent.width - (parent.width % blockSize)
-            height: parent.height - (parent.height % blockSize)
-            anchors.centerIn: parent
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: SameGame.handleClick(mouse.x, mouse.y)
-            }
-        }
-//![1]
-    }
-
-//![2]
-    Dialog {
-        id: dialog
-        anchors.centerIn: parent
-        z: 100
-    }
-//![2]
-
-    Rectangle {
-        id: toolBar
-        width: parent.width; height: 30
-        color: activePalette.window
-        anchors.bottom: screen.bottom
-
-        Button {
-            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
-            text: "New Game"
-            onClicked: SameGame.startNewGame()
-        }
-    }
-}
-//![0]

src/libcalamaresui/Branding.cpp

@@ -184,7 +184,7 @@ Branding::Branding( const QString& brandingFilePath,
 
         QDir translationsDir( componentDir.filePath( "lang" ) );
         if ( !translationsDir.exists() )
-            cWarning() << "the selected branding component does not ship translations.";
+            cWarning() << "the branding component" << componentDir.absolutePath() << "does not ship translations.";
         m_translationsPathPrefix = translationsDir.absolutePath();
         m_translationsPathPrefix.append( QString( "%1calamares-%2" )
                                             .arg( QDir::separator() )

src/qml/calamares/slideshow/BackButton.qml

@@ -0,0 +1,24 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 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
+ *   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/>.
+ */
+
+NavButton {
+    id: backButton
+    anchors.left: parent.left
+    visible: parent.currentSlide > 0
+    isForward: false
+}

src/qml/calamares/slideshow/ForwardButton.qml

@@ -0,0 +1,23 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 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
+ *   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/>.
+ */
+
+NavButton {
+    id: forwardButton
+    anchors.right: parent.right
+    visible: parent.currentSlide + 1 < parent.slides.length;
+}

src/qml/calamares/slideshow/NavButton.qml

@@ -0,0 +1,68 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 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
+ *   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/>.
+ */
+
+/* This is a navigation (arrow) button that fades in on hover, and
+ * which calls forward / backward navigation on the presentation it
+ * is in. It should be a child item of the presentation (not of a
+ * single slide). Use the ForwardButton or BackButton for a pre-
+ * configured instance that interacts with the presentation.
+ */
+
+import QtQuick 2.5;
+
+Image {
+    id: fade
+    
+    property bool isForward : true
+    
+    width: 100
+    height: 100
+    anchors.verticalCenter: parent.verticalCenter
+    opacity: 0.3
+    
+    OpacityAnimator {
+        id: fadeIn
+        target: fade
+        from: fade.opacity
+        to: 1.0
+        duration: 500
+        running: false
+    }
+    
+    OpacityAnimator {
+        id: fadeOut
+        target: fade
+        from: fade.opacity
+        to: 0.3
+        duration: 250
+        running: false
+    }
+    
+    MouseArea {
+        anchors.fill: parent
+        hoverEnabled: true
+        onEntered: { fadeOut.running = false; fadeIn.running = true }
+        onExited: { fadeIn.running = false ; fadeOut.running = true }
+        onClicked: {
+            if (isForward)
+                fade.parent.goToNextSlide()
+            else
+                fade.parent.goToPreviousSlide()
+        }
+    }
+}

src/qml/calamares/slideshow/Presentation.qml

@@ -2,6 +2,12 @@
  *
  *   Copyright 2017, Adriaan de Groot <groot@kde.org>
  *     - added looping, keys-instead-of-shortcut
+ *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *     - make looping a property, drop the 'c' fade-key
+ *     - drop navigation through entering a slide number
+ *       (this and the 'c' key make sense in a *presentation*
+ *       slideshow, not in a passive slideshow like Calamares)
+ *     - remove quit key
  *
  *   SPDX-License-Identifier: LGPL-2.1
  *   License-Filename: LICENSES/LGPLv2.1-Presentation
@@ -58,6 +64,8 @@ Item {
     property variant slides: []
     property int currentSlide: 0
 
+    property bool loopSlides: true
+
     property bool showNotes: false;
     property bool allowDelay: true;
     property alias mouseNavigation: mouseArea.enabled
@@ -70,8 +78,6 @@ Item {
     property string codeFontFamily: "Courier New"
 
     // Private API
-    property bool _faded: false
-    property int _userNum;
     property int _lastShownSlide: 0
 
     Component.onCompleted: {
@@ -85,7 +91,6 @@ Item {
         }
 
         root.slides = slides;
-        root._userNum = 0;
 
         // Make first slide visible...
         if (root.slides.length > 0)
@@ -106,48 +111,21 @@ Item {
     }
 
     function goToNextSlide() {
-        root._userNum = 0
-        if (_faded)
-            return
         if (root.slides[currentSlide].delayPoints) {
             if (root.slides[currentSlide]._advance())
                 return;
         }
         if (currentSlide + 1 < root.slides.length)
             ++currentSlide;
-        else
+        else if (loopSlides)
             currentSlide = 0;  // Loop at the end
     }
 
     function goToPreviousSlide() {
-        root._userNum = 0
-        if (root._faded)
-            return
         if (currentSlide - 1 >= 0)
             --currentSlide;
-    }
+        else if (loopSlides)
-
+            currentSlide = root.slides.length - 1
-    function goToUserSlide() {
-        --_userNum;
-        if (root._faded || _userNum >= root.slides.length)
-            return
-        if (_userNum < 0)
-            goToNextSlide()
-        else {
-            currentSlide = _userNum;
-            root.focus = true;
-        }
-    }
-
-    // directly type in the slide number: depends on root having focus
-    Keys.onPressed: {
-        if (event.key >= Qt.Key_0 && event.key <= Qt.Key_9)
-            _userNum = 10 * _userNum + (event.key - Qt.Key_0)
-        else {
-            if (event.key == Qt.Key_Return || event.key == Qt.Key_Enter)
-                goToUserSlide();
-            _userNum = 0;
-        }
     }
 
     focus: true  // Keep focus
@@ -165,20 +143,10 @@ Item {
 
     // presentation-specific single-key shortcuts (which interfere with normal typing)
     Shortcut { sequence: " "; enabled: root.keyShortcutsEnabled; onActivated: goToNextSlide() }
-    Shortcut { sequence: "c"; enabled: root.keyShortcutsEnabled; onActivated: root._faded = !root._faded }
 
     // standard shortcuts
     Shortcut { sequence: StandardKey.MoveToNextPage; onActivated: goToNextSlide() }
     Shortcut { sequence: StandardKey.MoveToPreviousPage; onActivated: goToPreviousSlide() }
-    Shortcut { sequence: StandardKey.Quit; onActivated: Qt.quit() }
-
-    Rectangle {
-        z: 1000
-        color: "black"
-        anchors.fill: parent
-        opacity: root._faded ? 1 : 0
-        Behavior on opacity { NumberAnimation { duration: 250 } }
-    }
 
     MouseArea {
         id: mouseArea

src/qml/calamares/slideshow/Slide.qml

@@ -46,7 +46,7 @@
 ****************************************************************************/
 
 
-import QtQuick 2.0
+import QtQuick 2.5
 
 Item {
     /*

src/qml/calamares/slideshow/SlideCounter.qml

@@ -0,0 +1,38 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 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
+ *   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/>.
+ */
+
+/* This control just shows a (non-translated) count of the slides
+ * in the slideshow in the format "n / total".
+ */
+
+import QtQuick 2.5;
+
+Rectangle {
+    id: slideCounter
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+    width: 100
+    height: 50
+
+    Text {
+        id: slideCounterText
+        anchors.centerIn: parent
+        //: slide counter, %1 of %2 (numeric)
+        text: qsTr("%L1 / %L2").arg(parent.parent.currentSlide + 1).arg(parent.parent.slides.length)
+    }
+}

src/qml/calamares/slideshow/qmldir

@@ -1,4 +1,10 @@
 module calamares.slideshow
+
 Presentation 1.0 Presentation.qml
 Slide 1.0 Slide.qml
 
+NavButton 1.0 NavButton.qml
+ForwardButton 1.0 ForwardButton.qml
+BackButton 1.0 BackButton.qml
+
+SlideCounter 1.0 SlideCounter.qml