Override the debug and feedback menu URLs.

Author: davidgiven

src/gui2/build.py

@@ -421,6 +421,7 @@ def plugin(name, id, srcs, hdrs, romfsdir, deps):
             "dep/imhex/plugins/builtin/source/content/main_menu_items.cpp",
             "dep/imhex/plugins/builtin/source/content/welcome_screen.cpp",
             "dep/imhex/plugins/builtin/source/content/out_of_box_experience.cpp",
+            "dep/imhex/plugins/builtin/source/content/ui_items.cpp",
             "dep/imhex/plugins/builtin/source/content/views.cpp",
             "dep/imhex/plugins/builtin/source/content/views/view_data_processor.cpp",
             "dep/imhex/plugins/builtin/source/content/views/view_tutorials.cpp",
@@ -434,6 +435,7 @@ def plugin(name, id, srcs, hdrs, romfsdir, deps):
     + [
         "./imhex_overrides/welcome.cc",
         "./imhex_overrides/stubs.cc",
+        "./imhex_overrides/ui_items.cc",
         "./imhex_overrides/views.cpp",
         "./imhex_overrides/main_menu_items.cpp",
     ],
@@ -446,6 +448,7 @@ def plugin(name, id, srcs, hdrs, romfsdir, deps):
         ".+libwolv",
         ".+ui-plugin",
         ".+fonts-plugin",
+        "dep/imhex/plugins/builtin/source/content/ui_items.cpp",
     ],
 )
 
@@ -578,16 +581,16 @@ def plugin(name, id, srcs, hdrs, romfsdir, deps):
             "mkdir -p $[dir]/FluxEngine.app/Contents/Resources",
             "cp $[ins[1]] $[dir]/FluxEngine.app/Contents/Resources/FluxEngine.icns",
             "dylibbundler -of -x $[dir]/FluxEngine.app/Contents/MacOS/fluxengine-gui -b -d $[dir]/FluxEngine.app/Contents/libs -cd > /dev/null",
-            #"cp $$(brew --prefix wxwidgets)/README.md FluxEngine.app/Contents/libs/wxWidgets.md",
-            #"cp $$(brew --prefix protobuf)/LICENSE FluxEngine.app/Contents/libs/protobuf.txt",
-            #"cp $$(brew --prefix fmt)/LICENSE* FluxEngine.app/Contents/libs/fmt.rst",
-            #"cp $$(brew --prefix libpng)/LICENSE FluxEngine.app/Contents/libs/libpng.txt",
-            #"cp $$(brew --prefix libjpeg)/README FluxEngine.app/Contents/libs/libjpeg.txt",
-            #"cp $$(brew --prefix abseil)/LICENSE FluxEngine.app/Contents/libs/abseil.txt",
-            #"cp $$(brew --prefix libtiff)/LICENSE.md FluxEngine.app/Contents/libs/libtiff.txt",
-            #"cp $$(brew --prefix zstd)/LICENSE FluxEngine.app/Contents/libs/zstd.txt",
+            # "cp $$(brew --prefix wxwidgets)/README.md FluxEngine.app/Contents/libs/wxWidgets.md",
+            # "cp $$(brew --prefix protobuf)/LICENSE FluxEngine.app/Contents/libs/protobuf.txt",
+            # "cp $$(brew --prefix fmt)/LICENSE* FluxEngine.app/Contents/libs/fmt.rst",
+            # "cp $$(brew --prefix libpng)/LICENSE FluxEngine.app/Contents/libs/libpng.txt",
+            # "cp $$(brew --prefix libjpeg)/README FluxEngine.app/Contents/libs/libjpeg.txt",
+            # "cp $$(brew --prefix abseil)/LICENSE FluxEngine.app/Contents/libs/abseil.txt",
+            # "cp $$(brew --prefix libtiff)/LICENSE.md FluxEngine.app/Contents/libs/libtiff.txt",
+            # "cp $$(brew --prefix zstd)/LICENSE FluxEngine.app/Contents/libs/zstd.txt",
             "(cd $[dir] && zip -rq FluxEngine.app.zip FluxEngine.app)",
-            "mv $[dir]/FluxEngine.app.zip $[outs[0]]"
+            "mv $[dir]/FluxEngine.app.zip $[outs[0]]",
         ],
         label="MKAPP",
     )
@@ -605,4 +608,3 @@ def plugin(name, id, srcs, hdrs, romfsdir, deps):
         ],
         label="MKPKG",
     )
-

src/gui2/controlpanelview.cc

@@ -47,7 +47,6 @@ static void saveFluxFile()
     fs::openFileBrowser(fs::DialogMode::Save, {}, Datastore::writeFluxFile);
 }
 
-static void showOptions() {}
 void ControlPanelView::drawContent()
 {
     auto diskFlux = Datastore::getDiskFlux();

src/gui2/imhex_overrides/ui_items.cc

@@ -0,0 +1,37 @@
+#define addTitleBarButtons addTitleBarButtons_disabled
+#include "../../../dep/imhex/plugins/builtin/source/content/ui_items.cpp"
+#undef addTitleBarButtons
+
+namespace hex::plugin::builtin
+{
+    void addTitleBarButtons()
+    {
+        if (dbg::debugModeEnabled())
+        {
+            ContentRegistry::UserInterface::addTitleBarButton(ICON_VS_DEBUG,
+                ImGuiCustomCol_ToolbarGray,
+                "hex.builtin.title_bar_button.debug_build",
+                []
+                {
+                    if (ImGui::GetIO().KeyShift)
+                    {
+                        RequestOpenPopup::post("DebugMenu");
+                    }
+                    else
+                    {
+                        hex::openWebpage("https://cowlark.com/fluxengine");
+                    }
+                });
+        }
+
+        ContentRegistry::UserInterface::addTitleBarButton(ICON_VS_SMILEY,
+            ImGuiCustomCol_ToolbarGray,
+            "hex.builtin.title_bar_button.feedback",
+            []
+            {
+                hex::openWebpage(
+                    "https://github.com/davidgiven/fluxengine/discussions/"
+                    "categories/general");
+            });
+    }
+}

src/gui2/summaryview.cc

@@ -84,6 +84,8 @@ void SummaryView::drawContent()
 {
     auto diskFlux = Datastore::getDiskFlux();
     auto diskLayout = Datastore::getDiskLayout();
+    if (!diskFlux || !diskLayout)
+        return;
 
     auto [minPhysicalCylinder,
         maxPhysicalCylinder,