From kde-commits Sat May 31 18:37:49 2014 From: Somsubhra Bairi Date: Sat, 31 May 2014 18:37:49 +0000 To: kde-commits Subject: [calligra/animator-plugin-somsubhra] krita/plugins/extensions/dockers/animator: Added some timeline Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=140156147902008 Git commit 54832bfef78628e5c66c5999e1bfdf5801fbf1f8 by Somsubhra Bairi. Committed on 31/05/2014 at 18:36. Pushed by somsubhrabairi into branch 'animator-plugin-somsubhra'. Added some timeline control elements UI. M +43 -6 krita/plugins/extensions/dockers/animator/kis_timeline.cpp M +4 -0 krita/plugins/extensions/dockers/animator/kis_timeline.h http://commits.kde.org/calligra/54832bfef78628e5c66c5999e1bfdf5801fbf1f8 diff --git a/krita/plugins/extensions/dockers/animator/kis_timeline.cpp b/k= rita/plugins/extensions/dockers/animator/kis_timeline.cpp index 687dad8..297f6d9 100644 --- a/krita/plugins/extensions/dockers/animator/kis_timeline.cpp +++ b/krita/plugins/extensions/dockers/animator/kis_timeline.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -49,6 +50,8 @@ KisTimeline::KisTimeline(QWidget *parent) : QWidget(paren= t) this->m_numberOfLayers =3D 0; this->lastBrokenFrame =3D QRect(); = + this->frameBreakState =3D false; + QWidget* leftWidget =3D new QWidget(); leftWidget->setMinimumWidth(120); QWidget* rightWidget =3D new QWidget(); @@ -62,7 +65,7 @@ KisTimeline::KisTimeline(QWidget *parent) : QWidget(paren= t) = QToolButton* m_addLayerButton =3D new QToolButton(this); m_addLayerButton->setIcon(koIcon("list-add")); - m_addLayerButton->setFixedSize(10,10); + m_addLayerButton->setFixedSize(15, 15); m_addLayerButton->setToolTip("Add Layer"); = m_addPaintLayerAction =3D new QAction(koIcon("list-add"), "Add Paint L= ayer", this); @@ -76,7 +79,7 @@ KisTimeline::KisTimeline(QWidget *parent) : QWidget(paren= t) QToolButton* removeLayerButton =3D new QToolButton(this); removeLayerButton->setIcon(koIcon("list-remove")); removeLayerButton->setToolTip("Remove Layer"); - removeLayerButton->setFixedSize(10, 10); + removeLayerButton->setFixedSize(15, 15); = layerButtons->addWidget(m_addLayerButton); layerButtons->addWidget(removeLayerButton); @@ -109,31 +112,50 @@ KisTimeline::KisTimeline(QWidget *parent) : QWidget(p= arent) QToolButton* addFrameButton =3D new QToolButton(this); addFrameButton->setIcon(koIcon("list-add")); addFrameButton->setToolTip("Insert Frame"); - addFrameButton->setFixedSize(10, 10); + addFrameButton->setFixedSize(15, 15); = QToolButton* addKeyFrameButton =3D new QToolButton(this); addKeyFrameButton->setIcon(koIcon("list-add")); addKeyFrameButton->setToolTip("Insert key frame"); - addKeyFrameButton->setFixedSize(10, 10); + addKeyFrameButton->setFixedSize(15, 15); = QToolButton* addBlankFrameButton =3D new QToolButton(this); addBlankFrameButton->setIcon(koIcon("list-add")); addBlankFrameButton->setToolTip("Insert blank frame"); - addBlankFrameButton->setFixedSize(10, 10); + addBlankFrameButton->setFixedSize(15, 15); = QToolButton* removeFrameButton =3D new QToolButton(this); removeFrameButton->setIcon(koIcon("list-remove")); removeFrameButton->setToolTip("Remove frame"); - removeFrameButton->setFixedSize(10, 10); + removeFrameButton->setFixedSize(15, 15); + + QCheckBox* frameBreakState =3D new QCheckBox(this); + frameBreakState->setText("Add blank frame "); + + QToolButton* nextFrameButton =3D new QToolButton(this); + nextFrameButton->setIcon(koIcon("go-next-view")); + nextFrameButton->setToolTip("Next frame"); + nextFrameButton->setFixedSize(15, 15); = + QToolButton* prevFrameButton =3D new QToolButton(this); + prevFrameButton->setIcon(koIcon("go-previous-view")); + prevFrameButton->setToolTip("Previous frame"); + prevFrameButton->setFixedSize(15, 15); + + frameButtons->addWidget(frameBreakState); frameButtons->addWidget(addFrameButton); frameButtons->addWidget(addKeyFrameButton); frameButtons->addWidget(addBlankFrameButton); frameButtons->addWidget(removeFrameButton); + frameButtons->addWidget(prevFrameButton); + frameButtons->addWidget(nextFrameButton); = connect(addFrameButton, SIGNAL(pressed()), this, SLOT(addframePressed(= ))); connect(addKeyFrameButton, SIGNAL(pressed()), this, SLOT(keyFramePress= ed())); connect(addBlankFrameButton, SIGNAL(pressed()), this, SLOT(blankFrameP= ressed())); + connect(frameBreakState, SIGNAL(clicked(bool)), this, SLOT(frameBreakS= tateChanged(bool))); + connect(prevFrameButton, SIGNAL(clicked()), this, SLOT(prevFramePresse= d())); + connect(nextFrameButton, SIGNAL(clicked()), this, SLOT(nextFramePresse= d())); = QToolBar* playerButtons =3D new QToolBar(this); = @@ -274,6 +296,11 @@ void KisTimeline::addframePressed() } } = +void KisTimeline::frameBreakStateChanged(bool state) +{ + kWarning() << state; + this->frameBreakState =3D state; +} = void KisTimeline::breakFrame(QRect position) { @@ -293,6 +320,16 @@ void KisTimeline::breakFrame(QRect position) dynamic_cast(this->getCanvas()->view()->document())-= >breakFrame(globalGeometry); } = +void KisTimeline::nextFramePressed() +{ + kWarning() << "Next frame pressed"; +} + +void KisTimeline::prevFramePressed() +{ + kWarning() << "Previous frame pressed"; +} + void KisTimeline::documentModified() { emit canvasModified(); diff --git a/krita/plugins/extensions/dockers/animator/kis_timeline.h b/kri= ta/plugins/extensions/dockers/animator/kis_timeline.h index eb059be..3aa4b32 100644 --- a/krita/plugins/extensions/dockers/animator/kis_timeline.h +++ b/krita/plugins/extensions/dockers/animator/kis_timeline.h @@ -59,6 +59,7 @@ private: KisAnimationLayerBox *m_list; KisAnimation* m_animation; QRect lastBrokenFrame; + bool frameBreakState; = private slots: void updateHeight(); @@ -70,6 +71,9 @@ private slots: void pauseAnimation(); void stopAnimation(); void breakFrame(QRect position); + void frameBreakStateChanged(bool state); + void nextFramePressed(); + void prevFramePressed(); = signals: void canvasModified();