[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/krita-animation-pentikainen] krita/plugins/extensions/dockers/animation: Use actions for a
From:       Jouni_Pentikäinen <mctyyppi42 () gmail ! com>
Date:       2015-02-28 15:37:39
Message-ID: E1YRjSV-0006uS-4L () scm ! kde ! org
[Download RAW message or body]

Git commit 259109ed7082dde9375ef803c0a41b75efbeecc3 by Jouni Pentikäinen.
Committed on 24/02/2015 at 17:28.
Pushed by jounip into branch 'krita-animation-pentikainen'.

Use actions for animation toolbar buttons

M  +36   -17   krita/plugins/extensions/dockers/animation/animation_docker.cpp
M  +10   -0    krita/plugins/extensions/dockers/animation/animation_docker.h

http://commits.kde.org/calligra/259109ed7082dde9375ef803c0a41b75efbeecc3

diff --git a/krita/plugins/extensions/dockers/animation/animation_docker.cpp \
b/krita/plugins/extensions/dockers/animation/animation_docker.cpp index \
                d2a1a93..a360c8b 100644
--- a/krita/plugins/extensions/dockers/animation/animation_docker.cpp
+++ b/krita/plugins/extensions/dockers/animation/animation_docker.cpp
@@ -37,31 +37,50 @@ AnimationDocker::AnimationDocker()
 
     m_animationWidget->setupUi(mainWidget);
 
-    m_animationWidget->btnPreviousFrame->setIcon(themedIcon("prevframe"));
-    m_animationWidget->btnPreviousFrame->setIconSize(QSize(22, 22));
+    m_previousFrameAction = new KisAction(i18n("Move to previous frame"), \
m_animationWidget->btnPreviousFrame); +    \
m_previousFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE); +    \
m_previousFrameAction->setIcon(themedIcon("prevframe")); +    \
m_animationWidget->btnPreviousFrame->setDefaultAction(m_previousFrameAction); +
+    m_nextFrameAction = new KisAction(i18n("Move to next frame"), \
m_animationWidget->btnNextFrame); +    \
m_nextFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE); +    \
m_nextFrameAction->setIcon(themedIcon("nextframe")); +    \
m_animationWidget->btnNextFrame->setDefaultAction(m_nextFrameAction); +
+    m_playPauseAction = new KisAction(i18n("Play / pause animation"), \
m_animationWidget->btnPlay); +    \
m_playPauseAction->setActivationFlags(KisAction::ACTIVE_IMAGE); +    \
m_playPauseAction->setIcon(themedIcon("playpause")); +    \
m_animationWidget->btnPlay->setDefaultAction(m_playPauseAction); +
+    m_addBlankFrameAction = new KisAction(i18n("Add blank frame"), \
m_animationWidget->btnAddKeyframe); +    \
m_addBlankFrameAction->setActivationFlags(KisAction::ACTIVE_LAYER); +    \
m_addBlankFrameAction->setIcon(themedIcon("addblankframe")); +    \
m_animationWidget->btnAddKeyframe->setDefaultAction(m_addBlankFrameAction); +
+    m_addDuplicateFrameAction = new KisAction(i18n("Add duplicate frame"), \
m_animationWidget->btnAddDuplicateFrame); +    \
m_addDuplicateFrameAction->setActivationFlags(KisAction::ACTIVE_LAYER); +    \
m_addDuplicateFrameAction->setIcon(themedIcon("addduplicateframe")); +    \
m_animationWidget->btnAddDuplicateFrame->setDefaultAction(m_addDuplicateFrameAction); \
+ +    m_deleteKeyframeAction = new KisAction(i18n("Delete keyframe"), \
m_animationWidget->btnDeleteKeyframe); +    \
m_deleteKeyframeAction->setActivationFlags(KisAction::ACTIVE_LAYER); +    \
m_deleteKeyframeAction->setIcon(themedIcon("deletekeyframe")); +    \
m_animationWidget->btnDeleteKeyframe->setDefaultAction(m_deleteKeyframeAction);  
-    m_animationWidget->btnPlay->setIcon(themedIcon("playpause"));
+    m_animationWidget->btnPreviousFrame->setIconSize(QSize(22, 22));
     m_animationWidget->btnPlay->setIconSize(QSize(22, 22));
