X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.h;h=32c0ade5c0ca7957dcfbbb8c086fa900275b0e1e;hb=6f206f85a9c002e4e8e5f80880750739a088ec52;hp=cea8053802e7716a9508b3d33bfcd398f0d79074;hpb=7860e004dc0e5d594835ce51b58ad1ec9eb3e420;p=kdenlive diff --git a/src/projectlist.h b/src/projectlist.h index cea80538..32c0ade5 100644 --- a/src/projectlist.h +++ b/src/projectlist.h @@ -42,10 +42,6 @@ #include #include -#if KDE_IS_VERSION(4,7,0) -#include -#endif - #ifdef NEPOMUK #include #include @@ -59,10 +55,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; @@ -144,31 +169,28 @@ public: 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)); QRectF bounding; painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText, &bounding); - 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(); - painter->setPen(Qt::NoPen); - color.setAlpha(180); - painter->setBrush(QBrush(color)); - QRect progress(pixmapPoint.x() + 1, pixmapPoint.y() + pixmap.height() - 9, pixmap.width() - 2, 8); - painter->drawRect(progress); - painter->setBrush(option.palette.text()); - if (jobProgress > 0) { - progress.adjust(1, 1, 0, -1); - progress.setWidth((pixmap.width() - 4) * jobProgress / 100); - painter->drawRect(progress); - } else if (jobProgress == JOBWAITING) { - // Draw kind of a pause icon - progress.adjust(1, 1, 0, -1); - progress.setWidth(2); - painter->drawRect(progress); - progress.moveLeft(progress.right() + 2); + 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)); + painter->drawRect(progress); + painter->setBrush(option.palette.link()); + progress.adjust(2, 2, -2, -2); + if (jobProgress == JOBWAITING) { + progress.setLeft(progress.right() - 2); + painter->drawRect(progress); + progress.moveLeft(progress.left() - 5); + painter->drawRect(progress); + } + else if (jobProgress > 0) { + progress.setWidth(progress.width() * jobProgress / 100); painter->drawRect(progress); } } else if (jobProgress == JOBCRASHED) { @@ -221,8 +243,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 that match a condition. */ - QStringList getConditionalIds(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 +252,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); @@ -306,7 +328,8 @@ public slots: /** @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 QString&,const QString&); + 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: @@ -326,7 +349,7 @@ private: 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. */ @@ -341,6 +364,7 @@ private: QList m_thumbnailQueue; QAction *m_proxyAction; QMutex m_jobMutex; + QMutex m_processMutex; bool m_abortAllJobs; /** @brief We are cleaning up the project list, so stop processing signals. */ bool m_closing; @@ -349,10 +373,11 @@ private: 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 @@ -399,7 +424,14 @@ private: /** @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); + 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(); @@ -428,16 +460,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. */ @@ -445,7 +477,7 @@ private slots: /** @brief Discard a running clip jobs. */ void slotCancelRunningJob(const QString id, stringMap); /** @brief Update a clip's job status. */ - void slotProcessLog(const QString, int progress, int, const QString = 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()); @@ -461,6 +493,12 @@ private slots: 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); @@ -469,7 +507,7 @@ signals: void showClipProperties(QList , QMap commonproperties); void projectModified(); void loadingIsOver(); - void displayMessage(const QString, int progress); + 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 @@ -483,7 +521,7 @@ signals: 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); @@ -493,8 +531,12 @@ signals: 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 QString &filterName, stringMap params); + void gotFilterJobResults(const QString &id, int startPos, int track, stringMap params, stringMap extra); + void pauseMonitor(); + void updateAnalysisData(DocClipBase *); + void addMarkers(const QString &, QList ); }; #endif +