Pr 1292 changes

app/app.pro

@@ -39,6 +39,7 @@ INCLUDEPATH += \
 
 HEADERS += \
     src/importlayersdialog.h \
+    src/keyframetextedit.h \
     src/mainwindow2.h \
     src/predefinedsetmodel.h \
     src/pegbaralignmentdialog.h \
@@ -72,6 +73,7 @@ HEADERS += \
 
 SOURCES += \
     src/importlayersdialog.cpp \
+    src/keyframetextedit.cpp \
     src/main.cpp \
     src/mainwindow2.cpp \
     src/predefinedsetmodel.cpp \

app/src/framecommentwidget.cpp

@@ -2,9 +2,11 @@
 #include "ui_framecommentwidget.h"
 
 #include "editor.h"
+#include "keyframe.h"
+
 #include "layermanager.h"
 #include "playbackmanager.h"
-#include <QDebug>
+#include "keyframetextedit.h"
 
 FrameCommentWidget::FrameCommentWidget(QWidget *parent) :
     BaseDockWidget(parent)
@@ -25,9 +27,6 @@ FrameCommentWidget::~FrameCommentWidget()
 void FrameCommentWidget::initUI()
 {
     connect(this, &FrameCommentWidget::visibilityChanged, this, &FrameCommentWidget::updateConnections);
-    dialogueTextChanged("");
-    actionTextChanged("");
-    notesTextChanged("");
     updateConnections();
 }
 
@@ -39,132 +38,138 @@ void FrameCommentWidget::updateUI()
 void FrameCommentWidget::setCore(Editor *editor)
 {
     mEditor = editor;
-    mLayer = editor->layers()->currentLayer();
-    mKeyframe = mLayer->getKeyFrameAt(mEditor->currentFrame());
-    currentFrameChanged(mEditor->currentFrame());
 }
 
-void FrameCommentWidget::dialogueTextChanged(QString text)
+void FrameCommentWidget::dialogueTextChanged()
 {
-    int len = text.length();
-    ui->labDialogueCount->setText(tr("%1 chars").arg(QString::number(len)));
+    int len = ui->textEditDialogue->toPlainText().length();
+    ui->labelDialogueCounter->setText(tr("%1 chars").arg(QString::number(len)));
 }
 
-void FrameCommentWidget::actionTextChanged(QString text)
+void FrameCommentWidget::actionTextChanged()
 {
-    int len = text.length();
-    ui->labActionCount->setText(tr("%1 chars").arg(QString::number(len)));
+    int len = ui->textEditAction->toPlainText().length();
+    ui->labelActionCounter->setText(tr("%1 chars").arg(QString::number(len)));
 }
 
-void FrameCommentWidget::notesTextChanged(QString text)
+void FrameCommentWidget::slugTextChanged()
 {
-    int len = text.length();
-    ui->labNotesCount->setText(tr("%1 chars").arg(QString::number(len)));
+    int len = ui->textEditSlug->toPlainText().length();
+    ui->labelSlugCounter->setText(tr("%1 chars").arg(QString::number(len)));
 }
 
 void FrameCommentWidget::currentFrameChanged(int frame)
 {
     if (!mIsPlaying)
     {
-        if (mLayer->firstKeyFramePosition() <= frame)
+        if (mEditor->layers()->currentLayer()->firstKeyFramePosition() <= frame)
         {
-            fillFrameComments();
-            ui->btnApplyComments->setEnabled(true);
+            fillComments();
         }
         else
         {
             clearFrameCommentsFields();
-            ui->btnApplyComments->setEnabled(false);
         }
     }
 }
 
 void FrameCommentWidget::currentLayerChanged(int index)
 {
     Q_UNUSED(index)
-    mLayer = mEditor->layers()->currentLayer();
     currentFrameChanged(mEditor->currentFrame());
 }
 
 void FrameCommentWidget::clearFrameCommentsFields()
 {
-    ui->leDialogue->clear();
-    ui->leAction->clear();
-    ui->leNotes->clear();
-    if (!mLayer->keyExists(mEditor->currentFrame()))
-        ui->labLayerFrame->setText("");
-}
-
-void FrameCommentWidget::applyFrameComments()
-{
-    mKeyframe = mLayer->getKeyFrameAt(mEditor->currentFrame());
-    if (mKeyframe == nullptr)
-        mKeyframe = mLayer->getKeyFrameAt(mLayer->getPreviousFrameNumber(mEditor->currentFrame(), true));
-    if (mKeyframe == nullptr) { return; }
-    mKeyframe->setDialogueComment(ui->leDialogue->text());
-    mKeyframe->setActionComment(ui->leAction->text());
-    mKeyframe->setSlugComment(ui->leNotes->text());
-    ui->labLayerFrame->setText(tr("%1 #%2 :").arg(mLayer->name()).arg(QString::number(mKeyframe->pos())));
-    mLayer->setModified(mKeyframe->pos(), true);
+    ui->textEditDialogue->clear();
+    ui->textEditAction->clear();
+    ui->textEditSlug->clear();
 }
 
 void FrameCommentWidget::playStateChanged(bool isPlaying)
 {
     mIsPlaying = isPlaying;
     if (!mIsPlaying)
     {
-        mLayer = mEditor->layers()->currentLayer();
         currentFrameChanged(mEditor->currentFrame());
     }
 }
 
 void FrameCommentWidget::updateConnections()
 {
-    if (isVisible())
+    if (!isVisible())
     {
-        connectAll();
+        disconnectNotifiers();
     }
     else
     {
-        disconnectAll();
+        makeConnections();
     }
 }
 
