First steps for "split audio" feature,. Don't use yet, it might corrupt your projects

[kdenlive] / src / titlewidget.cpp

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 7494281b1c0f28dcf4ceb0427518d69fa1046a5b..4612961bde3cb2a5c9aedc24c5e9d2313e7490cf 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -15,28 +15,24 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "titlewidget.h"
+#include "kdenlivesettings.h"
 
+#include <KDebug>
+#include <KGlobalSettings>
+#include <KFileDialog>
+#include <KStandardDirs>
 
-#include <QGraphicsView>
 #include <QDomDocument>
 #include <QGraphicsItem>
 #include <QGraphicsSvgItem>
 #include <QTimer>
-
 #include <QToolBar>
 #include <QMenu>
 
-#include <KDebug>
-#include <KGlobalSettings>
-#include <KFileDialog>
-#include <KStandardDirs>
-
-#include "titlewidget.h"
-#include "kdenlivesettings.h"
-
 int settingUp = false;
 
-TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget *parent): QDialog(parent), m_render(render), m_count(0), m_projectPath(projectPath) {
+TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget *parent): QDialog(parent), m_render(render), m_count(0), m_projectPath(projectPath), startViewport(NULL), endViewport(NULL) {
     setupUi(this);
     setFont(KGlobalSettings::toolBarFont());
     //toolBox->setFont(KGlobalSettings::toolBarFont());
@@ -94,7 +90,7 @@ TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget
 
     // mbd
     connect(this, SIGNAL(accepted()), this, SLOT(slotAccepted()));
-    
+
     buttonFitZoom->setIcon(KIcon("zoom-fit-best"));
     buttonRealSize->setIcon(KIcon("zoom-original"));
     buttonBold->setIcon(KIcon("format-text-bold"));
@@ -178,7 +174,7 @@ TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget
 
     // mbd: load saved settings
     readChoices();
-    
+
     initViewports();
     QTimer::singleShot(500, this, SLOT(slotAdjustZoom()));
     graphicsView->show();
@@ -195,6 +191,21 @@ TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget
     }
 }
 
+TitleWidget::~TitleWidget() {
+    delete m_buttonRect;
+    delete m_buttonText;
+    delete m_buttonImage;
+    delete m_buttonCursor;
+    delete m_buttonSave;
+    delete m_buttonLoad;
+
+    delete m_frameBorder;
+    delete m_frameImage;
+    if (startViewport) delete startViewport;
+    if (endViewport) delete endViewport;
+    delete m_scene;
+}
+
 //static
 QStringList TitleWidget::getFreeTitleInfo(const KUrl &projectUrl) {
     QStringList result;
@@ -220,7 +231,7 @@ QString TitleWidget::getTitleResourceFromName(const KUrl &projectUrl, const QStr
 }
 
 //virtual
-void TitleWidget::resizeEvent(QResizeEvent * event) {
+void TitleWidget::resizeEvent(QResizeEvent * /*event*/) {
     //slotAdjustZoom();
 }
 
@@ -321,7 +332,7 @@ void TitleWidget::initViewports() {
 
 void TitleWidget::slotUpdateZoom(int pos) {
     m_scene->setZoom((double) pos / 100);
-    zoom_label->setText(QString::number(pos) + "%");
+    zoom_label->setText(QString::number(pos) + '%');
 }
 
 void TitleWidget::slotZoom(bool up) {
@@ -673,15 +684,15 @@ void TitleWidget::setXml(QDomDocument doc) {
     kcolorbutton->setColor(background_color);
     horizontalSlider->blockSignals(false);
     kcolorbutton->blockSignals(false);
-    
+
     slotSelectTool();
 }
 
-QPixmap TitleWidget::renderedPixmap() {
-    QPixmap pix(m_frameWidth, m_frameHeight);
+QImage TitleWidget::renderedPixmap() {
+    QImage pix(m_frameWidth, m_frameHeight, QImage::Format_ARGB32);
     pix.fill(Qt::transparent);
     QPainter painter(&pix);
-    painter.setRenderHint(QPainter::Antialiasing);
+    painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::HighQualityAntialiasing);
     m_scene->clearTextSelection();
     QPen framepen = m_frameBorder->pen();
     m_frameBorder->setPen(Qt::NoPen);
@@ -690,6 +701,7 @@ QPixmap TitleWidget::renderedPixmap() {
     m_frameImage->setVisible(false);
 
     m_scene->render(&painter, QRectF(), QRectF(0, 0, m_frameWidth, m_frameHeight));
+    painter.end();
     m_frameBorder->setPen(framepen);
     startViewport->setVisible(true);
     endViewport->setVisible(true);
@@ -706,43 +718,43 @@ void TitleWidget::slotAccepted() {
 void TitleWidget::writeChoices() {
     // Get a pointer to a shared configuration instance, then get the TitleWidget group.
     KSharedConfigPtr config = KGlobal::config();
-    KConfigGroup titleConfig( config, "TitleWidget" );
+    KConfigGroup titleConfig(config, "TitleWidget");
     // Write the entries
     titleConfig.writeEntry("font_family", font_family->currentFont());
-    titleConfig.writeEntry("font_size", font_size->value() );
-    titleConfig.writeEntry("font_color", fontColorButton->color() );
-    titleConfig.writeEntry("font_alpha", textAlpha->value() );
+    titleConfig.writeEntry("font_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_italic", buttonItalic->isChecked());
     titleConfig.writeEntry("font_underlined", buttonUnder->isChecked());
-    
+
     titleConfig.writeEntry("rect_foreground_color", rectFColor->color());
     titleConfig.writeEntry("rect_foreground_alpha", rectFAlpha->value());
     titleConfig.writeEntry("rect_background_color", rectBColor->color());
     titleConfig.writeEntry("rect_background_alpha", rectBAlpha->value());
     titleConfig.writeEntry("rect_line_width", rectLineWidth->value());
-    
+
     titleConfig.writeEntry("background_color", kcolorbutton->color());
     titleConfig.writeEntry("background_alpha", horizontalSlider->value());
     //! \todo Not sure if I should sync - it is probably safe to do it
     config->sync();
-    
+
 }
 
 /** \brief Read the last stored choices into the dialog */
 void TitleWidget::readChoices() {
     // Get a pointer to a shared configuration instance, then get the TitleWidget group.
     KSharedConfigPtr config = KGlobal::config();
-    KConfigGroup titleConfig( config, "TitleWidget" );
+    KConfigGroup titleConfig(config, "TitleWidget");
     // read the entries
     font_family->setCurrentFont(titleConfig.readEntry("font_family", font_family->currentFont()));
-    font_size->setValue(titleConfig.readEntry( "font_size", font_size->value()));
+    font_size->setValue(titleConfig.readEntry("font_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()));
     buttonItalic->setChecked(titleConfig.readEntry("font_italic", buttonItalic->isChecked()));
     buttonUnder->setChecked(titleConfig.readEntry("font_underlined", buttonUnder->isChecked()));
-    
+
     rectFColor->setColor(titleConfig.readEntry("rect_foreground_color", rectFColor->color()));
     rectFAlpha->setValue(titleConfig.readEntry("rect_foreground_alpha", rectFAlpha->value()));
     rectBColor->setColor(titleConfig.readEntry("rect_background_color", rectBColor->color()));
@@ -752,4 +764,4 @@ void TitleWidget::readChoices() {
     kcolorbutton->setColor(titleConfig.readEntry("background_color", kcolorbutton->color()));
     horizontalSlider->setValue(titleConfig.readEntry("background_alpha", horizontalSlider->value()));
 }
-#include "moc_titlewidget.cpp"
+