From 2d52134ab0f3b3e4d8ce0164cb8b93a4a0e848e8 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Tue, 30 Sep 2025 13:21:51 -0700 Subject: [PATCH 1/3] Update feather-tk version Signed-off-by: Darby Johnston --- CMakeLists.txt | 2 +- bin/toucan-filmstrip/App.cpp | 2 +- bin/toucan-filmstrip/App.h | 4 ++-- bin/toucan-filmstrip/main.cpp | 2 +- bin/toucan-render/App.cpp | 2 +- bin/toucan-render/App.h | 4 ++-- bin/toucan-render/main.cpp | 2 +- bin/toucan-view/main.cpp | 2 +- cmake/SuperBuild/Buildfeather-tk.cmake | 2 +- lib/toucanRender/CMakeLists.txt | 2 +- lib/toucanRender/FFmpegRead.cpp | 2 +- lib/toucanRender/FFmpegWrite.cpp | 2 +- lib/toucanRender/ImageEffectHost.cpp | 2 +- lib/toucanRender/ImageEffectHost.h | 2 +- lib/toucanRender/ImageGraph.cpp | 2 +- lib/toucanRender/ImageGraph.h | 4 ++-- lib/toucanRender/TimelineWrapper.cpp | 2 +- lib/toucanResource/CMakeLists.txt | 2 +- lib/toucanView/App.cpp | 10 ++++---- lib/toucanView/App.h | 4 ++-- lib/toucanView/AudioClipItem.cpp | 2 +- lib/toucanView/AudioClipItem.h | 2 +- lib/toucanView/BackgroundTool.cpp | 8 +++---- lib/toucanView/BackgroundTool.h | 10 ++++---- lib/toucanView/CMakeLists.txt | 2 +- lib/toucanView/CompareMenu.cpp | 2 +- lib/toucanView/CompareMenu.h | 2 +- lib/toucanView/CompareTool.cpp | 8 +++---- lib/toucanView/CompareTool.h | 14 ++++++------ lib/toucanView/DetailsTool.cpp | 8 +++---- lib/toucanView/DetailsTool.h | 20 ++++++++-------- lib/toucanView/ExportTool.cpp | 12 +++++----- lib/toucanView/ExportTool.h | 28 +++++++++++------------ lib/toucanView/File.cpp | 2 +- lib/toucanView/File.h | 6 ++--- lib/toucanView/FileMenu.cpp | 8 +++---- lib/toucanView/FileMenu.h | 6 ++--- lib/toucanView/FileTab.h | 2 +- lib/toucanView/FileToolBar.h | 8 +++---- lib/toucanView/FilesModel.cpp | 6 ++--- lib/toucanView/FilesModel.h | 10 ++++---- lib/toucanView/GapItem.cpp | 2 +- lib/toucanView/GapItem.h | 2 +- lib/toucanView/GraphTool.cpp | 2 +- lib/toucanView/GraphTool.h | 8 +++---- lib/toucanView/HUDWidget.cpp | 4 ++-- lib/toucanView/HUDWidget.h | 4 ++-- lib/toucanView/IItem.h | 6 ++--- lib/toucanView/IToolWidget.h | 2 +- lib/toucanView/InfoBar.cpp | 2 +- lib/toucanView/InfoBar.h | 8 +++---- lib/toucanView/ItemLabel.h | 2 +- lib/toucanView/JSONTool.cpp | 10 ++++---- lib/toucanView/JSONTool.h | 14 ++++++------ lib/toucanView/LogTool.cpp | 6 ++--- lib/toucanView/LogTool.h | 12 +++++----- lib/toucanView/MainWindow.cpp | 10 ++++---- lib/toucanView/MainWindow.h | 12 +++++----- lib/toucanView/MarkerItem.cpp | 2 +- lib/toucanView/MarkerItem.h | 2 +- lib/toucanView/MenuBar.h | 2 +- lib/toucanView/PlaybackBar.h | 6 ++--- lib/toucanView/PlaybackMenu.cpp | 2 +- lib/toucanView/PlaybackMenu.h | 2 +- lib/toucanView/PlaybackModel.h | 6 ++--- lib/toucanView/SelectMenu.cpp | 2 +- lib/toucanView/SelectMenu.h | 2 +- lib/toucanView/SelectionModel.h | 2 +- lib/toucanView/StackItem.cpp | 4 ++-- lib/toucanView/StackItem.h | 2 +- lib/toucanView/ThumbnailGenerator.cpp | 6 ++--- lib/toucanView/ThumbnailGenerator.h | 4 ++-- lib/toucanView/ThumbnailsWidget.cpp | 2 +- lib/toucanView/ThumbnailsWidget.h | 2 +- lib/toucanView/TimeLayout.h | 2 +- lib/toucanView/TimeMenu.cpp | 2 +- lib/toucanView/TimeMenu.h | 2 +- lib/toucanView/TimeUnitsModel.cpp | 8 +++---- lib/toucanView/TimeUnitsModel.h | 6 ++--- lib/toucanView/TimeWidgets.cpp | 2 +- lib/toucanView/TimeWidgets.h | 10 ++++---- lib/toucanView/TimelineItem.cpp | 2 +- lib/toucanView/TimelineItem.h | 2 +- lib/toucanView/TimelineWidget.h | 4 ++-- lib/toucanView/ToolBar.cpp | 2 +- lib/toucanView/ToolBar.h | 4 ++-- lib/toucanView/TrackItem.cpp | 4 ++-- lib/toucanView/TrackItem.h | 2 +- lib/toucanView/VideoClipItem.cpp | 2 +- lib/toucanView/VideoClipItem.h | 2 +- lib/toucanView/ViewMenu.h | 4 ++-- lib/toucanView/ViewModel.cpp | 4 ++-- lib/toucanView/ViewModel.h | 8 +++---- lib/toucanView/ViewToolBar.h | 8 +++---- lib/toucanView/Viewport.cpp | 2 +- lib/toucanView/Viewport.h | 4 ++-- lib/toucanView/WindowMenu.cpp | 8 +++---- lib/toucanView/WindowMenu.h | 6 ++--- lib/toucanView/WindowModel.cpp | 6 ++--- lib/toucanView/WindowModel.h | 8 +++---- lib/toucanView/WindowToolBar.h | 8 +++---- tests/toucan-test/main.cpp | 4 ++-- tests/toucanViewTest/FilesModelTest.h | 2 +- tests/toucanViewTest/PlaybackModelTest.h | 2 +- tests/toucanViewTest/SelectionModelTest.h | 2 +- tests/toucanViewTest/ViewModelTest.h | 2 +- tests/toucanViewTest/WindowModelTest.h | 2 +- 107 files changed, 256 insertions(+), 256 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e980582..75f65c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ find_package(OpenColorIO) find_package(OpenImageIO) find_package(OpenFX) find_package(OpenTimelineIO) -find_package(feather-tk) +find_package(ftk) include_directories(lib) include_directories(tests) diff --git a/bin/toucan-filmstrip/App.cpp b/bin/toucan-filmstrip/App.cpp index 1b9b37e..fb19d48 100644 --- a/bin/toucan-filmstrip/App.cpp +++ b/bin/toucan-filmstrip/App.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/bin/toucan-filmstrip/App.h b/bin/toucan-filmstrip/App.h index 5120d04..f3fac70 100644 --- a/bin/toucan-filmstrip/App.h +++ b/bin/toucan-filmstrip/App.h @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/bin/toucan-filmstrip/main.cpp b/bin/toucan-filmstrip/main.cpp index ef38161..91c82c8 100644 --- a/bin/toucan-filmstrip/main.cpp +++ b/bin/toucan-filmstrip/main.cpp @@ -3,7 +3,7 @@ #include "App.h" -#include +#include #include diff --git a/bin/toucan-render/App.cpp b/bin/toucan-render/App.cpp index dc7ff2f..83f658e 100644 --- a/bin/toucan-render/App.cpp +++ b/bin/toucan-render/App.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include diff --git a/bin/toucan-render/App.h b/bin/toucan-render/App.h index 8a1dc2d..c73a206 100644 --- a/bin/toucan-render/App.h +++ b/bin/toucan-render/App.h @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/bin/toucan-render/main.cpp b/bin/toucan-render/main.cpp index 2e653a8..9d07b0c 100644 --- a/bin/toucan-render/main.cpp +++ b/bin/toucan-render/main.cpp @@ -3,7 +3,7 @@ #include "App.h" -#include +#include #include diff --git a/bin/toucan-view/main.cpp b/bin/toucan-view/main.cpp index d74c1e7..f891482 100644 --- a/bin/toucan-view/main.cpp +++ b/bin/toucan-view/main.cpp @@ -3,7 +3,7 @@ #include "toucanView/App.h" -#include +#include #include diff --git a/cmake/SuperBuild/Buildfeather-tk.cmake b/cmake/SuperBuild/Buildfeather-tk.cmake index 159358e..90da47a 100644 --- a/cmake/SuperBuild/Buildfeather-tk.cmake +++ b/cmake/SuperBuild/Buildfeather-tk.cmake @@ -1,7 +1,7 @@ include(ExternalProject) set(ftk_GIT_REPOSITORY "https://github.com/darbyjohnston/feather-tk.git") -set(ftk_GIT_TAG "038196681ad5825c431f7da22ff4d873c82b3acd") +set(ftk_GIT_TAG "d3d0eed9f1a77782f56d4ce3f74eb2260c0b49ca") set(ftk_DEPS ZLIB nlohmann_json PNG Freetype lunasvg) diff --git a/lib/toucanRender/CMakeLists.txt b/lib/toucanRender/CMakeLists.txt index b2199c0..02aa75c 100644 --- a/lib/toucanRender/CMakeLists.txt +++ b/lib/toucanRender/CMakeLists.txt @@ -46,7 +46,7 @@ endif() add_library(toucanRender ${HEADERS} ${HEADERS_PRIVATE} ${SOURCE}) set(LIBS_PUBLIC toucanResource - ftk::feather-tk-core + ftk::ftkCore OTIO::opentimelineio OTIO::opentime lunasvg::lunasvg diff --git a/lib/toucanRender/FFmpegRead.cpp b/lib/toucanRender/FFmpegRead.cpp index 32e1034..a945fa1 100644 --- a/lib/toucanRender/FFmpegRead.cpp +++ b/lib/toucanRender/FFmpegRead.cpp @@ -3,7 +3,7 @@ #include "FFmpegRead.h" -#include +#include #include #include diff --git a/lib/toucanRender/FFmpegWrite.cpp b/lib/toucanRender/FFmpegWrite.cpp index 7976c27..b1942b4 100644 --- a/lib/toucanRender/FFmpegWrite.cpp +++ b/lib/toucanRender/FFmpegWrite.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include #include diff --git a/lib/toucanRender/ImageEffectHost.cpp b/lib/toucanRender/ImageEffectHost.cpp index bf322ef..62ae66c 100644 --- a/lib/toucanRender/ImageEffectHost.cpp +++ b/lib/toucanRender/ImageEffectHost.cpp @@ -5,7 +5,7 @@ #include "ImageEffect.h" -#include +#include #include #include diff --git a/lib/toucanRender/ImageEffectHost.h b/lib/toucanRender/ImageEffectHost.h index c459197..554a077 100644 --- a/lib/toucanRender/ImageEffectHost.h +++ b/lib/toucanRender/ImageEffectHost.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanRender/ImageGraph.cpp b/lib/toucanRender/ImageGraph.cpp index d6c1545..ee074a0 100644 --- a/lib/toucanRender/ImageGraph.cpp +++ b/lib/toucanRender/ImageGraph.cpp @@ -10,7 +10,7 @@ #include "TimelineAlgo.h" #include "Util.h" -#include +#include #include #include diff --git a/lib/toucanRender/ImageGraph.h b/lib/toucanRender/ImageGraph.h index 246732d..7bd4672 100644 --- a/lib/toucanRender/ImageGraph.h +++ b/lib/toucanRender/ImageGraph.h @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/lib/toucanRender/TimelineWrapper.cpp b/lib/toucanRender/TimelineWrapper.cpp index 5ed2c5d..18ba432 100644 --- a/lib/toucanRender/TimelineWrapper.cpp +++ b/lib/toucanRender/TimelineWrapper.cpp @@ -7,7 +7,7 @@ #include -#include +#include #include #include diff --git a/lib/toucanResource/CMakeLists.txt b/lib/toucanResource/CMakeLists.txt index 926e01a..c4fdcbe 100644 --- a/lib/toucanResource/CMakeLists.txt +++ b/lib/toucanResource/CMakeLists.txt @@ -6,7 +6,7 @@ foreach(RESOURCE ${RESOURCES}) get_filename_component(RESOURCE_BASE ${RESOURCE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_BASE}.cpp - COMMAND $ ${CMAKE_SOURCE_DIR}/${RESOURCE} ${RESOURCE_BASE} toucan_resource + COMMAND $ ${CMAKE_SOURCE_DIR}/${RESOURCE} ${RESOURCE_BASE} toucan_resource DEPENDS ${CMAKE_SOURCE_DIR}/${RESOURCE}) list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_BASE}.cpp) endforeach() diff --git a/lib/toucanView/App.cpp b/lib/toucanView/App.cpp index 9bbe3cb..8cc76c1 100644 --- a/lib/toucanView/App.cpp +++ b/lib/toucanView/App.cpp @@ -11,12 +11,12 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include diff --git a/lib/toucanView/App.h b/lib/toucanView/App.h index 79f2812..55cdf74 100644 --- a/lib/toucanView/App.h +++ b/lib/toucanView/App.h @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include +#include #include diff --git a/lib/toucanView/AudioClipItem.cpp b/lib/toucanView/AudioClipItem.cpp index 5138422..756df64 100644 --- a/lib/toucanView/AudioClipItem.cpp +++ b/lib/toucanView/AudioClipItem.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/AudioClipItem.h b/lib/toucanView/AudioClipItem.h index 762b972..bd20959 100644 --- a/lib/toucanView/AudioClipItem.h +++ b/lib/toucanView/AudioClipItem.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include diff --git a/lib/toucanView/BackgroundTool.cpp b/lib/toucanView/BackgroundTool.cpp index d31f3a0..9d4a91e 100644 --- a/lib/toucanView/BackgroundTool.cpp +++ b/lib/toucanView/BackgroundTool.cpp @@ -5,10 +5,10 @@ #include "App.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/BackgroundTool.h b/lib/toucanView/BackgroundTool.h index 5a6db37..6c00196 100644 --- a/lib/toucanView/BackgroundTool.h +++ b/lib/toucanView/BackgroundTool.h @@ -7,11 +7,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/CMakeLists.txt b/lib/toucanView/CMakeLists.txt index 189ea37..795cbf7 100644 --- a/lib/toucanView/CMakeLists.txt +++ b/lib/toucanView/CMakeLists.txt @@ -99,6 +99,6 @@ set(SOURCE WindowToolBar.cpp) add_library(toucanView ${HEADERS} ${SOURCE}) -target_link_libraries(toucanView PUBLIC toucanRender ftk::feather-tk-ui) +target_link_libraries(toucanView PUBLIC toucanRender ftk::ftkUi) set_target_properties(toucanView PROPERTIES FOLDER lib) add_dependencies(toucanView ${TOUCAN_PLUGINS}) diff --git a/lib/toucanView/CompareMenu.cpp b/lib/toucanView/CompareMenu.cpp index a6728a3..5968359 100644 --- a/lib/toucanView/CompareMenu.cpp +++ b/lib/toucanView/CompareMenu.cpp @@ -5,7 +5,7 @@ #include "App.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/CompareMenu.h b/lib/toucanView/CompareMenu.h index c86b9db..ea51ab3 100644 --- a/lib/toucanView/CompareMenu.h +++ b/lib/toucanView/CompareMenu.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/CompareTool.cpp b/lib/toucanView/CompareTool.cpp index 5c18745..7a5e7c3 100644 --- a/lib/toucanView/CompareTool.cpp +++ b/lib/toucanView/CompareTool.cpp @@ -6,10 +6,10 @@ #include "App.h" #include "SelectionModel.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/CompareTool.h b/lib/toucanView/CompareTool.h index eee5528..5c01400 100644 --- a/lib/toucanView/CompareTool.h +++ b/lib/toucanView/CompareTool.h @@ -6,13 +6,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/DetailsTool.cpp b/lib/toucanView/DetailsTool.cpp index 4b08896..66a998c 100644 --- a/lib/toucanView/DetailsTool.cpp +++ b/lib/toucanView/DetailsTool.cpp @@ -7,10 +7,10 @@ #include "FilesModel.h" #include "PlaybackModel.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/DetailsTool.h b/lib/toucanView/DetailsTool.h index a5fc5c0..4052f07 100644 --- a/lib/toucanView/DetailsTool.h +++ b/lib/toucanView/DetailsTool.h @@ -9,16 +9,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/ExportTool.cpp b/lib/toucanView/ExportTool.cpp index 921a397..0e49be9 100644 --- a/lib/toucanView/ExportTool.cpp +++ b/lib/toucanView/ExportTool.cpp @@ -9,12 +9,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/ExportTool.h b/lib/toucanView/ExportTool.h index 61266d6..e27e8c7 100644 --- a/lib/toucanView/ExportTool.h +++ b/lib/toucanView/ExportTool.h @@ -8,20 +8,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/File.cpp b/lib/toucanView/File.cpp index c8d53e9..8410f96 100644 --- a/lib/toucanView/File.cpp +++ b/lib/toucanView/File.cpp @@ -9,7 +9,7 @@ #include -#include +#include namespace toucan { diff --git a/lib/toucanView/File.h b/lib/toucanView/File.h index 9dd210d..c8c1613 100644 --- a/lib/toucanView/File.h +++ b/lib/toucanView/File.h @@ -7,9 +7,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/FileMenu.cpp b/lib/toucanView/FileMenu.cpp index 40c6e1a..46bf253 100644 --- a/lib/toucanView/FileMenu.cpp +++ b/lib/toucanView/FileMenu.cpp @@ -10,10 +10,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/FileMenu.h b/lib/toucanView/FileMenu.h index 0f59dff..a5226e7 100644 --- a/lib/toucanView/FileMenu.h +++ b/lib/toucanView/FileMenu.h @@ -3,9 +3,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/lib/toucanView/FileTab.h b/lib/toucanView/FileTab.h index d80f5c7..60777b4 100644 --- a/lib/toucanView/FileTab.h +++ b/lib/toucanView/FileTab.h @@ -5,7 +5,7 @@ #include -#include +#include namespace toucan { diff --git a/lib/toucanView/FileToolBar.h b/lib/toucanView/FileToolBar.h index 3779dd2..d972fb2 100644 --- a/lib/toucanView/FileToolBar.h +++ b/lib/toucanView/FileToolBar.h @@ -3,10 +3,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/FilesModel.cpp b/lib/toucanView/FilesModel.cpp index 95923f1..4ba00f1 100644 --- a/lib/toucanView/FilesModel.cpp +++ b/lib/toucanView/FilesModel.cpp @@ -5,9 +5,9 @@ #include "PlaybackModel.h" -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/FilesModel.h b/lib/toucanView/FilesModel.h index d913470..776ba1e 100644 --- a/lib/toucanView/FilesModel.h +++ b/lib/toucanView/FilesModel.h @@ -6,11 +6,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/GapItem.cpp b/lib/toucanView/GapItem.cpp index 1090b31..1a9e819 100644 --- a/lib/toucanView/GapItem.cpp +++ b/lib/toucanView/GapItem.cpp @@ -5,7 +5,7 @@ #include "File.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/GapItem.h b/lib/toucanView/GapItem.h index f52c749..58b36a8 100644 --- a/lib/toucanView/GapItem.h +++ b/lib/toucanView/GapItem.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/GraphTool.cpp b/lib/toucanView/GraphTool.cpp index b7918b5..aa63ad8 100644 --- a/lib/toucanView/GraphTool.cpp +++ b/lib/toucanView/GraphTool.cpp @@ -6,7 +6,7 @@ #include "App.h" #include "FilesModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/GraphTool.h b/lib/toucanView/GraphTool.h index 8c516b3..eb49b9f 100644 --- a/lib/toucanView/GraphTool.h +++ b/lib/toucanView/GraphTool.h @@ -7,10 +7,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/HUDWidget.cpp b/lib/toucanView/HUDWidget.cpp index 54e3216..49d4741 100644 --- a/lib/toucanView/HUDWidget.cpp +++ b/lib/toucanView/HUDWidget.cpp @@ -6,8 +6,8 @@ #include "App.h" #include "FilesModel.h" -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/HUDWidget.h b/lib/toucanView/HUDWidget.h index 9013f11..c30b1df 100644 --- a/lib/toucanView/HUDWidget.h +++ b/lib/toucanView/HUDWidget.h @@ -5,8 +5,8 @@ #include -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/IItem.h b/lib/toucanView/IItem.h index 6a80ef8..bf13186 100644 --- a/lib/toucanView/IItem.h +++ b/lib/toucanView/IItem.h @@ -7,9 +7,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/IToolWidget.h b/lib/toucanView/IToolWidget.h index e986d56..7dae14a 100644 --- a/lib/toucanView/IToolWidget.h +++ b/lib/toucanView/IToolWidget.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/lib/toucanView/InfoBar.cpp b/lib/toucanView/InfoBar.cpp index bfcb94b..3cf7eee 100644 --- a/lib/toucanView/InfoBar.cpp +++ b/lib/toucanView/InfoBar.cpp @@ -6,7 +6,7 @@ #include "App.h" #include "FilesModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/InfoBar.h b/lib/toucanView/InfoBar.h index bb86c65..75232a9 100644 --- a/lib/toucanView/InfoBar.h +++ b/lib/toucanView/InfoBar.h @@ -3,11 +3,11 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include +#include namespace toucan { diff --git a/lib/toucanView/ItemLabel.h b/lib/toucanView/ItemLabel.h index 3401971..1627535 100644 --- a/lib/toucanView/ItemLabel.h +++ b/lib/toucanView/ItemLabel.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/lib/toucanView/JSONTool.cpp b/lib/toucanView/JSONTool.cpp index 5f9d927..ccd3523 100644 --- a/lib/toucanView/JSONTool.cpp +++ b/lib/toucanView/JSONTool.cpp @@ -6,11 +6,11 @@ #include "App.h" #include "FilesModel.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/JSONTool.h b/lib/toucanView/JSONTool.h index 1162efd..360056f 100644 --- a/lib/toucanView/JSONTool.h +++ b/lib/toucanView/JSONTool.h @@ -6,13 +6,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/LogTool.cpp b/lib/toucanView/LogTool.cpp index 787bd1d..3148457 100644 --- a/lib/toucanView/LogTool.cpp +++ b/lib/toucanView/LogTool.cpp @@ -5,9 +5,9 @@ #include "App.h" -#include -#include -#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/LogTool.h b/lib/toucanView/LogTool.h index e70c851..6c14397 100644 --- a/lib/toucanView/LogTool.h +++ b/lib/toucanView/LogTool.h @@ -5,12 +5,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/MainWindow.cpp b/lib/toucanView/MainWindow.cpp index 3586bc6..6cd3379 100644 --- a/lib/toucanView/MainWindow.cpp +++ b/lib/toucanView/MainWindow.cpp @@ -19,10 +19,10 @@ #include "TimelineWidget.h" #include "ToolBar.h" -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -119,7 +119,7 @@ namespace toucan _infoBar = InfoBar::create(context, app, _layout); std::weak_ptr appWeak(app); - _tabWidget->setTabCallback( + _tabWidget->setCurrentTabCallback( [appWeak](int index) { if (auto app = appWeak.lock()) diff --git a/lib/toucanView/MainWindow.h b/lib/toucanView/MainWindow.h index 33efbab..bcc9a4a 100644 --- a/lib/toucanView/MainWindow.h +++ b/lib/toucanView/MainWindow.h @@ -5,12 +5,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/MarkerItem.cpp b/lib/toucanView/MarkerItem.cpp index 2653e81..a238322 100644 --- a/lib/toucanView/MarkerItem.cpp +++ b/lib/toucanView/MarkerItem.cpp @@ -3,7 +3,7 @@ #include "MarkerItem.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/MarkerItem.h b/lib/toucanView/MarkerItem.h index fb3fe05..38d29e9 100644 --- a/lib/toucanView/MarkerItem.h +++ b/lib/toucanView/MarkerItem.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include diff --git a/lib/toucanView/MenuBar.h b/lib/toucanView/MenuBar.h index 3c9c506..1898ce8 100644 --- a/lib/toucanView/MenuBar.h +++ b/lib/toucanView/MenuBar.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/lib/toucanView/PlaybackBar.h b/lib/toucanView/PlaybackBar.h index a0d6220..075b320 100644 --- a/lib/toucanView/PlaybackBar.h +++ b/lib/toucanView/PlaybackBar.h @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/PlaybackMenu.cpp b/lib/toucanView/PlaybackMenu.cpp index b75bf1d..fa8a6ea 100644 --- a/lib/toucanView/PlaybackMenu.cpp +++ b/lib/toucanView/PlaybackMenu.cpp @@ -6,7 +6,7 @@ #include "App.h" #include "FilesModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/PlaybackMenu.h b/lib/toucanView/PlaybackMenu.h index 48eb7da..69d382a 100644 --- a/lib/toucanView/PlaybackMenu.h +++ b/lib/toucanView/PlaybackMenu.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/PlaybackModel.h b/lib/toucanView/PlaybackModel.h index 4991725..b059f5e 100644 --- a/lib/toucanView/PlaybackModel.h +++ b/lib/toucanView/PlaybackModel.h @@ -5,9 +5,9 @@ #include -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/SelectMenu.cpp b/lib/toucanView/SelectMenu.cpp index 53e0dd4..e274246 100644 --- a/lib/toucanView/SelectMenu.cpp +++ b/lib/toucanView/SelectMenu.cpp @@ -7,7 +7,7 @@ #include "FilesModel.h" #include "SelectionModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/SelectMenu.h b/lib/toucanView/SelectMenu.h index e2690ee..68ce66e 100644 --- a/lib/toucanView/SelectMenu.h +++ b/lib/toucanView/SelectMenu.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include diff --git a/lib/toucanView/SelectionModel.h b/lib/toucanView/SelectionModel.h index 09acd30..cdbb4b9 100644 --- a/lib/toucanView/SelectionModel.h +++ b/lib/toucanView/SelectionModel.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include diff --git a/lib/toucanView/StackItem.cpp b/lib/toucanView/StackItem.cpp index c7fb24a..2f35b6e 100644 --- a/lib/toucanView/StackItem.cpp +++ b/lib/toucanView/StackItem.cpp @@ -9,8 +9,8 @@ #include "TrackItem.h" #include "WindowModel.h" -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/StackItem.h b/lib/toucanView/StackItem.h index ce73dd7..7ce923b 100644 --- a/lib/toucanView/StackItem.h +++ b/lib/toucanView/StackItem.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/ThumbnailGenerator.cpp b/lib/toucanView/ThumbnailGenerator.cpp index ae521a8..86d32b1 100644 --- a/lib/toucanView/ThumbnailGenerator.cpp +++ b/lib/toucanView/ThumbnailGenerator.cpp @@ -10,9 +10,9 @@ #include -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/ThumbnailGenerator.h b/lib/toucanView/ThumbnailGenerator.h index 1d50040..338b56d 100644 --- a/lib/toucanView/ThumbnailGenerator.h +++ b/lib/toucanView/ThumbnailGenerator.h @@ -5,8 +5,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/lib/toucanView/ThumbnailsWidget.cpp b/lib/toucanView/ThumbnailsWidget.cpp index 14a93b5..181b7e9 100644 --- a/lib/toucanView/ThumbnailsWidget.cpp +++ b/lib/toucanView/ThumbnailsWidget.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include namespace toucan { diff --git a/lib/toucanView/ThumbnailsWidget.h b/lib/toucanView/ThumbnailsWidget.h index 42a3f73..02b3fcb 100644 --- a/lib/toucanView/ThumbnailsWidget.h +++ b/lib/toucanView/ThumbnailsWidget.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include diff --git a/lib/toucanView/TimeLayout.h b/lib/toucanView/TimeLayout.h index 2e061e8..723067a 100644 --- a/lib/toucanView/TimeLayout.h +++ b/lib/toucanView/TimeLayout.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include diff --git a/lib/toucanView/TimeMenu.cpp b/lib/toucanView/TimeMenu.cpp index 2de9a28..12ee30f 100644 --- a/lib/toucanView/TimeMenu.cpp +++ b/lib/toucanView/TimeMenu.cpp @@ -7,7 +7,7 @@ #include "FilesModel.h" #include "PlaybackModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/TimeMenu.h b/lib/toucanView/TimeMenu.h index 589c73e..a69d36b 100644 --- a/lib/toucanView/TimeMenu.h +++ b/lib/toucanView/TimeMenu.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/TimeUnitsModel.cpp b/lib/toucanView/TimeUnitsModel.cpp index 536d040..7b38b22 100644 --- a/lib/toucanView/TimeUnitsModel.cpp +++ b/lib/toucanView/TimeUnitsModel.cpp @@ -3,10 +3,10 @@ #include "TimeUnitsModel.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/TimeUnitsModel.h b/lib/toucanView/TimeUnitsModel.h index cc4171e..7053825 100644 --- a/lib/toucanView/TimeUnitsModel.h +++ b/lib/toucanView/TimeUnitsModel.h @@ -3,9 +3,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/TimeWidgets.cpp b/lib/toucanView/TimeWidgets.cpp index 664b572..a691d55 100644 --- a/lib/toucanView/TimeWidgets.cpp +++ b/lib/toucanView/TimeWidgets.cpp @@ -3,7 +3,7 @@ #include "TimeWidgets.h" -#include +#include #include diff --git a/lib/toucanView/TimeWidgets.h b/lib/toucanView/TimeWidgets.h index 9e01d82..be69b4b 100644 --- a/lib/toucanView/TimeWidgets.h +++ b/lib/toucanView/TimeWidgets.h @@ -6,11 +6,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/TimelineItem.cpp b/lib/toucanView/TimelineItem.cpp index f8eb861..534a050 100644 --- a/lib/toucanView/TimelineItem.cpp +++ b/lib/toucanView/TimelineItem.cpp @@ -9,7 +9,7 @@ #include "ThumbnailsWidget.h" #include "WindowModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/TimelineItem.h b/lib/toucanView/TimelineItem.h index aae655f..b1914a4 100644 --- a/lib/toucanView/TimelineItem.h +++ b/lib/toucanView/TimelineItem.h @@ -6,7 +6,7 @@ #include #include -#include +#include namespace toucan { diff --git a/lib/toucanView/TimelineWidget.h b/lib/toucanView/TimelineWidget.h index 9567716..2bc03c2 100644 --- a/lib/toucanView/TimelineWidget.h +++ b/lib/toucanView/TimelineWidget.h @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/lib/toucanView/ToolBar.cpp b/lib/toucanView/ToolBar.cpp index 1bff46b..0db71fe 100644 --- a/lib/toucanView/ToolBar.cpp +++ b/lib/toucanView/ToolBar.cpp @@ -7,7 +7,7 @@ #include "ViewToolBar.h" #include "WindowToolBar.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/ToolBar.h b/lib/toucanView/ToolBar.h index ddc4057..4f0b130 100644 --- a/lib/toucanView/ToolBar.h +++ b/lib/toucanView/ToolBar.h @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/TrackItem.cpp b/lib/toucanView/TrackItem.cpp index 9f6b7c1..f16870f 100644 --- a/lib/toucanView/TrackItem.cpp +++ b/lib/toucanView/TrackItem.cpp @@ -8,8 +8,8 @@ #include "GapItem.h" #include "VideoClipItem.h" -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/TrackItem.h b/lib/toucanView/TrackItem.h index c40df2a..219e8bc 100644 --- a/lib/toucanView/TrackItem.h +++ b/lib/toucanView/TrackItem.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/VideoClipItem.cpp b/lib/toucanView/VideoClipItem.cpp index c79ee5f..982c2b9 100644 --- a/lib/toucanView/VideoClipItem.cpp +++ b/lib/toucanView/VideoClipItem.cpp @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/lib/toucanView/VideoClipItem.h b/lib/toucanView/VideoClipItem.h index 28830dc..6348113 100644 --- a/lib/toucanView/VideoClipItem.h +++ b/lib/toucanView/VideoClipItem.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include diff --git a/lib/toucanView/ViewMenu.h b/lib/toucanView/ViewMenu.h index 0f07f09..41e0398 100644 --- a/lib/toucanView/ViewMenu.h +++ b/lib/toucanView/ViewMenu.h @@ -5,8 +5,8 @@ #include -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/ViewModel.cpp b/lib/toucanView/ViewModel.cpp index ba5fb5d..40f1d4d 100644 --- a/lib/toucanView/ViewModel.cpp +++ b/lib/toucanView/ViewModel.cpp @@ -3,8 +3,8 @@ #include "ViewModel.h" -#include -#include +#include +#include #include diff --git a/lib/toucanView/ViewModel.h b/lib/toucanView/ViewModel.h index a1c84fa..fdb46a1 100644 --- a/lib/toucanView/ViewModel.h +++ b/lib/toucanView/ViewModel.h @@ -3,10 +3,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/ViewToolBar.h b/lib/toucanView/ViewToolBar.h index 1e0fe43..90a4df8 100644 --- a/lib/toucanView/ViewToolBar.h +++ b/lib/toucanView/ViewToolBar.h @@ -3,10 +3,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/Viewport.cpp b/lib/toucanView/Viewport.cpp index fede292..fb2e17b 100644 --- a/lib/toucanView/Viewport.cpp +++ b/lib/toucanView/Viewport.cpp @@ -8,7 +8,7 @@ #include "App.h" #include "ViewModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/Viewport.h b/lib/toucanView/Viewport.h index 95173ce..3dacc3c 100644 --- a/lib/toucanView/Viewport.h +++ b/lib/toucanView/Viewport.h @@ -6,9 +6,9 @@ #include #include -#include +#include -#include +#include namespace toucan { diff --git a/lib/toucanView/WindowMenu.cpp b/lib/toucanView/WindowMenu.cpp index 5df1b82..531ef73 100644 --- a/lib/toucanView/WindowMenu.cpp +++ b/lib/toucanView/WindowMenu.cpp @@ -11,10 +11,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/WindowMenu.h b/lib/toucanView/WindowMenu.h index a66b0f2..736cda5 100644 --- a/lib/toucanView/WindowMenu.h +++ b/lib/toucanView/WindowMenu.h @@ -5,9 +5,9 @@ #include -#include -#include -#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/WindowModel.cpp b/lib/toucanView/WindowModel.cpp index 9d615a9..6b2e8b2 100644 --- a/lib/toucanView/WindowModel.cpp +++ b/lib/toucanView/WindowModel.cpp @@ -3,9 +3,9 @@ #include "WindowModel.h" -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/WindowModel.h b/lib/toucanView/WindowModel.h index 4d9fee9..04febbd 100644 --- a/lib/toucanView/WindowModel.h +++ b/lib/toucanView/WindowModel.h @@ -3,10 +3,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/WindowToolBar.h b/lib/toucanView/WindowToolBar.h index 15fa3c8..0e4577a 100644 --- a/lib/toucanView/WindowToolBar.h +++ b/lib/toucanView/WindowToolBar.h @@ -5,10 +5,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/tests/toucan-test/main.cpp b/tests/toucan-test/main.cpp index 7e2d90c..c4a6883 100644 --- a/tests/toucan-test/main.cpp +++ b/tests/toucan-test/main.cpp @@ -17,9 +17,9 @@ #include #if defined(toucan_VIEW) -#include +#include #endif // toucan_VIEW -#include +#include #include diff --git a/tests/toucanViewTest/FilesModelTest.h b/tests/toucanViewTest/FilesModelTest.h index bc25df7..859ae14 100644 --- a/tests/toucanViewTest/FilesModelTest.h +++ b/tests/toucanViewTest/FilesModelTest.h @@ -5,7 +5,7 @@ #include -#include +#include namespace toucan { diff --git a/tests/toucanViewTest/PlaybackModelTest.h b/tests/toucanViewTest/PlaybackModelTest.h index dc821a6..cd88590 100644 --- a/tests/toucanViewTest/PlaybackModelTest.h +++ b/tests/toucanViewTest/PlaybackModelTest.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/tests/toucanViewTest/SelectionModelTest.h b/tests/toucanViewTest/SelectionModelTest.h index fccec30..45a501b 100644 --- a/tests/toucanViewTest/SelectionModelTest.h +++ b/tests/toucanViewTest/SelectionModelTest.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include diff --git a/tests/toucanViewTest/ViewModelTest.h b/tests/toucanViewTest/ViewModelTest.h index 020ff77..b2ca35a 100644 --- a/tests/toucanViewTest/ViewModelTest.h +++ b/tests/toucanViewTest/ViewModelTest.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/tests/toucanViewTest/WindowModelTest.h b/tests/toucanViewTest/WindowModelTest.h index 9d81daf..e5fcf38 100644 --- a/tests/toucanViewTest/WindowModelTest.h +++ b/tests/toucanViewTest/WindowModelTest.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { From 1cee0d9244cb6f065795d227573cf961871b012a Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Tue, 30 Sep 2025 13:56:07 -0700 Subject: [PATCH 2/3] Add system info Signed-off-by: Darby Johnston --- .github/workflows/ci-workflow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 9772e2e..d03c533 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -96,6 +96,7 @@ jobs: echo "$PWD/install-Debug/bin" >> $GITHUB_PATH echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV cmake --version + system_profiler SPHardwareDataType - name: Build run: sh toucan/sbuild-macos.sh Debug @@ -124,6 +125,7 @@ jobs: echo "$PWD/install-Debug/bin" >> $GITHUB_PATH echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV cmake --version + system_profiler SPHardwareDataType - name: Build run: bash toucan/sbuild-macos.sh From 0ca593564a9e285a59ee5f9a2f0765f5004fc563 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Tue, 4 Nov 2025 14:08:21 -0800 Subject: [PATCH 3/3] Update feather-tk version Signed-off-by: Darby Johnston --- .github/workflows/ci-workflow.yml | 2 - .../{Buildfeather-tk.cmake => Buildftk.cmake} | 4 +- cmake/SuperBuild/CMakeLists.txt | 6 +- lib/toucanView/App.cpp | 8 +- lib/toucanView/App.h | 4 +- lib/toucanView/AudioClipItem.cpp | 2 +- lib/toucanView/AudioClipItem.h | 2 +- lib/toucanView/BackgroundTool.cpp | 6 +- lib/toucanView/BackgroundTool.h | 10 +-- lib/toucanView/CMakeLists.txt | 2 +- lib/toucanView/CompareMenu.cpp | 2 +- lib/toucanView/CompareMenu.h | 2 +- lib/toucanView/CompareTool.cpp | 6 +- lib/toucanView/CompareTool.h | 12 +-- lib/toucanView/DetailsTool.cpp | 4 +- lib/toucanView/DetailsTool.h | 18 ++-- lib/toucanView/ExportTool.cpp | 8 +- lib/toucanView/ExportTool.h | 26 +++--- lib/toucanView/FileMenu.cpp | 6 +- lib/toucanView/FileMenu.h | 2 +- lib/toucanView/FileTab.h | 2 +- lib/toucanView/FileToolBar.h | 6 +- lib/toucanView/FilesModel.h | 4 +- lib/toucanView/GapItem.cpp | 2 +- lib/toucanView/GapItem.h | 2 +- lib/toucanView/GraphTool.cpp | 2 +- lib/toucanView/GraphTool.h | 8 +- lib/toucanView/HUDWidget.cpp | 2 +- lib/toucanView/HUDWidget.h | 4 +- lib/toucanView/IItem.cpp | 2 +- lib/toucanView/IItem.h | 4 +- lib/toucanView/IToolWidget.h | 2 +- lib/toucanView/InfoBar.h | 6 +- lib/toucanView/ItemLabel.cpp | 12 +-- lib/toucanView/ItemLabel.h | 2 +- lib/toucanView/JSONTool.cpp | 6 +- lib/toucanView/JSONTool.h | 12 +-- lib/toucanView/LogTool.cpp | 4 +- lib/toucanView/LogTool.h | 10 +-- lib/toucanView/MainWindow.cpp | 6 +- lib/toucanView/MainWindow.h | 10 +-- lib/toucanView/MarkerItem.cpp | 2 +- lib/toucanView/MarkerItem.h | 2 +- lib/toucanView/MenuBar.h | 2 +- lib/toucanView/PlaybackBar.h | 6 +- lib/toucanView/PlaybackMenu.cpp | 2 +- lib/toucanView/PlaybackMenu.h | 2 +- lib/toucanView/SelectMenu.cpp | 2 +- lib/toucanView/SelectMenu.h | 2 +- lib/toucanView/StackItem.cpp | 2 +- lib/toucanView/StackItem.h | 2 +- lib/toucanView/ThumbnailsWidget.cpp | 4 +- lib/toucanView/TimeLayout.cpp | 4 +- lib/toucanView/TimeLayout.h | 4 +- lib/toucanView/TimeMenu.cpp | 2 +- lib/toucanView/TimeMenu.h | 2 +- lib/toucanView/TimeUnitsModel.cpp | 2 +- lib/toucanView/TimeUnitsModel.h | 2 +- lib/toucanView/TimeWidgets.cpp | 2 +- lib/toucanView/TimeWidgets.h | 10 +-- lib/toucanView/TimelineItem.cpp | 14 +-- lib/toucanView/TimelineWidget.cpp | 21 +++-- lib/toucanView/TimelineWidget.h | 5 +- lib/toucanView/ToolBar.cpp | 2 +- lib/toucanView/ToolBar.h | 4 +- lib/toucanView/TrackItem.cpp | 2 +- lib/toucanView/TrackItem.h | 2 +- lib/toucanView/VideoClipItem.cpp | 2 +- lib/toucanView/VideoClipItem.h | 2 +- lib/toucanView/ViewMenu.h | 2 +- lib/toucanView/ViewModel.h | 2 +- lib/toucanView/ViewToolBar.h | 6 +- lib/toucanView/Viewport.cpp | 88 +++++++++---------- lib/toucanView/Viewport.h | 4 +- lib/toucanView/WindowMenu.cpp | 6 +- lib/toucanView/WindowMenu.h | 2 +- lib/toucanView/WindowModel.cpp | 2 +- lib/toucanView/WindowModel.h | 2 +- lib/toucanView/WindowToolBar.h | 6 +- tests/toucan-test/main.cpp | 2 +- 80 files changed, 234 insertions(+), 238 deletions(-) rename cmake/SuperBuild/{Buildfeather-tk.cmake => Buildftk.cmake} (87%) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index d03c533..9772e2e 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -96,7 +96,6 @@ jobs: echo "$PWD/install-Debug/bin" >> $GITHUB_PATH echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV cmake --version - system_profiler SPHardwareDataType - name: Build run: sh toucan/sbuild-macos.sh Debug @@ -125,7 +124,6 @@ jobs: echo "$PWD/install-Debug/bin" >> $GITHUB_PATH echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV cmake --version - system_profiler SPHardwareDataType - name: Build run: bash toucan/sbuild-macos.sh diff --git a/cmake/SuperBuild/Buildfeather-tk.cmake b/cmake/SuperBuild/Buildftk.cmake similarity index 87% rename from cmake/SuperBuild/Buildfeather-tk.cmake rename to cmake/SuperBuild/Buildftk.cmake index 90da47a..e814ec9 100644 --- a/cmake/SuperBuild/Buildfeather-tk.cmake +++ b/cmake/SuperBuild/Buildftk.cmake @@ -1,7 +1,7 @@ include(ExternalProject) -set(ftk_GIT_REPOSITORY "https://github.com/darbyjohnston/feather-tk.git") -set(ftk_GIT_TAG "d3d0eed9f1a77782f56d4ce3f74eb2260c0b49ca") +set(ftk_GIT_REPOSITORY "https://github.com/grizzlypeak3d/feather-tk.git") +set(ftk_GIT_TAG "2de0861f19326dab562b189e2988a49304475dc3") set(ftk_DEPS ZLIB nlohmann_json PNG Freetype lunasvg) diff --git a/cmake/SuperBuild/CMakeLists.txt b/cmake/SuperBuild/CMakeLists.txt index 8320c03..9c1bcaf 100644 --- a/cmake/SuperBuild/CMakeLists.txt +++ b/cmake/SuperBuild/CMakeLists.txt @@ -25,7 +25,7 @@ set(toucan_OpenColorIO ON CACHE BOOL "Build OpenColorIO") set(toucan_OpenImageIO ON CACHE BOOL "Build OpenImageIO") set(toucan_OpenTimelineIO ON CACHE BOOL "Build OpenTimelineIO") set(toucan_OpenFX ON CACHE BOOL "Build OpenFX") -set(toucan_feather-tk ON CACHE BOOL "Build feather-tk") +set(toucan_ftk ON CACHE BOOL "Build feather-tk") list(PREPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) @@ -119,6 +119,6 @@ endif() if(toucan_OpenFX) include(BuildOpenFX) endif() -if(toucan_feather-tk) - include(Buildfeather-tk) +if(toucan_ftk) + include(Buildftk) endif() diff --git a/lib/toucanView/App.cpp b/lib/toucanView/App.cpp index 8cc76c1..bec4e12 100644 --- a/lib/toucanView/App.cpp +++ b/lib/toucanView/App.cpp @@ -11,10 +11,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/App.h b/lib/toucanView/App.h index 55cdf74..ba7406a 100644 --- a/lib/toucanView/App.h +++ b/lib/toucanView/App.h @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include +#include #include diff --git a/lib/toucanView/AudioClipItem.cpp b/lib/toucanView/AudioClipItem.cpp index 756df64..5402dce 100644 --- a/lib/toucanView/AudioClipItem.cpp +++ b/lib/toucanView/AudioClipItem.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/AudioClipItem.h b/lib/toucanView/AudioClipItem.h index bd20959..9ebfc85 100644 --- a/lib/toucanView/AudioClipItem.h +++ b/lib/toucanView/AudioClipItem.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include diff --git a/lib/toucanView/BackgroundTool.cpp b/lib/toucanView/BackgroundTool.cpp index 9d4a91e..4539335 100644 --- a/lib/toucanView/BackgroundTool.cpp +++ b/lib/toucanView/BackgroundTool.cpp @@ -5,9 +5,9 @@ #include "App.h" -#include -#include -#include +#include +#include +#include #include namespace toucan diff --git a/lib/toucanView/BackgroundTool.h b/lib/toucanView/BackgroundTool.h index 6c00196..c93c31f 100644 --- a/lib/toucanView/BackgroundTool.h +++ b/lib/toucanView/BackgroundTool.h @@ -7,11 +7,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/CMakeLists.txt b/lib/toucanView/CMakeLists.txt index 795cbf7..1e8bad8 100644 --- a/lib/toucanView/CMakeLists.txt +++ b/lib/toucanView/CMakeLists.txt @@ -99,6 +99,6 @@ set(SOURCE WindowToolBar.cpp) add_library(toucanView ${HEADERS} ${SOURCE}) -target_link_libraries(toucanView PUBLIC toucanRender ftk::ftkUi) +target_link_libraries(toucanView PUBLIC toucanRender ftk::ftkUI) set_target_properties(toucanView PROPERTIES FOLDER lib) add_dependencies(toucanView ${TOUCAN_PLUGINS}) diff --git a/lib/toucanView/CompareMenu.cpp b/lib/toucanView/CompareMenu.cpp index 5968359..ae5c9d3 100644 --- a/lib/toucanView/CompareMenu.cpp +++ b/lib/toucanView/CompareMenu.cpp @@ -5,7 +5,7 @@ #include "App.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/CompareMenu.h b/lib/toucanView/CompareMenu.h index ea51ab3..9eb5d2c 100644 --- a/lib/toucanView/CompareMenu.h +++ b/lib/toucanView/CompareMenu.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/CompareTool.cpp b/lib/toucanView/CompareTool.cpp index 7a5e7c3..c1e26a7 100644 --- a/lib/toucanView/CompareTool.cpp +++ b/lib/toucanView/CompareTool.cpp @@ -6,9 +6,9 @@ #include "App.h" #include "SelectionModel.h" -#include -#include -#include +#include +#include +#include #include namespace toucan diff --git a/lib/toucanView/CompareTool.h b/lib/toucanView/CompareTool.h index 5c01400..b5c9185 100644 --- a/lib/toucanView/CompareTool.h +++ b/lib/toucanView/CompareTool.h @@ -6,12 +6,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace toucan diff --git a/lib/toucanView/DetailsTool.cpp b/lib/toucanView/DetailsTool.cpp index 66a998c..71737ca 100644 --- a/lib/toucanView/DetailsTool.cpp +++ b/lib/toucanView/DetailsTool.cpp @@ -7,8 +7,8 @@ #include "FilesModel.h" #include "PlaybackModel.h" -#include -#include +#include +#include #include #include diff --git a/lib/toucanView/DetailsTool.h b/lib/toucanView/DetailsTool.h index 4052f07..c52bc7a 100644 --- a/lib/toucanView/DetailsTool.h +++ b/lib/toucanView/DetailsTool.h @@ -9,15 +9,15 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/lib/toucanView/ExportTool.cpp b/lib/toucanView/ExportTool.cpp index 0e49be9..51090ce 100644 --- a/lib/toucanView/ExportTool.cpp +++ b/lib/toucanView/ExportTool.cpp @@ -9,10 +9,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/lib/toucanView/ExportTool.h b/lib/toucanView/ExportTool.h index e27e8c7..1f9a737 100644 --- a/lib/toucanView/ExportTool.h +++ b/lib/toucanView/ExportTool.h @@ -8,19 +8,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace toucan diff --git a/lib/toucanView/FileMenu.cpp b/lib/toucanView/FileMenu.cpp index 46bf253..9cd1d7b 100644 --- a/lib/toucanView/FileMenu.cpp +++ b/lib/toucanView/FileMenu.cpp @@ -10,9 +10,9 @@ #include -#include -#include -#include +#include +#include +#include #include namespace toucan diff --git a/lib/toucanView/FileMenu.h b/lib/toucanView/FileMenu.h index a5226e7..14cf2f6 100644 --- a/lib/toucanView/FileMenu.h +++ b/lib/toucanView/FileMenu.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include diff --git a/lib/toucanView/FileTab.h b/lib/toucanView/FileTab.h index 60777b4..1630833 100644 --- a/lib/toucanView/FileTab.h +++ b/lib/toucanView/FileTab.h @@ -5,7 +5,7 @@ #include -#include +#include namespace toucan { diff --git a/lib/toucanView/FileToolBar.h b/lib/toucanView/FileToolBar.h index d972fb2..6eb0fe6 100644 --- a/lib/toucanView/FileToolBar.h +++ b/lib/toucanView/FileToolBar.h @@ -3,9 +3,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include namespace toucan diff --git a/lib/toucanView/FilesModel.h b/lib/toucanView/FilesModel.h index 776ba1e..b847323 100644 --- a/lib/toucanView/FilesModel.h +++ b/lib/toucanView/FilesModel.h @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lib/toucanView/GapItem.cpp b/lib/toucanView/GapItem.cpp index 1a9e819..424cc57 100644 --- a/lib/toucanView/GapItem.cpp +++ b/lib/toucanView/GapItem.cpp @@ -5,7 +5,7 @@ #include "File.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/GapItem.h b/lib/toucanView/GapItem.h index 58b36a8..b20671e 100644 --- a/lib/toucanView/GapItem.h +++ b/lib/toucanView/GapItem.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/GraphTool.cpp b/lib/toucanView/GraphTool.cpp index aa63ad8..e1717ba 100644 --- a/lib/toucanView/GraphTool.cpp +++ b/lib/toucanView/GraphTool.cpp @@ -6,7 +6,7 @@ #include "App.h" #include "FilesModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/GraphTool.h b/lib/toucanView/GraphTool.h index eb49b9f..5f62183 100644 --- a/lib/toucanView/GraphTool.h +++ b/lib/toucanView/GraphTool.h @@ -7,10 +7,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/HUDWidget.cpp b/lib/toucanView/HUDWidget.cpp index 49d4741..f882be0 100644 --- a/lib/toucanView/HUDWidget.cpp +++ b/lib/toucanView/HUDWidget.cpp @@ -6,7 +6,7 @@ #include "App.h" #include "FilesModel.h" -#include +#include #include namespace toucan diff --git a/lib/toucanView/HUDWidget.h b/lib/toucanView/HUDWidget.h index c30b1df..8634eaf 100644 --- a/lib/toucanView/HUDWidget.h +++ b/lib/toucanView/HUDWidget.h @@ -5,8 +5,8 @@ #include -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/IItem.cpp b/lib/toucanView/IItem.cpp index bf1fdb0..e514212 100644 --- a/lib/toucanView/IItem.cpp +++ b/lib/toucanView/IItem.cpp @@ -50,7 +50,7 @@ namespace toucan if (value == _selected) return; _selected = value; - _setDrawUpdate(); + setDrawUpdate(); } void IItem::mousePressEvent(ftk::MouseClickEvent& event) diff --git a/lib/toucanView/IItem.h b/lib/toucanView/IItem.h index bf13186..feef60c 100644 --- a/lib/toucanView/IItem.h +++ b/lib/toucanView/IItem.h @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/lib/toucanView/IToolWidget.h b/lib/toucanView/IToolWidget.h index 7dae14a..52df2f4 100644 --- a/lib/toucanView/IToolWidget.h +++ b/lib/toucanView/IToolWidget.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/lib/toucanView/InfoBar.h b/lib/toucanView/InfoBar.h index 75232a9..5924d8a 100644 --- a/lib/toucanView/InfoBar.h +++ b/lib/toucanView/InfoBar.h @@ -3,9 +3,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/lib/toucanView/ItemLabel.cpp b/lib/toucanView/ItemLabel.cpp index 6975c10..6b917c1 100644 --- a/lib/toucanView/ItemLabel.cpp +++ b/lib/toucanView/ItemLabel.cpp @@ -29,8 +29,8 @@ namespace toucan if (value == _name) return; _name = value; - _setSizeUpdate(); - _setDrawUpdate(); + setSizeUpdate(); + setDrawUpdate(); } void ItemLabel::setDuration(const std::string& value) @@ -38,8 +38,8 @@ namespace toucan if (value == _duration) return; _duration = value; - _setSizeUpdate(); - _setDrawUpdate(); + setSizeUpdate(); + setDrawUpdate(); } void ItemLabel::setMarginRole(ftk::SizeRole value) @@ -47,8 +47,8 @@ namespace toucan if (value == _marginRole) return; _marginRole = value; - _setSizeUpdate(); - _setDrawUpdate(); + setSizeUpdate(); + setDrawUpdate(); } void ItemLabel::setGeometry(const ftk::Box2I& value) diff --git a/lib/toucanView/ItemLabel.h b/lib/toucanView/ItemLabel.h index 1627535..dd27498 100644 --- a/lib/toucanView/ItemLabel.h +++ b/lib/toucanView/ItemLabel.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/lib/toucanView/JSONTool.cpp b/lib/toucanView/JSONTool.cpp index ccd3523..3400eda 100644 --- a/lib/toucanView/JSONTool.cpp +++ b/lib/toucanView/JSONTool.cpp @@ -6,9 +6,9 @@ #include "App.h" #include "FilesModel.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/lib/toucanView/JSONTool.h b/lib/toucanView/JSONTool.h index 360056f..7a64a14 100644 --- a/lib/toucanView/JSONTool.h +++ b/lib/toucanView/JSONTool.h @@ -6,12 +6,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/lib/toucanView/LogTool.cpp b/lib/toucanView/LogTool.cpp index 3148457..f6c0035 100644 --- a/lib/toucanView/LogTool.cpp +++ b/lib/toucanView/LogTool.cpp @@ -5,8 +5,8 @@ #include "App.h" -#include -#include +#include +#include #include namespace toucan diff --git a/lib/toucanView/LogTool.h b/lib/toucanView/LogTool.h index 6c14397..aad30c1 100644 --- a/lib/toucanView/LogTool.h +++ b/lib/toucanView/LogTool.h @@ -5,11 +5,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace toucan diff --git a/lib/toucanView/MainWindow.cpp b/lib/toucanView/MainWindow.cpp index 6cd3379..462edb2 100644 --- a/lib/toucanView/MainWindow.cpp +++ b/lib/toucanView/MainWindow.cpp @@ -19,9 +19,9 @@ #include "TimelineWidget.h" #include "ToolBar.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/lib/toucanView/MainWindow.h b/lib/toucanView/MainWindow.h index bcc9a4a..70667f7 100644 --- a/lib/toucanView/MainWindow.h +++ b/lib/toucanView/MainWindow.h @@ -5,11 +5,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace toucan diff --git a/lib/toucanView/MarkerItem.cpp b/lib/toucanView/MarkerItem.cpp index a238322..de0a850 100644 --- a/lib/toucanView/MarkerItem.cpp +++ b/lib/toucanView/MarkerItem.cpp @@ -3,7 +3,7 @@ #include "MarkerItem.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/MarkerItem.h b/lib/toucanView/MarkerItem.h index 38d29e9..c07be87 100644 --- a/lib/toucanView/MarkerItem.h +++ b/lib/toucanView/MarkerItem.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include diff --git a/lib/toucanView/MenuBar.h b/lib/toucanView/MenuBar.h index 1898ce8..397998b 100644 --- a/lib/toucanView/MenuBar.h +++ b/lib/toucanView/MenuBar.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace toucan { diff --git a/lib/toucanView/PlaybackBar.h b/lib/toucanView/PlaybackBar.h index 075b320..3faf451 100644 --- a/lib/toucanView/PlaybackBar.h +++ b/lib/toucanView/PlaybackBar.h @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace toucan { diff --git a/lib/toucanView/PlaybackMenu.cpp b/lib/toucanView/PlaybackMenu.cpp index fa8a6ea..2f3ddac 100644 --- a/lib/toucanView/PlaybackMenu.cpp +++ b/lib/toucanView/PlaybackMenu.cpp @@ -6,7 +6,7 @@ #include "App.h" #include "FilesModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/PlaybackMenu.h b/lib/toucanView/PlaybackMenu.h index 69d382a..fadc943 100644 --- a/lib/toucanView/PlaybackMenu.h +++ b/lib/toucanView/PlaybackMenu.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/SelectMenu.cpp b/lib/toucanView/SelectMenu.cpp index e274246..73559e2 100644 --- a/lib/toucanView/SelectMenu.cpp +++ b/lib/toucanView/SelectMenu.cpp @@ -7,7 +7,7 @@ #include "FilesModel.h" #include "SelectionModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/SelectMenu.h b/lib/toucanView/SelectMenu.h index 68ce66e..6253d24 100644 --- a/lib/toucanView/SelectMenu.h +++ b/lib/toucanView/SelectMenu.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include diff --git a/lib/toucanView/StackItem.cpp b/lib/toucanView/StackItem.cpp index 2f35b6e..ca62c38 100644 --- a/lib/toucanView/StackItem.cpp +++ b/lib/toucanView/StackItem.cpp @@ -9,7 +9,7 @@ #include "TrackItem.h" #include "WindowModel.h" -#include +#include #include namespace toucan diff --git a/lib/toucanView/StackItem.h b/lib/toucanView/StackItem.h index 7ce923b..a0200bf 100644 --- a/lib/toucanView/StackItem.h +++ b/lib/toucanView/StackItem.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/ThumbnailsWidget.cpp b/lib/toucanView/ThumbnailsWidget.cpp index 181b7e9..a540a54 100644 --- a/lib/toucanView/ThumbnailsWidget.cpp +++ b/lib/toucanView/ThumbnailsWidget.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include namespace toucan { @@ -79,7 +79,7 @@ namespace toucan const std::string cacheKey = getThumbnailCacheKey(_item, i->time, _size.thumbnailHeight); const auto image = i->future.get(); _thumbnailCache->add(cacheKey, image); - _setDrawUpdate(); + setDrawUpdate(); i = _thumbnailRequests.erase(i); } else diff --git a/lib/toucanView/TimeLayout.cpp b/lib/toucanView/TimeLayout.cpp index 1958fad..e1c0f50 100644 --- a/lib/toucanView/TimeLayout.cpp +++ b/lib/toucanView/TimeLayout.cpp @@ -11,7 +11,7 @@ namespace toucan const std::string& objectName, const std::shared_ptr& parent) { - ftk::IWidget::_init(context, objectName, parent); + ftk::IMouseWidget::_init(context, objectName, parent); _timeRange = timeRange; } @@ -40,7 +40,7 @@ namespace toucan item->setScale(value); } } - _setSizeUpdate(); + setSizeUpdate(); } int ITimeWidget::getMinWidth() const diff --git a/lib/toucanView/TimeLayout.h b/lib/toucanView/TimeLayout.h index 723067a..f86600b 100644 --- a/lib/toucanView/TimeLayout.h +++ b/lib/toucanView/TimeLayout.h @@ -3,14 +3,14 @@ #pragma once -#include +#include #include namespace toucan { //! Base class for widgets in a time layout. - class ITimeWidget : public ftk::IWidget + class ITimeWidget : public ftk::IMouseWidget { protected: void _init( diff --git a/lib/toucanView/TimeMenu.cpp b/lib/toucanView/TimeMenu.cpp index 12ee30f..cbf0d1a 100644 --- a/lib/toucanView/TimeMenu.cpp +++ b/lib/toucanView/TimeMenu.cpp @@ -7,7 +7,7 @@ #include "FilesModel.h" #include "PlaybackModel.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/TimeMenu.h b/lib/toucanView/TimeMenu.h index a69d36b..0d8bee4 100644 --- a/lib/toucanView/TimeMenu.h +++ b/lib/toucanView/TimeMenu.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/TimeUnitsModel.cpp b/lib/toucanView/TimeUnitsModel.cpp index 7b38b22..fe2a85c 100644 --- a/lib/toucanView/TimeUnitsModel.cpp +++ b/lib/toucanView/TimeUnitsModel.cpp @@ -3,7 +3,7 @@ #include "TimeUnitsModel.h" -#include +#include #include #include #include diff --git a/lib/toucanView/TimeUnitsModel.h b/lib/toucanView/TimeUnitsModel.h index 7053825..c1944e0 100644 --- a/lib/toucanView/TimeUnitsModel.h +++ b/lib/toucanView/TimeUnitsModel.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include diff --git a/lib/toucanView/TimeWidgets.cpp b/lib/toucanView/TimeWidgets.cpp index a691d55..039bb2d 100644 --- a/lib/toucanView/TimeWidgets.cpp +++ b/lib/toucanView/TimeWidgets.cpp @@ -3,7 +3,7 @@ #include "TimeWidgets.h" -#include +#include #include diff --git a/lib/toucanView/TimeWidgets.h b/lib/toucanView/TimeWidgets.h index be69b4b..95906a0 100644 --- a/lib/toucanView/TimeWidgets.h +++ b/lib/toucanView/TimeWidgets.h @@ -6,11 +6,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/lib/toucanView/TimelineItem.cpp b/lib/toucanView/TimelineItem.cpp index 534a050..3f746ee 100644 --- a/lib/toucanView/TimelineItem.cpp +++ b/lib/toucanView/TimelineItem.cpp @@ -9,7 +9,7 @@ #include "ThumbnailsWidget.h" #include "WindowModel.h" -#include +#include namespace toucan { @@ -73,7 +73,7 @@ namespace toucan if (value == _currentTime) return; _currentTime = value; - _setDrawUpdate(); + setDrawUpdate(); } void TimelineItem::setCurrentTimeCallback(const std::function& value) @@ -86,7 +86,7 @@ namespace toucan if (value == _inOutRange) return; _inOutRange = value; - _setDrawUpdate(); + setDrawUpdate(); } void TimelineItem::setGeometry(const ftk::Box2I& value) @@ -200,7 +200,7 @@ namespace toucan { _currentTimeCallback(_currentTime); } - _setDrawUpdate(); + setDrawUpdate(); } } @@ -257,7 +257,7 @@ namespace toucan { _currentTimeCallback(_currentTime); } - _setDrawUpdate(); + setDrawUpdate(); } } } @@ -274,8 +274,8 @@ namespace toucan void TimelineItem::_timeUnitsUpdate() { - _setSizeUpdate(); - _setDrawUpdate(); + setSizeUpdate(); + setDrawUpdate(); } ftk::Size2I TimelineItem::_getLabelMaxSize( diff --git a/lib/toucanView/TimelineWidget.cpp b/lib/toucanView/TimelineWidget.cpp index c2906a6..dfe91f3 100644 --- a/lib/toucanView/TimelineWidget.cpp +++ b/lib/toucanView/TimelineWidget.cpp @@ -20,7 +20,7 @@ namespace toucan const std::shared_ptr& app, const std::shared_ptr& parent) { - IWidget::_init(context, "toucan::TimelineWidget", parent); + IMouseWidget::_init(context, "toucan::TimelineWidget", parent); _setMouseHoverEnabled(true); _setMousePressEnabled( @@ -118,8 +118,8 @@ namespace toucan _currentTimeObserver.reset(); } - _setSizeUpdate(); - _setDrawUpdate(); + setSizeUpdate(); + setDrawUpdate(); }); } @@ -182,14 +182,14 @@ namespace toucan { _timelineItem->setScale(_scale); } - _setSizeUpdate(); - _setDrawUpdate(); + setSizeUpdate(); + setDrawUpdate(); } void TimelineWidget::setGeometry(const ftk::Box2I& value) { const ftk::Box2I viewportPrev = _scrollWidget->getViewport(); - IWidget::setGeometry(value); + IMouseWidget::setGeometry(value); _scrollWidget->setGeometry(value); const bool changed = _scrollWidget->getViewport() != viewportPrev; if (_sizeInit) @@ -218,13 +218,12 @@ namespace toucan void TimelineWidget::sizeHintEvent(const ftk::SizeHintEvent& event) { - IWidget::sizeHintEvent(event); _setSizeHint(_scrollWidget->getSizeHint()); } void TimelineWidget::mouseMoveEvent(ftk::MouseMoveEvent& event) { - IWidget::mouseMoveEvent(event); + IMouseWidget::mouseMoveEvent(event); switch (_mouse.mode) { case MouseMode::Scroll: @@ -240,7 +239,7 @@ namespace toucan void TimelineWidget::mousePressEvent(ftk::MouseClickEvent& event) { - IWidget::mousePressEvent(event); + IMouseWidget::mousePressEvent(event); if (1 == event.button && static_cast(ftk::KeyModifier::Alt) == event.modifiers) { @@ -257,13 +256,13 @@ namespace toucan void TimelineWidget::mouseReleaseEvent(ftk::MouseClickEvent& event) { - IWidget::mouseReleaseEvent(event); + IMouseWidget::mouseReleaseEvent(event); event.accept = true; } void TimelineWidget::scrollEvent(ftk::ScrollEvent& event) { - IWidget::scrollEvent(event); + IMouseWidget::scrollEvent(event); event.accept = true; if (event.value.y > 0) { diff --git a/lib/toucanView/TimelineWidget.h b/lib/toucanView/TimelineWidget.h index 2bc03c2..5a958eb 100644 --- a/lib/toucanView/TimelineWidget.h +++ b/lib/toucanView/TimelineWidget.h @@ -6,7 +6,8 @@ #include #include -#include +#include +#include #include #include @@ -19,7 +20,7 @@ namespace toucan class ThumbnailGenerator; //! Timeline widget. - class TimelineWidget : public ftk::IWidget + class TimelineWidget : public ftk::IMouseWidget { protected: void _init( diff --git a/lib/toucanView/ToolBar.cpp b/lib/toucanView/ToolBar.cpp index 0db71fe..1a544c6 100644 --- a/lib/toucanView/ToolBar.cpp +++ b/lib/toucanView/ToolBar.cpp @@ -7,7 +7,7 @@ #include "ViewToolBar.h" #include "WindowToolBar.h" -#include +#include namespace toucan { diff --git a/lib/toucanView/ToolBar.h b/lib/toucanView/ToolBar.h index 4f0b130..7ac5329 100644 --- a/lib/toucanView/ToolBar.h +++ b/lib/toucanView/ToolBar.h @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include +#include namespace toucan { diff --git a/lib/toucanView/TrackItem.cpp b/lib/toucanView/TrackItem.cpp index f16870f..88ef3f3 100644 --- a/lib/toucanView/TrackItem.cpp +++ b/lib/toucanView/TrackItem.cpp @@ -8,7 +8,7 @@ #include "GapItem.h" #include "VideoClipItem.h" -#include +#include #include namespace toucan diff --git a/lib/toucanView/TrackItem.h b/lib/toucanView/TrackItem.h index 219e8bc..179862a 100644 --- a/lib/toucanView/TrackItem.h +++ b/lib/toucanView/TrackItem.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/lib/toucanView/VideoClipItem.cpp b/lib/toucanView/VideoClipItem.cpp index 982c2b9..6893349 100644 --- a/lib/toucanView/VideoClipItem.cpp +++ b/lib/toucanView/VideoClipItem.cpp @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/lib/toucanView/VideoClipItem.h b/lib/toucanView/VideoClipItem.h index 6348113..eed412b 100644 --- a/lib/toucanView/VideoClipItem.h +++ b/lib/toucanView/VideoClipItem.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include diff --git a/lib/toucanView/ViewMenu.h b/lib/toucanView/ViewMenu.h index 41e0398..212b089 100644 --- a/lib/toucanView/ViewMenu.h +++ b/lib/toucanView/ViewMenu.h @@ -5,7 +5,7 @@ #include -#include +#include #include namespace toucan diff --git a/lib/toucanView/ViewModel.h b/lib/toucanView/ViewModel.h index fdb46a1..54ed737 100644 --- a/lib/toucanView/ViewModel.h +++ b/lib/toucanView/ViewModel.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include #include diff --git a/lib/toucanView/ViewToolBar.h b/lib/toucanView/ViewToolBar.h index 90a4df8..fdf1503 100644 --- a/lib/toucanView/ViewToolBar.h +++ b/lib/toucanView/ViewToolBar.h @@ -3,9 +3,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include namespace toucan diff --git a/lib/toucanView/Viewport.cpp b/lib/toucanView/Viewport.cpp index fb2e17b..c7f6435 100644 --- a/lib/toucanView/Viewport.cpp +++ b/lib/toucanView/Viewport.cpp @@ -8,7 +8,7 @@ #include "App.h" #include "ViewModel.h" -#include +#include namespace toucan { @@ -18,7 +18,7 @@ namespace toucan const std::shared_ptr& file, const std::shared_ptr& parent) { - IWidget::_init(context, "toucan::Viewport", parent); + IMouseWidget::_init(context, "toucan::Viewport", parent); _setMouseHoverEnabled(true); _setMousePressEnabled(true, 0, 0); @@ -35,7 +35,7 @@ namespace toucan [this](const std::shared_ptr& value) { _image = value; - _setDrawUpdate(); + setDrawUpdate(); }); _bObserver = ftk::ValueObserver >::create( @@ -52,7 +52,7 @@ namespace toucan [this](const std::shared_ptr& value) { _bImage = value; - _setDrawUpdate(); + setDrawUpdate(); }); } else @@ -60,7 +60,7 @@ namespace toucan _bImageSize = ftk::Size2I(); _bImage.reset(); _bImageObserver.reset(); - _setDrawUpdate(); + setDrawUpdate(); } }); @@ -69,7 +69,7 @@ namespace toucan [this](const CompareOptions& value) { _compareOptions = value; - _setDrawUpdate(); + setDrawUpdate(); }); _zoomInObserver = ftk::ValueObserver::create( @@ -114,7 +114,7 @@ namespace toucan [this](const ViewOptions& value) { _options = value; - _setDrawUpdate(); + setDrawUpdate(); }); _globalOptionsObserver = ftk::ValueObserver::create( @@ -122,7 +122,7 @@ namespace toucan [this](const GlobalViewOptions& value) { _globalOptions = value; - _setDrawUpdate(); + setDrawUpdate(); }); } @@ -167,7 +167,7 @@ namespace toucan changed |= _viewZoom->setIfChanged(zoom); if (changed) { - _setDrawUpdate(); + setDrawUpdate(); } } @@ -217,14 +217,12 @@ namespace toucan if (_frameView->setIfChanged(value)) { _viewModel->setFrameView(value); - _setDrawUpdate(); + setDrawUpdate(); } } void Viewport::drawEvent(const ftk::Box2I& drawRect, const ftk::DrawEvent& event) { - IWidget::drawEvent(drawRect, event); - // Draw the background. const ftk::Box2I& g = getGeometry(); switch (_globalOptions.background) @@ -247,10 +245,10 @@ namespace toucan { _frameUpdate(); } - ftk::M44F vm; - vm = vm * ftk::translate(ftk::V3F(g.min.x, g.min.y, 0.F)); - vm = vm * ftk::translate(ftk::V3F(_viewPos->get().x, _viewPos->get().y, 0.F)); - vm = vm * ftk::scale(ftk::V3F(_viewZoom->get(), _viewZoom->get(), 1.F)); + const ftk::M44F vm = + ftk::translate(ftk::V3F(g.min.x, g.min.y, 0.F)) * + ftk::translate(ftk::V3F(_viewPos->get().x, _viewPos->get().y, 0.F)) * + ftk::scale(ftk::V3F(_viewZoom->get(), _viewZoom->get(), 1.F)); const auto m = event.render->getTransform(); event.render->setTransform(m * vm); @@ -320,18 +318,18 @@ namespace toucan mesh.t.push_back(ftk::V2F(_options.flop ? 1.F : 0.F, _options.flip ? 0.F : 1.F)); ftk::Triangle2 triangle; triangle.v[0].v = 1; - triangle.v[1].v = 2; - triangle.v[2].v = 3; + triangle.v[1].v = 3; + triangle.v[2].v = 2; triangle.v[0].t = 1; - triangle.v[1].t = 2; - triangle.v[2].t = 3; + triangle.v[1].t = 3; + triangle.v[2].t = 2; mesh.triangles.push_back(triangle); triangle.v[0].v = 3; - triangle.v[1].v = 4; - triangle.v[2].v = 1; + triangle.v[1].v = 1; + triangle.v[2].v = 4; triangle.v[0].t = 3; - triangle.v[1].t = 4; - triangle.v[2].t = 1; + triangle.v[1].t = 1; + triangle.v[2].t = 4; mesh.triangles.push_back(triangle); event.render->drawImage( _image, @@ -357,18 +355,18 @@ namespace toucan mesh.t.push_back(ftk::V2F(_options.flop ? .5F : .5F, _options.flip ? 0.F : 1.F)); ftk::Triangle2 triangle; triangle.v[0].v = 1; - triangle.v[1].v = 2; - triangle.v[2].v = 3; + triangle.v[1].v = 3; + triangle.v[2].v = 2; triangle.v[0].t = 1; - triangle.v[1].t = 2; - triangle.v[2].t = 3; + triangle.v[1].t = 3; + triangle.v[2].t = 2; mesh.triangles.push_back(triangle); triangle.v[0].v = 3; - triangle.v[1].v = 4; - triangle.v[2].v = 1; + triangle.v[1].v = 1; + triangle.v[2].v = 4; triangle.v[0].t = 3; - triangle.v[1].t = 4; - triangle.v[2].t = 1; + triangle.v[1].t = 1; + triangle.v[2].t = 4; mesh.triangles.push_back(triangle); event.render->drawImage( _bImage, @@ -477,7 +475,7 @@ namespace toucan void Viewport::mouseMoveEvent(ftk::MouseMoveEvent& event) { - IWidget::mouseMoveEvent(event); + IMouseWidget::mouseMoveEvent(event); if (_isMousePressed()) { event.accept = true; @@ -485,13 +483,13 @@ namespace toucan _viewPos->setIfChanged(ftk::V2I( _viewMousePress.x + (event.pos.x - mousePressPos.x), _viewMousePress.y + (event.pos.y - mousePressPos.y))); - _setDrawUpdate(); + setDrawUpdate(); } } void Viewport::mousePressEvent(ftk::MouseClickEvent& event) { - IWidget::mousePressEvent(event); + IMouseWidget::mousePressEvent(event); if (1 == event.button && 0 == event.modifiers) { event.accept = true; @@ -502,13 +500,13 @@ namespace toucan void Viewport::mouseReleaseEvent(ftk::MouseClickEvent& event) { - IWidget::mouseReleaseEvent(event); + IMouseWidget::mouseReleaseEvent(event); event.accept = true; } void Viewport::scrollEvent(ftk::ScrollEvent& event) { - IWidget::scrollEvent(event); + IMouseWidget::scrollEvent(event); if (0 == event.modifiers) { event.accept = true; @@ -558,18 +556,18 @@ namespace toucan mesh.t.push_back(ftk::V2F(_options.flop ? 1.F : 0.F, _options.flip ? 0.F : 1.F)); ftk::Triangle2 triangle; triangle.v[0].v = 1; - triangle.v[1].v = 2; - triangle.v[2].v = 3; + triangle.v[1].v = 3; + triangle.v[2].v = 2; triangle.v[0].t = 1; - triangle.v[1].t = 2; - triangle.v[2].t = 3; + triangle.v[1].t = 3; + triangle.v[2].t = 2; mesh.triangles.push_back(triangle); triangle.v[0].v = 3; - triangle.v[1].v = 4; - triangle.v[2].v = 1; + triangle.v[1].v = 1; + triangle.v[2].v = 4; triangle.v[0].t = 3; - triangle.v[1].t = 4; - triangle.v[2].t = 1; + triangle.v[1].t = 1; + triangle.v[2].t = 4; mesh.triangles.push_back(triangle); return mesh; } diff --git a/lib/toucanView/Viewport.h b/lib/toucanView/Viewport.h index 3dacc3c..579b87b 100644 --- a/lib/toucanView/Viewport.h +++ b/lib/toucanView/Viewport.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include @@ -17,7 +17,7 @@ namespace toucan class ViewModel; //! Viewport widget. - class Viewport : public ftk::IWidget + class Viewport : public ftk::IMouseWidget { protected: void _init( diff --git a/lib/toucanView/WindowMenu.cpp b/lib/toucanView/WindowMenu.cpp index 531ef73..3c5b590 100644 --- a/lib/toucanView/WindowMenu.cpp +++ b/lib/toucanView/WindowMenu.cpp @@ -11,9 +11,9 @@ #include -#include -#include -#include +#include +#include +#include #include namespace toucan diff --git a/lib/toucanView/WindowMenu.h b/lib/toucanView/WindowMenu.h index 736cda5..c624bbf 100644 --- a/lib/toucanView/WindowMenu.h +++ b/lib/toucanView/WindowMenu.h @@ -5,7 +5,7 @@ #include -#include +#include #include #include diff --git a/lib/toucanView/WindowModel.cpp b/lib/toucanView/WindowModel.cpp index 6b2e8b2..1487eb8 100644 --- a/lib/toucanView/WindowModel.cpp +++ b/lib/toucanView/WindowModel.cpp @@ -3,7 +3,7 @@ #include "WindowModel.h" -#include +#include #include #include diff --git a/lib/toucanView/WindowModel.h b/lib/toucanView/WindowModel.h index 04febbd..b64cc6b 100644 --- a/lib/toucanView/WindowModel.h +++ b/lib/toucanView/WindowModel.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include #include diff --git a/lib/toucanView/WindowToolBar.h b/lib/toucanView/WindowToolBar.h index 0e4577a..4def544 100644 --- a/lib/toucanView/WindowToolBar.h +++ b/lib/toucanView/WindowToolBar.h @@ -5,9 +5,9 @@ #include -#include -#include -#include +#include +#include +#include #include namespace toucan diff --git a/tests/toucan-test/main.cpp b/tests/toucan-test/main.cpp index c4a6883..019be19 100644 --- a/tests/toucan-test/main.cpp +++ b/tests/toucan-test/main.cpp @@ -17,7 +17,7 @@ #include #if defined(toucan_VIEW) -#include +#include #endif // toucan_VIEW #include