Merge pull request #30 from darbyjohnston/settings

Add settings
OpenTimelineIO · Dec 3, 2024 · 5b09cbd · 5b09cbd
2 parents 4b93454 + 8613de5
commit 5b09cbd
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 31 deletions.
diff --git a/cmake/SuperBuild/Builddtk-deps.cmake b/cmake/SuperBuild/Builddtk-deps.cmake
@@ -1,7 +1,7 @@
 include(ExternalProject)
 
 set(dtk_GIT_REPOSITORY "https://github.com/darbyjohnston/dtk.git")
-set(dtk_GIT_TAG "3f569280b3ea1c9cf37241f80be7847b6105d12c")
+set(dtk_GIT_TAG "b9515ed232f27dbba1398a81d25dad0d2caf231a")
 
 set(dtk-deps_ARGS
     ${toucan_EXTERNAL_PROJECT_ARGS}

diff --git a/cmake/SuperBuild/Builddtk.cmake b/cmake/SuperBuild/Builddtk.cmake
@@ -1,7 +1,7 @@
 include(ExternalProject)
 
 set(dtk_GIT_REPOSITORY "https://github.com/darbyjohnston/dtk.git")
-set(dtk_GIT_TAG "3f569280b3ea1c9cf37241f80be7847b6105d12c")
+set(dtk_GIT_TAG "b9515ed232f27dbba1398a81d25dad0d2caf231a")
 
 set(dtk_DEPS dtk-deps)
 set(dtk_ARGS

diff --git a/lib/toucanView/App.cpp b/lib/toucanView/App.cpp
@@ -12,6 +12,7 @@
 #include <dtk/ui/FileBrowser.h>
 #include <dtk/ui/MessageDialog.h>
 #include <dtk/ui/RecentFilesModel.h>
+#include <dtk/ui/Settings.h>
 
 #include <dtk/core/CmdLine.h>
 
@@ -25,8 +26,6 @@ namespace toucan
     {
         _messageLog = std::make_shared<MessageLog>();
 
-        _settings = dtk::Settings::create(dtk::getSettingsPath("toucan", "toucan-view.settings"));
-
         dtk::App::_init(
             context,
             argv,
@@ -40,9 +39,9 @@ namespace toucan
                     true)
             },
             {},
-            _settings);
+            dtk::getSettingsPath("toucan", "toucan-view.settings").string());
 
-        _timeUnitsModel = std::make_shared<TimeUnitsModel>(_settings);
+        _timeUnitsModel = std::make_shared<TimeUnitsModel>(context);
 
         std::vector<std::filesystem::path> searchPath;
         const std::filesystem::path parentPath = std::filesystem::path(argv[0]).parent_path();
@@ -59,7 +58,7 @@ namespace toucan
         auto fileBrowserSystem = context->getSystem<dtk::FileBrowserSystem>();
         fileBrowserSystem->setNativeFileDialog(false);
 
-        _filesModel = std::make_shared<FilesModel>(context, _settings, _host);
+        _filesModel = std::make_shared<FilesModel>(context, _host);
 
         _windowModel = std::make_shared<WindowModel>();
 

diff --git a/lib/toucanView/App.h b/lib/toucanView/App.h
@@ -35,7 +35,6 @@ namespace toucan
 
     private:
         std::shared_ptr<MessageLog> _messageLog;
-        std::shared_ptr<dtk::Settings> _settings;
         std::string _path;
         std::shared_ptr<TimeUnitsModel> _timeUnitsModel;
         std::shared_ptr<ImageEffectHost> _host;

diff --git a/lib/toucanView/ExportTool.cpp b/lib/toucanView/ExportTool.cpp
@@ -25,6 +25,7 @@ namespace toucan
         _host = app->getHost();
         _formats =
         {
+            ".exr",
             ".tiff",
             ".png"
         };

diff --git a/lib/toucanView/FilesModel.cpp b/lib/toucanView/FilesModel.cpp
@@ -11,7 +11,6 @@ namespace toucan
 {
     FilesModel::FilesModel(
         const std::shared_ptr<dtk::Context>& context,
-        const std::shared_ptr<dtk::Settings>& settings,
         const std::shared_ptr<ImageEffectHost>& host) :
         _context(context),
         _host(host)
@@ -21,7 +20,7 @@ namespace toucan
         _remove = dtk::ObservableValue<int>::create(-1);
         _current = dtk::ObservableValue< std::shared_ptr<File> >::create(nullptr);
         _currentIndex = dtk::ObservableValue<int>::create(-1);
-        _recentFilesModel = dtk::RecentFilesModel::create(context, settings);
+        _recentFilesModel = dtk::RecentFilesModel::create(context);
     }
 
     FilesModel::~FilesModel()

