Remove visual button, put back in the menu

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 68964b8834db424e6c034f211d188d32fbbe6853..3607bcf0d1a6d95c827f5c399e5e8be3212618ed 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -78,7 +78,6 @@ VideoWidget::~VideoWidget()
 
 QSize VideoWidget::sizeHint() const
 {
-    fprintf( stderr, "Video Size %ix%i\n", widgetSize.width(), widgetSize.height() );
     return widgetSize;
 }
 
@@ -132,7 +131,6 @@ BackgroundWidget::~BackgroundWidget()
 
 QSize BackgroundWidget::sizeHint() const
 {
-    fprintf( stderr, "BG %ix%i\n", widgetSize.width(), widgetSize.height() );
     return widgetSize;
 }
 
@@ -318,7 +316,6 @@ void PlaylistWidget::setArt( QString url )
 {
     if( prevArt != url )
     {
-        fprintf( stderr, "Display %s\n", qta( url ) );
         art->setPixmap( QPixmap( url ) );
         prevArt = url;
     }

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index d39f2a29435048cad3614a05d83999a408cd3d20..1688a229612d0488128f373a358363d9a225bdb0 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -100,12 +100,13 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     playlistEmbeddedFlag = settings->value( "playlist-embedded", true ).
                                                                     toBool();
     advControlsEnabled= settings->value( "adv-controls", false ).toBool();
+    visualSelectorEnabled= settings->value( "visual-selector", false ).toBool();
 
     setWindowTitle( QString::fromUtf8( _("VLC media player") ) );
     handleMainUi( settings );
 
     QVLCMenu::createMenuBar( this, p_intf, playlistEmbeddedFlag,
-                             advControlsEnabled );
+                             advControlsEnabled, visualSelectorEnabled );
 
     /* Status bar */
     timeLabel = new QLabel( 0 );
@@ -165,8 +166,6 @@ void MainInterface::handleMainUi( QSettings *settings )
     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() );
-    BUTTON_SET_ACT_I( ui.visualButton, "", stop.png,
-                    qtr( "Audio visualizations" ), visual() );
 
     /* Volume */
     ui.volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
@@ -236,13 +235,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
     {
@@ -251,23 +248,15 @@ void MainInterface::calculateInterfaceSize()
     }
     if( VISIBLE( visualSelector ) )
         height += visualSelector->height();
-    fprintf( stderr, "Adv %p - visible %i\n", advControls, advControls->isVisible() );
     if( VISIBLE( advControls) )
     {
-        fprintf( stderr, "visible\n" );
         height += advControls->sizeHint().height();
     }
-
-    fprintf( stderr, "Adv height %i\n", advControls->sizeHint().height() );
-    fprintf( stderr, "Setting to %ix%i\n",
-                     width + addSize.width() , height + addSize.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 )
     {
@@ -392,11 +381,13 @@ void MainInterface::visual()
         {
             /* Show the background widget */
         }
+        visualSelectorEnabled = true;
     }
     else
     {
         /* Stop any currently running visualization */
         visualSelector->hide();
+        visualSelectorEnabled = false;
     }
     doComponentsUpdate();
 }
@@ -468,7 +459,8 @@ void MainInterface::undockPlaylist()
         playlistEmbeddedFlag = false;
 
         menuBar()->clear();
-        QVLCMenu::createMenuBar( this, p_intf, false, advControlsEnabled );
+        QVLCMenu::createMenuBar( this, p_intf, false, advControlsEnabled,
+                                 visualSelectorEnabled);
 
         if( videoIsActive )
         {
@@ -489,7 +481,8 @@ void MainInterface::customEvent( QEvent *event )
         PlaylistDialog::killInstance();
         playlistEmbeddedFlag = true;
         menuBar()->clear();
-        QVLCMenu::createMenuBar(this, p_intf, true, advControlsEnabled );
+        QVLCMenu::createMenuBar(this, p_intf, true, advControlsEnabled,
+                                visualSelectorEnabled);
         playlist();
     }
 }
