From: Clément Stenac Date: Sun, 12 Nov 2006 10:22:39 +0000 (+0000) Subject: Qt4: add meta info panel and fix layout bug in stats X-Git-Tag: 0.9.0-test0~9514 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1f52d4926216f981aa525c55e31d73f60377f571;p=vlc Qt4: add meta info panel and fix layout bug in stats --- diff --git a/modules/gui/qt4/components/infopanels.cpp b/modules/gui/qt4/components/infopanels.cpp index 15eeec8ab4..d7377a1e1d 100644 --- a/modules/gui/qt4/components/infopanels.cpp +++ b/modules/gui/qt4/components/infopanels.cpp @@ -86,31 +86,68 @@ void InputStatsPanel::clear() MetaPanel::MetaPanel( QWidget *parent, intf_thread_t *_p_intf ) : QWidget( parent ), p_intf( _p_intf ) { - + int line = 0; + QGridLayout *l = new QGridLayout( this ); +#define ADD_META( string, widget ) { \ + l->addWidget( new QLabel( qfu( string ) ), line, 0 ); \ + widget = new QLabel( "" ); \ + l->addWidget( widget, line, 1 ); \ + line++; } + ADD_META( _( "Name" ), name_text ); + ADD_META( _( "URI" ), uri_text ); + ADD_META( VLC_META_ARTIST, artist_text ); + ADD_META( VLC_META_GENRE, genre_text ); + ADD_META( VLC_META_COPYRIGHT, copyright_text ); + ADD_META( VLC_META_COLLECTION, collection_text ); + ADD_META( VLC_META_SEQ_NUM, seqnum_text ); + ADD_META( VLC_META_DESCRIPTION, description_text ); + ADD_META( VLC_META_RATING, rating_text ); + ADD_META( VLC_META_DATE, date_text ); + ADD_META( VLC_META_LANGUAGE, language_text ); + ADD_META( VLC_META_NOW_PLAYING, nowplaying_text ); + ADD_META( VLC_META_PUBLISHER, publisher_text ); + ADD_META( VLC_META_SETTING, setting_text ); } + MetaPanel::~MetaPanel() { } -void MetaPanel::update( input_item_t *p_item ) -{ -} -void MetaPanel::clear() -{ -} -char* MetaPanel::getURI() +void MetaPanel::update( input_item_t *p_item ) { - char *URI; - return URI; +#define UPDATE_META( meta, widget ) { \ + char* psz_meta = p_item->p_meta->psz_##meta; \ + if( !EMPTY_STR( psz_meta ) ) \ + widget->setText( qfu( psz_meta ) ); \ + else \ + widget->setText( "" ); } + + if( !EMPTY_STR( p_item->psz_name ) ) + name_text->setText( qfu( p_item->psz_name ) ); + else name_text->setText( "" ); + if( !EMPTY_STR( p_item->psz_uri ) ) + uri_text->setText( qfu( p_item->psz_uri ) ); + else uri_text->setText( "" ); + UPDATE_META( artist, artist_text ); + UPDATE_META( genre, genre_text ); + UPDATE_META( copyright, copyright_text ); + UPDATE_META( album, collection_text ); + UPDATE_META( tracknum, seqnum_text ); + UPDATE_META( description, description_text ); + UPDATE_META( rating, rating_text ); + UPDATE_META( date, date_text ); + UPDATE_META( language, language_text ); + UPDATE_META( nowplaying, nowplaying_text ); + UPDATE_META( publisher, publisher_text ); + UPDATE_META( setting, setting_text ); + +#undef UPDATE_META } -char* MetaPanel::getName() +void MetaPanel::clear() { - char *Name; - return Name; } - InfoPanel::InfoPanel( QWidget *parent, intf_thread_t *_p_intf ) : QWidget( parent ), p_intf( _p_intf ) { diff --git a/modules/gui/qt4/components/infopanels.hpp b/modules/gui/qt4/components/infopanels.hpp index 0fff766d9c..7e00f9b6cc 100644 --- a/modules/gui/qt4/components/infopanels.hpp +++ b/modules/gui/qt4/components/infopanels.hpp @@ -57,13 +57,25 @@ public: virtual ~MetaPanel(); private: intf_thread_t *p_intf; + QLabel *uri_text; + QLabel *name_text; + QLabel *artist_text; + QLabel *genre_text; + QLabel *copyright_text; + QLabel *collection_text; + QLabel *seqnum_text; + QLabel *description_text; + QLabel *rating_text; + QLabel *date_text; + QLabel *setting_text; + QLabel *language_text; + QLabel *nowplaying_text; + QLabel *publisher_text; + public slots: void update( input_item_t * ); void clear(); - - char* getURI(); - char* getName(); }; class InfoPanel: public QWidget diff --git a/modules/gui/qt4/ui/input_stats.ui b/modules/gui/qt4/ui/input_stats.ui index 07e46b9b9d..426328e5c2 100644 --- a/modules/gui/qt4/ui/input_stats.ui +++ b/modules/gui/qt4/ui/input_stats.ui @@ -1,123 +1,143 @@ - - - InputStats 0 0 - 470 - 300 + 486 + 302 _("Form") - - - - 240 - 150 - 215 - 135 - + + + 9 - - _("Audio") + + 6 - - - 9 - - - 6 - - - - - 0 + + + + _("Audio") + + + + 9 + + + 6 + + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + _("Played buffers") + + + + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + _("Lost buffers") + + + + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + _("Decoded blocks") + + + + + + + + + + _("Video") + + + + + 11 + 62 + 133 + 28 + - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - _("Played buffers") + _("Displayed frames") - - - - - 0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 11 + 96 + 133 + 28 + - - - - - _("Lost buffers") + _("Lost frames") - - - - - 0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 11 + 28 + 133 + 28 + - - - - _("Decoded blocks") - - - - - - - 10 - 10 - 215 - 135 - - - - _("Input") - - - - 9 - - - 6 - - - - - 0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 150 + 96 + 50 + 28 + - - - - 0 @@ -125,41 +145,15 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - kb/s - - - - - - - kb/s - - - - - - - - 0 - 0 - 0 - 0 - + + + + 150 + 62 + 50 + 28 + - - kB - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - 0 @@ -167,103 +161,15 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - _("Demuxed") - - - - - - - _("Stream bitrate") + + + + 150 + 28 + 50 + 28 + - - - - - - _("Read at media") - - - - - - - _("Input bitrate") - - - - - - - kB - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - 240 - 10 - 215 - 135 - - - - _("Streaming") - - - - 9 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - kb/s - - - - - - - 0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 0 @@ -271,159 +177,233 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - kB - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - _("Send bitrate") - - - - - - - _("Sent bytes") - - - - - - - _("Sent packets") - - - - - - - - - - - - - - - - 10 - 150 - 215 - 135 - - - - _("Video") - - - - - 11 - 62 - 133 - 28 - - - - _("Displayed frames") - - - - - - 11 - 96 - 133 - 28 - - - - _("Lost frames") - - - - - - 11 - 28 - 133 - 28 - - - - _("Decoded blocks") - - - - - - 150 - 96 - 50 - 28 - - - - 0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 150 - 62 - 50 - 28 - - - - 0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 150 - 28 - 50 - 28 - - - - 0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + + + + _("Streaming") + + + + 9 + + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + kb/s + + + + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + kB + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + _("Send bitrate") + + + + + + + _("Sent bytes") + + + + + + + _("Sent packets") + + + + + + + + + + + + + + + + + _("Input") + + + + 9 + + + 6 + + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + kb/s + + + + + + + kb/s + + + + + + + + 0 + 0 + 0 + 0 + + + + kB + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + _("Demuxed") + + + + + + + _("Stream bitrate") + + + + + + + _("Read at media") + + + + + + + _("Input bitrate") + + + + + + + kB + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + -