]> git.sesse.net Git - kdenlive/blobdiff - src/customtrackview.cpp
Patch from Ray Lehtiniemi (3):
[kdenlive] / src / customtrackview.cpp
index 19193cf9c55b31069e317a27205fc2902555fbc4..80f4c1e8dceb69b53736df5204a7c40e591d5a06 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QMouseEvent>
-#include <QStylePainter>
-#include <QGraphicsItem>
-#include <QDomDocument>
-#include <QScrollBar>
-#include <QApplication>
-#include <QInputDialog>
-
-#include <KDebug>
-#include <KLocale>
-#include <KUrl>
-#include <KIcon>
-#include <KCursor>
 
 #include "customtrackview.h"
 #include "customtrackscene.h"
@@ -52,8 +39,6 @@
 #include "razorclipcommand.h"
 #include "kdenlivesettings.h"
 #include "transition.h"
-#include "clipitem.h"
-#include "customtrackview.h"
 #include "clipmanager.h"
 #include "renderer.h"
 #include "markerdialog.h"
 #include "ui_addtrack_ui.h"
 #include "initeffects.h"
 #include "locktrackcommand.h"
+#include "groupclipscommand.h"
+#include "splitaudiocommand.h"
+#include "changecliptypecommand.h"
+
+#include <KDebug>
+#include <KLocale>
+#include <KUrl>
+#include <KIcon>
+#include <KCursor>
+
+#include <QMouseEvent>
+#include <QStylePainter>
+#include <QGraphicsItem>
+#include <QDomDocument>
+#include <QScrollBar>
+#include <QApplication>
+#include <QInputDialog>
+
 
 //TODO:
 // disable animation if user asked it in KDE's global settings
@@ -79,9 +82,9 @@
 // const int duration = animate ? 1500 : 1;
 
 CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent)
-        : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList<AbstractClipItem *> ()), m_scrollOffset(0) {
+        : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList<AbstractClipItem *> ()), m_scrollOffset(0), m_changeSpeedAction(NULL), m_pasteEffectsAction(NULL), m_ungroupAction(NULL), m_clipDrag(false) {
     if (doc) m_commandStack = doc->commandStack();
-    else m_commandStack == NULL;
+    else m_commandStack = NULL;
     setMouseTracking(true);
     setAcceptDrops(true);
     m_animationTimer = new QTimeLine(800);
@@ -122,10 +125,21 @@ void CustomTrackView::setDocumentModified() {
 void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) {
     m_timelineContextMenu = timeline;
     m_timelineContextClipMenu = clip;
+    QList <QAction *> list = m_timelineContextClipMenu->actions();
+    for (int i = 0; i < list.count(); i++) {
+        if (list.at(i)->data().toString() == "change_speed") m_changeSpeedAction = list.at(i);
+        else if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i);
+        else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i);
+    }
+
     m_timelineContextTransitionMenu = transition;
-    QList <QAction *> list = m_timelineContextTransitionMenu->actions();
-    for (int i = 0; i < list.count(); i++)
-        if (list.at(i)->data().toString() == "auto") m_autoTransition = list.at(i);
+    list = m_timelineContextTransitionMenu->actions();
+    for (int i = 0; i < list.count(); i++) {
+        if (list.at(i)->data().toString() == "auto") {
+            m_autoTransition = list.at(i);
+            break;
+        }
+    }
 }
 
 void CustomTrackView::checkAutoScroll() {
@@ -260,9 +274,11 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) {
 
             } else if (m_operationMode == RESIZESTART && move) {
                 double snappedPos = getSnapPointForPos(mappedXPos);
+                m_document->renderer()->pause();
                 m_dragItem->resizeStart((int)(snappedPos));
             } else if (m_operationMode == RESIZEEND && move) {
                 double snappedPos = getSnapPointForPos(mappedXPos);
+                m_document->renderer()->pause();
                 m_dragItem->resizeEnd((int)(snappedPos));
             } else if (m_operationMode == FADEIN && move) {
                 ((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps())));
@@ -542,8 +558,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         return;
     }
 
-    if (event->modifiers() == Qt::ShiftModifier && collisionList.count() == 0) {
+    if (event->modifiers() & Qt::ShiftModifier && collisionList.count() == 0) {
         setDragMode(QGraphicsView::RubberBandDrag);
+        if (!(event->modifiers() & Qt::ControlModifier)) {
+            resetSelectionGroup();
+            scene()->clearSelection();
+        }
         QGraphicsView::mousePressEvent(event);
         m_blockRefresh = false;
         m_operationMode = RUBBERSELECTION;
@@ -565,16 +585,21 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         return;
     }
 
-    // Find first clip or transition under mouse
-    int i = 0;
+    // Find first clip, transition or group under mouse
+    int ct = 0;
     m_dragItem = NULL;
-    while (i < collisionList.count()) {
-        if (collisionList.at(i)->type() == AVWIDGET || collisionList.at(i)->type() == TRANSITIONWIDGET) {
-            m_dragItem = static_cast <AbstractClipItem *>(collisionList.at(i));
+    AbstractGroupItem *dragGroup = NULL;
+    while (ct < collisionList.count()) {
+        if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) {
+            m_dragItem = static_cast <AbstractClipItem *>(collisionList.at(ct));
             m_dragItemInfo = m_dragItem->info();
+            if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) {
+                //kDebug()<<"// KLIK FOUND GRP: "<<m_dragItem->sceneBoundingRect();
+                dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+            }
             break;
         }
-        i++;
+        ct++;
     }
 
     if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) {
@@ -586,14 +611,15 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
     // context menu requested
     if (event->button() == Qt::RightButton) {
         if (m_dragItem) {
-            if (!m_dragItem->isSelected()) {
+            if (dragGroup) dragGroup->setSelected(true);
+            else if (!m_dragItem->isSelected()) {
                 resetSelectionGroup(false);
                 m_scene->clearSelection();
                 m_dragItem->setSelected(true);
             }
         }
         m_operationMode = NONE;
-        displayContextMenu(event->globalPos(), m_dragItem);
+        displayContextMenu(event->globalPos(), m_dragItem, dragGroup);
         m_menuPosition = m_clickEvent;
         m_dragItem = NULL;
         event->accept();
@@ -625,7 +651,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
             m_scene->clearSelection();
 
             for (int i = 0; i < selection.count(); i++) {
-                if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
+                if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) {
                     selection.at(i)->setSelected(true);
                 }
             }
@@ -637,15 +663,21 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
     }
 
     // Razor tool
-    if (m_tool == RAZORTOOL) {
+    if (m_tool == RAZORTOOL && m_dragItem) {
         if (m_dragItem->type() == TRANSITIONWIDGET) {
             emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage);
             event->accept();
             m_dragItem = NULL;
             return;
+        } else if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+            emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage);
+            event->accept();
+            m_dragItem = NULL;
+            return;
         }
         AbstractClipItem *clip = static_cast <AbstractClipItem *>(m_dragItem);
         RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()), true);
+        m_document->renderer()->pause();
         m_commandStack->push(command);
         m_document->setModified(true);
         m_dragItem = NULL;
@@ -653,30 +685,16 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         return;
     }
 
-
-    if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem);
-    else emit clipItemSelected(NULL);
-
-    if (event->modifiers() != Qt::ControlModifier && (m_dragItem->group() || m_dragItem->isSelected())) {
-        // If clicked item is selected, allow move
-        event->accept();
-        if (m_selectionGroup) m_selectionGroup->setSelected(true);
-        if (m_operationMode == NONE) QGraphicsView::mousePressEvent(event);
-    } else {
-        resetSelectionGroup();
-        if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection();
-        m_dragItem->setSelected(!m_dragItem->isSelected());
-        groupSelectedItems();
-    }
-
-    if (m_selectionGroup == NULL) updateSnapPoints(m_dragItem);
+    if (dragGroup == NULL) updateSnapPoints(m_dragItem);
     else {
         QList <GenTime> offsetList;
-        QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+        QList<QGraphicsItem *> children = dragGroup->childItems();
         for (int i = 0; i < children.count(); i++) {
-            AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
-            offsetList.append(item->startPos());
-            offsetList.append(item->endPos());
+            if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) {
+                AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
+                offsetList.append(item->startPos());
+                offsetList.append(item->endPos());
+            }
         }
         if (!offsetList.isEmpty()) {
             qSort(offsetList);
@@ -692,6 +710,31 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         }
     }
 
