X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Farchivewidget.h;h=de4c1f54ba51021452626f89befd36db604e013b;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=5903937e0431c31430e8083260e74502437e4142;hpb=86e749b3719d01c440202540c3d3bb19a2b9bfee;p=kdenlive

diff --git a/src/archivewidget.h b/src/archivewidget.h
index 5903937e..de4c1f54 100644
--- a/src/archivewidget.h
+++ b/src/archivewidget.h
@@ -26,14 +26,17 @@
 #include "docclipbase.h"
 
 #include <kio/global.h>
+#include <KIO/CopyJob>
+#include <KTemporaryFile>
+#include <kdeversion.h>
+
 #include <QLabel>
 #include <QDialog>
 #include <QList>
-#include <KIO/CopyJob>
-#include <KTemporaryFile>
+
 
 class KJob;
-class KTar;
+class KArchive;
 
 /**
  * @class ArchiveWidget
@@ -41,22 +44,26 @@ class KTar;
  * @author Jean-Baptiste Mardelle
  */
 
+#if KDE_IS_VERSION(4,7,0)
+    class KMessageWidget;
+#endif
+
 class ArchiveWidget : public QDialog, public Ui::ArchiveWidget_UI
 {
     Q_OBJECT
 
 public:
-    ArchiveWidget(QString projectName, QDomDocument doc, QList <DocClipBase*> list, QStringList luma_list, QWidget * parent = 0);
+    ArchiveWidget(const QString &projectName, const QDomDocument &doc, const QList <DocClipBase*> &list, const QStringList &luma_list, QWidget * parent = 0);
     // Constructor for extracting widget
-    ArchiveWidget(const KUrl &url, QWidget * parent = 0);
+    explicit ArchiveWidget(const KUrl &url, QWidget * parent = 0);
     ~ArchiveWidget();
 
-    QString extractedProjectFile();
+    QString extractedProjectFile() const;
     
 private slots:
     void slotCheckSpace();
     bool slotStartArchiving(bool firstPass = true);
-    void slotArchivingFinished(KJob *job = NULL);
+    void slotArchivingFinished(KJob *job = NULL, bool finished = false);
     void slotArchivingProgress(KJob *, qulonglong);
     virtual void done ( int r );
     bool closeAccepted();
@@ -68,6 +75,10 @@ private slots:
     void slotExtractingFinished();
     void slotExtractProgress();
     void slotGotProgress(KJob*);
+    void openArchiveForExtraction();
+    void slotDisplayMessage(const QString &icon, const QString &text);
+    void slotJobResult(bool success, const QString &text);
+    void slotProxyOnly(int onlyProxy);
 
 protected:
     virtual void closeEvent ( QCloseEvent * e );
@@ -88,10 +99,17 @@ private:
     KUrl m_extractUrl;
     QString m_projectName;
     QTimer *m_progressTimer;
-    KTar *m_extractArchive;
+    KArchive *m_extractArchive;
+    int m_missingClips;
+    
+#if KDE_IS_VERSION(4,7,0)
+    KMessageWidget *m_infoMessage;
+#endif
 
     /** @brief Generate tree widget subitems from a string list of urls. */
-    void generateItems(QTreeWidgetItem *parentItem, QStringList items);
+    void generateItems(QTreeWidgetItem *parentItem, const QStringList &items);
+    /** @brief Generate tree widget subitems from a map of clip ids / urls. */
+    void generateItems(QTreeWidgetItem *parentItem, const QMap<QString, QString> &items);
     /** @brief Replace urls in project file. */
     bool processProjectFile();
 
@@ -99,6 +117,7 @@ signals:
     void archivingFinished(bool);
     void archiveProgress(int);
     void extractingFinished();
+    void showMessage(const QString &, const QString &);
 };