napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamaresui] Store the slideshow-from-images data

Browse Source 
- This code has existed for a long time but never stored anything
  to the Branding object, and the most literal slideshow (just some
  images) was not implemented.
This commit is contained in:
Adriaan de Groot 2020-05-07 19:02:38 +02:00
parent 401a34fcbd
commit 526716556c
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcalamaresui/Branding.cpp
View File

@ -238,7 +238,7 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent )
slideShowPictures[ i ] = imageFi.absoluteFilePath(); slideShowPictures[ i ] = imageFi.absoluteFilePath();
} }
//FIXME: implement a GenericSlideShow.qml that uses these slideShowPictures m_slideshowFilenames = slideShowPictures;
} }
else if ( doc[ "slideshow" ].IsScalar() ) else if ( doc[ "slideshow" ].IsScalar() )
{ {

10
src/libcalamaresui/Branding.h
View File

@ -237,6 +237,16 @@ private:
QMap< QString, QString > m_strings; QMap< QString, QString > m_strings;
QMap< QString, QString > m_images; QMap< QString, QString > m_images;
QMap< QString, QString > m_style; QMap< QString, QString > m_style;
/* The slideshow can be done in one of two ways:
* - as a sequence of images
* - as a QML file
* The slideshow: setting selects which one is used. If it is
* a list (of filenames) then it is a sequence of images, and otherwise
* it is a QML file which is run. (For QML, the slideshow API is
* important).
*/
QStringList m_slideshowFilenames;
QString m_slideshowPath; QString m_slideshowPath;
int m_slideshowAPI; int m_slideshowAPI;
QString m_translationsPathPrefix; QString m_translationsPathPrefix;