]> git.sesse.net Git - vlc/blobdiff - modules/gui/qt4/main_interface.cpp
Qt4 - popupMenu and AlwaysOnTop. Needs testing.
[vlc] / modules / gui / qt4 / main_interface.cpp
index e3ff231d2b67292169be46ab8717461ed8cdd936..16bb64003b79eb4ba455dc4d0d2e254cb6292d04 100644 (file)
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * main_inteface.cpp : Main interface
+ * main_interface.cpp : Main interface
  ****************************************************************************
  * Copyright (C) 2006 the VideoLAN team
  * $Id$
 #include "input_manager.hpp"
 #include "util/input_slider.hpp"
 #include "util/qvlcframe.hpp"
+#include "util/customwidgets.hpp"
 #include "dialogs_provider.hpp"
 #include "components/interface_widgets.hpp"
 #include "dialogs/playlist.hpp"
 #include "menus.hpp"
 
+#include <QMenuBar>
 #include <QCloseEvent>
 #include <QPushButton>
 #include <QStatusBar>
 #include <QKeyEvent>
+#include <QUrl>
 
 #include <assert.h>
 #include <vlc_keys.h>
-#include <vlc/vout.h>
+#include <vlc_vout.h>
 
 #ifdef WIN32
     #define PREF_W 410
     #define PREF_H 125
 #endif
 
-#define BUTTON_SET( button, image, tooltip ) ui.button##Button->setText(""); \
-    ui.button##Button->setIcon( QIcon( ":/pixmaps/"#image ) ); \
-    ui.button##Button->setToolTip( tooltip );
-
 #define VISIBLE(i) (i && i->isVisible())
 
 #define SET_WIDTH(i,j) i->widgetSize.setWidth(j)
 
 #define DS(i) i.width(),i.height()
 
+/* Callback prototypes */
+static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
+                        vlc_value_t old_val, vlc_value_t new_val, void *param );
+static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable,
+                       vlc_value_t old_val, vlc_value_t new_val, void *param );
 static int InteractCallback( vlc_object_t *, const char *, vlc_value_t,
                              vlc_value_t, void *);
 /* Video handling */
@@ -76,31 +80,41 @@ static int DoControl( intf_thread_t *p_intf, void *p_win, int i_q, va_list a )
     return p_intf->p_sys->p_mi->controlVideo( p_win, i_q, a );
 }
 
-bool embeddedPlaylistWasActive;
-bool videoIsActive;
-QSize savedVideoSize;
-
 MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
 {
+    /* Configuration */
     settings = new QSettings( "VideoLAN", "VLC" );
     settings->beginGroup( "MainWindow" );
 
+    setWindowIcon( QApplication::windowIcon() );
+
     need_components_update = false;
     bgWidget = NULL; videoWidget = NULL; playlistWidget = NULL;
     embeddedPlaylistWasActive = videoIsActive = false;
 
-    setWindowTitle( QString::fromUtf8( _("VLC media player") ) );
-    handleMainUi( settings );
+    videoEmbeddedFlag = false;
+    if( config_GetInt( p_intf, "embedded-video" ) ) videoEmbeddedFlag = true;
+
+    alwaysVideoFlag = false;
+    if( videoEmbeddedFlag && config_GetInt( p_intf, "qt-always-video" ))
+        alwaysVideoFlag = true;
 
-    QVLCMenu::createMenuBar( menuBar(), p_intf );
+    playlistEmbeddedFlag = settings->value("playlist-embedded", true).toBool();
+    advControlsEnabled= settings->value( "adv-controls", false ).toBool();
+    visualSelectorEnabled= settings->value( "visual-selector", false ).toBool();
 
-    /* Status bar */
+    /* UI */
+    setWindowTitle( qtr( "VLC media player" ) );
+    handleMainUi( settings );
+    QVLCMenu::createMenuBar( this, p_intf, playlistEmbeddedFlag,
+                             advControlsEnabled, visualSelectorEnabled );
     timeLabel = new QLabel( 0 );
     nameLabel = new QLabel( 0 );
     statusBar()->addWidget( nameLabel, 4 );
     statusBar()->addPermanentWidget( timeLabel, 1 );
 
     setFocusPolicy( Qt::StrongFocus );
+    setAcceptDrops(true);
 
     /* Init input manager */
     MainInputManager::getInstance( p_intf );
@@ -115,17 +129,49 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
              this, setDisplay( float, int, int ) );
     CONNECT( THEMIM->getIM(), nameChanged( QString ), this,setName( QString ) );
     CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
