hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Enable compiled-in XPM pixmaps (#4578)

Browse Source
This commit is contained in:
Johannes Lorenz
2018-09-22 13:22:36 +02:00
committed by Johannes Lorenz
parent a0737a4efc
commit 4babbe25c5
2 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/embed.h
View File

@@ -35,7 +35,17 @@
namespace embed
{
QPixmap LMMS_EXPORT getIconPixmap( const QString& _name, int _w = -1, int _h = -1 );
/**
* Return an image for the icon pixmap cache.
*
* @param _name Identifier for the pixmap. If it is not in the icon pixmap
* cache, it will be loaded from the artwork QDir search paths (exceptions are
* compiled-in XPMs, you need to provide @p xpm for loading them).
* @param xpm Must be XPM data if the source should be raw XPM data instead of
* a file
*/
QPixmap LMMS_EXPORT getIconPixmap( const QString& _name,
int _w = -1, int _h = -1 , const char** xpm = nullptr );
QString LMMS_EXPORT getText( const char * _name );
}
@@ -45,9 +55,10 @@ QString LMMS_EXPORT getText( const char * _name );
namespace PLUGIN_NAME
{
inline QPixmap getIconPixmap( const QString& _name, int _w = -1, int _h = -1 )
inline QPixmap getIconPixmap( const QString& _name,
int _w = -1, int _h = -1, const char** xpm = nullptr )
{
return embed::getIconPixmap(QString("%1/%2").arg(STRINGIFY(PLUGIN_NAME), _name), _w, _h);
return embed::getIconPixmap(QString("%1/%2").arg(STRINGIFY(PLUGIN_NAME), _name), _w, _h, xpm);
}
//QString getText( const char * _name );
@@ -60,12 +71,15 @@ class PixmapLoader
{
public:
PixmapLoader( const PixmapLoader * _ref ) :
m_name( _ref != NULL ? _ref->m_name : QString() )
m_name( _ref != NULL ? _ref->m_name : QString() ),
m_xpm( _ref->m_xpm )
{
}
PixmapLoader( const QString & _name = QString() ) :
m_name( _name )
PixmapLoader( const QString & _name = QString(),
const char** xpm = nullptr ) :
m_name( _name ),
m_xpm(xpm)
{
}
@@ -73,7 +87,8 @@ public:
{
if( !m_name.isEmpty() )
{
return( embed::getIconPixmap( m_name.toLatin1().constData() ) );
return( embed::getIconPixmap(
m_name.toLatin1().constData(), -1, -1, m_xpm ));
}
return( QPixmap() );
}
@@ -89,6 +104,7 @@ public:
protected:
QString m_name;
const char** m_xpm = nullptr;
} ;