Commit 961e494b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: don't resize the mainWindow when toolbar changes

This introduced way too many bugs.
Close #3297 and "activate-subs hide the video" bug and a few more.
This is way suboptimal, but no fix works in a reliable fashion so far.
parent c67f375c
......@@ -465,8 +465,6 @@ QFrame *AbstractController::discFrame()
sectionNext() );
CONNECT( menuButton, clicked(), THEMIM->getIM(),
sectionMenu() );
connect( THEMIM->getIM(), SIGNAL( titleChanged( bool ) ),
this, SIGNAL( sizeChanged() ) );
return discFrame;
}
......@@ -481,8 +479,6 @@ QFrame *AbstractController::telexFrame()
telexLayout->setSpacing( 0 ); telexLayout->setMargin( 0 );
CONNECT( THEMIM->getIM(), teletextPossible( bool ),
telexFrame, setVisible( bool ) );
connect( THEMIM->getIM(), SIGNAL( teletextPossible( bool ) ),
this, SIGNAL( sizeChanged() ) );
/* On/Off button */
QToolButton *telexOn = new QToolButton;
......
......@@ -171,7 +171,6 @@ signals:
void inputPlaying( bool ); /// This might be usefull in the IM ?
void inputIsRecordable( bool ); /// same ?
void inputIsTrickPlayable( bool ); /// same ?
void sizeChanged();
};
/* Advanced Button Bar */
......
......@@ -339,11 +339,6 @@ void MainInterface::recreateToolbars()
delete inputC;
controls = new ControlsWidget( p_intf, false, this ); /* FIXME */
CONNECT( controls, advancedControlsToggled( bool ),
this, adaptGeometry() );
CONNECT( controls, sizeChanged(),
this, adaptGeometry() );
inputC = new InputControlsWidget( p_intf, this );
mainLayout->insertWidget( 2, inputC );
......@@ -379,10 +374,6 @@ void MainInterface::createMainWidget( QSettings *settings )
/* Create the CONTROLS Widget */
controls = new ControlsWidget( p_intf,
settings->value( "adv-controls", false ).toBool(), this );
CONNECT( controls, advancedControlsToggled( bool ),
this, adaptGeometry() );
CONNECT( controls, sizeChanged(),
this, adaptGeometry() );
inputC = new InputControlsWidget( p_intf, this );
mainLayout->insertWidget( 2, inputC );
......@@ -480,19 +471,6 @@ inline void MainInterface::createStatusBar()
* Handling of sizing of the components
**********************************************************************/
/* This function is called:
- Advanced buttons toggled
- Toolbar geom changed
*/
void MainInterface::adaptGeometry()
{
resize( sizeHint() );
#ifdef DEBUG_INTF
debug();
#endif
}
void MainInterface::debug()
{
#ifdef DEBUG_INTF
......
......@@ -193,7 +193,6 @@ private slots:
void debug();
void destroyPopupMenu();
void recreateToolbars();
void adaptGeometry();
void setName( const QString& );
void setVLCWindowsTitle( const QString& title = "" );
#if 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment