[vlmc-devel] commit: Don't show mixer effects are they can't be used. ( Hugo Beauzée-Luyssen )
git at videolan.org
git at videolan.org
Sun Sep 26 18:23:08 CEST 2010
vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Sun Sep 26 17:20:46 2010 +0200| [e399eb6126f8d488b1482903d2552387e7d80cec] | committer: Hugo Beauzée-Luyssen
Don't show mixer effects are they can't be used.
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=e399eb6126f8d488b1482903d2552387e7d80cec
---
src/CMakeLists.txt | 3 -
src/Gui/MainWindow.cpp | 5 +-
src/Gui/effectsengine/EffectsList.cpp | 39 -----------------
src/Gui/effectsengine/EffectsList.h | 46 --------------------
src/Gui/effectsengine/ui/EffectsList.ui | 69 -------------------------------
5 files changed, 3 insertions(+), 159 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b5b2425..b2d99ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -163,7 +163,6 @@ ELSE(NOT WITH_GUI)
Gui/WorkflowFileRendererDialog.cpp
Gui/effectsengine/EffectInstanceWidget.cpp
Gui/effectsengine/EffectInstanceListModel.cpp
- Gui/effectsengine/EffectsList.cpp
Gui/effectsengine/EffectsListView.cpp
Gui/effectsengine/EffectStack.cpp
Gui/effectsengine/EffectWidget.cpp
@@ -233,7 +232,6 @@ ELSE(NOT WITH_GUI)
Gui/UndoStack.h
Gui/WorkflowFileRendererDialog.h
Gui/effectsengine/EffectInstanceWidget.h
- Gui/effectsengine/EffectsList.h
Gui/effectsengine/EffectsListView.h
Gui/effectsengine/EffectStack.h
Gui/effectsengine/EffectWidget.h
@@ -293,7 +291,6 @@ ELSE(NOT WITH_GUI)
)
SET(VLMC_UIS
- Gui/effectsengine/ui/EffectsList.ui
Gui/effectsengine/ui/EffectInstanceWidget.ui
Gui/effectsengine/ui/EffectStack.ui
Gui/effectsengine/ui/EffectWidget.ui
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index cb34157..c86fcfd 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -48,7 +48,7 @@
/* Widgets */
#include "DockWidgetManager.h"
-#include "EffectsList.h"
+#include "EffectsListView.h"
#include "ImportController.h"
#include "MediaLibrary.h"
#include "NotificationZone.h"
@@ -437,7 +437,8 @@ MainWindow::initializeDockWidgets( void )
{
DockWidgetManager *dockManager = DockWidgetManager::getInstance();
- EffectsList *effectsList = new EffectsList( this );
+ EffectsListView *effectsList = new EffectsListView( this );
+ effectsList->setType( Effect::Filter );
dockManager->addDockedWidget( effectsList,
QT_TRANSLATE_NOOP( "DockWidgetManager", "Effects List" ),
Qt::AllDockWidgetAreas, QDockWidget::AllDockWidgetFeatures,
diff --git a/src/Gui/effectsengine/EffectsList.cpp b/src/Gui/effectsengine/EffectsList.cpp
deleted file mode 100644
index f42adbc..0000000
--- a/src/Gui/effectsengine/EffectsList.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * EffectsList.cpp: List the available effects plugin
- *****************************************************************************
- * Copyright (C) 2008-2010 VideoLAN
- *
- * Authors: Hugo Beauzée-Luyssen <beauze.h at gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#include "EffectsList.h"
-#include "EffectsEngine/EffectsEngine.h"
-#include "ui_EffectsList.h"
-
-EffectsList::EffectsList(QWidget *parent) :
- QWidget(parent),
- m_ui( new Ui::EffectsList )
-{
- m_ui->setupUi( this );
- m_ui->filterList->setType( Effect::Filter );
- m_ui->effectsList->setType( Effect::Mixer2 );
-}
-
-EffectsList::~EffectsList()
-{
- delete m_ui;
-}
diff --git a/src/Gui/effectsengine/EffectsList.h b/src/Gui/effectsengine/EffectsList.h
deleted file mode 100644
index e624967..0000000
--- a/src/Gui/effectsengine/EffectsList.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************
- * EffectsList.h: List the available effects plugin
- *****************************************************************************
- * Copyright (C) 2008-2010 VideoLAN
- *
- * Authors: Hugo Beauzée-Luyssen <beauze.h at gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef EFFECTSLIST_H
-#define EFFECTSLIST_H
-
-#include <QWidget>
-#include "EffectsEngine/Effect.h"
-
-namespace Ui
-{
- class EffectsList;
-}
-
-class EffectsList : public QWidget
-{
- Q_OBJECT
-
- public:
- explicit EffectsList(QWidget *parent = 0);
- ~EffectsList();
-
- private:
- Ui::EffectsList *m_ui;
-};
-
-#endif // EFFECTSLIST_H
diff --git a/src/Gui/effectsengine/ui/EffectsList.ui b/src/Gui/effectsengine/ui/EffectsList.ui
deleted file mode 100644
index 9daa6f1..0000000
--- a/src/Gui/effectsengine/ui/EffectsList.ui
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>EffectsList</class>
- <widget class="QWidget" name="EffectsList">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>400</width>
- <height>300</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="filterTab">
- <attribute name="title">
- <string>Filters</string>
- </attribute>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="EffectsListView" name="filterList">
- <property name="editTriggers">
- <set>QAbstractItemView::NoEditTriggers</set>
- </property>
- <property name="dragEnabled">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="effectsTab">
- <attribute name="title">
- <string>Effects</string>
- </attribute>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="EffectsListView" name="effectsList">
- <property name="editTriggers">
- <set>QAbstractItemView::NoEditTriggers</set>
- </property>
- <property name="dragEnabled">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>EffectsListView</class>
- <extends>QListView</extends>
- <header>effectsengine/EffectsListView.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
More information about the Vlmc-devel
mailing list