X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fmessages.cpp;h=59e8fbad0c530a0528120325fa7fa81af175b0be;hb=07a2328d3b27d99b213086054dfacda4b94dcd4f;hp=6f0aaf41d01ac048acd6b6dcbb12f0e609e37727;hpb=abef937f02a581a8969614422b478755e8c1b98f;p=vlc diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp index 6f0aaf41d0..59e8fbad0c 100644 --- a/modules/gui/qt4/dialogs/messages.cpp +++ b/modules/gui/qt4/dialogs/messages.cpp @@ -1,8 +1,8 @@ /***************************************************************************** * Messages.cpp : Information about an item **************************************************************************** - * Copyright (C) 2006 the VideoLAN team - * $Id: Messages.cpp 16024 2006-07-13 13:51:05Z xtophe $ + * Copyright (C) 2006-2007 the VideoLAN team + * $Id$ * * Authors: Jean-Baptiste Kempf * @@ -20,11 +20,13 @@ * 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/messages.hpp" #include "dialogs_provider.hpp" -#include "util/qvlcframe.hpp" -#include "qt4.hpp" + #include #include #include @@ -33,45 +35,101 @@ #include #include #include +#include +#include +#include +#include MessagesDialog *MessagesDialog::instance = NULL; -MessagesDialog::MessagesDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) +MessagesDialog::MessagesDialog( intf_thread_t *_p_intf) + : QVLCFrame( _p_intf ) { setWindowTitle( qtr( "Messages" ) ); - resize(600, 400); - QGridLayout *layout = new QGridLayout( this ); + /* General widgets */ + QGridLayout *mainLayout = new QGridLayout( this ); + mainTab = new QTabWidget( this ); + mainTab->setTabPosition( QTabWidget::North ); + + + /* Messages */ + QWidget *msgWidget = new QWidget; + QGridLayout *msgLayout = new QGridLayout( msgWidget ); + + messages = new QTextEdit(); + messages->setReadOnly( true ); + messages->setGeometry( 0, 0, 440, 600 ); + messages->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); + + msgLayout->addWidget( messages, 0, 0, 1, 0 ); + mainTab->addTab( msgWidget, qtr( "Messages" ) ); + ON_TIMEOUT( updateLog() ); + + + /* Modules tree */ + QWidget *treeWidget = new QWidget; + QGridLayout *treeLayout = new QGridLayout( treeWidget ); + + modulesTree = new QTreeWidget(); + modulesTree->header()->hide(); + + treeLayout->addWidget( modulesTree, 0, 0, 1, 0 ); + mainTab->addTab( treeWidget, qtr( "Modules tree" ) ); + + + /* Buttons and general layout */ QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); - QPushButton *clearButton = new QPushButton( qtr( "&Clear" ) ); - QPushButton *saveLogButton = new QPushButton( qtr( "&Save as..." ) ); + closeButton->setDefault( true ); + clearUpdateButton = new QPushButton( qtr( "&Clear" ) ); + saveLogButton = new QPushButton( qtr( "&Save as..." ) ); + saveLogButton->setToolTip( qtr( "Save all the displayed logs to a file" ) ); + verbosityBox = new QSpinBox(); verbosityBox->setRange( 0, 2 ); verbosityBox->setValue( config_GetInt( p_intf, "verbose" ) ); verbosityBox->setWrapping( true ); verbosityBox->setMaximumWidth( 50 ); - QLabel *verbosityLabel = new QLabel(qtr( "Verbosity Level" ) ); - messages = new QTextEdit(); - messages->setReadOnly( true ); - messages->setGeometry( 0, 0, 440, 600 ); - messages->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); - layout->addWidget( messages, 0, 0, 1, 0 ); - layout->addWidget( verbosityLabel, 1, 0, 1,1 ); - layout->addWidget( verbosityBox, 1, 1 ); - layout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ), 1,2 ); - layout->addWidget( saveLogButton, 1, 3 ); - layout->addWidget( clearButton, 1, 4 ); - layout->addWidget( closeButton, 1, 5 ); + verbosityLabel = new QLabel( qtr( "Verbosity Level" ) ); + + mainLayout->addWidget( mainTab, 0, 0, 1, 0 ); + mainLayout->addWidget( verbosityLabel, 1, 0, 1, 1 ); + mainLayout->addWidget( verbosityBox, 1, 1 ); + mainLayout->setColumnStretch( 2, 10 ); + mainLayout->addWidget( saveLogButton, 1, 3 ); + mainLayout->addWidget( clearUpdateButton, 1, 4 ); + mainLayout->addWidget( closeButton, 1, 5 ); - BUTTONACT( closeButton, close() ); - BUTTONACT( clearButton, clear() ); + BUTTONACT( closeButton, hide() ); + BUTTONACT( clearUpdateButton, clearOrUpdate() ); BUTTONACT( saveLogButton, save() ); - ON_TIMEOUT( updateLog() ); + CONNECT( mainTab, currentChanged( int ), + this, updateTab( int ) ); + + /* General action */ + readSettings( "Messages", QSize( 600, 450 ) ); } -MessagesDialog::~MessagesDialog() +void MessagesDialog::updateTab( int index ) { + /* Second tab : modules tree */ + if( index == 1 ) + { + verbosityLabel->hide(); + verbosityBox->hide(); + clearUpdateButton->setText( qtr( "&Update" ) ); + saveLogButton->hide(); + updateTree(); + } + /* First tab : messages */ + else + { + verbosityLabel->show(); + verbosityBox->show(); + clearUpdateButton->setText( qtr( "&Clear" ) ); + saveLogButton->show(); + } } void MessagesDialog::updateLog() @@ -83,9 +141,10 @@ void MessagesDialog::updateLog() int i_stop = *p_sub->pi_stop; vlc_mutex_unlock( p_sub->p_lock ); - messages->textCursor().movePosition( QTextCursor::End ); if( p_sub->i_start != i_stop ) { + messages->textCursor().movePosition( QTextCursor::End ); + for( i_start = p_sub->i_start; i_start != i_stop; i_start = (i_start+1) % VLC_MSG_QSIZE ) @@ -99,7 +158,7 @@ void MessagesDialog::updateLog() { messages->setFontItalic( true ); messages->setTextColor( "darkBlue" ); - messages->insertPlainText( qfu(p_sub->p_msg[i_start].psz_module)); + messages->insertPlainText( qfu( p_sub->p_msg[i_start].psz_module ) ); } else continue; @@ -139,9 +198,44 @@ void MessagesDialog::updateLog() } } -void MessagesDialog::close() +void MessagesDialog::buildTree( QTreeWidgetItem *parentItem, + vlc_object_t *p_obj ) +{ + QTreeWidgetItem *item; + + if( parentItem ) + item = new QTreeWidgetItem( parentItem ); + else + item = new QTreeWidgetItem( modulesTree ); + + if( p_obj->psz_object_name ) + item->setText( 0, qfu( p_obj->psz_object_type ) + " \"" + + qfu( p_obj->psz_object_name ) + "\" (" + + QString::number(p_obj->i_object_id) + ")" ); + else + item->setText( 0, qfu( p_obj->psz_object_type ) + " (" + + QString::number(p_obj->i_object_id) + ")" ); + + item->setExpanded( true ); + + vlc_list_t *l = vlc_list_children( p_obj ); + for( int i=0; i < l->i_count; i++ ) + buildTree( item, l->p_values[i].p_object ); + vlc_list_release( l ); +} + +void MessagesDialog::clearOrUpdate() { - this->toggleVisible(); + if( mainTab->currentIndex() ) + updateTree(); + else + clear(); +} + +void MessagesDialog::updateTree() +{ + modulesTree->clear(); + buildTree( NULL, VLC_OBJECT( p_intf->p_libvlc ) ); } void MessagesDialog::clear() @@ -152,9 +246,9 @@ void MessagesDialog::clear() bool MessagesDialog::save() { QString saveLogFileName = QFileDialog::getSaveFileName( - this, qtr( "Choose a filename to save the logs under..." ), - qfu( p_intf->p_libvlc->psz_homedir ), - "Texts / Logs (*.log *.txt);; All (*.*) " ); + this, qtr( "Select a name for the logs file" ), + qfu( config_GetHomeDir() ), + qtr( "Texts / Logs (*.log *.txt);; All (*.*) ") ); if( !saveLogFileName.isNull() ) { @@ -174,4 +268,3 @@ bool MessagesDialog::save() } return false; } -