Fix crash on clip deletion, fix issues with placeholder clips

[kdenlive] / src / mainwindow.h

diff --git a/src/mainwindow.h b/src/mainwindow.h
index e259a491a8d80c5fa0013661db16196b98c81a6f..86ca504ccf637047b1101c51ed69f75db27fb448 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -166,11 +166,13 @@ private:
     KAction *m_buttonVideoThumbs;
     KAction *m_buttonShowMarkers;
     KAction *m_buttonFitZoom;
+    KAction *m_normalEditTool;
+    KAction *m_overwriteEditTool;
+    KAction *m_insertEditTool;
     KAction *m_buttonSelectTool;
     KAction *m_buttonRazorTool;
     KAction *m_buttonSpacerTool;
     KAction *m_buttonSnap;
-    QActionGroup *m_toolGroup;
     KAction *m_saveAction;
     KAction *m_closeAction;
     QSlider *m_zoomSlider;
@@ -211,7 +213,7 @@ public slots:
     Q_SCRIPTABLE void setRenderingFinished(const QString &url, int status, const QString &error);
 
 private slots:
-    void newFile(bool showProjectSettings = true);
+    void newFile(bool showProjectSettings = true, bool force = false);
     void queryQuit();
     void activateDocument();
     void connectDocument(TrackView*, KdenliveDoc*);
@@ -248,6 +250,13 @@ private slots:
     void slotDeleteAllClipMarkers();
     void slotEditClipMarker();
     void slotCutTimelineClip();
+    void slotInsertClipOverwrite();
+    void slotSelectTimelineClip();
+    void slotSelectTimelineTransition();
+    void slotDeselectTimelineClip();
+    void slotDeselectTimelineTransition();
+    void slotSelectAddTimelineClip();
+    void slotSelectAddTimelineTransition();
     void slotAddVideoEffect(QAction *result);
     void slotAddAudioEffect(QAction *result);
     void slotAddCustomEffect(QAction *result);
@@ -257,9 +266,11 @@ private slots:
     void slotShuttleButton(int code);
 #endif /* NO_JOGSHUTTLE */
     void slotShowClipProperties(DocClipBase *clip);
+    void slotShowClipProperties(QList <DocClipBase *>cliplist, QMap<QString, QString> commonproperties);
     void slotActivateEffectStackView();
     void slotActivateTransitionView(Transition *);
     void slotChangeTool(QAction * action);
+    void slotChangeEdit(QAction * action);
     void slotSetTool(PROJECTTOOL tool);
     void slotSnapForward();
     void slotSnapRewind();
@@ -290,6 +301,8 @@ private slots:
 
     void slotSetInPoint();
     void slotSetOutPoint();
+    void slotResizeItemStart();
+    void slotResizeItemEnd();
     void configureNotifications();
     void slotInsertTrack(int ix = 0);
     void slotDeleteTrack(int ix = 0);
@@ -324,6 +337,9 @@ private slots:
     void slotUpdateTrackInfo();
     /** \brief Change color scheme */
     void slotChangePalette(QAction *action, const QString &themename = QString());
+    void slotSwitchMonitors();
+    void slotInsertZoneToTree();
+    void slotInsertZoneToTimeline();
 
 signals:
     Q_SCRIPTABLE void abortRenderJob(const QString &url);