From b0876e1c35d026304533b6ccc39d0c8bf8c26086 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Fri, 12 May 2023 08:38:32 +0200 Subject: [PATCH] impr: Move some options into a new Extras menu --- plugins/builtin/romfs/lang/en_US.json | 1 + .../builtin/source/content/main_menu_items.cpp | 15 ++++++++------- .../builtin/source/content/views/view_about.cpp | 10 +++++++++- .../source/content/views/view_settings.cpp | 4 ++-- .../builtin/source/content/views/view_store.cpp | 4 +--- .../source/content/views/view_theme_manager.cpp | 2 +- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/plugins/builtin/romfs/lang/en_US.json b/plugins/builtin/romfs/lang/en_US.json index 8e55672fd..442ad0972 100644 --- a/plugins/builtin/romfs/lang/en_US.json +++ b/plugins/builtin/romfs/lang/en_US.json @@ -137,6 +137,7 @@ "hex.builtin.menu.edit.bookmark.create": "Create bookmark", "hex.builtin.menu.edit.redo": "Redo", "hex.builtin.menu.edit.undo": "Undo", + "hex.builtin.menu.extras": "Extras", "hex.builtin.menu.file": "File", "hex.builtin.menu.file.bookmark.export": "Export bookmarks", "hex.builtin.menu.file.bookmark.import": "Import bookmarks", diff --git a/plugins/builtin/source/content/main_menu_items.cpp b/plugins/builtin/source/content/main_menu_items.cpp index 2828ba230..86e5491d7 100644 --- a/plugins/builtin/source/content/main_menu_items.cpp +++ b/plugins/builtin/source/content/main_menu_items.cpp @@ -13,7 +13,6 @@ #include #include -#include #include #include @@ -461,19 +460,21 @@ namespace hex::plugin::builtin { }); } - static void createHelpMenu() { - ContentRegistry::Interface::registerMainMenuItem("hex.builtin.menu.help", 5000); - - ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.help", "hex.builtin.menu.help.ask_for_help" }, 5000, CTRLCMD + SHIFT + Keys::D, [] { - PopupDocsQuestion::open(); - }); + static void createExtrasMenu() { + ContentRegistry::Interface::registerMainMenuItem("hex.builtin.menu.extras", 5000); } + static void createHelpMenu() { + ContentRegistry::Interface::registerMainMenuItem("hex.builtin.menu.help", 6000); + } + + void registerMainMenuEntries() { createFileMenu(); createEditMenu(); createViewMenu(); createLayoutMenu(); + createExtrasMenu(); createHelpMenu(); (void)EventManager::subscribe([] { diff --git a/plugins/builtin/source/content/views/view_about.cpp b/plugins/builtin/source/content/views/view_about.cpp index 00eaaa880..459fc5ca6 100644 --- a/plugins/builtin/source/content/views/view_about.cpp +++ b/plugins/builtin/source/content/views/view_about.cpp @@ -6,6 +6,8 @@ #include #include +#include + #include namespace hex::plugin::builtin { @@ -18,9 +20,15 @@ namespace hex::plugin::builtin { this->getWindowOpenState() = true; }); - ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.help", "hex.builtin.view.help.documentation" }, 1050, Shortcut::None, [] { + ContentRegistry::Interface::addMenuItemSeparator({ "hex.builtin.menu.help" }, 2000); + + ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.help", "hex.builtin.view.help.documentation" }, 3000, Shortcut::None, [] { hex::openWebpage("https://imhex.werwolv.net/docs"); }); + + ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.help", "hex.builtin.menu.help.ask_for_help" }, 4000, CTRLCMD + SHIFT + Keys::D, [] { + PopupDocsQuestion::open(); + }); } static void link(const std::string &name, const std::string &author, const std::string &url) { diff --git a/plugins/builtin/source/content/views/view_settings.cpp b/plugins/builtin/source/content/views/view_settings.cpp index b566b7508..cf272024b 100644 --- a/plugins/builtin/source/content/views/view_settings.cpp +++ b/plugins/builtin/source/content/views/view_settings.cpp @@ -19,9 +19,9 @@ namespace hex::plugin::builtin { } }); - ContentRegistry::Interface::addMenuItemSeparator({ "hex.builtin.menu.help" }, 4000); + ContentRegistry::Interface::addMenuItemSeparator({ "hex.builtin.menu.extras" }, 3000); - ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.help", "hex.builtin.view.settings.name"_lang }, 4050, Shortcut::None, [&, this] { + ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.extras", "hex.builtin.view.settings.name"_lang }, 4000, Shortcut::None, [&, this] { TaskManager::doLater([] { ImGui::OpenPopup(View::toWindowName("hex.builtin.view.settings.name").c_str()); }); this->getWindowOpenState() = true; }); diff --git a/plugins/builtin/source/content/views/view_store.cpp b/plugins/builtin/source/content/views/view_store.cpp index 71d48bbfe..49554816c 100644 --- a/plugins/builtin/source/content/views/view_store.cpp +++ b/plugins/builtin/source/content/views/view_store.cpp @@ -29,9 +29,7 @@ namespace hex::plugin::builtin { using namespace std::literals::chrono_literals; ViewStore::ViewStore() : View("hex.builtin.view.store.name") { - ContentRegistry::Interface::addMenuItemSeparator({ "hex.builtin.menu.help" }, 2000); - - ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.help", "hex.builtin.view.store.name" }, 2050, Shortcut::None, [&, this] { + ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.extras", "hex.builtin.view.store.name" }, 1000, Shortcut::None, [&, this] { if (this->m_requestStatus == RequestStatus::NotAttempted) this->refresh(); TaskManager::doLater([] { ImGui::OpenPopup(View::toWindowName("hex.builtin.view.store.name").c_str()); }); diff --git a/plugins/builtin/source/content/views/view_theme_manager.cpp b/plugins/builtin/source/content/views/view_theme_manager.cpp index b774dd82e..4589f689f 100644 --- a/plugins/builtin/source/content/views/view_theme_manager.cpp +++ b/plugins/builtin/source/content/views/view_theme_manager.cpp @@ -7,7 +7,7 @@ namespace hex::plugin::builtin { ViewThemeManager::ViewThemeManager() : View("hex.builtin.view.theme_manager.name") { - ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.help", "hex.builtin.view.theme_manager.name" }, 3000, Shortcut::None, [&, this] { + ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.extras", "hex.builtin.view.theme_manager.name" }, 2000, Shortcut::None, [&, this] { this->m_viewOpen = true; this->getWindowOpenState() = true; });