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

List:       kde-commits
Subject:    [calligra/krita-animator-plugin-new-mlshi] krita/plugins/extensions/dockers/animatordocker: Merge re
From:       Torio Mlshi <mlshi () lavabit ! com>
Date:       2012-09-11 20:28:08
Message-ID: 20120911202808.E764DA60D9 () git ! kde ! org
[Download RAW message or body]

Git commit f315342c638bfe84a247185a0829606dd038d759 by Torio Mlshi.
Committed on 11/09/2012 at 22:26.
Pushed by mlshi into branch 'krita-animator-plugin-new-mlshi'.

Merge remote-tracking branch 'origin/krita-animator-plugin-new-mlshi' into \
krita-animator-plugin-new-mlshi

Conflicts:
	krita/plugins/extensions/dockers/CMakeLists.txt
	krita/plugins/extensions/dockers/animatordocker/animator_manager.cpp
	krita/plugins/extensions/dockers/animatordocker/animator_model.cpp
	krita/plugins/extensions/dockers/animatordocker/animator_model.h

M  +154  -134  krita/plugins/extensions/dockers/animatordocker/animator_manager.cpp

http://commits.kde.org/calligra/f315342c638bfe84a247185a0829606dd038d759

diff --cc krita/plugins/extensions/dockers/animatordocker/animator_manager.cpp
index e6c7750,c94fb9e..aeb46b1
--- a/krita/plugins/extensions/dockers/animatordocker/animator_manager.cpp
+++ b/krita/plugins/extensions/dockers/animatordocker/animator_manager.cpp
@@@ -205,11 -211,11 +211,11 @@@ void AnimatorManager::setFrameFilter(Fi
  
  void AnimatorManager::putNodeAt(KisNodeSP node, KisNodeSP parent, int index)
  {
-     if (node->parent())
+     if (node->parent()) {
          m_nodeManager->moveNodeAt(node, parent, index);
-     else {
 -    }
 -    else {
 -        m_nodeAdapter->addNode(node, parent, index);
++    } else {
 +        m_nodeManager->addNodeDirect(node, parent, NULL);
 +        m_nodeManager->moveNodeAt(node, parent, index);
      }
  }
  
@@@ -229,18 -235,9 +235,24 @@@ void AnimatorManager::removeLayer(KisNo
  {
      if (!layer || !layer->parent())
          return;
++// <<<<<<< HEAD
 +    
-     KisNodeSP newActive = layer->prevSibling();
-     if (!newActive) {
-         newActive = layer->nextSibling();
-         if (!newActive) {
-             newActive = layer->parent();
-         }
-     }
-     
-     m_nodeManager->removeNode(layer);
-     m_nodeManager->slotNonUiActivatedNode(newActive);
-     layerRemoved(dynamic_cast<AnimatedLayer*>(layer));
++//     KisNodeSP newActive = layer->prevSibling();
++//     if (!newActive) {
++//         newActive = layer->nextSibling();
++//         if (!newActive) {
++//             newActive = layer->parent();
++//         }
++//     }
++//     
++//     m_nodeManager->removeNode(layer);
++//     m_nodeManager->slotNonUiActivatedNode(newActive);
++//     layerRemoved(dynamic_cast<AnimatedLayer*>(layer));
++// =======
+ 
+     m_nodeAdapter->removeNode(layer);
+     layerRemoved(layer);
++// >>>>>>> origin/krita-animator-plugin-new-mlshi
  }
  
  void AnimatorManager::createGroupLayer(KisNodeSP parent)
@@@ -376,23 -371,19 +386,32 @@@ KisNodeSP AnimatorManager::activeLayer(
  template <class CustomAnimatedLayer>
  void AnimatorManager::createAnimatedLayer()
  {
-     CustomAnimatedLayer* newLayer = new CustomAnimatedLayer(image(), "", 255);
-     newLayer->setAName("New layer");
-     
-     KisNode *activeNode = activeLayer();
-     AnimatedLayer *alayer = qobject_cast<AnimatedLayer*>(activeNode);
-     
+     CustomAnimatedLayer *newLayer = new CustomAnimatedLayer(image(), "", 255);
+     newLayer->setAnimationName(i18n("New Animation Layer"));
+ 
+     KisNodeSP activeNode = activeLayer();
+     AnimatedLayerSP alayer = qobject_cast<AnimatedLayer*>(activeNode.data());
+ 
      if (alayer) {
-         KisNode *parent = alayer->parent().data();
-         m_nodeManager->addNodeDirect(newLayer, parent, NULL);
-         m_nodeManager->moveNodeAt(newLayer, parent, parent->index(alayer));
++// <<<<<<< HEAD
++//         KisNode *parent = alayer->parent().data();
++//         m_nodeManager->addNodeDirect(newLayer, parent, NULL);
++//         m_nodeManager->moveNodeAt(newLayer, parent, parent->index(alayer));
++//     } else {
++//         m_nodeManager->addNodeDirect(newLayer, image()->root(), 0);
++//         m_nodeManager->moveNodeAt(newLayer, image()->root(), 0);
++//     }
++//     
++// =======
+         KisNodeSP parent = alayer->parent();
+         m_nodeAdapter->addNode(newLayer, parent, parent->index(alayer));
      } else {
-         m_nodeManager->addNodeDirect(newLayer, image()->root(), 0);
-         m_nodeManager->moveNodeAt(newLayer, image()->root(), 0);
+         m_nodeAdapter->addNode(newLayer, image()->root(), 0);
+         //        m_nodeAdapter->moveNode(newLayer, activeNode);
      }
 +    
 +    layerAdded(newLayer);
 +    m_nodeManager->slotNonUiActivatedNode(newLayer);
  }
  
  void AnimatorManager::createNormalLayer()


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