X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderwidget.h;h=57b4c65a3b508e33cefee9c28eed83bf1a3336ae;hb=09733bc4c03f2999f1fd1446dd34753c88d7b695;hp=33cc4b5abce974563c90ea8d4deb9c43540210b9;hpb=69d0882da5bab36886887868ed7caec816819258;p=kdenlive

diff --git a/src/renderwidget.h b/src/renderwidget.h
index 33cc4b5a..57b4c65a 100644
--- a/src/renderwidget.h
+++ b/src/renderwidget.h
@@ -40,10 +40,7 @@ public:
 
     void paint(QPainter *painter, const QStyleOptionViewItem &option,
                const QModelIndex &index) const {
-        if (index.column() == 0) {
-            QItemDelegate::paint(painter, option, index);
-            return;
-        } else if (index.column() == 1) {
+        if (index.column() == 1) {
             QRect r1 = option.rect;
             painter->save();
             if (option.state & (QStyle::State_Selected)) {
@@ -63,82 +60,47 @@ public:
             painter->setPen(option.palette.color(QPalette::Mid));
             painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , index.data(Qt::UserRole).toString());
             painter->restore();
-            return;
-        }
-        // Set up a QStyleOptionProgressBar to precisely mimic the
-        // environment of a progress bar.
-        QStyleOptionProgressBar progressBarOption;
-        progressBarOption.state = option.state;
-        progressBarOption.direction = QApplication::layoutDirection();
-        QRect rect = option.rect;
-        if (option.state & (QStyle::State_Selected)) {
-            painter->setPen(option.palette.color(QPalette::HighlightedText));
-            painter->fillRect(rect, option.palette.highlight());
-        }
-
-        int mid = rect.height() / 2;
-        rect.setTop(rect.top() + mid / 2);
-        rect.setHeight(mid);
-        progressBarOption.rect = rect;
-        progressBarOption.fontMetrics = QApplication::fontMetrics();
-        progressBarOption.minimum = 0;
-        progressBarOption.maximum = 100;
-        progressBarOption.textAlignment = Qt::AlignCenter;
-        progressBarOption.textVisible = true;
-
-        // Set the progress and text values of the style option.
-        int progress = index.data(Qt::UserRole).toInt();
-        progressBarOption.progress = progress < 0 ? 0 : progress;
-        progressBarOption.text = QString().sprintf("%d%%", progressBarOption.progress);
-
-        // Draw the progress bar onto the view.
-        QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter);
-    }
-};
-
-
-// RenderScriptDelegate is used to draw the script items.
-class RenderScriptDelegate : public QItemDelegate
-{
-    Q_OBJECT
-public:
-    RenderScriptDelegate(QWidget *parent) : QItemDelegate(parent) {}
-
-    void paint(QPainter *painter, const QStyleOptionViewItem &option,
-               const QModelIndex &index) const {
-        if (index.column() == 0) {
-            QRect r1 = option.rect;
-            painter->save();
+        } else if (index.column() == 2) {
+            // Set up a QStyleOptionProgressBar to precisely mimic the
+            // environment of a progress bar.
+            QStyleOptionProgressBar progressBarOption;
+            progressBarOption.state = option.state;
+            progressBarOption.direction = QApplication::layoutDirection();
+            QRect rect = option.rect;
             if (option.state & (QStyle::State_Selected)) {
                 painter->setPen(option.palette.color(QPalette::HighlightedText));
-                painter->fillRect(r1, option.palette.highlight());
-            } else painter->setPen(option.palette.color(QPalette::Text));
-            QFont font = painter->font();
-            font.setBold(true);
-            painter->setFont(font);
-            int mid = (int)((r1.height() / 2));
-            r1.setBottom(r1.y() + mid);
-            r1.setLeft(r1.left() + 3);
-            QRect r2 = option.rect;
-            r2.setTop(r2.y() + mid);
-            r2.setLeft(r2.left() + 3);
-            painter->drawText(r1, Qt::AlignLeft | Qt::AlignBottom , index.data().toString());
-            font.setBold(false);
-            painter->setFont(font);
-            painter->setPen(option.palette.color(QPalette::Mid));
-            painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , index.data(Qt::UserRole).toString());
-            painter->restore();
-            return;
+                painter->fillRect(rect, option.palette.highlight());
+            }
+
+            int mid = rect.height() / 2;
+            rect.setTop(rect.top() + mid / 2);
+            rect.setHeight(mid);
+            progressBarOption.rect = rect;
+            progressBarOption.fontMetrics = QApplication::fontMetrics();
+            progressBarOption.minimum = 0;
+            progressBarOption.maximum = 100;
+            progressBarOption.textAlignment = Qt::AlignCenter;
+            progressBarOption.textVisible = true;
+
+            // Set the progress and text values of the style option.
+            int progress = index.data(Qt::UserRole).toInt();
+            progressBarOption.progress = progress < 0 ? 0 : progress;
+            progressBarOption.text = QString().sprintf("%d%%", progressBarOption.progress);
+
+            // Draw the progress bar onto the view.
+            QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter);
         } else QItemDelegate::paint(painter, option, index);
     }
 };
 