+    CONNECT( THEMIM->getIM(), navigationChanged( int ), this, setNavigation(int) );
     CONNECT( slider, sliderDragged( float ),
              THEMIM->getIM(), sliderUpdate( float ) );
 
+    CONNECT( ui.prevSectionButton, clicked(), THEMIM->getIM(),
+             sectionPrev() );
+    CONNECT( ui.nextSectionButton, clicked(), THEMIM->getIM(),
+             sectionNext() );
+    CONNECT( ui.menuButton, clicked(), THEMIM->getIM(),
+             sectionMenu() );
+
     var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
     var_AddCallback( p_intf, "interaction", InteractCallback, this );
     p_intf->b_interaction = VLC_TRUE;
+
+    /* Register callback for the intf-popupmenu variable */
+    playlist_t *p_playlist =
+        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+    if( p_playlist != NULL )
+    {
+        var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
+        var_AddCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
+        vlc_object_release( p_playlist );
+    }
 }
 
 MainInterface::~MainInterface()
 {
-    /// \todo Save everything
+    /* Unregister callback for the intf-popupmenu variable */
+    playlist_t *p_playlist =
+        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+    if( p_playlist != NULL )
+    {
+        var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
+        var_DelCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
+        vlc_object_release( p_playlist );
+    }
+
+    settings->setValue( "playlist-embedded", playlistEmbeddedFlag );
+    settings->setValue( "adv-controls", advControlsEnabled );
+    settings->setValue( "pos", pos() );
+    settings->endGroup();
+    delete settings;
     p_intf->b_interaction = VLC_FALSE;
     var_DelCallback( p_intf, "interaction", InteractCallback, this );
 
@@ -141,19 +187,17 @@ void MainInterface::handleMainUi( QSettings *settings )
     ui.setupUi( centralWidget() );
 
     slider = new InputSlider( Qt::Horizontal, NULL );
-    ui.hboxLayout->insertWidget( 0, slider );
-
-    BUTTON_SET( prev, previous.png, qtr( "Previous" ) );
-    BUTTONACT( ui.prevButton, prev() );
-    BUTTON_SET( next, next.png , qtr( "Next" ) );
-    BUTTONACT( ui.nextButton, next() );
-    BUTTON_SET( play, play.png , qtr( "Play" ) );
-    BUTTONACT( ui.playButton, play() );
-    BUTTON_SET( stop, stop.png , qtr( "Stop" )  );
-    BUTTONACT( ui.stopButton, stop() );
-
-    BUTTON_SET( visual,  stop.png, qtr( "Audio visualizations" ) );
-    BUTTONACT( ui.visualButton, visual() );
+    ui.vboxLayout->insertWidget( 0, slider );
+    ui.discFrame->hide();
+    BUTTON_SET_IMG( ui.prevSectionButton, "", previous.png, "" );
+    BUTTON_SET_IMG( ui.nextSectionButton, "", next.png, "" );
+    BUTTON_SET_IMG( ui.menuButton, "", previous.png, "" );
+
+    BUTTON_SET_ACT_I( ui.prevButton, "" , previous.png,
+                      qtr("Previous"), prev() );
+    BUTTON_SET_ACT_I( ui.nextButton, "", next.png, qtr("Next"), next() );
+    BUTTON_SET_ACT_I( ui.playButton, "", play.png, qtr("Play"), play() );
+    BUTTON_SET_ACT_I( ui.stopButton, "", stop.png, qtr("Stop"), stop() );
 
     /* Volume */
     ui.volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
@@ -163,20 +207,8 @@ void MainInterface::handleMainUi( QSettings *settings )
     ui.volMuteLabel->installEventFilter(h);
     ui.volumeSlider->setFocusPolicy( Qt::NoFocus );
 
-    /* Fetch configuration from settings and vlc config */
-    videoEmbeddedFlag = false;
-    if( config_GetInt( p_intf, "embedded-video" ) )
-        videoEmbeddedFlag = true;
-
-    alwaysVideoFlag = false;
-    if( videoEmbeddedFlag && config_GetInt( p_intf, "qt-always-video" ))
-        alwaysVideoFlag = true;
-
-    playlistEmbeddedFlag = true;
-    /// \todo fetch playlist settings
-
-    BUTTON_SET( playlist, volume-low.png, playlistEmbeddedFlag ?
-                                                qtr( "Show playlist" ) :
+    BUTTON_SET_IMG( ui.playlistButton, "" , playlist_icon.png,
+                        playlistEmbeddedFlag ?  qtr( "Show playlist" ) :
                                                 qtr( "Open playlist" ) );
     BUTTONACT( ui.playlistButton, playlist() );
 
@@ -185,6 +217,12 @@ void MainInterface::handleMainUi( QSettings *settings )
 
     addSize = QSize( ui.vboxLayout->margin() * 2, PREF_H );
 
+    advControls = new ControlsWidget( p_intf );
+    ui.vboxLayout->insertWidget( 0, advControls );
+    advControls->updateGeometry();
+    if( !advControlsEnabled ) advControls->hide();
+    need_components_update = true;
+
     visualSelector = new VisualSelector( p_intf );
     ui.vboxLayout->insertWidget( 0, visualSelector );
     visualSelector->hide();
@@ -210,10 +248,6 @@ void MainInterface::handleMainUi( QSettings *settings )
         p_intf->pf_release_window  = ::DoRelease;
         p_intf->pf_control_window  = ::DoControl;
     }
-
-    calculateInterfaceSize();
-    resize( mainSize );
-
     setMinimumSize( PREF_W, addSize.height() );
 }
 
