svn path=/branches/KDE4/; revision=2049
if (durationDiff == GenTime()) return;
//kDebug() << "-- RESCALE: CROP=" << m_cropStart << ", DIFF = " << durationDiff;
if (durationDiff == GenTime()) return;
//kDebug() << "-- RESCALE: CROP=" << m_cropStart << ", DIFF = " << durationDiff;
- if (m_cropStart + durationDiff < GenTime() && type() == 70000) {
+ if (m_cropStart + durationDiff < GenTime() && type() == AVWIDGET) {
durationDiff = GenTime() - m_cropStart;
} else if (durationDiff >= m_cropDuration) {
durationDiff = m_cropDuration - GenTime(3, m_fps);
durationDiff = GenTime() - m_cropStart;
} else if (durationDiff >= m_cropDuration) {
durationDiff = m_cropDuration - GenTime(3, m_fps);
}
int ClipItem::type() const {
}
int ClipItem::type() const {
}
DocClipBase *ClipItem::baseClip() {
}
DocClipBase *ClipItem::baseClip() {
if (m_operationMode == MOVE) {
double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint);
kDebug() << "/////// MOVE CLIP, EVENT Y: ";//<<event->scenePos().y()<<", SCENE HEIGHT: "<<scene()->sceneRect().height();
if (m_operationMode == MOVE) {
double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint);
kDebug() << "/////// MOVE CLIP, EVENT Y: ";//<<event->scenePos().y()<<", SCENE HEIGHT: "<<scene()->sceneRect().height();
- int moveTrack = (int) mapToScene(event->pos() - QPoint(0, (m_dragItem->type() == 70001 ? 25 : 0))).y() / 50;
+ int moveTrack = (int) mapToScene(event->pos() - QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? 25 : 0))).y() / 50;
int currentTrack = m_dragItem->track();
if (moveTrack > m_tracksCount - 1) moveTrack = m_tracksCount - 1;
int currentTrack = m_dragItem->track();
if (moveTrack > m_tracksCount - 1) moveTrack = m_tracksCount - 1;
int i = 0;
QGraphicsRectItem *item = NULL;
for (int i = 0; i < itemList.count(); i++) {
int i = 0;
QGraphicsRectItem *item = NULL;
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == 70000 || itemList.at(i)->type() == 70001) {
+ if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
item = (QGraphicsRectItem*) itemList.at(i);
break;
}
item = (QGraphicsRectItem*) itemList.at(i);
break;
}
QList<QGraphicsItem *> collisionList = items(event->pos());
for (int i = 0; i < collisionList.size(); ++i) {
QGraphicsItem *item = collisionList.at(i);
QList<QGraphicsItem *> collisionList = items(event->pos());
for (int i = 0; i < collisionList.size(); ++i) {
QGraphicsItem *item = collisionList.at(i);
- if (item->type() == 70000 || item->type() == 70001) {
+ if (item->type() == AVWIDGET || item->type() == TRANSITIONWIDGET) {
// select item
if (!item->isSelected()) {
QList<QGraphicsItem *> itemList = items();
// select item
if (!item->isSelected()) {
QList<QGraphicsItem *> itemList = items();
}
m_dragItem = (AbstractClipItem *) item;
}
m_dragItem = (AbstractClipItem *) item;
- if (item->type() == 70000) {
+ if (item->type() == AVWIDGET) {
emit clipItemSelected((ClipItem*) m_dragItem);
}
m_clickPoint = mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale;
emit clipItemSelected((ClipItem*) m_dragItem);
}
m_clickPoint = mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale;
}
kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track;
for (int i = 0; i < itemList.count(); i++) {
}
kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track;
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == 70000 && (itemList.at(i)->isSelected() || track != -1)) {
+ if (itemList.at(i)->type() == AVWIDGET && (itemList.at(i)->isSelected() || track != -1)) {
ClipItem *item = (ClipItem *)itemList.at(i);
// the kdenlive_ix int is used to identify an effect in mlt's playlist, should
// not be changed
ClipItem *item = (ClipItem *)itemList.at(i);
// the kdenlive_ix int is used to identify an effect in mlt's playlist, should
// not be changed
void CustomTrackView::deleteClip(int clipId) {
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
void CustomTrackView::deleteClip(int clipId) {
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == 70000) {
+ 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->track(), item->startPos(), item->rect(), item->duration(), true, true);
ClipItem *item = (ClipItem *)itemList.at(i);
if (item->clipProducer() == clipId) {
AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->track(), item->startPos(), item->rect(), item->duration(), true, true);
if (selected) offset = selected->duration();
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
if (selected) offset = selected->duration();
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == 70000 && itemList.at(i) != selected) {
+ if (itemList.at(i)->type() == AVWIDGET && itemList.at(i) != selected) {
ClipItem *item = (ClipItem *)itemList.at(i);
GenTime start = item->startPos();
GenTime end = item->endPos();
ClipItem *item = (ClipItem *)itemList.at(i);
GenTime start = item->startPos();
GenTime end = item->endPos();
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == 70000 || itemList.at(i)->type() == 70001) {
+ if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
AbstractClipItem *clip = (AbstractClipItem *)itemList.at(i);
clip->setRect(clip->startPos().frames(m_document->fps()) * m_scale, clip->rect().y(), clip->duration().frames(m_document->fps()) * m_scale, clip->rect().height());
}
AbstractClipItem *clip = (AbstractClipItem *)itemList.at(i);
clip->setRect(clip->startPos().frames(m_document->fps()) * m_scale, clip->rect().y(), clip->duration().frames(m_document->fps()) * m_scale, clip->rect().height());
}
+#include "definitions.h"
LabelItem::LabelItem(QString text, QGraphicsRectItem *parent)
: QGraphicsSimpleTextItem(" " + text + " ", parent) {
LabelItem::LabelItem(QString text, QGraphicsRectItem *parent)
: QGraphicsSimpleTextItem(" " + text + " ", parent) {
}
int LabelItem::type() const {
}
int LabelItem::type() const {
painter->setClipPath(resultClipPath.intersected(clippath), Qt::IntersectClip);
//painter->fillPath(roundRectPath, brush()); //, QBrush(QColor(Qt::red)));
painter->setClipPath(resultClipPath.intersected(clippath), Qt::IntersectClip);
//painter->fillPath(roundRectPath, brush()); //, QBrush(QColor(Qt::red)));
- painter->fillRect(br.intersected(rectInView), QBrush(QColor(200, 200, 0, 160)));
+ painter->fillRect(br.intersected(rectInView), QBrush(QColor(200, 200, 0, 160)/*,Qt::Dense4Pattern*/));
painter->setClipRect(option->exposedRect);
painter->drawPath(resultClipPath.intersected(clippath));
}
int Transition::type() const {
painter->setClipRect(option->exposedRect);
painter->drawPath(resultClipPath.intersected(clippath));
}
int Transition::type() const {
+ return TRANSITIONWIDGET;
}
OPERATIONTYPE Transition::operationMode(QPointF pos, double scale) {
if (abs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;
}
OPERATIONTYPE Transition::operationMode(QPointF pos, double scale) {
if (abs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;