+    if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem);
+    else emit clipItemSelected(NULL);
+
+    if (event->modifiers() != Qt::ControlModifier && (m_dragItem->isSelected() || dragGroup && dragGroup->isSelected())) {
+        // If clicked item is selected, allow move
+        if (dragGroup) dragGroup->setSelected(true);
+        //event->accept();
+        if (m_operationMode == NONE) QGraphicsView::mousePressEvent(event);
+    } else {
+        resetSelectionGroup();
+        if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection();
+        dragGroup = NULL;
+        if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) {
+            //kDebug()<<"// KLIK FOUND GRP: "<<m_dragItem->sceneBoundingRect();
+            dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+        }
+        bool selected = !m_dragItem->isSelected();
+        if (dragGroup) dragGroup->setSelected(selected);
+        else m_dragItem->setSelected(selected);
+        groupSelectedItems();
+        ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
+        m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO);
+        m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
+    }
+
     m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
     m_operationMode = m_dragItem->operationMode(mapToScene(event->pos()));
 
@@ -701,7 +744,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         return;
     } else if (m_operationMode == MOVE) {
         setCursor(Qt::ClosedHandCursor);
-    } else if (m_operationMode == TRANSITIONSTART) {
+    } else if (m_operationMode == TRANSITIONSTART && event->modifiers() != Qt::ControlModifier) {
         ItemInfo info;
         info.startPos = m_dragItem->startPos();
         info.track = m_dragItem->track();
@@ -727,7 +770,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         }
         if (transitionAccepted) slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
         else emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
-    } else if (m_operationMode == TRANSITIONEND) {
+    } else if (m_operationMode == TRANSITIONEND && event->modifiers() != Qt::ControlModifier) {
         ItemInfo info;
         info.endPos = GenTime(m_dragItem->endPos().frames(m_document->fps()), m_document->fps());
         info.track = m_dragItem->track();
@@ -772,10 +815,16 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) {
         // delete selection group
         bool snap = KdenliveSettings::snaptopoints();
         KdenliveSettings::setSnaptopoints(false);
+
         QList<QGraphicsItem *> children = m_selectionGroup->childItems();
         scene()->destroyItemGroup(m_selectionGroup);
         for (int i = 0; i < children.count(); i++) {
-            if (!static_cast <AbstractClipItem *>(children.at(i))->isItemLocked()) {
+            if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) {
+                if (!static_cast <AbstractClipItem *>(children.at(i))->isItemLocked()) {
+                    children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+                    children.at(i)->setSelected(selectItems);
+                }
+            } else if (children.at(i)->type() == GROUPWIDGET) {
                 children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
                 children.at(i)->setSelected(selectItems);
             }
@@ -785,42 +834,72 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) {
     }
 }
 
-void CustomTrackView::groupSelectedItems(bool force) {
+void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) {
     if (m_selectionGroup) {
         kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP";
         return;
     }
     QList<QGraphicsItem *> selection = m_scene->selectedItems();
-    QGraphicsItemGroup *group = m_scene->createItemGroup(selection);
-    scene()->addItem(group);
-    QPointF top = group->sceneBoundingRect().topLeft();
-    m_scene->destroyItemGroup(group);
+    if (selection.isEmpty()) return;
+    QPointF top = selection.at(0)->sceneBoundingRect().topLeft();
+    // Find top left position of selection
+    for (int i = 1; i < selection.count(); i++) {
+        if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) {
+            QPointF currenttop = selection.at(i)->sceneBoundingRect().topLeft();
+            if (currenttop.x() < top.x()) top.setX(currenttop.x());
+            if (currenttop.y() < top.y()) top.setY(currenttop.y());
+        }
+    }
+
     if (force || selection.count() > 1) {
         bool snap = KdenliveSettings::snaptopoints();
         KdenliveSettings::setSnaptopoints(false);
-        m_selectionGroup = new AbstractGroupItem(m_document->fps());
-        m_selectionGroup->translate(-top.x(), -top.y() + 1);
-        m_selectionGroup->setPos(top.x(), top.y() - 1);
-        scene()->addItem(m_selectionGroup);
-        for (int i = 0; i < selection.count(); i++) {
-            if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
-                m_selectionGroup->addToGroup(selection.at(i));
-                selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+        if (createNewGroup) {
+            AbstractGroupItem *newGroup = m_document->clipManager()->createGroup();
+            newGroup->translate(-top.x(), -top.y() + 1);
+            newGroup->setPos(top.x(), top.y() - 1);
+            scene()->addItem(newGroup);
+
+            // CHeck if we are trying to include a group in a group
+            QList <AbstractGroupItem *> groups;
+            for (int i = 0; i < selection.count(); i++) {
+                if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast<AbstractGroupItem *>(selection.at(i)))) {
+                    groups.append(static_cast<AbstractGroupItem *>(selection.at(i)));
+                } else if (selection.at(i)->parentItem() && !groups.contains(static_cast<AbstractGroupItem *>(selection.at(i)->parentItem()))) groups.append(static_cast<AbstractGroupItem *>(selection.at(i)->parentItem()));
+            }
+            if (!groups.isEmpty()) {
+                // ungroup previous groups
+                while (!groups.isEmpty()) {
+                    AbstractGroupItem *grp = groups.takeFirst();
+                    m_document->clipManager()->removeGroup(grp);
+                    scene()->destroyItemGroup(grp);
+                }
+                selection = m_scene->selectedItems();
             }
-        }
-        KdenliveSettings::setSnaptopoints(snap);
 
-        if (m_selectionGroup) {
-            /*bool snap = KdenliveSettings::snaptopoints();
-            KdenliveSettings::setSnaptopoints(false);
-            QPointF top = m_selectionGroup->sceneBoundingRect().topLeft();
-            // kDebug()<<"SEL GRP TOP: "<<top;
-            // Fix group item position
-            m_selectionGroup->translate(-top.x(), -top.y());
-            m_selectionGroup->setPos(top);*/
-            m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
-            m_selectionGroupInfo.track = m_selectionGroup->track();
-            //KdenliveSettings::setSnaptopoints(snap);
+            for (int i = 0; i < selection.count(); i++) {
+                if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
+                    newGroup->addToGroup(selection.at(i));
+                    selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+                }
+            }
+            KdenliveSettings::setSnaptopoints(snap);
+        } else {
+            m_selectionGroup = new AbstractGroupItem(m_document->fps());
+            m_selectionGroup->translate(-top.x(), -top.y() + 1);
+            m_selectionGroup->setPos(top.x(), top.y() - 1);
+            scene()->addItem(m_selectionGroup);
+            for (int i = 0; i < selection.count(); i++) {
+                if (selection.at(i)->parentItem() == NULL && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
+                    m_selectionGroup->addToGroup(selection.at(i));
+                    selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+                }
+            }
+            KdenliveSettings::setSnaptopoints(snap);
+            if (m_selectionGroup) {
+                m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
+                m_selectionGroupInfo.track = m_selectionGroup->track();
+            }
         }
     } else resetSelectionGroup();
 }
@@ -923,10 +1002,22 @@ void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int
 }
 
 
