/*****************************************************************************
* 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"
-MessagesDialog *MessagesDialog::instance = NULL;
+#include <QSpinBox>
+#include <QLabel>
+#include <QTextEdit>
+#include <QTextCursor>
+#include <QFileDialog>
+#include <QTextStream>
+#include <QMessageBox>
+#include <QTabWidget>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QHeaderView>
+#include <QMutex>
+#include <QLineEdit>
+#include <QPushButton>
-MessagesDialog::MessagesDialog( intf_thread_t *_p_intf, bool _main_input ) :
- QVLCFrame( _p_intf ), main_input( _main_input )
+#include <assert.h>
+
+enum {
+ MsgEvent_Type = QEvent::User + MsgEventType + 1,
+};
+
+class MsgEvent : public QEvent
+{
+public:
+ MsgEvent( msg_item_t *msg )
+ : QEvent( (QEvent::Type)MsgEvent_Type ), msg(msg)
+ {
+ msg_Hold( msg );
+ }
+ virtual ~MsgEvent()
+ {
+ msg_Release( msg );
+ }
+
+ msg_item_t *msg;
+};
+
+struct msg_cb_data_t
{
- 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(1, 3);
- verbosityBox->setWrapping(true);
- QLabel *verbosityLabel = new QLabel(qtr("Verbosity Level"));
+ MessagesDialog *self;
+};
+static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned );
+
+MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
+ : QVLCFrame( _p_intf )
+{
+ setWindowTitle( qtr( "Messages" ) );
+ setWindowRole( "vlc-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 );
+ messages->setTextInteractionFlags( Qt::TextSelectableByMouse );
+
+ msgLayout->addWidget( messages, 0, 0, 1, 0 );
+ mainTab->addTab( msgWidget, qtr( "Messages" ) );
+
+
+ /* 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( "C&lear" ) );
+ saveLogButton = new QPushButton( qtr( "&Save as..." ) );
+ saveLogButton->setToolTip( qtr( "Saves all the displayed logs to a file" ) );
+
+ verbosityBox = new QSpinBox();
+ verbosityBox->setRange( 0, 2 );
+ verbosityBox->setValue( var_InheritInteger( p_intf, "verbose" ) );
+ verbosityBox->setWrapping( true );
+ verbosityBox->setMaximumWidth( 50 );
+
+ verbosityLabel = new QLabel( qtr( "Verbosity Level" ) );
+
+ vbobjectsEdit = new QLineEdit();
+
+ vbobjectsEdit->setMaximumWidth( 100 );
+ vbobjectsEdit->setText(config_GetPsz( p_intf, "verbose-objects"));
+ vbobjectsEdit->setToolTip( "verbose-objects usage: \n"
+ "--verbose-objects=+printthatobject,-dontprintthatone\n"
+ "(keyword 'all' to applies to all objects)");
+
+ vbobjectsLabel = new QLabel( qtr( "Message filter" ) );
+
+ mainLayout->addWidget( mainTab, 0, 0, 1, 0 );
+ mainLayout->addWidget( verbosityLabel, 1, 0, 1, 1 );
+ mainLayout->addWidget( verbosityBox, 1, 1 );
+ mainLayout->addWidget( vbobjectsLabel, 1, 2, 1, 1 );
+ mainLayout->addWidget( vbobjectsEdit, 1, 3 );
+ mainLayout->setColumnStretch( 4, 10 );
+ mainLayout->addWidget( saveLogButton, 1, 5 );
+ mainLayout->addWidget( clearUpdateButton, 1, 6 );
+ mainLayout->addWidget( closeButton, 1, 7 );
+
+ BUTTONACT( closeButton, hide() );
+ BUTTONACT( clearUpdateButton, clearOrUpdate() );
+ BUTTONACT( saveLogButton, save() );
+ CONNECT( mainTab, currentChanged( int ),
+ this, updateTab( int ) );
+ CONNECT(vbobjectsEdit, editingFinished(), this, updateConfig());
+ CONNECT( verbosityBox, valueChanged( int ),
+ this, changeVerbosity( int ) );
+
+ /* General action */
+ readSettings( "Messages", QSize( 600, 450 ) );
+
+
+ /* Hook up to LibVLC messaging */
+ cbData = new msg_cb_data_t;
+ cbData->self = this;
+ sub = msg_Subscribe( p_intf->p_libvlc, MsgCallback, cbData );
+ changeVerbosity( verbosityBox->value() );
}
MessagesDialog::~MessagesDialog()
{
+ writeSettings( "Messages" );
+ msg_Unsubscribe( sub );
+ delete cbData;
+};
+
+void MessagesDialog::changeVerbosity( int verbosity )
+{
+ msg_SubscriptionSetVerbosity( sub , verbosity );
}
-void MessagesDialog::updateLog()
+void MessagesDialog::updateTab( int index )
{
- msg_subscription_t *p_sub = p_intf->p_sys->p_sub;
- int i_start;
+ /* Second tab : modules tree */
+ if( index == 1 )
+ {
+ verbosityLabel->hide();
+ verbosityBox->hide();
+ vbobjectsLabel->hide();
+ vbobjectsEdit->hide();
+ clearUpdateButton->setText( qtr( "&Update" ) );
+ saveLogButton->hide();
+ updateTree();
+ }
+ /* First tab : messages */
+ else
+ {
+ verbosityLabel->show();
+ verbosityBox->show();
+ vbobjectsLabel->show();
+ vbobjectsEdit->show();
+ clearUpdateButton->setText( qtr( "&Clear" ) );
+ saveLogButton->show();
+ }
+}
- vlc_mutex_lock( p_sub->p_lock );
- int i_stop = *p_sub->pi_stop;
- vlc_mutex_unlock( p_sub->p_lock );
+void MessagesDialog::updateConfig()
+{
+ config_PutPsz(p_intf, "verbose-objects", qtu(vbobjectsEdit->text()));
+ //vbobjectsEdit->setText("vbEdit changed!");
- messages->textCursor().movePosition( QTextCursor::End );
- if( p_sub->i_start != i_stop )
+ if( !vbobjectsEdit->text().isEmpty() )
{
- for( i_start = p_sub->i_start;
- i_start != i_stop;
- i_start = (i_start+1) % VLC_MSG_QSIZE )
+ /* if user sets filter, go with the idea that user just wants that to be shown,
+ so disable all by default and enable those that user wants */
+ msg_DisableObjectPrinting( p_intf, "all");
+ char * psz_verbose_objects = strdup(qtu(vbobjectsEdit->text()));
+ char * psz_object, * iter = psz_verbose_objects;
+ while( (psz_object = strsep( &iter, "," )) )
{
- // [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 */
+ switch( psz_object[0] )
+ {
+ printf("%s\n", psz_object+1);
+ case '+': msg_EnableObjectPrinting(p_intf, psz_object+1); break;
+ case '-': msg_DisableObjectPrinting(p_intf, psz_object+1); break;
+ /* user can but just 'lua,playlist' on filter */
+ default: msg_EnableObjectPrinting(p_intf, psz_object); break;
+ }
+ }
+ free( psz_verbose_objects );
+ }
+ else
+ {
+ msg_EnableObjectPrinting( p_intf, "all");
+ }
+}
+void MessagesDialog::sinkMessage( msg_item_t *item )
+{
+ /* Copy selected text to the clipboard */
+ if( messages->textCursor().hasSelection() )
+ messages->copy();
- messages->setFontItalic(true);
- messages->setTextColor("darkBlue");
- messages->insertPlainText(p_sub->p_msg[i_start].psz_module);
+ /* Fix selected text bug */
+ if( !messages->textCursor().atEnd() ||
+ messages->textCursor().anchor() != messages->textCursor().position() )
+ messages->moveCursor( QTextCursor::End );
- switch( p_sub->p_msg[i_start].i_type )
- {
- case VLC_MSG_INFO:
- messages->setTextColor("blue");
- messages->insertPlainText(" info: ");
- break;
- case VLC_MSG_ERR:
- messages->setTextColor("red");
- messages->insertPlainText(" error: ");
- break;
- case VLC_MSG_WARN:
- messages->setTextColor("green");
- messages->insertPlainText(" warning: ");
- break;
- case VLC_MSG_DBG:
- default:
- messages->setTextColor("grey");
- messages->insertPlainText(" debug: ");
- break;
- }
-
- /* Add message Regular black Font */
- messages->setFontItalic(false);
- messages->setTextColor("black");
- messages->insertPlainText( qfu(p_sub->p_msg[i_start].psz_msg) );
- messages->insertPlainText( "\n" );
- }
- messages->ensureCursorVisible();
+ messages->setFontItalic( true );
+ messages->setTextColor( "darkBlue" );
+ messages->insertPlainText( qfu( item->psz_module ) );
- vlc_mutex_lock( p_sub->p_lock );
- p_sub->i_start = i_start;
- vlc_mutex_unlock( p_sub->p_lock );
+ switch (item->i_type)
+ {
+ case VLC_MSG_INFO:
+ messages->setTextColor( "blue" );
+ messages->insertPlainText( " info: " );
+ break;
+ case VLC_MSG_ERR:
+ messages->setTextColor( "red" );
+ messages->insertPlainText( " error: " );
+ break;
+ case VLC_MSG_WARN:
+ messages->setTextColor( "green" );
+ messages->insertPlainText( " warning: " );
+ break;
+ case VLC_MSG_DBG:
+ default:
+ messages->setTextColor( "grey" );
+ messages->insertPlainText( " debug: " );
+ break;
}
+
+ /* Add message Regular black Font */
+ messages->setFontItalic( false );
+ messages->setTextColor( "black" );
+ messages->insertPlainText( qfu(item->psz_msg) );
+ messages->insertPlainText( "\n" );
+ messages->ensureCursorVisible();
}
-void MessagesDialog::onCloseButton()
+void MessagesDialog::customEvent( QEvent *event )
{
- this->toggleVisible();
+ MsgEvent *msge = static_cast<MsgEvent *>(event);
+
+ assert( msge );
+ sinkMessage( msge->msg );
}
-void MessagesDialog::onClearButton()
+void MessagesDialog::clearOrUpdate()
+{
+ if( mainTab->currentIndex() )
+ updateTree();
+ else
+ clear();
+}
+
+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( "Save log file as..." ),
+ QVLCUserDir( VLC_DOCUMENTS_DIR ),
+ 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 to 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)
+void MessagesDialog::buildTree( QTreeWidgetItem *parentItem,
+ vlc_object_t *p_obj )
{
- //FIXME: Does not seems to work.
- vlc_value_t val;
- val.i_int = verbosityLevel - 1;
- var_Set( p_intf->p_vlc, "verbose", val );
+ QTreeWidgetItem *item;
+
+ if( parentItem )
+ item = new QTreeWidgetItem( parentItem );
+ else
+ item = new QTreeWidgetItem( modulesTree );
+
+ char *name = vlc_object_get_name( p_obj );
+ if( name != NULL )
+ {
+ item->setText( 0, qfu( p_obj->psz_object_type ) + " \"" +
+ qfu( name ) + "\" (" +
+ QString::number((uintptr_t)p_obj) + ")" );
+ free( name );
+ }
+ else
+ item->setText( 0, qfu( p_obj->psz_object_type ) + " (" +
+ QString::number((uintptr_t)p_obj) + ")" );
+
+ 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::updateTree()
+{
+ modulesTree->clear();
+ buildTree( NULL, VLC_OBJECT( p_intf->p_libvlc ) );
+}
+
+static void MsgCallback( msg_cb_data_t *data, msg_item_t *item, unsigned )
+{
+ int canc = vlc_savecancel();
+
+ QApplication::postEvent( data->self, new MsgEvent( item ) );
+
+ vlc_restorecancel( canc );
}
projects / vlc / blobdiff