const int IMAGEITEM = 7;
const int RECTITEM = 3;
const int TEXTITEM = 8;
-static bool insertingValues=false;
+static bool insertingValues = false;
-TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWidget *parent) :
+TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render *render, QWidget *parent) :
QDialog(parent),
Ui::TitleWidget_UI(),
m_startViewport(NULL),
m_render(render),
m_count(0),
m_unicodeDialog(new UnicodeDialog(UnicodeDialog::InputHex)),
- m_projectTitlePath(projectTitlePath)
+ m_projectTitlePath(projectTitlePath),
+ m_tc(tc)
{
setupUi(this);
setFont(KGlobalSettings::toolBarFont());
//toolBox->setFont(KGlobalSettings::toolBarFont());
frame_properties->setEnabled(false);
rect_properties->setFixedHeight(frame_properties->height() + 4);
+ no_properties->setFixedHeight(frame_properties->height() + 4);
+ image_properties->setFixedHeight(frame_properties->height() + 4);
text_properties->setFixedHeight(frame_properties->height() + 4);
+ frame_properties->setFixedHeight(frame_toolbar->height());
m_frameWidth = render->renderWidth();
m_frameHeight = render->renderHeight();
+ showToolbars(TITLE_NONE);
+
+ //TODO: get default title duration instead of hardcoded one
+ title_duration->setText(m_tc.getTimecode(GenTime(5000 / 1000.0)));
connect(kcolorbutton, SIGNAL(clicked()), this, SLOT(slotChangeBackground())) ;
connect(horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(slotChangeBackground())) ;
connect(font_family, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(slotUpdateText())) ;
connect(font_size, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateText())) ;
connect(textAlpha, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateText()));
+ connect(font_weight_box, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateText()));
connect(rectFAlpha, SIGNAL(valueChanged(int)), this, SLOT(rectChanged()));
connect(rectBAlpha, SIGNAL(valueChanged(int)), this, SLOT(rectChanged()));
connect(value_h, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem()));
connect(buttonFitZoom, SIGNAL(clicked()), this, SLOT(slotAdjustZoom()));
connect(buttonRealSize, SIGNAL(clicked()), this, SLOT(slotZoomOneToOne()));
- connect(buttonBold, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
connect(buttonItalic, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
connect(buttonUnder, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
connect(buttonAlignLeft, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
// mbd
connect(this, SIGNAL(accepted()), this, SLOT(slotAccepted()));
+ font_weight_box->blockSignals(true);
+ font_weight_box->addItem(i18nc("Font style", "Light"), QFont::Light);
+ font_weight_box->addItem(i18nc("Font style", "Normal"), QFont::Normal);
+ font_weight_box->addItem(i18nc("Font style", "Demi-Bold"), QFont::DemiBold);
+ font_weight_box->addItem(i18nc("Font style", "Bold"), QFont::Bold);
+ font_weight_box->addItem(i18nc("Font style", "Black"), QFont::Black);
+ font_weight_box->setToolTip(i18n("Font weight"));
+ font_weight_box->setCurrentIndex(1);
+ font_weight_box->blockSignals(false);
+
buttonFitZoom->setIcon(KIcon("zoom-fit-best"));
buttonRealSize->setIcon(KIcon("zoom-original"));
- buttonBold->setIcon(KIcon("format-text-bold"));
buttonItalic->setIcon(KIcon("format-text-italic"));
buttonUnder->setIcon(KIcon("format-text-underline"));
buttonAlignCenter->setIcon(KIcon("format-justify-center"));
// initialize graphic scene
m_scene = new GraphicsSceneRectMove(this);
graphicsView->setScene(m_scene);
- m_titledocument.setScene(m_scene);
+ m_titledocument.setScene(m_scene, m_frameWidth, m_frameHeight);
connect(m_scene, SIGNAL(changed(QList<QRectF>)), this, SLOT(slotChanged()));
// a gradient background
readChoices();
initViewports();
- QTimer::singleShot(500, this, SLOT(slotAdjustZoom()));
graphicsView->show();
//graphicsView->setRenderHint(QPainter::Antialiasing);
graphicsView->setInteractive(true);
kDebug() << "// TITLE WIDGWT: " << graphicsView->viewport()->width() << "x" << graphicsView->viewport()->height();
//toolBox->setItemEnabled(2, false);
if (!url.isEmpty()) {
- m_count = m_titledocument.loadDocument(url, m_startViewport, m_endViewport) + 1;
+ double out;
+ m_count = m_titledocument.loadDocument(url, m_startViewport, m_endViewport, &out) + 1;
+ adjustFrameSize();
+ title_duration->setText(m_tc.getTimecode(GenTime(out)));
slotSelectTool();
} else {
slotTextTool();
}
-
- showToolbars(TITLE_NONE);
+ QTimer::singleShot(200, this, SLOT(slotAdjustZoom()));
}
TitleWidget::~TitleWidget()
{
m_scene->setTool(TITLE_TEXT);
showToolbars(TITLE_TEXT);
- checkButton(TITLE_TEXT);
+ checkButton(TITLE_TEXT);
}
void TitleWidget::slotRectTool()
{
m_scene->setTool(TITLE_RECTANGLE);
showToolbars(TITLE_RECTANGLE);
- checkButton(TITLE_RECTANGLE);
+ checkButton(TITLE_RECTANGLE);
}
void TitleWidget::slotSelectTool()
updateRotZoom(l.at(0));
}
- checkButton(TITLE_SELECT);
+ checkButton(TITLE_SELECT);
}
void TitleWidget::slotImageTool()
}
m_scene->setTool(TITLE_SELECT);
showToolbars(TITLE_SELECT);
- checkButton(TITLE_NONE);
+ checkButton(TITLE_NONE);
}
void TitleWidget::showToolbars(TITLETOOL toolType)
{
- bool bText = false;
- bool bRect = false;
- bool bImage = false;
- bool bNone = false;
-
switch (toolType) {
case TITLE_TEXT:
- bText = true;
+ rect_properties->setHidden(true);
+ image_properties->setHidden(true);
+ no_properties->setHidden(true);
+ text_properties->setHidden(false);
break;
case TITLE_RECTANGLE:
- bRect = true;
+ image_properties->setHidden(true);
+ no_properties->setHidden(true);
+ text_properties->setHidden(true);
+ rect_properties->setHidden(false);
break;
case TITLE_IMAGE:
- bImage = true;
- break;
+ no_properties->setHidden(true);
+ text_properties->setHidden(true);
+ rect_properties->setHidden(true);
+ image_properties->setHidden(false);
+ break;
default:
- bNone = true;
+ text_properties->setHidden(true);
+ rect_properties->setHidden(true);
+ image_properties->setHidden(true);
+ no_properties->setHidden(false);
break;
}
- text_properties->setHidden(!bText);
- rect_properties->setHidden(!bRect);
- image_properties->setHidden(!bImage);
- no_properties->setHidden(!bNone);
}
void TitleWidget::enableToolbars(TITLETOOL toolType)
bool bFrame = false;
bool bText = false;
bool bRect = false;
- bool bImage = false;
+ bool bImage = false;
bool bValue_w = false;
bool bValue_h = false;
bFrame = true;
bValue_w = true;
bValue_h = true;
- bImage = true;
+ bImage = true;
break;
default:
break;
frame_properties->setEnabled(bFrame);
text_properties->setEnabled(bText);
rect_properties->setEnabled(bRect);
- image_properties->setEnabled(bImage);
+ image_properties->setEnabled(bImage);
value_w->setEnabled(bValue_w);
value_h->setEnabled(bValue_h);
}
void TitleWidget::checkButton(TITLETOOL toolType)
{
- bool bSelect = false;
- bool bText = false;
- bool bRect = false;
- bool bImage = false;
-
- switch (toolType) {
- case TITLE_SELECT:
- bSelect = true;
- break;
- case TITLE_TEXT:
- bText = true;
- break;
- case TITLE_RECTANGLE:
- bRect = true;
- break;
- case TITLE_IMAGE:
- bImage = true;
- break;
- case TITLE_NONE:
- break;
- }
-
- m_buttonCursor->setChecked(bSelect);
- m_buttonText->setChecked(bText);
- m_buttonRect->setChecked(bRect);
- m_buttonImage->setChecked(bImage);
+ bool bSelect = false;
+ bool bText = false;
+ bool bRect = false;
+ bool bImage = false;
+
+ switch (toolType) {
+ case TITLE_SELECT:
+ bSelect = true;
+ break;
+ case TITLE_TEXT:
+ bText = true;
+ break;
+ case TITLE_RECTANGLE:
+ bRect = true;
+ break;
+ case TITLE_IMAGE:
+ bImage = true;
+ break;
+ case TITLE_NONE:
+ break;
+ }
+
+ m_buttonCursor->setChecked(bSelect);
+ m_buttonText->setChecked(bText);
+ m_buttonRect->setChecked(bRect);
+ m_buttonImage->setChecked(bImage);
}
void TitleWidget::displayBackgroundFrame()
void TitleWidget::slotNewRect(QGraphicsRectItem * rect)
{
- updateAxisButtons(rect); // back to default
-
+ updateAxisButtons(rect); // back to default
+
QColor f = rectFColor->color();
f.setAlpha(rectFAlpha->value());
QPen penf(f);
void TitleWidget::slotNewText(QGraphicsTextItem *tt)
{
- updateAxisButtons(tt); // back to default
-
+ updateAxisButtons(tt); // back to default
+
QFont font = font_family->currentFont();
font.setPixelSize(font_size->value());
// mbd: issue 551:
- font.setBold(buttonBold->isChecked());
+ font.setWeight(font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
font.setItalic(buttonItalic->isChecked());
font.setUnderline(buttonUnder->isChecked());
setCurrentItem(tt);
}
+void TitleWidget::setFontBoxWeight(int weight)
+{
+ int index = font_weight_box->findData(weight);
+ if (index < 0) {
+ index = font_weight_box->findData(QFont::Normal);
+ }
+ font_weight_box->setCurrentIndex(index);
+}
+
void TitleWidget::setCurrentItem(QGraphicsItem *item)
{
m_scene->setSelectedItem(item);
//toolBox->setItemEnabled(2, true);
font_size->blockSignals(true);
font_family->blockSignals(true);
- buttonBold->blockSignals(true);
+ font_weight_box->blockSignals(true);
buttonItalic->blockSignals(true);
buttonUnder->blockSignals(true);
fontColorButton->blockSignals(true);
QFont font = i->font();
font_family->setCurrentFont(font);
font_size->setValue(font.pixelSize());
- buttonBold->setChecked(font.bold());
buttonItalic->setChecked(font.italic());
buttonUnder->setChecked(font.underline());
+ setFontBoxWeight(font.weight());
QColor color = i->defaultTextColor();
fontColorButton->setColor(color);
font_size->blockSignals(false);
font_family->blockSignals(false);
- buttonBold->blockSignals(false);
+ font_weight_box->blockSignals(false);
buttonItalic->blockSignals(false);
buttonUnder->blockSignals(false);
fontColorButton->blockSignals(false);
enableToolbars(TITLE_RECTANGLE);
} else if (l.at(0)->type() == IMAGEITEM) {
- showToolbars(TITLE_IMAGE);
-
+ showToolbars(TITLE_IMAGE);
+
updateCoordinates(l.at(0));
updateDimension(l.at(0));
} else {
//toolBox->setCurrentIndex(0);
- showToolbars(TITLE_NONE);
+ showToolbars(TITLE_NONE);
enableToolbars(TITLE_NONE);
/*frame_properties->setEnabled(false);
text_properties->setEnabled(false);
{
QFont font = font_family->currentFont();
font.setPixelSize(font_size->value());
- font.setBold(buttonBold->isChecked());
font.setItalic(buttonItalic->isChecked());
font.setUnderline(buttonUnder->isChecked());
+ font.setWeight(font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
QColor color = fontColorButton->color();
color.setAlpha(textAlpha->value());
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 ep(0, 0, endViewportSize->value() * m_frameWidth/100.0,endViewportSize->value() * m_frameHeight/100.0);
+ //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 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);
QPolygonF epoly(ep);
- spoly.translate( startViewportX->value(), startViewportY->value() );
- epoly.translate( endViewportX->value(), endViewportY->value() );
+ spoly.translate(startViewportX->value(), startViewportY->value());
+ epoly.translate(endViewportX->value(), endViewportY->value());
m_startViewport->setPolygon(spoly);
m_endViewport->setPolygon(epoly);
- if (! insertingValues){
- m_startViewport->setData(0,startViewportX->value());
- m_startViewport->setData(1,startViewportY->value());
- m_startViewport->setData(2,startViewportSize->value());
-
- m_endViewport->setData(0,endViewportX->value());
- m_endViewport->setData(1,endViewportY->value());
- m_endViewport->setData(2,endViewportSize->value());
+ if (! insertingValues) {
+ m_startViewport->setData(0, startViewportX->value());
+ m_startViewport->setData(1, startViewportY->value());
+ m_startViewport->setData(2, startViewportSize->value());
+
+ m_endViewport->setData(0, endViewportX->value());
+ m_endViewport->setData(1, endViewportY->value());
+ m_endViewport->setData(2, endViewportSize->value());
}
}
void TitleWidget::loadTitle()
{
- KUrl url = KFileDialog::getOpenUrl(KUrl(m_projectTitlePath), "*.kdenlivetitle", this, i18n("Load Title"));
+ KUrl url = KFileDialog::getOpenUrl(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this, i18n("Load Title"));
if (!url.isEmpty()) {
QList<QGraphicsItem *> items = m_scene->items();
for (int i = 0; i < items.size(); i++) {
if (items.at(i)->zValue() > -1000) delete items.at(i);
}
- m_count = m_titledocument.loadDocument(url, m_startViewport, m_endViewport) + 1;
- insertingValues=true;
- 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());
- insertingValues=false;
+ m_scene->clearTextSelection();
+ double out;
+ m_count = m_titledocument.loadDocument(url, m_startViewport, m_endViewport, &out) + 1;
+ adjustFrameSize();
+ title_duration->setText(m_tc.getTimecode(GenTime(out / 1000.0)));
+ insertingValues = true;
+ 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());
+ insertingValues = false;
slotSelectTool();
+ slotAdjustZoom();
}
}
void TitleWidget::saveTitle(KUrl url)
{
- if (url.isEmpty()) url = KFileDialog::getSaveUrl(KUrl(m_projectTitlePath), "*.kdenlivetitle", this, i18n("Save Title"));
+ 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) == false)
+ if (m_titledocument.saveDocument(url, m_startViewport, m_endViewport, GenTime(m_tc.getFrameCount(title_duration->text()), m_render->fps()).ms()) == false)
KMessageBox::error(this, i18n("Cannot write to file %1", url.path()));
}
}
QDomDocument TitleWidget::xml()
{
QDomDocument doc = m_titledocument.xml(m_startViewport, m_endViewport);
+ doc.documentElement().setAttribute("out", GenTime(m_tc.getFrameCount(title_duration->text())).ms());
if (cropImage->isChecked()) {
doc.documentElement().setAttribute("crop", 1);
}
return doc;
}
+int TitleWidget::duration() const
+{
+ return GenTime(m_tc.getFrameCount(title_duration->text())).frames(m_render->fps());
+}
+
void TitleWidget::setXml(QDomDocument doc)
{
- m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport);
+ double out;
+ m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport, &out);
+ adjustFrameSize();
+ title_duration->setText(m_tc.getTimecode(GenTime(out / 1000.0)));
+ /*if (doc.documentElement().hasAttribute("out")) {
+ GenTime duration = GenTime(doc.documentElement().attribute("out").toDouble() / 1000.0);
+ title_duration->setText(m_tc.getTimecode(duration));
+ }
+ else title_duration->setText(m_tc.getTimecode(GenTime(5000)));*/
+
QDomElement e = doc.documentElement();
cropImage->setChecked(e.hasAttribute("crop"));
m_transformations.clear();
kcolorbutton->setColor(background_color);
horizontalSlider->blockSignals(false);
kcolorbutton->blockSignals(false);
-
+ QTimer::singleShot(200, this, SLOT(slotAdjustZoom()));
slotSelectTool();
}
titleConfig.writeEntry("font_pixel_size", font_size->value());
titleConfig.writeEntry("font_color", fontColorButton->color());
titleConfig.writeEntry("font_alpha", textAlpha->value());
- titleConfig.writeEntry("font_bold", buttonBold->isChecked());
+ titleConfig.writeEntry("font_weight", font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
titleConfig.writeEntry("font_italic", buttonItalic->isChecked());
titleConfig.writeEntry("font_underlined", buttonUnder->isChecked());
font_size->setValue(titleConfig.readEntry("font_pixel_size", font_size->value()));
fontColorButton->setColor(titleConfig.readEntry("font_color", fontColorButton->color()));
textAlpha->setValue(titleConfig.readEntry("font_alpha", textAlpha->value()));
- buttonBold->setChecked(titleConfig.readEntry("font_bold", buttonBold->isChecked()));
+ int weight;
+ if (titleConfig.readEntry("font_bold", false)) weight = QFont::Bold;
+ else weight = titleConfig.readEntry("font_weight", font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
+ setFontBoxWeight(weight);
buttonItalic->setChecked(titleConfig.readEntry("font_italic", buttonItalic->isChecked()));
buttonUnder->setChecked(titleConfig.readEntry("font_underlined", buttonUnder->isChecked()));
cropImage->setChecked(titleConfig.readEntry("crop_image", cropImage->isChecked()));
}
+void TitleWidget::adjustFrameSize()
+{
+ m_frameWidth = m_titledocument.frameWidth();
+ m_frameHeight = m_titledocument.frameHeight();
+ m_frameBorder->setRect(0, 0, m_frameWidth, m_frameHeight);
+ displayBackgroundFrame();
+}
+
+
+
+
projects / kdenlive / blobdiff