Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.24.0)
cmake_policy(SET CMP0005 NEW)
cmake_policy(SET CMP0048 NEW) # manages project version

project(QtMeshEditor VERSION 2.17.1 LANGUAGES C CXX)
project(QtMeshEditor VERSION 2.18.0 LANGUAGES C CXX)
message(STATUS "Building QtMeshEditor version ${PROJECT_VERSION}")

set(QTMESHEDITOR_VERSION_STRING "\"${PROJECT_VERSION}\"")
Expand Down
536 changes: 536 additions & 0 deletions qml/AnimationControlPanel.qml

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions qml/PropertiesPanel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import PropertiesPanel 1.0
import AnimationControl 1.0

Rectangle {
id: root
Expand Down Expand Up @@ -46,6 +47,15 @@ Rectangle {

Component.onCompleted: content = animationComponent
}

// ---- Animation Control (keyframe editor) ----
CollapsibleSection {
title: "Animation Control"
sectionVisible: AnimationControlController.hasAnimation
expanded: false

Component.onCompleted: content = animControlComponent
}
}
}

Expand Down Expand Up @@ -263,6 +273,16 @@ Rectangle {
}
}

// ---- Animation Control Content (keyframe editor) ----
Component {
id: animControlComponent

Loader {
width: parent ? parent.width : 300
source: "qrc:/AnimationControl/AnimationControlPanel.qml"
}
}

// ---- Animation Content ----
Component {
id: animationComponent
Expand Down
Loading
Loading