Disables some useless metadata in infopanel dialog

Redesign the label & edits placement to resize the dialog

diff --git a/modules/gui/qt4/components/infopanels.cpp b/modules/gui/qt4/components/infopanels.cpp
index 40c6e365dbc71a855828d3771080aa8d2d77b5b1..c8caa8205b75eddb322f733f0ed86666d1363290 100644 (file)
--- a/modules/gui/qt4/components/infopanels.cpp
+++ b/modules/gui/qt4/components/infopanels.cpp
@@ -56,9 +56,19 @@ MetaPanel::MetaPanel( QWidget *parent,
 #define ADD_META( string, widget ) {                             \
     l->addWidget( new QLabel( qtr( string ) + " :" ), line, 0 ); \
     widget = new QLineEdit;                                      \
-    l->addWidget( widget, line, 1, 1, 9 );                       \
+    l->addWidget( widget, line, 1, 1, 5 );                       \
     line++;            }
 
+    /* ART_URL */
+    art_cover = new QLabel( "" );
+    art_cover->setMinimumHeight( 128 );
+    art_cover->setMinimumWidth( 128 );
+    art_cover->setMaximumHeight( 128 );
+    art_cover->setMaximumWidth( 128 );
+    art_cover->setScaledContents( true );
+    art_cover->setPixmap( QPixmap( ":/noart.png" ) );
+    l->addWidget( art_cover, line, 6, 4, 2 );
+
     /* Title, artist and album*/
     ADD_META( VLC_META_TITLE, title_text ); /* OK */
     ADD_META( VLC_META_ARTIST, artist_text ); /* OK */
