X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstackview.cpp;h=d6d79719ef1b861a68cf06ffac50fda5ac03c4c5;hb=8f0ae78b0d64b265aa0d99b37b019b2286d75b6e;hp=ae90b7978cc75ad39fee3e0fed3eb276f5ddcbbe;hpb=76a91c652a0f24ac0962b43aa8e411dcaaca723f;p=kdenlive

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index ae90b797..d6d79719 100644
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -52,7 +52,7 @@ EffectStackView::EffectStackView(Monitor *monitor, QWidget *parent) :
     vbox1->setSpacing(0);
     vbox1->addWidget(m_effectedit);
     m_ui.frame->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
-    m_ui.region_url->fileDialog()->setFilter(ProjectList::getExtensions());
+    //m_ui.region_url->fileDialog()->setFilter(ProjectList::getExtensions());
     //m_ui.effectlist->horizontalHeader()->setVisible(false);
     //m_ui.effectlist->verticalHeader()->setVisible(false);
 
@@ -73,8 +73,8 @@ EffectStackView::EffectStackView(Monitor *monitor, QWidget *parent) :
 
     m_ui.effectlist->setDragDropMode(QAbstractItemView::NoDragDrop); //use internal if drop is recognised right
 
-    connect(m_ui.region_url, SIGNAL(urlSelected(const KUrl &)), this , SLOT(slotRegionChanged()));
-    connect(m_ui.region_url, SIGNAL(returnPressed()), this , SLOT(slotRegionChanged()));
+    //connect(m_ui.region_url, SIGNAL(urlSelected(const KUrl &)), this , SLOT(slotRegionChanged()));
+    //connect(m_ui.region_url, SIGNAL(returnPressed()), this , SLOT(slotRegionChanged()));
     connect(m_ui.effectlist, SIGNAL(itemSelectionChanged()), this , SLOT(slotItemSelectionChanged()));
     connect(m_ui.effectlist, SIGNAL(itemChanged(QListWidgetItem *)), this , SLOT(slotItemChanged(QListWidgetItem *)));
     connect(m_ui.buttonUp, SIGNAL(clicked()), this, SLOT(slotItemUp()));
@@ -123,7 +123,7 @@ void EffectStackView::slotSaveEffect()
     if (name.isEmpty()) return;
     QString path = KStandardDirs::locateLocal("appdata", "effects/", true);
     path = path + name + ".xml";
-    if (QFile::exists(path)) if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return;
+    if (QFile::exists(path)) if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", path)) == KMessageBox::No) return;
 
     int i = m_ui.effectlist->currentRow();
     QDomDocument doc;
@@ -169,7 +169,15 @@ void EffectStackView::slotClipItemSelected(ClipItem* c, int ix)
     } else {
         m_clipref = c;
         if (c) {
-            m_ui.checkAll->setText(i18n("Effects for %1").arg(m_clipref->clipName()));
+            QString cname = m_clipref->clipName();
+            if (cname.length() > 20) {
+                m_ui.checkAll->setToolTip(i18n("Effects for %1").arg(cname));
+                cname.truncate(17);
+                m_ui.checkAll->setText(i18n("Effects for %1").arg(cname) + "...");
+            } else {
+                m_ui.checkAll->setToolTip(QString());
+                m_ui.checkAll->setText(i18n("Effects for %1").arg(cname));
+            }
             ix = c->selectedEffectIndex();
             QString size = c->baseClip()->getProperty("frame_size");
             double factor = c->baseClip()->getProperty("aspect_ratio").toDouble();
@@ -182,8 +190,10 @@ void EffectStackView::slotClipItemSelected(ClipItem* c, int ix)
         m_ui.effectlist->blockSignals(true);
         m_ui.effectlist->clear();
         m_effectedit->transferParamDesc(QDomElement(), 0, 0, 0);
-        m_ui.region_url->clear();
+        //m_ui.region_url->clear();
         m_ui.effectlist->blockSignals(false);
+        m_ui.checkAll->setToolTip(QString());
+        m_ui.checkAll->setText(QString());
         setEnabled(false);
         return;
     }
@@ -200,6 +210,7 @@ void EffectStackView::slotTrackItemSelected(int ix, const TrackInfo info)
     m_currentEffectList = info.effectsList;
     kDebug() << "// TRACK; " << ix << ", EFFECTS: " << m_currentEffectList.count();
     setEnabled(true);
+    m_ui.checkAll->setToolTip(QString());
     m_ui.checkAll->setText(i18n("Effects for track %1").arg(info.trackName.isEmpty() ? QString::number(ix) : info.trackName));
     m_trackindex = ix;
     setupListView(0);
@@ -214,8 +225,10 @@ void EffectStackView::slotItemChanged(QListWidgetItem *item)
     int activeRow = m_ui.effectlist->currentRow();
     if (activeRow >= 0) {
         m_effectedit->updateParameter("disable", QString::number((int) disable));
-        if (m_trackMode) emit changeEffectState(NULL, m_trackindex, activeRow, disable);
-        else emit changeEffectState(m_clipref, -1, activeRow, disable);
+        if (m_trackMode)
+            emit changeEffectState(NULL, m_trackindex, activeRow, disable);
+        else
+            emit changeEffectState(m_clipref, -1, activeRow, disable);
     }
     slotUpdateCheckAllButton();
 }