-void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) {
+void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, AbstractGroupItem *group) {
     if (clip == NULL) m_timelineContextMenu->popup(pos);
-    else if (clip->type() == AVWIDGET) m_timelineContextClipMenu->popup(pos);
-    else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
+    else if (group != NULL) {
+        m_changeSpeedAction->setEnabled(false);
+        m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
+        m_ungroupAction->setEnabled(true);
+        m_timelineContextClipMenu->popup(pos);
+    } else {
+        m_ungroupAction->setEnabled(false);
+        if (clip->type() == AVWIDGET) {
+            ClipItem *item = static_cast <ClipItem*>(clip);
+            m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO);
+            m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
+            m_timelineContextClipMenu->popup(pos);
+        } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
+    }
 }
 
 void CustomTrackView::activateMonitor() {
@@ -935,10 +1026,11 @@ void CustomTrackView::activateMonitor() {
 
 void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) {
     if (event->mimeData()->hasFormat("kdenlive/clip")) {
+        m_clipDrag = true;
         resetSelectionGroup();
-        QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(";");
+        QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(';');
         m_selectionGroup = new AbstractGroupItem(m_document->fps());
-        QPoint pos = QPoint();
+        QPoint pos;
         DocClipBase *clip = m_document->getBaseClip(list.at(0));
         if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
         ItemInfo info;
@@ -957,13 +1049,14 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) {
         scene()->addItem(m_selectionGroup);
         event->acceptProposedAction();
     } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
-        QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(";");
+        m_clipDrag = true;
+        QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(';');
         m_scene->clearSelection();
         resetSelectionGroup(false);
 
         m_selectionGroup = new AbstractGroupItem(m_document->fps());
-        QPoint pos = QPoint();
-        GenTime start = GenTime();
+        QPoint pos;
+        GenTime start;
         QList <GenTime> offsetList;
         for (int i = 0; i < ids.size(); ++i) {
             DocClipBase *clip = m_document->getBaseClip(ids.at(i));
@@ -983,7 +1076,11 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) {
         updateSnapPoints(NULL, offsetList);
         scene()->addItem(m_selectionGroup);
         event->acceptProposedAction();
-    } else QGraphicsView::dragEnterEvent(event);
+    } else {
+        // the drag is not a clip (may be effect, ...)
+        m_clipDrag = false;
+        QGraphicsView::dragEnterEvent(event);
+    }
 }
 
 
@@ -1055,8 +1152,50 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) {
     }
 }
 
+void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group) {
+    QList<QGraphicsItem *> itemList = group->childItems();
+    QUndoCommand *effectCommand = new QUndoCommand();
+    QString effectName;
+    QDomNode namenode = effect.elementsByTagName("name").item(0);
+    if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+    else effectName = i18n("effect");
+    effectCommand->setText(i18n("Add %1", effectName));
+    int count = 0;
+    for (int i = 0; i < itemList.count(); i++) {
+        if (itemList.at(i)->type() == AVWIDGET) {
+            ClipItem *item = (ClipItem *)itemList.at(i);
+            if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") {
+                emit displayMessage(i18n("Effect already present in clip"), ErrorMessage);
+                continue;
+            }
+            if (item->isItemLocked()) {
+                continue;
+            }
+            item->initEffect(effect);
+            if (effect.attribute("tag") == "ladspa") {
+                QString ladpsaFile = m_document->getLadspaFile();
+                initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect));
+                effect.setAttribute("src", ladpsaFile);
+            }
+            new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand);
+            count++;
+        }
+    }
+    if (count > 0) {
+        m_commandStack->push(effectCommand);
+        m_document->setModified(true);
+    } else delete effectCommand;
+}
+
 void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) {
     QList<QGraphicsItem *> itemList;
+    QUndoCommand *effectCommand = new QUndoCommand();
+    QString effectName;
+    QDomNode namenode = effect.elementsByTagName("name").item(0);
+    if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+    else effectName = i18n("effect");
+    effectCommand->setText(i18n("Add %1", effectName));
+    int count = 0;
     if (track == -1) itemList = scene()->selectedItems();
     if (itemList.isEmpty()) {
         ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track);
@@ -1071,17 +1210,23 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
                 emit displayMessage(i18n("Effect already present in clip"), ErrorMessage);
                 continue;
             }
+            if (item->isItemLocked()) {
+                continue;
+            }
             item->initEffect(effect);
             if (effect.attribute("tag") == "ladspa") {
                 QString ladpsaFile = m_document->getLadspaFile();
                 initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect));
                 effect.setAttribute("src", ladpsaFile);
             }
-            AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true);
-            m_commandStack->push(command);
+            new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand);
+            count++;
         }
     }
-    m_document->setModified(true);
+    if (count > 0) {
+        m_commandStack->push(effectCommand);
+        m_document->setModified(true);
+    } else delete effectCommand;
 }
 
 void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) {
@@ -1106,7 +1251,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i
         }
         if (effectParams.paramValue("disabled") == "1") {
             if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"), false)) {
-                kDebug() << "//////  DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex();
+                kDebug() << "//////  DISABLING EFFECT: " << ix << ", CURRENTLA: " << clip->selectedEffectIndex();
             } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
         } else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams))
             emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
@@ -1197,6 +1342,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) {
         if (dup->checkKeyFrames()) slotRefreshEffects(dup);
         item->baseClip()->addReference();
         m_document->updateClip(item->baseClip()->getId());
+        m_document->setModified(true);
         kDebug() << "/////////  CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25);
         kDebug() << "//  CUTTING CLIP dONE";
     } else {
@@ -1231,6 +1377,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) {
         bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos);
         if (success) {
             item->resizeEnd((int) info.endPos.frames(m_document->fps()));
+            m_document->setModified(true);
         } else
             emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
 
@@ -1329,7 +1476,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) {
         }
 }
 
-void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) {
+void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionInfo, int endTrack, QDomElement transition) {
     if (transitionInfo.startPos >= transitionInfo.endPos) {
         emit displayMessage(i18n("Invalid transition"), ErrorMessage);
         return;
@@ -1351,7 +1498,7 @@ void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomE
     }
 }
 
