From f126064a91d16849070f4061618900a19a36dfa4 Mon Sep 17 00:00:00 2001 From: jfa Date: Tue, 22 May 2007 12:35:46 +0000 Subject: [PATCH] Fix bugs 15980,15981: IOLS: 'AVI' and 'MORE' buttons are always inactive. --- src/VISUGUI/VisuGUI_Slider.cxx | 7 ++----- src/VISUGUI/VisuGUI_Slider.h | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/VISUGUI/VisuGUI_Slider.cxx b/src/VISUGUI/VisuGUI_Slider.cxx index 2291dcfe..9cb6b2b3 100644 --- a/src/VISUGUI/VisuGUI_Slider.cxx +++ b/src/VISUGUI/VisuGUI_Slider.cxx @@ -125,6 +125,7 @@ VisuGUI_Slider::VisuGUI_Slider( VisuGUI_Module* theModule, aLayout->addWidget( myCacheMemory, 0, 12 ); // Buttons +#ifdef ENABLE_AVI_AND_MORE_BUTTONS myMoreButton = new QToolButton( aWidget ); myMoreButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); myMoreButton->setEnabled( false ); @@ -139,6 +140,7 @@ VisuGUI_Slider::VisuGUI_Slider( VisuGUI_Module* theModule, myAVIButton->setIconSet( aResourceMgr->loadPixmap( "VISU", tr( "ICON_SLIDER_AVI" ) ) ); QToolTip::add( myAVIButton, tr( "AVI" ) ); aLayout->addWidget( myAVIButton, 1, 1 ); +#endif aLayout->addItem( new QSpacerItem( 24, 24, QSizePolicy::Expanding, QSizePolicy::Minimum ), 1, 2 ); @@ -191,7 +193,6 @@ VisuGUI_Slider::VisuGUI_Slider( VisuGUI_Module* theModule, connect( myTimeStampStrings, SIGNAL( activated( int ) ), SLOT( onTimeStampActivated( int ) ) ); connect( myTimeStampIndices, SIGNAL( activated( int ) ), SLOT( onTimeStampActivated( int ) ) ); - connect( myMoreButton, SIGNAL( toggled( bool ) ), SLOT( onMore( bool ) ) ); connect( myFirstButton, SIGNAL( clicked() ), SLOT( onFirst() ) ); connect( myPreviousButton, SIGNAL( clicked() ), SLOT( onPrevious() ) ); connect( myPlayButton, SIGNAL( toggled( bool ) ), SLOT( onPlay( bool ) ) ); @@ -347,10 +348,6 @@ void VisuGUI_Slider::onTimeStampActivated( int value ) onValueChanged( value ); } -void VisuGUI_Slider::onMore( bool ) -{ -} - void VisuGUI_Slider::onFirst() { int value = mySlider->minValue(); diff --git a/src/VISUGUI/VisuGUI_Slider.h b/src/VISUGUI/VisuGUI_Slider.h index 80e4ab09..81594499 100644 --- a/src/VISUGUI/VisuGUI_Slider.h +++ b/src/VISUGUI/VisuGUI_Slider.h @@ -68,7 +68,6 @@ public slots: virtual void onTimeStampActivated( int ); - virtual void onMore( bool ); virtual void onFirst(); virtual void onPrevious(); virtual void onPlay( bool ); @@ -99,8 +98,10 @@ private: QLabel* myCacheMemory; +#ifdef ENABLE_AVI_AND_MORE_BUTTONS QToolButton* myMoreButton; QToolButton* myAVIButton; +#endif QToolButton* myFirstButton; QToolButton* myPreviousButton; -- 2.39.2