summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp24
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h1
-rw-r--r--noncore/multimedia/opieplayer2/skin.cpp36
-rw-r--r--noncore/multimedia/opieplayer2/skin.h7
4 files changed, 41 insertions, 27 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 4de7ea9..da0706e 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -33,73 +33,53 @@ MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPla
{
connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ),
this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) );
connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ),
this, SLOT( setLength( long ) ) );
connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
this, SLOT( setPlaying( bool ) ) );
}
MediaWidget::~MediaWidget()
{
}
void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
const Skin &skin, const QSize &buttonAreaSize )
{
- buttonMask = QImage( buttonAreaSize, 8, 255 );
- buttonMask.fill( 0 );
+ buttonMask = skin.buttonMask( skinInfo, buttonCount, buttonAreaSize );
buttons.clear();
buttons.reserve( buttonCount );
for ( uint i = 0; i < buttonCount; ++i ) {
Button button = setupButton( skinInfo[ i ], skin );
buttons.push_back( button );
}
}
MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin )
{
Button button;
button.command = buttonInfo.command;
button.type = buttonInfo.type;
-
- button.mask = setupButtonMask( button.command, skin.buttonMaskImage( buttonInfo.fileName ) );
+ button.mask = skin.buttonMaskImage( buttonInfo.fileName );
return button;
}
-QBitmap MediaWidget::setupButtonMask( const Command &command, const QImage &maskImage )
-{
- if ( maskImage.isNull() )
- return QBitmap();
-
- uchar **dest = buttonMask.jumpTable();
- for ( int y = 0; y < buttonMask.height(); y++ ) {
- uchar *line = dest[y];
- for ( int x = 0; x < buttonMask.width(); x++ )
- if ( !qRed( maskImage.pixel( x, y ) ) )
- line[x] = command + 1;
- }
-
- // ### grmbl qt2. use constructor when switching to qt3.
- QBitmap bm; bm = maskImage;
- return bm;
-}
-
void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix )
{
Config cfg( "OpiePlayer" );
cfg.setGroup( "Options" );
QString skin = cfg.readEntry( "Skin","default" );
loadSkin( skinInfo, buttonCount, skin, fileNameInfix );
}
void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &name, const QString &fileNameInfix )
{
Skin skin( name, fileNameInfix );
QString skinPath = "opieplayer2/skins/" + name;
backgroundPixmap = skin.backgroundImage();
buttonUpImage = skin.buttonUpImage();
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 0d635aa..4bd8760 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -91,33 +91,32 @@ public slots:
virtual void loadSkin() = 0;
signals:
void moreReleased();
void lessReleased();
void forwardReleased();
void backReleased();
void forwardClicked();
void backClicked();
void moreClicked();
void lessClicked();
protected:
void setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
const Skin &skin, const QSize &buttonAreaSize );
Button setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin );
- QBitmap setupButtonMask( const Command &command, const QImage &maskImage );
void loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix = QString::null );
void loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &name, const QString &fileNameInfix );
virtual void closeEvent( QCloseEvent * );
virtual void paintEvent( QPaintEvent *pe );
Button *buttonAt( const QPoint &position );
virtual void mousePressEvent( QMouseEvent *event );
virtual void mouseReleaseEvent( QMouseEvent *event );
virtual void makeVisible();
void handleCommand( Command command, bool buttonDown );
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index 7d05d80..ef70957 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -1,54 +1,84 @@
#include "skin.h"
#include <qpe/resource.h>
Skin::Skin( const QString &name, const QString &fileNameInfix )
: m_name( name ), m_fileNameInfix( fileNameInfix )
{
m_skinPath = "opieplayer2/skins/" + name;
}
-void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount )
+void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize )
{
backgroundImage();
buttonUpImage();
buttonDownImage();
- for ( uint i = 0; i < buttonCount; ++i )
- ( void )buttonMaskImage( skinButtonInfo[ i ].fileName );
+ ( void )buttonMask( skinButtonInfo, buttonCount, buttonAreaSize );
}
QImage Skin::backgroundImage() const
{
if ( m_backgroundImage.isNull() )
m_backgroundImage = QImage( Resource::findPixmap( QString( "%1/background" ).arg( m_skinPath ) ) );
return m_backgroundImage;
}
QImage Skin::buttonUpImage() const
{
if ( m_buttonUpImage.isNull() )
m_buttonUpImage = QImage( Resource::findPixmap( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) );
return m_buttonUpImage;
}
QImage Skin::buttonDownImage() const
{
if ( m_buttonDownImage.isNull() )
m_buttonDownImage = QImage( Resource::findPixmap( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) );
return m_buttonDownImage;
}
+QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize ) const
+{
+ if ( buttonAreaSize != m_buttonMask.size() )
+ m_buttonMask = QImage();
+
+ if ( !m_buttonMask.isNull() )
+ return m_buttonMask;
+
+ m_buttonMask = QImage( buttonAreaSize, 8, 255 );
+ m_buttonMask.fill( 0 );
+
+ for ( uint i = 0; i < buttonCount; ++i )
+ addButtonToMask( skinButtonInfo[ i ].command + 1, buttonMaskImage( skinButtonInfo[ i ].fileName ) );
+
+ return m_buttonMask;
+}
+
+void Skin::addButtonToMask( int tag, const QImage &maskImage ) const
+{
+ if ( maskImage.isNull() )
+ return;
+
+ uchar **dest = m_buttonMask.jumpTable();
+ for ( int y = 0; y < m_buttonMask.height(); y++ ) {
+ uchar *line = dest[y];
+ for ( int x = 0; x < m_buttonMask.width(); x++ )
+ if ( !qRed( maskImage.pixel( x, y ) ) )
+ line[x] = tag;
+ }
+}
+
QImage Skin::buttonMaskImage( const QString &fileName ) const
{
ButtonMaskImageMap::Iterator it = m_buttonMasks.find( fileName );
if ( it == m_buttonMasks.end() ) {
QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix );
QString path = prefix + fileName + ".png";
it = m_buttonMasks.insert( fileName, QImage( Resource::findPixmap( path ) ) );
}
return *it;
}
/* vim: et sw=4 ts=4
*/
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index 9276a5b..14873e7 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -1,41 +1,46 @@
#ifndef SKIN_H
#define SKIN_H
#include <qstring.h>
#include <qimage.h>
#include <qmap.h>
#include "mediawidget.h"
class Skin
{
public:
Skin( const QString &name, const QString &fileNameInfix );
- void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount );
+ void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize );
QImage backgroundImage() const;
QImage buttonUpImage() const;
QImage buttonDownImage() const;
+ QImage buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize ) const;
+
QImage buttonMaskImage( const QString &fileName ) const;
private:
+ void addButtonToMask( int tag, const QImage &maskImage ) const;
+
QString m_name;
QString m_fileNameInfix;
QString m_skinPath;
typedef QMap<QString, QImage> ButtonMaskImageMap;
mutable QImage m_backgroundImage;
mutable QImage m_buttonUpImage;
mutable QImage m_buttonDownImage;
+ mutable QImage m_buttonMask;
mutable ButtonMaskImageMap m_buttonMasks;
Skin( const Skin & );
Skin &operator=( const Skin & );
};
#endif // SKIN_H
/* vim: et sw=4 ts=4
*/