@@ -68,47 +78,39 @@ MetaPanel::MetaPanel( QWidget *parent,
     /* FIXME List id3genres.h is not includable yet ? */
     genre_text = new QLineEdit;
     l->addWidget( new QLabel( qtr( VLC_META_GENRE ) + " :" ), line, 0 );
-    l->addWidget( genre_text, line, 1, 1, 6 );
+    l->addWidget( genre_text, line, 1, 1, 2 );
+
+    /* Number */
+    l->addWidget( new QLabel( qtr( "Track Number" )  + " :" ),
+                  line, 3 );
+    seqnum_text = new QSpinBox; setSpinBounds( seqnum_text );
+    l->addWidget( seqnum_text, line, 4, 1, 2 );
+    line++;
 
     /* Date (Should be in years) */
     date_text = new QSpinBox; setSpinBounds( date_text );
-    l->addWidget( new QLabel( qtr( VLC_META_DATE ) + " :" ), line, 7 );
-    l->addWidget( date_text, line, 8, 1, 2 );
-    line++;
+    l->addWidget( new QLabel( qtr( VLC_META_DATE ) + " :" ), line, 0 );
+    l->addWidget( date_text, line, 1, 1, 1 );
 
-    /* Number and Rating */
-    l->addWidget( new QLabel( qtr( "Track number/Position" )  + " :" ),
-                  line, 0 );
-    seqnum_text = new QSpinBox; setSpinBounds( seqnum_text );
-    l->addWidget( seqnum_text, line, 1, 1, 4 );
+    /* Rating */
 
-    l->addWidget( new QLabel( qtr( VLC_META_RATING ) + " :" ), line, 5 );
+    l->addWidget( new QLabel( qtr( VLC_META_RATING ) + " :" ), line, 2 );
     rating_text = new QSpinBox; setSpinBounds( rating_text) ;
-    l->addWidget( rating_text, line, 6, 1, 4 );
-    line++;
+    l->addWidget( rating_text, line, 3, 1, 1 );
 
     /* Now Playing ? */
-    ADD_META( VLC_META_NOW_PLAYING, nowplaying_text );
+//    ADD_META( VLC_META_NOW_PLAYING, nowplaying_text );
 
     /* Language and settings */
-    l->addWidget( new QLabel( qfu( VLC_META_LANGUAGE ) + " :" ), line, 0 );
+    l->addWidget( new QLabel( qfu( VLC_META_LANGUAGE ) + " :" ), line, 4 );
     language_text = new QLineEdit;
-    l->addWidget( language_text, line, 1, 1, 4 );
-    l->addWidget( new QLabel( qtr( VLC_META_SETTING ) + " :" ), line, 5 );
+    l->addWidget( language_text, line, 5, 1, 1 );
+/*    l->addWidget( new QLabel( qtr( VLC_META_SETTING ) + " :" ), line, 5 );
     setting_text = new QLineEdit;
     l->addWidget( setting_text, line, 6, 1, 4 );
-    line++;
-
-    /* ART_URL */
-    art_cover = new QLabel( "" );
-    art_cover->setMinimumHeight( 128 );
-    art_cover->setMinimumWidth( 128 );
-    art_cover->setMaximumHeight( 128 );
-    art_cover->setMaximumWidth( 128 );
-    art_cover->setScaledContents( true );
-    art_cover->setPixmap( QPixmap( ":/noart.png" ) );
-    l->addWidget( art_cover, line, 8, 4, 2 );
+    line++;*/
 
+/* useless metadata
 #define ADD_META_2( string, widget ) {                             \
     l->addWidget( new QLabel( qtr( string ) + " :" ), line, 0 ); \
     widget = new QLineEdit;                                      \
@@ -118,22 +120,21 @@ MetaPanel::MetaPanel( QWidget *parent,
     ADD_META_2( VLC_META_COPYRIGHT, copyright_text );
     ADD_META_2( VLC_META_PUBLISHER, publisher_text );
 
-    ADD_META_2( VLC_META_ENCODED_BY, publisher_text );
+    ADD_META_2( VLC_META_ENCODED_BY, encodedby_text );
     ADD_META_2( VLC_META_DESCRIPTION, description_text );
-
+*/
     /*  ADD_META( TRACKID )  Useless ? */
     /*  ADD_URI - DO not show it, done outside */
 
 #undef ADD_META
-#undef ADD_META_2
+//#undef ADD_META_2
 
 
     CONNECT( title_text, textEdited( QString ), this, editMeta( QString ) );
-    CONNECT( description_text, textEdited( QString ), this, editMeta( QString ) );
+//    CONNECT( description_text, textEdited( QString ), this, editMeta( QString ) );
     CONNECT( artist_text, textEdited( QString ), this, editMeta( QString ) );
     CONNECT( collection_text, textEdited( QString ), this, editMeta( QString ) );
     CONNECT( genre_text, textEdited( QString ), this, editMeta( QString ) );
-    CONNECT( description_text, textEdited( QString ), this, editMeta( QString ) );
     CONNECT( date_text, valueChanged( QString ), this, editMeta( QString ) );
     CONNECT( seqnum_text, valueChanged( QString ), this, editMeta( QString ) );
     CONNECT( rating_text, valueChanged( QString ), this, editMeta( QString ) );
@@ -256,13 +257,14 @@ void MetaPanel::update( input_item_t *p_item )
     /* Other classic though */
     UPDATE_META( Artist, artist_text );
     UPDATE_META( Genre, genre_text );
-    UPDATE_META( Copyright, copyright_text );
+//    UPDATE_META( Copyright, copyright_text );
     UPDATE_META( Album, collection_text );
-    UPDATE_META( Description, description_text );
+//    UPDATE_META( Description, description_text );
     UPDATE_META( Language, language_text );
-    UPDATE_META( NowPlaying, nowplaying_text );
-    UPDATE_META( Publisher, publisher_text );
-    UPDATE_META( Setting, setting_text );
+//    UPDATE_META( NowPlaying, nowplaying_text );
+//    UPDATE_META( Publisher, publisher_text );
+//    UPDATE_META( Setting, setting_text );
+//    UPDATE_META( EncodedBy, encodedby_text );
 
     UPDATE_META_INT( Date, date_text );
     UPDATE_META_INT( TrackNum, seqnum_text );

diff --git a/modules/gui/qt4/components/infopanels.hpp b/modules/gui/qt4/components/infopanels.hpp
index acd43a386d48a8f96878b770b0423525b97597f3..11c17147b1680d32e525ffc846489529cc36619e 100644 (file)
--- a/modules/gui/qt4/components/infopanels.hpp
+++ b/modules/gui/qt4/components/infopanels.hpp
@@ -63,16 +63,17 @@ private:
     QLineEdit *title_text;
     QLineEdit *artist_text;
     QLineEdit *genre_text;
-    QLineEdit *copyright_text;
+//    QLineEdit *copyright_text;
     QLineEdit *collection_text;
     QSpinBox *seqnum_text;
-    QLineEdit *description_text;
+//    QLineEdit *description_text;
     QSpinBox *rating_text;
     QSpinBox *date_text;
-    QLineEdit *setting_text;
+//    QLineEdit *setting_text;
     QLineEdit *language_text;
-    QLineEdit *nowplaying_text;
-    QLineEdit *publisher_text;
+//    QLineEdit *nowplaying_text;
+//    QLineEdit *publisher_text;
+//    QLineEdit *encodedby_text;
     QLabel *art_cover;
     bool in_edit;
 

diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index 5649bd2bdd03f71c2e9af74f2ce751e460f09ddb..022c9d6dc53b61b54ca457347eb0efc97bb352f4 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -48,7 +48,7 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf, bool _mainInput,
     need_update = true;
 
     setWindowTitle( qtr( "Media information" ) );
-    resize( 700 , 450 );
+    resize( 600 , 300 );
 
     /* TabWidgets and Tabs creation */
     IT = new QTabWidget;