From 4d526f22a037c20dd36cccb2053a874e82ecbf98 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sat, 28 Aug 2010 22:24:49 +0000 Subject: [PATCH] remove region stuff svn path=/trunk/kdenlive/; revision=4777 --- src/effectstackedit.cpp | 2 +- src/effectstackview.cpp | 20 ++++++++++---------- src/effectstackview.h | 4 ++-- src/widgets/effectstack_ui.ui | 12 ------------ 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index 621275c8..42e8a418 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - effecstackview.cpp - description + effecstackedit.cpp - description ------------------- begin : Feb 15 2008 copyright : (C) 2008 by Marco Gittler diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp index ae90b797..e75c2d65 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())); @@ -182,7 +182,7 @@ 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); setEnabled(false); return; @@ -276,7 +276,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(); } @@ -296,7 +296,7 @@ void EffectStackView::slotItemSelectionChanged(bool update) 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_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 +357,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 +381,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); } @@ -426,10 +426,10 @@ void EffectStackView::slotCheckAll(int state) m_ui.effectlist->item(i)->setCheckState((Qt::CheckState)state); } -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) { diff --git a/src/effectstackview.h b/src/effectstackview.h index 7754c5df..02229adb 100644 --- a/src/effectstackview.h +++ b/src/effectstackview.h @@ -123,8 +123,8 @@ private slots: /** @brief Sets the check state of all effects according to @param state. */ void slotCheckAll(int state); - /** @brief Define the region filter for current effect. */ - void slotRegionChanged(); + /* @brief Define the region filter for current effect. + void slotRegionChanged();*/ /** @brief Checks whether the monitor scene has to be displayed. */ void slotCheckMonitorPosition(int renderPos); diff --git a/src/widgets/effectstack_ui.ui b/src/widgets/effectstack_ui.ui index 31813cd5..ba513150 100644 --- a/src/widgets/effectstack_ui.ui +++ b/src/widgets/effectstack_ui.ui @@ -170,13 +170,6 @@ - - - - Set filter region - - - @@ -184,11 +177,6 @@ - - KUrlRequester - QFrame -
kurlrequester.h
-
KListWidget QListWidget -- 2.39.2