Fix focus detection when pressing the "Del" key, and fix speed action icon

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

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d73d5ea859daebe5576cf042b43e812950fd7a90..639f2bc091af1a7c26f87a0a16bcb7360d3864cc 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -700,7 +700,7 @@ void MainWindow::setupActions() {
     collection->addAction("delete_timeline_clip", deleteTimelineClip);
     connect(deleteTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTimelineClip()));
 
-    KAction* editTimelineClipSpeed = new KAction(KIcon("edit-delete"), i18n("Change Clip Speed"), this);
+    KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this);
     collection->addAction("change_clip_speed", editTimelineClipSpeed);
     connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed()));
 
@@ -1326,7 +1326,7 @@ void MainWindow::slotSwitchSnap() {
 
 
 void MainWindow::slotDeleteTimelineClip() {
-    if (projectListDock->isActiveWindow()) m_projectList->slotRemoveClip();
+    if (QApplication::focusWidget()->parentWidget()->parentWidget() == projectListDock) m_projectList->slotRemoveClip();
     else if (m_activeTimeline) {
         m_activeTimeline->projectView()->deleteSelectedClips();
     }