mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
212f5bf5ae
Required changes to use Qt6 and disable support for Qt5. There are still some adjustments related to Qt6 to be done, but these changes are not required to make Qt6 compile on relevant systems. * Build system changes Qt6 * Override enterEvent * Update QKeySequence * QtChart changes * Use QScreen to instepct dotsPerInch * Add app->quit() * Required updates for code related to QString * Use RiaQDateTimeTools * Required changes related to regular expressions * Support compile on Qt < 6.5 When version < 6.5 is found, qt_generate_deploy_app_script() is disabled. Compilation of ResInsight will work, but the install target will be incomplete. * Octave: add missing header. * Qt Advanced Docking: force Qt6 where both Qt5 and Qt6 is available. --------- Co-authored-by: magnesj <1793152+magnesj@users.noreply.github.com> Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
81 lines
2.7 KiB
C++
81 lines
2.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2016 Statoil 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 "RicExitApplicationFeature.h"
|
|
|
|
#include "RiaGuiApplication.h"
|
|
#include "RiuMainWindow.h"
|
|
#include "RiuPlotMainWindow.h"
|
|
|
|
#include <QAction>
|
|
#include <QDebug>
|
|
|
|
CAF_CMD_SOURCE_INIT( RicExitApplicationFeature, "RicExitApplicationFeature" );
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RicExitApplicationFeature::onActionTriggered( bool isChecked )
|
|
{
|
|
disableModelChangeContribution();
|
|
|
|
RiaGuiApplication* app = RiaGuiApplication::instance();
|
|
if ( !app->askUserToSaveModifiedProject() ) return;
|
|
|
|
if ( app->mainPlotWindow() )
|
|
{
|
|
app->mainPlotWindow()->saveWinGeoAndDockToolBarLayout();
|
|
}
|
|
|
|
if ( app->mainWindow() )
|
|
{
|
|
app->mainWindow()->saveWinGeoAndDockToolBarLayout();
|
|
}
|
|
|
|
// Hide all windows first to make sure they get closed properly
|
|
for ( QWidget* topLevelWidget : RiaGuiApplication::topLevelWidgets() )
|
|
{
|
|
topLevelWidget->hide();
|
|
}
|
|
|
|
if ( app->mainWindow() )
|
|
{
|
|
app->mainWindow()->close();
|
|
}
|
|
|
|
if ( app->mainPlotWindow() )
|
|
{
|
|
app->mainPlotWindow()->close();
|
|
}
|
|
|
|
// This was required after moving to Qt6, causing the application not to shut down properly, and ghost processes remains after a forced
|
|
// shutdown. The slot onLastWindowClosed() configured in RiaGuiApplication::RiaGuiApplication is never called. Testing with
|
|
// processEvents() had no effect.
|
|
app->quit();
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RicExitApplicationFeature::setupActionLook( QAction* actionToSetup )
|
|
{
|
|
actionToSetup->setText( "E&xit" );
|
|
|
|
applyShortcutWithHintToAction( actionToSetup, QKeySequence::Quit );
|
|
}
|