-void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) {
+void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/) {
     Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track);
     if (!item) {
         emit displayMessage(i18n("Select clip to delete"), ErrorMessage);
@@ -1387,19 +1534,17 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr
 void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) {
     event->setDropAction(Qt::IgnoreAction);
     const QPointF pos = mapToScene(event->pos());
-    if (m_selectionGroup) {
+    if (m_selectionGroup && m_clipDrag) {
         m_selectionGroup->setPos(pos.x(), pos.y());
         event->setDropAction(Qt::MoveAction);
-        if (event->mimeData()->hasFormat("kdenlive/producerslist") || event->mimeData()->hasFormat("kdenlive/clip")) {
-            event->acceptProposedAction();
-        }
+        event->acceptProposedAction();
     } else {
         QGraphicsView::dragMoveEvent(event);
     }
 }
 
 void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) {
-    if (m_selectionGroup) {
+    if (m_selectionGroup && m_clipDrag) {
         QList<QGraphicsItem *> items = m_selectionGroup->childItems();
         qDeleteAll(items);
         scene()->destroyItemGroup(m_selectionGroup);
@@ -1408,12 +1553,14 @@ void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) {
 }
 
 void CustomTrackView::dropEvent(QDropEvent * event) {
-    if (m_selectionGroup) {
+    if (m_selectionGroup && m_clipDrag) {
         QList<QGraphicsItem *> items = m_selectionGroup->childItems();
         resetSelectionGroup();
         m_scene->clearSelection();
+        bool hasVideoClip = false;
         for (int i = 0; i < items.count(); i++) {
             ClipItem *item = static_cast <ClipItem *>(items.at(i));
+            if (!hasVideoClip && (item->clipType() == AV || item->clipType() == VIDEO)) hasVideoClip = true;
             AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false);
             m_commandStack->push(command);
             item->baseClip()->addReference();
@@ -1439,8 +1586,9 @@ void CustomTrackView::dropEvent(QDropEvent * event) {
             m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track()));
             item->setSelected(true);
         }
+        m_changeSpeedAction->setEnabled(hasVideoClip);
+        m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
         groupSelectedItems(true);
-        m_document->setModified(true);
     } else QGraphicsView::dropEvent(event);
     setFocus();
 }
@@ -1461,8 +1609,11 @@ Qt::DropActions CustomTrackView::supportedDropActions() const {
 }
 
 void CustomTrackView::setDuration(int duration) {
-    if (duration > sceneRect().width())
-        setSceneRect(0, 0, (duration + 100), sceneRect().height());
+    int diff = qAbs(duration - sceneRect().width());
+    if (diff * matrix().m11() > -50) {
+        if (matrix().m11() < 0.4) setSceneRect(0, 0, (duration + 100 / matrix().m11()), sceneRect().height());
+        else setSceneRect(0, 0, (duration + 300), sceneRect().height());
+    }
     m_projectDuration = duration;
 }
 
@@ -1502,7 +1653,11 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) {
                 ClipItem *clip = static_cast <ClipItem *>(item);
                 // We add a move clip command so that we get the correct producer for new track number
                 if (clip->clipType() == AV || clip->clipType() == AUDIO) {
-                    m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), clip->baseClip()->producer(clipinfo.track));
+                    Mlt::Producer *prod;
+                    if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track);
+                    else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
+                    else prod = clip->baseClip()->producer(clipinfo.track);
+                    m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod);
                     kDebug() << "// UPDATING CLIP TO TRACK PROD: " << clipinfo.track;
                 }
             } else if (item->type() == TRANSITIONWIDGET) {
@@ -1562,8 +1717,13 @@ void CustomTrackView::removeTrack(int ix) {
             ItemInfo clipinfo = clip->info();
             kDebug() << "// CLIP TRK IS: " << clipinfo.track;
             // We add a move clip command so that we get the correct producer for new track number
-            if (clip->clipType() == AV || clip->clipType() == AUDIO)
-                m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), clip->baseClip()->producer(clipinfo.track));
+            if (clip->clipType() == AV || clip->clipType() == AUDIO) {
+                Mlt::Producer *prod;
+                if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track);
+                else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
+                else prod = clip->baseClip()->producer(clipinfo.track);
+                m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod);
+            }
         } else if (children.at(i)->type() == TRANSITIONWIDGET) {
             Transition *tr = static_cast <Transition *>(children.at(i));
             tr->updateItem();
@@ -1667,8 +1827,8 @@ void CustomTrackView::slotRemoveSpace() {
     QRectF r(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 1);
     QList<QGraphicsItem *> items = m_scene->items(r);
 
-    QList<ItemInfo> clipsToMove = QList<ItemInfo> ();
-    QList<ItemInfo> transitionsToMove = QList<ItemInfo> ();
+    QList<ItemInfo> clipsToMove;
+    QList<ItemInfo> transitionsToMove;
 
     for (int i = 0; i < items.count(); i++) {
         if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) {
@@ -1712,8 +1872,8 @@ void CustomTrackView::slotInsertSpace() {
     QRectF r(pos.frames(m_document->fps()), minh, sceneRect().width() - pos.frames(m_document->fps()), maxh);
     QList<QGraphicsItem *> items = m_scene->items(r);
 
-    QList<ItemInfo> clipsToMove = QList<ItemInfo> ();
-    QList<ItemInfo> transitionsToMove = QList<ItemInfo> ();
+    QList<ItemInfo> clipsToMove;
+    QList<ItemInfo> transitionsToMove;
 
     for (int i = 0; i < items.count(); i++) {
         if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) {
@@ -1739,9 +1899,6 @@ void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> t
     ClipItem *clip;
     Transition *transition;
 
-    kDebug() << "/// STARTING SPACE INSERT";
-
-
     // Create lists with start pos for each track
     QMap <int, int> trackClipStartList;
     QMap <int, int> trackTransitionStartList;
@@ -1752,45 +1909,69 @@ void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> t
     }
 
     if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); i++) {
-            kDebug() << "/// FETCHING CLIP: " << i;
             clip = getClipItemAtStart(clipsToMove.at(i).startPos + offset, clipsToMove.at(i).track);
             if (clip) {
-                m_selectionGroup->addToGroup(clip);
+                if (clip->parentItem()) {
+                    m_selectionGroup->addToGroup(clip->parentItem());
+                    clip->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable);
+                } else {
+                    m_selectionGroup->addToGroup(clip);
+                    clip->setFlags(QGraphicsItem::ItemIsSelectable);
+                }
                 if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track))
                     trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps());
-                clip->setFlags(QGraphicsItem::ItemIsSelectable);
             } else emit displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames(clipsToMove.at(i).startPos.frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage);
         }
     if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) {
-            kDebug() << "/// FETCHING TRANS: " << i;
             transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track);
             if (transition) {
+                if (transition->parentItem()) m_selectionGroup->addToGroup(transition->parentItem());
                 m_selectionGroup->addToGroup(transition);
                 if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track))
                     trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps());
                 transition->setFlags(QGraphicsItem::ItemIsSelectable);
             } else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage);
         }
-    kDebug() << "/// STARTING SPACE DONE";
     m_selectionGroup->translate(diff, 0);
+
+    // update items coordinates
+    QList<QGraphicsItem *> itemList = scene()->selectedItems();
+    for (int i = 0; i < itemList.count(); i++) {
+        if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
+            static_cast < AbstractClipItem *>(itemList.at(i))->updateItem();
+        } else if (itemList.at(i)->type() == GROUPWIDGET) {
+            QList<QGraphicsItem *> children = itemList.at(i)->childItems();
+            for (int j = 0; j < children.count(); j++) {
+                static_cast < AbstractClipItem *>(children.at(j))->updateItem();
+            }
+        }
+    }
     resetSelectionGroup(false);
-    kDebug() << "/// STARTING SPACE DONE2";
     if (track != -1) track = m_document->tracksCount() - track;
     m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, duration, offset);
 }
 
 void CustomTrackView::deleteClip(const QString &clipId) {
+    resetSelectionGroup();
     QList<QGraphicsItem *> itemList = items();
+    QUndoCommand *deleteCommand = new QUndoCommand();
+    deleteCommand->setText(i18n("Delete timeline clips"));
+    int count = 0;
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = (ClipItem *)itemList.at(i);
             if (item->clipProducer() == clipId) {
-                AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true);
-                m_commandStack->push(command);
-                //delete item;
+                count++;
+                if (item->parentItem()) {
+                    // Clip is in a group, destroy the group
+                    new GroupClipsCommand(this, QList<ItemInfo>() << item->info(), QList<ItemInfo>(), false, true, deleteCommand);
+                }
+                new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteCommand);
             }
         }
     }
+    if (count == 0) delete deleteCommand;
+    else m_commandStack->push(deleteCommand);
 }
 
 void CustomTrackView::setCursorPos(int pos, bool seek) {
@@ -1849,19 +2030,17 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
         m_dragItem = NULL;
         return;
     } else if (m_operationMode == SPACER) {
-        int endClick = (int)(mapToScene(event->pos()).x() + 0.5);
-        int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5);
-        int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
-        if (m_selectionGroup->sceneBoundingRect().height() > m_tracksHeight) {
+        int track;
+        if (event->modifiers() != Qt::ControlModifier) {
             // We are moving all tracks
             track = -1;
-        }
+        } else track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
         GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos;
         if (timeOffset != GenTime()) {
             QList<QGraphicsItem *> items = m_selectionGroup->childItems();
 
-            QList<ItemInfo> clipsToMove = QList<ItemInfo> ();
-            QList<ItemInfo> transitionsToMove = QList<ItemInfo> ();
+            QList<ItemInfo> clipsToMove;
+            QList<ItemInfo> transitionsToMove;
 
             // Create lists with start pos for each track
             QMap <int, int> trackClipStartList;
@@ -1872,16 +2051,26 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
                 trackTransitionStartList[i] = -1;
             }
 
