oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various: encapsulate all code in the olive namespace to avoid name collisions

Browse Source 
Large-scale code cleanup. Also adds a license to the top of all files that were
missing it.
This commit is contained in:
itsmattkc
2020-04-06 15:29:53 +10:00
parent 82b6ddccc8
commit 1aa87cbda6
519 changed files with 7939 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/audiomonitor/audiomonitor.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "audiomonitor.h"
#include <QAudio>
@@ -7,6 +27,8 @@
#include "audio/audiomanager.h"
#include "common/qtutils.h"
OLIVE_NAMESPACE_ENTER
const int kDecibelStep = 6;
const int kDecibelMinimum = -200;
const int kClearTimerInterval = 500;
@@ -145,3 +167,5 @@ void AudioMonitor::mousePressEvent(QMouseEvent *)
peaked_.fill(false);
update();
}
OLIVE_NAMESPACE_EXIT
app/widget/audiomonitor/audiomonitor.h
+26
View File
@@ -1,9 +1,33 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef AUDIOMONITORWIDGET_H
#define AUDIOMONITORWIDGET_H
#include <QTimer>
#include <QWidget>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class AudioMonitor : public QWidget
{
Q_OBJECT
@@ -25,4 +49,6 @@ private:
QTimer clear_timer_;
};
OLIVE_NAMESPACE_EXIT
#endif // AUDIOMONITORWIDGET_H
app/widget/clickablelabel/clickablelabel.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "clickablelabel.h"
OLIVE_NAMESPACE_ENTER
ClickableLabel::ClickableLabel(const QString &text, QWidget *parent) :
QLabel(text, parent)
{
@@ -21,3 +43,5 @@ void ClickableLabel::mouseDoubleClickEvent(QMouseEvent *)
{
emit MouseDoubleClicked();
}
OLIVE_NAMESPACE_EXIT
app/widget/clickablelabel/clickablelabel.h
+26
View File
@@ -1,8 +1,32 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef CLICKABLELABEL_H
#define CLICKABLELABEL_H
#include <QLabel>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class ClickableLabel : public QLabel
{
Q_OBJECT
@@ -20,4 +44,6 @@ signals:
};
OLIVE_NAMESPACE_EXIT
#endif // CLICKABLELABEL_H
app/widget/colorbutton/colorbutton.cpp
+24
View File
@@ -1,7 +1,29 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "colorbutton.h"
#include "dialog/color/colordialog.h"
OLIVE_NAMESPACE_ENTER
ColorButton::ColorButton(ColorManager* color_manager, QWidget *parent) :
QPushButton(parent),
color_manager_(color_manager),
@@ -59,3 +81,5 @@ void ColorButton::UpdateColor()
setStyleSheet(QStringLiteral("ColorButton {background: %1;}").arg(managed.name()));
}
OLIVE_NAMESPACE_EXIT
app/widget/colorbutton/colorbutton.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef COLORBUTTON_H
#define COLORBUTTON_H
@@ -6,6 +26,8 @@
#include "render/color.h"
#include "render/colormanager.h"
OLIVE_NAMESPACE_ENTER
class ColorButton : public QPushButton
{
Q_OBJECT
@@ -36,4 +58,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // COLORBUTTON_H
app/widget/colorwheel/colorgradientwidget.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "colorgradientwidget.h"
#include <QPainter>
@@ -6,6 +26,8 @@
#include "common/lerp.h"
#include "node/node.h"
OLIVE_NAMESPACE_ENTER
ColorGradientWidget::ColorGradientWidget(Qt::Orientation orientation, QWidget *parent) :
ColorSwatchWidget(parent),
orientation_(orientation),
@@ -81,3 +103,5 @@ Color ColorGradientWidget::LerpColor(const Color &a, const Color &b, int i, int
lerp(a.green(), b.green(), t),
lerp(a.blue(), b.blue(), t));
}
OLIVE_NAMESPACE_EXIT
app/widget/colorwheel/colorgradientwidget.h
+24
View File
@@ -1,9 +1,31 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef COLORGRADIENTGLWIDGET_H
#define COLORGRADIENTGLWIDGET_H
#include "colorswatchwidget.h"
#include "render/color.h"
OLIVE_NAMESPACE_ENTER
class ColorGradientWidget : public ColorSwatchWidget
{
Q_OBJECT
@@ -32,4 +54,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // COLORGRADIENTGLWIDGET_H
app/widget/colorwheel/colorswatchwidget.cpp
+24
View File
@@ -1,9 +1,31 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "colorswatchwidget.h"
#include <QMouseEvent>
#include "render/backend/opengl/openglrenderfunctions.h"
OLIVE_NAMESPACE_ENTER
ColorSwatchWidget::ColorSwatchWidget(QWidget *parent) :
QWidget(parent),
to_linear_processor_(nullptr),
@@ -79,3 +101,5 @@ void ColorSwatchWidget::SetSelectedColorInternal(const Color &c, bool external)
SelectedColorChangedEvent(c, external);
update();
}
OLIVE_NAMESPACE_EXIT
app/widget/colorwheel/colorswatchwidget.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef COLORSWATCHWIDGET_H
#define COLORSWATCHWIDGET_H
@@ -7,6 +27,8 @@
#include "render/color.h"
#include "render/colorprocessor.h"
OLIVE_NAMESPACE_ENTER
class ColorSwatchWidget : public QWidget
{
Q_OBJECT
@@ -47,4 +69,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // COLORSWATCHWIDGET_H
app/widget/colorwheel/colorwheelwidget.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "colorwheelwidget.h"
#include <QPainter>
@@ -5,6 +25,8 @@
#include "node/node.h"
OLIVE_NAMESPACE_ENTER
#define M_180_OVER_PI 57.295791433133264917914229473464
#define M_RADIAN_TO_0_1 0.15915497620314795810531730409296
@@ -152,3 +174,5 @@ QPoint ColorWheelWidget::GetCoordsFromColor(const Color &c) const
return pos;
}
OLIVE_NAMESPACE_EXIT
app/widget/colorwheel/colorwheelwidget.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef COLORWHEELWIDGET_H
#define COLORWHEELWIDGET_H
@@ -7,6 +27,8 @@
#include "render/backend/opengl/openglshader.h"
#include "render/color.h"
OLIVE_NAMESPACE_ENTER
class ColorWheelWidget : public ColorSwatchWidget
{
Q_OBJECT
@@ -50,4 +72,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // COLORWHEELWIDGET_H
app/widget/columnedgridlayout/columnedgridlayout.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "columnedgridlayout.h"
OLIVE_NAMESPACE_ENTER
ColumnedGridLayout::ColumnedGridLayout(QWidget* parent,
int maximum_columns) :
QGridLayout (parent),
@@ -32,3 +54,5 @@ void ColumnedGridLayout::SetMaximumColumns(int maximum_columns)
{
maximum_columns_ = maximum_columns;
}
OLIVE_NAMESPACE_EXIT
app/widget/columnedgridlayout/columnedgridlayout.h
+26
View File
@@ -1,8 +1,32 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef COLUMNEDGRIDLAYOUT_H
#define COLUMNEDGRIDLAYOUT_H
#include <QGridLayout>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief The ColumnedGridLayout class
*
@@ -24,4 +48,6 @@ private:
int maximum_columns_;
};
OLIVE_NAMESPACE_EXIT
#endif // COLUMNEDGRIDLAYOUT_H
app/widget/curvewidget/beziercontrolpointitem.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "beziercontrolpointitem.h"
#include <QApplication>
@@ -7,6 +27,8 @@
#include "common/qtutils.h"
OLIVE_NAMESPACE_ENTER
BezierControlPointItem::BezierControlPointItem(NodeKeyframePtr key, NodeKeyframe::BezierType mode, QGraphicsItem *parent) :
QGraphicsRectItem(parent),
key_(key),
@@ -80,3 +102,5 @@ void BezierControlPointItem::UpdatePos()
setPos(handle_offset - rect().center());
}
OLIVE_NAMESPACE_EXIT
app/widget/curvewidget/beziercontrolpointitem.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef BEZIERCONTROLPOINTITEM_H
#define BEZIERCONTROLPOINTITEM_H
@@ -5,6 +25,8 @@
#include "node/keyframe.h"
OLIVE_NAMESPACE_ENTER
class BezierControlPointItem : public QObject, public QGraphicsRectItem
{
public:
@@ -41,4 +63,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // BEZIERCONTROLPOINTITEM_H
app/widget/curvewidget/curveview.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "curveview.h"
#include <QMouseEvent>
@@ -5,6 +25,8 @@
#include "common/qtutils.h"
OLIVE_NAMESPACE_ENTER
CurveView::CurveView(QWidget *parent) :
KeyframeViewBase(parent)
{
@@ -354,3 +376,5 @@ void CurveView::AddKeyframe(NodeKeyframePtr key)
connect(key.get(), &NodeKeyframe::ValueChanged, this, &CurveView::KeyframeValueChanged);
connect(key.get(), &NodeKeyframe::TypeChanged, this, &CurveView::KeyframeTypeChanged);
}
OLIVE_NAMESPACE_EXIT
app/widget/curvewidget/curveview.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef CURVEVIEW_H
#define CURVEVIEW_H
@@ -6,6 +26,8 @@
#include "widget/keyframeview/keyframeview.h"
#include "widget/keyframeview/keyframeviewitem.h"
OLIVE_NAMESPACE_ENTER
class CurveView : public KeyframeViewBase
{
public:
@@ -67,4 +89,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // CURVEVIEW_H
app/widget/curvewidget/curvewidget.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "curvewidget.h"
#include <QEvent>
@@ -11,6 +31,8 @@
#include "node/node.h"
#include "widget/keyframeview/keyframeviewundo.h"
OLIVE_NAMESPACE_ENTER
CurveWidget::CurveWidget(QWidget *parent) :
TimeBasedWidget(parent),
input_(nullptr),
@@ -294,3 +316,5 @@ void CurveWidget::KeyControlRequestedTimeChanged(const rational &time)
{
SetTimeAndSignal(Timecode::time_to_timestamp(time, view_->timebase()));
}
OLIVE_NAMESPACE_EXIT
app/widget/curvewidget/curvewidget.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef CURVEWIDGET_H
#define CURVEWIDGET_H
@@ -11,6 +31,8 @@
#include "widget/nodeparamview/nodeparamviewwidgetbridge.h"
#include "widget/timebased/timebased.h"
OLIVE_NAMESPACE_ENTER
class CurveWidget : public TimeBasedWidget, public TimeTargetObject
{
Q_OBJECT
@@ -71,4 +93,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // CURVEWIDGET_H
app/widget/focusablelineedit/focusablelineedit.cpp
+4
View File
@@ -22,6 +22,8 @@
#include <QKeyEvent>
OLIVE_NAMESPACE_ENTER
FocusableLineEdit::FocusableLineEdit(QWidget *parent) :
QLineEdit(parent)
{
@@ -49,3 +51,5 @@ void FocusableLineEdit::focusOutEvent(QFocusEvent *e)
emit Confirmed();
}
OLIVE_NAMESPACE_EXIT
app/widget/focusablelineedit/focusablelineedit.h
+6
View File
@@ -23,6 +23,10 @@
#include <QLineEdit>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class FocusableLineEdit : public QLineEdit
{
Q_OBJECT
@@ -42,4 +46,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
#endif // SLIDERLINEEDIT_H
app/widget/footagecombobox/footagecombobox.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "footagecombobox.h"
#include <QAction>
@@ -6,6 +26,8 @@
#include "ui/icons/icons.h"
#include "widget/menu/menu.h"
OLIVE_NAMESPACE_ENTER
FootageComboBox::FootageComboBox(QWidget *parent) :
QComboBox(parent),
root_(nullptr),
@@ -95,3 +117,5 @@ void FootageComboBox::TraverseFolder(const Folder *f, QMenu *m)
}
}
}
OLIVE_NAMESPACE_EXIT
app/widget/footagecombobox/footagecombobox.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef FOOTAGECOMBOBOX_H
#define FOOTAGECOMBOBOX_H
@@ -7,6 +27,8 @@
#include "project/item/footage/footage.h"
#include "project/project.h"
OLIVE_NAMESPACE_ENTER
class FootageComboBox : public QComboBox
{
Q_OBJECT
@@ -37,4 +59,6 @@ private:
bool only_show_ready_footage_;
};
OLIVE_NAMESPACE_EXIT
#endif // FOOTAGECOMBOBOX_H
app/widget/keyframeview/keyframeview.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "keyframeview.h"
OLIVE_NAMESPACE_ENTER
KeyframeView::KeyframeView(QWidget *parent) :
KeyframeViewBase(parent)
{
@@ -22,3 +44,5 @@ void KeyframeView::AddKeyframe(NodeKeyframePtr key, int y)
KeyframeViewItem* item = AddKeyframeInternal(key);
item->SetOverrideY(scene_pt.y());
}
OLIVE_NAMESPACE_EXIT
app/widget/keyframeview/keyframeview.h
+24
View File
@@ -1,8 +1,30 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef KEYFRAMEVIEW_H
#define KEYFRAMEVIEW_H
#include "keyframeviewbase.h"
OLIVE_NAMESPACE_ENTER
class KeyframeView : public KeyframeViewBase
{
Q_OBJECT
@@ -17,4 +39,6 @@ public slots:
};
OLIVE_NAMESPACE_EXIT
#endif // KEYFRAMEVIEW_H
app/widget/keyframeview/keyframeviewbase.cpp
+23
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "keyframeviewbase.h"
#include <QMouseEvent>
@@ -10,6 +30,8 @@
#include "widget/menu/menushared.h"
#include "widget/nodeparamview/nodeparamviewundo.h"
OLIVE_NAMESPACE_ENTER
KeyframeViewBase::KeyframeViewBase(QWidget *parent) :
TimelineViewBase(parent),
dragging_bezier_point_(nullptr),
@@ -458,3 +480,4 @@ void KeyframeViewBase::ShowKeyframePropertiesDialog()
}
}
OLIVE_NAMESPACE_EXIT
app/widget/keyframeview/keyframeviewbase.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef KEYFRAMEVIEWBASE_H
#define KEYFRAMEVIEWBASE_H
@@ -7,6 +27,8 @@
#include "widget/curvewidget/beziercontrolpointitem.h"
#include "widget/timelinewidget/view/timelineviewbase.h"
OLIVE_NAMESPACE_ENTER
class KeyframeViewBase : public TimelineViewBase, public TimeTargetObject
{
Q_OBJECT
@@ -81,4 +103,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // KEYFRAMEVIEWBASE_H
app/widget/keyframeview/keyframeviewitem.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "keyframeviewitem.h"
#include <QApplication>
@@ -8,6 +28,8 @@
#include "common/qtutils.h"
#include "node/input.h"
OLIVE_NAMESPACE_ENTER
KeyframeViewItem::KeyframeViewItem(NodeKeyframePtr key, QGraphicsItem *parent) :
QGraphicsRectItem(parent),
key_(key),
@@ -104,3 +126,5 @@ void KeyframeViewItem::Redraw()
{
QGraphicsItem::update();
}
OLIVE_NAMESPACE_EXIT
app/widget/keyframeview/keyframeviewitem.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef KEYFRAMEVIEWITEM_H
#define KEYFRAMEVIEWITEM_H
@@ -6,6 +26,8 @@
#include "node/keyframe.h"
#include "timetargetobject.h"
OLIVE_NAMESPACE_ENTER
class KeyframeViewItem : public QObject, public QGraphicsRectItem, public TimeTargetObject
{
Q_OBJECT
@@ -41,4 +63,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // KEYFRAMEVIEWITEM_H
app/widget/keyframeview/keyframeviewundo.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "keyframeviewundo.h"
OLIVE_NAMESPACE_ENTER
KeyframeSetTypeCommand::KeyframeSetTypeCommand(NodeKeyframePtr key, NodeKeyframe::Type type, QUndoCommand *parent) :
UndoCommand(parent),
key_(key),
@@ -45,3 +67,5 @@ void KeyframeSetBezierControlPoint::undo_internal()
{
key_->set_bezier_control(mode_, old_point_);
}
OLIVE_NAMESPACE_EXIT
app/widget/keyframeview/keyframeviewundo.h
+24
View File
@@ -1,9 +1,31 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef KEYFRAMEVIEWUNDO_H
#define KEYFRAMEVIEWUNDO_H
#include "node/keyframe.h"
#include "undo/undocommand.h"
OLIVE_NAMESPACE_ENTER
class KeyframeSetTypeCommand : public UndoCommand {
public:
KeyframeSetTypeCommand(NodeKeyframePtr key, NodeKeyframe::Type type, QUndoCommand* parent = nullptr);
@@ -41,4 +63,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // KEYFRAMEVIEWUNDO_H
app/widget/keyframeview/timetargetobject.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "timetargetobject.h"
OLIVE_NAMESPACE_ENTER
TimeTargetObject::TimeTargetObject() :
time_target_(nullptr),
path_index_(0)
@@ -57,3 +79,5 @@ TimeRange TimeTargetObject::GetAdjustedTime(Node* from, Node* to, const TimeRang
return adjusted.size();
}*/
OLIVE_NAMESPACE_EXIT
app/widget/keyframeview/timetargetobject.h
+24
View File
@@ -1,8 +1,30 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef TIMETARGETOBJECT_H
#define TIMETARGETOBJECT_H
#include "node/node.h"
OLIVE_NAMESPACE_ENTER
class TimeTargetObject
{
public:
@@ -28,4 +50,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMETARGETOBJECT_H
app/widget/menu/menu.cpp
+4
View File
@@ -22,6 +22,8 @@
#include "ui/style/style.h"
OLIVE_NAMESPACE_ENTER
Menu::Menu(QMenuBar *bar, const QObject* receiver, const char* member) :
QMenu(bar)
{
@@ -139,3 +141,5 @@ void Menu::SetBooleanAction(QAction *a, bool* boolean)
a->setChecked(*boolean);
a->setProperty("boolptr", reinterpret_cast<quintptr>(boolean));
}
OLIVE_NAMESPACE_EXIT
app/widget/menu/menu.h
+6
View File
@@ -24,6 +24,10 @@
#include <QMenuBar>
#include <QMenu>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A menu widget for context menus and menu bars
*
@@ -171,4 +175,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // WIDGETMENU_H
app/widget/menu/menushared.cpp
+4
View File
@@ -24,6 +24,8 @@
#include "panel/panelmanager.h"
#include "panel/timeline/timeline.h"
OLIVE_NAMESPACE_ENTER
MenuShared* MenuShared::instance_ = nullptr;
MenuShared::MenuShared()
@@ -211,3 +213,5 @@ void MenuShared::Retranslate()
clip_enable_disable_item_->setText(tr("Enable/Disable"));
clip_nest_item_->setText(tr("Nest"));
}
OLIVE_NAMESPACE_EXIT
app/widget/menu/menushared.h
+4
View File
@@ -23,6 +23,8 @@
#include "widget/menu/menu.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A static object that provides various "stock" menus for use throughout the application
*/
@@ -103,4 +105,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // MENUSHARED_H
app/widget/nodecopypaste/nodecopypaste.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "nodecopypaste.h"
#include <QMessageBox>
@@ -6,6 +26,8 @@
#include "widget/nodeview/nodeviewundo.h"
#include "window/mainwindow/mainwindow.h"
OLIVE_NAMESPACE_ENTER
void NodeCopyPasteWidget::CopyNodesToClipboard(const QList<Node *> &nodes, void *userdata)
{
QString copy_str;
@@ -139,3 +161,5 @@ void NodeCopyPasteWidget::PasteNodesFromClipboardInternal(QXmlStreamReader* read
{
reader->skipCurrentElement();
}
OLIVE_NAMESPACE_EXIT
app/widget/nodecopypaste/nodecopypaste.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef NODECOPYPASTEWIDGET_H
#define NODECOPYPASTEWIDGET_H
@@ -7,6 +27,8 @@
#include "node/node.h"
#include "project/item/sequence/sequence.h"
OLIVE_NAMESPACE_ENTER
class NodeCopyPasteWidget
{
public:
@@ -23,4 +45,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
#endif // NODECOPYPASTEWIDGET_H
app/widget/nodeparamview/nodeparamview.cpp
+4
View File
@@ -27,6 +27,8 @@
#include "common/timecodefunctions.h"
#include "node/output/viewer/viewer.h"
OLIVE_NAMESPACE_ENTER
NodeParamView::NodeParamView(QWidget *parent) :
TimeBasedWidget(true, false, parent),
last_scroll_val_(0)
@@ -224,3 +226,5 @@ void NodeParamView::ForceKeyframeViewToScroll(int min, int max)
bottom_item_->setY(keyframe_view_->viewport()->height() + max);
}
OLIVE_NAMESPACE_EXIT
app/widget/nodeparamview/nodeparamview.h
+4
View File
@@ -29,6 +29,8 @@
#include "widget/keyframeview/keyframeview.h"
#include "widget/timebased/timebased.h"
OLIVE_NAMESPACE_ENTER
class NodeParamView : public TimeBasedWidget
{
Q_OBJECT
@@ -74,4 +76,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // NODEPARAMVIEW_H
app/widget/nodeparamview/nodeparamviewitem.cpp
+4
View File
@@ -30,6 +30,8 @@
#include "project/item/sequence/sequence.h"
#include "ui/icons/icons.h"
OLIVE_NAMESPACE_ENTER
NodeParamViewItem::NodeParamViewItem(Node *node, QWidget *parent) :
QWidget(parent),
node_(node)
@@ -281,3 +283,5 @@ void NodeParamViewItemTitleBar::paintEvent(QPaintEvent *event)
p.setPen(palette().text().color());
p.drawLine(0, bottom, width(), bottom);
}
OLIVE_NAMESPACE_EXIT
app/widget/nodeparamview/nodeparamviewitem.h
+4
View File
@@ -32,6 +32,8 @@
#include "nodeparamviewwidgetbridge.h"
#include "widget/clickablelabel/clickablelabel.h"
OLIVE_NAMESPACE_ENTER
class NodeParamViewItemTitleBar : public QWidget {
public:
NodeParamViewItemTitleBar(QWidget* parent = nullptr);
@@ -109,4 +111,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // NODEPARAMVIEWITEM_H
app/widget/nodeparamview/nodeparamviewkeyframecontrol.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "nodeparamviewkeyframecontrol.h"
#include <QHBoxLayout>
@@ -7,6 +27,8 @@
#include "nodeparamviewundo.h"
#include "ui/icons/icons.h"
OLIVE_NAMESPACE_ENTER
NodeParamViewKeyframeControl::NodeParamViewKeyframeControl(bool right_align, QWidget *parent) :
QWidget(parent),
input_(nullptr)
@@ -254,3 +276,5 @@ void NodeParamViewKeyframeControl::KeyframeEnableChanged(bool e)
Core::instance()->undo_stack()->pushIfHasChildren(command);
}
OLIVE_NAMESPACE_EXIT
app/widget/nodeparamview/nodeparamviewkeyframecontrol.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef NODEPARAMVIEWKEYFRAMECONTROL_H
#define NODEPARAMVIEWKEYFRAMECONTROL_H
@@ -7,6 +27,8 @@
#include "node/input.h"
#include "widget/keyframeview/timetargetobject.h"
OLIVE_NAMESPACE_ENTER
class NodeParamViewKeyframeControl : public QWidget, public TimeTargetObject
{
Q_OBJECT
@@ -55,4 +77,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // NODEPARAMVIEWKEYFRAMECONTROL_H
app/widget/nodeparamview/nodeparamviewundo.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "nodeparamviewundo.h"
OLIVE_NAMESPACE_ENTER
NodeParamSetKeyframingCommand::NodeParamSetKeyframingCommand(NodeInput *input, bool setting, QUndoCommand *parent) :
UndoCommand(parent),
input_(input),
@@ -144,3 +166,5 @@ void NodeParamSetStandardValueCommand::undo_internal()
{
input_->set_standard_value(old_value_, track_);
}
OLIVE_NAMESPACE_EXIT
app/widget/nodeparamview/nodeparamviewundo.h
+24
View File
@@ -1,9 +1,31 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef NODEPARAMVIEWUNDO_H
#define NODEPARAMVIEWUNDO_H
#include "node/input.h"
#include "undo/undocommand.h"
OLIVE_NAMESPACE_ENTER
class NodeParamSetKeyframingCommand : public UndoCommand {
public:
NodeParamSetKeyframingCommand(NodeInput* input, bool setting, QUndoCommand* parent = nullptr);
@@ -102,4 +124,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // NODEPARAMVIEWUNDO_H
app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "nodeparamviewwidgetbridge.h"
#include <QCheckBox>
@@ -17,6 +37,8 @@
#include "widget/slider/floatslider.h"
#include "widget/slider/integerslider.h"
OLIVE_NAMESPACE_ENTER
NodeParamViewWidgetBridge::NodeParamViewWidgetBridge(NodeInput *input, QObject *parent) :
QObject(parent),
input_(input),
@@ -571,3 +593,5 @@ void NodeParamViewWidgetBridge::PropertyChanged(const QString &key, const QVaria
}
}
}
OLIVE_NAMESPACE_EXIT
app/widget/nodeparamview/nodeparamviewwidgetbridge.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef NODEPARAMVIEWWIDGETBRIDGE_H
#define NODEPARAMVIEWWIDGETBRIDGE_H
@@ -7,6 +27,8 @@
#include "widget/keyframeview/timetargetobject.h"
#include "widget/slider/sliderbase.h"
OLIVE_NAMESPACE_ENTER
class NodeParamViewWidgetBridge : public QObject, public TimeTargetObject
{
Q_OBJECT
@@ -52,4 +74,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // NODEPARAMVIEWWIDGETBRIDGE_H
app/widget/nodeview/nodeview.cpp
+4
View File
@@ -26,6 +26,8 @@
#include "nodeviewundo.h"
#include "node/factory.h"
OLIVE_NAMESPACE_ENTER
NodeView::NodeView(QWidget *parent) :
QGraphicsView(parent),
graph_(nullptr),
@@ -468,3 +470,5 @@ void NodeView::DetachItemFromCursor()
{
AttachItemToCursor(nullptr);
}
OLIVE_NAMESPACE_EXIT
app/widget/nodeview/nodeview.h
+4
View File
@@ -28,6 +28,8 @@
#include "nodeviewscene.h"
#include "widget/nodecopypaste/nodecopypaste.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A widget for viewing and editing node graphs
*
@@ -117,4 +119,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // NODEVIEW_H
app/widget/nodeview/nodeviewedge.cpp
+3
View File
@@ -29,6 +29,8 @@
#include "nodeview.h"
#include "nodeviewscene.h"
OLIVE_NAMESPACE_ENTER
NodeViewEdge::NodeViewEdge(QGraphicsItem *parent) :
QGraphicsPathItem(parent),
edge_(nullptr),
@@ -114,3 +116,4 @@ void NodeViewEdge::UpdatePen()
//update();
}
OLIVE_NAMESPACE_EXIT
app/widget/nodeview/nodeviewedge.h
+4
View File
@@ -26,6 +26,8 @@
#include "node/edge.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A graphical representation of a NodeEdge to be used in NodeView
*
@@ -94,4 +96,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // NODEEDGEITEM_H
app/widget/nodeview/nodeviewitem.cpp
+4
View File
@@ -35,6 +35,8 @@
#include "ui/icons/icons.h"
#include "window/mainwindow/mainwindow.h"
OLIVE_NAMESPACE_ENTER
NodeViewItem::NodeViewItem(QGraphicsItem *parent) :
QGraphicsRectItem(parent),
node_(nullptr),
@@ -456,3 +458,5 @@ QPointF NodeViewItem::GetInputPoint(int index) const
return QPointF(input_rect.left(), input_rect.center().y());
}
OLIVE_NAMESPACE_EXIT
app/widget/nodeview/nodeviewitem.h
+4
View File
@@ -31,6 +31,8 @@
#include "nodeviewedge.h"
#include "nodeviewitemwidgetproxy.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A visual widget representation of a Node object to be used in a NodeView
*
@@ -153,4 +155,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // NODEVIEWITEM_H
app/widget/nodeview/nodeviewitemwidgetproxy.cpp
+20 -4
View File
@@ -1,8 +1,24 @@
#include "nodeviewitemwidgetproxy.h"
/***
NodeViewItemWidget::NodeViewItemWidget()
{
}
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "nodeviewitemwidgetproxy.h"
QColor NodeViewItemWidget::TitleBarColor()
{
app/widget/nodeview/nodeviewitemwidgetproxy.h
+21 -1
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef NODEVIEWITEMWIDGETPROXY_H
#define NODEVIEWITEMWIDGETPROXY_H
@@ -14,7 +34,7 @@ class NodeViewItemWidget : public QWidget {
Q_PROPERTY(QColor titlebarColor READ TitleBarColor WRITE SetTitleBarColor DESIGNABLE true)
Q_PROPERTY(QColor borderColor READ BorderColor WRITE SetBorderColor DESIGNABLE true)
public:
NodeViewItemWidget();
NodeViewItemWidget() = default;
QColor TitleBarColor();
void SetTitleBarColor(QColor color);
app/widget/nodeview/nodeviewscene.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "nodeviewscene.h"
OLIVE_NAMESPACE_ENTER
NodeViewScene::NodeViewScene(QObject *parent) :
QGraphicsScene(parent),
graph_(nullptr)
@@ -296,3 +318,5 @@ void NodeViewScene::Reorganize()
ReorganizeInternal(NodeToUIObject(end_node), node_weights, processed_nodes);
}
}
OLIVE_NAMESPACE_EXIT
app/widget/nodeview/nodeviewscene.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef NODEVIEWSCENE_H
#define NODEVIEWSCENE_H
@@ -8,6 +28,8 @@
#include "widget/nodeview/nodeviewedge.h"
#include "widget/nodeview/nodeviewitem.h"
OLIVE_NAMESPACE_ENTER
class NodeViewScene : public QGraphicsScene
{
Q_OBJECT
@@ -105,4 +127,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // NODEVIEWSCENE_H
app/widget/nodeview/nodeviewundo.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
NodeEdgeAddCommand::NodeEdgeAddCommand(NodeOutput *output, NodeInput *input, QUndoCommand *parent) :
UndoCommand(parent),
output_(output),
@@ -164,3 +186,5 @@ void NodeCopyInputsCommand::redo_internal()
{
Node::CopyInputs(src_, dest_, include_connections_);
}
OLIVE_NAMESPACE_EXIT
app/widget/nodeview/nodeviewundo.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef NODEVIEWUNDO_H
#define NODEVIEWUNDO_H
@@ -8,6 +28,8 @@
#include "nodeviewitem.h"
#include "undo/undocommand.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief An undoable command for connecting two NodeParams together
*
@@ -117,4 +139,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // NODEVIEWUNDO_H
app/widget/panel/panel.cpp
+4
View File
@@ -25,6 +25,8 @@
#include <QStyleOption>
#include <QVariant>
OLIVE_NAMESPACE_ENTER
PanelWidget::PanelWidget(QWidget *parent) :
QDockWidget(parent),
border_visible_(false)
@@ -113,3 +115,5 @@ void PanelWidget::changeEvent(QEvent *e)
void PanelWidget::Retranslate()
{
}
OLIVE_NAMESPACE_EXIT
app/widget/panel/panel.h
+6
View File
@@ -24,6 +24,10 @@
#include <QDockWidget>
#include <QEvent>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A widget that is always dockable within the MainWindow.
*/
@@ -204,4 +208,6 @@ private:
bool border_visible_;
};
OLIVE_NAMESPACE_EXIT
#endif // PANEL_WIDGET_H
app/widget/playbackcontrols/dragbutton.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "dragbutton.h"
OLIVE_NAMESPACE_ENTER
DragButton::DragButton(QWidget *parent) :
QPushButton(parent)
{
@@ -10,3 +32,5 @@ void DragButton::mousePressEvent(QMouseEvent *event) {
emit MousePressed();
}
OLIVE_NAMESPACE_EXIT
app/widget/playbackcontrols/dragbutton.h
+26
View File
@@ -1,8 +1,32 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef DRAGBUTTON_H
#define DRAGBUTTON_H
#include <QPushButton>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class DragButton : public QPushButton
{
Q_OBJECT
@@ -17,4 +41,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
#endif // DRAGBUTTON_H
app/widget/playbackcontrols/playbackcontrols.cpp
+4
View File
@@ -28,6 +28,8 @@
#include "config/config.h"
#include "ui/icons/icons.h"
OLIVE_NAMESPACE_ENTER
PlaybackControls::PlaybackControls(QWidget *parent) :
QWidget(parent),
time_base_(0)
@@ -220,3 +222,5 @@ void PlaybackControls::TimecodeChanged()
// Update end time
SetEndTime(end_time_);
}
OLIVE_NAMESPACE_EXIT
app/widget/playbackcontrols/playbackcontrols.h
+4
View File
@@ -30,6 +30,8 @@
#include "dragbutton.h"
#include "widget/slider/timeslider.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A playback controls widget providing buttons for navigating media
*
@@ -132,4 +134,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // PLAYBACKCONTROLS_H
app/widget/projectexplorer/projectexplorer.cpp
+4
View File
@@ -33,6 +33,8 @@
#include "dialog/sequence/sequence.h"
#include "widget/menu/menu.h"
OLIVE_NAMESPACE_ENTER
ProjectExplorer::ProjectExplorer(QWidget *parent) :
QWidget(parent),
model_(this)
@@ -425,3 +427,5 @@ void ProjectExplorer::DeleteSelected()
Core::instance()->undo_stack()->pushIfHasChildren(command);
}
OLIVE_NAMESPACE_EXIT
app/widget/projectexplorer/projectexplorer.h
+4
View File
@@ -33,6 +33,8 @@
#include "widget/projectexplorer/projectexplorernavigation.h"
#include "widget/projecttoolbar/projecttoolbar.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A widget for browsing through a Project structure.
*
@@ -163,4 +165,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // PROJECTEXPLORER_H
app/widget/projectexplorer/projectexplorericonview.cpp
+4
View File
@@ -20,6 +20,8 @@
#include "projectexplorericonview.h"
OLIVE_NAMESPACE_ENTER
ProjectExplorerIconView::ProjectExplorerIconView(QWidget *parent) :
ProjectExplorerListViewBase(parent)
{
@@ -27,3 +29,5 @@ ProjectExplorerIconView::ProjectExplorerIconView(QWidget *parent) :
setItemDelegate(&delegate_);
}
OLIVE_NAMESPACE_EXIT
app/widget/projectexplorer/projectexplorericonview.h
+4
View File
@@ -24,6 +24,8 @@
#include "projectexplorerlistviewbase.h"
#include "projectexplorericonviewitemdelegate.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief The view widget used when ProjectExplorer is in Icon View
*/
@@ -37,4 +39,6 @@ private:
ProjectExplorerIconViewItemDelegate delegate_;
};
OLIVE_NAMESPACE_EXIT
#endif // PROJECTEXPLORERICONVIEW_H
app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp
+3
View File
@@ -24,6 +24,8 @@
#include "common/qtutils.h"
OLIVE_NAMESPACE_ENTER
ProjectExplorerIconViewItemDelegate::ProjectExplorerIconViewItemDelegate(QObject *parent) :
QStyledItemDelegate (parent)
{
@@ -97,3 +99,4 @@ void ProjectExplorerIconViewItemDelegate::paint(QPainter *painter, const QStyleO
}
}
OLIVE_NAMESPACE_EXIT
app/widget/projectexplorer/projectexplorericonviewitemdelegate.h
+6
View File
@@ -23,6 +23,10 @@
#include <QStyledItemDelegate>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief The delegate that's used to draw items when ProjectExplorer is in Icon view
*/
@@ -34,4 +38,6 @@ public:
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
};
OLIVE_NAMESPACE_EXIT
#endif // PROJECTEXPLORERICONVIEWITEMDELEGATE_H
app/widget/projectexplorer/projectexplorerlistview.cpp
+4
View File
@@ -20,6 +20,8 @@
#include "projectexplorerlistview.h"
OLIVE_NAMESPACE_ENTER
ProjectExplorerListView::ProjectExplorerListView(QWidget *parent) :
ProjectExplorerListViewBase(parent)
{
@@ -27,3 +29,5 @@ ProjectExplorerListView::ProjectExplorerListView(QWidget *parent) :
setItemDelegate(&delegate_);
}
OLIVE_NAMESPACE_EXIT
app/widget/projectexplorer/projectexplorerlistview.h
+4
View File
@@ -24,6 +24,8 @@
#include "projectexplorerlistviewbase.h"
#include "projectexplorerlistviewitemdelegate.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief The view widget used when ProjectExplorer is in List View
*/
@@ -37,4 +39,6 @@ private:
ProjectExplorerListViewItemDelegate delegate_;
};
OLIVE_NAMESPACE_EXIT
#endif // PROJECTEXPLORERLISTVIEW_H
app/widget/projectexplorer/projectexplorerlistviewbase.cpp
+4
View File
@@ -22,6 +22,8 @@
#include <QMouseEvent>
OLIVE_NAMESPACE_ENTER
ProjectExplorerListViewBase::ProjectExplorerListViewBase(QWidget *parent) :
QListView(parent)
{
@@ -48,3 +50,5 @@ void ProjectExplorerListViewBase::mouseDoubleClickEvent(QMouseEvent *event)
emit DoubleClickedEmptyArea();
}
}
OLIVE_NAMESPACE_EXIT
app/widget/projectexplorer/projectexplorerlistviewbase.h
+6
View File
@@ -23,6 +23,10 @@
#include <QListView>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A QListView derivative that contains functionality used by both List view and Icon view (which are both based
* on QListView)
@@ -53,4 +57,6 @@ signals:
void DoubleClickedEmptyArea();
};
OLIVE_NAMESPACE_EXIT
#endif // PROJECTEXPLORERLISTVIEWBASE_H
app/widget/projectexplorer/projectexplorerlistviewitemdelegate.cpp
+4
View File
@@ -22,6 +22,8 @@
#include <QPainter>
OLIVE_NAMESPACE_ENTER
ProjectExplorerListViewItemDelegate::ProjectExplorerListViewItemDelegate(QObject *parent) :
QStyledItemDelegate(parent)
{
@@ -77,3 +79,5 @@ void ProjectExplorerListViewItemDelegate::paint(QPainter *painter, const QStyleO
painter->drawText(text_rect, static_cast<int>(Qt::AlignLeft | Qt::AlignVCenter), text);
}
OLIVE_NAMESPACE_EXIT
app/widget/projectexplorer/projectexplorerlistviewitemdelegate.h
+6
View File
@@ -23,6 +23,10 @@
#include <QStyledItemDelegate>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief The delegate that's used to draw items when ProjectExplorer is in List view
*/
@@ -35,4 +39,6 @@ public:
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
};
OLIVE_NAMESPACE_EXIT
#endif // PROJECTEXPLORERLISTVIEWITEMDELEGATE_H
app/widget/projectexplorer/projectexplorernavigation.cpp
+4
View File
@@ -26,6 +26,8 @@
#include "common/define.h"
#include "ui/icons/icons.h"
OLIVE_NAMESPACE_ENTER
ProjectExplorerNavigation::ProjectExplorerNavigation(QWidget *parent) :
QWidget(parent)
{
@@ -93,3 +95,5 @@ void ProjectExplorerNavigation::UpdateIcons()
size_slider_->setMaximum(kProjectIconSizeMaximum);
size_slider_->setValue(kProjectIconSizeDefault);
}
OLIVE_NAMESPACE_EXIT
app/widget/projectexplorer/projectexplorernavigation.h
+6
View File
@@ -26,6 +26,10 @@
#include <QSlider>
#include <QWidget>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A navigation bar widget for ProjectExplorer's Icon and List views
*
@@ -108,4 +112,6 @@ private:
QSlider* size_slider_;
};
OLIVE_NAMESPACE_EXIT
#endif // PROJECTEXPLORERLISTVIEWTOOLBAR_H
app/widget/projectexplorer/projectexplorertreeview.cpp
+4
View File
@@ -22,6 +22,8 @@
#include <QMouseEvent>
OLIVE_NAMESPACE_ENTER
ProjectExplorerTreeView::ProjectExplorerTreeView(QWidget *parent) :
QTreeView(parent)
{
@@ -51,3 +53,5 @@ void ProjectExplorerTreeView::mouseDoubleClickEvent(QMouseEvent *event)
emit DoubleClickedEmptyArea();
}
}
OLIVE_NAMESPACE_EXIT
app/widget/projectexplorer/projectexplorertreeview.h
+6
View File
@@ -23,6 +23,10 @@
#include <QTreeView>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief The view widget used when ProjectExplorer is in Tree View
*
@@ -55,4 +59,6 @@ signals:
void DoubleClickedEmptyArea();
};
OLIVE_NAMESPACE_EXIT
#endif // PROJECTEXPLORERTREEVIEW_H
app/widget/projecttoolbar/projecttoolbar.cpp
+4
View File
@@ -26,6 +26,8 @@
#include "ui/icons/icons.h"
OLIVE_NAMESPACE_ENTER
ProjectToolbar::ProjectToolbar(QWidget *parent) :
QWidget(parent)
{
@@ -150,3 +152,5 @@ void ProjectToolbar::ViewButtonClicked()
abort();
}
}
OLIVE_NAMESPACE_EXIT
app/widget/projecttoolbar/projecttoolbar.h
+6
View File
@@ -25,6 +25,10 @@
#include <QLineEdit>
#include <QPushButton>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief The ProjectToolbar class
*
@@ -83,4 +87,6 @@ private slots:
void ViewButtonClicked();
};
OLIVE_NAMESPACE_EXIT
#endif // PROJECTTOOLBAR_H
app/widget/resizablescrollbar/resizablescrollbar.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "resizablescrollbar.h"
#include <QDebug>
@@ -7,6 +27,8 @@
#include "common/range.h"
OLIVE_NAMESPACE_ENTER
const int ResizableScrollBar::kHandleWidth = 10;
ResizableScrollBar::ResizableScrollBar(QWidget *parent) :
@@ -136,3 +158,5 @@ int ResizableScrollBar::GetActiveMousePos(QMouseEvent *event)
return event->pos().y();
}
}
OLIVE_NAMESPACE_EXIT
app/widget/resizablescrollbar/resizablescrollbar.h
+26
View File
@@ -1,8 +1,32 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef RESIZABLESCROLLBAR_H
#define RESIZABLESCROLLBAR_H
#include <QScrollBar>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class ResizableScrollBar : public QScrollBar
{
Q_OBJECT
@@ -41,4 +65,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // RESIZABLESCROLLBAR_H
app/widget/slider/floatslider.cpp
+4
View File
@@ -22,6 +22,8 @@
#include <QAudio>
OLIVE_NAMESPACE_ENTER
FloatSlider::FloatSlider(QWidget *parent) :
SliderBase(kFloat, parent),
display_type_(kNormal)
@@ -162,3 +164,5 @@ void FloatSlider::ConvertValue(QVariant v)
{
emit ValueChanged(v.toDouble());
}
OLIVE_NAMESPACE_EXIT
app/widget/slider/floatslider.h
+4
View File
@@ -23,6 +23,8 @@
#include "sliderbase.h"
OLIVE_NAMESPACE_ENTER
class FloatSlider : public SliderBase
{
Q_OBJECT
@@ -64,4 +66,6 @@ private:
DisplayType display_type_;
};
OLIVE_NAMESPACE_EXIT
#endif // FLOATSLIDER_H
app/widget/slider/integerslider.cpp
+4
View File
@@ -20,6 +20,8 @@
#include "integerslider.h"
OLIVE_NAMESPACE_ENTER
IntegerSlider::IntegerSlider(QWidget* parent) :
SliderBase(kInteger, parent)
{
@@ -69,3 +71,5 @@ void IntegerSlider::ConvertValue(QVariant v)
{
emit ValueChanged(v.toInt());
}
OLIVE_NAMESPACE_EXIT
app/widget/slider/integerslider.h
+4
View File
@@ -23,6 +23,8 @@
#include "sliderbase.h"
OLIVE_NAMESPACE_ENTER
class IntegerSlider : public SliderBase
{
Q_OBJECT
@@ -47,4 +49,6 @@ private slots:
void ConvertValue(QVariant v);
};
OLIVE_NAMESPACE_EXIT
#endif // INTEGERSLIDER_H
app/widget/slider/sliderbase.cpp
+4
View File
@@ -24,6 +24,8 @@
#include <QEvent>
#include <QMessageBox>
OLIVE_NAMESPACE_ENTER
SliderBase::SliderBase(Mode mode, QWidget *parent) :
QStackedWidget(parent),
decimal_places_(1),
@@ -315,3 +317,5 @@ void SliderBase::LineEditCancelled()
editor_->blockSignals(false);
label_->blockSignals(false);
}
OLIVE_NAMESPACE_EXIT
app/widget/slider/sliderbase.h
+3
View File
@@ -26,6 +26,7 @@
#include "sliderlabel.h"
#include "widget/focusablelineedit/focusablelineedit.h"
OLIVE_NAMESPACE_ENTER
class SliderBase : public QStackedWidget
{
Q_OBJECT
@@ -121,4 +122,6 @@ private slots:
void LineEditCancelled();
};
OLIVE_NAMESPACE_EXIT
#endif // SLIDERBASE_H
app/widget/slider/sliderlabel.cpp
+4
View File
@@ -23,6 +23,8 @@
#include <QApplication>
#include <QMouseEvent>
OLIVE_NAMESPACE_ENTER
SliderLabel::SliderLabel(QWidget *parent) :
QLabel(parent)
{
@@ -90,3 +92,5 @@ void SliderLabel::focusInEvent(QFocusEvent *event)
emit focused();
}
}
OLIVE_NAMESPACE_EXIT
app/widget/slider/sliderlabel.h
+6
View File
@@ -23,6 +23,10 @@
#include <QLabel>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class SliderLabel : public QLabel
{
Q_OBJECT
@@ -52,4 +56,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // SLIDERLABEL_H
app/widget/slider/stringslider.cpp
+4
View File
@@ -20,6 +20,8 @@
#include "stringslider.h"
OLIVE_NAMESPACE_ENTER
StringSlider::StringSlider(QWidget* parent) :
SliderBase(kString, parent)
{
@@ -46,3 +48,5 @@ void StringSlider::ConvertValue(QVariant v)
{
emit ValueChanged(v.toString());
}
OLIVE_NAMESPACE_EXIT
app/widget/slider/stringslider.h
+4
View File
@@ -23,6 +23,8 @@
#include "sliderbase.h"
OLIVE_NAMESPACE_ENTER
class StringSlider : public SliderBase
{
Q_OBJECT
@@ -45,4 +47,6 @@ private slots:
void ConvertValue(QVariant v);
};
OLIVE_NAMESPACE_EXIT
#endif // STRINGSLIDER_H
app/widget/slider/timeslider.cpp
+24
View File
@@ -1,8 +1,30 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#include "timeslider.h"
#include "common/timecodefunctions.h"
#include "core.h"
OLIVE_NAMESPACE_ENTER
TimeSlider::TimeSlider(QWidget *parent) :
IntegerSlider(parent)
{
@@ -40,3 +62,5 @@ void TimeSlider::TimecodeDisplayChanged()
{
UpdateLabel(Value());
}
OLIVE_NAMESPACE_EXIT
app/widget/slider/timeslider.h
+24
View File
@@ -1,9 +1,31 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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 3 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, see <http://www.gnu.org/licenses/>.
***/
#ifndef TIMESLIDER_H
#define TIMESLIDER_H
#include "common/rational.h"
#include "integerslider.h"
OLIVE_NAMESPACE_ENTER
class TimeSlider : public IntegerSlider
{
Q_OBJECT
@@ -25,4 +47,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMESLIDER_H

Some files were not shown because too many files have changed in this diff Show More