i_visualmode = config_GetInt( p_intf, "qt-display-mode" );
/* Set the other interface settings */
- settings = new QSettings( "vlc", "vlc-qt-interface" );
+ settings = getSettings();
settings->beginGroup( "MainWindow" );
//TODO: I don't like that code
CONNECT( this, askUpdate(), this, doComponentsUpdate() );
/* Size and placement of interface */
- QVLCTools::restoreWidgetPosition(settings,this,QSize(350,60));
+ QVLCTools::restoreWidgetPosition( settings, this, QSize(380, 60) );
/* Playlist */
msg_Dbg( p_intf, "Destroying the main interface" );
if( playlistWidget )
- playlistWidget->savingSettings( settings );
+ playlistWidget->savingSettings();
settings->beginGroup( "MainWindow" );
settings->setValue( "backgroundSize", bgWidget->size() );
settings->endGroup();
- delete settings;
var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
visualSelector->hide();
#endif
- /* And video Outputs */
- if( i_visualmode == QT_ALWAYS_VIDEO_MODE ||
- i_visualmode == QT_MINIMAL_MODE )
+ /* Bg Cone */
+ bgWidget = new BackgroundWidget( p_intf );
+ bgWidget->resize(
+ settings->value( "backgroundSize", QSize( 300, 200 ) ).toSize() );
+ bgWidget->updateGeometry();
+ mainLayout->insertWidget( 0, bgWidget );
+ CONNECT( this, askBgWidgetToToggle(), bgWidget, toggle() );
+
+ if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
+ i_visualmode != QT_MINIMAL_MODE )
{
- bgWidget = new BackgroundWidget( p_intf );
- bgWidget->resize(
- settings->value( "backgroundSize", QSize( 300, 150 ) ).toSize() );
- bgWidget->updateGeometry();
- mainLayout->insertWidget( 0, bgWidget );
- CONNECT( this, askBgWidgetToToggle(), bgWidget, toggle() );
+ bgWidget->hide();
}
+ /* And video Outputs */
if( videoEmbeddedFlag )
{
videoWidget = new VideoWidget( p_intf );
int *pi_y, unsigned int *pi_width,
unsigned int *pi_height )
{
- bool bgWasVisible = false;
+ bgWasVisible = false;
/* Request the videoWidget */
void *ret = videoWidget->request( p_nvout,pi_x, pi_y, pi_width, pi_height );
videoWidget->release( p_win );
videoWidget->hide();
- if( bgWidget )// WRONG
+ if( bgWasVisible )
+ {
+ bgWasVisible = false;
bgWidget->show();
+ }
adjustSize();
videoIsActive = false;
{
/* HACK for minimalView, see menus.cpp */
if( !menuBar()->isVisible() ) QVLCMenu::minimalViewAction->toggle();
+ if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
+ i_visualmode != QT_MINIMAL_MODE )
+ {
+ emit askBgWidgetToToggle();
+ }
+
TOGGLEV( menuBar() );
TOGGLEV( controls );
TOGGLEV( statusBar() );