+            int max = items.count();
+            for (int i = 0; i < max; i++) {
+                if (items.at(i)->type() == GROUPWIDGET)
+                    items += static_cast <QGraphicsItemGroup *>(items.at(i))->childItems();
+            }
+
             for (int i = 0; i < items.count(); i++) {
-                AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
-                ItemInfo info = item->info();
-                if (item->type() == AVWIDGET) {
+                if (items.at(i)->type() == AVWIDGET) {
+                    AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
+                    ItemInfo info = item->info();
                     clipsToMove.append(info);
+                    item->updateItem();
                     if (trackClipStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - info.track))
                         trackClipStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps());
-                } else if (item->type() == TRANSITIONWIDGET) {
+                } else if (items.at(i)->type() == TRANSITIONWIDGET) {
+                    AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
+                    ItemInfo info = item->info();
                     transitionsToMove.append(info);
-                    if (trackClipStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - info.track))
+                    item->updateItem();
+                    if (trackTransitionStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - info.track))
                         trackTransitionStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps());
                 }
             }
@@ -1889,6 +2078,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
             InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false);
             m_commandStack->push(command);
             if (track != -1) track = m_document->tracksCount() - track;
+            kDebug() << "SPACER TRACK:" << track;
             m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime());
         }
         resetSelectionGroup(false);
@@ -1910,11 +2100,15 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
     if (m_operationMode == MOVE) {
         setCursor(Qt::OpenHandCursor);
 
-        if (m_selectionGroup == NULL) {
+        if (m_dragItem->parentItem() == 0) {
             // we are moving one clip, easy
             if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
                 ClipItem *item = static_cast <ClipItem *>(m_dragItem);
-                bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), item->baseClip()->producer(info.track));
+                Mlt::Producer *prod;
+                if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(m_dragItemInfo.track);
+                else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer();
+                else prod = item->baseClip()->producer(m_dragItemInfo.track);
+                bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), prod);
                 if (success) {
                     int tracknumber = m_document->tracksCount() - item->track() - 1;
                     bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
@@ -1995,6 +2189,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
                     m_commandStack->push(command);
                     emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage);
                 }
+                m_document->setModified(true);
             }
             if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
                 Transition *transition = static_cast <Transition *>(m_dragItem);
@@ -2011,19 +2206,28 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
         } else {
             // Moving several clips. We need to delete them and readd them to new position,
             // or they might overlap each other during the move
+            QGraphicsItemGroup *group = static_cast <QGraphicsItemGroup *>(m_dragItem->parentItem());
+            QList<QGraphicsItem *> items = group->childItems();
 
-            QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+            QList<ItemInfo> clipsToMove;
+            QList<ItemInfo> transitionsToMove;
 
-            QList<ItemInfo> clipsToMove = QList<ItemInfo> ();
-            QList<ItemInfo> transitionsToMove = QList<ItemInfo> ();
-
-            GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos;
-            const int trackOffset = m_selectionGroup->track() - m_selectionGroupInfo.track;
+            GenTime timeOffset = GenTime(m_dragItem->scenePos().x(), m_document->fps()) - m_dragItemInfo.startPos;
+            const int trackOffset = (int)(m_dragItem->scenePos().y() / m_tracksHeight) - m_dragItemInfo.track;
+            //kDebug() << "// MOVED SEVERAL CLIPS" << timeOffset.frames(25);
             if (timeOffset != GenTime() || trackOffset != 0) {
-                QUndoCommand *moveClips = new QUndoCommand();
-                moveClips->setText(i18n("Move group"));
                 // remove items in MLT playlist
+
+                // Expand groups
+                int max = items.count();
+                for (int i = 0; i < max; i++) {
+                    if (items.at(i)->type() == GROUPWIDGET) {
+                        items += items.at(i)->childItems();
+                    }
+                }
+
                 for (int i = 0; i < items.count(); i++) {
+                    if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue;
                     AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
                     ItemInfo info = item->info();
                     if (item->type() == AVWIDGET) {
@@ -2042,20 +2246,25 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
 
                 for (int i = 0; i < items.count(); i++) {
                     // re-add items in correct place
+                    if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue;
                     AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
                     item->updateItem();
                     ItemInfo info = item->info();
                     int tracknumber = m_document->tracksCount() - info.track - 1;
                     bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
                     if (isLocked) {
-                        m_selectionGroup->removeFromGroup(item);
+                        group->removeFromGroup(item);
                         item->setItemLocked(true);
                     }
 
                     if (item->type() == AVWIDGET) {
                         ClipItem *clip = static_cast <ClipItem*>(item);
                         info.track = m_document->tracksCount() - info.track;
-                        m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track));
+                        Mlt::Producer *prod;
+                        if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track);
+                        else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
+                        else prod = clip->baseClip()->producer(info.track);
+                        m_document->renderer()->mltInsertClip(info, clip->xml(), prod);
                         for (int i = 0; i < clip->effectsCount(); i++) {
                             m_document->renderer()->mltAddEffect(info.track, info.startPos, clip->getEffectArgs(clip->effectAt(i)), false);
                         }
@@ -2070,15 +2279,19 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
                     }
                 }
 
-                new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveClips);
-                m_commandStack->push(moveClips);
+                MoveGroupCommand *move = new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false);
+                m_commandStack->push(move);
 
-                QPointF top = m_selectionGroup->sceneBoundingRect().topLeft();
+                //QPointF top = group->sceneBoundingRect().topLeft();
                 //QPointF oldpos = m_selectionGroup->scenePos();
                 //kDebug()<<"SELECTION GRP POS: "<<m_selectionGroup->scenePos()<<", TOP: "<<top;
-                m_selectionGroup->setPos(top);
-                m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
-                m_selectionGroupInfo.track = m_selectionGroup->track();
+                //group->setPos(top);
+                //TODO: get rid of the 3 lines below
+                if (m_selectionGroup) {
+                    m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
+                    m_selectionGroupInfo.track = m_selectionGroup->track();
+                }
+                m_document->setModified(true);
             }
         }
 
@@ -2131,7 +2344,17 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
             }
 
         }
-
+        if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+            // Item was resized, rebuild group;
+            AbstractGroupItem *group = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+            QList <QGraphicsItem *> children = group->childItems();
+            m_document->clipManager()->removeGroup(group);
+            scene()->destroyItemGroup(group);
+            for (int i = 0; i < children.count(); i++) {
+                children.at(i)->setSelected(true);
+            }
+            groupSelectedItems(false, true);
+        }
         //m_document->renderer()->doRefresh();
     } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) {
         // resize end
@@ -2182,6 +2405,17 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
                 m_commandStack->push(command);
             }
         }
+        if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+            // Item was resized, rebuild group;
+            AbstractGroupItem *group = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+            QList <QGraphicsItem *> children = group->childItems();
+            m_document->clipManager()->removeGroup(group);
+            scene()->destroyItemGroup(group);
+            for (int i = 0; i < children.count(); i++) {
+                children.at(i)->setSelected(true);
+            }
+            groupSelectedItems(false, true);
+        }
         //m_document->renderer()->doRefresh();
     } else if (m_operationMode == FADEIN) {
         // resize fade in effect
@@ -2276,7 +2510,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
     }
 
     emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) ? static_cast <Transition *>(m_dragItem) : NULL);
-    m_document->setModified(true);
+    if (m_operationMode != NONE && m_operationMode != MOVE) m_document->setModified(true);
     m_operationMode = NONE;
 }
 
