summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e396921)
svn path=/trunk/kdenlive/; revision=3362
#include <QGraphicsSvgItem>
#include <QFontInfo>
#include <QFile>
#include <QGraphicsSvgItem>
#include <QFontInfo>
#include <QFile>
TitleDocument::TitleDocument()
TitleDocument::TitleDocument()
content.setAttribute("font-italic", font.italic());
content.setAttribute("font-underline", font.underline());
content.setAttribute("font-color", colorToString(t->defaultTextColor()));
content.setAttribute("font-italic", font.italic());
content.setAttribute("font-underline", font.underline());
content.setAttribute("font-color", colorToString(t->defaultTextColor()));
+ if (t->textWidth() != -1) {
+ content.setAttribute("alignment", t->textCursor().blockFormat().alignment());
+ }
break;
default:
continue;
break;
default:
continue;
QGraphicsTextItem *txt = m_scene->addText(items.item(i).namedItem("content").firstChild().nodeValue(), font);
txt->setDefaultTextColor(col);
txt->setTextInteractionFlags(Qt::NoTextInteraction);
QGraphicsTextItem *txt = m_scene->addText(items.item(i).namedItem("content").firstChild().nodeValue(), font);
txt->setDefaultTextColor(col);
txt->setTextInteractionFlags(Qt::NoTextInteraction);
+ if (txtProperties.namedItem("alignment").isNull() == false) {
+ txt->setTextWidth(txt->boundingRect().width());
+ QTextCursor cur = txt->textCursor();
+ QTextBlockFormat format = cur.blockFormat();
+ format.setAlignment((Qt::Alignment) txtProperties.namedItem("alignment").nodeValue().toInt());
+ cur.select(QTextCursor::Document);
+ cur.setBlockFormat(format);
+ txt->setTextCursor(cur);
+ cur.clearSelection();
+ txt->setTextCursor(cur);
+ }
+
gitem = txt;
} else if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsRectItem") {
QString rect = items.item(i).namedItem("content").attributes().namedItem("rect").nodeValue();
gitem = txt;
} else if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsRectItem") {
QString rect = items.item(i).namedItem("content").attributes().namedItem("rect").nodeValue();
#include <QTimer>
#include <QToolBar>
#include <QMenu>
#include <QTimer>
#include <QToolBar>
#include <QMenu>
+#include <QTextBlockFormat>
+#include <QTextCursor>
connect(buttonBold, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
connect(buttonItalic, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
connect(buttonUnder, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
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()));
+ connect(buttonAlignRight, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
+ connect(buttonAlignCenter, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
+ connect(buttonAlignNone, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
connect(displayBg, SIGNAL(stateChanged(int)), this, SLOT(displayBackgroundFrame()));
// mbd
connect(displayBg, SIGNAL(stateChanged(int)), this, SLOT(displayBackgroundFrame()));
// mbd
buttonBold->setIcon(KIcon("format-text-bold"));
buttonItalic->setIcon(KIcon("format-text-italic"));
buttonUnder->setIcon(KIcon("format-text-underline"));
buttonBold->setIcon(KIcon("format-text-bold"));
buttonItalic->setIcon(KIcon("format-text-italic"));
buttonUnder->setIcon(KIcon("format-text-underline"));
+ buttonAlignCenter->setIcon(KIcon("format-justify-center"));
+ buttonAlignLeft->setIcon(KIcon("format-justify-left"));
+ buttonAlignRight->setIcon(KIcon("format-justify-right"));
+ buttonAlignNone->setToolTip(i18n("No alignment"));
+ buttonAlignRight->setToolTip(i18n("Align right"));
+ buttonAlignLeft->setToolTip(i18n("Align left"));
+ buttonAlignCenter->setToolTip(i18n("Align center"));
itemhcenter->setIcon(KIcon("kdenlive-align-hor"));
itemhcenter->setToolTip(i18n("Align item horizontally"));
itemhcenter->setIcon(KIcon("kdenlive-align-hor"));
itemhcenter->setToolTip(i18n("Align item horizontally"));
buttonUnder->blockSignals(true);
fontColorButton->blockSignals(true);
textAlpha->blockSignals(true);
buttonUnder->blockSignals(true);
fontColorButton->blockSignals(true);
textAlpha->blockSignals(true);
+ buttonAlignLeft->blockSignals(true);
+ buttonAlignRight->blockSignals(true);
+ buttonAlignNone->blockSignals(true);
+ buttonAlignCenter->blockSignals(true);
QFont font = i->font();
font_family->setCurrentFont(font);
QFont font = i->font();
font_family->setCurrentFont(font);
fontColorButton->setColor(color);
textAlpha->setValue(color.alpha());
fontColorButton->setColor(color);
textAlpha->setValue(color.alpha());
+ QTextCursor cur = i->textCursor();
+ QTextBlockFormat format = cur.blockFormat();
+ if (i->textWidth() == -1) buttonAlignNone->setChecked(true);
+ else if (format.alignment() == Qt::AlignHCenter) buttonAlignCenter->setChecked(true);
+ else if (format.alignment() == Qt::AlignRight) buttonAlignRight->setChecked(true);
+ else if (format.alignment() == Qt::AlignLeft) buttonAlignLeft->setChecked(true);
+
font_size->blockSignals(false);
font_family->blockSignals(false);
buttonBold->blockSignals(false);
font_size->blockSignals(false);
font_family->blockSignals(false);
buttonBold->blockSignals(false);
buttonUnder->blockSignals(false);
fontColorButton->blockSignals(false);
textAlpha->blockSignals(false);
buttonUnder->blockSignals(false);
fontColorButton->blockSignals(false);
textAlpha->blockSignals(false);
+ buttonAlignLeft->blockSignals(false);
+ buttonAlignRight->blockSignals(false);
+ buttonAlignNone->blockSignals(false);
+ buttonAlignCenter->blockSignals(false);
value_x->setValue((int) i->pos().x());
value_y->setValue((int) i->pos().y());
value_x->setValue((int) i->pos().x());
value_y->setValue((int) i->pos().y());
}
if (!item) return;
//if (item->textCursor().selection ().isEmpty())
}
if (!item) return;
//if (item->textCursor().selection ().isEmpty())
+ QTextCursor cur = item->textCursor();
+ QTextBlockFormat format = cur.blockFormat();
+ if (buttonAlignLeft->isChecked() || buttonAlignCenter->isChecked() || buttonAlignRight->isChecked()) {
+ item->setTextWidth(item->boundingRect().width());
+ if (buttonAlignCenter->isChecked()) format.setAlignment(Qt::AlignHCenter);
+ else if (buttonAlignRight->isChecked()) format.setAlignment(Qt::AlignRight);
+ else if (buttonAlignLeft->isChecked()) format.setAlignment(Qt::AlignLeft);
+ } else {
+ format.setAlignment(Qt::AlignLeft);
+ item->setTextWidth(-1);
+ }
+
{
item->setFont(font);
item->setDefaultTextColor(color);
{
item->setFont(font);
item->setDefaultTextColor(color);
+ cur.select(QTextCursor::Document);
+ cur.setBlockFormat(format);
+ item->setTextCursor(cur);
+ cur.clearSelection();
+ item->setTextCursor(cur);
+
}
/*else {
QTextDocumentFragment selec = item->textCursor().selection ();
}
/*else {
QTextDocumentFragment selec = item->textCursor().selection ();