-rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 13 | ||||
-rw-r--r-- | core/multimedia/opieplayer/videowidget.cpp | 26 |
2 files changed, 28 insertions, 11 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index b187cb4..44fbe48 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp | |||
@@ -121,7 +121,17 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
121 | buttonPixDown[i] = NULL; | 121 | buttonPixDown[i] = NULL; |
122 | } | 122 | } |
123 | 123 | ||
124 | setBackgroundPixmap( *pixBg ); | 124 | QWidget *d = QApplication::desktop(); |
125 | int width = d->width(); | ||
126 | int height = d->height(); | ||
127 | |||
128 | if( (width != pixBg->width() ) || (height != pixBg->height() ) ) { | ||
129 | // qDebug("<<<<<<<< scale image >>>>>>>>>>>>"); | ||
130 | QImage img; | ||
131 | img = pixBg->convertToImage(); | ||
132 | pixBg->convertFromImage( img.smoothScale( width, height)); | ||
133 | } | ||
134 | setBackgroundPixmap( *pixBg); | ||
125 | 135 | ||
126 | songInfo.setFocusPolicy( QWidget::NoFocus ); | 136 | songInfo.setFocusPolicy( QWidget::NoFocus ); |
127 | 137 | ||
@@ -136,6 +146,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
136 | slider.setMinValue( 0 ); | 146 | slider.setMinValue( 0 ); |
137 | slider.setMaxValue( 1 ); | 147 | slider.setMaxValue( 1 ); |
138 | slider.setFocusPolicy( QWidget::NoFocus ); | 148 | slider.setFocusPolicy( QWidget::NoFocus ); |
149 | |||
139 | slider.setBackgroundPixmap( *pixBg ); | 150 | slider.setBackgroundPixmap( *pixBg ); |
140 | 151 | ||
141 | time.setFocusPolicy( QWidget::NoFocus ); | 152 | time.setFocusPolicy( QWidget::NoFocus ); |
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp index 02c8568..d9a9478 100644 --- a/core/multimedia/opieplayer/videowidget.cpp +++ b/core/multimedia/opieplayer/videowidget.cpp | |||
@@ -97,22 +97,18 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
97 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); | 97 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); |
98 | imgButtonMask->fill( 0 ); | 98 | imgButtonMask->fill( 0 ); |
99 | 99 | ||
100 | for ( int i = 0; i < 7; i++ ) | 100 | for ( int i = 0; i < 7; i++ ) { |
101 | { | ||
102 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + | 101 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + |
103 | "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); | 102 | "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); |
104 | // qDebug("loading "+filename); | 103 | // qDebug("loading "+filename); |
105 | masks[i] = new QBitmap( filename ); | 104 | masks[i] = new QBitmap( filename ); |
106 | 105 | ||
107 | if ( !masks[i]->isNull() ) | 106 | if ( !masks[i]->isNull() ) { |
108 | { | ||
109 | QImage imgMask = masks[i]->convertToImage(); | 107 | QImage imgMask = masks[i]->convertToImage(); |
110 | uchar **dest = imgButtonMask->jumpTable(); | 108 | uchar **dest = imgButtonMask->jumpTable(); |
111 | for ( int y = 0; y < imgUp->height(); y++ ) | 109 | for ( int y = 0; y < imgUp->height(); y++ ) { |
112 | { | ||
113 | uchar *line = dest[y]; | 110 | uchar *line = dest[y]; |
114 | for ( int x = 0; x < imgUp->width(); x++ ) | 111 | for ( int x = 0; x < imgUp->width(); x++ ) { |
115 | { | ||
116 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 112 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
117 | line[x] = i + 1; | 113 | line[x] = i + 1; |
118 | } | 114 | } |
@@ -120,12 +116,22 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
120 | } | 116 | } |
121 | } | 117 | } |
122 | // qDebug("finished loading first pics"); | 118 | // qDebug("finished loading first pics"); |
123 | for ( int i = 0; i < 7; i++ ) | 119 | for ( int i = 0; i < 7; i++ ) { |
124 | { | ||
125 | buttonPixUp[i] = NULL; | 120 | buttonPixUp[i] = NULL; |
126 | buttonPixDown[i] = NULL; | 121 | buttonPixDown[i] = NULL; |
127 | } | 122 | } |
128 | 123 | ||
124 | |||
125 | QWidget *d = QApplication::desktop(); | ||
126 | int width = d->width(); | ||
127 | int height = d->height(); | ||
128 | |||
129 | if( (width != pixBg->width() ) || (height != pixBg->height() ) ) { | ||
130 | // qDebug("<<<<<<<< scale image >>>>>>>>>>>>"); | ||
131 | QImage img; | ||
132 | img = pixBg->convertToImage(); | ||
133 | pixBg->convertFromImage( img.smoothScale( width, height)); | ||
134 | } | ||
129 | setBackgroundPixmap( *pixBg ); | 135 | setBackgroundPixmap( *pixBg ); |
130 | 136 | ||
131 | currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 ); | 137 | currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 ); |