@@ -2307,19 +2541,49 @@ void CustomTrackView::deleteClip(ItemInfo info) {
 }
 
 void CustomTrackView::deleteSelectedClips() {
+    resetSelectionGroup();
     QList<QGraphicsItem *> itemList = scene()->selectedItems();
     if (itemList.count() == 0) {
         emit displayMessage(i18n("Select clip to delete"), ErrorMessage);
         return;
     }
+    scene()->clearSelection();
     QUndoCommand *deleteSelected = new QUndoCommand();
     deleteSelected->setText(i18n("Delete selected items"));
+    bool resetGroup = false;
+
+    // expand & destroy groups
+    for (int i = 0; i < itemList.count(); i++) {
+        if (itemList.at(i)->type() == GROUPWIDGET) {
+            QList<QGraphicsItem *> children = itemList.at(i)->childItems();
+            itemList += children;
+            QList <ItemInfo> clipInfos;
+            QList <ItemInfo> transitionInfos;
+            GenTime currentPos = GenTime(m_cursorPos, m_document->fps());
+            for (int j = 0; j < children.count(); j++) {
+                if (children.at(j)->type() == AVWIDGET) {
+                    AbstractClipItem *clip = static_cast <AbstractClipItem *>(children.at(j));
+                    if (!clip->isItemLocked()) clipInfos.append(clip->info());
+                } else if (children.at(j)->type() == TRANSITIONWIDGET) {
+                    AbstractClipItem *clip = static_cast <AbstractClipItem *>(children.at(j));
+                    if (!clip->isItemLocked()) transitionInfos.append(clip->info());
+                }
+            }
+            if (clipInfos.count() > 0) {
+                new GroupClipsCommand(this, clipInfos, transitionInfos, false, true, deleteSelected);
+            }
+        }
+    }
+
+
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
+            if (item->parentItem()) resetGroup = true;
             new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected);
         } else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
             Transition *item = static_cast <Transition *>(itemList.at(i));
+            if (item->parentItem()) resetGroup = true;
             ItemInfo info;
             info.startPos = item->startPos();
             info.endPos = item->endPos();
@@ -2339,14 +2603,16 @@ void CustomTrackView::changeClipSpeed() {
     QUndoCommand *changeSelected = new QUndoCommand();
     changeSelected->setText("Edit clip speed");
     int count = 0;
+    int percent = -1;
+    bool ok;
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
             ItemInfo info = item->info();
-            bool ok;
-            int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 300, 1, &ok);
+            if (percent == -1) percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 10000, 1, &ok);
+            if (!ok) break;
             double speed = (double) percent / 100.0;
-            if (ok && item->speed() != speed) {
+            if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) {
                 count++;
                 new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected);
             }
@@ -2366,12 +2632,13 @@ void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const
     }
     info.track = m_document->tracksCount() - item->track();
     int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, baseclip->producer());
-    kDebug() << "//CH CLIP SPEED: " << speed << "x" << oldspeed << ", END POS: " << endPos;
-    item->setSpeed(speed);
-    item->updateRectGeometry();
-    if (item->cropDuration().frames(m_document->fps()) > endPos)
-        item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed);
-    m_document->setModified(true);
+    if (endPos >= 0) {
+        item->setSpeed(speed);
+        item->updateRectGeometry();
+        if (item->cropDuration().frames(m_document->fps()) > endPos)
+            item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed);
+        m_document->setModified(true);
+    } else emit displayMessage(i18n("Invalid clip"), ErrorMessage);
 }
 
 void CustomTrackView::cutSelectedClips() {
@@ -2380,7 +2647,9 @@ void CustomTrackView::cutSelectedClips() {
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
-            if (currentPos > item->startPos() && currentPos <  item->endPos()) {
+            if (item->parentItem() && item->parentItem() != m_selectionGroup) {
+                emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage);
+            } else if (currentPos > item->startPos() && currentPos <  item->endPos()) {
                 RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos, true);
                 m_commandStack->push(command);
             }
@@ -2388,6 +2657,81 @@ void CustomTrackView::cutSelectedClips() {
     }
 }
 
+void CustomTrackView::groupClips(bool group) {
+    QList<QGraphicsItem *> itemList = scene()->selectedItems();
+    QList <ItemInfo> clipInfos;
+    QList <ItemInfo> transitionInfos;
+    GenTime currentPos = GenTime(m_cursorPos, m_document->fps());
+
+    // Expand groups
+    int max = itemList.count();
+    for (int i = 0; i < max; i++) {
+        if (itemList.at(i)->type() == GROUPWIDGET) {
+            itemList += itemList.at(i)->childItems();
+        }
+    }
+
+    for (int i = 0; i < itemList.count(); i++) {
+        if (itemList.at(i)->type() == AVWIDGET) {
+            AbstractClipItem *clip = static_cast <AbstractClipItem *>(itemList.at(i));
+            if (!clip->isItemLocked()) clipInfos.append(clip->info());
+        } else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
+            AbstractClipItem *clip = static_cast <AbstractClipItem *>(itemList.at(i));
+            if (!clip->isItemLocked()) transitionInfos.append(clip->info());
+        }
+    }
+    if (clipInfos.count() > 0) {
+        GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group, true);
+        m_commandStack->push(command);
+    }
+}
+
+void CustomTrackView::doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo> transitionInfos, bool group) {
+    resetSelectionGroup();
+    m_scene->clearSelection();
+    if (!group) {
+        for (int i = 0; i < clipInfos.count(); i++) {
+            ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track);
+            if (clip == NULL) continue;
+            if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) {
+                AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(clip->parentItem());
+                m_document->clipManager()->removeGroup(grp);
+                scene()->destroyItemGroup(grp);
+            }
+            clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+        }
+        for (int i = 0; i < transitionInfos.count(); i++) {
+            Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track);
+            if (tr == NULL) continue;
+            if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) {
+                AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(tr->parentItem());
+                m_document->clipManager()->removeGroup(grp);
+                scene()->destroyItemGroup(grp);
+            }
+            tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+        }
+        m_document->setModified(true);
+        return;
+    }
+
+    QList <QGraphicsItemGroup *> groups;
+    for (int i = 0; i < clipInfos.count(); i++) {
+        ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track);
+        if (clip) {
+            clip->setSelected(true);
+        }
+    }
+    for (int i = 0; i < transitionInfos.count(); i++) {
+        Transition *clip = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track);
+        if (clip) {
+            clip->setSelected(true);
+        }
+    }
+
+    groupSelectedItems(false, true);
+    m_document->setModified(true);
+}
+
 void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) {
     DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId);
     if (baseclip == NULL) {
@@ -2417,10 +2761,15 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i
     baseclip->addReference();
     m_document->updateClip(baseclip->getId());
     info.track = m_document->tracksCount() - info.track;
-    m_document->renderer()->mltInsertClip(info, xml, baseclip->producer(info.track));
+    Mlt::Producer *prod;
+    if (item->isAudioOnly()) prod = baseclip->audioProducer(info.track);
+    else if (item->isVideoOnly()) prod = baseclip->videoProducer();
+    else prod = baseclip->producer(info.track);
+    m_document->renderer()->mltInsertClip(info, xml, prod);
     for (int i = 0; i < item->effectsCount(); i++) {
         m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false);
     }
+    m_document->setModified(true);
     m_document->renderer()->doRefresh();
 }
 
