Re-add Set Zone out point action which had disappeared

Fix play / pause button in monitor:
http://www.kdenlive.org:80/mantis/view.php?id=445

svn path=/branches/KDE4/; revision=2801

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8ddcad83d3e7cee53818a723d02af49448af8046..4253a6599d6f1e44d83a10e1429cb320dfa3a873 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -722,7 +722,10 @@ void MainWindow::setupActions() {
     markIn->setShortcut(Qt::Key_I);
     connect(markIn, SIGNAL(triggered(bool)), this, SLOT(slotSetInPoint()));
 
-
+    KAction *markOut = collection->addAction("mark_out");
+    markOut->setText(i18n("Set Out Point"));
+    markOut->setShortcut(Qt::Key_O);
+    connect(markOut, SIGNAL(triggered(bool)), this, SLOT(slotSetOutPoint()));
 
     KAction* monitorSeekBackward = new KAction(KIcon("media-seek-backward"), i18n("Rewind"), this);
     monitorSeekBackward->setShortcut(Qt::Key_J);
@@ -2022,7 +2025,6 @@ void MainWindow::slotSetOutPoint() {
 }
 
 void MainWindow::slotGetNewStuff() {
-    kDebug() << "// GET NEW STUFF";
     //KNS::Entry::List download();
     KNS::Entry::List entries = KNS::Engine::download();
     int numberInstalled = 0;

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 4de7d7dfc9120f136b9ea3f52a41d839b0f72666..b1d11e594e089c93d0afa486a41d5c0f07b802ad 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -570,9 +570,14 @@ void Monitor::pause() {
 void Monitor::slotPlay() {
     if (render == NULL) return;
     activateMonitor();
+    if (render->playSpeed() == 0) {
+        m_playAction->setChecked(true);
+        m_playAction->setIcon(m_pauseIcon);
+    } else {
+        m_playAction->setChecked(false);
+        m_playAction->setIcon(m_playIcon);
+    }
     render->switchPlay();
-    m_playAction->setChecked(true);
-    m_playAction->setIcon(m_pauseIcon);
 }
 
 void Monitor::slotPlayZone() {