@@ -233,13 +267,11 @@ void MainInterface::calculateInterfaceSize()
     {
         width = playlistWidget->widgetSize.width();
         height = playlistWidget->widgetSize.height();
-        fprintf( stderr, "Have %ix%i playlist\n", width, height );
     }
     else if( videoIsActive )
     {
         width =  videoWidget->widgetSize.width() ;
         height = videoWidget->widgetSize.height();
-        fprintf( stderr, "Video Size %ix%i\n", DS( videoWidget->widgetSize ) );
     }
     else
     {
@@ -248,30 +280,27 @@ void MainInterface::calculateInterfaceSize()
     }
     if( VISIBLE( visualSelector ) )
         height += visualSelector->height();
-
-    fprintf( stderr, "Setting to %ix%i\n",
-                     width + addSize.width() , height + addSize.height() );
-
+    if( VISIBLE( advControls) )
+    {
+        height += advControls->sizeHint().height();
+    }
     mainSize = QSize( width + addSize.width(), height + addSize.height() );
 }
 
 void MainInterface::resizeEvent( QResizeEvent *e )
 {
-    fprintf( stderr, "Resize event to %ix%i\n", DS( e->size() ) );
     videoWidget->widgetSize.setWidth(  e->size().width() - addSize.width() );
     if( videoWidget && videoIsActive && videoWidget->widgetSize.height() > 1 )
     {
         SET_WH( videoWidget, e->size().width() - addSize.width(),
                              e->size().height()  - addSize.height() );
         videoWidget->updateGeometry();
-        fprintf( stderr, "Video set to %ix%i\n", DS( videoWidget->widgetSize) );
     }
     if( VISIBLE( playlistWidget ) )
     {
         SET_WH( playlistWidget , e->size().width() - addSize.width(),
                                  e->size().height() - addSize.height() );
         playlistWidget->updateGeometry();
-        fprintf( stderr, "PL set to %ix%i\n",DS(playlistWidget->widgetSize ) );
     }
 }
 
@@ -286,13 +315,13 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
         if( VISIBLE( playlistWidget ) )
         {
             embeddedPlaylistWasActive = true;
-            playlistWidget->hide();
+//            playlistWidget->hide();
         }
         bool bgWasVisible = false;
         if( VISIBLE( bgWidget) )
         {
             bgWasVisible = true;
-            bgWidget->hide();
+//            bgWidget->hide();
         }
         if( THEMIM->getIM()->hasVideo() || !bgWasVisible )
         {
@@ -305,7 +334,7 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
             // videoWidget->widgetSize = bgWidget->widgeTSize;
             videoWidget->widgetSize = QSize( *pi_width, *pi_height );
         }
-        videoWidget->updateGeometry(); /// FIXME: Needed ?
+//        videoWidget->updateGeometry(); /// FIXME: Needed ?
         need_components_update = true;
     }
     return ret;
@@ -318,14 +347,31 @@ void MainInterface::releaseVideo( void *p_win )
     videoWidget->resize( videoWidget->widgetSize );
 
     if( embeddedPlaylistWasActive )
-        playlistWidget->show();
+        ;//playlistWidget->show();
     else if( bgWidget )
-        bgWidget->show();
+        ;//bgWidget->show();
 
     videoIsActive = false;
     need_components_update = true;
 }
 
