Add regex and case sensitivity options to FilterEdit

Author: negasora

ui/attachprocess.cpp

@@ -313,7 +313,7 @@ ProcessListWidget::ProcessListWidget(QWidget* parent, DbgRef<DebuggerController>
 	setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
 	setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
 	setAutoScroll(false);
-	
+
 	resizeColumnsToContents();
 	resizeRowsToContents();
 
@@ -367,9 +367,14 @@ void ProcessListWidget::updateContent(const std::vector<ProcessItem>& processLis
 }
 
 
-void ProcessListWidget::setFilter(const string& filter)
+void ProcessListWidget::setFilter(const string& filter, FilterOptions options)
 {
-	m_filter->setFilterFixedString(QString::fromStdString(filter));
+	if (options.testFlag(UseRegexOption))
+		m_filter->setFilterRegularExpression(QString::fromStdString(filter));
+	else
+		m_filter->setFilterFixedString(QString::fromStdString(filter));
+	m_filter->setFilterCaseSensitivity(
+		options.testFlag(CaseSensitiveOption) ? Qt::CaseSensitive : Qt::CaseInsensitive);
 	updateColumnWidths();
 }
 
@@ -395,6 +400,7 @@ AttachProcessDialog::AttachProcessDialog(QWidget* parent, DbgRef<DebuggerControl
 
 	m_processListWidget = new ProcessListWidget(this, controller);
 	m_separateEdit = new FilterEdit(m_processListWidget);
+	m_separateEdit->showRegexToggle(true);
 	m_filter = new FilteredView(this, m_processListWidget, m_processListWidget, m_separateEdit);
 	m_filter->setFilterPlaceholderText("Search process");
 

ui/attachprocess.h

@@ -26,6 +26,7 @@ limitations under the License.
 #include <QHeaderView>
 #include <QStyledItemDelegate>
 #include "debuggerapi.h"
+#include "filter.h"
 #include "ui.h"
 
 
@@ -133,7 +134,7 @@ class ProcessListWidget : public QTableView, public FilterTarget
 
 	virtual void contextMenuEvent(QContextMenuEvent* event) override;
 
-	virtual void setFilter(const std::string& filter) override;
+	virtual void setFilter(const std::string& filter, FilterOptions options) override;
 	virtual void scrollToFirstItem() override;
 	virtual void scrollToCurrentItem() override;
 	virtual void ensureSelection() override;

ui/moduleswidget.cpp

@@ -580,9 +580,14 @@ void DebugModulesWidget::onDoubleClicked()
 };
 
 
-void DebugModulesWidget::setFilter(const string& filter)
+void DebugModulesWidget::setFilter(const string& filter, FilterOptions options)
 {
-	m_filter->setFilterRegularExpression(QString::fromStdString(filter));
+	if (options.testFlag(UseRegexOption))
+		m_filter->setFilterRegularExpression(QString::fromStdString(filter));
+	else
+		m_filter->setFilterFixedString(QString::fromStdString(filter));
+	m_filter->setFilterCaseSensitivity(
+		options.testFlag(CaseSensitiveOption) ? Qt::CaseSensitive : Qt::CaseInsensitive);
 	updateColumnWidths();
 }
 
@@ -609,6 +614,7 @@ DebugModulesWithFilter::DebugModulesWithFilter(ViewFrame* view, BinaryViewRef da
 {
 	m_modules = new DebugModulesWidget(view, data);
 	m_separateEdit = new FilterEdit(m_modules);
+	m_separateEdit->showRegexToggle(true);
 	m_filter = new FilteredView(this, m_modules, m_modules, m_separateEdit);
 	m_filter->setFilterPlaceholderText("Search modules");
 

ui/moduleswidget.h

@@ -27,6 +27,7 @@ limitations under the License.
 #include "fontsettings.h"
 #include "theme.h"
 #include "globalarea.h"
+#include "filter.h"
 #include "debuggerapi.h"
 
 using namespace BinaryNinjaDebuggerAPI;
@@ -154,7 +155,7 @@ class DebugModulesWidget : public QTableView, public FilterTarget
 	bool canCopy();
 	bool canCopyAll();
 
-	virtual void setFilter(const std::string& filter) override;
+	virtual void setFilter(const std::string& filter, FilterOptions options) override;
 	virtual void scrollToFirstItem() override;
 	virtual void scrollToCurrentItem() override;
 	virtual void ensureSelection() override;

ui/registerswidget.cpp

@@ -930,9 +930,14 @@ void DebugRegistersWidget::editValue()
 }
 
 
-void DebugRegistersWidget::setFilter(const string& filter)
+void DebugRegistersWidget::setFilter(const string& filter, FilterOptions options)
 {
-	m_filter->setFilterRegularExpression(QString::fromStdString(filter));
+	if (options.testFlag(UseRegexOption))
+		m_filter->setFilterRegularExpression(QString::fromStdString(filter));
+	else
+		m_filter->setFilterFixedString(QString::fromStdString(filter));
+	m_filter->setFilterCaseSensitivity(
+		options.testFlag(CaseSensitiveOption) ? Qt::CaseSensitive : Qt::CaseInsensitive);
 	updateColumnWidths();
 }
 
@@ -953,6 +958,7 @@ DebugRegistersContainer::DebugRegistersContainer(ViewFrame* view, BinaryViewRef
 {
 	m_register = new DebugRegistersWidget(view, data, menu);
 	m_separateEdit = new FilterEdit(m_register);
+	m_separateEdit->showRegexToggle(true);
 	m_filter = new FilteredView(this, m_register, m_register, m_separateEdit);
 	m_filter->setFilterPlaceholderText("Search registers");
 

ui/registerswidget.h

@@ -179,7 +179,7 @@ class DebugRegistersWidget : public QTableView, public FilterTarget
 	bool selectionNotEmpty();
 	bool canPaste();
 
-	virtual void setFilter(const std::string& filter) override;
+	virtual void setFilter(const std::string& filter, FilterOptions options) override;
 	virtual void scrollToFirstItem() override;
 	virtual void scrollToCurrentItem() override;
 	virtual void ensureSelection() override;