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() ...@@ -465,8 +465,6 @@ QFrame *AbstractController::discFrame()
sectionNext() ); sectionNext() );
CONNECT( menuButton, clicked(), THEMIM->getIM(), CONNECT( menuButton, clicked(), THEMIM->getIM(),
sectionMenu() ); sectionMenu() );
connect( THEMIM->getIM(), SIGNAL( titleChanged( bool ) ),
this, SIGNAL( sizeChanged() ) );
return discFrame; return discFrame;
} }
...@@ -481,8 +479,6 @@ QFrame *AbstractController::telexFrame() ...@@ -481,8 +479,6 @@ QFrame *AbstractController::telexFrame()
telexLayout->setSpacing( 0 ); telexLayout->setMargin( 0 ); telexLayout->setSpacing( 0 ); telexLayout->setMargin( 0 );
CONNECT( THEMIM->getIM(), teletextPossible( bool ), CONNECT( THEMIM->getIM(), teletextPossible( bool ),
telexFrame, setVisible( bool ) ); telexFrame, setVisible( bool ) );
connect( THEMIM->getIM(), SIGNAL( teletextPossible( bool ) ),
this, SIGNAL( sizeChanged() ) );
/* On/Off button */ /* On/Off button */
QToolButton *telexOn = new QToolButton; QToolButton *telexOn = new QToolButton;
......
...@@ -171,7 +171,6 @@ signals: ...@@ -171,7 +171,6 @@ signals:
void inputPlaying( bool ); /// This might be usefull in the IM ? void inputPlaying( bool ); /// This might be usefull in the IM ?
void inputIsRecordable( bool ); /// same ? void inputIsRecordable( bool ); /// same ?
void inputIsTrickPlayable( bool ); /// same ? void inputIsTrickPlayable( bool ); /// same ?
void sizeChanged();
}; };
/* Advanced Button Bar */ /* Advanced Button Bar */
...@@ -203,7 +202,7 @@ public: ...@@ -203,7 +202,7 @@ public:
protected: protected:
friend class MainInterface; friend class MainInterface;
bool b_advancedVisible; bool b_advancedVisible;
protected slots: protected slots:
void toggleAdvanced(); void toggleAdvanced();
......
...@@ -339,11 +339,6 @@ void MainInterface::recreateToolbars() ...@@ -339,11 +339,6 @@ void MainInterface::recreateToolbars()
delete inputC; delete inputC;
controls = new ControlsWidget( p_intf, false, this ); /* FIXME */ 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 ); inputC = new InputControlsWidget( p_intf, this );
mainLayout->insertWidget( 2, inputC ); mainLayout->insertWidget( 2, inputC );
...@@ -379,10 +374,6 @@ void MainInterface::createMainWidget( QSettings *settings ) ...@@ -379,10 +374,6 @@ void MainInterface::createMainWidget( QSettings *settings )
/* Create the CONTROLS Widget */ /* Create the CONTROLS Widget */
controls = new ControlsWidget( p_intf, controls = new ControlsWidget( p_intf,
settings->value( "adv-controls", false ).toBool(), this ); settings->value( "adv-controls", false ).toBool(), this );
CONNECT( controls, advancedControlsToggled( bool ),
this, adaptGeometry() );
CONNECT( controls, sizeChanged(),
this, adaptGeometry() );
inputC = new InputControlsWidget( p_intf, this ); inputC = new InputControlsWidget( p_intf, this );
mainLayout->insertWidget( 2, inputC ); mainLayout->insertWidget( 2, inputC );
...@@ -480,19 +471,6 @@ inline void MainInterface::createStatusBar() ...@@ -480,19 +471,6 @@ inline void MainInterface::createStatusBar()
* Handling of sizing of the components * 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() void MainInterface::debug()
{ {
#ifdef DEBUG_INTF #ifdef DEBUG_INTF
......
...@@ -193,7 +193,6 @@ private slots: ...@@ -193,7 +193,6 @@ private slots:
void debug(); void debug();
void destroyPopupMenu(); void destroyPopupMenu();
void recreateToolbars(); void recreateToolbars();
void adaptGeometry();
void setName( const QString& ); void setName( const QString& );
void setVLCWindowsTitle( const QString& title = "" ); void setVLCWindowsTitle( const QString& title = "" );
#if 0 #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