1 files changed, 43 insertions, 40 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
@@ -67,103 +67,64 @@ const MediaWidget::SkinButtonInfo skinInfo[] =
     { MediaWidget::Loop, "loop", MediaWidget::ToggleButton },
     { MediaWidget::PlayList, "playlist", MediaWidget::NormalButton },
     { MediaWidget::Forward, "forward", MediaWidget::NormalButton },
     { MediaWidget::Back, "back", MediaWidget::NormalButton }
 };
 
 const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] );
 
 void changeTextColor( QWidget * w) {
    QPalette p = w->palette();
    p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) );
    p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) );
    w->setPalette( p );
 }
 
 }
 
 AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
 
     MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this ),
     audioSliderBeingMoved( false )
 {
     setCaption( tr("OpiePlayer") );
 
-    Config cfg("OpiePlayer");
-    cfg.setGroup("Options");
-    skin = cfg.readEntry("Skin","default");
-    //skin = "scaleTest";
-    // color of background, frame, degree of transparency
-
-    QString skinPath = "opieplayer2/skins/" + skin;
-    backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
-    imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
-    imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
-
-    setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir()  + "/pics/" + skinPath + "/skin_mask_", imgUp.size() );
-
-    setBackgroundPixmap( backgroundPixmap );
-
-    songInfo.setFocusPolicy( QWidget::NoFocus );
-//    changeTextColor( &songInfo );
-//    songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
-//    songInfo.setFrameStyle( QFrame::NoFrame);
-    songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
-//    songInfo.setForegroundColor(Qt::white);
-
-    slider.setFixedHeight( 20 );
-    slider.setMinValue( 0 );
-    slider.setMaxValue( 1 );
-    slider.setFocusPolicy( QWidget::NoFocus );
-    slider.setBackgroundPixmap( backgroundPixmap );
-
-//     Config cofg("qpe");
-//     cofg.setGroup("Appearance");
-//     QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) );
-
-    time.setFocusPolicy( QWidget::NoFocus );
-    time.setAlignment( Qt::AlignCenter );
-    
-//    time.setFrame(FALSE);
-//    changeTextColor( &time );
-
-    resizeEvent( NULL );
+    loadSkin();
 
     connect( &mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
     connect( &mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) );
 
     connect( this,  SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) );
     connect( this,  SIGNAL( backClicked() ),  this, SLOT( skipBack() ) );
     connect( this,  SIGNAL( forwardReleased() ), this, SLOT( stopSkip() ) );
     connect( this,  SIGNAL( backReleased() ), this, SLOT( stopSkip() ) );
 
     // Intialise state
     setLength( mediaPlayerState.length() );
     setPosition( mediaPlayerState.position() );
     setLooping( mediaPlayerState.isFullscreen() );
     //    setPaused( mediaPlayerState->paused() );
     setPlaying( mediaPlayerState.isPlaying() );
-
 }
 
 AudioWidget::~AudioWidget() {
 
 //    mediaPlayerState->setPlaying(false);
 }
 
 namespace {
 
 QPixmap combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
     QPixmap pix( img.width(), img.height() );
     QPainter p( &pix );
     p.drawTiledPixmap( pix.rect(), bg, offset );
     p.drawImage( 0, 0, img );
     return pix;
 }
 
 
 QPixmap maskPixToMask( QPixmap pix, QBitmap mask ) {
     QPixmap pixmap( pix );
     pixmap.setMask( mask );
     return pixmap;
 }
 
@@ -208,48 +169,90 @@ void AudioWidget::sliderReleased() {
 }
 
 void AudioWidget::setPosition( long i ) {
     //    qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
     updateSlider( i, mediaPlayerState.length() );
 }
 
 
 void AudioWidget::setLength( long max ) {
     updateSlider( mediaPlayerState.position(), max );
 }
 
 
 void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
     if ( mediaType == MediaPlayerState::Audio ) {
         // startTimer( 150 );
         showMaximized();
         return;
     }
 
     killTimers();
     hide();
 }
 
+void AudioWidget::loadSkin()
+{
+    Config cfg("OpiePlayer");
+    cfg.setGroup("Options");
+    skin = cfg.readEntry("Skin","default");
+    //skin = "scaleTest";
+    // color of background, frame, degree of transparency
+
+    QString skinPath = "opieplayer2/skins/" + skin;
+    backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
+    imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
+    imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
+
+    setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir()  + "/pics/" + skinPath + "/skin_mask_", imgUp.size() );
+
+    setBackgroundPixmap( backgroundPixmap );
+
+    songInfo.setFocusPolicy( QWidget::NoFocus );
+//    changeTextColor( &songInfo );
+//    songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
+//    songInfo.setFrameStyle( QFrame::NoFrame);
+    songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
+//    songInfo.setForegroundColor(Qt::white);
+
+    slider.setFixedHeight( 20 );
+    slider.setMinValue( 0 );
+    slider.setMaxValue( 1 );
+    slider.setFocusPolicy( QWidget::NoFocus );
+    slider.setBackgroundPixmap( backgroundPixmap );
+
+//     Config cofg("qpe");
+//     cofg.setGroup("Appearance");
+//     QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) );
+
+    time.setFocusPolicy( QWidget::NoFocus );
+    time.setAlignment( Qt::AlignCenter );
+    
+//    time.setFrame(FALSE);
+//    changeTextColor( &time );
+
+    resizeEvent( 0 );
+}
 
 void AudioWidget::setSeekable( bool isSeekable ) {
 
     if ( !isSeekable ) {
         qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
         if( !slider.isHidden()) {
             slider.hide();
         }
         disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
         disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
     } else {
         // this stops the slider from being moved, thus
         // does not stop stream when it reaches the end
         slider.show();
         qDebug( " CONNECT SET POSTION " );
         connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
         connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
     }
 }