@@ -2468,7 +2817,7 @@ ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) {
 }
 
 ClipItem *CustomTrackView::getClipItemAt(int pos, int track) {
-    QList<QGraphicsItem *> list = scene()->items(QPointF(pos , track * m_tracksHeight + m_tracksHeight / 2));
+    QList<QGraphicsItem *> list = scene()->items(QPointF(pos, track * m_tracksHeight + m_tracksHeight / 2));
     ClipItem *clip = NULL;
     for (int i = 0; i < list.size(); i++) {
         if (list.at(i)->type() == AVWIDGET) {
@@ -2484,8 +2833,8 @@ ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) {
     return getClipItemAt(framepos, track);
 }
 
-Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) {
-    QList<QGraphicsItem *> list = scene()->items(QPointF(pos.frames(m_document->fps()), (track + 1) * m_tracksHeight));
+Transition *CustomTrackView::getTransitionItemAt(int pos, int track) {
+    QList<QGraphicsItem *> list = scene()->items(QPointF(pos, (track + 1) * m_tracksHeight));
     Transition *clip = NULL;
     for (int i = 0; i < list.size(); i++) {
         if (list.at(i)->type() == TRANSITIONWIDGET) {
@@ -2496,6 +2845,10 @@ Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) {
     return clip;
 }
 
+Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) {
+    return getTransitionItemAt(pos.frames(m_document->fps()), track);
+}
+
 Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) {
     int framepos = (int)(pos.frames(m_document->fps()));
     QList<QGraphicsItem *> list = scene()->items(QPointF(framepos - 1, (track + 1) * m_tracksHeight));
@@ -2531,7 +2884,12 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) {
         kDebug() << "----------------  ERROR, CANNOT find clip to move at.. ";
         return;
     }
-    bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - start.track), (int)(m_document->tracksCount() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), item->baseClip()->producer(end.track));
+    Mlt::Producer *prod;
+    if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(end.track);
+    else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer();
+    else prod = item->baseClip()->producer(end.track);
+
+    bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - start.track), (int)(m_document->tracksCount() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), prod);
     if (success) {
         bool snap = KdenliveSettings::snaptopoints();
         KdenliveSettings::setSnaptopoints(false);
@@ -2555,6 +2913,7 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) {
             }
         }
         KdenliveSettings::setSnaptopoints(snap);
+        m_document->setModified(true);
     } else {
         // undo last move and emit error message
         emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage);
@@ -2564,20 +2923,29 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) {
 
 void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> startTransition, const GenTime offset, const int trackOffset, bool reverseMove) {
     // Group Items
-    kDebug() << "// GROUP MOVE; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset;
+    kDebug() << "//GRP MOVE, REVERS:" << reverseMove;
+    kDebug() << "// GROUP MOV; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset;
     resetSelectionGroup();
     m_scene->clearSelection();
+    QList<QGraphicsItem *> itemList = items();
+    for (int i = 0; i < itemList.count(); i++) {
+        if (itemList.at(i)->type() == AVWIDGET)
+            kDebug() << "ITEM " << i << ": " << static_cast <AbstractClipItem *>(itemList.at(i))->startPos().frames(25) << ",REEL: " << itemList.at(i)->scenePos();
+    }
+
     for (int i = 0; i < startClip.count(); i++) {
         if (reverseMove) {
             startClip[i].startPos = startClip.at(i).startPos - offset;
             startClip[i].track = startClip.at(i).track - trackOffset;
         }
+        //kDebug()<<"//LKING FR CLIP AT:"<<startClip.at(i).startPos.frames(25)<<", TK:"<<startClip.at(i).track;
         ClipItem *clip = getClipItemAt(startClip.at(i).startPos, startClip.at(i).track);
         if (clip) {
             clip->setItemLocked(false);
-            clip->setSelected(true);
+            if (clip->parentItem()) clip->parentItem()->setSelected(true);
+            else clip->setSelected(true);
             m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos);
-        }
+        } else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25);
     }
     for (int i = 0; i < startTransition.count(); i++) {
         if (reverseMove) {
@@ -2587,28 +2955,33 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
         Transition *tr = getTransitionItemAt(startTransition.at(i).startPos, startTransition.at(i).track);
         if (tr) {
             tr->setItemLocked(false);
-            tr->setSelected(true);
+            if (tr->parentItem()) tr->parentItem()->setSelected(true);
+            else tr->setSelected(true);
             m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML());
-        }
+        } else kDebug() << "//MISSING TRANSITION AT: " << startTransition.at(i).startPos.frames(25);
     }
-    groupSelectedItems();
+    groupSelectedItems(true);
     if (m_selectionGroup) {
-        QPointF pos = m_selectionGroup->pos();
-        qreal posx = pos.x() + offset.frames(m_document->fps());
-        qreal posy = pos.y() + trackOffset * (qreal) m_tracksHeight;
         bool snap = KdenliveSettings::snaptopoints();
         KdenliveSettings::setSnaptopoints(false);
 
-        m_selectionGroup->setPos(posx, posy);
+        m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset * (qreal) m_tracksHeight);
 
-        QPointF top = m_selectionGroup->sceneBoundingRect().topLeft();
-        m_selectionGroup->setPos(top);
-        m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
-        m_selectionGroupInfo.track = m_selectionGroup->track();
+        kDebug() << "%% GRP NEW POS: " << m_selectionGroup->scenePos().x();
 
         QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+        // Expand groups
+        int max = children.count();
+        for (int i = 0; i < max; i++) {
+            if (children.at(i)->type() == GROUPWIDGET) {
+                children += children.at(i)->childItems();
+            }
+        }
+        kDebug() << "// GRP MOVE; FOUND CHILDREN:" << children.count();
+
         for (int i = 0; i < children.count(); i++) {
             // re-add items in correct place
+            if (children.at(i)->type() != AVWIDGET && children.at(i)->type() != TRANSITIONWIDGET) continue;
             AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
             item->updateItem();
             ItemInfo info = item->info();
@@ -2620,8 +2993,13 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
             if (item->type() == AVWIDGET) {
                 ClipItem *clip = static_cast <ClipItem*>(item);
                 info.track = m_document->tracksCount() - info.track;
-                m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track));
-            } else {
+                Mlt::Producer *prod;
+                if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track);
+                else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
+                else prod = clip->baseClip()->producer(info.track);
+                m_document->renderer()->mltInsertClip(info, clip->xml(), prod);
+                kDebug() << "// inserting new clp: " << info.startPos.frames(25);
+            } else if (item->type() == TRANSITIONWIDGET) {
                 Transition *tr = static_cast <Transition*>(item);
                 int newTrack = tr->transitionEndTrack();
                 kDebug() << "/// TRANSITION CURR TRK: " << newTrack;
@@ -2635,8 +3013,14 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
             }
         }
         KdenliveSettings::setSnaptopoints(snap);
-    }
+    } else kDebug() << "///////// WARNING; NO GROUP TO MOVE";
 
+    kDebug() << "///////// DONE+++++++++++++";
+    itemList = items();
+    for (int i = 0; i < itemList.count(); i++) {
+        if (itemList.at(i)->type() == AVWIDGET)
+            kDebug() << "ITEM " << i << ": " << static_cast <AbstractClipItem *>(itemList.at(i))->startPos().frames(25) << ",REEL: " << itemList.at(i)->scenePos();
+    }
 }
 
 void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) {
@@ -2669,6 +3053,7 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) {
     KdenliveSettings::setSnaptopoints(snap);
     item->updateTransitionEndTrack(getPreviousVideoTrack(end.track));
     m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos);
+    if (m_dragItem && m_dragItem == item) emit transitionItemSelected(item);
 }
 
 void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) {
@@ -3039,7 +3424,7 @@ void CustomTrackView::slotDeleteAllGuides() {
     QUndoCommand *deleteAll = new QUndoCommand();
     deleteAll->setText("Delete all guides");
     for (int i = 0; i < m_guides.count(); i++) {
-        EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll);
+        new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll);
     }
     m_commandStack->push(deleteAll);
 }
@@ -3062,27 +3447,15 @@ void CustomTrackView::setScale(double scaleFactor) {
         delete m_animation;
         m_animation = NULL;
     }
-    /*double pos = cursorPos() / m_scale;
-    m_scale = scaleFactor;
-    m_scene->setScale(m_scale);
-    int vert = verticalScrollBar()->value();
-    kDebug() << " HHHHHHHH  SCALING: " << m_scale;
-    QList<QGraphicsItem *> itemList = items();
-    for (int i = 0; i < itemList.count(); i++) {
-        if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
-            AbstractClipItem *clip = (AbstractClipItem *)itemList.at(i);
-            clip->setRect(0, 0, (qreal) clip->duration().frames(m_document->fps()) * m_scale - .5, clip->rect().height());
-            clip->setPos((qreal) clip->startPos().frames(m_document->fps()) * m_scale, clip->pos().y());
-        }
-    }
 
-    for (int i = 0; i < m_guides.count(); i++) {
-        m_guides.at(i)->updatePosition(m_scale);
+    //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height());
+    setMatrix(matrix);
+    int diff = sceneRect().width() - m_projectDuration;
+    if (diff * matrix.m11() < 50) {
+        if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height());
+        else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height());
     }
 
-    setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
-    updateCursorPos();*/
-    setMatrix(matrix);
     centerOn(QPointF(cursorPos(), m_tracksHeight));
     //verticalScrollBar()->setValue(vert);*/
 }
