Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 0047ac0..bc47717 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -164,58 +164,49 @@ void VideoWidget::sliderReleased() { | |||
164 | void VideoWidget::setPosition( long i ) { | 164 | void VideoWidget::setPosition( long i ) { |
165 | updateSlider( i, mediaPlayerState.length() ); | 165 | updateSlider( i, mediaPlayerState.length() ); |
166 | } | 166 | } |
167 | 167 | ||
168 | 168 | ||
169 | void VideoWidget::setLength( long max ) { | 169 | void VideoWidget::setLength( long max ) { |
170 | updateSlider( mediaPlayerState.position(), max ); | 170 | updateSlider( mediaPlayerState.position(), max ); |
171 | } | 171 | } |
172 | 172 | ||
173 | void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) | 173 | void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) |
174 | { | 174 | { |
175 | if ( displayType == MediaPlayerState::Video ) { | 175 | if ( displayType == MediaPlayerState::Video ) { |
176 | makeVisible(); | 176 | makeVisible(); |
177 | return; | 177 | return; |
178 | } | 178 | } |
179 | 179 | ||
180 | // Effectively blank the view next time we show it so it looks nicer | 180 | // Effectively blank the view next time we show it so it looks nicer |
181 | scaledWidth = 0; | 181 | scaledWidth = 0; |
182 | scaledHeight = 0; | 182 | scaledHeight = 0; |
183 | hide(); | 183 | hide(); |
184 | } | 184 | } |
185 | 185 | ||
186 | void VideoWidget::loadSkin() | 186 | void VideoWidget::loadSkin() |
187 | { | 187 | { |
188 | Config cfg("OpiePlayer"); | 188 | loadDefaultSkin( skinInfo, buttonCount, "V" ); |
189 | cfg.setGroup("Options"); | ||
190 | QString skin = cfg.readEntry("Skin","default"); | ||
191 | |||
192 | QString skinPath = "opieplayer2/skins/" + skin; | ||
193 | backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | ||
194 | buttonUpImage = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); | ||
195 | buttonDownImage = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); | ||
196 | |||
197 | setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_", buttonUpImage.size() ); | ||
198 | 189 | ||
199 | setBackgroundPixmap( backgroundPixmap ); | 190 | setBackgroundPixmap( backgroundPixmap ); |
200 | 191 | ||
201 | delete slider; | 192 | delete slider; |
202 | slider = new QSlider( Qt::Horizontal, this ); | 193 | slider = new QSlider( Qt::Horizontal, this ); |
203 | slider->setMinValue( 0 ); | 194 | slider->setMinValue( 0 ); |
204 | slider->setMaxValue( 1 ); | 195 | slider->setMaxValue( 1 ); |
205 | slider->setBackgroundPixmap( backgroundPixmap ); | 196 | slider->setBackgroundPixmap( backgroundPixmap ); |
206 | //slider->setFocusPolicy( QWidget::NoFocus ); | 197 | //slider->setFocusPolicy( QWidget::NoFocus ); |
207 | 198 | ||
208 | resizeEvent( 0 ); | 199 | resizeEvent( 0 ); |
209 | } | 200 | } |
210 | 201 | ||
211 | void VideoWidget::updateSlider( long i, long max ) { | 202 | void VideoWidget::updateSlider( long i, long max ) { |
212 | // Will flicker too much if we don't do this | 203 | // Will flicker too much if we don't do this |
213 | if ( max == 0 ) { | 204 | if ( max == 0 ) { |
214 | return; | 205 | return; |
215 | } | 206 | } |
216 | int width = slider->width(); | 207 | int width = slider->width(); |
217 | int val = int((double)i * width / max); | 208 | int val = int((double)i * width / max); |
218 | if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) { | 209 | if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) { |
219 | if ( slider->value() != val ) { | 210 | if ( slider->value() != val ) { |
220 | slider->setValue( val ); | 211 | slider->setValue( val ); |
221 | } | 212 | } |