From kde-commits  Thu Mar 27 08:55:28 2003
From: Ewald Snel <ewald () rambo ! its ! tudelft ! nl>
Date: Thu, 27 Mar 2003 08:55:28 +0000
To: kde-commits
Subject: KDE_3_1_BRANCH: kdemultimedia/noatun/modules/simple
X-MARC-Message: https://marc.info/?l=kde-commits&m=104875546122649

CVS commit by snel: 

Backport fix for bug 56141 (wishlist)


  M +4 -15     userinterface.cpp   1.7.2.2
  M +0 -1      userinterface.h   1.4.2.1


--- kdemultimedia/noatun/modules/simple/userinterface.cpp  #1.7.2.1:1.7.2.2
@@ -161,16 +161,8 @@ void SimpleUI::setupCentralWidget()
     npWidget->setSpacing( 0 );
 
-    QHBox *topFrame = new QHBox( npWidget );
-    topFrame->setFixedHeight( 20 );
-    topFrame->setFrameShape( QFrame::StyledPanel );
-    topFrame->setFrameShadow( QFrame::Raised );
-    topFrame->setMargin( 1 );
-    topFrame->setSpacing( 0 );
-    stateLabel = new QLabel( topFrame );
-    stateLabel->setFixedSize( 16, 16 );
-    stateLabel->setPixmap( QPixmap( stop_xpm ) );
-    stateLabel->setScaledContents( false );
-    positionLabel = new QLabel( topFrame );
-    positionLabel->setAlignment( AlignVCenter | AlignRight );
+    positionLabel = new QLabel( statusBar() );
+    positionLabel->setAlignment( AlignVCenter | AlignCenter );
+    positionLabel->setFixedSize( fontMetrics().size( 0, " 00:00/00:00 " ) );
+    statusBar()->addWidget( positionLabel, 0, true );
 
     video = new VideoFrame( npWidget );
@@ -261,5 +253,4 @@ void SimpleUI::slotPlaying()
 {
     playButton->setPixmap( QPixmap( pause_xpm ) );
-    stateLabel->setPixmap( QPixmap( play_xpm ) );
     stopButton->setEnabled( true );
     slider->setEnabled( true );
@@ -272,5 +263,4 @@ void SimpleUI::slotStopped()
 {
     playButton->setPixmap( QPixmap( play_xpm ) );
-    stateLabel->setPixmap( QPixmap( stop_xpm ) );
     stopButton->setEnabled( false );
     slider->setEnabled( false );
@@ -283,5 +273,4 @@ void SimpleUI::slotPaused()
 {
     playButton->setPixmap( QPixmap( play_xpm ) );
-    stateLabel->setPixmap( QPixmap( pause_xpm ) );
     slider->setEnabled( true );
 }

--- kdemultimedia/noatun/modules/simple/userinterface.h  #1.4:1.4.2.1
@@ -61,5 +61,4 @@ private:
     QPushButton *stopButton;
     QPushButton *playButton;
-    QLabel *stateLabel;
     QLabel *positionLabel;
     VideoFrame *video;