Commit abef937f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4: messages. Small commit to fix two forgottten qfu() and to add whitespaces where needed.

parent 2d454641
...@@ -41,28 +41,28 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) ...@@ -41,28 +41,28 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
setWindowTitle( qtr( "Messages" ) ); setWindowTitle( qtr( "Messages" ) );
resize(600, 400); resize(600, 400);
QGridLayout *layout = new QGridLayout(this); QGridLayout *layout = new QGridLayout( this );
QPushButton *closeButton = new QPushButton(qtr("&Close")); QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
QPushButton *clearButton = new QPushButton(qtr("&Clear")); QPushButton *clearButton = new QPushButton( qtr( "&Clear" ) );
QPushButton *saveLogButton = new QPushButton(qtr("&Save as...")); QPushButton *saveLogButton = new QPushButton( qtr( "&Save as..." ) );
verbosityBox = new QSpinBox(); verbosityBox = new QSpinBox();
verbosityBox->setRange(0, 2); verbosityBox->setRange( 0, 2 );
verbosityBox->setValue(config_GetInt(p_intf, "verbose")); verbosityBox->setValue( config_GetInt( p_intf, "verbose" ) );
verbosityBox->setWrapping(true); verbosityBox->setWrapping( true );
verbosityBox->setMaximumWidth( 50 ); verbosityBox->setMaximumWidth( 50 );
QLabel *verbosityLabel = new QLabel(qtr("Verbosity Level")); QLabel *verbosityLabel = new QLabel(qtr( "Verbosity Level" ) );
messages = new QTextEdit(); messages = new QTextEdit();
messages->setReadOnly(true); messages->setReadOnly( true );
messages->setGeometry(0, 0, 440, 600); messages->setGeometry( 0, 0, 440, 600 );
messages->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); messages->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
layout->addWidget(messages, 0, 0, 1, 0); layout->addWidget( messages, 0, 0, 1, 0 );
layout->addWidget(verbosityLabel, 1, 0, 1,1 ); layout->addWidget( verbosityLabel, 1, 0, 1,1 );
layout->addWidget(verbosityBox, 1, 1 ); layout->addWidget( verbosityBox, 1, 1 );
layout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ), 1,2 ); layout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ), 1,2 );
layout->addWidget(saveLogButton, 1, 3 ); layout->addWidget( saveLogButton, 1, 3 );
layout->addWidget(clearButton, 1, 4 ); layout->addWidget( clearButton, 1, 4 );
layout->addWidget(closeButton, 1, 5 ); layout->addWidget( closeButton, 1, 5 );
BUTTONACT( closeButton, close() ); BUTTONACT( closeButton, close() );
BUTTONACT( clearButton, clear() ); BUTTONACT( clearButton, clear() );
...@@ -97,9 +97,9 @@ void MessagesDialog::updateLog() ...@@ -97,9 +97,9 @@ void MessagesDialog::updateLog()
p_sub->p_msg[i_start].i_type == VLC_MSG_DBG && p_sub->p_msg[i_start].i_type == VLC_MSG_DBG &&
verbosityBox->value() >= 2 ) verbosityBox->value() >= 2 )
{ {
messages->setFontItalic(true); messages->setFontItalic( true );
messages->setTextColor("darkBlue"); messages->setTextColor( "darkBlue" );
messages->insertPlainText(p_sub->p_msg[i_start].psz_module); messages->insertPlainText( qfu(p_sub->p_msg[i_start].psz_module));
} }
else else
continue; continue;
...@@ -107,27 +107,27 @@ void MessagesDialog::updateLog() ...@@ -107,27 +107,27 @@ void MessagesDialog::updateLog()
switch( p_sub->p_msg[i_start].i_type ) switch( p_sub->p_msg[i_start].i_type )
{ {
case VLC_MSG_INFO: case VLC_MSG_INFO:
messages->setTextColor("blue"); messages->setTextColor( "blue" );
messages->insertPlainText(" info: "); messages->insertPlainText( " info: " );
break; break;
case VLC_MSG_ERR: case VLC_MSG_ERR:
messages->setTextColor("red"); messages->setTextColor( "red" );
messages->insertPlainText(" error: "); messages->insertPlainText( " error: " );
break; break;
case VLC_MSG_WARN: case VLC_MSG_WARN:
messages->setTextColor("green"); messages->setTextColor( "green" );
messages->insertPlainText(" warning: "); messages->insertPlainText( " warning: " );
break; break;
case VLC_MSG_DBG: case VLC_MSG_DBG:
default: default:
messages->setTextColor("grey"); messages->setTextColor( "grey" );
messages->insertPlainText(" debug: "); messages->insertPlainText( " debug: " );
break; break;
} }
/* Add message Regular black Font */ /* Add message Regular black Font */
messages->setFontItalic(false); messages->setFontItalic( false );
messages->setTextColor("black"); messages->setTextColor( "black" );
messages->insertPlainText( qfu(p_sub->p_msg[i_start].psz_msg) ); messages->insertPlainText( qfu(p_sub->p_msg[i_start].psz_msg) );
messages->insertPlainText( "\n" ); messages->insertPlainText( "\n" );
} }
...@@ -152,25 +152,26 @@ void MessagesDialog::clear() ...@@ -152,25 +152,26 @@ void MessagesDialog::clear()
bool MessagesDialog::save() bool MessagesDialog::save()
{ {
QString saveLogFileName = QFileDialog::getSaveFileName( QString saveLogFileName = QFileDialog::getSaveFileName(
this, qtr("Choose a filename to save the logs under..."), this, qtr( "Choose a filename to save the logs under..." ),
p_intf->p_libvlc->psz_homedir, qfu( p_intf->p_libvlc->psz_homedir ),
"Texts / Logs (*.log *.txt);; All (*.*) "); "Texts / Logs (*.log *.txt);; All (*.*) " );
if( !saveLogFileName.isNull() ) if( !saveLogFileName.isNull() )
{ {
QFile file(saveLogFileName); QFile file( saveLogFileName );
if (!file.open(QFile::WriteOnly | QFile::Text)) { if ( !file.open( QFile::WriteOnly | QFile::Text ) ) {
QMessageBox::warning(this, qtr("Application"), QMessageBox::warning( this, qtr( "Application" ),
qtr("Cannot write file %1:\n%2.") qtr( "Cannot write file %1:\n%2." )
.arg(saveLogFileName) .arg( saveLogFileName )
.arg(file.errorString())); .arg( file.errorString() ) );
return false; return false;
} }
QTextStream out(&file); QTextStream out( &file );
out << messages->toPlainText() << "\n"; out << messages->toPlainText() << "\n";
return true; return true;
} }
return false; return false;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment