X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.h;h=b944eea1425c8ce91d24d6d1ec4939c5cdb1477a;hb=ac8c99168f151e2f351043d13500741ce1ca8966;hp=a0f87f3bad135009b10df8ebc0a26f7fe77935ea;hpb=dd604e8fc559277a2fc42a161feb0de91d3515a5;p=kdenlive diff --git a/src/projectlist.h b/src/projectlist.h index a0f87f3b..b944eea1 100644 --- a/src/projectlist.h +++ b/src/projectlist.h @@ -42,15 +42,17 @@ #include #include -#if KDE_IS_VERSION(4,7,0) -#include -#endif - #ifdef NEPOMUK #include #include #endif +#ifdef NEPOMUKCORE +#include +#include +#endif + + #include "definitions.h" #include "timecode.h" #include "kdenlivesettings.h" @@ -59,10 +61,39 @@ #include "projecttree/abstractclipjob.h" #include +#if KDE_IS_VERSION(4,7,0) +#include +#else +// Dummy KMessageWidget to allow compilation of MyMessageWidget class since Qt's moc doesn work inside #ifdef +#include + +class KMessageWidget: public QLabel +{ +public: + KMessageWidget(QWidget * = 0) {}; + KMessageWidget(const QString &, QWidget * = 0) {}; + virtual ~KMessageWidget(){}; +}; +#endif + +class MyMessageWidget: public KMessageWidget +{ + Q_OBJECT +public: + MyMessageWidget(QWidget *parent = 0); + MyMessageWidget(const QString &text, QWidget *parent = 0); + +protected: + bool event(QEvent* ev); + +signals: + void messageClosing(); +}; + namespace Mlt { class Producer; -}; +} class ProjectItem; class ProjectListView; @@ -80,7 +111,7 @@ class SmallInfoLabel: public QPushButton Q_OBJECT public: SmallInfoLabel(QWidget *parent = 0); - + static const QString getStyleSheet(const QPalette &p); private: QTimeLine* m_timeLine; @@ -91,13 +122,13 @@ private slots: void slotTimeLineChanged(qreal value); void slotTimeLineFinished(); }; - + class InvalidDialog: public KDialog { Q_OBJECT public: - InvalidDialog(const QString &caption, const QString &message, bool infoOnly, QWidget *parent = 0); - virtual ~InvalidDialog(); + explicit InvalidDialog(const QString &caption, const QString &message, bool infoOnly, QWidget *parent = 0); + ~InvalidDialog(); void addClip(const QString &id, const QString &path); QStringList getIds() const; private: @@ -143,46 +174,41 @@ public: painter->setFont(font); QString subText = index.data(DurationRole).toString(); int usage = index.data(UsageRole).toInt(); - if (usage != 0) subText.append(QString(" (%1)").arg(usage)); - if (option.state & (QStyle::State_Selected)) painter->setPen(option.palette.color(QPalette::Mid)); + if (usage != 0) subText.append(QString::fromLatin1(" (%1)").arg(usage)); QRectF bounding; painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText, &bounding); - - int proxy = index.data(Qt::UserRole + 5).toInt(); - if (proxy != 0 && proxy != JOBDONE) { - QString proxyText; - QColor color; - if (proxy != JOBCRASHED) { - // Draw proxy progress bar - color = option.palette.alternateBase().color(); - painter->setPen(Qt::NoPen); - color.setAlpha(180); + int jobProgress = index.data(Qt::UserRole + 5).toInt(); + if (jobProgress != 0 && jobProgress != JOBDONE && jobProgress != JOBABORTED) { + if (jobProgress != JOBCRASHED) { + // Draw job progress bar + QColor color = option.palette.alternateBase().color(); + color.setAlpha(150); + painter->setPen(option.palette.link().color()); + QRect progress(pixmapPoint.x() + 2, pixmapPoint.y() + pixmap.height() - 9, pixmap.width() - 4, 7); painter->setBrush(QBrush(color)); - QRect progress(pixmapPoint.x() + 1, pixmapPoint.y() + pixmap.height() - 5, pixmap.width() - 2, 4); painter->drawRect(progress); - painter->setBrush(option.palette.text()); - if (proxy > 0) { - progress.adjust(1, 1, 0, -1); - progress.setWidth((pixmap.width() - 4) * proxy / 100); + painter->setBrush(option.palette.link()); + progress.adjust(2, 2, -2, -2); + if (jobProgress == JOBWAITING) { + progress.setLeft(progress.right() - 2); painter->drawRect(progress); - } - else if (proxy == JOBWAITING) { - // Draw kind of a pause icon - progress.adjust(1, 1, 0, -1); - progress.setWidth(2); + progress.moveLeft(progress.left() - 5); painter->drawRect(progress); - progress.moveLeft(progress.right() + 2); + } + else if (jobProgress > 0) { + progress.setWidth(progress.width() * jobProgress / 100); painter->drawRect(progress); } - } - else if (proxy == JOBCRASHED) { - proxyText = index.data(Qt::UserRole + 7).toString(); - QRectF txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, " " + proxyText + " "); - painter->setPen(Qt::NoPen); - painter->setBrush(option.palette.highlight()); - painter->drawRoundedRect(txtBounding, 2, 2); - painter->setPen(option.palette.highlightedText().color()); - painter->drawText(txtBounding, Qt::AlignHCenter | Qt::AlignVCenter , proxyText); + } else if (jobProgress == JOBCRASHED) { + QString jobText = index.data(Qt::UserRole + 7).toString(); + if (!jobText.isEmpty()) { + QRectF txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, QLatin1Char(' ') + jobText + QLatin1Char(' ') ); + painter->setPen(Qt::NoPen); + painter->setBrush(option.palette.highlight()); + painter->drawRoundedRect(txtBounding, 2, 2); + painter->setPen(option.palette.highlightedText().color()); + painter->drawText(txtBounding, Qt::AlignCenter, jobText); + } } } @@ -199,6 +225,10 @@ public: #ifdef NEPOMUK KRatingPainter::paintRating(painter, r1, Qt::AlignCenter, index.data().toInt()); #endif +#ifdef NEPOMUKCORE + KRatingPainter::paintRating(painter, r1, Qt::AlignCenter, index.data().toInt()); +#endif + } else { QStyledItemDelegate::paint(painter, option, index); } @@ -223,6 +253,8 @@ public: void setupGeneratorMenu(const QHash& menus); QString currentClipUrl() const; KUrl::List getConditionalUrls(const QString &condition) const; + /** @brief Get a list of selected clip Id's and url's that match a condition. */ + QMap getConditionalIds(const QString &condition) const; QDomDocument generateTemplateXml(QString data, const QString &replaceString); void cleanup(); void trashUnusedClips(); @@ -230,8 +262,8 @@ public: void addClipCut(const QString &id, int in, int out, const QString desc, bool newItem); void removeClipCut(const QString &id, int in, int out); void focusTree() const; - SubProjectItem *getSubItem(ProjectItem *clip, QPoint zone); - void doUpdateClipCut(const QString &id, const QPoint oldzone, const QPoint zone, const QString &comment); + SubProjectItem *getSubItem(ProjectItem *clip, const QPoint &zone); + void doUpdateClipCut(const QString &id, const QPoint &oldzone, const QPoint &zone, const QString &comment); bool hasMissingClips(); void deleteProjectFolder(QMap map); void selectItemById(const QString &clipId); @@ -257,10 +289,16 @@ public: void clearSelection(); /** @brief Print required overlays over clip thumb (proxy, stabilized,...). */ void processThumbOverlays(ProjectItem *item, QPixmap &pix); + /** @brief Start an MLT process job. */ + void startClipFilterJob(const QString &filterName, const QString &condition); + /** @brief Set current document for the project tree. */ + void setDocument(KdenliveDoc *doc); + + /** @brief Palette was changed, update style. */ + void updatePalette(); public slots: - void setDocument(KdenliveDoc *doc); - void updateAllClips(bool displayRatioChanged, bool fpsChanged, QStringList brokenClips); + void updateAllClips(bool displayRatioChanged, bool fpsChanged, const QStringList &brokenClips); void slotReplyGetImage(const QString &clipId, const QImage &img); void slotReplyGetImage(const QString &clipId, const QString &name, int width, int height); void slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const stringMap &properties, const stringMap &metadata, bool replace); @@ -275,13 +313,13 @@ public slots: /** @brief Prepares removing the selected items. */ void slotRemoveClip(); - void slotAddClip(const QString url, const QString &groupName, const QString &groupId); - void slotAddClip(const QList givenList = QList (), const QString &groupName = QString(), const QString &groupId = QString()); + void slotAddClip(const QString &url, const QString &groupName, const QString &groupId); + void slotAddClip(const QList &givenList = QList (), const QString &groupName = QString(), const QString &groupId = QString()); /** @brief Adds, edits or deletes a folder item. * * This is triggered by AddFolderCommand and EditFolderCommand. */ - void slotAddFolder(const QString foldername, const QString &clipId, bool remove, bool edit = false); + void slotAddFolder(const QString &foldername, const QString &clipId, bool remove, bool edit = false); void slotResetProjectList(); void slotOpenClip(); void slotEditClip(); @@ -297,6 +335,12 @@ public slots: void slotDeleteProxy(const QString proxyPath); /** @brief Start a hard cut clip job. */ void slotCutClipJob(const QString &id, QPoint zone); + /** @brief Start transcoding selected clips. */ + void slotTranscodeClipJob(const QString &condition, QString params, QString desc); + /** @brief Start an MLT process job. */ + void slotStartFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QMap &); + void slotSetThumbnail(const QString &id, int framePos, QImage img); + private: ProjectListView *m_listView; @@ -309,10 +353,13 @@ private: ProjectItem *getItemById(const QString &id); QTreeWidgetItem *getAnyItemById(const QString &id); FolderProjectItem *getFolderItemById(const QString &id); + FolderProjectItem *getFolderItemByName(const QString &name); QAction *m_openAction; QAction *m_reloadAction; + QAction *m_discardCurrentClipJobs; + QMenu *m_extractAudioAction; QMenu *m_transcodeAction; - QMenu *m_stabilizeAction; + QMenu *m_clipsActionsMenu; KdenliveDoc *m_doc; ItemDelegate *m_listViewDelegate; /** @brief False if we have not yet finished opening the document. */ @@ -326,29 +373,26 @@ private: QMap m_producerQueue; QList m_thumbnailQueue; QAction *m_proxyAction; - QStringList m_processingClips; - /** @brief Holds a list of proxy urls that should be aborted. */ - QStringList m_abortProxy; - /** @brief Holds a list of proxy urls that are currently being created. */ - QStringList m_processingProxy; - QMutex m_mutex; + QMutex m_jobMutex; + QMutex m_processMutex; bool m_abortAllJobs; /** @brief We are cleaning up the project list, so stop processing signals. */ bool m_closing; QList m_jobList; - QFutureSynchronizer m_proxyThreads; + QFutureSynchronizer m_jobThreads; InvalidDialog *m_invalidClipDialog; QMenu *m_jobsMenu; SmallInfoLabel *m_infoLabel; + /** @brief A list of strings containing the last error logs for clip jobs. */ + QStringList m_errorLog; + #if KDE_IS_VERSION(4,7,0) - KMessageWidget *m_infoMessage; - /** @brief A string containing the last error log for a clip job. */ - QString m_errorLog; + MyMessageWidget *m_infoMessage; /** @brief The action that will trigger the log dialog. */ QAction *m_logAction; #endif - void requestClipThumbnail(const QString id); + void requestClipThumbnail(const QString &id); /** @brief Creates an EditFolderCommand to change the name of an folder item. */ void editFolder(const QString folderName, const QString oldfolderName, const QString &clipId); @@ -368,22 +412,36 @@ private: /** @brief Sets the buttons enabled/disabled according to selected item. */ void updateButtons() const; - /** @brief Set the Proxy status on a clip. + /** @brief Set the Proxy status on a clip. * @param item The clip item to set status - * @param status The job status (see definitions.h) */ - void setJobStatus(ProjectItem *item, CLIPJOBSTATUS status, int progress = 0, JOBTYPE jobType = NOJOBTYPE); + * @param jobType The job type + * @param status The job status (see definitions.h) + * @param progress The job progress (in percents) + * @param statusMessage The job info message */ + void setJobStatus(ProjectItem *item, JOBTYPE jobType, CLIPJOBSTATUS status, int progress = 0, const QString &statusMessage = QString()); void monitorItemEditing(bool enable); /** @brief Get cached thumbnail for a project's clip or create it if no cache. */ void getCachedThumbnail(ProjectItem *item); void getCachedThumbnail(SubProjectItem *item); /** @brief The clip is about to be reloaded, cancel thumbnail requests. */ void resetThumbsProducer(DocClipBase *clip); - /** @brief Check if it is necessary to start a job thread. */ - void startJobProcess(); - /** @brief Check if a clip has a running or pending proxy process. */ - bool hasPendingProxy(ProjectItem *item); + /** @brief Check if a clip has a running or pending job process. */ + bool hasPendingJob(ProjectItem *item, JOBTYPE type); /** @brief Delete pending jobs for a clip. */ void deleteJobsForClip(const QString &clipId); + /** @brief Discard specific job type for a clip. */ + void discardJobs(const QString &id, JOBTYPE type = NOJOBTYPE); + /** @brief Get the list of job names for current clip. */ + QStringList getPendingJobs(const QString &id); + /** @brief Start an MLT process job. */ + void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, stringMap extraParams = stringMap()); + /** @brief Create rounded shape pixmap for project tree thumb. */ + QPixmap roundedPixmap(const QImage &img); + QPixmap roundedPixmap(const QPixmap &source); + /** @brief Extract a clip's metadata with the exiftool program. */ + void extractMetadata(DocClipBase *clip); + /** @brief Add a special FFmpeg tag if clip matches some properties (for example set full_luma for Sony NEX camcorders. */ + //void checkCamcorderFilters(DocClipBase *clip, QMap meta); private slots: void slotClipSelected(); @@ -397,7 +455,7 @@ private slots: void slotContextMenu(const QPoint &pos, QTreeWidgetItem *item); /** @brief Creates an AddFolderCommand. */ - void slotAddFolder(); + void slotAddFolder(const QString &name = QString()); /** @brief This is triggered when a clip description has been modified. */ void slotItemEdited(QTreeWidgetItem *item, int column); @@ -412,16 +470,16 @@ private slots: /** @brief Try to find a matching profile for given item. */ bool adjustProjectProfileToItem(ProjectItem *item = NULL); /** @brief Add a sequence from the stopmotion widget. */ - void slotAddOrUpdateSequence(const QString frameName); + void slotAddOrUpdateSequence(const QString &frameName); /** @brief A proxy clip was created, update display. */ void slotGotProxy(const QString &proxyPath); void slotGotProxy(ProjectItem *item); /** @brief Enable / disable proxy for current clip. */ void slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy = NULL); /** @brief Put clip in the proxy waiting list. */ - void slotCreateProxy(const QString id); + void slotCreateProxy(const QString &id); /** @brief Stop creation of this clip's proxy. */ - void slotAbortProxy(const QString id, const QString path); + void slotAbortProxy(const QString &id, const QString& path); /** @brief Start creation of clip jobs. */ void slotProcessJobs(); /** @brief Discard running and pending clip jobs. */ @@ -429,41 +487,66 @@ private slots: /** @brief Discard a running clip jobs. */ void slotCancelRunningJob(const QString id, stringMap); /** @brief Update a clip's job status. */ - void slotProcessLog(ProjectItem *item, int progress, int); - /** @brief A clip fob crashed, inform user. */ - void slotJobCrashed(ProjectItem *item, const QString &label, const QString &actionName = QString(), const QString details = QString()); + void slotProcessLog(const QString&, int progress, int, const QString & tmp= QString()); + /** @brief A clip job crashed, inform user. */ + void slotUpdateJobStatus(const QString id, int type, int status, const QString label, const QString actionName, const QString details); + void slotUpdateJobStatus(ProjectItem *item, int type, int status, const QString &label, const QString &actionName = QString(), const QString details = QString()); /** @brief Display error log for last failed job. */ void slotShowJobLog(); + /** @brief A proxy clip is ready. */ + void slotGotProxyForId(const QString); + /** @brief Check if it is necessary to start a job thread. */ + void slotCheckJobProcess(); + /** @brief Fill the jobs menu with current clip's jobs. */ + void slotPrepareJobsMenu(); + /** @brief Discard all jobs for current clip. */ + void slotDiscardClipJobs(); + /** @brief Make sure current clip is visible in project tree. */ + void slotCheckScrolling(); + /** @brief Reset all text and log data from info message widget. */ + void slotResetInfoMessage(); + /** @brief close warning info passive popup. */ + void slotClosePopup(); + /** @brief process clip job result. */ + void slotGotFilterJobResults(QString ,int , int, stringMap, stringMap); signals: - void clipSelected(DocClipBase *, QPoint zone = QPoint(), bool forceUpdate = false); + void clipSelected(DocClipBase *, const QPoint &zone = QPoint(), bool forceUpdate = false); void receivedClipDuration(const QString &); void showClipProperties(DocClipBase *); - void showClipProperties(QList , QMap commonproperties); + void showClipProperties(const QList &, const QMap &commonproperties); void projectModified(); void loadingIsOver(); - void displayMessage(const QString, int progress); - void clipNameChanged(const QString, const QString); + void displayMessage(const QString&, int progress, MessageType type = DefaultMessage); + void clipNameChanged(const QString&, const QString&); void clipNeedsReload(const QString&); /** @brief A property affecting display was changed, so we need to update monitors and thumbnails * @param id: The clip's id string * @param resetThumbs Should we recreate the timeline thumbnails. */ void refreshClip(const QString &id, bool resetThumbs); void updateRenderStatus(); - void deleteProjectClips(QStringList ids, QMap folderids); + void deleteProjectClips(const QStringList &ids, const QMap &folderids); void findInTimeline(const QString &clipId); /** @brief Request a profile change for current document. */ void updateProfile(const QString &); void processNextThumbnail(); /** @brief Activate the clip monitor. */ - void raiseClipMonitor(); + void raiseClipMonitor(bool forceRefresh); /** @brief Set number of running jobs. */ void jobCount(int); - void cancelRunningJob(const QString, stringMap); - void processLog(ProjectItem *, int , int); + void cancelRunningJob(const QString&, const stringMap&); + void processLog(const QString&, int , int, const QString & = QString()); void addClip(const QString, const QString &, const QString &); - void jobCrashed(ProjectItem *item, const QString &label, const QString &actionName = QString(), const QString details = QString()); + void updateJobStatus(const QString&, int, int, const QString &label = QString(), const QString &actionName = QString(), const QString &details = QString()); + void gotProxy(const QString&); + void checkJobProcess(); + /** @brief A Filter Job produced results, send them back to the clip. */ + void gotFilterJobResults(const QString &id, int startPos, int track, const stringMap ¶ms, const stringMap &extra); + void pauseMonitor(); + void updateAnalysisData(DocClipBase *); + void addMarkers(const QString &, const QList &); }; #endif +