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

Implemented check if running GUI application.

Browse Source
This commit is contained in:
rubenthoms 2020-09-17 16:17:44 +02:00 committed by Gaute Lindkvist
parent a3d37edbcf
commit d86fb54b19
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/UserInterface/RiuGuiTheme.cpp
View File

@ -18,10 +18,10 @@
#include "RiuGuiTheme.h" #include "RiuGuiTheme.h"
#include "RiuThemesDirectory.h" #include "RiaApplication.h"
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RiuThemesDirectory.h"
#include "cafAppEnum.h" #include "cafAppEnum.h"
#include <QAbstractItemModel> #include <QAbstractItemModel>
@ -564,15 +564,18 @@ QAbstractItemModel* RiuGuiTheme::getQssCompletionModel( QCompleter* completer )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QColor RiuGuiTheme::getColorByVariableName( const QString& variable, int theme /*= -1 */ ) QColor RiuGuiTheme::getColorByVariableName( const QString& variable, int theme /*= -1 */ )
{ {
RiaDefines::ThemeEnum eTheme = RiaGuiApplication::instance()->preferences()->guiTheme(); if ( dynamic_cast<RiaGuiApplication*>( RiaApplication::instance() ) )
if ( theme >= 0 && theme < static_cast<int>( caf::AppEnum<RiaDefines::ThemeEnum>().size() ) )
{ {
eTheme = static_cast<RiaDefines::ThemeEnum>( theme ); RiaDefines::ThemeEnum eTheme = RiaGuiApplication::instance()->preferences()->guiTheme();
} if ( theme >= 0 && theme < static_cast<int>( caf::AppEnum<RiaDefines::ThemeEnum>().size() ) )
{
eTheme = static_cast<RiaDefines::ThemeEnum>( theme );
}
if ( s_variableValueMap.keys().contains( eTheme ) && s_variableValueMap[eTheme].keys().contains( "$" + variable ) ) if ( s_variableValueMap.keys().contains( eTheme ) && s_variableValueMap[eTheme].keys().contains( "$" + variable ) )
{ {
return QColor( s_variableValueMap[eTheme]["$" + variable] ); return QColor( s_variableValueMap[eTheme]["$" + variable] );
}
} }
return Qt::black; return Qt::black;
} }