better handling of document switching (still some crashes)

[kdenlive] / src / mainwindow.h

diff --git a/src/mainwindow.h b/src/mainwindow.h
index ebd5f0798cc41084a8c3651ef68df9ae0ec673a9..7a231529df46b885259c82d067fb2e4ea5151627 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -20,10 +20,11 @@
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
- 
+
 #include <QDockWidget>
 #include <QUndoView>
 #include <QLabel>
+#include <QProgressBar>
 
 #include <KXmlGuiWindow>
 #include <KTextEdit>
@@ -41,22 +42,28 @@
 #include "customtrackview.h"
 #include "effectslist.h"
 #include "effectslistview.h"
+#include "effectstackview.h"
+
+
+class MainWindow : public KXmlGuiWindow {
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
 
-class MainWindow : public KXmlGuiWindow
-{
-  Q_OBJECT
-  
-  public:
-    MainWindow(QWidget *parent=0);
+    void parseProfiles();
 
-  protected:
+protected:
     virtual bool queryClose();
-  
-  private:
+
+private:
     KTabWidget* m_timelineArea;
+    QProgressBar *statusProgressBar;
+    QLabel* statusLabel;
     void setupActions();
     QString fileName;
     KdenliveDoc *m_activeDocument;
+    TrackView *m_activeTimeline;
     MonitorManager *m_monitorManager;
 
     QDockWidget *projectListDock;
@@ -67,7 +74,7 @@ class MainWindow : public KXmlGuiWindow
     //KListWidget *m_effectList;
 
     QDockWidget *effectStackDock;
-    KListWidget *effectStack;
+    EffectStackView *effectStack;
 
     QDockWidget *transitionConfigDock;
     KListWidget *transitionConfig;
@@ -97,11 +104,10 @@ class MainWindow : public KXmlGuiWindow
     void readOptions();
     void saveOptions();
 
-  public slots:
+public slots:
     void openFile(const KUrl &url);
 
-
-  private slots:
+private slots:
     void newFile();
     void activateDocument();
     void connectDocument(TrackView*, KdenliveDoc*);
@@ -110,10 +116,16 @@ class MainWindow : public KXmlGuiWindow
     void saveFileAs();
     void saveFileAs(const QString &outputFileName);
     void slotPreferences();
+    void updateConfiguration();
     void slotConnectMonitors();
     void slotRaiseMonitor(bool clipMonitor);
     void slotSetClipDuration(int id, int duration);
     void slotUpdateMousePosition(int pos);
+    void slotAddEffect(QDomElement effect, GenTime pos = GenTime(), int track = -1);
+    void slotEditProfiles();
+    void slotEditProjectSettings();
+    void slotDisplayActionMessage(QAction *a);
+    void slotGotProgressInfo(KUrl url, int progress);
 };
- 
+
 #endif