From b3728ae658dd5ce53f1eb7908096d309b5a0b444 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sun, 6 Feb 2022 21:02:31 +0100 Subject: [PATCH] ui/ux: hexeditor -> hex_editor, Improved performance and flickering when highlighting bytes --- plugins/builtin/CMakeLists.txt | 2 +- ...view_hexeditor.hpp => view_hex_editor.hpp} | 0 .../source/content/data_formatters.cpp | 18 +- plugins/builtin/source/content/layouts.cpp | 2 +- plugins/builtin/source/content/ui_items.cpp | 2 +- plugins/builtin/source/content/views.cpp | 2 +- ...view_hexeditor.cpp => view_hex_editor.cpp} | 196 +++++++++--------- .../builtin/source/content/welcome_screen.cpp | 10 +- plugins/builtin/source/lang/de_DE.cpp | 150 +++++++------- plugins/builtin/source/lang/en_US.cpp | 150 +++++++------- plugins/builtin/source/lang/it_IT.cpp | 150 +++++++------- plugins/builtin/source/lang/zh_CN.cpp | 150 +++++++------- 12 files changed, 417 insertions(+), 415 deletions(-) rename plugins/builtin/include/content/views/{view_hexeditor.hpp => view_hex_editor.hpp} (100%) rename plugins/builtin/source/content/views/{view_hexeditor.cpp => view_hex_editor.cpp} (83%) diff --git a/plugins/builtin/CMakeLists.txt b/plugins/builtin/CMakeLists.txt index 869e7b48c..5beced191 100644 --- a/plugins/builtin/CMakeLists.txt +++ b/plugins/builtin/CMakeLists.txt @@ -24,7 +24,7 @@ add_library(${PROJECT_NAME} SHARED source/content/providers/gdb_provider.cpp source/content/providers/disk_provider.cpp - source/content/views/view_hexeditor.cpp + source/content/views/view_hex_editor.cpp source/content/views/view_pattern_editor.cpp source/content/views/view_pattern_data.cpp source/content/views/view_hashes.cpp diff --git a/plugins/builtin/include/content/views/view_hexeditor.hpp b/plugins/builtin/include/content/views/view_hex_editor.hpp similarity index 100% rename from plugins/builtin/include/content/views/view_hexeditor.hpp rename to plugins/builtin/include/content/views/view_hex_editor.hpp diff --git a/plugins/builtin/source/content/data_formatters.cpp b/plugins/builtin/source/content/data_formatters.cpp index c27908ab6..786d89405 100644 --- a/plugins/builtin/source/content/data_formatters.cpp +++ b/plugins/builtin/source/content/data_formatters.cpp @@ -35,35 +35,35 @@ namespace hex::plugin::builtin { void registerDataFormatters() { - ContentRegistry::DataFormatter::add("hex.builtin.view.hexeditor.copy.c", [](prv::Provider *provider, u64 offset, size_t size) { + ContentRegistry::DataFormatter::add("hex.builtin.view.hex_editor.copy.c", [](prv::Provider *provider, u64 offset, size_t size) { return formatLanguageArray(provider, offset, size, hex::format("const uint8_t data[{0}] = {{", size), "0x{0:02X}, ", "};"); }); - ContentRegistry::DataFormatter::add("hex.builtin.view.hexeditor.copy.cpp", [](prv::Provider *provider, u64 offset, size_t size) { + ContentRegistry::DataFormatter::add("hex.builtin.view.hex_editor.copy.cpp", [](prv::Provider *provider, u64 offset, size_t size) { return formatLanguageArray(provider, offset, size, hex::format("constexpr std::array data = {{", size), "0x{0:02X}, ", "};"); }); - ContentRegistry::DataFormatter::add("hex.builtin.view.hexeditor.copy.java", [](prv::Provider *provider, u64 offset, size_t size) { + ContentRegistry::DataFormatter::add("hex.builtin.view.hex_editor.copy.java", [](prv::Provider *provider, u64 offset, size_t size) { return formatLanguageArray(provider, offset, size, "final byte[] data = {", "0x{0:02X}, ", "};"); }); - ContentRegistry::DataFormatter::add("hex.builtin.view.hexeditor.copy.csharp", [](prv::Provider *provider, u64 offset, size_t size) { + ContentRegistry::DataFormatter::add("hex.builtin.view.hex_editor.copy.csharp", [](prv::Provider *provider, u64 offset, size_t size) { return formatLanguageArray(provider, offset, size, "const byte[] data = {", "0x{0:02X}, ", "};"); }); - ContentRegistry::DataFormatter::add("hex.builtin.view.hexeditor.copy.rust", [](prv::Provider *provider, u64 offset, size_t size) { + ContentRegistry::DataFormatter::add("hex.builtin.view.hex_editor.copy.rust", [](prv::Provider *provider, u64 offset, size_t size) { return formatLanguageArray(provider, offset, size, hex::format("let data: [u8; 0x{0:02X}] = [", size), "0x{0:02X}, ", "];"); }); - ContentRegistry::DataFormatter::add("hex.builtin.view.hexeditor.copy.python", [](prv::Provider *provider, u64 offset, size_t size) { + ContentRegistry::DataFormatter::add("hex.builtin.view.hex_editor.copy.python", [](prv::Provider *provider, u64 offset, size_t size) { return formatLanguageArray(provider, offset, size, "data = bytes([", "0x{0:02X}, ", "]);"); }); - ContentRegistry::DataFormatter::add("hex.builtin.view.hexeditor.copy.js", [](prv::Provider *provider, u64 offset, size_t size) { + ContentRegistry::DataFormatter::add("hex.builtin.view.hex_editor.copy.js", [](prv::Provider *provider, u64 offset, size_t size) { return formatLanguageArray(provider, offset, size, "const data = new Uint8Array([", "0x{0:02X}, ", "]);"); }); - ContentRegistry::DataFormatter::add("hex.builtin.view.hexeditor.copy.ascii", [](prv::Provider *provider, u64 offset, size_t size) { + ContentRegistry::DataFormatter::add("hex.builtin.view.hex_editor.copy.ascii", [](prv::Provider *provider, u64 offset, size_t size) { std::string result = "Hex View 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F\n\n"; std::vector buffer(0x1'0000, 0x00); @@ -105,7 +105,7 @@ namespace hex::plugin::builtin { return result; }); - ContentRegistry::DataFormatter::add("hex.builtin.view.hexeditor.copy.html", [](prv::Provider *provider, u64 offset, size_t size) { + ContentRegistry::DataFormatter::add("hex.builtin.view.hex_editor.copy.html", [](prv::Provider *provider, u64 offset, size_t size) { std::string result = "
\n" "