From 82b425fabc4a7436dad1592570dbd7a1df8a2c45 Mon Sep 17 00:00:00 2001 From: William Johnson Date: Wed, 22 Nov 2023 08:15:15 -0800 Subject: [PATCH 1/2] Maybe fix FAQ resource bundle not loading on macOS app. --- src/UseInfoWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UseInfoWindow.cpp b/src/UseInfoWindow.cpp index 9ca6f48e..07643bbf 100644 --- a/src/UseInfoWindow.cpp +++ b/src/UseInfoWindow.cpp @@ -1082,7 +1082,7 @@ void UseInfoWindow::textItemCreator( const std::string &resource, Wt::WContainer const string resource_name = SpecUtils::filename(resource); WMessageResourceBundle bundle; - bundle.use( resource, true ); + bundle.use( resource_base, true ); vector> topic_keys; From 7fd2568c36006aa8b92edd521722428f5bed61bb Mon Sep 17 00:00:00 2001 From: William Johnson Date: Wed, 22 Nov 2023 12:04:08 -0800 Subject: [PATCH 2/2] Fix macOS https links not working, and "FAQs" displaying. --- InterSpec_resources/static_text/faqs/faqs.css | 5 ++ data/more_nuclide_info.xml | 67 +++++++++++++++++-- src/UseInfoWindow.cpp | 3 +- target/osx/AppDelegate.mm | 7 +- 4 files changed, 74 insertions(+), 8 deletions(-) diff --git a/InterSpec_resources/static_text/faqs/faqs.css b/InterSpec_resources/static_text/faqs/faqs.css index 068d5440..757cea63 100644 --- a/InterSpec_resources/static_text/faqs/faqs.css +++ b/InterSpec_resources/static_text/faqs/faqs.css @@ -18,6 +18,11 @@ } +.faqs-toc-item.LinkBtn +{ + float: none; +} + .faqs-subjects { diff --git a/data/more_nuclide_info.xml b/data/more_nuclide_info.xml index 6357a5da..d15bbe2c 100644 --- a/data/more_nuclide_info.xml +++ b/data/more_nuclide_info.xml @@ -1,4 +1,4 @@ - +