+class SetVideoOnTopQtEvent : public QEvent
+{
+public:
+    SetVideoOnTopQtEvent( bool _onTop ) :
+      QEvent( (QEvent::Type)SetVideoOnTopEvent_Type ), onTop( _onTop)
+    {
+    }
+
+    bool OnTop() const
+    {
+        return onTop;
+    }
+
+private:
+    bool onTop;
+};
+
 int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
 {
     int i_ret = VLC_EGENERIC;
@@ -344,15 +390,19 @@ int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
         {
             unsigned int i_width  = va_arg( args, unsigned int );
             unsigned int i_height = va_arg( args, unsigned int );
-//          if( !i_width && p_vout ) i_width = p_vout->i_window_width;
-//          if( !i_height && p_vout ) i_height = p_vout->i_window_height;
             videoWidget->widgetSize = QSize( i_width, i_height );
-            videoWidget->updateGeometry();
+            // videoWidget->updateGeometry();
             need_components_update = true;
             i_ret = VLC_SUCCESS;
             break;
         }
         case VOUT_SET_STAY_ON_TOP:
+        {
+            int i_arg = va_arg( args, int );
+            QApplication::postEvent( this, new SetVideoOnTopQtEvent( i_arg ) );
+            i_ret = VLC_SUCCESS;
+            break;
+        }
         default:
             msg_Warn( p_intf, "unsupported control query" );
             break;
@@ -360,6 +410,21 @@ int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
     return i_ret;
 }
 
+void MainInterface::advanced()
+{
+    if( !VISIBLE( advControls ) )
+    {
+        advControls->show();
+        advControlsEnabled = true;
+    }
+    else
+    {
+        advControls->hide();
+        advControlsEnabled = false;
+    }
+    doComponentsUpdate();
+}
+
 void MainInterface::visual()
 {
     if( !VISIBLE( visualSelector) )
@@ -369,14 +434,15 @@ void MainInterface::visual()
         {
             /* Show the background widget */
         }
+        visualSelectorEnabled = true;
     }
     else
     {
         /* Stop any currently running visualization */
         visualSelector->hide();
+        visualSelectorEnabled = false;
     }
-    calculateInterfaceSize();
-    resize( mainSize );
+    doComponentsUpdate();
 }
 
 void MainInterface::playlist()
@@ -401,10 +467,8 @@ void MainInterface::playlist()
                                                QSize( 650, 310 ) ).toSize();
         playlistWidget->hide();
     }
-    /// Todo, reset its size ?
-    if( VISIBLE( playlistWidget) )
+    if( VISIBLE( playlistWidget ) )
     {
-        fprintf( stderr, "hiding playlist\n" );
         playlistWidget->hide();
         if( videoIsActive )
         {
@@ -415,7 +479,6 @@ void MainInterface::playlist()
     }
     else
     {
-        fprintf( stderr, "showing playlist\n" );
         playlistWidget->show();
         if( videoIsActive )
         {
@@ -426,9 +489,7 @@ void MainInterface::playlist()
         }
         if( VISIBLE( bgWidget ) ) bgWidget->hide();
     }
-
-    calculateInterfaceSize();
-    resize( mainSize );
+    doComponentsUpdate();
 }
 
 /* Video widget cannot do this synchronously as it runs in another thread */
@@ -439,59 +500,107 @@ void MainInterface::doComponentsUpdate()
     resize( mainSize );
 }
 
