haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dark mode colors for HTML report generator. 

Fixes https://gitlab.com/kicad/code/kicad/issues/9688
This commit is contained in:
Jeff Young 2021-11-19 12:30:17 +00:00
parent c01649fc6e
commit 48c3734eea
2 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
common/dialogs/wx_html_report_panel.cpp
View File

@ -33,6 +33,7 @@
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/menu.h> #include <wx/menu.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <kiplatform/ui.h>
WX_HTML_REPORT_PANEL::WX_HTML_REPORT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos, WX_HTML_REPORT_PANEL::WX_HTML_REPORT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos,
const wxSize& size, long style ) : const wxSize& size, long style ) :
@ -181,23 +182,47 @@ wxString WX_HTML_REPORT_PANEL::generateHtml( const REPORT_LINE& aLine )
if( !( m_severities & aLine.severity ) ) if( !( m_severities & aLine.severity ) )
return retv; return retv;
switch( aLine.severity ) if( KIPLATFORM::UI::IsDarkTheme() )
{ {
case RPT_SEVERITY_ERROR: switch( aLine.severity )
retv = "<font color=\"red\" size=3>" + _( "Error:" ) + " </font>" {
"<font size=3>" + aLine.message + "</font><br>"; case RPT_SEVERITY_ERROR:
break; retv = "<font color=#F04040 size=3>" + _( "Error:" ) + " </font>"
case RPT_SEVERITY_WARNING: "<font size=3>" + aLine.message + "</font><br>";
retv = "<font size=3>" + _( "Warning:" ) + wxS( " " ) + aLine.message + "</font><br>"; break;
break; case RPT_SEVERITY_WARNING:
case RPT_SEVERITY_INFO: retv = "<font size=3>" + _( "Warning:" ) + wxS( " " ) + aLine.message + "</font><br>";
retv = "<font color=\"dark gray\" size=3>" + aLine.message + "</font><br>"; break;
break; case RPT_SEVERITY_INFO:
case RPT_SEVERITY_ACTION: retv = "<font color=#909090 size=3>" + aLine.message + "</font><br>";
retv = "<font color=\"dark green\" size=3>" + aLine.message + "</font><br>"; break;
break; case RPT_SEVERITY_ACTION:
default: retv = "<font color=#60D060 size=3>" + aLine.message + "</font><br>";
retv = "<font size=3>" + aLine.message + "</font><br>"; break;
default:
retv = "<font size=3>" + aLine.message + "</font><br>";
}
}
else
{
switch( aLine.severity )
{
case RPT_SEVERITY_ERROR:
retv = "<font color=#D00000 size=3>" + _( "Error:" ) + " </font>"
"<font size=3>" + aLine.message + "</font><br>";
break;
case RPT_SEVERITY_WARNING:
retv = "<font size=3>" + _( "Warning:" ) + wxS( " " ) + aLine.message + "</font><br>";
break;
case RPT_SEVERITY_INFO:
retv = "<font color=#808080 size=3>" + aLine.message + "</font><br>";
break;
case RPT_SEVERITY_ACTION:
retv = "<font color=#008000 size=3>" + aLine.message + "</font><br>";
break;
default:
retv = "<font size=3>" + aLine.message + "</font><br>";
}
} }
return retv; return retv;

4
common/widgets/number_badge.cpp
View File

@ -25,7 +25,7 @@
#include <widgets/number_badge.h> #include <widgets/number_badge.h>
#include <algorithm> #include <algorithm>
#include <kiplatform/ui.h>
NUMBER_BADGE::NUMBER_BADGE( wxWindow* aParent, wxWindowID aId, const wxPoint& aPos, NUMBER_BADGE::NUMBER_BADGE( wxWindow* aParent, wxWindowID aId, const wxPoint& aPos,
const wxSize& aSize, int aStyles ) : const wxSize& aSize, int aStyles ) :
@ -67,7 +67,7 @@ void NUMBER_BADGE::UpdateNumber( int aNumber, SEVERITY aSeverity )
switch( aSeverity ) switch( aSeverity )
{ {
case RPT_SEVERITY_ERROR: case RPT_SEVERITY_ERROR:
m_badgeColour = *wxRED; m_badgeColour = KIPLATFORM::UI::IsDarkTheme() ? wxColour( 240, 64, 64 ) : *wxRED;
m_textColour = *wxWHITE; m_textColour = *wxWHITE;
break; break;