Merge branch 'master' into feature/pkey

[kdenlive] / src / dvdwizard.h

diff --git a/src/dvdwizard.h b/src/dvdwizard.h
index 46534bbbf7aa27e61796eebc76ed66ae97420e77..4f045be98678bcc0be7135a00f40d2d825536a9e 100644 (file)
--- a/src/dvdwizard.h
+++ b/src/dvdwizard.h
@@ -34,7 +34,6 @@
 #include "dvdwizardvob.h"
 #include "dvdwizardmenu.h"
 #include "dvdwizardchapters.h"
-#include "ui_dvdwizardiso_ui.h"
 #include "ui_dvdwizardstatus_ui.h"
 #include "ui_dvdwizardchapters_ui.h"
 
@@ -48,16 +47,23 @@ public:
 private:
     DvdWizardVob *m_pageVob;
     DvdWizardMenu *m_pageMenu;
-    Ui::DvdWizardIso_UI m_iso;
     Ui::DvdWizardStatus_UI m_status;
+
+#if KDE_IS_VERSION(4,7,0)
+    KMessageWidget *m_isoMessage;
+#endif
+
     DvdWizardChapters *m_pageChapters;
-    KTemporaryFile m_menuFile;
     KTemporaryFile m_authorFile;
+    KTemporaryFile m_menuFile;
+    KTemporaryFile m_menuVobFile;
     QProcess *m_dvdauthor;
     QProcess *m_mkiso;
     QString m_creationLog;
     void cleanup();
     QMenu *m_burnMenu;
+    void errorMessage(const QString &text);
+    void infoMessage(const QString &text);
 
 private slots:
     void slotPageChanged(int page);
@@ -66,6 +72,12 @@ private slots:
     void generateDvd();
     void slotPreview();
     void slotBurn();
+    void slotGenerate();
+    void slotAbort();
+    void slotLoad();
+    void slotSave();
+    void slotShowRenderInfo();
+    void slotShowIsoInfo();
 };
 
 #endif