[Kdenlive-svn] SF.net SVN: kdenlive:[3420] trunk/kdenlive/src

[<j-...@us...>]

Revision: 3420
          http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3420&view=rev
Author:   j-b-m
Date:     2009-05-25 21:39:59 +0000 (Mon, 25 May 2009)

Log Message:
-----------
Fix :
http://www.kdenlive.org/mantis/view.php?id=863
http://www.kdenlive.org/mantis/view.php?id=848

Modified Paths:
--------------
    trunk/kdenlive/src/customtrackview.cpp
    trunk/kdenlive/src/dvdwizard.cpp
    trunk/kdenlive/src/monitor.cpp

Modified: trunk/kdenlive/src/customtrackview.cpp
===================================================================
--- trunk/kdenlive/src/customtrackview.cpp	2009-05-25 20:45:21 UTC (rev 3419)
+++ trunk/kdenlive/src/customtrackview.cpp	2009-05-25 21:39:59 UTC (rev 3420)
@@ -572,6 +572,7 @@
 void CustomTrackView::mousePressEvent(QMouseEvent * event)
 {
     kDebug() << "mousePressEvent STARTED";
+    setFocus(Qt::MouseFocusReason);
     m_menuPosition = QPoint();
     m_blockRefresh = true;
     m_dragItem = NULL;

Modified: trunk/kdenlive/src/dvdwizard.cpp
===================================================================
--- trunk/kdenlive/src/dvdwizard.cpp	2009-05-25 20:45:21 UTC (rev 3419)
+++ trunk/kdenlive/src/dvdwizard.cpp	2009-05-25 21:39:59 UTC (rev 3420)
@@ -453,6 +453,7 @@
     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 @@
         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 @@
         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::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());

Modified: trunk/kdenlive/src/monitor.cpp
===================================================================
--- trunk/kdenlive/src/monitor.cpp	2009-05-25 20:45:21 UTC (rev 3419)
+++ trunk/kdenlive/src/monitor.cpp	2009-05-25 21:39:59 UTC (rev 3420)
@@ -578,7 +578,6 @@
     m_position = pos;
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_ruler->slotNewValue(pos);
-    m_timePos->clearFocus();    
 }
 
 void Monitor::rendererStopped(int pos)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.