Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 0516089..0b7cc45 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -137,18 +137,18 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { | |||
137 | songInfo.setGeometry( QRect( 2, 2, w - 4, 20 ) ); | 137 | songInfo.setGeometry( QRect( 2, 2, w - 4, 20 ) ); |
138 | slider.setFixedWidth( w - 110 ); | 138 | slider.setFixedWidth( w - 110 ); |
139 | slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); | 139 | slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); |
140 | slider.setBackgroundOrigin( QWidget::ParentOrigin ); | 140 | slider.setBackgroundOrigin( QWidget::ParentOrigin ); |
141 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); | 141 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); |
142 | 142 | ||
143 | upperLeftOfButtonMask.rx() = ( w - imgUp.width() ) / 2; | 143 | upperLeftOfButtonMask.rx() = ( w - buttonUpImage.width() ) / 2; |
144 | upperLeftOfButtonMask.ry() = (( h - imgUp.height() ) / 2) - 10; | 144 | upperLeftOfButtonMask.ry() = (( h - buttonUpImage.height() ) / 2) - 10; |
145 | QPoint p = upperLeftOfButtonMask; | 145 | QPoint p = upperLeftOfButtonMask; |
146 | 146 | ||
147 | QPixmap pixUp = combineImageWithBackground( imgUp, backgroundPixmap, p ); | 147 | QPixmap pixUp = combineImageWithBackground( buttonUpImage, backgroundPixmap, p ); |
148 | QPixmap pixDn = combineImageWithBackground( imgDn, backgroundPixmap, p ); | 148 | QPixmap pixDn = combineImageWithBackground( buttonDownImage, backgroundPixmap, p ); |
149 | 149 | ||
150 | for ( uint i = 0; i < buttons.size(); i++ ) { | 150 | for ( uint i = 0; i < buttons.size(); i++ ) { |
151 | if ( !buttons[i].mask.isNull() ) { | 151 | if ( !buttons[i].mask.isNull() ) { |
152 | buttons[i].pixUp = maskPixToMask( pixUp, buttons[i].mask ); | 152 | buttons[i].pixUp = maskPixToMask( pixUp, buttons[i].mask ); |
153 | buttons[i].pixDown = maskPixToMask( pixDn, buttons[i].mask ); | 153 | buttons[i].pixDown = maskPixToMask( pixDn, buttons[i].mask ); |
154 | } | 154 | } |
@@ -197,16 +197,16 @@ void AudioWidget::loadSkin() | |||
197 | skin = cfg.readEntry("Skin","default"); | 197 | skin = cfg.readEntry("Skin","default"); |
198 | //skin = "scaleTest"; | 198 | //skin = "scaleTest"; |
199 | // color of background, frame, degree of transparency | 199 | // color of background, frame, degree of transparency |
200 | 200 | ||
201 | QString skinPath = "opieplayer2/skins/" + skin; | 201 | QString skinPath = "opieplayer2/skins/" + skin; |
202 | backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 202 | backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
203 | imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); | 203 | buttonUpImage = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); |
204 | imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); | 204 | buttonDownImage = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); |
205 | 205 | ||
206 | setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_", imgUp.size() ); | 206 | setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_", buttonUpImage.size() ); |
207 | 207 | ||
208 | setBackgroundPixmap( backgroundPixmap ); | 208 | setBackgroundPixmap( backgroundPixmap ); |
209 | 209 | ||
210 | songInfo.setFocusPolicy( QWidget::NoFocus ); | 210 | songInfo.setFocusPolicy( QWidget::NoFocus ); |
211 | // changeTextColor( &songInfo ); | 211 | // changeTextColor( &songInfo ); |
212 | // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); | 212 | // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); |