-
-    m_animationWidget->btnNextFrame->setIcon(themedIcon("nextframe"));
     m_animationWidget->btnNextFrame->setIconSize(QSize(22, 22));
-
-    m_animationWidget->btnAddKeyframe->setIcon(themedIcon("addblankframe"));
     m_animationWidget->btnAddKeyframe->setIconSize(QSize(22, 22));
-
-    m_animationWidget->btnAddDuplicateFrame->setIcon(themedIcon("addduplicateblankframe"));
  m_animationWidget->btnAddDuplicateFrame->setIconSize(QSize(22, 22));
-
-    m_animationWidget->btnDeleteKeyframe->setIcon(themedIcon("deletekeyframe"));
     m_animationWidget->btnDeleteKeyframe->setIconSize(QSize(22, 22));
 
-    connect(m_animationWidget->btnPreviousFrame, SIGNAL(clicked()), this, \
                SLOT(slotPreviousFrame()));
-    connect(m_animationWidget->btnPlay, SIGNAL(clicked()), this, \
                SLOT(slotPlayPause()));
-    connect(m_animationWidget->btnNextFrame, SIGNAL(clicked()), this, \
SLOT(slotNextFrame())); +    connect(m_previousFrameAction, SIGNAL(triggered()), \
this, SLOT(slotPreviousFrame())); +    connect(m_nextFrameAction, \
SIGNAL(triggered()), this, SLOT(slotNextFrame())); +    connect(m_playPauseAction, \
SIGNAL(triggered()), this, SLOT(slotPlayPause()));  
-    connect(m_animationWidget->btnAddKeyframe, SIGNAL(clicked()), this, \
                SLOT(slotAddBlankFrame()));
-    connect(m_animationWidget->btnAddDuplicateFrame, SIGNAL(clicked()), this, \
                SLOT(slotAddDuplicateFrame()));
-    connect(m_animationWidget->btnDeleteKeyframe, SIGNAL(clicked()), this, \
SLOT(slotDeleteKeyframe())); +    connect(m_addBlankFrameAction, SIGNAL(triggered()), \
this, SLOT(slotAddBlankFrame())); +    connect(m_addDuplicateFrameAction, \
SIGNAL(triggered()), this, SLOT(slotAddDuplicateFrame())); +    \
connect(m_deleteKeyframeAction, SIGNAL(triggered()), this, \
SLOT(slotDeleteKeyframe()));  }
 
 void AnimationDocker::setCanvas(KoCanvasBase * canvas)
diff --git a/krita/plugins/extensions/dockers/animation/animation_docker.h \
b/krita/plugins/extensions/dockers/animation/animation_docker.h index \
                8ddd1a1..3dd86a8 100644
--- a/krita/plugins/extensions/dockers/animation/animation_docker.h
+++ b/krita/plugins/extensions/dockers/animation/animation_docker.h
@@ -24,6 +24,8 @@
 #include <QDockWidget>
 
 #include <KoCanvasObserverBase.h>
+#include "kis_action.h"
+
 
 class KisCanvas2;
 class Ui_WdgAnimation;
@@ -49,6 +51,14 @@ private:
 
     KisCanvas2 *m_canvas;
     Ui_WdgAnimation *m_animationWidget;
+
+    KisAction *m_previousFrameAction;
+    KisAction *m_nextFrameAction;
+    KisAction *m_playPauseAction;
+
+    KisAction *m_addBlankFrameAction;
+    KisAction *m_addDuplicateFrameAction;
+    KisAction *m_deleteKeyframeAction;
 };
 
 


[prev in list] [next in list] [prev in thread] [next in thread]