From 5151cde6bda31e311b441a854799c660ac94476a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Thu, 28 Jun 2018 11:12:12 +0200 Subject: [PATCH] #3107 Hierarchy dialog. Warning to user when invalid chars are detected in file pattern --- .../Commands/RicFileHierarchyDialog.cpp | 18 ++++++++++++++++++ .../Commands/RicFileHierarchyDialog.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/ApplicationCode/Commands/RicFileHierarchyDialog.cpp b/ApplicationCode/Commands/RicFileHierarchyDialog.cpp index 2b410142bf..efd80352ae 100644 --- a/ApplicationCode/Commands/RicFileHierarchyDialog.cpp +++ b/ApplicationCode/Commands/RicFileHierarchyDialog.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -569,6 +570,22 @@ void RicFileHierarchyDialog::setOkButtonEnabled(bool enabled) m_buttons->button(QDialogButtonBox::Ok)->setEnabled(enabled); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RicFileHierarchyDialog::warningIfInvalidCharacters() +{ + if (m_fileFilter->text().contains(QRegExp("[\\\\/:]"))) + { + QToolTip::showText(m_fileFilter->mapToGlobal(QPoint(0, 0)), "File pattern contains invalid characters"); + m_effectiveFilter->setText("(Invalid filter)"); + } + else + { + QToolTip::hideText(); + } +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -576,6 +593,7 @@ void RicFileHierarchyDialog::slotFilterChanged(const QString& text) { clearFileList(); updateEffectiveFilter(); + warningIfInvalidCharacters(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicFileHierarchyDialog.h b/ApplicationCode/Commands/RicFileHierarchyDialog.h index e6c08d6720..05184f1474 100644 --- a/ApplicationCode/Commands/RicFileHierarchyDialog.h +++ b/ApplicationCode/Commands/RicFileHierarchyDialog.h @@ -87,6 +87,8 @@ private: void setOkButtonEnabled(bool enabled); + void warningIfInvalidCharacters(); + private slots: void slotFilterChanged(const QString& text); void slotFileListCustomMenuRequested(const QPoint& point);