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

File Search Dialog : Do not search on launch

Browse Source
This commit is contained in:
Magne Sjaastad
2021-09-13 14:11:42 +02:00
parent 9838f766cb
commit dc3a962cae
1 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp
View File

@@ -40,6 +40,7 @@
#include <QMenu> #include <QMenu>
#include <QPushButton> #include <QPushButton>
#include <QSettings> #include <QSettings>
#include <QSignalBlocker>
#include <QTextEdit> #include <QTextEdit>
#include <QTime> #include <QTime>
#include <QToolBar> #include <QToolBar>
@@ -69,7 +70,15 @@ RicRecursiveFileSearchDialogResult RicRecursiveFileSearchDialog::runRecursiveSea
const QString& fileNameFilter, const QString& fileNameFilter,
const QStringList& fileExtensions ) const QStringList& fileExtensions )
{ {
const QString filePathRegistryKey = QString( "RicRecursiveFileSearchDialog %1" ).arg( caption ).replace( " ", "_" );
const QString fileFilterRegistryKey =
QString( "RicRecursiveFileSearchDialog file filter %1" ).arg( caption ).replace( " ", "_" );
const QString useRealizationStarRegistryKey = "RecursiveFileSearchDialog_use_realization";
QSettings settings;
RicRecursiveFileSearchDialog dialog( parent ); RicRecursiveFileSearchDialog dialog( parent );
{
QSignalBlocker signalBlocker( dialog.m_pathFilterField );
dialog.setWindowTitle( caption ); dialog.setWindowTitle( caption );
@@ -79,16 +88,10 @@ RicRecursiveFileSearchDialogResult RicRecursiveFileSearchDialog::runRecursiveSea
dialog.m_fileFilterField->addItem( fileNameFilter ); dialog.m_fileFilterField->addItem( fileNameFilter );
dialog.m_pathFilterField->addItem( QDir::toNativeSeparators( pathFilterText ) ); dialog.m_pathFilterField->addItem( QDir::toNativeSeparators( pathFilterText ) );
const QString filePathRegistryKey = QString( "RicRecursiveFileSearchDialog %1" ).arg( caption ).replace( " ", "_" );
populateComboBoxHistoryFromRegistry( dialog.m_pathFilterField, filePathRegistryKey ); populateComboBoxHistoryFromRegistry( dialog.m_pathFilterField, filePathRegistryKey );
const QString fileFilterRegistryKey =
QString( "RicRecursiveFileSearchDialog file filter %1" ).arg( caption ).replace( " ", "_" );
populateComboBoxHistoryFromRegistry( dialog.m_fileFilterField, fileFilterRegistryKey ); populateComboBoxHistoryFromRegistry( dialog.m_fileFilterField, fileFilterRegistryKey );
QSettings settings;
const QString useRealizationStarRegistryKey = "RecursiveFileSearchDialog_use_realization";
bool isChecked = settings.value( useRealizationStarRegistryKey, true ).toBool(); bool isChecked = settings.value( useRealizationStarRegistryKey, true ).toBool();
dialog.m_useRealizationStarCheckBox->setChecked( isChecked ); dialog.m_useRealizationStarCheckBox->setChecked( isChecked );
@@ -105,6 +108,8 @@ RicRecursiveFileSearchDialogResult RicRecursiveFileSearchDialog::runRecursiveSea
dialog.setOkButtonEnabled( false ); dialog.setOkButtonEnabled( false );
dialog.resize( 800, 150 ); dialog.resize( 800, 150 );
}
dialog.exec(); dialog.exec();
if ( dialog.result() == QDialog::Accepted ) if ( dialog.result() == QDialog::Accepted )