Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
261
Issues
261
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
50b06be5
Commit
50b06be5
authored
Mar 29, 2018
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reintroduce switch param type
parent
97076e46
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
125 additions
and
1 deletion
+125
-1
src/assets/CMakeLists.txt
src/assets/CMakeLists.txt
+1
-0
src/assets/view/widgets/abstractparamwidget.cpp
src/assets/view/widgets/abstractparamwidget.cpp
+4
-1
src/assets/view/widgets/switchparamwidget.cpp
src/assets/view/widgets/switchparamwidget.cpp
+62
-0
src/assets/view/widgets/switchparamwidget.hpp
src/assets/view/widgets/switchparamwidget.hpp
+58
-0
No files found.
src/assets/CMakeLists.txt
View file @
50b06be5
...
...
@@ -14,6 +14,7 @@ set(kdenlive_SRCS
assets/view/widgets/abstractparamwidget.cpp
#assets/view/widgets/animationwidget.cpp
assets/view/widgets/boolparamwidget.cpp
assets/view/widgets/switchparamwidget.cpp
assets/view/widgets/doubleparamwidget.cpp
assets/view/widgets/colorwheel.cpp
assets/view/widgets/slidewidget.cpp
...
...
src/assets/view/widgets/abstractparamwidget.cpp
View file @
50b06be5
...
...
@@ -21,6 +21,7 @@
#include "animationwidget.h"
#include "assets/model/assetparametermodel.hpp"
#include "boolparamwidget.hpp"
#include "switchparamwidget.hpp"
#include "lumaliftgainparam.hpp"
#include "doubleparamwidget.hpp"
#include "geometryeditwidget.hpp"
...
...
@@ -101,6 +102,9 @@ AbstractParamWidget *AbstractParamWidget::construct(const std::shared_ptr<AssetP
case
ParamType
::
Wipe
:
widget
=
new
SlideWidget
(
model
,
index
,
parent
);
break
;
case
ParamType
::
Switch
:
widget
=
new
SwitchParamWidget
(
model
,
index
,
parent
);
break
;
case
ParamType
::
Animated
:
case
ParamType
::
RestrictedAnim
:
// widget = new AnimationWidget(model, index, range, parent);
...
...
@@ -108,7 +112,6 @@ AbstractParamWidget *AbstractParamWidget::construct(const std::shared_ptr<AssetP
// case ParamType::KeyframeParam:
// widget = new KeyframeEdit(model, index, parent);
// break;
case
ParamType
::
Switch
:
case
ParamType
::
Addedgeometry
:
case
ParamType
::
Curve
:
case
ParamType
::
Bezier_spline
:
...
...
src/assets/view/widgets/switchparamwidget.cpp
0 → 100644
View file @
50b06be5
/***************************************************************************
* Copyright (C) 2018 by Jean-Baptiste Mardelle *
* This file is part of Kdenlive. See www.kdenlive.org. *
* *
* 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) version 3 or any later version accepted by the *
* membership of KDE e.V. (or its successor approved by the membership *
* of KDE e.V.), which shall act as a proxy defined in Section 14 of *
* version 3 of the license. *
* *
* 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, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#include "switchparamwidget.hpp"
#include "assets/model/assetparametermodel.hpp"
SwitchParamWidget
::
SwitchParamWidget
(
std
::
shared_ptr
<
AssetParameterModel
>
model
,
QModelIndex
index
,
QWidget
*
parent
)
:
AbstractParamWidget
(
std
::
move
(
model
),
index
,
parent
)
{
setupUi
(
this
);
// setup the comment
QString
name
=
m_model
->
data
(
m_index
,
AssetParameterModel
::
NameRole
).
toString
();
QString
comment
=
m_model
->
data
(
m_index
,
AssetParameterModel
::
CommentRole
).
toString
();
setToolTip
(
comment
);
m_labelComment
->
setText
(
comment
);
m_widgetComment
->
setHidden
(
true
);
// setup the name
m_labelName
->
setText
(
m_model
->
data
(
m_index
,
Qt
::
DisplayRole
).
toString
());
// set check state
slotRefresh
();
// emit the signal of the base class when appropriate
connect
(
this
->
m_checkBox
,
&
QCheckBox
::
stateChanged
,
[
this
](
int
)
{
emit
valueChanged
(
m_index
,
m_checkBox
->
isChecked
()
?
m_model
->
data
(
m_index
,
AssetParameterModel
::
MaxRole
).
toString
()
:
m_model
->
data
(
m_index
,
AssetParameterModel
::
MinRole
).
toString
(),
true
);
});
}
void
SwitchParamWidget
::
slotShowComment
(
bool
show
)
{
if
(
!
m_labelComment
->
text
().
isEmpty
())
{
m_widgetComment
->
setVisible
(
show
);
}
}
void
SwitchParamWidget
::
slotRefresh
()
{
m_checkBox
->
setChecked
(
m_model
->
data
(
m_index
,
AssetParameterModel
::
ValueRole
)
==
m_model
->
data
(
m_index
,
AssetParameterModel
::
MaxRole
));
}
void
SwitchParamWidget
::
slotSetRange
(
QPair
<
int
,
int
>
)
{
}
src/assets/view/widgets/switchparamwidget.hpp
0 → 100644
View file @
50b06be5
/***************************************************************************
* Copyright (C) 2018 by Jean-Baptiste Mardelle *
* This file is part of Kdenlive. See www.kdenlive.org. *
* *
* 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) version 3 or any later version accepted by the *
* membership of KDE e.V. (or its successor approved by the membership *
* of KDE e.V.), which shall act as a proxy defined in Section 14 of *
* version 3 of the license. *
* *
* 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, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifndef SWITCHPARAMWIDGET_H
#define SWITCHPARAMWIDGET_H
#include "abstractparamwidget.hpp"
#include "ui_boolparamwidget_ui.h"
#include <QWidget>
/** @brief This class represents a parameter that requires
the user to choose tick a checkbox
*/
class
SwitchParamWidget
:
public
AbstractParamWidget
,
public
Ui
::
BoolParamWidget_UI
{
Q_OBJECT
public:
/** @brief Constructor for the widgetComment
@param name String containing the name of the parameter
@param comment Optional string containing the comment associated to the parameter
@param checked Boolean indicating wether the checkbox should initially be checked
@param parent Parent widget
*/
SwitchParamWidget
(
std
::
shared_ptr
<
AssetParameterModel
>
model
,
QModelIndex
index
,
QWidget
*
parent
);
public
slots
:
/** @brief Toggle the comments on or off
*/
void
slotShowComment
(
bool
show
)
override
;
/** @brief refresh the properties to reflect changes in the model
*/
void
slotRefresh
()
override
;
/** @brief update the clip's in/out point
*/
void
slotSetRange
(
QPair
<
int
,
int
>
)
override
;
};
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment