From fa9770928efeee721e1645f82d657ba225ba17b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Wed, 17 Apr 2024 17:13:53 -0300 Subject: [PATCH] Added saving to settings of clip info and track info. --- mrv2/lib/mrvApp/mrvSettingsObject.cpp | 6 ++++++ mrv2/lib/mrvFl/mrvCallbacks.cpp | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/mrv2/lib/mrvApp/mrvSettingsObject.cpp b/mrv2/lib/mrvApp/mrvSettingsObject.cpp index 4e3db9b1f..b57603d65 100644 --- a/mrv2/lib/mrvApp/mrvSettingsObject.cpp +++ b/mrv2/lib/mrvApp/mrvSettingsObject.cpp @@ -15,6 +15,8 @@ namespace fs = std::filesystem; #include #include +#include + #include #include "mrvCore/mrvOS.h" @@ -70,6 +72,10 @@ namespace mrv p.defaultValues["Timeline/Editable"] = true; p.defaultValues["Timeline/FrameView"] = true; + p.defaultValues["Timeline/TrackInfo"] = + timelineui::ItemOptions().trackInfo; + p.defaultValues["Timeline/ClipInfo"] = + timelineui::ItemOptions().clipInfo; p.defaultValues["Timeline/ScrollToCurrentFrame"] = true; p.defaultValues["Timeline/StopOnScrub"] = true; p.defaultValues["Timeline/FirstTrack"] = false; diff --git a/mrv2/lib/mrvFl/mrvCallbacks.cpp b/mrv2/lib/mrvFl/mrvCallbacks.cpp index f5aea1d15..0db2af186 100644 --- a/mrv2/lib/mrvFl/mrvCallbacks.cpp +++ b/mrv2/lib/mrvFl/mrvCallbacks.cpp @@ -1628,6 +1628,8 @@ namespace mrv Fl_Menu_Item* item = const_cast< Fl_Menu_Item* >(m->mvalue()); auto options = ui->uiTimeline->getItemOptions(); options.trackInfo = item->checked(); + auto settings = ui->app->settings(); + settings->setValue("Timeline/TrackInfo", options.trackInfo); Message msg; msg["command"] = "setTimelineItemOptions"; msg["value"] = options; @@ -1644,6 +1646,8 @@ namespace mrv Fl_Menu_Item* item = const_cast< Fl_Menu_Item* >(m->mvalue()); auto options = ui->uiTimeline->getItemOptions(); options.clipInfo = item->checked(); + auto settings = ui->app->settings(); + settings->setValue("Timeline/ClipInfo", options.clipInfo); Message msg; msg["command"] = "setTimelineItemOptions"; msg["value"] = options;