fix crash when starting under macOSX

[kdenlive] / src / effectstackview.cpp

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index b643085b87e4e87d97e37c3c528fb22087649b29..939a58f93dcf73dd9cf25b246bcd23ab9713487e 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -30,12 +30,12 @@
 #include "effectslist.h"
 #include "clipitem.h"
 #include "mainwindow.h"
-
+#include "kdenlivesettings.h"
 
 EffectStackView::EffectStackView(QWidget *parent)
         : QWidget(parent) {
     ui.setupUi(this);
-    effectedit = new EffectStackEdit(ui.frame, this);
+    effectedit = new EffectStackEdit(ui.frame);
     //ui.effectlist->horizontalHeader()->setVisible(false);
     //ui.effectlist->verticalHeader()->setVisible(false);
     clipref = NULL;
@@ -68,8 +68,8 @@ EffectStackView::EffectStackView(QWidget *parent)
     effectLists["audio"] = &MainWindow::audioEffects;
     effectLists["video"] = &MainWindow::videoEffects;
     effectLists["custom"] = &MainWindow::customEffects;
-
-    ui.infoBox->hide();
+    ui.splitter->setStretchFactor(1, 10);
+    ui.splitter->setStretchFactor(0, 1);
     setEnabled(false);
 }
 
@@ -77,8 +77,8 @@ void EffectStackView::setMenu(QMenu *menu) {
     ui.buttonNew->setMenu(menu);
 }
 
