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

Remove file global defines

Browse Source
This commit is contained in:
Magne Sjaastad 2020-06-04 10:40:34 +02:00
parent b7fb6c4e5a
commit ed86954a1a
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Commands/RicResampleDialog.cpp
View File

@ -36,10 +36,6 @@
#include <QToolBar> #include <QToolBar>
#include <QVBoxLayout> #include <QVBoxLayout>
#define DEFAULT_DIALOG_WIDTH 250
#define DEFAULT_DIALOG_HEIGHT 100
#define DEFAULT_DIALOG_TITLE "Export Plot Data"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -89,11 +85,11 @@ RicResampleDialogResult RicResampleDialog::openDialog( QWidget* parent /*= 0*/,
if ( !caption.isEmpty() ) if ( !caption.isEmpty() )
dialog.setWindowTitle( caption ); dialog.setWindowTitle( caption );
else else
dialog.setWindowTitle( DEFAULT_DIALOG_TITLE ); dialog.setWindowTitle( "Export Plot Data" );
dialog.setPeriodOptions( RiaQDateTimeTools::dateTimePeriods() ); dialog.setPeriodOptions( RiaQDateTimeTools::dateTimePeriods() );
dialog.resize( DEFAULT_DIALOG_WIDTH, DEFAULT_DIALOG_HEIGHT ); dialog.resize( 250, 100 );
dialog.exec(); dialog.exec();
return RicResampleDialogResult( dialog.result() == QDialog::Accepted, dialog.selectedDateTimePeriod() ); return RicResampleDialogResult( dialog.result() == QDialog::Accepted, dialog.selectedDateTimePeriod() );

5
ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp
View File

@ -59,9 +59,6 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#define DEFAULT_DIALOG_WIDTH 550
#define DEFAULT_DIALOG_INIT_HEIGHT 150
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Internal functions /// Internal functions
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -376,7 +373,7 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog( const
// Set properties and show dialog // Set properties and show dialog
dialog.setWindowTitle( "Origin Files" ); dialog.setWindowTitle( "Origin Files" );
dialog.m_buttons->button( QDialogButtonBox::Apply )->setVisible( !useFirstSummaryCaseAsTemplate && showApplyToAllWidget ); dialog.m_buttons->button( QDialogButtonBox::Apply )->setVisible( !useFirstSummaryCaseAsTemplate && showApplyToAllWidget );
dialog.resize( DEFAULT_DIALOG_WIDTH, DEFAULT_DIALOG_INIT_HEIGHT ); dialog.resize( 550, 150 );
QApplication::setOverrideCursor( QCursor( Qt::ArrowCursor ) ); QApplication::setOverrideCursor( QCursor( Qt::ArrowCursor ) );
dialog.exec(); dialog.exec();