Layout fixes in COPYING (and use spaces instead of tabs). Use a fixed width font...

[vlc] / modules / gui / qt4 / dialogs / mediainfo.cpp

diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index 529610e48ee33bdd062dd8017b8b3da4e3a150fa..a80b687c7f25d0f536edfe7dfed217b48410a42d 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -23,11 +23,9 @@
  ******************************************************************************/
 
 #include "dialogs/mediainfo.hpp"
+#include "components/infopanels.hpp"
 #include "input_manager.hpp"
 #include "dialogs_provider.hpp"
-#include "util/qvlcframe.hpp"
-#include "components/infopanels.hpp"
-#include "qt4.hpp"
 
 #include <QTabWidget>
 #include <QGridLayout>
@@ -45,10 +43,10 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf, bool _mainInput,
 {
     i_runs = 0;
     p_input = NULL;
-    need_update = true;
+    b_need_update = true;
 
     setWindowTitle( qtr( "Media information" ) );
-    resize( 600 , 300 );
+    resize( 600 , 480 );
 
     /* TabWidgets and Tabs creation */
     IT = new QTabWidget;
@@ -61,7 +59,7 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf, bool _mainInput,
     if( stats )
     {
         ISP = new InputStatsPanel( IT, p_intf );
-        IT->addTab( ISP, qtr( "&Stats" ) );
+        IT->addTab( ISP, qtr( "&Statistics" ) );
     }
 
     QGridLayout *layout = new QGridLayout( this );
@@ -88,7 +86,7 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf, bool _mainInput,
 
     /* Let the MetaData Panel update the URI */
     CONNECT( MP, uriSet( QString ), uriLine, setText( QString ) );
-    CONNECT( MP, editing( bool ), this, editMeta( bool ) );
+    CONNECT( MP, editing(), this, editMeta() );
 
     CONNECT( IT, currentChanged( int ), this, updateButtons( int ) );
 
@@ -113,8 +111,6 @@ void MediaInfoDialog::showTab( int i_tab = 0 )
     IT->setCurrentIndex( i_tab );
 }
 
-
-/**/
 void MediaInfoDialog::editMeta()
 {
     saveMetaButton->show();
@@ -130,7 +126,7 @@ static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
         vlc_value_t oldval, vlc_value_t newval, void *param )
 {
     MediaInfoDialog *p_d = (MediaInfoDialog *)param;
-    p_d->need_update = VLC_TRUE;
+    p_d->b_need_update = VLC_TRUE;
     return VLC_SUCCESS;
 }
 
@@ -138,14 +134,14 @@ void MediaInfoDialog::setInput( input_item_t *p_input )
 {
     clear();
     update( p_input, true, true );
-    /* if info is from current input, don't set default to edit, if user opens 
+    /* if info is from current input, don't set default to edit, if user opens
      * some other item, se default to edit, so it won't be updated to current item metas
      *
      * This really doesn't seem as clean solution as it could be
      */
     input_thread_t *p_current =
                      MainInputManager::getInstance( p_intf )->getInput();
-    MP->setEditMode( ( !p_current || p_current->b_dead ) ? 
+    MP->setEditMode( ( !p_current || p_current->b_dead || input_GetItem( p_current ) != p_input ) ?
                             true: false );
 }
 
@@ -166,13 +162,13 @@ void MediaInfoDialog::update()
 
     vlc_object_yield( p_input );
 
-    update( input_GetItem(p_input), need_update, need_update );
-    need_update = false;
+    update( input_GetItem(p_input), b_need_update, b_need_update );
+    b_need_update = false;
 
     vlc_object_release( p_input );
 }
 
-void MediaInfoDialog::update( input_item_t *p_item, 
+void MediaInfoDialog::update( input_item_t *p_item,
                                                  bool update_info,
                                                  bool update_meta )
 {