mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-26 23:20:29 -05:00
#13126 RiaLogging: Extract errorInMessageBox to RiuMessageDialog
Move the QMessageBox-displaying helper out of the logging utility into a dedicated UI class. RiaLogging.h no longer pulls QMessageBox/QWidget into the ~270 files that include it. Behavior is preserved: showError displays the dialog when running interactively (and not under regression tests), then forwards the text to RiaLogging::error.
This commit is contained in:
1 parent
0e27709fe3
commit
bb0afbf962
56 files changed
+249
-147
No files matched your search
@@ -75,6 +75,7 @@ set(SOURCE_GROUP_HEADER_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuFlowCharacteristicsPlot.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuNightchartsWidget.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuMessagePanel.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuMessageDialog.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuPlotObjectPicker.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefinitionKeywords.h
|
||||
@@ -191,6 +192,7 @@ set(SOURCE_GROUP_SOURCE_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuFlowCharacteristicsPlot.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuNightchartsWidget.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuMessagePanel.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuMessageDialog.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuPlotObjectPicker.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorSelectionUi.cpp
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "RiaGuiApplication.h"
|
||||
#include "RiaLogging.h"
|
||||
#include "RiuMessageDialog.h"
|
||||
|
||||
#include "RiuMainWindow.h"
|
||||
|
||||
@@ -62,5 +63,5 @@ void Riu3DMainWindowTools::selectAsCurrentItem( const caf::PdmObject* object, bo
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void Riu3DMainWindowTools::reportAndShowWarning( const QString& warningDialogHeader, const QString& warningtext )
|
||||
{
|
||||
RiaLogging::errorInMessageBox( Riu3DMainWindowTools::mainWindowWidget(), warningDialogHeader, warningtext );
|
||||
RiuMessageDialog::showError( Riu3DMainWindowTools::mainWindowWidget(), warningDialogHeader, warningtext );
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2026- Equinor ASA
|
||||
//
|
||||
// ResInsight is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
// for more details.
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "RiuMessageDialog.h"
|
||||
|
||||
#include "RiaGuiApplication.h"
|
||||
#include "RiaLogging.h"
|
||||
#include "RiaRegressionTestRunner.h"
|
||||
|
||||
#include <QMessageBox>
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessageDialog::showError( QWidget* parent, const QString& title, const QString& text )
|
||||
{
|
||||
if ( RiaGuiApplication::isRunning() && !RiaRegressionTestRunner::instance()->isRunningRegressionTests() )
|
||||
{
|
||||
if ( parent == nullptr )
|
||||
{
|
||||
parent = RiaGuiApplication::widgetToUseAsParent();
|
||||
}
|
||||
QMessageBox dlg( QMessageBox::Critical, title, text, QMessageBox::Ok, parent );
|
||||
dlg.setWindowFlags( dlg.windowFlags() | Qt::WindowStaysOnTopHint );
|
||||
dlg.exec();
|
||||
}
|
||||
|
||||
RiaLogging::error( text );
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2026- Equinor ASA
|
||||
//
|
||||
// ResInsight is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
// for more details.
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
|
||||
class QWidget;
|
||||
|
||||
//==================================================================================================
|
||||
//
|
||||
//==================================================================================================
|
||||
class RiuMessageDialog
|
||||
{
|
||||
public:
|
||||
static void showError( QWidget* parent, const QString& title, const QString& text );
|
||||
};
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "RiaGuiApplication.h"
|
||||
#include "RiaLogging.h"
|
||||
#include "RiaStringListSerializer.h"
|
||||
#include "RiuMessageDialog.h"
|
||||
|
||||
#include <QAction>
|
||||
#include <QDir>
|
||||
@@ -152,7 +153,7 @@ void RiuRecentFileActionProvider::slotOpenRecentFile()
|
||||
}
|
||||
else
|
||||
{
|
||||
RiaLogging::errorInMessageBox( nullptr, "File open", "Failed to import file located at\n" + fileName );
|
||||
RiuMessageDialog::showError( nullptr, "File open", "Failed to import file located at\n" + fileName );
|
||||
|
||||
removeFileName( fileName );
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user