Corrected feather-tk declarations for updated API

Author: leighsmith

Dockerfile

@@ -34,19 +34,13 @@ RUN apt-get update && apt-get install -y build-essential \
 			      libopencolorio-dev \
 			      libopentimelineio-dev
 
-# TODO:
-
-# missing #include <ftk/Core/ObservableValue.h> replace with #include <ftk/Core/Observable.h>
-# Missing OpenFX/ofxProperty.h need to install OpenFX headers properly.
-
 # Clone, compile and install feather-tk library
 RUN mkdir feather-tk
 RUN cd feather-tk; git clone https://github.com/grizzlypeak3d/feather-tk.git
 RUN cd feather-tk; sh feather-tk/sbuild-linux.sh feather-tk
 # TODO replace with cmake --target install 
 RUN tar -C feather-tk/install-Release -c -f - . | tar -C /usr/local -x -f -
 
-
 # Add the pipx installation location:
 ENV PATH=/root/.local/share/pipx/venvs/conan/bin:$PATH
 
@@ -60,18 +54,12 @@ RUN conan profile detect
 RUN git clone https://github.com/AcademySoftwareFoundation/openfx.git
 # TODO this doesn't build on arm64 Linux currently, can't find the architecture.
 RUN cd openfx; scripts/build-cmake.sh
-# TODO need to fully install this?
+# TODO need to find a better installation method, cmake --target install
 RUN mkdir /usr/local/include/OpenFX
-RUN tar -C include -c -f - . | tar -C /usr/local/include/OpenFX -x -f -
+RUN tar -C openfx/include -c -f - . | tar -C /usr/local/include/OpenFX -x -f -
 
 # RUN git clone https://github.com/OpenTimelineIO/toucan.git
 # RUN git clone https://github.com/leighsmith/toucan.git
 COPY . /home/ubuntu/toucan
 
 # RUN sh toucan/sbuild-linux.sh
-
-
-#			      python3-venv \
-#			      python3-pip
-# RUN python3 -m venv /home/ubuntu/toucan_python
-# RUN /home/ubuntu/toucan_python/bin/pip install conan

lib/toucanView/CompareMenu.cpp

@@ -24,7 +24,7 @@ namespace toucan
 
         _actions["Compare/A"] = ftk::Action::create(
             "A",
-            KeyShortcut(ftk::Key::A, ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::A, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();
@@ -35,7 +35,7 @@ namespace toucan
 
         _actions["Compare/B"] = ftk::Action::create(
             "B",
-            KeyShortcut(ftk::Key::B, ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::B, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();
@@ -46,7 +46,7 @@ namespace toucan
 
         _actions["Compare/Split"] = ftk::Action::create(
             "Split",
-            KeyShortcut(ftk::Key::S, ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::S, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();
@@ -57,7 +57,7 @@ namespace toucan
 
         _actions["Compare/Overlay"] = ftk::Action::create(
             "Overlay",
-            KeyShortcut(ftk::Key::E, ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::E, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();
@@ -68,7 +68,7 @@ namespace toucan
 
         _actions["Compare/Horizontal"] = ftk::Action::create(
             "Horizontal",
-            KeyShortcut(ftk::Key::H, ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::H, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();
@@ -79,7 +79,7 @@ namespace toucan
 
         _actions["Compare/Vertical"] = ftk::Action::create(
             "Vertical",
-            KeyShortcut(ftk::Key::V, ftk::KeyModifier::Shift),
+            ftk::KeyShortcut(ftk::Key::V, ftk::KeyModifier::Shift),
             [this](bool)
             {
                 CompareOptions options = _filesModel->getCompareOptions();