- Don't put private system_* header in public

[vlc] / modules / gui / qt4 / main_interface.cpp

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 620fc5420030f2934b1c1d3aa3176291fb2ca42f..ed4f42fbaac4c1552fd09ca810b34d743aec822c 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -51,7 +51,9 @@
 #include <QLabel>
 #include <QSlider>
 #include <QWidgetAction>
+#if 0
 #include <QDockWidget>
+#endif
 #include <QToolBar>
 #include <QGroupBox>
 #include <QDate>
@@ -324,7 +326,7 @@ inline void MainInterface::createStatusBar()
     nameLabel = new QLabel;
     nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse
                                       | Qt::TextSelectableByKeyboard );
-    speedLabel = new QLabel( "1.00x" );
+    speedLabel = new SpeedLabel( p_intf, "1.00x" );
     speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
 
     /* Styling those labels */
@@ -537,6 +539,8 @@ int MainInterface::privacyDialog( QList<ConfigControl *> controls )
     CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool ); line++;
     CONFIG_GENERIC_NOBOOL( "qt-updates-days", Integer ); line++;
 #endif
+    CONFIG_GENERIC( "security-policy", IntegerList ); line++;
+
     QPushButton *ok = new QPushButton( qtr( "Ok" ) );
 
     gLayout->addWidget( ok, 2, 2 );
@@ -900,8 +904,13 @@ void MainInterface::setName( QString name )
 
 void MainInterface::setStatus( int status )
 {
+    msg_Dbg( p_intf, "I was here, updating your status" );
     /* Forward the status to the controls to toggle Play/Pause */
     controls->setStatus( status );
+
+    controls->updateInput();
+    speedControl->setEnable( THEMIM->getIM()->hasInput() );
+
     /* And in the systray for the menu */
     if( sysTray )
         QVLCMenu::updateSystrayMenu( this, p_intf );