Diffstat (limited to 'core/multimedia/opieplayer/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index 896da91..d20d560 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp | |||
@@ -48,7 +48,6 @@ struct MediaButton { | |||
48 | MediaButton audioButtons[] = { | 48 | MediaButton audioButtons[] = { |
49 | { TRUE, FALSE, FALSE }, // play | 49 | { TRUE, FALSE, FALSE }, // play |
50 | { FALSE, FALSE, FALSE }, // stop | 50 | { FALSE, FALSE, FALSE }, // stop |
51 | { TRUE, FALSE, FALSE }, // pause | ||
52 | { FALSE, FALSE, FALSE }, // next | 51 | { FALSE, FALSE, FALSE }, // next |
53 | { FALSE, FALSE, FALSE }, // previous | 52 | { FALSE, FALSE, FALSE }, // previous |
54 | { FALSE, FALSE, FALSE }, // volume up | 53 | { FALSE, FALSE, FALSE }, // volume up |
@@ -56,15 +55,14 @@ MediaButton audioButtons[] = { | |||
56 | { TRUE, FALSE, FALSE }, // repeat/loop | 55 | { TRUE, FALSE, FALSE }, // repeat/loop |
57 | { FALSE, FALSE, FALSE }, // playlist | 56 | { FALSE, FALSE, FALSE }, // playlist |
58 | { FALSE, FALSE, FALSE }, // forward | 57 | { FALSE, FALSE, FALSE }, // forward |
59 | { FALSE, FALSE, FALSE } // back | 58 | { FALSE, FALSE, FALSE } // back |
60 | }; | 59 | }; |
61 | 60 | ||
62 | const char *skin_mask_file_names[11] = { | 61 | const char *skin_mask_file_names[10] = { |
63 | "play", "stop", "pause", "next", "prev", "up", | 62 | "play", "stop", "next", "prev", "up", |
64 | "down", "loop", "playlist", "forward", "back" | 63 | "down", "loop", "playlist", "forward", "back" |
65 | }; | 64 | }; |
66 | 65 | ||
67 | |||
68 | static void changeTextColor( QWidget *w ) { | 66 | static void changeTextColor( QWidget *w ) { |
69 | QPalette p = w->palette(); | 67 | QPalette p = w->palette(); |
70 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); | 68 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); |
@@ -81,12 +79,14 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
81 | qDebug("<<<<<audioWidget"); | 79 | qDebug("<<<<<audioWidget"); |
82 | 80 | ||
83 | Config cfg("OpiePlayer"); | 81 | Config cfg("OpiePlayer"); |
84 | cfg.setGroup("AudioWidget"); | 82 | cfg.setGroup("Options"); |
85 | skin = cfg.readEntry("Skin","default"); | 83 | skin = cfg.readEntry("Skin","default"); |
86 | //skin = "scaleTest"; | 84 | //skin = "scaleTest"; |
87 | // color of background, frame, degree of transparency | 85 | // color of background, frame, degree of transparency |
88 | 86 | ||
89 | QString skinPath = "opieplayer2/skins/" + skin; | 87 | QString skinPath = "opieplayer2/skins/" + skin; |
88 | qDebug("skin path "+skinPath); | ||
89 | |||
90 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 90 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
91 | imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); | 91 | imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); |
92 | imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); | 92 | imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); |
@@ -94,7 +94,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
94 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); | 94 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); |
95 | imgButtonMask->fill( 0 ); | 95 | imgButtonMask->fill( 0 ); |
96 | 96 | ||
97 | for ( int i = 0; i < 11; i++ ) { | 97 | for ( int i = 0; i < 10; i++ ) { |
98 | QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png"; | 98 | QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png"; |
99 | masks[i] = new QBitmap( filename ); | 99 | masks[i] = new QBitmap( filename ); |
100 | 100 | ||
@@ -161,7 +161,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
161 | 161 | ||
162 | AudioWidget::~AudioWidget() { | 162 | AudioWidget::~AudioWidget() { |
163 | 163 | ||
164 | for ( int i = 0; i < 11; i++ ) { | 164 | for ( int i = 0; i < 10; i++ ) { |
165 | delete buttonPixUp[i]; | 165 | delete buttonPixUp[i]; |
166 | delete buttonPixDown[i]; | 166 | delete buttonPixDown[i]; |
167 | } | 167 | } |
@@ -169,7 +169,7 @@ AudioWidget::~AudioWidget() { | |||
169 | delete imgUp; | 169 | delete imgUp; |
170 | delete imgDn; | 170 | delete imgDn; |
171 | delete imgButtonMask; | 171 | delete imgButtonMask; |
172 | for ( int i = 0; i < 11; i++ ) { | 172 | for ( int i = 0; i < 10; i++ ) { |
173 | delete masks[i]; | 173 | delete masks[i]; |
174 | } | 174 | } |
175 | } | 175 | } |
@@ -210,7 +210,7 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { | |||
210 | QPixmap *pixUp = combineImageWithBackground( *imgUp, *pixBg, p ); | 210 | QPixmap *pixUp = combineImageWithBackground( *imgUp, *pixBg, p ); |
211 | QPixmap *pixDn = combineImageWithBackground( *imgDn, *pixBg, p ); | 211 | QPixmap *pixDn = combineImageWithBackground( *imgDn, *pixBg, p ); |
212 | 212 | ||
213 | for ( int i = 0; i < 11; i++ ) { | 213 | for ( int i = 0; i < 10; i++ ) { |
214 | if ( !masks[i]->isNull() ) { | 214 | if ( !masks[i]->isNull() ) { |
215 | delete buttonPixUp[i]; | 215 | delete buttonPixUp[i]; |
216 | delete buttonPixDown[i]; | 216 | delete buttonPixDown[i]; |