@@ -78,30 +78,33 @@ void QgsMessageLogViewer::logMessage( const QString &message, const QString &tag
78
78
79
79
QString levelString;
80
80
QgsSettings settings;
81
- QColor color;
81
+ QPalette pal = qApp->palette ();
82
+ QString defaultColorName = pal.color ( QPalette::WindowText ).name ();
83
+ QString colorName;
82
84
switch ( level )
83
85
{
84
86
case Qgis::Info:
85
87
levelString = QStringLiteral ( " INFO" );
86
- color = QColor ( settings.value ( QStringLiteral ( " colors/info" ), QStringLiteral ( " #000000 " ) ).toString () );
88
+ colorName = settings.value ( QStringLiteral ( " colors/info" ), QString ( ) ).toString ();
87
89
break ;
88
90
case Qgis::Warning:
89
91
levelString = QStringLiteral ( " WARNING" );
90
- color = QColor ( settings.value ( QStringLiteral ( " colors/warning" ), QStringLiteral ( " #000000 " ) ).toString () );
92
+ colorName = settings.value ( QStringLiteral ( " colors/warning" ), QString ( ) ).toString ();
91
93
break ;
92
94
case Qgis::Critical:
93
95
levelString = QStringLiteral ( " CRITICAL" );
94
- color = QColor ( settings.value ( QStringLiteral ( " colors/critical" ), QStringLiteral ( " #000000 " ) ).toString () );
96
+ colorName = settings.value ( QStringLiteral ( " colors/critical" ), QString ( ) ).toString ();
95
97
break ;
96
98
case Qgis::Success:
97
99
levelString = QStringLiteral ( " SUCCESS" );
98
- color = QColor ( settings.value ( QStringLiteral ( " colors/success" ), QStringLiteral ( " #000000 " ) ).toString () );
100
+ colorName = settings.value ( QStringLiteral ( " colors/success" ), QString ( ) ).toString ();
99
101
break ;
100
102
case Qgis::None:
101
103
levelString = QStringLiteral ( " NONE" );
102
- color = QColor ( settings.value ( QStringLiteral ( " colors/default" ), QStringLiteral ( " #000000 " ) ).toString () );
104
+ colorName = settings.value ( QStringLiteral ( " colors/default" ), QString ( ) ).toString ();
103
105
break ;
104
106
}
107
+ QColor color = QColor ( !colorName.isEmpty () ? colorName : defaultColorName );
105
108
106
109
QString prefix = QStringLiteral ( " <font color=\" %1\" >%2 %3 </font>" )
107
110
.arg ( color.name (), QDateTime::currentDateTime ().toString ( Qt::ISODate ), levelString );
0 commit comments