Fix shortcut conflict + allow to remove effect from title

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

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 075d1b531a2ff6f34631004a633bacb8363d2796..951094a3959d4aca17feb44aa155ba6f7ee98f3e 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -750,13 +750,13 @@ void MainWindow::setupActions()
     m_normalEditTool->setChecked(true);
 
     m_overwriteEditTool = new KAction(KIcon("kdenlive-overwrite-edit"), i18n("Overwrite mode"), this);
-    m_overwriteEditTool->setShortcut(i18nc("Overwrite mode shortcut", "o"));
+    //m_overwriteEditTool->setShortcut(i18nc("Overwrite mode shortcut", "o"));
     toolbar->addAction(m_overwriteEditTool);
     m_overwriteEditTool->setCheckable(true);
     m_overwriteEditTool->setChecked(false);
 
     m_insertEditTool = new KAction(KIcon("kdenlive-insert-edit"), i18n("Insert mode"), this);
-    m_insertEditTool->setShortcut(i18nc("Insert mode shortcut", "i"));
+    //m_insertEditTool->setShortcut(i18nc("Insert mode shortcut", "i"));
     toolbar->addAction(m_insertEditTool);
     m_insertEditTool->setCheckable(true);
     m_insertEditTool->setChecked(false);

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 4e0ad1f87cd814ce51f1f656aeecafb505f7d88d..b43c4eb24a86dde0cf044296eb22690de79af12e 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -1794,14 +1794,15 @@ void TitleWidget::slotResize200()
 
 void TitleWidget::slotAddEffect(int ix)
 {
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
     int effect = effect_list->itemData(ix).toInt();
-    if (effect == 0) {
+    if (effect == NOEFFECT) {
+       if (l.size() == 1) l[0]->setData(100, QVariant());
         effect_stack->setHidden(true);
         return;
     }
     effect_stack->setCurrentIndex(effect - 1);
     effect_stack->setHidden(false);
-    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
     if (effect == TYPEWRITEREFFECT) {
         if (l.size() == 1 && l.at(0)->type() == TEXTITEM) {
             QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ";" + QString::number(typewriter_start->value());