-void EffectStackView::updateProjectFormat(MltVideoProfile profile) {
-    effectedit->updateProjectFormat(profile);
+void EffectStackView::updateProjectFormat(MltVideoProfile profile, Timecode t) {
+    effectedit->updateProjectFormat(profile, t);
 }
 
 void EffectStackView::slotSaveEffect() {
@@ -121,16 +121,17 @@ void EffectStackView::slotUpdateEffectParams(const QDomElement& old, const QDomE
         emit updateClipEffect(clipref, old, e, ui.effectlist->currentRow());
 }
 
-void EffectStackView::slotClipItemSelected(ClipItem* c) {
-    int ix = 0;
+void EffectStackView::slotClipItemSelected(ClipItem* c, int ix) {
     if (c && c == clipref) {
-        ix = ui.effectlist->currentRow();
+        if (ix == -1) ix = ui.effectlist->currentRow();
     } else {
         clipref = c;
         if (c) ix = c->selectedEffectIndex();
+        else ix = 0;
     }
     if (clipref == NULL) {
         ui.effectlist->clear();
+        effectedit->transferParamDesc(QDomElement(), 0, 0);
         setEnabled(false);
         return;
     }
@@ -151,18 +152,34 @@ void EffectStackView::slotItemChanged(QListWidgetItem *item) {
 
 void EffectStackView::setupListView(int ix) {
     ui.effectlist->clear();
+
+    // Issue 238: Add icons for effect type in effectstack.
+    KIcon videoIcon("kdenlive-show-video");
+    KIcon audioIcon("kdenlive-show-audio");
+    QListWidgetItem* item;
+
     for (int i = 0;i < clipref->effectsCount();i++) {
         QDomElement d = clipref->effectAt(i);
+
         QDomNode namenode = d.elementsByTagName("name").item(0);
         if (!namenode.isNull()) {
-            QListWidgetItem* item = new QListWidgetItem(namenode.toElement().text(), ui.effectlist);
+            // Issue 238: Add icons for effect type in effectstack.
+            // Logic more or less copied from initeffects.cpp
+            QString type = d.attribute("type", QString::null);
+            if ("audio" == type) {
+                item = new QListWidgetItem(audioIcon, i18n(namenode.toElement().text().toUtf8().data()), ui.effectlist);
+            } else if ("custom" == type) {
+                item = new QListWidgetItem(i18n(namenode.toElement().text().toUtf8().data()), ui.effectlist);
+            } else {
+                item = new QListWidgetItem(videoIcon, i18n(namenode.toElement().text().toUtf8().data()), ui.effectlist);
+            }
             item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
             if (d.attribute("disabled") == "1") item->setCheckState(Qt::Unchecked);
             else item->setCheckState(Qt::Checked);
         }
     }
     if (clipref->effectsCount() == 0) {
-        emit transferParamDesc(QDomElement(), 0, 100);
+        emit transferParamDesc(QDomElement(), 0, 0);
         ui.buttonDel->setEnabled(false);
         ui.buttonSave->setEnabled(false);
         ui.buttonReset->setEnabled(false);
@@ -186,7 +203,7 @@ void EffectStackView::slotItemSelectionChanged() {
     bool isChecked = false;
     if (hasItem && ui.effectlist->currentItem()->checkState() == Qt::Checked) isChecked = true;
     if (hasItem && ui.effectlist->currentItem()->isSelected()) {
-        emit transferParamDesc(clipref->effectAt(activeRow), 0, 100);//minx max frame
+        emit transferParamDesc(clipref->effectAt(activeRow), clipref->cropStart().frames(KdenliveSettings::project_fps()), clipref->cropDuration().frames(KdenliveSettings::project_fps()));//minx max frame
     }
     if (clipref) clipref->setSelectedEffect(activeRow);
     ui.buttonDel->setEnabled(hasItem);
@@ -198,29 +215,13 @@ void EffectStackView::slotItemSelectionChanged() {
 
 void EffectStackView::slotItemUp() {
     int activeRow = ui.effectlist->currentRow();
-    if (activeRow > 0) {
-        QDomElement act = clipref->effectAt(activeRow).cloneNode().toElement();
-        QDomElement before = clipref->effectAt(activeRow - 1).cloneNode().toElement();
-        clipref->setEffectAt(activeRow - 1, act);
-        clipref->setEffectAt(activeRow, before);
-    }
-    QListWidgetItem *item = ui.effectlist->takeItem(activeRow);
-    ui.effectlist->insertItem(activeRow - 1, item);
-    ui.effectlist->setCurrentItem(item);
+    if (activeRow <= 0) return;
     emit changeEffectPosition(clipref, activeRow + 1, activeRow);
 }
 
 void EffectStackView::slotItemDown() {
     int activeRow = ui.effectlist->currentRow();
-    if (activeRow < ui.effectlist->count() - 1) {
-        QDomElement act = clipref->effectAt(activeRow).cloneNode().toElement();
-        QDomElement after = clipref->effectAt(activeRow + 1).cloneNode().toElement();
-        clipref->setEffectAt(activeRow + 1, act);
-        clipref->setEffectAt(activeRow, after);
-    }
-    QListWidgetItem *item = ui.effectlist->takeItem(activeRow);
-    ui.effectlist->insertItem(activeRow + 1, item);
-    ui.effectlist->setCurrentItem(item);
+    if (activeRow >= ui.effectlist->count() - 1) return;
     emit changeEffectPosition(clipref, activeRow + 1, activeRow + 2);
 }
 
@@ -246,7 +247,7 @@ void EffectStackView::slotResetEffect() {
     }
     if (!dom.isNull()) {
         dom.setAttribute("kdenlive_ix", old.attribute("kdenlive_ix"));
-        emit transferParamDesc(dom, 0, 100);//minx max frame
+        emit transferParamDesc(dom, clipref->cropStart().frames(KdenliveSettings::project_fps()), clipref->cropDuration().frames(KdenliveSettings::project_fps()));//minx max frame
         emit updateClipEffect(clipref, old, dom, activeRow);
     }
 }
@@ -264,6 +265,7 @@ void EffectStackView::clear() {
     ui.buttonReset->setEnabled(false);
     ui.buttonUp->setEnabled(false);
     ui.buttonDown->setEnabled(false);
+    effectedit->transferParamDesc(QDomElement(), 0, 0);
 }
 
 #include "effectstackview.moc"