#include <QTreeWidgetItem>
#include <QHeaderView>
#include <QMutex>
+#include <QLineEdit>
+#include <QPushButton>
#include <assert.h>
-MessagesDialog *MessagesDialog::instance = NULL;
-
enum {
MsgEvent_Type = QEvent::User + MsgEventType + 1,
};
: QVLCFrame( _p_intf )
{
setWindowTitle( qtr( "Messages" ) );
+ setWindowRole( "vlc-messages" );
/* General widgets */
QGridLayout *mainLayout = new QGridLayout( this );
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" ) );
verbosityBox = new QSpinBox();
verbosityBox->setRange( 0, 2 );
- verbosityBox->setValue( config_GetInt( p_intf, "verbose" ) );
+ 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->setColumnStretch( 2, 10 );
- mainLayout->addWidget( saveLogButton, 1, 3 );
- mainLayout->addWidget( clearUpdateButton, 1, 4 );
- mainLayout->addWidget( closeButton, 1, 5 );
+ 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 ) );
cbData = new msg_cb_data_t;
cbData->self = this;
sub = msg_Subscribe( p_intf->p_libvlc, MsgCallback, cbData );
+ changeVerbosity( verbosityBox->value() );
}
MessagesDialog::~MessagesDialog()
delete cbData;
};
+void MessagesDialog::changeVerbosity( int verbosity )
+{
+ msg_SubscriptionSetVerbosity( sub , verbosity );
+}
+
void MessagesDialog::updateTab( int index )
{
/* Second tab : modules tree */
{
verbosityLabel->hide();
verbosityBox->hide();
+ vbobjectsLabel->hide();
+ vbobjectsEdit->hide();
clearUpdateButton->setText( qtr( "&Update" ) );
saveLogButton->hide();
updateTree();
{
verbosityLabel->show();
verbosityBox->show();
+ vbobjectsLabel->show();
+ vbobjectsEdit->show();
clearUpdateButton->setText( qtr( "&Clear" ) );
saveLogButton->show();
}
}
-void MessagesDialog::sinkMessage (msg_item_t *item, unsigned)
+void MessagesDialog::updateConfig()
{
- if ((item->i_type == VLC_MSG_WARN && verbosityBox->value() < 1)
- || (item->i_type == VLC_MSG_DBG && verbosityBox->value() < 2 ))
- return;
+ config_PutPsz(p_intf, "verbose-objects", qtu(vbobjectsEdit->text()));
+ //vbobjectsEdit->setText("vbEdit changed!");
- // Saving cursor selection
- int startPos = messages->textCursor().selectionStart();
- int endPos = messages->textCursor().selectionEnd();
+ if( !vbobjectsEdit->text().isEmpty() )
+ {
+ /* 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, "," )) )
+ {
+ 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();
+
+ /* Fix selected text bug */
+ if( !messages->textCursor().atEnd() ||
+ messages->textCursor().anchor() != messages->textCursor().position() )
+ messages->moveCursor( QTextCursor::End );
- messages->moveCursor( QTextCursor::End );
- if( startPos == endPos && messages->textCursor().selectionEnd() == endPos )
- endPos = 0;
messages->setFontItalic( true );
messages->setTextColor( "darkBlue" );
messages->insertPlainText( qfu( item->psz_module ) );
messages->insertPlainText( qfu(item->psz_msg) );
messages->insertPlainText( "\n" );
messages->ensureCursorVisible();
-
- // Restoring saved cursor selection
- // If the cursor was at this end, put it at the end,
- // so we don't need to scroll down.
- if( endPos == 0 )
- messages->moveCursor( QTextCursor::End );
- else
- {
- QTextCursor cur = messages->textCursor();
- cur.movePosition( QTextCursor::Start );
- cur.movePosition( QTextCursor::NextCharacter, QTextCursor::MoveAnchor, startPos );
- cur.movePosition( QTextCursor::NextCharacter, QTextCursor::KeepAnchor, endPos - startPos );
- messages->setTextCursor( cur );
- }
-}
-void MessagesDialog::customEvent( QEvent *event )
-{
- MsgEvent *msg = dynamic_cast<MsgEvent*>(event);
-
- assert( msg );
- sinkMessage( msg->msg, 0 );
}
-void MessagesDialog::buildTree( QTreeWidgetItem *parentItem,
- vlc_object_t *p_obj )
+void MessagesDialog::customEvent( QEvent *event )
{
- 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((uintptr_t)p_obj) + ")" );
- else
- item->setText( 0, qfu( p_obj->psz_object_type ) + " (" +
- QString::number((uintptr_t)p_obj) + ")" );
-
- item->setExpanded( true );
+ MsgEvent *msge = static_cast<MsgEvent *>(event);
- 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 );
+ assert( msge );
+ sinkMessage( msge->msg );
}
void MessagesDialog::clearOrUpdate()
clear();
}
-void MessagesDialog::updateTree()
-{
- modulesTree->clear();
- buildTree( NULL, VLC_OBJECT( p_intf->p_libvlc ) );
-}
-
void MessagesDialog::clear()
{
messages->clear();
{
QString saveLogFileName = QFileDialog::getSaveFileName(
this, qtr( "Save log file as..." ),
- qfu( config_GetHomeDir() ),
+ QVLCUserDir( VLC_DOCUMENTS_DIR ),
qtr( "Texts / Logs (*.log *.txt);; All (*.*) ") );
if( !saveLogFileName.isNull() )
return false;
}
+void MessagesDialog::buildTree( QTreeWidgetItem *parentItem,
+ vlc_object_t *p_obj )
+{
+ 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();
projects / vlc / blobdiff