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

#4588 Recursive import Dialog: Fixed tab order, default button,

Browse Source 
and avoid deleting the result list when editing the filters
This commit is contained in:
Jacob Støren 2019-08-16 11:36:37 +02:00
parent 5179f840b8
commit f2e5ccc60d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/RicFileHierarchyDialog.cpp
View File

@ -90,9 +90,9 @@ RicFileHierarchyDialog::RicFileHierarchyDialog(QWidget* parent)
m_fileExtensionLabel = new QLabel(); m_fileExtensionLabel = new QLabel();
m_effectiveFilterLabel = new QLabel(); m_effectiveFilterLabel = new QLabel();
m_effectiveFilter = new QLabel(); m_effectiveFilter = new QLabel();
m_findOrCancelButton = new QPushButton();
m_fileListLabel = new QLabel(); m_fileListLabel = new QLabel();
m_fileList = new QListWidget(); m_fileList = new QListWidget();
m_findOrCancelButton = new QPushButton();
m_buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); m_buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
@ -126,6 +126,7 @@ RicFileHierarchyDialog::RicFileHierarchyDialog(QWidget* parent)
m_browseButton->setFixedWidth(25); m_browseButton->setFixedWidth(25);
m_findOrCancelButton->setText(FIND_BUTTON_FIND_TEXT); m_findOrCancelButton->setText(FIND_BUTTON_FIND_TEXT);
m_findOrCancelButton->setFixedWidth(75); m_findOrCancelButton->setFixedWidth(75);
m_findOrCancelButton->setDefault(true);
// Define layout // Define layout
QVBoxLayout* dialogLayout = new QVBoxLayout(); QVBoxLayout* dialogLayout = new QVBoxLayout();
@ -624,9 +625,9 @@ void RicFileHierarchyDialog::warningIfInvalidCharacters()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicFileHierarchyDialog::slotFilterChanged(const QString& text) void RicFileHierarchyDialog::slotFilterChanged(const QString& text)
{ {
clearFileList();
updateEffectiveFilter(); updateEffectiveFilter();
warningIfInvalidCharacters(); warningIfInvalidCharacters();
m_findOrCancelButton->setDefault(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -751,6 +752,7 @@ void RicFileHierarchyDialog::slotFindOrCancelButtonClicked()
} }
setOkButtonEnabled(!m_files.isEmpty()); setOkButtonEnabled(!m_files.isEmpty());
m_buttons->button(QDialogButtonBox::Ok)->setDefault(true);
} }
else else
{ {