@@ -78,30 +78,33 @@ void QgsMessageLogViewer::logMessage( const QString &message, const QString &tag
7878
7979 QString levelString;
8080 QgsSettings settings;
81- QColor color;
81+ QPalette pal = qApp->palette ();
82+ QString defaultColorName = pal.color ( QPalette::WindowText ).name ();
83+ QString colorName;
8284 switch ( level )
8385 {
8486 case Qgis::Info:
8587 levelString = QStringLiteral ( " INFO" );
86- color = QColor ( settings.value ( QStringLiteral ( " colors/info" ), QStringLiteral ( " #000000 " ) ).toString () );
88+ colorName = settings.value ( QStringLiteral ( " colors/info" ), QString ( ) ).toString ();
8789 break ;
8890 case Qgis::Warning:
8991 levelString = QStringLiteral ( " WARNING" );
90- color = QColor ( settings.value ( QStringLiteral ( " colors/warning" ), QStringLiteral ( " #000000 " ) ).toString () );
92+ colorName = settings.value ( QStringLiteral ( " colors/warning" ), QString ( ) ).toString ();
9193 break ;
9294 case Qgis::Critical:
9395 levelString = QStringLiteral ( " CRITICAL" );
94- color = QColor ( settings.value ( QStringLiteral ( " colors/critical" ), QStringLiteral ( " #000000 " ) ).toString () );
96+ colorName = settings.value ( QStringLiteral ( " colors/critical" ), QString ( ) ).toString ();
9597 break ;
9698 case Qgis::Success:
9799 levelString = QStringLiteral ( " SUCCESS" );
98- color = QColor ( settings.value ( QStringLiteral ( " colors/success" ), QStringLiteral ( " #000000 " ) ).toString () );
100+ colorName = settings.value ( QStringLiteral ( " colors/success" ), QString ( ) ).toString ();
99101 break ;
100102 case Qgis::None:
101103 levelString = QStringLiteral ( " NONE" );
102- color = QColor ( settings.value ( QStringLiteral ( " colors/default" ), QStringLiteral ( " #000000 " ) ).toString () );
104+ colorName = settings.value ( QStringLiteral ( " colors/default" ), QString ( ) ).toString ();
103105 break ;
104106 }
107+ QColor color = QColor ( !colorName.isEmpty () ? colorName : defaultColorName );
105108
106109 QString prefix = QStringLiteral ( " <font color=\" %1\" >%2 %3 </font>" )
107110 .arg ( color.name (), QDateTime::currentDateTime ().toString ( Qt::ISODate ), levelString );
0 commit comments