author | simon <simon> | 2002-12-11 12:47:06 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 12:47:06 (UTC) |
commit | dd6a6d5345e191ffa6da3e015c4e024bd8ca67b7 (patch) (side-by-side diff) | |
tree | 565797ef0522be6d3cff893d8bc04c4378306c16 /noncore/multimedia | |
parent | 6f5e269efd9d6a5910251ce26750134e841f7b14 (diff) | |
download | opie-dd6a6d5345e191ffa6da3e015c4e024bd8ca67b7.zip opie-dd6a6d5345e191ffa6da3e015c4e024bd8ca67b7.tar.gz opie-dd6a6d5345e191ffa6da3e015c4e024bd8ca67b7.tar.bz2 |
- button mask composing moved to Skin class
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 24 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 36 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.h | 7 |
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 @@ -43,14 +43,13 @@ 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 ); @@ -60,36 +59,17 @@ void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount 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" ); 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 @@ -101,13 +101,12 @@ signals: 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 * ); 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 @@ -6,19 +6,18 @@ 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 ) ) ); @@ -36,12 +35,43 @@ 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"; 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 @@ -9,30 +9,35 @@ 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 & ); }; |