@@ -3360,9 +3733,11 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con
         }
         if (clips.count() == 1 && allowOutsideCursor) return static_cast < ClipItem *>(clips.at(0));
         for (int i = 0; i < clips.count(); ++i) {
-            if (clips.at(i)->type() == AVWIDGET)
+            if (clips.at(i)->type() == AVWIDGET) {
                 item = static_cast < ClipItem *>(clips.at(i));
-            if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) return item;
+                if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos)
+                    return item;
+            }
         }
     }
     return NULL;
@@ -3674,4 +4049,191 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim
     }
 }
 
+
+void CustomTrackView::loadGroups(const QDomNodeList groups) {
+    for (int i = 0; i < groups.count(); i++) {
+        QDomNodeList children = groups.at(i).childNodes();
+        scene()->clearSelection();
+        for (int nodeindex = 0; nodeindex < children.count(); nodeindex++) {
+            QDomNode n = children.item(nodeindex);
+            QDomElement elem = n.toElement();
+            int pos = elem.attribute("position").toInt();
+            int track = elem.attribute("track").toInt();
+            if (elem.tagName() == "clipitem") {
+                ClipItem *clip = getClipItemAt(pos, track); //m_document->tracksCount() - transitiontrack);
+                if (clip) clip->setSelected(true);
+            } else {
+                Transition *clip = getTransitionItemAt(pos, track); //m_document->tracksCount() - transitiontrack);
+                if (clip) clip->setSelected(true);
+            }
+        }
+        groupSelectedItems(false, true);
+    }
+}
+
+void CustomTrackView::splitAudio() {
+    resetSelectionGroup();
+    QList<QGraphicsItem *> selection = scene()->selectedItems();
+    if (selection.isEmpty()) {
+        emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+        return;
+    }
+    QUndoCommand *splitCommand = new QUndoCommand();
+    splitCommand->setText(i18n("Split audio"));
+    for (int i = 0; i < selection.count(); i++) {
+        if (selection.at(i)->type() == AVWIDGET) {
+            ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
+            if (clip->clipType() == AV || clip->clipType() == PLAYLIST) {
+                if (clip->parentItem()) {
+                    emit displayMessage(i18n("Cannot split audio of grouped clips"), ErrorMessage);
+                } else {
+                    new SplitAudioCommand(this, clip->track(), clip->startPos(), true, splitCommand);
+                }
+            }
+        }
+    }
+    m_commandStack->push(splitCommand);
+}
+
+void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) {
+    ClipItem *clip = getClipItemAt(pos, track);
+    if (clip == NULL) {
+        kDebug() << "// Cannot find clip to split!!!";
+        return;
+    }
+    if (split) {
+        int start = pos.frames(m_document->fps());
+        int freetrack = m_document->tracksCount() - track - 1;
+        for (; freetrack > 0; freetrack--) {
+            kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
+            if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK) {
+                kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
+                if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->duration().frames(m_document->fps())) {
+                    kDebug() << "FOUND SPACE ON TRK: " << freetrack;
+                    break;
+                }
+            }
+        }
+        kDebug() << "GOT TRK: " << track;
+        if (freetrack == 0) {
+            emit displayMessage(i18n("No empty space to put clip audio"), ErrorMessage);
+        } else {
+            ItemInfo info;
+            info.startPos = clip->startPos();
+            info.endPos = clip->endPos();
+            info.cropStart = clip->cropStart();
+            info.track = m_document->tracksCount() - freetrack;
+            addClip(clip->xml(), clip->clipProducer(), info, clip->effectList());
+            scene()->clearSelection();
+            clip->setSelected(true);
+            ClipItem *audioClip = getClipItemAt(start, info.track);
+            if (audioClip) {
+                clip->setVideoOnly(true);
+                m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer());
+                m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track));
+                audioClip->setSelected(true);
+                audioClip->setAudioOnly(true);
+                groupSelectedItems(false, true);
+            }
+        }
+    } else {
+        // unsplit clip: remove audio part and change video part to normal clip
+        if (clip->parentItem() == NULL || clip->parentItem()->type() != GROUPWIDGET) {
+            kDebug() << "//CANNOT FIND CLP GRP";
+            return;
+        }
+        AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(clip->parentItem());
+        QList<QGraphicsItem *> children = grp->childItems();
+        if (children.count() != 2) {
+            kDebug() << "//SOMETHING IS WRONG WITH CLP GRP";
+            return;
+        }
+        for (int i = 0; i < children.count(); i++) {
+            if (children.at(i) != clip) {
+                ClipItem *clp = static_cast <ClipItem *>(children.at(i));
+                ItemInfo info = clip->info();
+                deleteClip(clp->info());
+                clip->setVideoOnly(false);
+                m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, info.startPos.frames(m_document->fps()), clip->baseClip()->producer(info.track));
+                break;
+            }
+        }
+        m_document->clipManager()->removeGroup(grp);
+        scene()->destroyItemGroup(grp);
+    }
+}
+
+void CustomTrackView::videoOnly() {
+    resetSelectionGroup();
+    QList<QGraphicsItem *> selection = scene()->selectedItems();
+    if (selection.isEmpty()) {
+        emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+        return;
+    }
+    QUndoCommand *videoCommand = new QUndoCommand();
+    videoCommand->setText(i18n("Video only"));
+    for (int i = 0; i < selection.count(); i++) {
+        if (selection.at(i)->type() == AVWIDGET) {
+            ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
+            if (clip->clipType() == AV || clip->clipType() == PLAYLIST) {
+                if (clip->parentItem()) {
+                    emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage);
+                } else {
+                    new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), true, false, clip->isVideoOnly(), clip->isAudioOnly(), true, videoCommand);
+                }
+            }
+        }
+    }
+    m_commandStack->push(videoCommand);
+}
+
+void CustomTrackView::audioOnly() {
+    resetSelectionGroup();
+    QList<QGraphicsItem *> selection = scene()->selectedItems();
+    if (selection.isEmpty()) {
+        emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+        return;
+    }
+    QUndoCommand *videoCommand = new QUndoCommand();
+    videoCommand->setText(i18n("Audio only"));
+    for (int i = 0; i < selection.count(); i++) {
+        if (selection.at(i)->type() == AVWIDGET) {
+            ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
+            if (clip->clipType() == AV || clip->clipType() == PLAYLIST) {
+                if (clip->parentItem()) {
+                    emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage);
+                } else {
+                    new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, true, clip->isVideoOnly(), clip->isAudioOnly(), true, videoCommand);
+                }
+            }
+        }
+    }
+    m_commandStack->push(videoCommand);
+}
+
+void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool videoOnly, bool audioOnly) {
+    ClipItem *clip = getClipItemAt(pos, track);
+    if (clip == NULL) {
+        kDebug() << "// Cannot find clip to split!!!";
+        return;
+    }
+    if (videoOnly) {
+        int start = pos.frames(m_document->fps());
+        clip->setVideoOnly(true);
+        clip->setAudioOnly(false);
+        m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer());
+    } else if (audioOnly) {
+        int start = pos.frames(m_document->fps());
+        clip->setAudioOnly(true);
+        clip->setVideoOnly(false);
+        m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->audioProducer(track));
+    } else {
+        int start = pos.frames(m_document->fps());
+        clip->setAudioOnly(false);
+        clip->setVideoOnly(false);
+        m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track));
+    }
+    clip->update();
+}
+
 #include "customtrackview.moc"