Menu
▾
▴
[Kdenlive-svn] SF.net SVN: kdenlive:[5357] trunk/kdenlive/src
|
From: <tt...@us...> - 2011-01-27 21:10:40
|
Revision: 5357
http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5357&view=rev
Author: ttill
Date: 2011-01-27 21:10:34 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
remove unused monitor scene control widget
Modified Paths:
--------------
trunk/kdenlive/src/widgets/geometrywidget_ui.ui
Removed Paths:
-------------
trunk/kdenlive/src/monitorscenecontrolwidget.cpp
trunk/kdenlive/src/monitorscenecontrolwidget.h
trunk/kdenlive/src/widgets/monitorscenecontrolwidget_ui.ui
Deleted: trunk/kdenlive/src/monitorscenecontrolwidget.cpp
===================================================================
--- trunk/kdenlive/src/monitorscenecontrolwidget.cpp 2011-01-27 21:06:34 UTC (rev 5356)
+++ trunk/kdenlive/src/monitorscenecontrolwidget.cpp 2011-01-27 21:10:34 UTC (rev 5357)
@@ -1,90 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2010 by Till Theato (ro...@tt...) *
- * *
- * 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 "monitorscenecontrolwidget.h"
-#include "monitorscene.h"
-#include "kdenlivesettings.h"
-
-#include <QGridLayout>
-
-
-MonitorSceneControlWidget::MonitorSceneControlWidget(MonitorScene* scene, QWidget* parent) :
- QWidget(parent),
- m_scene(scene)
-{
- m_ui.setupUi(this);
-
- m_buttonConfig = new QToolButton();
- m_buttonConfig->setCheckable(true);
- m_buttonConfig->setAutoRaise(true);
- m_buttonConfig->setIcon(KIcon("system-run"));
- m_buttonConfig->setToolTip(i18n("Show/Hide Settings"));
- this->setHidden(true);
-
- m_ui.buttonShowScene->setIcon(KIcon("video-display"));
- m_ui.buttonShowScene->setToolTip(i18n("Show monitor scene"));
- m_ui.buttonDirectUpdate->setIcon(KIcon("transform-scale"));
- m_ui.buttonDirectUpdate->setToolTip(i18n("Update parameters while monitor scene changes"));
- m_ui.buttonDirectUpdate->setChecked(KdenliveSettings::monitorscene_directupdate());
-
- m_ui.buttonZoomFit->setIcon(KIcon("zoom-fit-best"));
- m_ui.buttonZoomFit->setToolTip(i18n("Fit zoom to monitor size"));
- m_ui.buttonZoomOriginal->setIcon(KIcon("zoom-original"));
- m_ui.buttonZoomOriginal->setToolTip(i18n("Original size"));
- m_ui.buttonZoomIn->setIcon(KIcon("zoom-in"));
- m_ui.buttonZoomIn->setToolTip(i18n("Zoom in"));
- m_ui.buttonZoomOut->setIcon(KIcon("zoom-out"));
- m_ui.buttonZoomOut->setToolTip(i18n("Zoom out"));
-
- connect(m_buttonConfig, SIGNAL(toggled(bool)), this, SLOT(setVisible(bool)));
-
- connect(m_ui.sliderZoom, SIGNAL(valueChanged(int)), m_scene, SLOT(slotZoom(int)));
- connect(m_scene, SIGNAL(zoomChanged(int)), m_ui.sliderZoom, SLOT(setValue(int)));
- connect(m_ui.buttonZoomFit, SIGNAL(clicked()), m_scene, SLOT(slotZoomFit()));
- connect(m_ui.buttonZoomOriginal, SIGNAL(clicked()), m_scene, SLOT(slotZoomOriginal()));
- connect(m_ui.buttonZoomIn, SIGNAL(clicked()), m_scene, SLOT(slotZoomIn()));
- connect(m_ui.buttonZoomOut, SIGNAL(clicked()), m_scene, SLOT(slotZoomOut()));
- m_scene->slotZoomFit();
-
- connect(m_ui.buttonShowScene, SIGNAL(toggled(bool)), this, SIGNAL(showScene(bool)));
- connect(m_ui.buttonDirectUpdate, SIGNAL(toggled(bool)), this, SLOT(slotSetDirectUpdate(bool)));
-}
-
-MonitorSceneControlWidget::~MonitorSceneControlWidget()
-{
- delete m_buttonConfig;
-}
-
-QToolButton *MonitorSceneControlWidget::getShowHideButton()
-{
- return m_buttonConfig;
-}
-
-void MonitorSceneControlWidget::addWidget(QWidget* widget, int row, int column)
-{
- ((QGridLayout*)m_ui.groupBox->layout())->addWidget(widget, row, column);
-}
-
-void MonitorSceneControlWidget::slotSetDirectUpdate(bool directUpdate)
-{
- KdenliveSettings::setMonitorscene_directupdate(directUpdate);
-}
-
-
-#include "monitorscenecontrolwidget.moc"
Deleted: trunk/kdenlive/src/monitorscenecontrolwidget.h
===================================================================
--- trunk/kdenlive/src/monitorscenecontrolwidget.h 2011-01-27 21:06:34 UTC (rev 5356)
+++ trunk/kdenlive/src/monitorscenecontrolwidget.h 2011-01-27 21:10:34 UTC (rev 5357)
@@ -1,59 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2010 by Till Theato (ro...@tt...) *
- * *
- * 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 MONITORSCENECONTROLWIDGET_H
-#define MONITORSCENECONTROLWIDGET_H
-
-#include "ui_monitorscenecontrolwidget_ui.h"
-
-#include <QWidget>
-#include <QToolButton>
-
-class MonitorScene;
-
-
-class MonitorSceneControlWidget : public QWidget
-{
- Q_OBJECT
-public:
- /** @brief Sets up the UI and connects it. */
- MonitorSceneControlWidget(MonitorScene *scene, QWidget *parent = 0);
- virtual ~MonitorSceneControlWidget();
-
- /** @brief Returns a button for showing and hiding the monitor scene controls (this widget). */
- QToolButton *getShowHideButton();
-
- /** @brief Adds a custom widget to the controls. */
- void addWidget(QWidget *widget, int row, int column);
-
-private slots:
- /** @brief Sets the KdenliveSetting directupdate with true = update parameters (rerender frame) during mouse move (before mouse button is released) */
- void slotSetDirectUpdate(bool directUpdate);
-
-private:
- Ui::MonitorSceneControlWidget_UI m_ui;
- MonitorScene *m_scene;
- QToolButton *m_buttonConfig;
-
-signals:
- void showScene(bool);
-};
-
-#endif
Modified: trunk/kdenlive/src/widgets/geometrywidget_ui.ui
===================================================================
--- trunk/kdenlive/src/widgets/geometrywidget_ui.ui 2011-01-27 21:06:34 UTC (rev 5356)
+++ trunk/kdenlive/src/widgets/geometrywidget_ui.ui 2011-01-27 21:10:34 UTC (rev 5357)
@@ -386,7 +386,7 @@
</layout>
</widget>
</item>
- <item row="3" column="0" colspan="4">
+ <item row="2" column="0" colspan="4">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -399,16 +399,6 @@
</property>
</spacer>
</item>
- <item row="2" column="0" colspan="2">
- <widget class="QFrame" name="frameSettings">
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
- </property>
- </widget>
- </item>
<item row="1" column="2">
<widget class="QWidget" name="widgetConfigButton" native="true">
<layout class="QGridLayout" name="gridLayout_6">
Deleted: trunk/kdenlive/src/widgets/monitorscenecontrolwidget_ui.ui
===================================================================
--- trunk/kdenlive/src/widgets/monitorscenecontrolwidget_ui.ui 2011-01-27 21:06:34 UTC (rev 5356)
+++ trunk/kdenlive/src/widgets/monitorscenecontrolwidget_ui.ui 2011-01-27 21:10:34 UTC (rev 5357)
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MonitorSceneControlWidget_UI</class>
- <widget class="QWidget" name="MonitorSceneControlWidget_UI">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>332</width>
- <height>80</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item row="0" column="2">
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string/>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- <property name="checkable">
- <bool>false</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_2">
- <property name="margin">
- <number>0</number>
- </property>
- <item row="1" column="0">
- <widget class="QToolButton" name="buttonZoomFit">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QToolButton" name="buttonShowScene">
- <property name="text">
- <string>...</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QToolButton" name="buttonDirectUpdate">
- <property name="text">
- <string>...</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QToolButton" name="buttonZoomOriginal">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QToolButton" name="buttonZoomOut">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QSlider" name="sliderZoom">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>300</number>
- </property>
- <property name="value">
- <number>100</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="1" column="4">
- <widget class="QToolButton" name="buttonZoomIn">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="2">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|