diff --git a/lib/toucanView/FilesModel.h b/lib/toucanView/FilesModel.h
@@ -6,7 +6,6 @@
 #include "File.h"
 
 #include <dtk/ui/RecentFilesModel.h>
-#include <dtk/ui/Settings.h>
 #include <dtk/core/Context.h>
 #include <dtk/core/ObservableList.h>
 #include <dtk/core/ObservableValue.h>
@@ -22,7 +21,6 @@ namespace toucan
     public:
         FilesModel(
             const std::shared_ptr<dtk::Context>&,
-            const std::shared_ptr<dtk::Settings>&,
             const std::shared_ptr<ImageEffectHost>&);
 
         virtual ~FilesModel();

diff --git a/lib/toucanView/GraphTool.cpp b/lib/toucanView/GraphTool.cpp
@@ -103,7 +103,7 @@ namespace toucan
         {
             _size.init = false;
             _size.displayScale = event.displayScale;
-            _size.lineWidth = event.style->getSizeRole(dtk::SizeRole::BorderFocus, event.displayScale);
+            _size.lineWidth = 2 * event.displayScale;
         }
         _setSizeHint(_layout->getSizeHint());
     }

diff --git a/lib/toucanView/JSONTool.cpp b/lib/toucanView/JSONTool.cpp
@@ -127,11 +127,9 @@ namespace toucan
         auto hLayout = dtk::HorizontalLayout::create(context, _bottomLayout);
         hLayout->setSpacingRole(dtk::SizeRole::SpacingTool);
         auto openButton = dtk::ToolButton::create(context, hLayout);
-        openButton->setMarginRole(dtk::SizeRole::MarginSmall);
         openButton->setIcon("BellowsOpen");
         openButton->setTooltip("Open all");
         auto closeButton = dtk::ToolButton::create(context, hLayout);
-        closeButton->setMarginRole(dtk::SizeRole::MarginSmall);
         closeButton->setIcon("BellowsClosed");
         closeButton->setTooltip("Close all");
 

diff --git a/lib/toucanView/MenuBar.cpp b/lib/toucanView/MenuBar.cpp
@@ -145,8 +145,11 @@ namespace toucan
                         {
                             fileBrowserSystem->setPath(_file->getPath().parent_path());
                         }
-                        dtk::FileBrowserOptions options;
+                        dtk::FileBrowserOptions options = fileBrowserSystem->getOptions();
+                        options.extensions.clear();
                         options.extensions.push_back(".otio");
+                        options.extensions.push_back(".otiod");
+                        options.extensions.push_back(".otioz");
                         fileBrowserSystem->setOptions(options);
                         fileBrowserSystem->open(
                             getWindow(),

diff --git a/lib/toucanView/TimeUnitsModel.cpp b/lib/toucanView/TimeUnitsModel.cpp
@@ -3,6 +3,8 @@
 
 #include "TimeUnitsModel.h"
 
+#include <dtk/ui/Settings.h>
+
 #include <nlohmann/json.hpp>
 
 #include <array>
@@ -33,16 +35,21 @@ namespace toucan
             TimeUnits::Timecode;
     }
 
