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

Add ImageRegistry support to Branding.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-10-16 16:57:52 +02:00
parent 5e8ab97de4
commit 7594c85f2e
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libcalamaresui/Branding.cpp
View File

@ -21,9 +21,11 @@
#include "utils/CalamaresUtils.h" #include "utils/CalamaresUtils.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/YamlUtils.h" #include "utils/YamlUtils.h"
#include "utils/ImageRegistry.h"
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QPixmap>
#include <yaml-cpp/yaml.h> #include <yaml-cpp/yaml.h>
@ -39,15 +41,6 @@ Branding::instance()
return s_instance; return s_instance;
} }
enum Branding::StringEntry : short
{
ProductName,
Version,
ShortVersion,
VersionedName,
ShortVersionedName
};
QStringList Branding::s_stringEntryStrings = QStringList Branding::s_stringEntryStrings =
{ {
@ -59,13 +52,6 @@ QStringList Branding::s_stringEntryStrings =
}; };
enum Branding::ImageEntry : short
{
ProductLogo,
ProductIcon
};
QStringList Branding::s_imageEntryStrings = QStringList Branding::s_imageEntryStrings =
{ {
"productLogo", "productLogo",
@ -186,14 +172,29 @@ Branding::string( Branding::StringEntry stringEntry ) const
QString QString
Branding::image( Branding::ImageEntry imageEntry ) const Branding::imagePath( Branding::ImageEntry imageEntry ) const
{ {
return m_images.value( s_imageEntryStrings.value( imageEntry ) ); return m_images.value( s_imageEntryStrings.value( imageEntry ) );
} }
QPixmap
Branding::image( Branding::ImageEntry imageEntry, const QSize& size ) const
{
QPixmap pixmap =
ImageRegistry::instance()->pixmap( imagePath( imageEntry ), size );
if ( pixmap.isNull() )
{
Q_ASSERT( false );
return QPixmap();
}
return pixmap;
}
QStringList QStringList
Branding::slideshow() const Branding::slideshowPaths() const
{ {
return m_slideshow; return m_slideshow;
} }

21
src/libcalamaresui/Branding.h
View File

@ -34,8 +34,20 @@ class UIDLLEXPORT Branding : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
enum StringEntry : short; enum StringEntry : short
enum ImageEntry : short; {
ProductName,
Version,
ShortVersion,
VersionedName,
ShortVersionedName
};
enum ImageEntry : short
{
ProductLogo,
ProductIcon
};
static Branding* instance(); static Branding* instance();
@ -47,8 +59,9 @@ public:
QString componentDirectory() const; QString componentDirectory() const;
QString string( Branding::StringEntry stringEntry ) const; QString string( Branding::StringEntry stringEntry ) const;
QString image( Branding::ImageEntry imageEntry ) const; QString imagePath( Branding::ImageEntry imageEntry ) const;
QStringList slideshow() const; QPixmap image( Branding::ImageEntry imageEntry, const QSize& size ) const;
QStringList slideshowPaths() const;
private: private:
static Branding* s_instance; static Branding* s_instance;