| -rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 40 |
2 files changed, 21 insertions, 21 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index efba6f3..3bf01b6 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h @@ -37,3 +37,3 @@ class MediaWidget : public QWidget public: - enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back, Undefined }; + enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back, FullScreen, Undefined }; enum ButtonType { NormalButton, ToggleButton }; diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 8409e5c..4867ef1 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -61,6 +61,15 @@ const int yo = 0; // movable y offset -const char * const skinV_mask_file_names[7] = { -"play","stop","fwd","back","up","down","full" +const MediaWidget::SkinButtonInfo skinInfo[] = +{ + { MediaWidget::Play, "play", MediaWidget::ToggleButton }, + { MediaWidget::Stop, "stop", MediaWidget::NormalButton }, + { MediaWidget::Next, "fwd", MediaWidget::NormalButton }, + { MediaWidget::Previous, "back", MediaWidget::NormalButton }, + { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton }, + { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton }, + { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton } }; +const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); + } @@ -72,13 +81,2 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye - Button defaultButton; - Button toggleButton = defaultButton; - toggleButton.type = ToggleButton; - - buttons.push_back( toggleButton ); // play - buttons.push_back( toggleButton ); // stop - buttons.push_back( toggleButton ); // next - buttons.push_back( toggleButton ); // previous - buttons.push_back( toggleButton ); // volUp - buttons.push_back( toggleButton ); // volDown - buttons.push_back( toggleButton ); // fullscreen @@ -101,8 +99,9 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye - uint i = 0; - for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it, ++i ) { - Button &button = *it; + for ( uint i = 0; i < buttonCount; i++ ) { + Button button; + button.command = skinInfo[ i ].command; + button.type = skinInfo[ i ].type; - QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); - button.mask = QBitmap( filename ); + QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinInfo[i].fileName + ".png" ); + button.mask =QBitmap( filename ); @@ -113,8 +112,9 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye uchar *line = dest[y]; - for ( int x = 0; x < imgUp.width(); x++ ) { + for ( int x = 0; x < imgUp.width(); x++ ) if ( !qRed( imgMask.pixel( x, y ) ) ) line[x] = i + 1; - } } } + + buttons.push_back( button ); } |