connect(rectBColor, SIGNAL(clicked()), this, SLOT(rectChanged()));
connect(rectLineWidth, SIGNAL(valueChanged(int)), this, SLOT(rectChanged()));
- connect(startViewportX, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
+ /*connect(startViewportX, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
connect(startViewportY, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
connect(startViewportSize, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
connect(endViewportX, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
connect(endViewportY, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
- connect(endViewportSize, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
+ connect(endViewportSize, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));*/
connect(zValue, SIGNAL(valueChanged(int)), this, SLOT(zIndexChanged(int)));
connect(itemzoom, SIGNAL(valueChanged(int)), this, SLOT(itemScaled(int)));
connect(itemrotate, SIGNAL(valueChanged(int)), this, SLOT(itemRotate(int)));
connect(itemhcenter, SIGNAL(clicked()), this, SLOT(itemHCenter()));
connect(itemvcenter, SIGNAL(clicked()), this, SLOT(itemVCenter()));
+ connect(itemtop, SIGNAL(clicked()), this, SLOT(itemTop()));
+ connect(itembottom, SIGNAL(clicked()), this, SLOT(itemBottom()));
+ connect(itemleft, SIGNAL(clicked()), this, SLOT(itemLeft()));
+ connect(itemright, SIGNAL(clicked()), this, SLOT(itemRight()));
connect(origin_x_left, SIGNAL(clicked()), this, SLOT(slotOriginXClicked()));
connect(origin_y_top, SIGNAL(clicked()), this, SLOT(slotOriginYClicked()));
itemhcenter->setToolTip(i18n("Align item horizontally"));
itemvcenter->setIcon(KIcon("kdenlive-align-vert"));
itemvcenter->setToolTip(i18n("Align item vertically"));
+ itemtop->setIcon(KIcon("kdenlive-align-top"));
+ itemtop->setToolTip(i18n("Align item to top"));
+ itembottom->setIcon(KIcon("kdenlive-align-bottom"));
+ itembottom->setToolTip(i18n("Align item to bottom"));
+ itemright->setIcon(KIcon("kdenlive-align-right"));
+ itemright->setToolTip(i18n("Align item to right"));
+ itemleft->setIcon(KIcon("kdenlive-align-left"));
+ itemleft->setToolTip(i18n("Align item to left"));
+
QHBoxLayout *layout = new QHBoxLayout;
frame_toolbar->setLayout(layout);
qtrans.scale(2.0, 2.0);
m_frameImage->setTransform(qtrans);
m_frameImage->setZValue(-1200);
- m_frameImage->setFlags(QGraphicsItem::ItemClipsToShape);
+ m_frameImage->setFlags(0);
displayBackgroundFrame();
graphicsView->scene()->addItem(m_frameImage);
m_frameBorder->setPen(framepen);
m_frameBorder->setZValue(-1100);
m_frameBorder->setBrush(Qt::transparent);
- m_frameBorder->setFlags(QGraphicsItem::ItemClipsToShape);
+ m_frameBorder->setFlags(0);
graphicsView->scene()->addItem(m_frameBorder);
// mbd: load saved settings
readChoices();
- initViewports();
graphicsView->show();
//graphicsView->setRenderHint(QPainter::Antialiasing);
graphicsView->setInteractive(true);
//graphicsView->resize(400, 300);
kDebug() << "// TITLE WIDGWT: " << graphicsView->viewport()->width() << "x" << graphicsView->viewport()->height();
//toolBox->setItemEnabled(2, false);
+ m_startViewport = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
+ m_endViewport = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
+ m_startViewport->setData(0, m_frameWidth);
+ m_startViewport->setData(1, m_frameHeight);
+ m_endViewport->setData(0, m_frameWidth);
+ m_endViewport->setData(1, m_frameHeight);
+
if (!url.isEmpty()) loadTitle(url);
else {
slotTextTool();
QTimer::singleShot(200, this, SLOT(slotAdjustZoom()));
}
+ initAnimation();
+ connect(anim_start, SIGNAL(toggled(bool)), this, SLOT(slotAnimStart(bool)));
+ connect(anim_end, SIGNAL(toggled(bool)), this, SLOT(slotAnimEnd(bool)));
}
TitleWidget::~TitleWidget()
break;
}
}
+
enableToolbars(t);
+ if (t == TITLE_RECTANGLE && (l.at(0) == m_endViewport || l.at(0) == m_startViewport)) {
+ //graphicsView->centerOn(l.at(0));
+ t = TITLE_NONE;
+ }
showToolbars(t);
if (l.size() > 0) {
QPixmap bg(m_frameWidth / 2, m_frameHeight / 2);
QPixmap pattern(20, 20);
pattern.fill();
+ QColor bgcolor(210, 210, 210);
QPainter p;
p.begin(&pattern);
- p.fillRect(QRect(0, 0, 10, 10), QColor(210, 210, 210));
- p.fillRect(QRect(10, 10, 20, 20), QColor(210, 210, 210));
+ p.fillRect(QRect(0, 0, 10, 10), bgcolor);
+ p.fillRect(QRect(10, 10, 20, 20), bgcolor);
p.end();
QBrush br(pattern);
}
}
-void TitleWidget::initViewports()
+void TitleWidget::initAnimation()
{
- m_startViewport = new QGraphicsPolygonItem(QPolygonF(QRectF(0, 0, 0, 0)));
- m_endViewport = new QGraphicsPolygonItem(QPolygonF(QRectF(0, 0, 0, 0)));
-
+ align_box->setEnabled(false);
QPen startpen(Qt::DotLine);
QPen endpen(Qt::DashDotLine);
startpen.setColor(QColor(100, 200, 100, 140));
m_startViewport->setPen(startpen);
m_endViewport->setPen(endpen);
- startViewportSize->setValue(100);
- endViewportSize->setValue(100);
-
m_startViewport->setZValue(-1000);
m_endViewport->setZValue(-1000);
- m_startViewport->setFlags(/*QGraphicsItem::ItemIsMovable|*/QGraphicsItem::ItemIsSelectable);
- m_endViewport->setFlags(/*QGraphicsItem::ItemIsMovable|*/QGraphicsItem::ItemIsSelectable);
+ m_startViewport->setFlags(0);
+ m_endViewport->setFlags(0);
graphicsView->scene()->addItem(m_startViewport);
graphicsView->scene()->addItem(m_endViewport);
+
+ connect(keep_aspect, SIGNAL(toggled(bool)), this, SLOT(slotKeepAspect(bool)));
+ connect(resize50, SIGNAL(clicked()), this, SLOT(slotResize50()));
+ connect(resize100, SIGNAL(clicked()), this, SLOT(slotResize100()));
+ connect(resize200, SIGNAL(clicked()), this, SLOT(slotResize200()));
}
void TitleWidget::slotUpdateZoom(int pos)
enableToolbars(TITLE_NONE);
if (blockX) origin_x_left->blockSignals(false);
if (blockY) origin_y_top->blockSignals(false);
+ itemzoom->setEnabled(false);
+ itemrotate->setEnabled(false);
} else if (l.size() == 1) {
+ if (l.at(0) != m_startViewport && l.at(0) != m_endViewport) {
+ itemzoom->setEnabled(true);
+ itemrotate->setEnabled(true);
+ } else {
+ itemzoom->setEnabled(false);
+ itemrotate->setEnabled(false);
+ }
if (l.at(0)->type() == TEXTITEM) {
showToolbars(TITLE_TEXT);
QGraphicsTextItem* i = static_cast <QGraphicsTextItem *>(l.at(0));
//if (l[0]->hasFocus())
- toolBox->setCurrentIndex(0);
+ //toolBox->setCurrentIndex(0);
//toolBox->setItemEnabled(2, true);
font_size->blockSignals(true);
font_family->blockSignals(true);
showToolbars(TITLE_RECTANGLE);
settingUp = true;
QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(l.at(0));
- toolBox->setCurrentIndex(0);
- //toolBox->setItemEnabled(3, true);
- rectFAlpha->setValue(rec->pen().color().alpha());
- rectBAlpha->setValue(rec->brush().color().alpha());
- //kDebug() << rec->brush().color().alpha();
- QColor fcol = rec->pen().color();
- QColor bcol = rec->brush().color();
- //fcol.setAlpha(255);
- //bcol.setAlpha(255);
- rectFColor->setColor(fcol);
- rectBColor->setColor(bcol);
- settingUp = false;
- rectLineWidth->setValue(rec->pen().width());
+ if (rec == m_startViewport || rec == m_endViewport) {
+ /*toolBox->setCurrentIndex(3);
+ toolBox->widget(0)->setEnabled(false);
+ toolBox->widget(1)->setEnabled(false);*/
+ enableToolbars(TITLE_NONE);
+ } else {
+ /*toolBox->widget(0)->setEnabled(true);
+ toolBox->widget(1)->setEnabled(true);
+ toolBox->setCurrentIndex(0);*/
+ //toolBox->setItemEnabled(3, true);
+ rectFAlpha->setValue(rec->pen().color().alpha());
+ rectBAlpha->setValue(rec->brush().color().alpha());
+ //kDebug() << rec->brush().color().alpha();
+ QColor fcol = rec->pen().color();
+ QColor bcol = rec->brush().color();
+ //fcol.setAlpha(255);
+ //bcol.setAlpha(255);
+ rectFColor->setColor(fcol);
+ rectBColor->setColor(bcol);
+ settingUp = false;
+ rectLineWidth->setValue(rec->pen().width());
+ enableToolbars(TITLE_RECTANGLE);
+ }
updateAxisButtons(l.at(0));
updateCoordinates(rec);
updateDimension(rec);
- enableToolbars(TITLE_RECTANGLE);
} else if (l.at(0)->type() == IMAGEITEM) {
showToolbars(TITLE_IMAGE);
QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
if (l.size() == 1) {
QGraphicsItem *item = l.at(0);
- QRectF br;
- br = item->sceneBoundingRect();
+ QRectF br = item->sceneBoundingRect();
int width = (int)br.width();
int newPos = (int)((m_frameWidth - width) / 2);
newPos += item->pos().x() - br.left(); // Check item transformation
QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
if (l.size() == 1) {
QGraphicsItem *item = l.at(0);
- QRectF br;
- br = item->sceneBoundingRect();
+ QRectF br = item->sceneBoundingRect();
int height = (int)br.height();
int newPos = (int)((m_frameHeight - height) / 2);
newPos += item->pos().y() - br.top(); // Check item transformation
}
}
+void TitleWidget::itemTop()
+{
+ QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+ if (l.size() == 1) {
+ QGraphicsItem *item = l.at(0);
+ QRectF br = item->sceneBoundingRect();
+ double diff;
+ if (br.top() > 0) diff = -br.top();
+ else diff = -br.bottom();
+ item->moveBy(0, diff);
+ updateCoordinates(item);
+ }
+}
+
+void TitleWidget::itemBottom()
+{
+ QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+ if (l.size() == 1) {
+ QGraphicsItem *item = l.at(0);
+ QRectF br = item->sceneBoundingRect();
+ double diff;
+ if (br.bottom() > m_frameHeight) diff = m_frameHeight - br.top();
+ else diff = m_frameHeight - br.bottom();
+ item->moveBy(0, diff);
+ updateCoordinates(item);
+ }
+}
+
+void TitleWidget::itemLeft()
+{
+ QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+ if (l.size() == 1) {
+ QGraphicsItem *item = l.at(0);
+ QRectF br = item->sceneBoundingRect();
+ double diff;
+ if (br.left() > 0) diff = -br.left();
+ else diff = -br.right();
+ item->moveBy(diff, 0);
+ updateCoordinates(item);
+ }
+}
+
+void TitleWidget::itemRight()
+{
+ QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+ if (l.size() == 1) {
+ QGraphicsItem *item = l.at(0);
+ QRectF br = item->sceneBoundingRect();
+ double diff;
+ if (br.right() < m_frameWidth) diff = m_frameWidth - br.right();
+ else diff = m_frameWidth - br.left();
+ item->moveBy(diff, 0);
+ updateCoordinates(item);
+ }
+}
+
void TitleWidget::setupViewports()
{
//double aspect_ratio = 4.0 / 3.0;//read from project
//better zoom centered, but render uses only the created rect, so no problem to change the zoom function
- QRectF sp(0, 0, startViewportSize->value() * m_frameWidth / 100.0 , startViewportSize->value()* m_frameHeight / 100.0);
+ /*QRectF sp(0, 0, startViewportSize->value() * m_frameWidth / 100.0 , startViewportSize->value()* m_frameHeight / 100.0);
QRectF ep(0, 0, endViewportSize->value() * m_frameWidth / 100.0, endViewportSize->value() * m_frameHeight / 100.0);
// use a polygon thiat uses 16:9 and 4:3 rects forpreview the size in all aspect ratios ?
QPolygonF spoly(sp);
m_endViewport->setData(0, endViewportX->value());
m_endViewport->setData(1, endViewportY->value());
m_endViewport->setData(2, endViewportSize->value());
- }
+ }*/
}
void TitleWidget::loadTitle(KUrl url)
KIO::NetAccess::removeTempFile(tmpfile);
}
setXml(doc);
+
/*int out;
m_count = m_titledocument.loadDocument(url, m_startViewport, m_endViewport, &out) + 1;
adjustFrameSize();
void TitleWidget::saveTitle(KUrl url)
{
+ if (anim_start->isChecked()) slotAnimStart(false);
+ if (anim_end->isChecked()) slotAnimEnd(false);
if (url.isEmpty()) url = KFileDialog::getSaveUrl(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this, i18n("Save Title"));
if (!url.isEmpty()) {
if (m_titledocument.saveDocument(url, m_startViewport, m_endViewport, m_tc.getFrameCount(title_duration->text())) == false)
{
QDomDocument doc = m_titledocument.xml(m_startViewport, m_endViewport);
doc.documentElement().setAttribute("out", m_tc.getFrameCount(title_duration->text()));
- if (cropImage->isChecked()) {
- doc.documentElement().setAttribute("crop", 1);
- }
return doc;
}
else title_duration->setText(m_tc.getTimecode(GenTime(5000)));*/
QDomElement e = doc.documentElement();
- cropImage->setChecked(e.hasAttribute("crop"));
m_transformations.clear();
QList <QGraphicsItem *> items = graphicsView->scene()->items();
const double PI = 4.0 * atan(1.0);
horizontalSlider->blockSignals(false);
kcolorbutton->blockSignals(false);
- startViewportX->setValue(m_startViewport->data(0).toInt());
+ /*startViewportX->setValue(m_startViewport->data(0).toInt());
startViewportY->setValue(m_startViewport->data(1).toInt());
startViewportSize->setValue(m_startViewport->data(2).toInt());
endViewportX->setValue(m_endViewport->data(0).toInt());
endViewportY->setValue(m_endViewport->data(1).toInt());
- endViewportSize->setValue(m_endViewport->data(2).toInt());
+ endViewportSize->setValue(m_endViewport->data(2).toInt());*/
QTimer::singleShot(200, this, SLOT(slotAdjustZoom()));
slotSelectTool();
}
-const QRect TitleWidget::renderedRect()
-{
- int minX = 0;
- int minY = 0;
- int maxX = m_frameWidth;
- int maxY = m_frameHeight;
- if (!cropImage->isChecked()) {
- m_scene->removeItem(m_startViewport);
- m_scene->removeItem(m_endViewport);
- QRect boundingRect = m_scene->itemsBoundingRect().toRect();
- if (boundingRect.left() < 0) minX = boundingRect.left();
- if (boundingRect.top() < 0) minY = boundingRect.top();
- if (boundingRect.right() > maxX) maxX = boundingRect.right();
- if (boundingRect.bottom() > maxY) maxY = boundingRect.bottom();
- if (minX < 0) {
- maxX = maxX - minX;
- }
- if (minY < 0) {
- maxY = maxY - minY;
- }
- }
- QRect rect(minX, minY, maxX, maxY);
- return rect;
-}
-
-QImage TitleWidget::renderedPixmap()
-{
- QRect rect = renderedRect();
- QImage pix(rect.width(), rect.height(), QImage::Format_ARGB32);
- pix.fill(Qt::transparent);
- QPainter painter(&pix);
- painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::HighQualityAntialiasing);
- m_scene->clearTextSelection();
- QPen framepen = m_frameBorder->pen();
- m_frameBorder->setPen(Qt::NoPen);
- m_startViewport->setVisible(false);
- m_endViewport->setVisible(false);
- m_frameImage->setVisible(false);
-
- m_scene->render(&painter, QRectF(), rect); //QRectF(minX, minY, maxX - minX, maxY - minY));
- painter.end();
- m_frameBorder->setPen(framepen);
- m_startViewport->setVisible(true);
- m_endViewport->setVisible(true);
- m_frameImage->setVisible(true);
- return pix;
-}
-
/** \brief Connected to the accepted signal - calls writeChoices */
void TitleWidget::slotAccepted()
{
+ if (anim_start->isChecked()) slotAnimStart(false);
+ if (anim_end->isChecked()) slotAnimEnd(false);
writeChoices();
}
titleConfig.writeEntry("background_color", kcolorbutton->color());
titleConfig.writeEntry("background_alpha", horizontalSlider->value());
- titleConfig.writeEntry("crop_image", cropImage->isChecked());
-
//! \todo Not sure if I should sync - it is probably safe to do it
config->sync();
kcolorbutton->setColor(titleConfig.readEntry("background_color", kcolorbutton->color()));
horizontalSlider->setValue(titleConfig.readEntry("background_alpha", horizontalSlider->value()));
-
- cropImage->setChecked(titleConfig.readEntry("crop_image", cropImage->isChecked()));
}
void TitleWidget::adjustFrameSize()
displayBackgroundFrame();
}
+void TitleWidget::slotAnimStart(bool anim)
+{
+ if (anim && anim_end->isChecked()) {
+ anim_end->setChecked(false);
+ m_endViewport->setZValue(-1000);
+ m_endViewport->setBrush(QBrush());
+ }
+ slotSelectTool();
+ QList<QGraphicsItem *> list = m_scene->items();
+ for (int i = 0; i < list.count(); i++) {
+ if (list.at(i)->zValue() > -1000) {
+ list.at(i)->setFlag(QGraphicsItem::ItemIsMovable, !anim);
+ list.at(i)->setFlag(QGraphicsItem::ItemIsSelectable, !anim);
+ }
+ }
+ align_box->setEnabled(anim);
+ itemzoom->setEnabled(!anim);
+ itemrotate->setEnabled(!anim);
+ frame_toolbar->setEnabled(!anim);
+ rect_properties->setEnabled(!anim);
+ if (anim) {
+ keep_aspect->setChecked(!m_startViewport->data(0).isNull());
+ m_startViewport->setZValue(1100);
+ QColor col = m_startViewport->pen().color();
+ col.setAlpha(100);
+ m_startViewport->setBrush(col);
+ m_startViewport->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ m_startViewport->setSelected(true);
+ selectionChanged();
+ slotSelectTool();
+ } else {
+ m_startViewport->setZValue(-1000);
+ m_startViewport->setBrush(QBrush());
+ m_startViewport->setFlags(0);
+ }
+
+}
+
+void TitleWidget::slotAnimEnd(bool anim)
+{
+ if (anim && anim_start->isChecked()) {
+ anim_start->setChecked(false);
+ m_startViewport->setZValue(-1000);
+ m_startViewport->setBrush(QBrush());
+ }
+ slotSelectTool();
+ QList<QGraphicsItem *> list = m_scene->items();
+ for (int i = 0; i < list.count(); i++) {
+ if (list.at(i)->zValue() > -1000) {
+ list.at(i)->setFlag(QGraphicsItem::ItemIsMovable, !anim);
+ list.at(i)->setFlag(QGraphicsItem::ItemIsSelectable, !anim);
+ }
+ }
+ align_box->setEnabled(anim);
+ itemzoom->setEnabled(!anim);
+ itemrotate->setEnabled(!anim);
+ frame_toolbar->setEnabled(!anim);
+ rect_properties->setEnabled(!anim);
+ if (anim) {
+ keep_aspect->setChecked(!m_endViewport->data(0).isNull());
+ m_endViewport->setZValue(1100);
+ QColor col = m_endViewport->pen().color();
+ col.setAlpha(100);
+ m_endViewport->setBrush(col);
+ m_endViewport->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ m_endViewport->setSelected(true);
+ selectionChanged();
+ slotSelectTool();
+ } else {
+ m_endViewport->setZValue(-1000);
+ m_endViewport->setBrush(QBrush());
+ m_endViewport->setFlags(0);
+ }
+}
+
+void TitleWidget::slotKeepAspect(bool keep)
+{
+ if (m_endViewport->zValue() == 1100) {
+ m_endViewport->setData(0, keep == true ? m_frameWidth : QVariant());
+ m_endViewport->setData(1, keep == true ? m_frameHeight : QVariant());
+ } else {
+ m_startViewport->setData(0, keep == true ? m_frameWidth : QVariant());
+ m_startViewport->setData(1, keep == true ? m_frameHeight : QVariant());
+ }
+}
+
+void TitleWidget::slotResize50()
+{
+ if (m_endViewport->zValue() == 1100) {
+ m_endViewport->setRect(0, 0, m_frameWidth / 2, m_frameHeight / 2);
+ } else m_startViewport->setRect(0, 0, m_frameWidth / 2, m_frameHeight / 2);
+}
+
+void TitleWidget::slotResize100()
+{
+ if (m_endViewport->zValue() == 1100) {
+ m_endViewport->setRect(0, 0, m_frameWidth, m_frameHeight);
+ } else m_startViewport->setRect(0, 0, m_frameWidth, m_frameHeight);
+}
+
+void TitleWidget::slotResize200()
+{
+ if (m_endViewport->zValue() == 1100) {
+ m_endViewport->setRect(0, 0, m_frameWidth * 2, m_frameHeight * 2);
+ } else m_startViewport->setRect(0, 0, m_frameWidth * 2, m_frameHeight * 2);
+}
projects / kdenlive / blobdiff