-void FrameCommentWidget::fillFrameComments()
+void FrameCommentWidget::fillComments()
+{
+    KeyFrame* keyframe = getKeyFrame();
+    if (keyframe == nullptr) { return; }
+
+    ui->textEditDialogue->setPlainText(keyframe->getDialogueComment());
+    ui->textEditAction->setPlainText(keyframe->getActionComment());
+    ui->textEditSlug->setPlainText(keyframe->getSlugComment());
+}
+
+void FrameCommentWidget::applyComments()
 {
-    mKeyframe = mLayer->getKeyFrameAt(mEditor->currentFrame());
-    if (mKeyframe == nullptr)
-        mKeyframe = mLayer->getKeyFrameAt(mLayer->getPreviousFrameNumber(mEditor->currentFrame(), true));
-    if (mKeyframe == nullptr) { return; }
-    ui->leDialogue->setText(mKeyframe->getDialogueComment());
-    ui->leAction->setText(mKeyframe->getActionComment());
-    ui->leNotes->setText(mKeyframe->getSlugComment());
-    ui->labLayerFrame->setText(tr("%1 #%2 :").arg(mEditor->layers()->currentLayer()->name()).arg(QString::number(mKeyframe->pos())));
+    KeyFrame* keyframe = getKeyFrame();
+    if (keyframe == nullptr) { return; }
+
+    keyframe->setDialogueComment(ui->textEditDialogue->toPlainText());
+    keyframe->setActionComment(ui->textEditAction->toPlainText());
+    keyframe->setSlugComment(ui->textEditSlug->toPlainText());
+    mEditor->layers()->currentLayer()->setModified(keyframe->pos(), true);
 }
 
