8 changes: 4 additions & 4 deletions src/app/qgisapp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
QString caption = tr( "Quantum GIS - %1 ('%2')" ).arg( QGis::QGIS_VERSION ).arg( QGis::QGIS_RELEASE_NAME );
setWindowTitle( caption );

QgsMessageLog::logMessage( tr( "QGIS starting..." ) );
QgsMessageLog::logMessage( tr( "QGIS starting..." ), QString::null, QgsMessageLog::INFO );

// set QGIS specific srs validation
connect( this, SIGNAL( customSrsValidation( QgsCoordinateReferenceSystem& ) ),
Expand Down Expand Up @@ -660,9 +660,9 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,

mSplash->showMessage( tr( "QGIS Ready!" ), Qt::AlignHCenter | Qt::AlignBottom );

QgsMessageLog::logMessage( QgsApplication::showSettings() );
QgsMessageLog::logMessage( QgsApplication::showSettings(), QString::null, QgsMessageLog::INFO );

QgsMessageLog::logMessage( tr( "QGIS Ready!" ) );
QgsMessageLog::logMessage( tr( "QGIS Ready!" ), QString::null, QgsMessageLog::INFO );

mMapTipsVisible = false;
mTrustedMacros = false;
Expand Down Expand Up @@ -5937,7 +5937,7 @@ void QgisApp::loadPythonSupport()
// init python runner
QgsPythonRunner::setInstance( new QgsPythonRunnerImpl( mPythonUtils ) );

QgsMessageLog::logMessage( tr( "Python support ENABLED :-) " ) );
QgsMessageLog::logMessage( tr( "Python support ENABLED :-) " ), QString::null, QgsMessageLog::INFO );
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgspluginregistry.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ void QgsPluginRegistry::loadPythonPlugin( QString packageName )

// add to settings
settings.setValue( "/PythonPlugins/" + packageName, true );
QgsMessageLog::logMessage( QObject::tr( "Loaded %1 (package: %2)" ).arg( pluginName ).arg( packageName ), QObject::tr( "Plugins" ) );
QgsMessageLog::logMessage( QObject::tr( "Loaded %1 (package: %2)" ).arg( pluginName ).arg( packageName ), QObject::tr( "Plugins" ), QgsMessageLog::INFO );
}
}

Expand Down
17 changes: 11 additions & 6 deletions src/core/qgsmessagelog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,32 @@ QgsMessageLog *QgsMessageLog::instance()
return sInstance;
}

void QgsMessageLog::logMessage( QString message, QString tag, int level )
void QgsMessageLog::logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level )
{
QgsDebugMsg( QString( "%1 %2[%3] %4" ).arg( QDateTime::currentDateTime().toString( Qt::ISODate ) ).arg( tag ).arg( level ).arg( message ) );

QgsMessageLog::instance()->emitMessage( message, tag, level );
}

void QgsMessageLog::emitMessage( QString message, QString tag, int level )
void QgsMessageLog::emitMessage( QString message, QString tag, QgsMessageLog::MessageLevel level )
{
emit messageReceived( message, tag, level );
}

QgsMessageLogConsole::QgsMessageLogConsole()
: QObject( QgsMessageLog::instance() )
{
connect( QgsMessageLog::instance(), SIGNAL( messageReceived( QString, QString, int ) ),
this, SLOT( logMessage( QString, QString, tag ) ) );
connect( QgsMessageLog::instance(), SIGNAL( messageReceived( QString, QString, QgsMessageLog::MessageLevel ) ),
this, SLOT( logMessage( QString, QString, QgsMessageLog::MessageLevel ) ) );
}

void QgsMessageLogConsole::logMessage( QString message, QString tag, int level )
void QgsMessageLogConsole::logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level )
{
std::cout << tag.toLocal8Bit().data() << "[" << level << "]: " << message.toLocal8Bit().data() << std::endl;
std::cout
<< tag.toLocal8Bit().data() << "[" <<
( level == QgsMessageLog::INFO ? "INFO"
: level == QgsMessageLog::WARNING ? "WARNING"
: "CRITICAL" )
<< "]: " << message.toLocal8Bit().data() << std::endl;
}

15 changes: 11 additions & 4 deletions src/core/qgsmessagelog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,23 @@ class CORE_EXPORT QgsMessageLog : public QObject
public:
static QgsMessageLog *instance();

enum MessageLevel
{
INFO = 0,
WARNING = 1,
CRITICAL = 2
};

//! add a message to the instance (and create it if necessary)
static void logMessage( QString message, QString tag = QString::null, int level = 0 );
static void logMessage( QString message, QString tag = QString::null, MessageLevel level = WARNING );

signals:
void messageReceived( QString message, QString tag, int level );
void messageReceived( QString message, QString tag, QgsMessageLog::MessageLevel level );

private:
QgsMessageLog();

void emitMessage( QString message, QString tag, int level );
void emitMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );

static QgsMessageLog *sInstance;
};
Expand All @@ -66,7 +73,7 @@ class CORE_EXPORT QgsMessageLogConsole : public QObject
QgsMessageLogConsole();

public slots:
void logMessage( QString message, QString tag, int level );
void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
};

#endif
6 changes: 3 additions & 3 deletions src/core/qgsproject.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -739,15 +739,15 @@ bool QgsProject::addLayer( const QDomElement& layerElem, QList<QDomNode>& broken
mapLayer = QgsPluginLayerRegistry::instance()->createLayer( typeName );
}

Q_CHECK_PTR( mapLayer );

if ( !mapLayer )
{
QgsDebugMsg( "Unable to create layer" );

return false;
}

Q_CHECK_PTR( mapLayer );

// have the layer restore state that is stored in Dom node
if ( mapLayer->readXML( layerElem ) && mapLayer->isValid() )
{
Expand Down Expand Up @@ -1369,7 +1369,7 @@ QString QgsProject::readPath( QString src ) const
// where the source file had to exist and only the project directory was stripped
// from the filename.
QString home = homePath();
if( home.isNull() )
if ( home.isNull() )
return src;

QFileInfo fi( home + "/" + src );
Expand Down
8 changes: 4 additions & 4 deletions src/gui/qgsmessagelogviewer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ QgsMessageLogViewer::QgsMessageLogViewer( QStatusBar *statusBar, QWidget *parent
{
setupUi( this );

connect( QgsMessageLog::instance(), SIGNAL( messageReceived( QString, QString, int ) ),
this, SLOT( logMessage( QString, QString, int ) ) );
connect( QgsMessageLog::instance(), SIGNAL( messageReceived( QString, QString, QgsMessageLog::MessageLevel ) ),
this, SLOT( logMessage( QString, QString, QgsMessageLog::MessageLevel ) ) );

if ( statusBar )
{
Expand Down Expand Up @@ -106,11 +106,11 @@ void QgsMessageLogViewer::buttonDestroyed()
mButton = 0;
}

void QgsMessageLogViewer::logMessage( QString message, QString tag, int level )
void QgsMessageLogViewer::logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level )
{
mButton->setToolTip( tr( "%1 message(s) logged." ).arg( mCount++ ) );

if ( !isVisible() )
if ( !isVisible() && level > QgsMessageLog::INFO )
{
mButton->show();
QToolTip::showText( mButton->mapToGlobal( QPoint( 0, 0 ) ), mButton->toolTip() );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsmessagelogviewer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, private Ui::QgsMessageLogV
~QgsMessageLogViewer();

public slots:
void logMessage( QString message, QString tag, int level );
void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );

private:
void showEvent( QShowEvent * );
Expand Down