mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
File Search Dialog : Do not search on launch
This commit is contained in:
parent
9838f766cb
commit
dc3a962cae
@ -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,42 +70,46 @@ RicRecursiveFileSearchDialogResult RicRecursiveFileSearchDialog::runRecursiveSea
|
|||||||
const QString& fileNameFilter,
|
const QString& fileNameFilter,
|
||||||
const QStringList& fileExtensions )
|
const QStringList& fileExtensions )
|
||||||
{
|
{
|
||||||
RicRecursiveFileSearchDialog dialog( parent );
|
|
||||||
|
|
||||||
dialog.setWindowTitle( caption );
|
|
||||||
|
|
||||||
QString pathFilterText = dir;
|
|
||||||
RiaFilePathTools::appendSeparatorIfNo( pathFilterText );
|
|
||||||
pathFilterText += pathFilter;
|
|
||||||
dialog.m_fileFilterField->addItem( fileNameFilter );
|
|
||||||
dialog.m_pathFilterField->addItem( QDir::toNativeSeparators( pathFilterText ) );
|
|
||||||
|
|
||||||
const QString filePathRegistryKey = QString( "RicRecursiveFileSearchDialog %1" ).arg( caption ).replace( " ", "_" );
|
const QString filePathRegistryKey = QString( "RicRecursiveFileSearchDialog %1" ).arg( caption ).replace( " ", "_" );
|
||||||
populateComboBoxHistoryFromRegistry( dialog.m_pathFilterField, filePathRegistryKey );
|
|
||||||
|
|
||||||
const QString fileFilterRegistryKey =
|
const QString fileFilterRegistryKey =
|
||||||
QString( "RicRecursiveFileSearchDialog file filter %1" ).arg( caption ).replace( " ", "_" );
|
QString( "RicRecursiveFileSearchDialog file filter %1" ).arg( caption ).replace( " ", "_" );
|
||||||
populateComboBoxHistoryFromRegistry( dialog.m_fileFilterField, fileFilterRegistryKey );
|
|
||||||
|
|
||||||
QSettings settings;
|
|
||||||
const QString useRealizationStarRegistryKey = "RecursiveFileSearchDialog_use_realization";
|
const QString useRealizationStarRegistryKey = "RecursiveFileSearchDialog_use_realization";
|
||||||
|
QSettings settings;
|
||||||
|
|
||||||
bool isChecked = settings.value( useRealizationStarRegistryKey, true ).toBool();
|
RicRecursiveFileSearchDialog dialog( parent );
|
||||||
dialog.m_useRealizationStarCheckBox->setChecked( isChecked );
|
{
|
||||||
|
QSignalBlocker signalBlocker( dialog.m_pathFilterField );
|
||||||
|
|
||||||
dialog.m_fileFilterField->setCurrentText( fileNameFilter );
|
dialog.setWindowTitle( caption );
|
||||||
dialog.m_fileFilterField->setEditable( true );
|
|
||||||
|
|
||||||
dialog.m_pathFilterField->setCurrentText( QDir::toNativeSeparators( pathFilterText ) );
|
QString pathFilterText = dir;
|
||||||
dialog.m_pathFilterField->setEditable( true );
|
RiaFilePathTools::appendSeparatorIfNo( pathFilterText );
|
||||||
|
pathFilterText += pathFilter;
|
||||||
|
dialog.m_fileFilterField->addItem( fileNameFilter );
|
||||||
|
dialog.m_pathFilterField->addItem( QDir::toNativeSeparators( pathFilterText ) );
|
||||||
|
|
||||||
dialog.m_fileExtensions = trimLeftStrings( fileExtensions, "." );
|
populateComboBoxHistoryFromRegistry( dialog.m_pathFilterField, filePathRegistryKey );
|
||||||
|
|
||||||
dialog.updateEffectiveFilter();
|
populateComboBoxHistoryFromRegistry( dialog.m_fileFilterField, fileFilterRegistryKey );
|
||||||
dialog.clearFileList();
|
|
||||||
dialog.setOkButtonEnabled( false );
|
bool isChecked = settings.value( useRealizationStarRegistryKey, true ).toBool();
|
||||||
|
dialog.m_useRealizationStarCheckBox->setChecked( isChecked );
|
||||||
|
|
||||||
|
dialog.m_fileFilterField->setCurrentText( fileNameFilter );
|
||||||
|
dialog.m_fileFilterField->setEditable( true );
|
||||||
|
|
||||||
|
dialog.m_pathFilterField->setCurrentText( QDir::toNativeSeparators( pathFilterText ) );
|
||||||
|
dialog.m_pathFilterField->setEditable( true );
|
||||||
|
|
||||||
|
dialog.m_fileExtensions = trimLeftStrings( fileExtensions, "." );
|
||||||
|
|
||||||
|
dialog.updateEffectiveFilter();
|
||||||
|
dialog.clearFileList();
|
||||||
|
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 )
|
||||||
|
Loading…
Reference in New Issue
Block a user