From 0678dab7dca0bba07e9370140637cbac64625a42 Mon Sep 17 00:00:00 2001 From: Camisul <1397270-camisul@users.noreply.gitlab.com> Date: Fri, 22 Jan 2021 23:22:00 +0300 Subject: [PATCH] HexEditor: Find Added search submenu with options to find or find again. Find allows to search for ASII string or sequence of Hex value. --- .../Applications/HexEditor/CMakeLists.txt | 1 + .../Applications/HexEditor/FindDialog.cpp | 166 ++++++++++++++++++ Userland/Applications/HexEditor/FindDialog.h | 58 ++++++ Userland/Applications/HexEditor/HexEditor.cpp | 25 +++ Userland/Applications/HexEditor/HexEditor.h | 2 +- .../HexEditor/HexEditorWidget.cpp | 37 ++++ .../Applications/HexEditor/HexEditorWidget.h | 6 + 7 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 Userland/Applications/HexEditor/FindDialog.cpp create mode 100644 Userland/Applications/HexEditor/FindDialog.h diff --git a/Userland/Applications/HexEditor/CMakeLists.txt b/Userland/Applications/HexEditor/CMakeLists.txt index ebe134863f..496bb25a38 100644 --- a/Userland/Applications/HexEditor/CMakeLists.txt +++ b/Userland/Applications/HexEditor/CMakeLists.txt @@ -1,6 +1,7 @@ set(SOURCES HexEditor.cpp HexEditorWidget.cpp + FindDialog.cpp main.cpp ) diff --git a/Userland/Applications/HexEditor/FindDialog.cpp b/Userland/Applications/HexEditor/FindDialog.cpp new file mode 100644 index 0000000000..5c52f5738b --- /dev/null +++ b/Userland/Applications/HexEditor/FindDialog.cpp @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2021, the SerenityOS developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "FindDialog.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct Option { + String title; + OptionId opt; + bool enabled; + bool default_action; +}; + +static const Vector