More l10n string fixes. Adds a FIXME to atmo.cpp, because that setting description...

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

diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index 63e31bf567ee9d6bdcc695acdbf37519113cbe51..a2d341103b5b677d4892328ea182c1bb17750a3b 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -21,6 +21,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  ******************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "dialogs/mediainfo.hpp"
 #include "input_manager.hpp"
@@ -75,7 +78,7 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf,
     closeButton->setDefault( true );
 
     uriLine = new QLineEdit;
-    QLabel *uriLabel = new QLabel( qtr( "Location :" ) );
+    QLabel *uriLabel = new QLabel( qtr( "Location:" ) );
 
     layout->addWidget( IT, 0, 0, 1, 8 );
     layout->addWidget( uriLabel, 1, 0, 1, 1 );
@@ -101,7 +104,8 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf,
         CONNECT( THEMIM, inputChanged( input_thread_t * ),
                  this, update( input_thread_t * ) );
 
-        p_item = input_GetItem( THEMIM->getInput() );
+        if( THEMIM->getInput() )
+            p_item = input_GetItem( THEMIM->getInput() );
     }
 
     /* Call update by hand, so info is shown from current item too */
@@ -155,14 +159,14 @@ void MediaInfoDialog::update( input_thread_t *p_input )
     vlc_object_release( p_input );
 }
 
-void MediaInfoDialog::updateOnTimeOut() 
+void MediaInfoDialog::updateOnTimeOut()
 {
-    /* Timer runs at 150 ms, dont' update more than 2 times per second */ 
-    i_runs++; 
-    if( i_runs % 4 != 0 ) return; 
+    /* Timer runs at 150 ms, dont' update more than 2 times per second */
+    i_runs++;
+    if( i_runs % 4 != 0 ) return;
 
-    /* Get Input and clear if non-existant */ 
-    input_thread_t *p_input = THEMIM->getInput(); 
+    /* Get Input and clear if non-existant */
+    input_thread_t *p_input = THEMIM->getInput();
 
     if( p_input && !p_input->b_dead )
     {
@@ -198,7 +202,7 @@ void MediaInfoDialog::clear()
 
 void MediaInfoDialog::close()
 {
-    this->toggleVisible();
+    toggleVisible();
 
     /* if dialog is closed, revert editing if not saved */
     if( MP->isInEditMode() )