diff --git a/ApplicationCode/Application/Tools/RiaLogging.cpp b/ApplicationCode/Application/Tools/RiaLogging.cpp index 2b6d62e40a..e26564bee3 100644 --- a/ApplicationCode/Application/Tools/RiaLogging.cpp +++ b/ApplicationCode/Application/Tools/RiaLogging.cpp @@ -35,7 +35,10 @@ #include #endif -#include "QString" +#include "RiaGuiApplication.h" +#include "RiaRegressionTestRunner.h" +#include +#include //================================================================================================== // @@ -247,6 +250,19 @@ void RiaLogging::debug( const QString& message ) } } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RiaLogging::errorInMessageBox( QWidget* parent, const QString& title, const QString& text ) +{ + if ( RiaGuiApplication::isRunning() && !RiaRegressionTestRunner::instance()->isRunningRegressionTests() ) + { + QMessageBox::warning( parent, title, text ); + } + + RiaLogging::error( text ); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Application/Tools/RiaLogging.h b/ApplicationCode/Application/Tools/RiaLogging.h index fd4c5c2b1b..e1ef358075 100644 --- a/ApplicationCode/Application/Tools/RiaLogging.h +++ b/ApplicationCode/Application/Tools/RiaLogging.h @@ -21,6 +21,7 @@ #include class QString; +class QWidget; enum class RILogLevel { @@ -66,6 +67,8 @@ public: static void info( const QString& message ); static void debug( const QString& message ); + static void errorInMessageBox( QWidget* parent, const QString& title, const QString& text ); + private: static RiaLogger* sm_logger; };