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

Recursive Import Dialog: Cleaned up code

Browse Source
This commit is contained in:
Jacob Støren
2019-08-19 11:44:19 +02:00
parent 3d9ed39795
commit 2d2ecc3031
2 changed files with 117 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ApplicationCode/Commands/RicRecursiveFileSearchDialog.h
View File

@@ -45,8 +45,6 @@ class RicRecursiveFileSearchDialog : public QDialog
enum Status {SEARCHING_FOR_DIRS, SEARCHING_FOR_FILES, NO_FILES_FOUND};
public:
RicRecursiveFileSearchDialog(QWidget* parent);
~RicRecursiveFileSearchDialog() override;
static RicRecursiveFileSearchDialogResult runRecursiveSearchDialog(QWidget *parent = nullptr,
const QString& caption = QString(),
@@ -56,51 +54,47 @@ public:
const QStringList& fileExtensions = QStringList());
private:
RicRecursiveFileSearchDialog(QWidget* parent);
~RicRecursiveFileSearchDialog() override;
QString cleanTextFromPathFilterField() const;
QString rootDirWithEndSeparator() const;
QString pathFilterWithoutStartSeparator() const;
QString fileNameFilter() const;
QStringList fileExtensions() const;
QString fileExtensionsText() const;
QString extensionFromFileNameFilter() const;
void setOkButtonEnabled(bool enabled);
void warningIfInvalidCharacters();
void updateEffectiveFilter();
void updateStatus(Status status, const QString& extraText = "");
void updateFileListWidget();
void clearFileList();
void updateStatus(Status status, const QString& extraText = "");
// File search methods
QStringList findMatchingFiles();
QStringList buildDirectoryListRecursive(const QString& currentDir, int level = 0);
void buildDirectoryListRecursiveSimple(const QString& currentDir,
const QString& currentPathFilter,
QStringList* accumulatedDirs);
QStringList findFilesInDirs(const QStringList& dirs);
QStringList createFileNameFilterList();
bool pathFilterMatch(const QString& pathFilter, const QString& relPath);
void updateEffectiveFilter();
void setOkButtonEnabled(bool enabled);
void warningIfInvalidCharacters();
private slots:
void slotFilterChanged(const QString& text);
void slotBrowseButtonClicked();
void slotFindOrCancelButtonClicked();
void slotFileListCustomMenuRequested(const QPoint& point);
void slotCopyFileItemText();
void slotToggleFileListItems();
void slotTurnOffFileListItems();
void slotTurnOnFileListItems();
void slotCopyFileItemText();
void slotFindOrCancelButtonClicked();
void slotDialogOkClicked();
void slotDialogCancelClicked();
void slotBrowseButtonClicked();
private:
@@ -113,21 +107,24 @@ private:
QLabel* m_effectiveFilterLabel;
QLabel* m_effectiveFilterContentLabel;
QPushButton* m_findOrCancelButton;
QGroupBox* m_outputGroup;
QLabel* m_searchRootLabel;
QLabel* m_searchRootContentLabel;
QLabel* m_fileListLabel;
QListWidget* m_fileListWidget;
QPushButton* m_findOrCancelButton;
QDialogButtonBox* m_buttons;
QStringList m_foundFiles;
QStringList m_fileExtensions;
bool m_isCancelPressed;
// Obsolete. Here for reference if this search mode is needed later
QStringList buildDirectoryListRecursive(const QString& currentDir, int level = 0);
bool pathFilterMatch(const QString& pathFilter, const QString& relPath);
};