Merge branch 'master' into next

[kdenlive] / src / dvdwizard.h

diff --git a/src/dvdwizard.h b/src/dvdwizard.h
index 42e5b3521612a8405fa71dfe19174fb53c373147..b9578d9d213cf4ede96d4d9ccad275caa0bb39fc 100644 (file)
--- a/src/dvdwizard.h
+++ b/src/dvdwizard.h
@@ -33,8 +33,9 @@
 
 #include "dvdwizardvob.h"
 #include "dvdwizardmenu.h"
-#include "ui_dvdwizardiso_ui.h"
+#include "dvdwizardchapters.h"
 #include "ui_dvdwizardstatus_ui.h"
+#include "ui_dvdwizardchapters_ui.h"
 
 class DvdWizard : public QWizard
 {
@@ -46,20 +47,34 @@ public:
 private:
     DvdWizardVob *m_pageVob;
     DvdWizardMenu *m_pageMenu;
-    Ui::DvdWizardIso_UI m_iso;
     Ui::DvdWizardStatus_UI m_status;
-    KTemporaryFile m_menuFile;
+
+#if KDE_IS_VERSION(4,7,0)
+    KMessageWidget *m_isoMessage;
+#endif
+
+    DvdWizardChapters *m_pageChapters;
     KTemporaryFile m_authorFile;
+    KTemporaryFile m_menuFile;
     QProcess *m_dvdauthor;
     QProcess *m_mkiso;
     QString m_creationLog;
     void cleanup();
+    QMenu *m_burnMenu;
 
 private slots:
     void slotPageChanged(int page);
     void slotRenderFinished(int exitCode, QProcess::ExitStatus status);
     void slotIsoFinished(int exitCode, QProcess::ExitStatus status);
     void generateDvd();
+    void slotPreview();
+    void slotBurn();
+    void slotGenerate();
+    void slotAbort();
+    void slotLoad();
+    void slotSave();
+    void slotShowRenderInfo();
+    void slotShowIsoInfo();
 };
 
 #endif