Skip to content

Pr 1292 changes #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 10, 2019
Merged

Pr 1292 changes #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4bda3b9
Make sure frame is updated when changing layer
MrStevns Nov 9, 2019
c04e5f4
Clear focus on FocusOutEvent
MrStevns Nov 9, 2019
5ae84ed
Remove no longer valid function
MrStevns Nov 10, 2019
1590477
Apply comments when leaving widget, out of focus is too late
MrStevns Nov 10, 2019
331edbc
Refactor getKeyFrame
MrStevns Nov 10, 2019
c8a27ba
Apply comments per keystroke
MrStevns Nov 10, 2019
ebe6a95
Merge branch 'issue1288_comments_to_frames' into PR_1292_changes
candyface Nov 10, 2019
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: 0 additions & 2 deletions app/app.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ INCLUDEPATH += \

HEADERS += \
src/importlayersdialog.h \
src/keyframetextedit.h \
src/importpositiondialog.h \
src/mainwindow2.h \
src/predefinedsetmodel.h \
Expand Down Expand Up @@ -74,7 +73,6 @@ HEADERS += \

SOURCES += \
src/importlayersdialog.cpp \
src/keyframetextedit.cpp \
src/importpositiondialog.cpp \
src/main.cpp \
src/mainwindow2.cpp \
Expand Down
40 changes: 21 additions & 19 deletions app/src/framecommentwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include "layermanager.h"
#include "playbackmanager.h"
#include "keyframetextedit.h"

FrameCommentWidget::FrameCommentWidget(QWidget *parent) :
BaseDockWidget(parent)
Expand All @@ -32,7 +31,6 @@ void FrameCommentWidget::initUI()

void FrameCommentWidget::updateUI()
{

}

