Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 60a3563..5b53568 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -22,24 +22,25 @@ | |||
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <qpe/qpeapplication.h> | ||
34 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
35 | #include <qpe/mediaplayerplugininterface.h> | 36 | #include <qpe/mediaplayerplugininterface.h> |
36 | #include <qpe/config.h> | 37 | #include <qpe/config.h> |
37 | 38 | ||
38 | 39 | ||
39 | #include <qwidget.h> | 40 | #include <qwidget.h> |
40 | #include <qpainter.h> | 41 | #include <qpainter.h> |
41 | #include <qpixmap.h> | 42 | #include <qpixmap.h> |
42 | #include <qslider.h> | 43 | #include <qslider.h> |
43 | #include <qdrawutil.h> | 44 | #include <qdrawutil.h> |
44 | #include "videowidget.h" | 45 | #include "videowidget.h" |
45 | #include "mediaplayerstate.h" | 46 | #include "mediaplayerstate.h" |
@@ -95,25 +96,25 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | |||
95 | cfg.setGroup("Options"); | 96 | cfg.setGroup("Options"); |
96 | skin = cfg.readEntry("Skin","default"); | 97 | skin = cfg.readEntry("Skin","default"); |
97 | 98 | ||
98 | QString skinPath = "opieplayer2/skins/" + skin; | 99 | QString skinPath = "opieplayer2/skins/" + skin; |
99 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 100 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
100 | imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); | 101 | imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); |
101 | imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); | 102 | imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); |
102 | 103 | ||
103 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); | 104 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); |
104 | imgButtonMask->fill( 0 ); | 105 | imgButtonMask->fill( 0 ); |
105 | 106 | ||
106 | for ( int i = 0; i < 7; i++ ) { | 107 | for ( int i = 0; i < 7; i++ ) { |
107 | QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png"; | 108 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); |
108 | masks[i] = new QBitmap( filename ); | 109 | masks[i] = new QBitmap( filename ); |
109 | 110 | ||
110 | if ( !masks[i]->isNull() ) { | 111 | if ( !masks[i]->isNull() ) { |
111 | QImage imgMask = masks[i]->convertToImage(); | 112 | QImage imgMask = masks[i]->convertToImage(); |
112 | uchar **dest = imgButtonMask->jumpTable(); | 113 | uchar **dest = imgButtonMask->jumpTable(); |
113 | for ( int y = 0; y < imgUp->height(); y++ ) { | 114 | for ( int y = 0; y < imgUp->height(); y++ ) { |
114 | uchar *line = dest[y]; | 115 | uchar *line = dest[y]; |
115 | for ( int x = 0; x < imgUp->width(); x++ ) { | 116 | for ( int x = 0; x < imgUp->width(); x++ ) { |
116 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 117 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
117 | line[x] = i + 1; | 118 | line[x] = i + 1; |
118 | } | 119 | } |
119 | } | 120 | } |
@@ -173,26 +174,26 @@ QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | |||
173 | return new QPixmap( pix ); | 174 | return new QPixmap( pix ); |
174 | } | 175 | } |
175 | 176 | ||
176 | QPixmap *maskVPixToMask( QPixmap pix, QBitmap mask ) { | 177 | QPixmap *maskVPixToMask( QPixmap pix, QBitmap mask ) { |
177 | QPixmap *pixmap = new QPixmap( pix ); | 178 | QPixmap *pixmap = new QPixmap( pix ); |
178 | pixmap->setMask( mask ); | 179 | pixmap->setMask( mask ); |
179 | return pixmap; | 180 | return pixmap; |
180 | } | 181 | } |
181 | 182 | ||
182 | void VideoWidget::resizeEvent( QResizeEvent * ) { | 183 | void VideoWidget::resizeEvent( QResizeEvent * ) { |
183 | int h = height(); | 184 | int h = height(); |
184 | int w = width(); | 185 | int w = width(); |
185 | int Vh = 160; | 186 | //int Vh = 160; |
186 | int Vw = 220; | 187 | //int Vw = 220; |
187 | 188 | ||
188 | slider->setFixedWidth( w - 20 ); | 189 | slider->setFixedWidth( w - 20 ); |
189 | slider->setGeometry( QRect( 15, h - 30, w - 90, 20 ) ); | 190 | slider->setGeometry( QRect( 15, h - 30, w - 90, 20 ) ); |
190 | slider->setBackgroundOrigin( QWidget::ParentOrigin ); | 191 | slider->setBackgroundOrigin( QWidget::ParentOrigin ); |
191 | slider->setFocusPolicy( QWidget::NoFocus ); | 192 | slider->setFocusPolicy( QWidget::NoFocus ); |
192 | slider->setBackgroundPixmap( *pixBg ); | 193 | slider->setBackgroundPixmap( *pixBg ); |
193 | 194 | ||
194 | xoff = 0;// ( imgUp->width() ) / 2; | 195 | xoff = 0;// ( imgUp->width() ) / 2; |
195 | yoff = 185;//(( Vh - imgUp->height() ) / 2) - 10; | 196 | yoff = 185;//(( Vh - imgUp->height() ) / 2) - 10; |
196 | QPoint p( xoff, yoff ); | 197 | QPoint p( xoff, yoff ); |
197 | 198 | ||
198 | QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p ); | 199 | QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p ); |