diff --git a/CHANGELOG.md b/CHANGELOG.md index de5981ad7d..0f6ff8c638 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Upcoming Release] +- Workflow links on the splash screen were reordered slightly. +- The "Frame Definition" workflow is now labelled as deprecated, because we anticipate + that it isn't used very much. If you think otherwise, then post a comment on issue + #951. - The documentation now contains an explanation for how to install OSC on MacOSes that have a newer, more draconian, gatekeeper (#942). - Fixed a typo where tutorial 5 referred to a "femur CT scan" when the content was diff --git a/src/OpenSimCreator/UI/Shared/MainMenu.cpp b/src/OpenSimCreator/UI/Shared/MainMenu.cpp index 00b12607c7..404fd1dc66 100644 --- a/src/OpenSimCreator/UI/Shared/MainMenu.cpp +++ b/src/OpenSimCreator/UI/Shared/MainMenu.cpp @@ -195,7 +195,7 @@ void osc::MainMenuFileTab::onDraw(IModelStatePair* maybeModel) auto tab = std::make_unique(*m_Parent); App::post_event(*m_Parent, std::move(tab)); } - if (ui::draw_menu_item(OSC_ICON_MAGIC " Preview Experimental Data (" OSC_ICON_MAGIC " experimental)")) { + if (ui::draw_menu_item(OSC_ICON_MAGIC " Preview Experimental Data")) { auto tab = std::make_unique(*m_Parent); App::post_event(*m_Parent, std::move(tab)); } diff --git a/src/OpenSimCreator/UI/SplashTab.cpp b/src/OpenSimCreator/UI/SplashTab.cpp index db8b3e3160..05c868f1a4 100644 --- a/src/OpenSimCreator/UI/SplashTab.cpp +++ b/src/OpenSimCreator/UI/SplashTab.cpp @@ -265,28 +265,32 @@ class osc::SplashTab::Impl final : public TabPrivate { void drawWorkflowsMenuSectionContent() { - if (ui::draw_menu_item(OSC_ICON_ARROWS_ALT " Frame Definition")) { - auto tab = std::make_unique(*parent()); - App::post_event(*parent(), std::move(tab)); - } if (ui::draw_menu_item(OSC_ICON_FILE_IMPORT " Mesh Importer")) { auto tab = std::make_unique(*parent()); App::post_event(*parent(), std::move(tab)); } + + if (ui::draw_menu_item(OSC_ICON_MAGIC " Preview Experimental Data")) { + auto tab = std::make_unique(*parent()); + App::post_event(*parent(), std::move(tab)); + } if (ui::draw_menu_item(OSC_ICON_CUBE " Mesh Warping")) { auto tab = std::make_unique(*parent()); App::post_event(*parent(), std::move(tab)); } + App::upd().add_frame_annotation("SplashTab/MeshWarpingMenuItem", ui::get_last_drawn_item_screen_rect()); + if (ui::draw_menu_item(OSC_ICON_MAGIC " Model Warping (" OSC_ICON_MAGIC " experimental)")) { auto tab = std::make_unique(*parent()); App::post_event(*parent(), std::move(tab)); } App::upd().add_frame_annotation("SplashTab/ModelWarpingMenuItem", ui::get_last_drawn_item_screen_rect()); - if (ui::draw_menu_item(OSC_ICON_MAGIC " Preview Experimental Data (" OSC_ICON_MAGIC " experimental)")) { - auto tab = std::make_unique(*parent()); + + if (ui::draw_menu_item(OSC_ICON_ARROWS_ALT " Frame Definition (" OSC_ICON_TRASH " deprecated)")) { + auto tab = std::make_unique(*parent()); App::post_event(*parent(), std::move(tab)); } - App::upd().add_frame_annotation("SplashTab/MeshWarpingMenuItem", ui::get_last_drawn_item_screen_rect()); + ui::draw_tooltip_if_item_hovered("Frame Definition Workflow", "This feature is currently scheduled for deprecation. If you think it shouldn't be deprecated, then post a comment on GitHub issue #951."); } void drawRecentlyOpenedFilesMenuSectionContent(int& imguiID)