-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 42 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 7 |
2 files changed, 28 insertions, 21 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 56b75f2..3b33209 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -35,104 +35,104 @@ | |||
35 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
36 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
37 | #include <opie/oticker.h> | 37 | #include <opie/oticker.h> |
38 | 38 | ||
39 | #include <qwidget.h> | 39 | #include <qwidget.h> |
40 | #include <qpixmap.h> | 40 | #include <qpixmap.h> |
41 | #include <qbutton.h> | 41 | #include <qbutton.h> |
42 | #include <qpainter.h> | 42 | #include <qpainter.h> |
43 | #include <qframe.h> | 43 | #include <qframe.h> |
44 | #include <qlayout.h> | 44 | #include <qlayout.h> |
45 | #include <qdir.h> | 45 | #include <qdir.h> |
46 | #include <stdlib.h> | 46 | #include <stdlib.h> |
47 | #include <stdio.h> | 47 | #include <stdio.h> |
48 | 48 | ||
49 | #include "audiowidget.h" | 49 | #include "audiowidget.h" |
50 | #include "mediaplayerstate.h" | 50 | #include "mediaplayerstate.h" |
51 | #include "playlistwidget.h" | 51 | #include "playlistwidget.h" |
52 | 52 | ||
53 | namespace | 53 | namespace |
54 | { | 54 | { |
55 | 55 | ||
56 | const int xo = -2; // movable x offset | 56 | const int xo = -2; // movable x offset |
57 | const int yo = 22; // movable y offset | 57 | const int yo = 22; // movable y offset |
58 | 58 | ||
59 | const char * const skin_mask_file_names[10] = { | 59 | const MediaWidget::SkinButtonInfo skinInfo[] = |
60 | "play", "stop", "next", "prev", "up", | 60 | { |
61 | "down", "loop", "playlist", "forward", "back" | 61 | { MediaWidget::Play, "play", MediaWidget::ToggleButton }, |
62 | { MediaWidget::Stop, "stop", MediaWidget::NormalButton }, | ||
63 | { MediaWidget::Next, "next", MediaWidget::NormalButton }, | ||
64 | { MediaWidget::Previous, "prev", MediaWidget::NormalButton }, | ||
65 | { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton }, | ||
66 | { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton }, | ||
67 | { MediaWidget::Loop, "loop", MediaWidget::ToggleButton }, | ||
68 | { MediaWidget::PlayList, "playlist", MediaWidget::NormalButton }, | ||
69 | { MediaWidget::Forward, "forward", MediaWidget::NormalButton }, | ||
70 | { MediaWidget::Back, "back", MediaWidget::NormalButton } | ||
62 | }; | 71 | }; |
63 | 72 | ||
73 | const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); | ||
74 | |||
64 | void changeTextColor( QWidget * w) { | 75 | void changeTextColor( QWidget * w) { |
65 | QPalette p = w->palette(); | 76 | QPalette p = w->palette(); |
66 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); | 77 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); |
67 | p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); | 78 | p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); |
68 | w->setPalette( p ); | 79 | w->setPalette( p ); |
69 | } | 80 | } |
70 | 81 | ||
71 | } | 82 | } |
72 | 83 | ||
73 | AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : | 84 | AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : |
74 | 85 | ||
75 | MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ), | 86 | MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ), |
76 | audioSliderBeingMoved( false ) | 87 | audioSliderBeingMoved( false ) |
77 | { | 88 | { |
78 | Button defaultButton; | 89 | for ( uint i = 0; i < buttonCount; ++i ) { |
79 | 90 | Button button; | |
80 | Button toggleButton = defaultButton; | 91 | button.buttonType = skinInfo[ i ].buttonType; |
81 | toggleButton.buttonType = ToggleButton; | 92 | buttons.push_back( button ); |
82 | 93 | } | |
83 | buttons.reserve( 10 ); | ||
84 | buttons.push_back( toggleButton ); // play | ||
85 | buttons.push_back( defaultButton ); // stop | ||
86 | buttons.push_back( defaultButton ); // next | ||
87 | buttons.push_back( defaultButton ); // previous | ||
88 | buttons.push_back( defaultButton ); // volume up | ||
89 | buttons.push_back( defaultButton ); // volume down | ||
90 | buttons.push_back( toggleButton ); // repeat/loop | ||
91 | buttons.push_back( defaultButton ); // playlist | ||
92 | buttons.push_back( defaultButton ); // forward | ||
93 | buttons.push_back( defaultButton ); // back | ||
94 | 94 | ||
95 | setCaption( tr("OpiePlayer") ); | 95 | setCaption( tr("OpiePlayer") ); |
96 | 96 | ||
97 | Config cfg("OpiePlayer"); | 97 | Config cfg("OpiePlayer"); |
98 | cfg.setGroup("Options"); | 98 | cfg.setGroup("Options"); |
99 | skin = cfg.readEntry("Skin","default"); | 99 | skin = cfg.readEntry("Skin","default"); |
100 | //skin = "scaleTest"; | 100 | //skin = "scaleTest"; |
101 | // color of background, frame, degree of transparency | 101 | // color of background, frame, degree of transparency |
102 | 102 | ||
103 | QString skinPath = "opieplayer2/skins/" + skin; | 103 | QString skinPath = "opieplayer2/skins/" + skin; |
104 | pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 104 | pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
105 | imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); | 105 | imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); |
106 | imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); | 106 | imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); |
107 | 107 | ||
108 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); | 108 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); |
109 | buttonMask.fill( 0 ); | 109 | buttonMask.fill( 0 ); |
110 | 110 | ||
111 | masks.reserve( 10 ); | 111 | masks.reserve( buttonCount ); |
112 | 112 | ||
113 | for ( uint i = 0; i < masks.capacity(); i++ ) { | 113 | for ( uint i = 0; i < masks.capacity(); i++ ) { |
114 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png" ); | 114 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" ); |
115 | masks.push_back( QBitmap( filename ) ); | 115 | masks.push_back( QBitmap( filename ) ); |
116 | 116 | ||
117 | if ( !masks[i].isNull() ) { | 117 | if ( !masks[i].isNull() ) { |
118 | QImage imgMask = masks[i].convertToImage(); | 118 | QImage imgMask = masks[i].convertToImage(); |
119 | uchar **dest = buttonMask.jumpTable(); | 119 | uchar **dest = buttonMask.jumpTable(); |
120 | for ( int y = 0; y < imgUp.height(); y++ ) { | 120 | for ( int y = 0; y < imgUp.height(); y++ ) { |
121 | uchar *line = dest[y]; | 121 | uchar *line = dest[y]; |
122 | for ( int x = 0; x < imgUp.width(); x++ ) | 122 | for ( int x = 0; x < imgUp.width(); x++ ) |
123 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 123 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
124 | line[x] = i + 1; | 124 | line[x] = i + 1; |
125 | } | 125 | } |
126 | } | 126 | } |
127 | 127 | ||
128 | } | 128 | } |
129 | 129 | ||
130 | buttonPixUp.resize( masks.size(), QPixmap() ); | 130 | buttonPixUp.resize( masks.size(), QPixmap() ); |
131 | buttonPixDown.resize( masks.size(), QPixmap() ); | 131 | buttonPixDown.resize( masks.size(), QPixmap() ); |
132 | 132 | ||
133 | setBackgroundPixmap( pixBg ); | 133 | setBackgroundPixmap( pixBg ); |
134 | 134 | ||
135 | songInfo.setFocusPolicy( QWidget::NoFocus ); | 135 | songInfo.setFocusPolicy( QWidget::NoFocus ); |
136 | // changeTextColor( &songInfo ); | 136 | // changeTextColor( &songInfo ); |
137 | // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); | 137 | // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); |
138 | // songInfo.setFrameStyle( QFrame::NoFrame); | 138 | // songInfo.setFrameStyle( QFrame::NoFrame); |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index aa8891f..e0f2cf1 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -26,48 +26,55 @@ | |||
26 | #include <qwidget.h> | 26 | #include <qwidget.h> |
27 | 27 | ||
28 | #include "mediaplayerstate.h" | 28 | #include "mediaplayerstate.h" |
29 | #include "playlistwidget.h" | 29 | #include "playlistwidget.h" |
30 | 30 | ||
31 | #include <vector> | 31 | #include <vector> |
32 | 32 | ||
33 | class MediaWidget : public QWidget | 33 | class MediaWidget : public QWidget |
34 | { | 34 | { |
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | public: | 36 | public: |
37 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back }; | 37 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back }; |
38 | enum ButtonType { NormalButton, ToggleButton }; | 38 | enum ButtonType { NormalButton, ToggleButton }; |
39 | 39 | ||
40 | struct Button | 40 | struct Button |
41 | { | 41 | { |
42 | Button() : buttonType( NormalButton ), isHeld( false ), isDown( false ) {} | 42 | Button() : buttonType( NormalButton ), isHeld( false ), isDown( false ) {} |
43 | 43 | ||
44 | ButtonType buttonType : 1; | 44 | ButtonType buttonType : 1; |
45 | bool isHeld : 1; | 45 | bool isHeld : 1; |
46 | bool isDown : 1; | 46 | bool isDown : 1; |
47 | }; | 47 | }; |
48 | typedef std::vector<Button> ButtonVector; | 48 | typedef std::vector<Button> ButtonVector; |
49 | 49 | ||
50 | struct SkinButtonInfo | ||
51 | { | ||
52 | Command command; | ||
53 | const char *fileName; | ||
54 | ButtonType buttonType; | ||
55 | }; | ||
56 | |||
50 | MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); | 57 | MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); |
51 | virtual ~MediaWidget(); | 58 | virtual ~MediaWidget(); |
52 | 59 | ||
53 | public slots: | 60 | public slots: |
54 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; | 61 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; |
55 | virtual void setLength( long length ) = 0; | 62 | virtual void setLength( long length ) = 0; |
56 | virtual void setPlaying( bool playing ) = 0; | 63 | virtual void setPlaying( bool playing ) = 0; |
57 | 64 | ||
58 | signals: | 65 | signals: |
59 | void moreReleased(); | 66 | void moreReleased(); |
60 | void lessReleased(); | 67 | void lessReleased(); |
61 | void forwardReleased(); | 68 | void forwardReleased(); |
62 | void backReleased(); | 69 | void backReleased(); |
63 | 70 | ||
64 | protected: | 71 | protected: |
65 | virtual void closeEvent( QCloseEvent * ); | 72 | virtual void closeEvent( QCloseEvent * ); |
66 | 73 | ||
67 | void handleCommand( Command command, bool buttonDown ); | 74 | void handleCommand( Command command, bool buttonDown ); |
68 | 75 | ||
69 | bool isOverButton( const QPoint &position, int buttonId ) const; | 76 | bool isOverButton( const QPoint &position, int buttonId ) const; |
70 | 77 | ||
71 | void paintButton( int buttonId ); | 78 | void paintButton( int buttonId ); |
72 | virtual void paintButton( QPainter &p, int i ) = 0; | 79 | virtual void paintButton( QPainter &p, int i ) = 0; |
73 | 80 | ||