reset edit mode when opening new doc

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

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5dd0474d508dc9c00aba0fc95066571fb9fbaf87..a9489893dc198430abf55dc6d78505aa8427a885 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -743,33 +743,33 @@ void MainWindow::setupActions()
     QString style1 = "QToolBar { border: 0px } QToolButton { border-style: inset; border:1px solid #999999;border-radius: 3px;margin: 0px 3px;padding: 0px;} QToolButton:checked { background-color: rgba(224, 224, 0, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;}";
 
     // create edit mode buttons
-    KAction *normaledit = new KAction(KIcon("kdenlive-normal-edit"), i18n("Normal mode"), this);
-    normaledit->setShortcut(i18nc("Normal editing", "n"));
-    toolbar->addAction(normaledit);
-    normaledit->setCheckable(true);
-    normaledit->setChecked(true);
-
-    m_overwriteModeTool = new KAction(KIcon("kdenlive-overwrite-edit"), i18n("Overwrite mode"), this);
-    m_overwriteModeTool->setShortcut(i18nc("Overwrite mode shortcut", "o"));
-    toolbar->addAction(m_overwriteModeTool);
-    m_overwriteModeTool->setCheckable(true);
-    m_overwriteModeTool->setChecked(false);
-
-    m_insertModeTool = new KAction(KIcon("kdenlive-insert-edit"), i18n("Insert mode"), this);
-    m_insertModeTool->setShortcut(i18nc("Insert mode shortcut", "i"));
-    toolbar->addAction(m_insertModeTool);
-    m_insertModeTool->setCheckable(true);
-    m_insertModeTool->setChecked(false);
+    m_normalEditTool = new KAction(KIcon("kdenlive-normal-edit"), i18n("Normal mode"), this);
+    m_normalEditTool->setShortcut(i18nc("Normal editing", "n"));
+    toolbar->addAction(m_normalEditTool);
+    m_normalEditTool->setCheckable(true);
+    m_normalEditTool->setChecked(true);
+
+    m_overwriteEditTool = new KAction(KIcon("kdenlive-overwrite-edit"), i18n("Overwrite mode"), this);
+    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"));
+    toolbar->addAction(m_insertEditTool);
+    m_insertEditTool->setCheckable(true);
+    m_insertEditTool->setChecked(false);
     // not implemented yet
-    m_insertModeTool->setEnabled(false);
+    m_insertEditTool->setEnabled(false);
 
     QActionGroup *editGroup = new QActionGroup(this);
-    editGroup->addAction(normaledit);
-    editGroup->addAction(m_overwriteModeTool);
-    editGroup->addAction(m_insertModeTool);
+    editGroup->addAction(m_normalEditTool);
+    editGroup->addAction(m_overwriteEditTool);
+    editGroup->addAction(m_insertEditTool);
     editGroup->setExclusive(true);
     connect(editGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeEdit(QAction *)));
-    //connect(m_overwriteModeTool, SIGNAL(toggled(bool)), this, SLOT(slotSetOverwriteMode(bool)));
+    //connect(m_overwriteEditTool, SIGNAL(toggled(bool)), this, SLOT(slotSetOverwriteMode(bool)));
 
     toolbar->addSeparator();
 
@@ -801,15 +801,15 @@ void MainWindow::setupActions()
 
     QWidget * actionWidget;
     int max = toolbar->iconSizeDefault() + 2;
-    actionWidget = toolbar->widgetForAction(normaledit);
+    actionWidget = toolbar->widgetForAction(m_normalEditTool);
     actionWidget->setMaximumWidth(max);
     actionWidget->setMaximumHeight(max - 4);
 
-    actionWidget = toolbar->widgetForAction(m_insertModeTool);
+    actionWidget = toolbar->widgetForAction(m_insertEditTool);
     actionWidget->setMaximumWidth(max);
     actionWidget->setMaximumHeight(max - 4);
 
-    actionWidget = toolbar->widgetForAction(m_overwriteModeTool);
+    actionWidget = toolbar->widgetForAction(m_overwriteEditTool);
     actionWidget->setMaximumWidth(max);
     actionWidget->setMaximumHeight(max - 4);
 
@@ -896,9 +896,9 @@ void MainWindow::setupActions()
     statusBar()->addPermanentWidget(m_timecodeFormat);
     //statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 3);
 
-    collection->addAction("normal_mode", normaledit);
-    collection->addAction("overwrite_mode", m_overwriteModeTool);
-    collection->addAction("insert_mode", m_insertModeTool);
+    collection->addAction("normal_mode", m_normalEditTool);
+    collection->addAction("overwrite_mode", m_overwriteEditTool);
+    collection->addAction("insert_mode", m_insertEditTool);
     collection->addAction("select_tool", m_buttonSelectTool);
     collection->addAction("razor_tool", m_buttonRazorTool);
     collection->addAction("spacer_tool", m_buttonSpacerTool);
@@ -2033,6 +2033,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
 
     setCaption(doc->description(), doc->isModified());
     m_saveAction->setEnabled(doc->isModified());
+    m_normalEditTool->setChecked(true);
     m_activeDocument = doc;
     m_activeTimeline->updateProjectFps();
     m_activeDocument->checkProjectClips();
@@ -2643,8 +2644,8 @@ void MainWindow::slotChangeTool(QAction * action)
 void MainWindow::slotChangeEdit(QAction * action)
 {
     if (!m_activeTimeline) return;
-    if (action == m_overwriteModeTool) m_activeTimeline->projectView()->setEditMode(OVERWRITEEDIT);
-    else if (action == m_insertModeTool) m_activeTimeline->projectView()->setEditMode(INSERTEDIT);
+    if (action == m_overwriteEditTool) m_activeTimeline->projectView()->setEditMode(OVERWRITEEDIT);
+    else if (action == m_insertEditTool) m_activeTimeline->projectView()->setEditMode(INSERTEDIT);
     else m_activeTimeline->projectView()->setEditMode(NORMALEDIT);
 }
 

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 8fe335f2a797def63c0015ac09c9fc5e5ea61073..67320c82b335b238225e9ea6575812a226a10984 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -166,8 +166,9 @@ private:
     KAction *m_buttonVideoThumbs;
     KAction *m_buttonShowMarkers;
     KAction *m_buttonFitZoom;
-    KAction *m_overwriteModeTool;
-    KAction *m_insertModeTool;
+    KAction *m_normalEditTool;
+    KAction *m_overwriteEditTool;
+    KAction *m_insertEditTool;
     KAction *m_buttonSelectTool;
     KAction *m_buttonRazorTool;
     KAction *m_buttonSpacerTool;