* Cleanup folder creation

[kdenlive] / src / markerdialog.cpp

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index e036720b1a2d8af5ccab4ae1c1536fa4896ed05f..a26b33791ca71db294ab6ef8198fa844ff3655f1 100644 (file)
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -17,66 +17,71 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-
+#include <QWheelEvent>
 #include <KDebug>
 
 #include "markerdialog.h"
 #include "kthumb.h"
 #include "kdenlivesettings.h"
 
-MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip), m_marker(t) {
+MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, const QString &caption, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip), m_marker(t), m_producer(NULL), m_profile(NULL) {
     setFont(KGlobalSettings::toolBarFont());
     m_fps = m_tc.fps();
     m_view.setupUi(this);
-
+    setWindowTitle(caption);
     m_previewTimer = new QTimer(this);
-    m_previewTimer->setInterval(500);
-    connect(m_previewTimer, SIGNAL(timeout()), this, SLOT(slotUpdateThumb()));
-
-    m_profile = new Mlt::Profile((char*) KdenliveSettings::current_profile().data());
-    m_dar = m_profile->dar();
-    QDomDocument doc;
-    QDomElement westley = doc.createElement("westley");
-    QDomElement play = doc.createElement("playlist");
-    doc.appendChild(westley);
-    westley.appendChild(play);
-    play.appendChild(doc.importNode(clip->toXML(), true));
-    //char *tmp = doc.toString().toUtf8().data();
-    m_producer = new Mlt::Producer(*m_profile, "westley-xml", doc.toString().toUtf8().data());
-    //delete[] tmp;
+
+    if (m_clip != NULL) {
+        m_previewTimer->setInterval(500);
+        connect(m_previewTimer, SIGNAL(timeout()), this, SLOT(slotUpdateThumb()));
+        m_profile = new Mlt::Profile((char*) KdenliveSettings::current_profile().data());
+        m_dar = m_profile->dar();
+        QDomDocument doc;
+        QDomElement westley = doc.createElement("westley");
+        QDomElement play = doc.createElement("playlist");
+        doc.appendChild(westley);
+        westley.appendChild(play);
+        play.appendChild(doc.importNode(clip->toXML(), true));
+        //char *tmp = doc.toString().toUtf8().data();
+        m_producer = new Mlt::Producer(*m_profile, "westley-xml", doc.toString().toUtf8().data());
+        //delete[] tmp;
+
+        QPixmap p((int)(100 * m_dar), 100);
+        QString colour = clip->getProperty("colour");
+        switch (m_clip->clipType()) {
+        case VIDEO:
+        case AV:
+        case SLIDESHOW:
+        case PLAYLIST:
+            connect(this, SIGNAL(updateThumb()), m_previewTimer, SLOT(start()));
+        case IMAGE:
+        case TEXT:
+            p = KThumb::getFrame(m_producer, t.time().frames(m_fps), (int)(100 * m_dar), 100);
+            break;
+        case COLOR:
+            colour = colour.replace(0, 2, "#");
+            p.fill(QColor(colour.left(7)));
+            break;
+        default:
+            p.fill(Qt::black);
+        }
+        if (!p.isNull()) {
+            m_view.clip_thumb->setFixedWidth(p.width());
+            m_view.clip_thumb->setFixedHeight(p.height());
+            m_view.clip_thumb->setPixmap(p);
+        }
+        connect(m_view.marker_position, SIGNAL(textChanged(const QString &)), this, SIGNAL(updateThumb()));
+    } else m_view.clip_thumb->setHidden(true);
 
     m_view.marker_position->setText(tc.getTimecode(t.time(), m_fps));
+
     m_view.marker_comment->setText(t.comment());
+    m_view.marker_comment->selectAll();
+    m_view.marker_comment->setFocus();
+
     connect(m_view.position_up, SIGNAL(clicked()), this, SLOT(slotTimeUp()));
     connect(m_view.position_down, SIGNAL(clicked()), this, SLOT(slotTimeDown()));
 
-    m_view.marker_comment->selectAll();
-    m_view.marker_comment->setFocus();
-    QPixmap p((int)(100 * m_dar), 100);
-    QString colour = clip->getProperty("colour");
-    switch (m_clip->clipType()) {
-    case VIDEO:
-    case AV:
-    case SLIDESHOW:
-    case PLAYLIST:
-        connect(this, SIGNAL(updateThumb()), m_previewTimer, SLOT(start()));
-    case IMAGE:
-    case TEXT:
-        p = KThumb::getFrame(*m_producer, t.time().frames(m_fps), (int)(100 * m_dar), 100);
-        break;
-    case COLOR:
-        colour = colour.replace(0, 2, "#");
-        p.fill(QColor(colour.left(7)));
-        break;
-    default:
-        p.fill(Qt::black);
-    }
-    if (!p.isNull()) {
-        m_view.clip_thumb->setFixedWidth(p.width());
-        m_view.clip_thumb->setFixedHeight(p.height());
-        m_view.clip_thumb->setPixmap(p);
-    }
-    connect(m_view.marker_position, SIGNAL(textChanged(const QString &)), this, SIGNAL(updateThumb()));
     adjustSize();
 }
 
@@ -89,14 +94,14 @@ MarkerDialog::~MarkerDialog() {
 void MarkerDialog::slotUpdateThumb() {
     m_previewTimer->stop();
     int pos = m_tc.getFrameCount(m_view.marker_position->text(), m_fps);
-    QPixmap p = KThumb::getFrame(*m_producer, pos, (int)(100 * m_dar), 100);
+    QPixmap p = KThumb::getFrame(m_producer, pos, (int)(100 * m_dar), 100);
     if (!p.isNull()) m_view.clip_thumb->setPixmap(p);
     else kDebug() << "!!!!!!!!!!!  ERROR CREATING THUMB";
 }
 
 void MarkerDialog::slotTimeUp() {
     int duration = m_tc.getFrameCount(m_view.marker_position->text(), m_fps);
-    if (duration >= m_clip->duration().frames(m_fps)) return;
+    if (m_clip && duration >= m_clip->duration().frames(m_fps)) return;
     duration ++;
     m_view.marker_position->setText(m_tc.getTimecode(GenTime(duration, m_fps), m_fps));
 }
@@ -112,6 +117,15 @@ CommentedTime MarkerDialog::newMarker() {
     return CommentedTime(GenTime(m_tc.getFrameCount(m_view.marker_position->text(), m_fps), m_fps), m_view.marker_comment->text());
 }
 
+void MarkerDialog::wheelEvent(QWheelEvent * event) {
+    if (m_view.marker_position->underMouse() || m_view.clip_thumb->underMouse()) {
+        if (event->delta() > 0)
+            slotTimeUp();
+        else
+            slotTimeDown();
+    }
+}
+
 #include "markerdialog.moc"