OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Stylesheet parser in RiuGuiTheme can now parse QPalette::$QColorRole[::$QColorGroup] and uses the application's default QPalette for color replacements.

Browse Source 
Adjusted default style sheet accordingly to use QPalette::Base color as QwtPlots' background color.
This commit is contained in:
Ruben Thoms
2020-09-28 12:57:47 +02:00
committed by Magne Sjaastad
parent aaf357531f
commit c49e9ea1bc
2 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/Resources/themes/default.qss
View File

@@ -24,16 +24,16 @@ $plotGridColor: #394046; // Plot grid color
$auxiliaryCurveColor: #000000; // Auxiliary curve color
$externalInputColor: #fff2a7; // Background color for external input fields
QwtPlot["*"]::grid["*"] {
color: $backgroundColor2;
}
QwtPlot {
background-color: white;
background-color: QPalette::Base;
}
QwtPlot > QWidget {
background-color: white;
background-color: QPalette::Base;
}
QwtPlot["*"]::grid["*"] {
color: $backgroundColor2;
}
QwtPlot["PvtPlot"]::curve["Auxiliary"] {
@@ -88,14 +88,6 @@ QwtPlot["PvtPlot"]::pointMarker["*"] {
color: $textColor;
}
QMainWindow {
background-color: #ffffff;
}
QToolBar {
background-color: #eeeeee;
}
QListView[state="ExternalInput"] {
background-color: $externalInputColor;
border: 2px solid $borderColor;

51
ApplicationCode/UserInterface/RiuGuiTheme.cpp
View File

@@ -745,10 +745,59 @@ void RiuGuiTheme::styleQwtItem( QwtPicker* item )
//--------------------------------------------------------------------------------------------------
void RiuGuiTheme::preparseStyleSheet( RiaDefines::ThemeEnum theme, QString& styleSheet )
{
QMap<QString, QPalette::ColorRole> colorRoleMap;
colorRoleMap.insert( "AlternateBase", QPalette::ColorRole::AlternateBase );
colorRoleMap.insert( "Base", QPalette::ColorRole::Base );
colorRoleMap.insert( "BrightText", QPalette::ColorRole::BrightText );
colorRoleMap.insert( "Button", QPalette::ColorRole::Button );
colorRoleMap.insert( "ButtonText", QPalette::ColorRole::ButtonText );
colorRoleMap.insert( "Dark", QPalette::ColorRole::Dark );
colorRoleMap.insert( "Highlight", QPalette::ColorRole::Highlight );
colorRoleMap.insert( "HighlightedText", QPalette::ColorRole::HighlightedText );
colorRoleMap.insert( "Light", QPalette::ColorRole::Light );
colorRoleMap.insert( "Link", QPalette::ColorRole::Link );
colorRoleMap.insert( "LinkVisited", QPalette::ColorRole::LinkVisited );
colorRoleMap.insert( "Mid", QPalette::ColorRole::Mid );
colorRoleMap.insert( "Midlight", QPalette::ColorRole::Midlight );
colorRoleMap.insert( "NoRole", QPalette::ColorRole::NoRole );
colorRoleMap.insert( "Shadow", QPalette::ColorRole::Shadow );
colorRoleMap.insert( "Text", QPalette::ColorRole::Text );
colorRoleMap.insert( "ToolTipBase", QPalette::ColorRole::ToolTipBase );
colorRoleMap.insert( "ToolTipText", QPalette::ColorRole::ToolTipText );
colorRoleMap.insert( "Window", QPalette::ColorRole::Window );
colorRoleMap.insert( "WindowText", QPalette::ColorRole::WindowText );
QMap<QString, QPalette::ColorGroup> colorGroupMap;
colorGroupMap.insert( "Active", QPalette::ColorGroup::Active );
colorGroupMap.insert( "Disabled", QPalette::ColorGroup::Disabled );
colorGroupMap.insert( "Inactive", QPalette::ColorGroup::Inactive );
QString regExp = "QPalette::(";
regExp += colorRoleMap.keys().join( "|" );
regExp += "){1}(::(";
regExp += colorGroupMap.keys().join( "|" );
regExp += "){1})?";
QRegularExpression paletteRegExp( regExp );
QRegularExpressionMatchIterator matchIterator = paletteRegExp.globalMatch( styleSheet );
QPalette palette = RiaGuiApplication::instance()->palette();
while ( matchIterator.hasNext() )
{
QRegularExpressionMatch match = matchIterator.next();
QPalette::ColorGroup colorGroup = QPalette::ColorGroup::Active;
if ( match.lastCapturedIndex() == 3 )
{
colorGroup = colorGroupMap.value( match.captured( 3 ) );
}
QColor color = palette.color( colorGroup, colorRoleMap.value( match.captured( 1 ) ) );
styleSheet.replace( match.captured( 0 ), color.name() );
}
QRegularExpression variableRegExp(
"[ \\t]*(?<name>\\$[a-zA-z0-9_]+)[ \\t]*:[ \\t]*(?<value>[a-zA-Z-_0-9#]+);[ \\t]*(\\/\\/[ "
"\\t]*(?<descriptor>(.*)))?[\\n\\r]*" );
QRegularExpressionMatchIterator matchIterator = variableRegExp.globalMatch( styleSheet );
matchIterator = variableRegExp.globalMatch( styleSheet );
if ( !s_variableValueMap.keys().contains( theme ) )
{