+void MainInterface::undockPlaylist()
+{
+    if( playlistWidget )
+    {
+        playlistWidget->hide();
+        playlistWidget->deleteLater();
+        ui.vboxLayout->removeWidget( playlistWidget );
+        playlistWidget = NULL;
+        playlistEmbeddedFlag = false;
+
+        menuBar()->clear();
+        QVLCMenu::createMenuBar( this, p_intf, false, advControlsEnabled,
+                                 visualSelectorEnabled);
+
+        if( videoIsActive )
+        {
+            videoWidget->widgetSize = savedVideoSize;
+            videoWidget->resize( videoWidget->widgetSize );
+            videoWidget->updateGeometry();
+        }
+
+        doComponentsUpdate();
+        THEDP->playlistDialog();
+    }
+}
+
+void MainInterface::customEvent( QEvent *event )
+{
+    if( event->type() == PLDockEvent_Type )
+    {
+        PlaylistDialog::killInstance();
+        playlistEmbeddedFlag = true;
+        menuBar()->clear();
+        QVLCMenu::createMenuBar(this, p_intf, true, advControlsEnabled,
+                                visualSelectorEnabled);
+        playlist();
+    }
+    else if ( event->type() == SetVideoOnTopEvent_Type )
+    {
+        SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event;
+        if( p_event->OnTop() )
+            setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+        else
+            setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);            
+        show(); /* necessary to apply window flags?? */
+    }
+}
+
+
+/************************************************************************
+ * D&D
+ ************************************************************************/
+void MainInterface::dropEvent(QDropEvent *event)
+{
+     const QMimeData *mimeData = event->mimeData();
+
+     /* D&D of a subtitles file, add it on the fly */
+     if( mimeData->urls().size() == 1 )
+     {
+        if( THEMIM->getIM()->hasInput() )
+        {
+            if( input_AddSubtitles( THEMIM->getInput(),
+                                    qtu( mimeData->urls()[0].toString() ),
+                                    VLC_TRUE ) )
+            {
+                event->acceptProposedAction();
+                return;
+            }
+        }
+     }
+     bool first = true;
+     foreach( QUrl url, mimeData->urls() ) {
+        QString s = url.toString();
+        if( s.length() > 0 ) {
+            playlist_Add( THEPL, qtu(s), NULL,
+                          PLAYLIST_APPEND | (first ? PLAYLIST_GO:0),
+                          PLAYLIST_END, VLC_TRUE, VLC_FALSE );
+            first = false;
+        }
+     }
+     event->acceptProposedAction();
+}
+void MainInterface::dragEnterEvent(QDragEnterEvent *event)
+{
+     event->acceptProposedAction();
+}
+void MainInterface::dragMoveEvent(QDragMoveEvent *event)
+{
+     event->acceptProposedAction();
+}
+void MainInterface::dragLeaveEvent(QDragLeaveEvent *event)
+{
+     event->accept();
+}
+
 /************************************************************************
  * Other stuff
  ************************************************************************/
 void MainInterface::keyPressEvent( QKeyEvent *e )
 {
-    int i_vlck = 0;
-    /* Handle modifiers */
-    if( e->modifiers()& Qt::ShiftModifier ) i_vlck |= KEY_MODIFIER_SHIFT;
-    if( e->modifiers()& Qt::AltModifier ) i_vlck |= KEY_MODIFIER_ALT;
-    if( e->modifiers()& Qt::ControlModifier ) i_vlck |= KEY_MODIFIER_CTRL;
-    if( e->modifiers()& Qt::MetaModifier ) i_vlck |= KEY_MODIFIER_META;
-
-    bool found = false;
-    /* Look for some special keys */
-#define HANDLE( qt, vk ) case Qt::qt : i_vlck |= vk; found = true;break
-    switch( e->key() )
-    {
-        HANDLE( Key_Left, KEY_LEFT );
-        HANDLE( Key_Right, KEY_RIGHT );
-        HANDLE( Key_Up, KEY_UP );
-        HANDLE( Key_Down, KEY_DOWN );
-        HANDLE( Key_Space, KEY_SPACE );
-        HANDLE( Key_Escape, KEY_ESC );
-        HANDLE( Key_Enter, KEY_ENTER );
-        HANDLE( Key_F1, KEY_F1 );
-        HANDLE( Key_F2, KEY_F2 );
-        HANDLE( Key_F3, KEY_F3 );
-        HANDLE( Key_F4, KEY_F4 );
-        HANDLE( Key_F5, KEY_F5 );
-        HANDLE( Key_F6, KEY_F6 );
-        HANDLE( Key_F7, KEY_F7 );
-        HANDLE( Key_F8, KEY_F8 );
-        HANDLE( Key_F9, KEY_F9 );
-        HANDLE( Key_F10, KEY_F10 );
-        HANDLE( Key_F11, KEY_F11 );
-        HANDLE( Key_F12, KEY_F12 );
-        HANDLE( Key_PageUp, KEY_PAGEUP );
-        HANDLE( Key_PageDown, KEY_PAGEDOWN );
-        HANDLE( Key_Home, KEY_HOME );
-        HANDLE( Key_End, KEY_END );
-        HANDLE( Key_Insert, KEY_INSERT );
-        HANDLE( Key_Delete, KEY_DELETE );
-
-    }
-    if( !found )
-    {
-        /* Force lowercase */
-        if( e->key() >= Qt::Key_A && e->key() <= Qt::Key_Z )
-            i_vlck += e->key() + 32;
-        /* Rest of the ascii range */
-        else if( e->key() >= Qt::Key_Space && e->key() <= Qt::Key_AsciiTilde )
-            i_vlck += e->key();
-    }
+    int i_vlck = qtEventToVLCKey( e );
     if( i_vlck >= 0 )
     {
         var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck );
@@ -501,16 +610,23 @@ void MainInterface::keyPressEvent( QKeyEvent *e )
         e->ignore();
 }
 
