Remove stupid test commited by error (pointed out by jb)

[vlc] / modules / gui / qt4 / components / info_panels.cpp

diff --git a/modules/gui/qt4/components/info_panels.cpp b/modules/gui/qt4/components/info_panels.cpp
index b9dc52efc8674d91f7d8adca71bfd7dbdbb84a91..107f4caf5cb2504e00d28a34b14ba34fb5788002 100644 (file)
--- a/modules/gui/qt4/components/info_panels.cpp
+++ b/modules/gui/qt4/components/info_panels.cpp
@@ -22,6 +22,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 "qt4.hpp"
 #include "components/info_panels.hpp"
@@ -64,16 +67,16 @@ MetaPanel::MetaPanel( QWidget *parent,
     /* Title, artist and album*/
     ADD_META( VLC_META_TITLE, title_text ); /* OK */
     ADD_META( VLC_META_ARTIST, artist_text ); /* OK */
-    ADD_META( VLC_META_COLLECTION, collection_text ); /* OK */
+    ADD_META( VLC_META_ALBUM, collection_text ); /* OK */
 
     /* Genre Name */
     /* TODO List id3genres.h is not includable yet ? */
     genre_text = new QLineEdit;
     metaLayout->addWidget( new QLabel( qtr( VLC_META_GENRE ) + " :" ), line, 0 );
-    metaLayout->addWidget( genre_text, line, 1, 1, 4 );
+    metaLayout->addWidget( genre_text, line, 1, 1, 3 );
 
     /* Number - on the same line */
-    metaLayout->addWidget( new QLabel( qtr( "Track Number" )  + " :" ),
+    metaLayout->addWidget( new QLabel( qtr( VLC_META_TRACK_NUMBER )  + " :" ),
                   line, 5, 1, 2  );
     seqnum_text = new QLineEdit;
     seqnum_text->setInputMask("0000");
@@ -95,10 +98,10 @@ MetaPanel::MetaPanel( QWidget *parent,
     metaLayout->addWidget( rating_text, line, 6, 1, 1 );
     */
     /* Language on the same line */
-    metaLayout->addWidget( new QLabel( qfu( VLC_META_LANGUAGE ) + " :" ), line, 7, 1, 2 );
+    metaLayout->addWidget( new QLabel( qfu( VLC_META_LANGUAGE ) + " :" ), line, 5, 1, 2 );
     language_text = new QLineEdit;
     language_text->setReadOnly( true );
-    metaLayout->addWidget( language_text, line,  9, 1, 1 );
+    metaLayout->addWidget( language_text, line,  7, 1, 3 );
     line++;
 
     /* ART_URL */
@@ -109,7 +112,7 @@ MetaPanel::MetaPanel( QWidget *parent,
     art_cover->setMaximumWidth( 128 );
     art_cover->setScaledContents( true );
     art_cover->setPixmap( QPixmap( ":/noart.png" ) );
-    metaLayout->addWidget( art_cover, line, 8, 4, 2 );
+    metaLayout->addWidget( art_cover, line, 8, 4, 2, Qt::AlignRight );
 
 /* Settings is unused */
 /*    l->addWidget( new QLabel( qtr( VLC_META_SETTING ) + " :" ), line, 5 );
@@ -136,6 +139,8 @@ MetaPanel::MetaPanel( QWidget *parent,
     /*  ADD_META( TRACKID )  Useless ? */
     /*  ADD_URI - DO not show it, done outside */
 
+    metaLayout->setColumnStretch( 1, 2 );
+    metaLayout->setColumnMinimumWidth ( 1, 80 );
 #undef ADD_META
 #undef ADD_META_2
 
@@ -372,7 +377,10 @@ void ExtraMetaPanel::update( input_item_t *p_item )
     vlc_mutex_lock( &p_item->lock );
     vlc_meta_t *p_meta = p_item->p_meta;
     if( !p_meta )
+    {
+        vlc_mutex_unlock( &p_item->lock );
         return;
+    }
 
     vlc_dictionary_t * p_dict = &p_meta->extra_tags;
     char ** ppsz_allkey = vlc_dictionary_all_keys( p_dict );
@@ -414,7 +422,7 @@ InfoPanel::InfoPanel( QWidget *parent,
      QList<QTreeWidgetItem *> items;
 
      QLabel *topLabel = new QLabel( qtr( "Information about what your media or"
-              " stream is made of.\n Muxer, Audio and Video Codecs, Subtitles "
+              " stream is made of.\nMuxer, Audio and Video Codecs, Subtitles "
               "are shown." ) );
      topLabel->setWordWrap( true );
      layout->addWidget( topLabel, 0, 0 );
@@ -487,8 +495,8 @@ InputStatsPanel::InputStatsPanel( QWidget *parent,
 
      QList<QTreeWidgetItem *> items;
 
-     QLabel *topLabel = new QLabel( qtr( "Various statistics about the current"
-                 " media or stream.\n Played and streamed info are shown." ) );
+     QLabel *topLabel = new QLabel( qtr( "Statistics about the currently "
+                 "playing media or stream." ) );
      topLabel->setWordWrap( true );
      layout->addWidget( topLabel, 0, 0 );
 
@@ -535,7 +543,7 @@ InputStatsPanel::InputStatsPanel( QWidget *parent,
     CREATE_AND_ADD_TO_CAT( send_stat, qtr("Sent packets"), "0", streaming, "" );
     CREATE_AND_ADD_TO_CAT( send_bytes_stat, qtr("Sent bytes"),
                            "0", streaming, "kB" );
-    CREATE_AND_ADD_TO_CAT( send_bitrate_stat, qtr("Sent bitrates"),
+    CREATE_AND_ADD_TO_CAT( send_bitrate_stat, qtr("Sent bitrate"),
                            "0", streaming, "kb/s" );
 
     CREATE_AND_ADD_TO_CAT( adecoded_stat, qtr("Decoded blocks"),