+
 class RenderWidget : public QDialog
 {
     Q_OBJECT
 
 public:
     explicit RenderWidget(const QString &projectfolder, QWidget * parent = 0);
+    virtual ~RenderWidget();
     void setGuides(QDomElement guidesxml, double duration);
     void focusFirstVisibleItem();
     void setProfile(MltVideoProfile profile);
@@ -146,7 +108,7 @@ public:
     void setRenderStatus(const QString &dest, int status, const QString &error);
     void setDocumentPath(const QString path);
     void reloadProfiles();
-    void setRenderProfile(const QString &dest, const QString &name);
+    void setRenderProfile(const QString &dest, const QString &group, const QString &name, const QString &url);
     int waitingJobsCount() const;
     QString getFreeScriptName(const QString &prefix = QString());
     bool startWaitingRenderJobs();
@@ -158,6 +120,7 @@ private slots:
     void slotUpdateButtons(KUrl url);
     void slotUpdateButtons();
     void refreshView();
+    void refreshCategory();
     void refreshParams();
     void slotSaveProfile();
     void slotEditProfile();
@@ -178,24 +141,35 @@ private slots:
     void slotHideLog();
     void slotPrepareExport(bool scriptExport = false);
     void slotPlayRendering(QTreeWidgetItem *item, int);
+    void slotStartCurrentJob();
+    void slotCopyToFavorites();
 
 private:
     Ui::RenderWidget_UI m_view;
     MltVideoProfile m_profile;
     QString m_projectFolder;
+    RenderViewDelegate *m_scriptsDelegate;
+    RenderViewDelegate *m_jobsDelegate;
     bool m_blockProcessing;
+    QString m_renderer;
     void parseProfiles(QString meta = QString(), QString group = QString(), QString profile = QString());
     void parseFile(QString exportFile, bool editable);
     void updateButtons();
     KUrl filenameWithExtension(KUrl url, QString extension);
     void checkRenderStatus();
+    void startRendering(QTreeWidgetItem *item);
+    void saveProfile(QDomElement newprofile);
+    QList <QListWidgetItem *> m_renderItems;
+    QList <QListWidgetItem *> m_renderCategory;
 
 signals:
-    void doRender(const QStringList&, const QStringList&);
     void abortProcess(const QString &url);
     void openDvdWizard(const QString &url, const QString &profile);
-    void selectedRenderProfile(const QString &category, const QString &name);
+    /** Send the infos about rendering that will be saved in the document:
+    (profile destination, profile name and url of rendered file */
+    void selectedRenderProfile(const QString &, const QString &, const QString &, const QString &);
     void prepareRenderingData(bool scriptExport, bool zoneOnly, const QString &chapterFile);
+    void shutdown();
 };