+void MainInterface::wheelEvent( QWheelEvent *e )
+{
+    int i_vlckey = qtWheelEventToVLCKey( e );
+    var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlckey );
+    e->accept();
+}
+
 void MainInterface::stop()
 {
-    playlist_Stop( THEPL );
+    THEMIM->stop();
 }
 void MainInterface::play()
 {
-    if( !THEPL->i_size || !THEPL->i_enabled )
+    if( playlist_IsEmpty(THEPL) )
     {
         /* The playlist is empty, open a file requester */
-        THEDP->openDialog();
+        THEDP->openFileDialog();
         setStatus( 0 );
         return;
     }
@@ -518,11 +634,11 @@ void MainInterface::play()
 }
 void MainInterface::prev()
 {
-    playlist_Prev( THEPL );
+    THEMIM->prev();
 }
 void MainInterface::next()
 {
-    playlist_Next( THEPL );
+    THEMIM->next();
 }
 
 void MainInterface::setDisplay( float pos, int time, int length )
@@ -548,14 +664,46 @@ void MainInterface::setStatus( int status )
         ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
 }
 
+#define HELP_MENU N_("Menu")
+#define HELP_PCH N_("Previous chapter")
+#define HELP_NCH N_("Next chapter")
+#define HELP_PTR N_("Previous track")
+#define HELP_NTR N_("Next track")
+
+void MainInterface::setNavigation( int navigation )
+{
+    // 1 = chapter, 2 = title, 0 = no
+    if( navigation == 0 )
+    {
+        ui.discFrame->hide();
+    } else if( navigation == 1 ) {
+        ui.prevSectionButton->show();
+        ui.prevSectionButton->setToolTip( qfu(HELP_PCH) );
+        ui.nextSectionButton->show();
+        ui.nextSectionButton->setToolTip( qfu(HELP_NCH) );
+        ui.menuButton->show();
+        ui.discFrame->show();
+    } else {
+        ui.prevSectionButton->show();
+        ui.prevSectionButton->setToolTip( qfu(HELP_PCH) );
+        ui.nextSectionButton->show();
+        ui.nextSectionButton->setToolTip( qfu(HELP_NCH) );
+        ui.menuButton->hide();
+        ui.discFrame->show();
+    }
+}
+
 static bool b_my_volume;
 
 void MainInterface::updateOnTimer()
 {
-    if( p_intf->b_die )
+    /* \todo Make this event-driven */
+    advControls->enableInput( THEMIM->getIM()->hasInput() );
+    advControls->enableVideo( THEMIM->getIM()->hasVideo() );
+
+    if( intf_ShouldDie( p_intf ) )
     {
         QApplication::closeAllWindows();
-        DialogsProvider::killInstance();
         QApplication::quit();
     }
     if( need_components_update )
@@ -599,9 +747,38 @@ static int InteractCallback( vlc_object_t *p_this,
 {
     intf_dialog_args_t *p_arg = new intf_dialog_args_t;
     p_arg->p_dialog = (interaction_dialog_t *)(new_val.p_address);
-
-    MainInterface *p_interface = (MainInterface*)param;
     DialogEvent *event = new DialogEvent( INTF_DIALOG_INTERACTION, 0, p_arg );
     QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
     return VLC_SUCCESS;
 }
+
+/*****************************************************************************
+ * PopupMenuCB: callback triggered by the intf-popupmenu playlist variable.
+ *  We don't show the menu directly here because we don't want the
+ *  caller to block for a too long time.
+ *****************************************************************************/
+static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
+                        vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+    intf_thread_t *p_intf = (intf_thread_t *)param;
+
+    if( p_intf->pf_show_dialog )
+    {
+        p_intf->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU,
+                                new_val.b_bool, 0 );
+    }
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * IntfShowCB: callback triggered by the intf-show playlist variable.
+ *****************************************************************************/
+static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable,
+                       vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+    intf_thread_t *p_intf = (intf_thread_t *)param;
+    //p_intf->p_sys->b_intf_show = VLC_TRUE;
+
+    return VLC_SUCCESS;
+}