-void FrameCommentWidget::connectAll()
+KeyFrame* FrameCommentWidget::getKeyFrame()
 {
-    connect(ui->leDialogue, &QLineEdit::textChanged, this, &FrameCommentWidget::dialogueTextChanged);
-    connect(ui->leAction, &QLineEdit::textChanged, this, &FrameCommentWidget::actionTextChanged);
-    connect(ui->leNotes, &QLineEdit::textChanged, this, &FrameCommentWidget::notesTextChanged);
+    int currentFrame = mEditor->currentFrame();
+    Layer* layer = mEditor->layers()->currentLayer();
+    KeyFrame* keyframe = layer->getKeyFrameAt(currentFrame);
+    if (keyframe == nullptr)
+        keyframe = layer->getKeyFrameAt(layer->getPreviousFrameNumber(currentFrame, 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->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(mEditor, &Editor::currentFrameChanged, this, &FrameCommentWidget::currentFrameChanged);
     connect(mEditor->layers(), &LayerManager::currentLayerChanged, this, &FrameCommentWidget::currentLayerChanged);
-    connect(ui->btnClearFields, &QPushButton::clicked, this, &FrameCommentWidget::clearFrameCommentsFields);
-    connect(ui->btnApplyComments, &QPushButton::clicked, this, &FrameCommentWidget::applyFrameComments);
-    connect(mEditor, &Editor::objectLoaded, this, &FrameCommentWidget::fillFrameComments);
+    connect(mEditor, &Editor::objectLoaded, this, &FrameCommentWidget::fillComments);
     connect(mEditor->playback(), &PlaybackManager::playStateChanged, this, &FrameCommentWidget::playStateChanged);
 }
 
-void FrameCommentWidget::disconnectAll()
+void FrameCommentWidget::disconnectNotifiers()
 {
-    disconnect(ui->leDialogue, &QLineEdit::textChanged, this, &FrameCommentWidget::dialogueTextChanged);
-    disconnect(ui->leAction, &QLineEdit::textChanged, this, &FrameCommentWidget::actionTextChanged);
-    disconnect(ui->leNotes, &QLineEdit::textChanged, this, &FrameCommentWidget::notesTextChanged);
+    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->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(mEditor, &Editor::currentFrameChanged, this, &FrameCommentWidget::currentFrameChanged);
     disconnect(mEditor->layers(), &LayerManager::currentLayerChanged, this, &FrameCommentWidget::currentLayerChanged);
-    disconnect(ui->btnClearFields, &QPushButton::clicked, this, &FrameCommentWidget::clearFrameCommentsFields);
-    disconnect(ui->btnApplyComments, &QPushButton::clicked, this, &FrameCommentWidget::applyFrameComments);
-    disconnect(mEditor, &Editor::objectLoaded, this, &FrameCommentWidget::fillFrameComments);
+    disconnect(mEditor, &Editor::objectLoaded, this, &FrameCommentWidget::fillComments);
     disconnect(mEditor->playback(), &PlaybackManager::playStateChanged, this, &FrameCommentWidget::playStateChanged);
 }
-

app/src/framecommentwidget.h

@@ -3,9 +3,10 @@
 
 #include <QWidget>
 #include "basedockwidget.h"
-#include "editor.h"
-#include "keyframe.h"
-#include "layer.h"
+
+class Editor;
+class KeyFrame;
+class Layer;
 
 namespace Ui {
     class FrameComment;
@@ -23,30 +24,33 @@ class FrameCommentWidget : public BaseDockWidget
     void updateUI() override;
     void setCore(Editor* editor);
 
-public slots:
-    void dialogueTextChanged(QString text);
-    void actionTextChanged(QString text);
-    void notesTextChanged(QString text);
+    void applyComments();
+    void fillComments();
+
+private:
+    Ui::FrameComment *ui;
+
+    void dialogueTextChanged();
+    void actionTextChanged();
+    void slugTextChanged();
+
     void currentFrameChanged(int frame);
     void currentLayerChanged(int index);
+
     void clearFrameCommentsFields();
-    void applyFrameComments();
-    void playStateChanged(bool isPlaying);
+
     void updateConnections();
 
-private:
-    Ui::FrameComment *ui;
+    void playStateChanged(bool isPlaying);
+
+    KeyFrame* getKeyFrame();
 
-    void fillFrameComments();
-    void connectAll();
-    void disconnectAll();
+    void makeConnections();
+    void disconnectNotifiers();
 
     bool mIsPlaying = false;
 
     Editor* mEditor = nullptr;
-    Layer* mLayer = nullptr;
-    KeyFrame* mKeyframe = nullptr;
-
 };
 
 #endif // FRAMECOMMENTWIDGET_H

app/src/keyframetextedit.cpp

@@ -0,0 +1,13 @@
+#include "keyframetextedit.h"
+
+KeyFrameTextEdit::KeyFrameTextEdit(QWidget* parent) : QPlainTextEdit(parent) {
+
+}
+
+void KeyFrameTextEdit::focusOutEvent(QFocusEvent *event) {
+
+    if (event->lostFocus()) {
+        emit(lostFocus());
+    }
+    QPlainTextEdit::focusOutEvent(event);
+}

app/src/keyframetextedit.h

@@ -0,0 +1,20 @@
+#ifndef KEYFRAMETEXTEDIT_H
+#define KEYFRAMETEXTEDIT_H
+
+#include <QPlainTextEdit>
+
+class KeyFrameTextEdit : public QPlainTextEdit {
+
+    Q_OBJECT
+public:
+    KeyFrameTextEdit(QWidget* parent = nullptr);
+
+Q_SIGNALS:
+    void lostFocus();
+
+protected:
+    void focusOutEvent(QFocusEvent *e) override;
+
+};
+
+#endif // KEYFRAMETEXTEDIT_H

app/src/mainwindow2.cpp

@@ -199,12 +199,11 @@ void MainWindow2::createDockWidgets()
     addDockWidget(Qt::RightDockWidgetArea, mColorBox);
     addDockWidget(Qt::RightDockWidgetArea, mColorInspector);
     addDockWidget(Qt::RightDockWidgetArea, mColorPalette);
-    addDockWidget(Qt::RightDockWidgetArea, mFrameComments);
-    mFrameComments->hide();
     addDockWidget(Qt::LeftDockWidgetArea, mToolBox);
     addDockWidget(Qt::LeftDockWidgetArea, mToolOptions);
     addDockWidget(Qt::LeftDockWidgetArea, mDisplayOptionWidget);
     addDockWidget(Qt::BottomDockWidgetArea, mTimeLine);
+
     setDockNestingEnabled(true);
 
     /*