Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 12 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 14 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 |
5 files changed, 15 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 5cc2814..553c56b 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -95,7 +95,7 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
95 | // color of background, frame, degree of transparency | 95 | // color of background, frame, degree of transparency |
96 | 96 | ||
97 | QString skinPath = "opieplayer2/skins/" + skin; | 97 | QString skinPath = "opieplayer2/skins/" + skin; |
98 | pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 98 | backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
99 | imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); | 99 | imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); |
100 | imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); | 100 | imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); |
101 | 101 | ||
@@ -123,7 +123,7 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
123 | buttons.insert( i, button ); | 123 | buttons.insert( i, button ); |
124 | } | 124 | } |
125 | 125 | ||
126 | setBackgroundPixmap( pixBg ); | 126 | setBackgroundPixmap( backgroundPixmap ); |
127 | 127 | ||
128 | songInfo.setFocusPolicy( QWidget::NoFocus ); | 128 | songInfo.setFocusPolicy( QWidget::NoFocus ); |
129 | // changeTextColor( &songInfo ); | 129 | // changeTextColor( &songInfo ); |
@@ -136,7 +136,7 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
136 | slider.setMinValue( 0 ); | 136 | slider.setMinValue( 0 ); |
137 | slider.setMaxValue( 1 ); | 137 | slider.setMaxValue( 1 ); |
138 | slider.setFocusPolicy( QWidget::NoFocus ); | 138 | slider.setFocusPolicy( QWidget::NoFocus ); |
139 | slider.setBackgroundPixmap( pixBg ); | 139 | slider.setBackgroundPixmap( backgroundPixmap ); |
140 | 140 | ||
141 | // Config cofg("qpe"); | 141 | // Config cofg("qpe"); |
142 | // cofg.setGroup("Appearance"); | 142 | // cofg.setGroup("Appearance"); |
@@ -205,8 +205,8 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { | |||
205 | upperLeftOfButtonMask.ry() = (( h - imgUp.height() ) / 2) - 10; | 205 | upperLeftOfButtonMask.ry() = (( h - imgUp.height() ) / 2) - 10; |
206 | QPoint p = upperLeftOfButtonMask; | 206 | QPoint p = upperLeftOfButtonMask; |
207 | 207 | ||
208 | QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p ); | 208 | QPixmap pixUp = combineImageWithBackground( imgUp, backgroundPixmap, p ); |
209 | QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p ); | 209 | QPixmap pixDn = combineImageWithBackground( imgDn, backgroundPixmap, p ); |
210 | 210 | ||
211 | for ( uint i = 0; i < buttons.count(); i++ ) { | 211 | for ( uint i = 0; i < buttons.count(); i++ ) { |
212 | if ( !buttons[i].mask.isNull() ) { | 212 | if ( !buttons[i].mask.isNull() ) { |
@@ -404,7 +404,7 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) { | |||
404 | QPixmap pix( pe->rect().size() ); | 404 | QPixmap pix( pe->rect().size() ); |
405 | QPainter p( &pix ); | 405 | QPainter p( &pix ); |
406 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); | 406 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); |
407 | p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); | 407 | p.drawTiledPixmap( pe->rect(), backgroundPixmap, pe->rect().topLeft() ); |
408 | for ( unsigned int i = 0; i < buttons.count(); i++ ) | 408 | for ( unsigned int i = 0; i < buttons.count(); i++ ) |
409 | paintButton( p, buttons[ i ] ); | 409 | paintButton( p, buttons[ i ] ); |
410 | QPainter p2( this ); | 410 | QPainter p2( this ); |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 7a775cd..69837cd 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -94,7 +94,6 @@ private: | |||
94 | void setToggleButton( int, bool ); | 94 | void setToggleButton( int, bool ); |
95 | int skipDirection; | 95 | int skipDirection; |
96 | QString skin; | 96 | QString skin; |
97 | QPixmap pixBg; | ||
98 | QImage imgUp; | 97 | QImage imgUp; |
99 | QImage imgDn; | 98 | QImage imgDn; |
100 | 99 | ||
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 163f449..211e56c 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -98,6 +98,8 @@ protected: | |||
98 | QImage buttonMask; | 98 | QImage buttonMask; |
99 | 99 | ||
100 | QPoint upperLeftOfButtonMask; | 100 | QPoint upperLeftOfButtonMask; |
101 | |||
102 | QPixmap backgroundPixmap; | ||
101 | }; | 103 | }; |
102 | 104 | ||
103 | #endif // MEDIAWIDGET_H | 105 | #endif // MEDIAWIDGET_H |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index a483434..a8bf252 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -92,7 +92,7 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
92 | skin = cfg.readEntry("Skin","default"); | 92 | skin = cfg.readEntry("Skin","default"); |
93 | 93 | ||
94 | QString skinPath = "opieplayer2/skins/" + skin; | 94 | QString skinPath = "opieplayer2/skins/" + skin; |
95 | pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 95 | backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
96 | imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); | 96 | imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); |
97 | imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); | 97 | imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); |
98 | 98 | ||
@@ -118,7 +118,7 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | setBackgroundPixmap( pixBg ); | 121 | setBackgroundPixmap( backgroundPixmap ); |
122 | 122 | ||
123 | slider = new QSlider( Qt::Horizontal, this ); | 123 | slider = new QSlider( Qt::Horizontal, this ); |
124 | slider->setMinValue( 0 ); | 124 | slider->setMinValue( 0 ); |
@@ -163,7 +163,7 @@ void VideoWidget::resizeEvent( QResizeEvent * ) { | |||
163 | slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); | 163 | slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); |
164 | slider->setBackgroundOrigin( QWidget::ParentOrigin ); | 164 | slider->setBackgroundOrigin( QWidget::ParentOrigin ); |
165 | slider->setFocusPolicy( QWidget::NoFocus ); | 165 | slider->setFocusPolicy( QWidget::NoFocus ); |
166 | slider->setBackgroundPixmap( pixBg ); | 166 | slider->setBackgroundPixmap( backgroundPixmap ); |
167 | 167 | ||
168 | upperLeftOfButtonMask.rx() = 0;// ( imgUp->width() ) / 2; | 168 | upperLeftOfButtonMask.rx() = 0;// ( imgUp->width() ) / 2; |
169 | if(w>h) | 169 | if(w>h) |
@@ -172,8 +172,8 @@ void VideoWidget::resizeEvent( QResizeEvent * ) { | |||
172 | upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; | 172 | upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; |
173 | QPoint p = upperLeftOfButtonMask; | 173 | QPoint p = upperLeftOfButtonMask; |
174 | 174 | ||
175 | QPixmap *pixUp = combineVImageWithBackground( imgUp, pixBg, p ); | 175 | QPixmap *pixUp = combineVImageWithBackground( imgUp, backgroundPixmap, p ); |
176 | QPixmap *pixDn = combineVImageWithBackground( imgDn, pixBg, p ); | 176 | QPixmap *pixDn = combineVImageWithBackground( imgDn, backgroundPixmap, p ); |
177 | 177 | ||
178 | for ( int i = 0; i < 7; i++ ) { | 178 | for ( int i = 0; i < 7; i++ ) { |
179 | Button &button = buttons[ i ]; | 179 | Button &button = buttons[ i ]; |
@@ -345,7 +345,7 @@ void VideoWidget::makeVisible() { | |||
345 | } else { | 345 | } else { |
346 | showNormal(); | 346 | showNormal(); |
347 | showMaximized(); | 347 | showMaximized(); |
348 | setBackgroundPixmap( pixBg ); | 348 | setBackgroundPixmap( backgroundPixmap ); |
349 | QWidget *d = QApplication::desktop(); | 349 | QWidget *d = QApplication::desktop(); |
350 | int w = d->width(); | 350 | int w = d->width(); |
351 | int h = d->height(); | 351 | int h = d->height(); |
@@ -390,7 +390,7 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { | |||
390 | QPixmap pix( pe->rect().size() ); | 390 | QPixmap pix( pe->rect().size() ); |
391 | QPainter p( &pix ); | 391 | QPainter p( &pix ); |
392 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); | 392 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); |
393 | p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); | 393 | p.drawTiledPixmap( pe->rect(), backgroundPixmap, pe->rect().topLeft() ); |
394 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { | 394 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { |
395 | paintButton( p, buttons[ i ] ); | 395 | paintButton( p, buttons[ i ] ); |
396 | } | 396 | } |
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index a271120..9d5239b 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -97,7 +97,6 @@ protected: | |||
97 | 97 | ||
98 | private: | 98 | private: |
99 | // Ticker songInfo; | 99 | // Ticker songInfo; |
100 | QPixmap pixBg; | ||
101 | QImage imgUp; | 100 | QImage imgUp; |
102 | QImage imgDn; | 101 | QImage imgDn; |
103 | QString skin; | 102 | QString skin; |