@@ -560,18 +553,7 @@ static bool b_my_volume;
 
 void MainInterface::updateOnTimer()
 {
-    aout_instance_t *p_aout = (aout_instance_t *)vlc_object_find( p_intf,
-                                    VLC_OBJECT_AOUT, FIND_ANYWHERE );
-    /* Todo: make this event-driven */
-    if( p_aout )
-    {
-        ui.visualButton->setEnabled( true );
-        vlc_object_release( p_aout );
-    }
-    else
-        ui.visualButton->setEnabled( false );
-
-    /* And this too */
+    /* \todo Make this event-driven */
     advControls->enableInput( THEMIM->getIM()->hasInput() );
     advControls->enableVideo( THEMIM->getIM()->hasVideo() );
 

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index cbece4bb99d1ca9b4bef1bd1faf22aa7646388ee..2905c14e1ad202b420cdd1e526d5af3a59731ac4 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -82,6 +82,7 @@ private:
     bool                 videoEmbeddedFlag;
     bool                 alwaysVideoFlag;
     bool                 advControlsEnabled;
+    bool                 visualSelectorEnabled;
 
     InputManager        *main_input_manager;
     InputSlider         *slider;

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 992e1940e9a6a36cc2c0881a3959ef421b0b62d8..70488e692fcc414fb1d444e1401ef8adee477cbe 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -120,7 +120,8 @@ static int AudioAutoMenuBuilder( vlc_object_t *p_object,
     THEDP->menusUpdateMapper->setMapping( menu, f ); }
 
 void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
-                              bool playlist, bool adv_controls_enabled )
+                              bool playlist, bool adv_controls_enabled,
+                              bool visual_selector_enabled )
 {
     QMenuBar *bar = mi->menuBar();
     BAR_ADD( FileMenu(), qtr("Media") );
@@ -128,7 +129,8 @@ void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
     {
         BAR_ADD( PlaylistMenu( mi,p_intf ), qtr("Playlist" ) );
     }
-    BAR_ADD( ToolsMenu( p_intf, mi, adv_controls_enabled ), qtr("Tools") );
+    BAR_ADD( ToolsMenu( p_intf, mi, adv_controls_enabled,
+                        visual_selector_enabled ), qtr("Tools") );
     BAR_DADD( VideoMenu( p_intf, NULL ), qtr("Video"), 1 );
     BAR_DADD( AudioMenu( p_intf, NULL ), qtr("Audio"), 2 );
     BAR_DADD( NavigMenu( p_intf, NULL ), qtr("Navigation"), 3 );
@@ -162,7 +164,8 @@ QMenu *QVLCMenu::PlaylistMenu( MainInterface *mi, intf_thread_t *p_intf )
 }
 
 QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
-                            bool adv_controls_enabled, bool with_intf )
+                            bool adv_controls_enabled,
+                            bool visual_selector_enabled, bool with_intf )
 {
     QMenu *menu = new QMenu();
     if( with_intf )
@@ -183,6 +186,10 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
                                         mi, SLOT( advanced() ) );
         adv->setCheckable( true );
         if( adv_controls_enabled ) adv->setChecked( true );
+        adv = menu->addAction( qtr("Visualizations selector" ),
+                               mi, SLOT( visual() ) );
+        adv->setCheckable( true );
+        if( visual_selector_enabled ) adv->setChecked( true );
     }
     menu->addSeparator();
     DP_SADD( qtr("Preferences"), "", "", prefsDialog() );

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index f50f18ecbf71cc17ada7144ac8d069973c59a55d..69e03130b8c7287ad5471828cb537abb44dacde8 100644 (file)
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -58,13 +58,13 @@ class QVLCMenu : public QObject
 {
     Q_OBJECT;
 public:
-    static void createMenuBar( MainInterface *mi, intf_thread_t *, bool, bool );
+    static void createMenuBar( MainInterface *mi, intf_thread_t *, bool, bool, bool );
 
     /* Menus */
     static QMenu *FileMenu();
     static QMenu *SDMenu( intf_thread_t * );
     static QMenu *PlaylistMenu( MainInterface *, intf_thread_t *);
-    static QMenu *ToolsMenu( intf_thread_t *, MainInterface *, bool,
+    static QMenu *ToolsMenu( intf_thread_t *, MainInterface *, bool, bool,
                              bool with = true );
     static QMenu *NavigMenu( intf_thread_t * , QMenu * );
     static QMenu *VideoMenu( intf_thread_t * , QMenu * );

diff --git a/modules/gui/qt4/ui/main_interface.ui b/modules/gui/qt4/ui/main_interface.ui
index 2f7f00e7074949f153f29845bd5443ef1b81ada8..9b23c2ee20fd5c18853a57505e957f59be04bc58 100644 (file)
--- a/modules/gui/qt4/ui/main_interface.ui
+++ b/modules/gui/qt4/ui/main_interface.ui
@@ -209,13 +209,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="visualButton" >
-       <property name="text" >
-        <string/>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QPushButton" name="playlistButton" >
        <property name="text" >