Correctly focus clips / folders when they are created:

[kdenlive] / src / kdenlivedoc.h

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index ccc4ba6072c9d4f26765ad682a4acf92bf7d87bb..0f7cca0414efebe5c5ed4ad35403a5f346bc348f 100644 (file)
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -45,10 +45,11 @@ class DocClipBase;
 class MainWindow;
 class TrackInfo;
 
-class KdenliveDoc: public QObject {
+class KdenliveDoc: public QObject
+{
 Q_OBJECT public:
 
-    KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent = 0);
+    KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, QString profileName, const QPoint tracks, Render *render, MainWindow *parent = 0);
     ~KdenliveDoc();
     QDomNodeList producersList();
     double fps() const;
@@ -56,43 +57,32 @@ Q_OBJECT public:
     int height() const;
     KUrl url() const;
     KAutoSaveFile *m_autosave;
-    void backupMltPlaylist();
     Timecode timecode() const;
     QDomDocument toXml();
     //void setRenderer(Render *render);
     QUndoStack *commandStack();
     QString producerName(const QString &id);
-    void setProducerDuration(const QString &id, int duration);
-    int getProducerDuration(const QString &id);
     Render *renderer();
-    QDomElement m_guidesXml;
+    QDomDocument m_guidesXml;
     QDomElement guidesXml() const;
     ClipManager *clipManager();
     void addClip(QDomElement elem, QString clipId, bool createClipItem = true);
     void addClipInfo(QDomElement elem, QDomElement orig, QString clipId);
-    void addFolder(const QString foldername, const QString &clipId, bool edit);
-    void deleteFolder(const QString foldername, const QString &clipId);
     void slotAddClipFile(const KUrl url, const QString group, const QString &groupId = QString());
     void slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId = QString());
-    void slotAddFolder(const QString folderName);
-    void slotDeleteFolder(const QString folderName, const QString &id);
-    void slotEditFolder(const QString folderName, const QString oldfolderName, const QString &clipId);
-    void slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId = QString());
-    void slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, const QString group, const QString &groupId = QString());
     void deleteClip(const QString &clipId);
     int getFramePos(QString duration);
     DocClipBase *getBaseClip(const QString &clipId);
     void updateClip(const QString &id);
     void deleteProjectClip(QList <QString> ids);
-    void deleteProjectFolder(QMap <QString, QString> map);
     /** Inform application of the audio thumbnails generation progress */
     void setThumbsProgress(const QString &message, int progress);
-    QString profilePath() const;
+    const QString &profilePath() const;
     MltVideoProfile mltProfile() const;
-    QString description() const;
+    const QString description() const;
     void setUrl(KUrl url);
     void setProfilePath(QString path);
-    const QString &getFreeClipId();
+    const QString getFreeClipId();
     /** does the document need saving */
     bool isModified() const;
     /** Returns project folder, used to store project files (titles, effects,...) */
@@ -102,9 +92,9 @@ Q_OBJECT public:
     void syncGuides(QList <Guide *> guides);
     void setZoom(int factor);
     int zoom() const;
-    const double dar();
+    double dar();
     double projectDuration() const;
-    bool saveSceneList(const QString &path, QDomDocument sceneList);
+    bool saveSceneList(const QString &path, const QString &scene);
     int tracksCount() const;
     TrackInfo trackInfoAt(int ix) const;
     void insertTrack(int ix, TrackInfo type);
@@ -112,9 +102,9 @@ Q_OBJECT public:
     void setTrackType(int ix, TrackInfo type);
     const QList <TrackInfo> tracksList() const;
     QPoint getTracksCount() const;
-    QString getTracksInfo() const;
     void switchTrackVideo(int ix, bool hide);
     void switchTrackAudio(int ix, bool hide);
+    void switchTrackLock(int ix, bool lock);
     void cachePixmap(const QString &fileId, const QPixmap &pix) const;
     void setProjectFolder(KUrl url);
     QString getLadspaFile() const;
@@ -122,13 +112,14 @@ Q_OBJECT public:
     QPoint zone() const;
     void setSceneList();
     void updatePreviewSettings();
+    bool isTrackLocked(int ix) const;
+    void setDocumentProperty(const QString &name, const QString &value);
+    const QString getDocumentProperty(const QString &name) const;
 
 private:
     KUrl m_url;
     QDomDocument m_document;
-    QString m_projectName;
     double m_fps;
-    int m_zoom;
     /** Cursor position at document opening */
     int m_startPos;
     int m_width;
@@ -136,47 +127,48 @@ private:
     Timecode m_timecode;
     Render *m_render;
     QUndoStack *m_commandStack;
-    QDomDocument generateSceneList();
     ClipManager *m_clipManager;
     MltVideoProfile m_profile;
-    QString m_scenelist;
     QTimer *m_autoSaveTimer;
     QString m_searchFolder;
-    /** tells whether current doc has been changed since last save event */
+    /** tells whether current doc has been changed since last save event */
     bool m_modified;
     /** Project folder, used to store project files (titles, effects,...) */
     KUrl m_projectFolder;
     double m_documentLoadingStep;
     double m_documentLoadingProgress;
-    int m_zoneStart;
-    int m_zoneEnd;
+    bool m_abortLoading;
+    QMap <QString, QString> m_documentProperties;
 
     QList <TrackInfo> m_tracksList;
 
-    bool convertDocument(double version);
     QDomDocument createEmptyDocument(const int videotracks, const int audiotracks);
-    QString colorToString(const QColor& c);
-    void checkProjectClips();
+
     void setNewClipResource(const QString &id, const QString &path);
     QString searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const;
     void moveProjectData(KUrl url);
+    bool checkDocumentClips(QDomNodeList infoproducers);
 
 public slots:
-    void slotCreateTextClip(QString group, const QString &groupId);
+    void slotCreateColorClip(const QString &name, const QString &color, const QString &duration, QString group, const QString &groupId);
+    void slotCreateSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, QString group, const QString &groupId);
+    void slotCreateTextClip(QString group, const QString &groupId, const QString &templatePath = QString());
+    void slotCreateTextTemplateClip(QString group, const QString &groupId, KUrl path);
     /** Set to true if document needs saving, false otherwise */
     void setModified(bool mod = true);
+    void checkProjectClips();
 
 private slots:
     void slotAutoSave();
 
 signals:
+    void resetProjectList();
     void addProjectClip(DocClipBase *, bool getInfo = true);
-    void addProjectFolder(const QString, const QString &, bool, bool edit = false);
     void signalDeleteProjectClip(const QString &);
     void updateClipDisplay(const QString&);
     void deleteTimelineClip(const QString&);
     void progressInfo(const QString &, int);
-    /** emited when the document state has been modified (= needs saving or not) */
+    /** emitted when the document state has been modified (= needs saving or not) */
     void docModified(bool);
     void selectLastAddedClip(const QString &);
     void guidesUpdated();