#endif
#include "dialogs/messages.hpp"
-#include "dialogs_provider.hpp"
-#include <QSpacerItem>
#include <QSpinBox>
#include <QLabel>
#include <QTextEdit>
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <QHeaderView>
+#include <QMutex>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QScrollBar>
-MessagesDialog *MessagesDialog::instance = NULL;
+#include <assert.h>
-MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
- : QVLCFrame( _p_intf )
-{
- setWindowTitle( qtr( "Messages" ) );
-
- /* General widgets */
- QGridLayout *mainLayout = new QGridLayout( this );
- mainTab = new QTabWidget( this );
- mainTab->setTabPosition( QTabWidget::North );
+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 );
+ }
- /* Messages */
- QWidget *msgWidget = new QWidget;
- QGridLayout *msgLayout = new QGridLayout( msgWidget );
+ msg_item_t *msg;
+};
- messages = new QTextEdit();
- messages->setReadOnly( true );
- messages->setGeometry( 0, 0, 440, 600 );
- messages->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+struct msg_cb_data_t
+{
+ MessagesDialog *self;
+};
+static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned );
- msgLayout->addWidget( messages, 0, 0, 1, 0 );
- mainTab->addTab( msgWidget, qtr( "Messages" ) );
- // ON_TIMEOUT( updateLog() );
+MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
+ : QVLCFrame( _p_intf )
+{
+ setWindowTitle( qtr( "Messages" ) );
+ setWindowRole( "vlc-messages" );
+ /* Build Ui */
+ ui.setupUi( this );
+ updateTree();
/* Modules tree */
- QWidget *treeWidget = new QWidget;
- QGridLayout *treeLayout = new QGridLayout( treeWidget );
+ ui.modulesTree->header()->hide();
- modulesTree = new QTreeWidget();
- modulesTree->header()->hide();
+ /* Buttons and general layout */
+ ui.saveLogButton->setToolTip( qtr( "Saves all the displayed logs to a file" ) );
- treeLayout->addWidget( modulesTree, 0, 0, 1, 0 );
- mainTab->addTab( treeWidget, qtr( "Modules tree" ) );
+ ui.verbosityBox->setValue( var_InheritInteger( p_intf, "verbose" ) );
+ ui.vbobjectsEdit->setText(config_GetPsz( p_intf, "verbose-objects"));
+ ui.vbobjectsEdit->setToolTip( "verbose-objects usage: \n"
+ "--verbose-objects=+printthatobject,-dontprintthatone\n"
+ "(keyword 'all' to applies to all objects)");
- /* 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( 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 ) );
+ BUTTONACT( ui.clearButton, clear() );
+ BUTTONACT( ui.updateButton, updateTree() );
+ BUTTONACT( ui.saveLogButton, save() );
+ CONNECT( ui.vbobjectsEdit, editingFinished(), this, updateConfig());
+ CONNECT( ui.bottomButtonsBox, rejected(), this, hide() );
+ CONNECT( ui.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( ui.verbosityBox->value() );
+}
+
+MessagesDialog::~MessagesDialog()
+{
+ writeSettings( "Messages" );
+ msg_Unsubscribe( sub );
+ delete cbData;
+};
+
+void MessagesDialog::changeVerbosity( int verbosity )
+{
+ msg_SubscriptionSetVerbosity( sub , verbosity );
}
-void MessagesDialog::updateTab( int index )
+void MessagesDialog::updateConfig()
{
- /* Second tab : modules tree */
- if( index == 1 )
+ config_PutPsz(p_intf, "verbose-objects", qtu(ui.vbobjectsEdit->text()));
+ //vbobjectsEdit->setText("vbEdit changed!");
+
+ if( !ui.vbobjectsEdit->text().isEmpty() )
{
- verbosityLabel->hide();
- verbosityBox->hide();
- clearUpdateButton->setText( qtr( "&Update" ) );
- saveLogButton->hide();
- updateTree();
+ /* 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(ui.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 );
}
- /* First tab : messages */
else
{
- verbosityLabel->show();
- verbosityBox->show();
- clearUpdateButton->setText( qtr( "&Clear" ) );
- saveLogButton->show();
+ msg_EnableObjectPrinting( p_intf, "all");
}
}
-void MessagesDialog::updateLog()
+void MessagesDialog::sinkMessage( msg_item_t *item )
{
-#if 0
- msg_subscription_t *p_sub = p_intf->p_sys->p_sub;
- int i_start;
+ QTextEdit *messages = ui.messages;
+ /* Only scroll if the viewport is at the end.
+ Don't bug user by auto-changing/loosing viewport on insert(). */
+ bool b_autoscroll = ( messages->verticalScrollBar()->value()
+ + messages->verticalScrollBar()->pageStep()
+ >= messages->verticalScrollBar()->maximum() );
+
+ /* 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->setFontItalic( true );
+ messages->setTextColor( "darkBlue" );
+ messages->insertPlainText( qfu( item->psz_module ) );
+
+ 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;
+ }
- vlc_mutex_lock( p_sub->p_lock );
- int i_stop = *p_sub->pi_stop;
- vlc_mutex_unlock( p_sub->p_lock );
+ /* Add message Regular black Font */
+ messages->setFontItalic( false );
+ messages->setTextColor( "black" );
+ messages->insertPlainText( qfu(item->psz_msg) );
+ messages->insertPlainText( "\n" );
+ if ( b_autoscroll ) messages->ensureCursorVisible();
+}
- if( p_sub->i_start != i_stop )
- {
- messages->textCursor().movePosition( QTextCursor::End );
+void MessagesDialog::customEvent( QEvent *event )
+{
+ MsgEvent *msge = static_cast<MsgEvent *>(event);
- for( i_start = p_sub->i_start;
- i_start != i_stop;
- i_start = (i_start+1) % VLC_MSG_QSIZE )
- {
- 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: " );
- 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" );
+ assert( msge );
+ sinkMessage( msge->msg );
+}
+
+void MessagesDialog::clear()
+{
+ ui.messages->clear();
+}
+
+bool MessagesDialog::save()
+{
+ QString saveLogFileName = QFileDialog::getSaveFileName(
+ this, qtr( "Save log file as..." ),
+ QVLCUserDir( VLC_DOCUMENTS_DIR ),
+ qtr( "Texts / Logs (*.log *.txt);; All (*.*) ") );
+
+ if( !saveLogFileName.isNull() )
+ {
+ 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;
}
- messages->ensureCursorVisible();
- vlc_mutex_lock( p_sub->p_lock );
- p_sub->i_start = i_start;
- vlc_mutex_unlock( p_sub->p_lock );
+ QTextStream out( &file );
+ out << ui.messages->toPlainText() << "\n";
+
+ return true;
}
-#endif
+ return false;
}
void MessagesDialog::buildTree( QTreeWidgetItem *parentItem,
if( parentItem )
item = new QTreeWidgetItem( parentItem );
else
- item = new QTreeWidgetItem( modulesTree );
+ item = new QTreeWidgetItem( ui.modulesTree );
- if( p_obj->psz_object_name )
+ char *name = vlc_object_get_name( p_obj );
+ if( name != NULL )
+ {
item->setText( 0, qfu( p_obj->psz_object_type ) + " \"" +
- qfu( p_obj->psz_object_name ) + "\" (" +
+ 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) + ")" );
vlc_list_release( l );
}
-void MessagesDialog::clearOrUpdate()
-{
- if( mainTab->currentIndex() )
- updateTree();
- else
- clear();
-}
-
void MessagesDialog::updateTree()
{
- modulesTree->clear();
+ ui.modulesTree->clear();
buildTree( NULL, VLC_OBJECT( p_intf->p_libvlc ) );
}
-void MessagesDialog::clear()
+static void MsgCallback( msg_cb_data_t *data, msg_item_t *item, unsigned )
{
- messages->clear();
-}
+ int canc = vlc_savecancel();
-bool MessagesDialog::save()
-{
- QString saveLogFileName = QFileDialog::getSaveFileName(
- this, qtr( "Save log file as..." ),
- qfu( config_GetHomeDir() ),
- qtr( "Texts / Logs (*.log *.txt);; All (*.*) ") );
-
- if( !saveLogFileName.isNull() )
- {
- 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;
- }
+ QApplication::postEvent( data->self, new MsgEvent( item ) );
- QTextStream out( &file );
- out << messages->toPlainText() << "\n";
-
- return true;
- }
- return false;
+ vlc_restorecancel( canc );
}
+
projects / vlc / blobdiff