From abef937f02a581a8969614422b478755e8c1b98f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Wed, 31 Jan 2007 19:51:46 +0000 Subject: [PATCH] Qt4: messages. Small commit to fix two forgottten qfu() and to add whitespaces where needed. --- modules/gui/qt4/dialogs/messages.cpp | 81 ++++++++++++++-------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp index c2a69c32ac..6f0aaf41d0 100644 --- a/modules/gui/qt4/dialogs/messages.cpp +++ b/modules/gui/qt4/dialogs/messages.cpp @@ -41,28 +41,28 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) setWindowTitle( qtr( "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...")); + QGridLayout *layout = new QGridLayout( this ); + QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); + QPushButton *clearButton = new QPushButton( qtr( "&Clear" ) ); + QPushButton *saveLogButton = new QPushButton( qtr( "&Save as..." ) ); verbosityBox = new QSpinBox(); - verbosityBox->setRange(0, 2); - verbosityBox->setValue(config_GetInt(p_intf, "verbose")); - verbosityBox->setWrapping(true); + verbosityBox->setRange( 0, 2 ); + verbosityBox->setValue( config_GetInt( p_intf, "verbose" ) ); + verbosityBox->setWrapping( true ); verbosityBox->setMaximumWidth( 50 ); - QLabel *verbosityLabel = new QLabel(qtr("Verbosity Level")); + QLabel *verbosityLabel = new QLabel(qtr( "Verbosity Level" ) ); messages = new QTextEdit(); - messages->setReadOnly(true); - messages->setGeometry(0, 0, 440, 600); - messages->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + 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, 1 ); + layout->addWidget( messages, 0, 0, 1, 0 ); + layout->addWidget( verbosityLabel, 1, 0, 1,1 ); + layout->addWidget( verbosityBox, 1, 1 ); layout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ), 1,2 ); - layout->addWidget(saveLogButton, 1, 3 ); - layout->addWidget(clearButton, 1, 4 ); - layout->addWidget(closeButton, 1, 5 ); + layout->addWidget( saveLogButton, 1, 3 ); + layout->addWidget( clearButton, 1, 4 ); + layout->addWidget( closeButton, 1, 5 ); BUTTONACT( closeButton, close() ); BUTTONACT( clearButton, clear() ); @@ -97,9 +97,9 @@ void MessagesDialog::updateLog() p_sub->p_msg[i_start].i_type == VLC_MSG_DBG && verbosityBox->value() >= 2 ) { - messages->setFontItalic(true); - messages->setTextColor("darkBlue"); - messages->insertPlainText(p_sub->p_msg[i_start].psz_module); + messages->setFontItalic( true ); + messages->setTextColor( "darkBlue" ); + messages->insertPlainText( qfu(p_sub->p_msg[i_start].psz_module)); } else continue; @@ -107,27 +107,27 @@ void MessagesDialog::updateLog() 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" ); } @@ -152,25 +152,26 @@ void MessagesDialog::clear() bool MessagesDialog::save() { QString saveLogFileName = QFileDialog::getSaveFileName( - this, qtr("Choose a filename to save the logs under..."), - p_intf->p_libvlc->psz_homedir, - "Texts / Logs (*.log *.txt);; All (*.*) "); + this, qtr( "Choose a filename to save the logs under..." ), + qfu( p_intf->p_libvlc->psz_homedir ), + "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 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; } + -- 2.39.5