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, 450 );
/* General widgets */
QGridLayout *mainLayout = new QGridLayout( this );
- QTabWidget *mainTab = new QTabWidget( this );
+ mainTab = new QTabWidget( this );
mainTab->setTabPosition( QTabWidget::North );
- QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
- closeButton->setDefault( true );
- clearButton = new QPushButton( qtr( "&Clear" ) );
- saveLogButton = new QPushButton( qtr( "&Save as..." ) );
-
- verbosityBox = new QSpinBox();
- verbosityBox->setRange( 0, 2 );
- verbosityBox->setValue( config_GetInt( p_intf, "verbose" ) );
- verbosityBox->setWrapping( true );
- verbosityBox->setMaximumWidth( 50 );
-
- 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->addWidget( saveLogButton, 1, 3 );
- mainLayout->addWidget( clearButton, 1, 4 );
- mainLayout->addWidget( closeButton, 1, 5 );
-
- BUTTONACT( closeButton, close() );
- BUTTONACT( clearButton, clear() );
- BUTTONACT( saveLogButton, save() );
- CONNECT( mainTab, currentChanged( int ), this, updateTab( int ) );
-
/* Messages */
QWidget *msgWidget = new QWidget;
mainTab->addTab( treeWidget, qtr( "Modules tree" ) );
+ /* Buttons and general layout */
+ QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
+ 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 );
+
+ 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, hide() );
+ BUTTONACT( clearUpdateButton, clearOrUpdate() );
+ BUTTONACT( saveLogButton, save() );
+ CONNECT( mainTab, currentChanged( int ),
+ this, updateTab( int ) );
+
/* General action */
- readSettings( "Messages" );
+ readSettings( "Messages", QSize( 600, 450 ) );
}
void MessagesDialog::updateTab( int index )
{
+ /* Second tab : modules tree */
if( index == 1 )
{
verbosityLabel->hide();
verbosityBox->hide();
- clearButton->hide();
+ clearUpdateButton->setText( qtr( "&Update" ) );
saveLogButton->hide();
updateTree();
}
+ /* First tab : messages */
else
{
verbosityLabel->show();
verbosityBox->show();
- clearButton->show();
+ clearUpdateButton->setText( qtr( "&Clear" ) );
saveLogButton->show();
}
}
}
}
-void MessagesDialog::buildTree( QTreeWidgetItem *parentItem, vlc_object_t *p_obj )
+void MessagesDialog::buildTree( QTreeWidgetItem *parentItem,
+ vlc_object_t *p_obj )
{
- vlc_object_yield( p_obj );
QTreeWidgetItem *item;
if( parentItem )
item->setText( 0, qfu( p_obj->psz_object_type ) + " (" +
QString::number(p_obj->i_object_id) + ")" );
- for( int i=0; i < p_obj->i_children; i++ )
- {
- buildTree( item, p_obj->pp_children[i]);
- }
+ item->setExpanded( true );
- vlc_object_release( p_obj );
+ 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::updateTree()
+void MessagesDialog::clearOrUpdate()
{
- modulesTree->clear();
-
- buildTree( NULL, VLC_OBJECT( p_intf->p_libvlc ) );
+ if( mainTab->currentIndex() )
+ updateTree();
+ else
+ clear();
}
-void MessagesDialog::close()
+void MessagesDialog::updateTree()
{
- hide();
+ modulesTree->clear();
+ buildTree( NULL, VLC_OBJECT( p_intf->p_libvlc ) );
}
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 ),
+ this, qtr( "Select a name for the logs file" ),
+ qfu( config_GetHomeDir() ),
qtr( "Texts / Logs (*.log *.txt);; All (*.*) ") );
if( !saveLogFileName.isNull() )