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

Branding::style is now ::styleString for clarity.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-03-19 17:58:18 +01:00
parent 9615691554
commit cc5095781d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libcalamaresui/Branding.cpp
View File

@ -208,6 +208,13 @@ Branding::string( Branding::StringEntry stringEntry ) const
} }
QString
Branding::styleString( Branding::StyleEntry styleEntry ) const
{
return m_style.value( s_styleEntryStrings.value( styleEntry ) );
}
QString QString
Branding::imagePath( Branding::ImageEntry imageEntry ) const Branding::imagePath( Branding::ImageEntry imageEntry ) const
{ {
@ -236,12 +243,6 @@ Branding::slideshowPath() const
return m_slideshowPath; return m_slideshowPath;
} }
QString
Branding::style( Branding::StyleEntry styleEntry ) const
{
return m_style.value( s_styleEntryStrings.value( styleEntry ) );
}
void void
Branding::setGlobals( GlobalStorage* globalStorage ) const Branding::setGlobals( GlobalStorage* globalStorage ) const

2
src/libcalamaresui/Branding.h
View File

@ -70,10 +70,10 @@ public:
QString componentDirectory() const; QString componentDirectory() const;
QString string( Branding::StringEntry stringEntry ) const; QString string( Branding::StringEntry stringEntry ) const;
QString styleString( Branding::StyleEntry styleEntry ) const;
QString imagePath( Branding::ImageEntry imageEntry ) const; QString imagePath( Branding::ImageEntry imageEntry ) const;
QPixmap image( Branding::ImageEntry imageEntry, const QSize& size ) const; QPixmap image( Branding::ImageEntry imageEntry, const QSize& size ) const;
QString slideshowPath() const; QString slideshowPath() const;
QString style( Branding::StyleEntry styleEntry ) const;
/** /**
* Creates a map called "branding" in the global storage, and inserts an * Creates a map called "branding" in the global storage, and inserts an