summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiowidget.cpp11
-rw-r--r--core/multimedia/opieplayer/videowidget.cpp26
2 files changed, 27 insertions, 10 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
@@ -112,39 +112,50 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
112 if ( !qRed( imgMask.pixel( x, y ) ) ) 112 if ( !qRed( imgMask.pixel( x, y ) ) )
113 line[x] = i + 1; 113 line[x] = i + 1;
114 } 114 }
115 } 115 }
116 116
117 } 117 }
118 118
119 for ( int i = 0; i < 11; i++ ) { 119 for ( int i = 0; i < 11; i++ ) {
120 buttonPixUp[i] = NULL; 120 buttonPixUp[i] = NULL;
121 buttonPixDown[i] = NULL; 121 buttonPixDown[i] = NULL;
122 } 122 }
123 123
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 }
124 setBackgroundPixmap( *pixBg ); 134 setBackgroundPixmap( *pixBg );
125 135
126 songInfo.setFocusPolicy( QWidget::NoFocus ); 136 songInfo.setFocusPolicy( QWidget::NoFocus );
127 137
128// changeTextColor( &songInfo ); 138// changeTextColor( &songInfo );
129// songInfo.setBackgroundColor( QColor( 167, 212, 167 )); 139// songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
130// songInfo.setFrameStyle( QFrame::NoFrame); 140// songInfo.setFrameStyle( QFrame::NoFrame);
131// songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); 141// songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
132 //NoFrame 142 //NoFrame
133// songInfo.setForegroundColor(Qt::white); 143// songInfo.setForegroundColor(Qt::white);
134 144
135 slider.setFixedHeight( 20 ); 145 slider.setFixedHeight( 20 );
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 );
142 time.setAlignment( Qt::AlignCenter ); 153 time.setAlignment( Qt::AlignCenter );
143 time.setFrame(FALSE); 154 time.setFrame(FALSE);
144 changeTextColor( &time ); 155 changeTextColor( &time );
145 156
146 resizeEvent( NULL ); 157 resizeEvent( NULL );
147 158
148 connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); 159 connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
149 connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); 160 connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
150 161
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
@@ -88,53 +88,59 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
88 88
89 // qDebug("skin path " + skinPath); 89 // qDebug("skin path " + skinPath);
90 90
91// QString skinPath = "opieplayer2/skins/" + skin; 91// QString skinPath = "opieplayer2/skins/" + skin;
92 92
93 pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); 93 pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
94 imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); 94 imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
95 imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); 95 imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
96 96
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 }
119 } 115 }
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 );
132 138
133 slider = new QSlider( Qt::Horizontal, this ); 139 slider = new QSlider( Qt::Horizontal, this );
134 slider->setMinValue( 0 ); 140 slider->setMinValue( 0 );
135 slider->setMaxValue( 1 ); 141 slider->setMaxValue( 1 );
136 slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); 142 slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
137 slider->setFocusPolicy( QWidget::NoFocus ); 143 slider->setFocusPolicy( QWidget::NoFocus );
138// slider->setGeometry( QRect( 7, 250, 220, 20 ) ); 144// slider->setGeometry( QRect( 7, 250, 220, 20 ) );
139 145
140 connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); 146 connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );