author | llornkcor <llornkcor> | 2002-09-19 00:43:06 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-09-19 00:43:06 (UTC) |
commit | ac90402cf450e0da9c2600e5ccff185c47075f84 (patch) (unidiff) | |
tree | 57c1212e8ffb1d2df8ee782b08d655c4a6998b46 | |
parent | dd4b256d39e7a438a7d688471d257dd10a75d138 (diff) | |
download | opie-ac90402cf450e0da9c2600e5ccff185c47075f84.zip opie-ac90402cf450e0da9c2600e5ccff185c47075f84.tar.gz opie-ac90402cf450e0da9c2600e5ccff185c47075f84.tar.bz2 |
tweaked gui placement better for landscape
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 7c49733..45f301e 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -28,33 +28,33 @@ | |||
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/qpeapplication.h> |
35 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
36 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
37 | 37 | ||
38 | #include <qwidget.h> | 38 | #include <qwidget.h> |
39 | #include <qpixmap.h> | 39 | #include <qpixmap.h> |
40 | #include <qbutton.h> | 40 | #include <qbutton.h> |
41 | #include <qpainter.h> | 41 | #include <qpainter.h> |
42 | #include <qframe.h> | 42 | #include <qframe.h> |
43 | #include <qlayout.h> | 43 | #include <qlayout.h> |
44 | 44 | #include <qdir.h> | |
45 | #include <stdlib.h> | 45 | #include <stdlib.h> |
46 | #include <stdio.h> | 46 | #include <stdio.h> |
47 | 47 | ||
48 | #include "audiowidget.h" | 48 | #include "audiowidget.h" |
49 | #include "mediaplayerstate.h" | 49 | #include "mediaplayerstate.h" |
50 | #include "playlistwidget.h" | 50 | #include "playlistwidget.h" |
51 | 51 | ||
52 | extern MediaPlayerState *mediaPlayerState; | 52 | extern MediaPlayerState *mediaPlayerState; |
53 | extern PlayListWidget *playList; | 53 | extern PlayListWidget *playList; |
54 | 54 | ||
55 | static const int xo = -2; // movable x offset | 55 | static const int xo = -2; // movable x offset |
56 | static const int yo = 22; // movable y offset | 56 | static const int yo = 22; // movable y offset |
57 | 57 | ||
58 | 58 | ||
59 | Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) { | 59 | Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) { |
60 | setFrameStyle( WinPanel | Sunken ); | 60 | setFrameStyle( WinPanel | Sunken ); |
@@ -240,35 +240,35 @@ QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | |||
240 | return new QPixmap( pix ); | 240 | return new QPixmap( pix ); |
241 | } | 241 | } |
242 | 242 | ||
243 | 243 | ||
244 | QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) { | 244 | QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) { |
245 | QPixmap *pixmap = new QPixmap( pix ); | 245 | QPixmap *pixmap = new QPixmap( pix ); |
246 | pixmap->setMask( mask ); | 246 | pixmap->setMask( mask ); |
247 | return pixmap; | 247 | return pixmap; |
248 | } | 248 | } |
249 | 249 | ||
250 | }; | 250 | }; |
251 | 251 | ||
252 | void AudioWidget::resizeEvent( QResizeEvent * ) { | 252 | void AudioWidget::resizeEvent( QResizeEvent * ) { |
253 | int h = height(); | 253 | int h = height(); |
254 | int w = width(); | 254 | int w = width(); |
255 | 255 | ||
256 | songInfo.setGeometry( QRect( 2, 10, w - 4, 20 ) ); | 256 | songInfo.setGeometry( QRect( 2, 2, w - 4, 20 ) ); |
257 | slider.setFixedWidth( w - 110 ); | 257 | slider.setFixedWidth( w - 110 ); |
258 | slider.setGeometry( QRect( 15, h - 30, w - 90, 20 ) ); | 258 | slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); |
259 | slider.setBackgroundOrigin( QWidget::ParentOrigin ); | 259 | slider.setBackgroundOrigin( QWidget::ParentOrigin ); |
260 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); | 260 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); |
261 | 261 | ||
262 | xoff = ( w - imgUp->width() ) / 2; | 262 | xoff = ( w - imgUp->width() ) / 2; |
263 | yoff = (( h - imgUp->height() ) / 2) - 10; | 263 | yoff = (( h - imgUp->height() ) / 2) - 10; |
264 | QPoint p( xoff, yoff ); | 264 | QPoint p( xoff, yoff ); |
265 | 265 | ||
266 | QPixmap *pixUp = combineImageWithBackground( *imgUp, *pixBg, p ); | 266 | QPixmap *pixUp = combineImageWithBackground( *imgUp, *pixBg, p ); |
267 | QPixmap *pixDn = combineImageWithBackground( *imgDn, *pixBg, p ); | 267 | QPixmap *pixDn = combineImageWithBackground( *imgDn, *pixBg, p ); |
268 | 268 | ||
269 | for ( int i = 0; i < 10; i++ ) { | 269 | for ( int i = 0; i < 10; i++ ) { |
270 | if ( !masks[i]->isNull() ) { | 270 | if ( !masks[i]->isNull() ) { |
271 | delete buttonPixUp[i]; | 271 | delete buttonPixUp[i]; |
272 | delete buttonPixDown[i]; | 272 | delete buttonPixDown[i]; |
273 | buttonPixUp[i] = maskPixToMask( *pixUp, *masks[i] ); | 273 | buttonPixUp[i] = maskPixToMask( *pixUp, *masks[i] ); |
274 | buttonPixDown[i] = maskPixToMask( *pixDn, *masks[i] ); | 274 | buttonPixDown[i] = maskPixToMask( *pixDn, *masks[i] ); |