From: <j-...@us...> - 2009-03-07 17:56:04
|
Revision: 3110 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3110&view=rev Author: j-b-m Date: 2009-03-07 17:55:55 +0000 (Sat, 07 Mar 2009) Log Message: ----------- [PATCH by Ray Lehtiniemi] Fix another potentially uninitialized use warning Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-03-07 17:55:01 UTC (rev 3109) +++ trunk/kdenlive/src/customtrackview.cpp 2009-03-07 17:55:55 UTC (rev 3110) @@ -3396,9 +3396,11 @@ } 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; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-03-07 18:09:22
|
Revision: 3116 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3116&view=rev Author: j-b-m Date: 2009-03-07 18:09:17 +0000 (Sat, 07 Mar 2009) Log Message: ----------- [PATCH by Ray Lehtiniemi] An incorrect variable in a debug output statement Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-03-07 18:08:44 UTC (rev 3115) +++ trunk/kdenlive/src/customtrackview.cpp 2009-03-07 18:09:17 UTC (rev 3116) @@ -1126,7 +1126,7 @@ } 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); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-03-07 22:57:49
|
Revision: 3118 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3118&view=rev Author: j-b-m Date: 2009-03-07 22:57:47 +0000 (Sat, 07 Mar 2009) Log Message: ----------- [PATCH by Ray Lehtiniemi] Fix up =/== confusion Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-03-07 18:09:59 UTC (rev 3117) +++ trunk/kdenlive/src/customtrackview.cpp 2009-03-07 22:57:47 UTC (rev 3118) @@ -81,7 +81,7 @@ 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), m_changeSpeedAction(NULL), m_pasteEffectsAction(NULL) { if (doc) m_commandStack = doc->commandStack(); - else m_commandStack == NULL; + else m_commandStack = NULL; setMouseTracking(true); setAcceptDrops(true); m_animationTimer = new QTimeLine(800); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-03-12 23:03:19
|
Revision: 3144 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3144&view=rev Author: j-b-m Date: 2009-03-12 23:03:16 +0000 (Thu, 12 Mar 2009) Log Message: ----------- Improve management of timeline empty space: http://www.kdenlive.org:80/mantis/view.php?id=714 Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-03-12 22:51:37 UTC (rev 3143) +++ trunk/kdenlive/src/customtrackview.cpp 2009-03-12 23:03:16 UTC (rev 3144) @@ -1537,8 +1537,11 @@ } 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; } @@ -3147,27 +3150,15 @@ 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);*/ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-03-20 13:39:38
|
Revision: 3167 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3167&view=rev Author: j-b-m Date: 2009-03-20 13:39:34 +0000 (Fri, 20 Mar 2009) Log Message: ----------- allow undo of clip split audio Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-03-20 13:20:52 UTC (rev 3166) +++ trunk/kdenlive/src/customtrackview.cpp 2009-03-20 13:39:34 UTC (rev 3167) @@ -4084,6 +4084,31 @@ } } } + 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() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-03-23 20:59:44
|
Revision: 3173 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3173&view=rev Author: j-b-m Date: 2009-03-23 20:59:26 +0000 (Mon, 23 Mar 2009) Log Message: ----------- Fix group deletion Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-03-23 12:34:54 UTC (rev 3172) +++ trunk/kdenlive/src/customtrackview.cpp 2009-03-23 20:59:26 UTC (rev 3173) @@ -2530,10 +2530,37 @@ emit displayMessage(i18n("Select clip to delete"), ErrorMessage); return; } + resetSelectionGroup(); + 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; @@ -2549,7 +2576,6 @@ } } m_commandStack->push(deleteSelected); - if (resetGroup) resetSelectionGroup(); } void CustomTrackView::changeClipSpeed() { @@ -4083,29 +4109,28 @@ 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; - } + } 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; - } - } + 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); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-03-23 22:42:34
|
Revision: 3176 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3176&view=rev Author: j-b-m Date: 2009-03-23 22:42:26 +0000 (Mon, 23 Mar 2009) Log Message: ----------- Fix deletion of project clips Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-03-23 22:09:07 UTC (rev 3175) +++ trunk/kdenlive/src/customtrackview.cpp 2009-03-23 22:42:26 UTC (rev 3176) @@ -1973,6 +1973,7 @@ } void CustomTrackView::deleteClip(const QString &clipId) { + resetSelectionGroup(); QList<QGraphicsItem *> itemList = items(); QUndoCommand *deleteCommand = new QUndoCommand(); deleteCommand->setText(i18n("Delete timeline clips")); @@ -1982,12 +1983,16 @@ ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { 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); - //delete item; } } } - + if (count == 0) delete deleteCommand; + else m_commandStack->push(deleteCommand); } void CustomTrackView::setCursorPos(int pos, bool seek) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-03-23 23:42:19
|
Revision: 3178 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3178&view=rev Author: j-b-m Date: 2009-03-23 23:42:13 +0000 (Mon, 23 Mar 2009) Log Message: ----------- Fix typo preventing the spacer tool to work correctly with transition: http://www.kdenlive.org:80/mantis/view.php?id=532 Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-03-23 22:59:24 UTC (rev 3177) +++ trunk/kdenlive/src/customtrackview.cpp 2009-03-23 23:42:13 UTC (rev 3178) @@ -2081,7 +2081,7 @@ trackClipStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps()); } else if (item->type() == TRANSITIONWIDGET) { 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)) + 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()); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-03-25 20:42:34
|
Revision: 3183 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3183&view=rev Author: j-b-m Date: 2009-03-25 20:42:31 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Do not allow cutting clip in a group, small fix in rubber selection Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-03-25 20:28:48 UTC (rev 3182) +++ trunk/kdenlive/src/customtrackview.cpp 2009-03-25 20:42:31 UTC (rev 3183) @@ -560,7 +560,7 @@ if (event->modifiers() & Qt::ShiftModifier && collisionList.count() == 0) { setDragMode(QGraphicsView::RubberBandDrag); - if (!event->modifiers() & Qt::ControlModifier) { + if (!(event->modifiers() & Qt::ControlModifier)) { resetSelectionGroup(); scene()->clearSelection(); } @@ -669,6 +669,11 @@ 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); @@ -2621,7 +2626,10 @@ 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); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-04-10 08:42:32
|
Revision: 3271 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3271&view=rev Author: j-b-m Date: 2009-04-10 08:42:26 +0000 (Fri, 10 Apr 2009) Log Message: ----------- comment out useless code Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-04-10 08:37:45 UTC (rev 3270) +++ trunk/kdenlive/src/customtrackview.cpp 2009-04-10 08:42:26 UTC (rev 3271) @@ -135,7 +135,8 @@ KIcon spacerIcon("kdenlive-spacer-tool"); m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22)); verticalScrollBar()->setTracking(true); - connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); + // Line below was supposed to scroll guides label with scrollbar, not implemented yet + //connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); connect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(slotCheckMouseScrolling())); m_scrollTimer.setInterval(100); m_scrollTimer.setSingleShot(true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-04-13 11:14:07
|
Revision: 3290 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3290&view=rev Author: j-b-m Date: 2009-04-13 11:13:57 +0000 (Mon, 13 Apr 2009) Log Message: ----------- Clear effect stack when deleting a clip: http://www.kdenlive.org/mantis/view.php?id=763 Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-04-13 04:44:48 UTC (rev 3289) +++ trunk/kdenlive/src/customtrackview.cpp 2009-04-13 11:13:57 UTC (rev 3290) @@ -2683,6 +2683,7 @@ 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); + emit clipItemSelected(NULL); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *item = static_cast <Transition *>(itemList.at(i)); if (item->parentItem()) resetGroup = true; @@ -2691,8 +2692,10 @@ info.endPos = item->endPos(); info.track = item->track(); new AddTransitionCommand(this, info, item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); + emit transitionItemSelected(NULL); } } + m_commandStack->push(deleteSelected); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-04-14 21:55:24
|
Revision: 3306 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3306&view=rev Author: j-b-m Date: 2009-04-14 21:55:19 +0000 (Tue, 14 Apr 2009) Log Message: ----------- Fix un/locking of track when timeline is scrolled vertically Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-04-14 21:28:58 UTC (rev 3305) +++ trunk/kdenlive/src/customtrackview.cpp 2009-04-14 21:55:19 UTC (rev 3306) @@ -1844,10 +1844,10 @@ { /*for (int i = 0; i < m_document->tracksCount(); i++) kDebug() << "TRK " << i << " STATE: " << m_document->trackInfoAt(i).isMute << m_document->trackInfoAt(i).isBlind;*/ - int tracknumber = m_document->tracksCount() - ix; - m_document->switchTrackAudio(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isMute); - kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber - 1).isMute << m_document->trackInfoAt(tracknumber - 1).isBlind; - m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); + int tracknumber = m_document->tracksCount() - ix - 1; + m_document->switchTrackAudio(tracknumber, !m_document->trackInfoAt(tracknumber).isMute); + kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isMute << m_document->trackInfoAt(tracknumber).isBlind; + m_document->renderer()->mltChangeTrackState(tracknumber + 1, m_document->trackInfoAt(tracknumber).isMute, m_document->trackInfoAt(tracknumber).isBlind); m_document->setModified(true); } @@ -1864,7 +1864,7 @@ int tracknumber = m_document->tracksCount() - ix - 1; m_document->switchTrackLock(tracknumber, lock); emit doTrackLock(ix, lock); - QList<QGraphicsItem *> selection = items(0, ix * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x(), m_tracksHeight / 2 - 2); + QList<QGraphicsItem *> selection = m_scene->items(0, ix * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 2); for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() != AVWIDGET && selection.at(i)->type() != TRANSITIONWIDGET) continue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-04-14 22:01:50
|
Revision: 3307 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3307&view=rev Author: j-b-m Date: 2009-04-14 22:01:41 +0000 (Tue, 14 Apr 2009) Log Message: ----------- remove debug code Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-04-14 21:55:19 UTC (rev 3306) +++ trunk/kdenlive/src/customtrackview.cpp 2009-04-14 22:01:41 UTC (rev 3307) @@ -3047,15 +3047,10 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> startTransition, const GenTime offset, const int trackOffset, bool reverseMove) { // Group Items - kDebug() << "//GRP MOVE, REVERS:" << reverseMove; - kDebug() << "// GROUP MOV; 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) { @@ -3138,13 +3133,6 @@ } 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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-04-20 17:04:19
|
Revision: 3325 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3325&view=rev Author: j-b-m Date: 2009-04-20 17:04:03 +0000 (Mon, 20 Apr 2009) Log Message: ----------- Show timeline position during clip dragging: http://www.kdenlive.org/mantis/view.php?id=506 Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-04-20 12:21:03 UTC (rev 3324) +++ trunk/kdenlive/src/customtrackview.cpp 2009-04-20 17:04:03 UTC (rev 3325) @@ -1604,6 +1604,7 @@ const QPointF pos = mapToScene(event->pos()); if (m_selectionGroup && m_clipDrag) { m_selectionGroup->setPos(pos.x(), pos.y()); + emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5)); event->setDropAction(Qt::MoveAction); event->acceptProposedAction(); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-04 23:14:15
|
Revision: 3359 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3359&view=rev Author: j-b-m Date: 2009-05-04 23:14:08 +0000 (Mon, 04 May 2009) Log Message: ----------- Fix locked clip after undoing "split audio": http://www.kdenlive.org/mantis/view.php?id=813 Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-05-04 22:15:09 UTC (rev 3358) +++ trunk/kdenlive/src/customtrackview.cpp 2009-05-04 23:14:08 UTC (rev 3359) @@ -4393,6 +4393,7 @@ break; } } + clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); m_document->clipManager()->removeGroup(grp); scene()->destroyItemGroup(grp); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-04 23:51:06
|
Revision: 3360 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3360&view=rev Author: j-b-m Date: 2009-05-04 23:51:02 +0000 (Mon, 04 May 2009) Log Message: ----------- Correctly show track type when changing a track (based on patch by jimmygilles): http://www.kdenlive.org/mantis/view.php?id=807 Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-05-04 23:14:08 UTC (rev 3359) +++ trunk/kdenlive/src/customtrackview.cpp 2009-05-04 23:51:02 UTC (rev 3360) @@ -4147,6 +4147,11 @@ view.track_nb->setValue(ix); d.setWindowTitle(i18n("Change Track Type")); + if (m_document->trackInfoAt(m_document->tracksCount() - ix - 1).type == VIDEOTRACK) + view.video_track->setChecked(true); + else + view.audio_track->setChecked(true); + if (d.exec() == QDialog::Accepted) { TrackInfo info; info.isLocked = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xz...@us...> - 2009-05-08 13:27:21
|
Revision: 3368 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3368&view=rev Author: xzhayon Date: 2009-05-08 13:27:15 +0000 (Fri, 08 May 2009) Log Message: ----------- enable dragging of an unselected clip: http://www.kdenlive.org/mantis/view.php?id=515 Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-05-08 11:54:09 UTC (rev 3367) +++ trunk/kdenlive/src/customtrackview.cpp 2009-05-08 13:27:15 UTC (rev 3368) @@ -768,12 +768,7 @@ 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 { + if (event->modifiers() == Qt::ControlModifier || !(m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))) { resetSelectionGroup(); if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection(); dragGroup = NULL; @@ -792,6 +787,10 @@ m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); } + // If clicked item is selected, allow move + //event->accept(); + if (event->modifiers() != Qt::ControlModifier && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected())) && m_operationMode == NONE) QGraphicsView::mousePressEvent(event); + 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())); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xz...@us...> - 2009-05-11 15:18:58
|
Revision: 3373 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3373&view=rev Author: xzhayon Date: 2009-05-11 15:18:49 +0000 (Mon, 11 May 2009) Log Message: ----------- two fixes: - when clicking on a guide that's over a clip, move the guide - if two or more clips are selected and you move a guide, don't move the clips Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-05-11 11:23:41 UTC (rev 3372) +++ trunk/kdenlive/src/customtrackview.cpp 2009-05-11 15:18:49 UTC (rev 3373) @@ -614,19 +614,22 @@ return; } - if (event->button() == Qt::LeftButton && collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) { - // a guide item was pressed - collisionList.at(0)->setFlag(QGraphicsItem::ItemIsMovable, true); - m_dragItem = NULL; - m_dragGuide = (Guide *) collisionList.at(0); - collision = true; - m_operationMode = MOVEGUIDE; - // deselect all clips so that only the guide will move - m_scene->clearSelection(); - resetSelectionGroup(); - updateSnapPoints(NULL); - QGraphicsView::mousePressEvent(event); - return; + for (int i = 0; event->button() == Qt::LeftButton && i < collisionList.count(); ++i) { + // if a guide and a clip were pressed, just move the guide + if (collisionList.at(i)->type() == GUIDEITEM) { + // a guide item was pressed + collisionList.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); + m_dragItem = NULL; + m_dragGuide = (Guide *) collisionList.at(i); + collision = true; + m_operationMode = MOVEGUIDE; + // deselect all clips so that only the guide will move + m_scene->clearSelection(); + resetSelectionGroup(false); + updateSnapPoints(NULL); + QGraphicsView::mousePressEvent(event); + return; + } } // Find first clip, transition or group under mouse This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-25 23:39:47
|
Revision: 3423 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3423&view=rev Author: j-b-m Date: 2009-05-25 23:39:44 +0000 (Mon, 25 May 2009) Log Message: ----------- Fix issue with rendering guides: http://www.kdenlive.org/mantis/view.php?id=861 Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-05-25 23:23:36 UTC (rev 3422) +++ trunk/kdenlive/src/customtrackview.cpp 2009-05-25 23:39:44 UTC (rev 3423) @@ -2171,6 +2171,7 @@ EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), newPos, m_dragGuide->label(), false); m_commandStack->push(command); m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x(), m_document->fps())); + m_document->syncGuides(m_guides); } m_dragGuide = NULL; m_dragItem = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-29 17:12:14
|
Revision: 3445 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3445&view=rev Author: j-b-m Date: 2009-05-29 17:12:00 +0000 (Fri, 29 May 2009) Log Message: ----------- Fix several small issues with timeline clip/group move Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-05-29 10:42:18 UTC (rev 3444) +++ trunk/kdenlive/src/customtrackview.cpp 2009-05-29 17:12:00 UTC (rev 3445) @@ -574,6 +574,15 @@ kDebug() << "mousePressEvent STARTED"; setFocus(Qt::MouseFocusReason); m_menuPosition = QPoint(); + + // special cases (middle click button or ctrl / shift click + if (event->button() == Qt::MidButton) { + m_document->renderer()->switchPlay(); + m_blockRefresh = false; + m_operationMode = NONE; + return; + } + m_blockRefresh = true; m_dragItem = NULL; m_dragGuide = NULL; @@ -586,14 +595,6 @@ } m_clickEvent = event->pos(); - // special cases (middle click button or ctrl / shift click - if (event->button() == Qt::MidButton) { - m_document->renderer()->switchPlay(); - m_blockRefresh = false; - m_operationMode = NONE; - return; - } - // check item under mouse QList<QGraphicsItem *> collisionList = items(m_clickEvent); @@ -781,7 +782,11 @@ 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()))) { + bool itemSelected = false; + if (m_dragItem->isSelected()) itemSelected = true; + else if (m_dragItem->parentItem() && m_dragItem->parentItem()->isSelected()) itemSelected = true; + else if (dragGroup && dragGroup->isSelected()) itemSelected = true; + if (event->modifiers() == Qt::ControlModifier || itemSelected == false) { resetSelectionGroup(); if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection(); dragGroup = NULL; @@ -802,7 +807,7 @@ // If clicked item is selected, allow move //event->accept(); - if (event->modifiers() != Qt::ControlModifier && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected())) && m_operationMode == NONE) QGraphicsView::mousePressEvent(event); + if (event->modifiers() != Qt::ControlModifier && itemSelected && m_operationMode == NONE) QGraphicsView::mousePressEvent(event); 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())); @@ -1696,6 +1701,7 @@ Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "composite"), true); if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) { scene()->addItem(tr); + tr->setSelected(true); } else { emit displayMessage(i18n("Cannot add transition"), ErrorMessage); delete tr; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-02 21:08:20
|
Revision: 3482 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3482&view=rev Author: j-b-m Date: 2009-06-02 21:08:13 +0000 (Tue, 02 Jun 2009) Log Message: ----------- Allow moving unselected clips in timeline: http://www.kdenlive.org:80/mantis/view.php?id=881 Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-06-02 20:54:14 UTC (rev 3481) +++ trunk/kdenlive/src/customtrackview.cpp 2009-06-02 21:08:13 UTC (rev 3482) @@ -806,8 +806,7 @@ } // If clicked item is selected, allow move - //event->accept(); - if (event->modifiers() != Qt::ControlModifier && itemSelected && m_operationMode == NONE) QGraphicsView::mousePressEvent(event); + if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))) QGraphicsView::mousePressEvent(event); 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())); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-10 17:16:19
|
Revision: 3510 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3510&view=rev Author: j-b-m Date: 2009-06-10 17:16:02 +0000 (Wed, 10 Jun 2009) Log Message: ----------- Don't add double transitions on redo: http://www.kdenlive.org/mantis/view.php?id=905 Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-06-10 17:13:59 UTC (rev 3509) +++ trunk/kdenlive/src/customtrackview.cpp 2009-06-10 17:16:02 UTC (rev 3510) @@ -1695,6 +1695,9 @@ resetSelectionGroup(); m_scene->clearSelection(); bool hasVideoClip = false; + QUndoCommand *addCommand = new QUndoCommand(); + addCommand->setText(i18n("Add timeline clip")); + 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; @@ -1703,8 +1706,8 @@ } else { updateClipTypeActions(NULL); } - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false); - m_commandStack->push(command); + + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, addCommand); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); ItemInfo info = item->info(); @@ -1713,26 +1716,19 @@ bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; if (isLocked) item->setItemLocked(true); - if (item->baseClip()->isTransparent()) { + if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) { // add transparency transition - int endTrack = getPreviousVideoTrack(info.track); - Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "composite"), true); - if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) { - scene()->addItem(tr); - tr->setSelected(true); - } else { - emit displayMessage(i18n("Cannot add transition"), ErrorMessage); - delete tr; - } + new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), MainWindow::transitions.getEffectByTag("composite", "composite"), false, true, addCommand); } info.track = m_document->tracksCount() - item->track(); m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track())); item->setSelected(true); } + m_commandStack->push(addCommand); m_document->setModified(true); m_changeSpeedAction->setEnabled(hasVideoClip); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); - groupSelectedItems(true); + if (items.count() > 1) groupSelectedItems(true); } else QGraphicsView::dropEvent(event); setFocus(); } @@ -2710,7 +2706,7 @@ item->baseClip()->removeReference(); m_document->updateClip(item->baseClip()->getId()); - if (item->baseClip()->isTransparent()) { + /*if (item->baseClip()->isTransparent()) { // also remove automatic transition Transition *tr = getTransitionItemAt(info.startPos, info.track); if (tr && tr->isAutomatic()) { @@ -2718,7 +2714,7 @@ scene()->removeItem(tr); delete tr; } - } + }*/ scene()->removeItem(item); if (m_dragItem == item) m_dragItem = NULL; delete item; @@ -2762,7 +2758,6 @@ } } - for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast <ClipItem *>(itemList.at(i)); @@ -2772,11 +2767,7 @@ } 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(); - info.track = item->track(); - new AddTransitionCommand(this, info, item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); + new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); emit transitionItemSelected(NULL); } } @@ -2944,18 +2935,6 @@ bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; if (isLocked) item->setItemLocked(true); - if (item->baseClip()->isTransparent()) { - // add transparency transition - int endTrack = getPreviousVideoTrack(info.track); - Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "composite"), true); - if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) scene()->addItem(tr); - else { - emit displayMessage(i18n("Cannot add transition"), ErrorMessage); - delete tr; - } - - } - baseclip->addReference(); m_document->updateClip(baseclip->getId()); info.track = m_document->tracksCount() - info.track; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-14 10:15:32
|
Revision: 3533 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3533&view=rev Author: j-b-m Date: 2009-06-14 10:15:29 +0000 (Sun, 14 Jun 2009) Log Message: ----------- Fix unmovable groups Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-06-14 09:38:17 UTC (rev 3532) +++ trunk/kdenlive/src/customtrackview.cpp 2009-06-14 10:15:29 UTC (rev 3533) @@ -646,7 +646,7 @@ 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(); + // kDebug()<<"// KLIK FOUND GRP: "<<m_dragItem->sceneBoundingRect(); dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem()); } break; @@ -807,7 +807,7 @@ } // If clicked item is selected, allow move - if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))) QGraphicsView::mousePressEvent(event); + if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE/* && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))*/) QGraphicsView::mousePressEvent(event); 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())); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-14 14:45:52
|
Revision: 3537 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3537&view=rev Author: j-b-m Date: 2009-06-14 14:43:07 +0000 (Sun, 14 Jun 2009) Log Message: ----------- Set doc modified when changing clip type Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-06-14 14:37:57 UTC (rev 3536) +++ trunk/kdenlive/src/customtrackview.cpp 2009-06-14 14:43:07 UTC (rev 3537) @@ -4547,6 +4547,7 @@ m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track)); } clip->update(); + m_document->setModified(true); } void CustomTrackView::updateClipTypeActions(ClipItem *clip) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-17 21:04:06
|
Revision: 3562 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3562&view=rev Author: j-b-m Date: 2009-06-17 21:03:59 +0000 (Wed, 17 Jun 2009) Log Message: ----------- Fix crash when using spacer tool and no clip moving Modified Paths: -------------- trunk/kdenlive/src/customtrackview.cpp Modified: trunk/kdenlive/src/customtrackview.cpp =================================================================== --- trunk/kdenlive/src/customtrackview.cpp 2009-06-17 20:42:47 UTC (rev 3561) +++ trunk/kdenlive/src/customtrackview.cpp 2009-06-17 21:03:59 UTC (rev 3562) @@ -363,7 +363,7 @@ m_visualTip = NULL; QGraphicsView::mouseMoveEvent(event); return; - } else if (m_operationMode == SPACER && move) { + } else if (m_operationMode == SPACER && move && m_selectionGroup) { // spacer tool int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5); m_selectionGroup->setPos(mappedXPos + (((int) m_selectionGroup->boundingRect().topLeft().x() + 0.5) - mappedClick) , m_selectionGroup->pos().y()); @@ -713,7 +713,7 @@ // No item under click if (m_dragItem == NULL || m_tool == SPACERTOOL) { - resetSelectionGroup(); + resetSelectionGroup(false); setCursor(Qt::ArrowCursor); m_scene->clearSelection(); //event->accept(); @@ -733,9 +733,6 @@ kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" << 1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height(); } - resetSelectionGroup(false); - m_scene->clearSelection(); - for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { selection.at(i)->setSelected(true); @@ -2239,7 +2236,7 @@ m_dragGuide = NULL; m_dragItem = NULL; return; - } else if (m_operationMode == SPACER) { + } else if (m_operationMode == SPACER && m_selectionGroup) { int track; if (event->modifiers() != Qt::ControlModifier) { // We are moving all tracks This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |