cleanup & fix crash on project saving with Qt 4.5:

[kdenlive] / src / markerdialog.cpp

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index 143fa737c580df5b41524a3f6f6e391c8e82fccf..a26b33791ca71db294ab6ef8198fa844ff3655f1 100644 (file)
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -17,18 +17,18 @@
  *   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), m_producer(NULL), m_profile(NULL) {
+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);
 
     if (m_clip != NULL) {
@@ -56,7 +56,7 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, QWid
             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);
+            p = KThumb::getFrame(m_producer, t.time().frames(m_fps), (int)(100 * m_dar), 100);
             break;
         case COLOR:
             colour = colour.replace(0, 2, "#");
@@ -74,13 +74,14 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, QWid
     } 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());
-    connect(m_view.position_up, SIGNAL(clicked()), this, SLOT(slotTimeUp()));
-    connect(m_view.position_down, SIGNAL(clicked()), this, SLOT(slotTimeDown()));
 
+    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()));
+
     adjustSize();
 }
 
@@ -93,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));
 }
@@ -116,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"