@@ -256,8 +269,10 @@ void EffectStackView::setupListView(int ix)
                 item = new QListWidgetItem(videoIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist);
             }
             item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-            if (d.attribute("disable") == "1") item->setCheckState(Qt::Unchecked);
-            else item->setCheckState(Qt::Checked);
+            if (d.attribute("disable") == "1")
+                item->setCheckState(Qt::Unchecked);
+            else
+                item->setCheckState(Qt::Checked);
         }
     }
     if (m_ui.effectlist->count() == 0) {
@@ -276,7 +291,7 @@ void EffectStackView::setupListView(int ix)
     m_ui.effectlist->blockSignals(false);
     if (m_ui.effectlist->count() == 0) {
         m_effectedit->transferParamDesc(QDomElement(), 0, 0, 0);
-        m_ui.region_url->clear();
+        //m_ui.region_url->clear();
     } else slotItemSelectionChanged(false);
     slotUpdateCheckAllButton();
 }
@@ -295,8 +310,8 @@ void EffectStackView::slotItemSelectionChanged(bool update)
         } else m_effectedit->transferParamDesc(eff,
                                                    0,
                                                    m_clipref->cropStart().frames(KdenliveSettings::project_fps()),
-                                                   (m_clipref->cropStart() + m_clipref->cropDuration()).frames(KdenliveSettings::project_fps())); //minx max frame
-        m_ui.region_url->setUrl(KUrl(eff.attribute("region")));
+                                                   (m_clipref->cropStart() + m_clipref->cropDuration()).frames(KdenliveSettings::project_fps()) - 1); //minx max frame
+        //m_ui.region_url->setUrl(KUrl(eff.attribute("region")));
     }
     if (!m_trackMode && m_clipref && update) m_clipref->setSelectedEffect(activeRow);
     m_ui.buttonDel->setEnabled(hasItem);
@@ -357,7 +372,7 @@ void EffectStackView::slotResetEffect()
         } else {
             m_clipref->initEffect(dom);
             m_effectedit->transferParamDesc(dom, 0, m_clipref->cropStart().frames(KdenliveSettings::project_fps()), (m_clipref->cropStart() + m_clipref->cropDuration()).frames(KdenliveSettings::project_fps()));//minx max frame
-            m_ui.region_url->setUrl(KUrl(dom.attribute("region")));
+            //m_ui.region_url->setUrl(KUrl(dom.attribute("region")));
             emit updateEffect(m_clipref, -1, old, dom, activeRow);
         }
     }
@@ -381,7 +396,7 @@ void EffectStackView::clear()
     m_ui.buttonDown->setEnabled(false);
     m_ui.checkAll->setEnabled(false);
     m_effectedit->transferParamDesc(QDomElement(), 0, 0, 0);
-    m_ui.region_url->clear();
+    //m_ui.region_url->clear();
     m_ui.effectlist->blockSignals(false);
 }
 
@@ -422,19 +437,27 @@ void EffectStackView::slotCheckAll(int state)
         m_ui.checkAll->blockSignals(false);
     }
 
-    for (int i = 0; i < m_ui.effectlist->count(); ++i)
-        m_ui.effectlist->item(i)->setCheckState((Qt::CheckState)state);
+    bool disabled = (state != 2);
+    m_effectedit->updateParameter("disable", QString::number((int) disabled));
+    for (int i = 0; i < m_ui.effectlist->count(); ++i) {
+        if (m_ui.effectlist->item(i)->checkState() != (Qt::CheckState)state) {
+            m_ui.effectlist->item(i)->setCheckState((Qt::CheckState)state);
+            if (m_trackMode)
+                emit changeEffectState(NULL, m_trackindex, i, disabled);
+            else
+                emit changeEffectState(m_clipref, -1, i, disabled);
+        }
+    }
 }
 
-void EffectStackView::slotRegionChanged()
+/*void EffectStackView::slotRegionChanged()
 {
     if (!m_trackMode) emit updateClipRegion(m_clipref, m_ui.effectlist->currentRow(), m_ui.region_url->text());
-}
+}*/
 
 void EffectStackView::slotCheckMonitorPosition(int renderPos)
 {
-    if (m_trackMode) return;
-    if (renderPos >= m_clipref->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_clipref->endPos().frames(KdenliveSettings::project_fps())) {
+    if (m_trackMode || (renderPos >= m_clipref->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_clipref->endPos().frames(KdenliveSettings::project_fps()))) {
         if (!m_monitor->getEffectScene()->views().at(0)->isVisible())
             m_monitor->slotEffectScene(true);
     } else {
@@ -448,4 +471,10 @@ void EffectStackView::slotRenderPos(int pos)
         m_effectedit->slotSyncEffectsPos(pos - m_clipref->startPos().frames(KdenliveSettings::project_fps()));
 }
 
+int EffectStackView::isTrackMode(bool *ok) const
+{
+    *ok = m_trackMode;
+    return m_trackindex;
+}
+
 #include "effectstackview.moc"