/*****************************************************************************
* 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 <jb (at) videolan.org>
*
* 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 "input_manager.hpp"
#include "dialogs/messages.hpp"
#include "dialogs_provider.hpp"
-#include "util/qvlcframe.hpp"
-#include "qt4.hpp"
+
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QLabel>
+#include <QTextEdit>
+#include <QTextCursor>
+#include <QFileDialog>
+#include <QTextStream>
+#include <QMessageBox>
+#include <QTabWidget>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QHeaderView>
MessagesDialog *MessagesDialog::instance = NULL;
-MessagesDialog::MessagesDialog( intf_thread_t *_p_intf, bool _main_input ) :
- QVLCFrame( _p_intf ), main_input( _main_input )
+MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
+ : QVLCFrame( _p_intf )
{
- setWindowTitle( _("Messages" ) );
- resize(600, 400);
-
- QGridLayout *layout = new QGridLayout(this);
- QPushButton *closeButton = new QPushButton(qtr("&Close"));
- QPushButton *clearButton = new QPushButton(qtr("&Clear"));
- QPushButton *saveLogButton = new QPushButton(qtr("&Save as..."));
- QSpinBox *verbosityBox = new QSpinBox();
- verbosityBox->setRange(0, 2);
- verbosityBox->setValue(config_GetInt(p_intf, "verbose"));
- verbosityBox->setWrapping(true);
- QLabel *verbosityLabel = new QLabel(qtr("Verbosity Level"));
+ setWindowTitle( qtr( "Messages" ) );
+
+ /* 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);
-
- layout->addWidget(messages, 0, 0, 1, 0);
- layout->addWidget(verbosityLabel, 1, 0, 1, 1);
- layout->addWidget(verbosityBox, 1, 2);
- layout->addWidget(saveLogButton, 2, 0);
- layout->addWidget(clearButton, 2, 1);
- layout->addWidget(closeButton, 2, 2);
-
- connect( closeButton, SIGNAL( clicked() ) ,
- this, SLOT( onCloseButton()));
- connect( clearButton, SIGNAL( clicked() ) ,
- this, SLOT( onClearButton()));
- connect( saveLogButton, SIGNAL( clicked() ) ,
- this, SLOT( onSaveButton()));
- connect( verbosityBox, SIGNAL( valueChanged(int) ),
- this, SLOT( onVerbosityChanged(int)));
- connect( DialogsProvider::getInstance(NULL)->fixed_timer,
- SIGNAL( timeout() ), this, SLOT(updateLog() ) );
-
- p_input = NULL;
+ 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" ) );
+ 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", 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()
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 )
{
- // [FIXME] Does not work as the old one
- // Outputs too much data ?
- // if (p_sub->p_msg[i_start].i_type = VLC_MSG_ERR)
- // continue;
- // if( !b_verbose &&
- // VLC_MSG_ERR != p_sub->p_msg[i_start].i_type )
- // continue;
-
- /* Append all messages to log window */
-
-
- messages->setFontItalic(true);
- messages->setTextColor("darkBlue");
- messages->insertPlainText(p_sub->p_msg[i_start].psz_module);
+ if( p_sub->p_msg[i_start].i_type == VLC_MSG_INFO ||
+ p_sub->p_msg[i_start].i_type == VLC_MSG_ERR ||
+ p_sub->p_msg[i_start].i_type == VLC_MSG_WARN &&
+ verbosityBox->value() >= 1 ||
+ p_sub->p_msg[i_start].i_type == VLC_MSG_DBG &&
+ verbosityBox->value() >= 2 )
+ {
+ messages->setFontItalic( true );
+ messages->setTextColor( "darkBlue" );
+ messages->insertPlainText( qfu( p_sub->p_msg[i_start].psz_module ) );
+ }
+ else
+ continue;
switch( p_sub->p_msg[i_start].i_type )
{
case VLC_MSG_INFO:
- messages->setTextColor("blue");
- messages->insertPlainText(" info: ");
+ messages->setTextColor( "blue" );
+ messages->insertPlainText( " info: " );
break;
case VLC_MSG_ERR:
- messages->setTextColor("red");
- messages->insertPlainText(" error: ");
+ messages->setTextColor( "red" );
+ messages->insertPlainText( " error: " );
break;
case VLC_MSG_WARN:
- messages->setTextColor("green");
- messages->insertPlainText(" warning: ");
+ messages->setTextColor( "green" );
+ messages->insertPlainText( " warning: " );
break;
case VLC_MSG_DBG:
default:
- messages->setTextColor("grey");
- messages->insertPlainText(" debug: ");
+ messages->setTextColor( "grey" );
+ messages->insertPlainText( " debug: " );
break;
}
/* Add message Regular black Font */
- messages->setFontItalic(false);
- messages->setTextColor("black");
+ messages->setFontItalic( false );
+ messages->setTextColor( "black" );
messages->insertPlainText( qfu(p_sub->p_msg[i_start].psz_msg) );
messages->insertPlainText( "\n" );
}
}
}
-void MessagesDialog::onCloseButton()
+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()
+{
+ if( mainTab->currentIndex() )
+ updateTree();
+ else
+ clear();
+}
+
+void MessagesDialog::updateTree()
{
- this->toggleVisible();
+ modulesTree->clear();
+ buildTree( NULL, VLC_OBJECT( p_intf->p_libvlc ) );
}
-void MessagesDialog::onClearButton()
+void MessagesDialog::clear()
{
messages->clear();
}
-bool MessagesDialog::onSaveButton()
+bool MessagesDialog::save()
{
QString saveLogFileName = QFileDialog::getSaveFileName(
- this,
- "Choose a filename to save the logs under...",
- p_intf->p_vlc->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 != NULL)
+ if( !saveLogFileName.isNull() )
{
- QFile file(saveLogFileName);
- if (!file.open(QFile::WriteOnly | QFile::Text)) {
- QMessageBox::warning(this, qtr("Application"),
- qtr("Cannot write file %1:\n%2.")
- .arg(saveLogFileName)
- .arg(file.errorString()));
+ QFile file( saveLogFileName );
+ if ( !file.open( QFile::WriteOnly | QFile::Text ) ) {
+ QMessageBox::warning( this, qtr( "Application" ),
+ qtr( "Cannot write file %1:\n%2." )
+ .arg( saveLogFileName )
+ .arg( file.errorString() ) );
return false;
}
- QTextStream out(&file);
+ QTextStream out( &file );
out << messages->toPlainText() << "\n";
return true;
}
return false;
}
-
-void MessagesDialog::onVerbosityChanged(int verbosityLevel)
-{
- //FIXME: Does not seems to work.
- vlc_value_t val;
- val.i_int = verbosityLevel - 1;
- var_Set( p_intf->p_vlc, "verbose", val );
-}
-
projects / vlc / blobdiff