[vlc-commits] commit: Qt: kill a fixme for Fullscreen Control recreation ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Apr  7 15:28:50 2010 +0200| [83e252bb6a4dc814d8d9d3d6793a3ffb3fd13b19] | committer: Jean-Baptiste Kempf 

Qt: kill a fixme for Fullscreen Control recreation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=83e252bb6a4dc814d8d9d3d6793a3ffb3fd13b19
---

 modules/gui/qt4/main_interface.cpp |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 713ceb0..4d66b40 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -339,14 +339,20 @@ MainInterface::~MainInterface()
  *****************************/
 void MainInterface::recreateToolbars()
 {
-    // FIXME: do the same for the FSC
     settings->beginGroup( "MainWindow" );
     delete controls;
     delete inputC;
 
-    controls = new ControlsWidget( p_intf, false, this ); /* FIXME */
+    controls = new ControlsWidget( p_intf, false, this );
     inputC = new InputControlsWidget( p_intf, this );
 
+    if( fullscreenControls )
+    {
+        delete fullscreenControls;
+        fullscreenControls = new FullscreenControllerWidget( p_intf, this );
+        CONNECT( fullscreenControls, keyPressed( QKeyEvent * ),
+                 this, handleKeyPress( QKeyEvent * ) );
+    }
     mainLayout->insertWidget( 2, inputC );
     mainLayout->insertWidget( settings->value( "ToolbarPos", 0 ).toInt() ? 0: 3,
                               controls );