summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp83
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/main.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.h1
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp3
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp47
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h2
9 files changed, 87 insertions, 61 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index fd18dbb..0516089 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -88,45 +88,7 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
88{ 88{
89 setCaption( tr("OpiePlayer") ); 89 setCaption( tr("OpiePlayer") );
90 90
91 Config cfg("OpiePlayer"); 91 loadSkin();
92 cfg.setGroup("Options");
93 skin = cfg.readEntry("Skin","default");
94 //skin = "scaleTest";
95 // color of background, frame, degree of transparency
96
97 QString skinPath = "opieplayer2/skins/" + skin;
98 backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
99 imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
100 imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
101
102 setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_", imgUp.size() );
103
104 setBackgroundPixmap( backgroundPixmap );
105
106 songInfo.setFocusPolicy( QWidget::NoFocus );
107// changeTextColor( &songInfo );
108// songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
109// songInfo.setFrameStyle( QFrame::NoFrame);
110 songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
111// songInfo.setForegroundColor(Qt::white);
112
113 slider.setFixedHeight( 20 );
114 slider.setMinValue( 0 );
115 slider.setMaxValue( 1 );
116 slider.setFocusPolicy( QWidget::NoFocus );
117 slider.setBackgroundPixmap( backgroundPixmap );
118
119// Config cofg("qpe");
120// cofg.setGroup("Appearance");
121// QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) );
122
123 time.setFocusPolicy( QWidget::NoFocus );
124 time.setAlignment( Qt::AlignCenter );
125
126// time.setFrame(FALSE);
127// changeTextColor( &time );
128
129 resizeEvent( NULL );
130 92
131 connect( &mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); 93 connect( &mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
132 connect( &mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) ); 94 connect( &mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) );
@@ -142,7 +104,6 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
142 setLooping( mediaPlayerState.isFullscreen() ); 104 setLooping( mediaPlayerState.isFullscreen() );
143 // setPaused( mediaPlayerState->paused() ); 105 // setPaused( mediaPlayerState->paused() );
144 setPlaying( mediaPlayerState.isPlaying() ); 106 setPlaying( mediaPlayerState.isPlaying() );
145
146} 107}
147 108
148AudioWidget::~AudioWidget() { 109AudioWidget::~AudioWidget() {
@@ -229,6 +190,48 @@ void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
229 hide(); 190 hide();
230} 191}
231 192
193void AudioWidget::loadSkin()
194{
195 Config cfg("OpiePlayer");
196 cfg.setGroup("Options");
197 skin = cfg.readEntry("Skin","default");
198 //skin = "scaleTest";
199 // color of background, frame, degree of transparency
200
201 QString skinPath = "opieplayer2/skins/" + skin;
202 backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
203 imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
204 imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
205
206 setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_", imgUp.size() );
207
208 setBackgroundPixmap( backgroundPixmap );
209
210 songInfo.setFocusPolicy( QWidget::NoFocus );
211// changeTextColor( &songInfo );
212// songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
213// songInfo.setFrameStyle( QFrame::NoFrame);
214 songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
215// songInfo.setForegroundColor(Qt::white);
216
217 slider.setFixedHeight( 20 );
218 slider.setMinValue( 0 );
219 slider.setMaxValue( 1 );
220 slider.setFocusPolicy( QWidget::NoFocus );
221 slider.setBackgroundPixmap( backgroundPixmap );
222
223// Config cofg("qpe");
224// cofg.setGroup("Appearance");
225// QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) );
226
227 time.setFocusPolicy( QWidget::NoFocus );
228 time.setAlignment( Qt::AlignCenter );
229
230// time.setFrame(FALSE);
231// changeTextColor( &time );
232
233 resizeEvent( 0 );
234}
232 235
233void AudioWidget::setSeekable( bool isSeekable ) { 236void AudioWidget::setSeekable( bool isSeekable ) {
234 237
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 53982a1..61556c6 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -68,6 +68,8 @@ public:
68 virtual void setPlaying( bool b) { setToggleButton( Play, b ); } 68 virtual void setPlaying( bool b) { setToggleButton( Play, b ); }
69 virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); 69 virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
70 70
71 virtual void loadSkin();
72
71signals: 73signals:
72 void sliderMoved(long); 74 void sliderMoved(long);
73 75
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp
index ffc7cb6..f87cee8 100644
--- a/noncore/multimedia/opieplayer2/main.cpp
+++ b/noncore/multimedia/opieplayer2/main.cpp
@@ -12,7 +12,7 @@ int main(int argc, char **argv) {
12 pl.showMaximized(); 12 pl.showMaximized();
13 MediaPlayer mp( pl, st, 0, "mediaPlayer" ); 13 MediaPlayer mp( pl, st, 0, "mediaPlayer" );
14 QObject::connect( &pl, SIGNAL( skinSelected() ), 14 QObject::connect( &pl, SIGNAL( skinSelected() ),
15 &mp, SLOT( recreateAudioAndVideoWidgets() ) ); 15 &mp, SLOT( reloadSkins() ) );
16 16
17 a.showMainDocumentWidget(&pl); 17 a.showMainDocumentWidget(&pl);
18 18
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index e1bfc2d..8a3d3e0 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -367,3 +367,9 @@ void MediaPlayer::recreateAudioAndVideoWidgets()
367 xineControl = new XineControl( videoUI, videoUI->vidWidget(), mediaPlayerState ); 367 xineControl = new XineControl( videoUI, videoUI->vidWidget(), mediaPlayerState );
368} 368}
369 369
370void MediaPlayer::reloadSkins()
371{
372 audioUI->loadSkin();
373 videoUI->loadSkin();
374}
375
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index dc306c4..6b316f6 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -55,6 +55,7 @@ public:
55 55
56public slots: 56public slots:
57 void recreateAudioAndVideoWidgets(); 57 void recreateAudioAndVideoWidgets();
58 void reloadSkins();
58 59
59private slots: 60private slots:
60 void setPlaying( bool ); 61 void setPlaying( bool );
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index db16b44..d60dc0d 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -45,6 +45,9 @@ void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount
45 buttonMask = QImage( buttonAreaSize, 8, 255 ); 45 buttonMask = QImage( buttonAreaSize, 8, 255 );
46 buttonMask.fill( 0 ); 46 buttonMask.fill( 0 );
47 47
48 buttons.clear();
49 buttons.reserve( buttonCount );
50
48 for ( uint i = 0; i < buttonCount; ++i ) { 51 for ( uint i = 0; i < buttonCount; ++i ) {
49 Button button = setupButton( skinInfo[ i ], imagePrefix ); 52 Button button = setupButton( skinInfo[ i ], imagePrefix );
50 buttons.push_back( button ); 53 buttons.push_back( button );
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 148948a..8c781e9 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -72,6 +72,8 @@ public slots:
72 virtual void setLength( long length ) = 0; 72 virtual void setLength( long length ) = 0;
73 virtual void setPlaying( bool playing ) = 0; 73 virtual void setPlaying( bool playing ) = 0;
74 74
75 virtual void loadSkin() = 0;
76
75signals: 77signals:
76 void moreReleased(); 78 void moreReleased();
77 void lessReleased(); 79 void lessReleased();
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index d1efaad..a03d43e 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -79,32 +79,14 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
79{ 79{
80 setCaption( tr("OpiePlayer - Video") ); 80 setCaption( tr("OpiePlayer - Video") );
81 81
82
83 videoFrame = new XineVideoWidget ( this, "Video frame" ); 82 videoFrame = new XineVideoWidget ( this, "Video frame" );
84 83
85 connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); 84 connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
86 connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); 85 connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) );
87 86
88 Config cfg("OpiePlayer"); 87 slider = 0;
89 cfg.setGroup("Options");
90 skin = cfg.readEntry("Skin","default");
91 88
92 QString skinPath = "opieplayer2/skins/" + skin; 89 loadSkin();
93 backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
94 imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
95 imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
96
97 setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_", imgUp.size() );
98
99 setBackgroundPixmap( backgroundPixmap );
100
101 slider = new QSlider( Qt::Horizontal, this );
102 slider->setMinValue( 0 );
103 slider->setMaxValue( 1 );
104 slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
105 //slider->setFocusPolicy( QWidget::NoFocus );
106
107 resizeEvent( NULL );
108 90
109 setLength( mediaPlayerState.length() ); 91 setLength( mediaPlayerState.length() );
110 setPosition( mediaPlayerState.position() ); 92 setPosition( mediaPlayerState.position() );
@@ -201,6 +183,31 @@ void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType )
201 hide(); 183 hide();
202} 184}
203 185
186void VideoWidget::loadSkin()
187{
188 Config cfg("OpiePlayer");
189 cfg.setGroup("Options");
190 skin = cfg.readEntry("Skin","default");
191
192 QString skinPath = "opieplayer2/skins/" + skin;
193 backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
194 imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
195 imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
196
197 setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_", imgUp.size() );
198
199 setBackgroundPixmap( backgroundPixmap );
200
201 delete slider;
202 slider = new QSlider( Qt::Horizontal, this );
203 slider->setMinValue( 0 );
204 slider->setMaxValue( 1 );
205 slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
206 //slider->setFocusPolicy( QWidget::NoFocus );
207
208 resizeEvent( 0 );
209}
210
204void VideoWidget::updateSlider( long i, long max ) { 211void VideoWidget::updateSlider( long i, long max ) {
205 // Will flicker too much if we don't do this 212 // Will flicker too much if we don't do this
206 if ( max == 0 ) { 213 if ( max == 0 ) {
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 21a4e9e..87be371 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -66,6 +66,8 @@ public:
66 virtual void setLength( long ); 66 virtual void setLength( long );
67 virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); 67 virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
68 68
69 virtual void loadSkin();
70
69signals: 71signals:
70 void moreClicked(); 72 void moreClicked();
71 void lessClicked(); 73 void lessClicked();