void FrameCommentWidget::setCore(Editor *editor)
Expand Down Expand Up @@ -62,7 +60,7 @@ void FrameCommentWidget::currentFrameChanged(int frame)
{
if (!mIsPlaying)
{
if (mEditor->layers()->currentLayer()->firstKeyFramePosition() <= frame)
if (frame >= mEditor->layers()->currentLayer()->firstKeyFramePosition())
{
fillComments();
}
Expand Down Expand Up @@ -112,6 +110,10 @@ void FrameCommentWidget::fillComments()
KeyFrame* keyframe = getKeyFrame();
if (keyframe == nullptr) { return; }

QSignalBlocker b(ui->textEditDialogue);
QSignalBlocker b2(ui->textEditAction);
QSignalBlocker b3(ui->textEditSlug);

ui->textEditDialogue->setPlainText(keyframe->getDialogueComment());
ui->textEditAction->setPlainText(keyframe->getActionComment());
ui->textEditSlug->setPlainText(keyframe->getSlugComment());
Expand All @@ -130,26 +132,26 @@ void FrameCommentWidget::applyComments()

KeyFrame* FrameCommentWidget::getKeyFrame()
{
int currentFrame = mEditor->currentFrame();
Layer* layer = mEditor->layers()->currentLayer();
KeyFrame* keyframe = layer->getKeyFrameAt(currentFrame);
const int frame = mEditor->currentFrame();
const Layer* layer = mEditor->layers()->currentLayer();
KeyFrame* keyframe = layer->getKeyFrameAt(frame);
if (keyframe == nullptr)
keyframe = layer->getKeyFrameAt(layer->getPreviousFrameNumber(currentFrame, true));
keyframe = layer->getKeyFrameAt(layer->getPreviousFrameNumber(frame, true));
if (keyframe == nullptr) { return nullptr; }

return keyframe;
}

void FrameCommentWidget::makeConnections()
{
connect(ui->textEditDialogue, &KeyFrameTextEdit::textChanged, this, &FrameCommentWidget::dialogueTextChanged);
connect(ui->textEditAction, &KeyFrameTextEdit::textChanged, this, &FrameCommentWidget::actionTextChanged);
connect(ui->textEditSlug, &KeyFrameTextEdit::textChanged, this, &FrameCommentWidget::slugTextChanged);
connect(ui->textEditDialogue, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::dialogueTextChanged);
connect(ui->textEditAction, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::actionTextChanged);
connect(ui->textEditSlug, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::slugTextChanged);
connect(ui->btnClearFields, &QPushButton::clicked, this, &FrameCommentWidget::clearFrameCommentsFields);

connect(ui->textEditSlug, &KeyFrameTextEdit::lostFocus, this, &FrameCommentWidget::applyComments);
connect(ui->textEditAction, &KeyFrameTextEdit::lostFocus, this, &FrameCommentWidget::applyComments);
connect(ui->textEditDialogue, &KeyFrameTextEdit::lostFocus, this, &FrameCommentWidget::applyComments);
connect(ui->textEditSlug, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::applyComments);
connect(ui->textEditAction, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::applyComments);
connect(ui->textEditDialogue, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::applyComments);

connect(mEditor, &Editor::currentFrameChanged, this, &FrameCommentWidget::currentFrameChanged);
connect(mEditor->layers(), &LayerManager::currentLayerChanged, this, &FrameCommentWidget::currentLayerChanged);
Expand All @@ -159,14 +161,14 @@ void FrameCommentWidget::makeConnections()

void FrameCommentWidget::disconnectNotifiers()
{
disconnect(ui->textEditDialogue, &KeyFrameTextEdit::textChanged, this, &FrameCommentWidget::dialogueTextChanged);
disconnect(ui->textEditAction, &KeyFrameTextEdit::textChanged, this, &FrameCommentWidget::actionTextChanged);
disconnect(ui->textEditSlug, &KeyFrameTextEdit::textChanged, this, &FrameCommentWidget::slugTextChanged);
disconnect(ui->textEditDialogue, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::dialogueTextChanged);
disconnect(ui->textEditAction, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::actionTextChanged);
disconnect(ui->textEditSlug, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::slugTextChanged);
disconnect(ui->btnClearFields, &QPushButton::clicked, this, &FrameCommentWidget::clearFrameCommentsFields);

disconnect(ui->textEditSlug, &KeyFrameTextEdit::lostFocus, this, &FrameCommentWidget::applyComments);
disconnect(ui->textEditAction, &KeyFrameTextEdit::lostFocus, this, &FrameCommentWidget::applyComments);
disconnect(ui->textEditDialogue, &KeyFrameTextEdit::lostFocus, this, &FrameCommentWidget::applyComments);
disconnect(ui->textEditSlug, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::applyComments);
disconnect(ui->textEditAction, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::applyComments);
disconnect(ui->textEditDialogue, &QPlainTextEdit::textChanged, this, &FrameCommentWidget::applyComments);

disconnect(mEditor, &Editor::currentFrameChanged, this, &FrameCommentWidget::currentFrameChanged);
disconnect(mEditor->layers(), &LayerManager::currentLayerChanged, this, &FrameCommentWidget::currentLayerChanged);
Expand Down
13 changes: 0 additions & 13 deletions app/src/keyframetextedit.cpp
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions app/src/keyframetextedit.h
View file
Open in desktop

This file was deleted.

13 changes: 3 additions & 10 deletions app/ui/framecommentwidget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</layout>
</item>
<item>
<widget class="KeyFrameTextEdit" name="textEditDialogue"/>
<widget class="QPlainTextEdit" name="textEditDialogue"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
Expand Down Expand Up @@ -95,7 +95,7 @@
</layout>
</item>
<item>
<widget class="KeyFrameTextEdit" name="textEditAction"/>
<widget class="QPlainTextEdit" name="textEditAction"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
Expand Down Expand Up @@ -129,7 +129,7 @@
</layout>
</item>
<item>
<widget class="KeyFrameTextEdit" name="textEditSlug"/>
<widget class="QPlainTextEdit" name="textEditSlug"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
Expand Down Expand Up @@ -157,13 +157,6 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KeyFrameTextEdit</class>
<extends>QPlainTextEdit</extends>
<header>keyframetextedit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>