-    TimeUnitsModel::TimeUnitsModel(const std::shared_ptr<dtk::Settings>& settings)
+    TimeUnitsModel::TimeUnitsModel(const std::shared_ptr<dtk::Context>& context)
     {
-        _settings = settings;
+        _context = context;
         TimeUnits value = TimeUnits::Timecode;
         try
         {
-            const auto json = std::any_cast<nlohmann::json>(_settings->get("TimeUnits"));
+            auto settings = context->getSystem<dtk::Settings>();
+            const auto json = std::any_cast<nlohmann::json>(settings->get("TimeUnits"));
             if (json.is_object())
             {
-                value = toucan::fromString(json["Units"]);
+                auto i = json.find("Units");
+                if (i != json.end())
+                {
+                    value = toucan::fromString(i->get<std::string>());
+                }
             }
         }
         catch (const std::exception&)
@@ -55,7 +62,9 @@ namespace toucan
     {
         nlohmann::json json;
         json["Units"] = toucan::toString(_timeUnits->get());
-        _settings->set("TimeUnits", json);
+        auto context = _context.lock();
+        auto settings = context->getSystem<dtk::Settings>();
+        settings->set("TimeUnits", json);
     }
 
     TimeUnits TimeUnitsModel::getTimeUnits() const

diff --git a/lib/toucanView/TimeUnitsModel.h b/lib/toucanView/TimeUnitsModel.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <dtk/ui/Settings.h>
+#include <dtk/core/Context.h>
 #include <dtk/core/ObservableValue.h>
 
 #include <opentimelineio/version.h>
@@ -28,7 +28,7 @@ namespace toucan
     class TimeUnitsModel : public std::enable_shared_from_this<TimeUnitsModel>
     {
     public:
-        TimeUnitsModel(const std::shared_ptr<dtk::Settings>&);
+        TimeUnitsModel(const std::shared_ptr<dtk::Context>&);
 
         virtual ~TimeUnitsModel();
 
@@ -48,7 +48,7 @@ namespace toucan
         OTIO_NS::RationalTime fromString(const std::string&, double rate) const;
 
     private:
-        std::shared_ptr<dtk::Settings> _settings;
+        std::weak_ptr<dtk::Context> _context;
         std::shared_ptr<dtk::ObservableValue<TimeUnits> > _timeUnits;
     };
 }
diff --git a/lib/toucanView/ToolBar.cpp b/lib/toucanView/ToolBar.cpp
@@ -22,8 +22,10 @@ namespace toucan
         dtk::IWidget::_init(context, "toucan::ToolBar", parent);
 
         _layout = dtk::HorizontalLayout::create(context, shared_from_this());
-        _layout->setSpacingRole(dtk::SizeRole::SpacingTool);
+        _layout->setSpacingRole(dtk::SizeRole::SpacingSmall);
 
+        auto hLayout = dtk::HorizontalLayout::create(context, _layout);
+        hLayout->setSpacingRole(dtk::SizeRole::SpacingTool);
         std::vector<std::string> actionNames =
         {
             "File/Open",
@@ -33,7 +35,7 @@ namespace toucan
         for (const auto& name : actionNames)
         {
             auto i = actions.find(name);
-            auto button = dtk::ToolButton::create(context, _layout);
+            auto button = dtk::ToolButton::create(context, hLayout);
             button->setIcon(i->second->icon);
             button->setTooltip(i->second->toolTip);
             button->setClickedCallback(
@@ -49,8 +51,10 @@ namespace toucan
 
         dtk::Divider::create(context, dtk::Orientation::Horizontal, _layout);
 
+        hLayout = dtk::HorizontalLayout::create(context, _layout);
+        hLayout->setSpacingRole(dtk::SizeRole::SpacingTool);
         auto i = actions.find("Window/FullScreen");
-        auto button = dtk::ToolButton::create(context, _layout);
+        auto button = dtk::ToolButton::create(context, hLayout);
         button->setIcon(i->second->icon);
         button->setCheckable(true);
         button->setTooltip(i->second->toolTip);
@@ -66,6 +70,8 @@ namespace toucan
 
         dtk::Divider::create(context, dtk::Orientation::Horizontal, _layout);
 
+        hLayout = dtk::HorizontalLayout::create(context, _layout);
+        hLayout->setSpacingRole(dtk::SizeRole::SpacingTool);
         actionNames =
         {
             "View/ZoomIn",
@@ -75,7 +81,7 @@ namespace toucan
         for (const auto& name : actionNames)
         {
             i = actions.find(name);
-            button = dtk::ToolButton::create(context, _layout);
+            button = dtk::ToolButton::create(context, hLayout);
             button->setIcon(i->second->icon);
             button->setTooltip(i->second->toolTip);
             button->setClickedCallback(
@@ -90,7 +96,7 @@ namespace toucan
         }
 
         i = actions.find("View/Frame");
-        button = dtk::ToolButton::create(context, _layout);
+        button = dtk::ToolButton::create(context, hLayout);
         button->setIcon(i->second->icon);
         button->setCheckable(true);
         button->setTooltip(i->second->toolTip);
@@ -104,8 +110,6 @@ namespace toucan
             });
         _buttons["View/Frame"] = button;
 
-        dtk::Divider::create(context, dtk::Orientation::Horizontal, _layout);
-
         _widgetUpdate();
 
         _filesObserver = dtk::ListObserver<std::shared_ptr<File> >::create(
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ namespace toucan @@
             _host = app->getHost();
             _formats =
             {
+                ".exr",
                 ".tiff",
                 ".png"
             };
@@ Expand Down @@