Fix :

http://www.kdenlive.org/mantis/view.php?id=863
http://www.kdenlive.org/mantis/view.php?id=848

svn path=/trunk/kdenlive/; revision=3420

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index c42f5866566087a5954a104b45a37c2e430cd455..b98cfc8879c607ff8810a67d623e881ffd78c2cb 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -572,6 +572,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
 void CustomTrackView::mousePressEvent(QMouseEvent * event)
 {
     kDebug() << "mousePressEvent STARTED";
+    setFocus(Qt::MouseFocusReason);
     m_menuPosition = QPoint();
     m_blockRefresh = true;
     m_dragItem = NULL;

diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp
index a22e0d2a860e6c2eeb35aab1b648c32eef36eeef..396eb02b305cebec356bbbdc738b53b1a35d594b 100644 (file)
--- a/src/dvdwizard.cpp
+++ b/src/dvdwizard.cpp
@@ -453,6 +453,7 @@ void DvdWizard::generateDvd()
     m_dvdauthor->setProcessChannelMode(QProcess::MergedChannels);
     m_dvdauthor->start("dvdauthor", args);
     m_status.button_abort->setEnabled(true);
+    button(QWizard::FinishButton)->setEnabled(false);
 }
 
 void DvdWizard::slotShowRenderInfo()
@@ -481,6 +482,7 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status)
         m_status.button_start->setEnabled(true);
         m_status.button_abort->setEnabled(false);
         cleanup();
+        button(QWizard::FinishButton)->setEnabled(true);
         return;
     }
     m_creationLog.append(m_dvdauthor->readAllStandardError());
@@ -497,6 +499,7 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status)
         m_status.button_start->setEnabled(true);
         m_status.button_abort->setEnabled(false);
         cleanup();
+        button(QWizard::FinishButton)->setEnabled(true);
         return;
     }
     authitem->setIcon(KIcon("dialog-ok"));
@@ -529,6 +532,7 @@ void DvdWizard::slotShowIsoInfo()
 
 void DvdWizard::slotIsoFinished(int exitCode, QProcess::ExitStatus status)
 {
+    button(QWizard::FinishButton)->setEnabled(true);
     QListWidgetItem *isoitem =  m_status.job_progress->item(4);
     if (status == QProcess::CrashExit || exitCode != 0) {
         QString result(m_mkiso->readAllStandardError());

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 046a70f8f5f8c439cf93965bc880dc5194a00157..092de52e406825ffce5a70ea3376e6b6b212e22d 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -578,7 +578,6 @@ void Monitor::seekCursor(int pos)
     m_position = pos;
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_ruler->slotNewValue(pos);
-    m_timePos->clearFocus();    
 }
 
 void Monitor::rendererStopped(int pos)