From c7106f856535ab4bd58938043427b1d4fc531ca0 Mon Sep 17 00:00:00 2001 From: pojienie Date: Jan 31 2020 12:12:01 +0000 Subject: add snap sensitivity UI mock up --- diff --git a/toonz/sources/tnztools/controlpointeditortool.cpp b/toonz/sources/tnztools/controlpointeditortool.cpp index d7a1e89..c9ccbbd 100644 --- a/toonz/sources/tnztools/controlpointeditortool.cpp +++ b/toonz/sources/tnztools/controlpointeditortool.cpp @@ -30,6 +30,12 @@ using namespace ToolUtils; TEnv::IntVar AutoSelectDrawing("ControlPointEditorToolAutoSelectDrawing", 1); //----------------------------------------------------------------------------- + +#define LOW_WSTR L"Low" +#define MEDIUM_WSTR L"Medium" +#define HIGH_WSTR L"High" + +//----------------------------------------------------------------------------- namespace { /*! Restituisce i parametri riferiti allo stroke della curva che si vuole @@ -129,6 +135,7 @@ class ControlPointEditorTool final : public TTool { TBoolProperty m_autoSelectDrawing; // Consente di scegliere se swichare tra i livelli. TBoolProperty m_snap; + TEnumProperty m_snapSensitivity; enum Action { NONE, @@ -213,7 +220,8 @@ ControlPointEditorTool::ControlPointEditorTool() , m_isImageChanged(false) , m_selectingRect(TRectD()) , m_autoSelectDrawing("Auto Select Drawing", true) - , m_snap("snap", true) + , m_snap("snap", false) + , m_snapSensitivity("Sensitivity:") , m_action(NONE) , m_cursorType(NORMAL) , m_undo(0) @@ -223,10 +231,15 @@ ControlPointEditorTool::ControlPointEditorTool() bind(TTool::Vectors); m_prop.bind(m_autoSelectDrawing); m_prop.bind(m_snap); + m_prop.bind(m_snapSensitivity); m_selection.setControlPointEditorStroke(&m_controlPointEditorStroke); m_autoSelectDrawing.setId("AutoSelectDrawing"); m_snap.setId("Snap"); + m_snapSensitivity.addValue(LOW_WSTR); + m_snapSensitivity.addValue(MEDIUM_WSTR); + m_snapSensitivity.addValue(HIGH_WSTR); + m_snapSensitivity.setId("SnapSensitivity"); } //----------------------------------------------------------------------------- @@ -234,6 +247,10 @@ ControlPointEditorTool::ControlPointEditorTool() void ControlPointEditorTool::updateTranslation() { m_autoSelectDrawing.setQStringName(tr("Auto Select Drawing")); m_snap.setQStringName(tr("Snap")); + m_snapSensitivity.setQStringName(tr("")); + m_snapSensitivity.setItemUIName(L"Low", tr("Low")); + m_snapSensitivity.setItemUIName(L"Medium", tr("Med")); + m_snapSensitivity.setItemUIName(L"High", tr("High")); } //---------------------------------------------------------------------------