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

code cleanups and fixed gif export #360

Browse Source
This commit is contained in:
itsmattkc
2019-01-30 21:36:07 +11:00
parent 6f3a826da7
commit c19a2dad7d
8 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/effectcontrols.cpp
+20 -17
View File
@@ -279,11 +279,11 @@ void EffectControls::setup_ui() {
hlayout->setSpacing(0);
hlayout->setMargin(0);
QSplitter* splitter = new QSplitter(contents);
QSplitter* splitter = new QSplitter();
splitter->setOrientation(Qt::Horizontal);
splitter->setChildrenCollapsible(false);
scrollArea = new QScrollArea(splitter);
scrollArea = new QScrollArea();
scrollArea->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding);
scrollArea->setFrameShape(QFrame::NoFrame);
scrollArea->setFrameShadow(QFrame::Plain);
@@ -291,13 +291,13 @@ void EffectControls::setup_ui() {
scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
scrollArea->setWidgetResizable(true);
QWidget* scrollAreaWidgetContents = new QWidget(scrollArea);
QWidget* scrollAreaWidgetContents = new QWidget();
QHBoxLayout* scrollAreaLayout = new QHBoxLayout(scrollAreaWidgetContents);
scrollAreaLayout->setSpacing(0);
scrollAreaLayout->setMargin(0);
effects_area = new EffectsArea(scrollAreaWidgetContents);
effects_area = new EffectsArea();
effects_area->setContextMenuPolicy(Qt::CustomContextMenu);
connect(effects_area, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(effects_area_context_menu()));
@@ -305,12 +305,12 @@ void EffectControls::setup_ui() {
effects_area_layout->setSpacing(0);
effects_area_layout->setMargin(0);
vcontainer = new QWidget(effects_area);
QVBoxLayout* vcontainerLayout = new QVBoxLayout();
vcontainer = new QWidget();
QVBoxLayout* vcontainerLayout = new QVBoxLayout(vcontainer);
vcontainerLayout->setSpacing(0);
vcontainerLayout->setMargin(0);
QWidget* veHeader = new QWidget(vcontainer);
QWidget* veHeader = new QWidget();
veHeader->setObjectName(QStringLiteral("veHeader"));
veHeader->setStyleSheet(QLatin1String("#veHeader { background: rgba(0, 0, 0, 0.25); }"));
@@ -353,11 +353,11 @@ void EffectControls::setup_ui() {
effects_area_layout->addWidget(vcontainer);
acontainer = new QWidget(effects_area);
acontainer = new QWidget();
QVBoxLayout* acontainerLayout = new QVBoxLayout(acontainer);
acontainerLayout->setSpacing(0);
acontainerLayout->setMargin(0);
QWidget* aeHeader = new QWidget(acontainer);
QWidget* aeHeader = new QWidget();
aeHeader->setObjectName(QStringLiteral("aeHeader"));
aeHeader->setStyleSheet(QLatin1String("#aeHeader { background: rgba(0, 0, 0, 0.25); }"));
@@ -389,7 +389,7 @@ void EffectControls::setup_ui() {
acontainerLayout->addWidget(aeHeader);
audio_effect_area = new QWidget(acontainer);
audio_effect_area = new QWidget();
QVBoxLayout* aeAreaLayout = new QVBoxLayout(audio_effect_area);
aeAreaLayout->setSpacing(0);
aeAreaLayout->setMargin(0);
@@ -398,7 +398,7 @@ void EffectControls::setup_ui() {
effects_area_layout->addWidget(acontainer);
lblMultipleClipsSelected = new QLabel(effects_area);
lblMultipleClipsSelected = new QLabel();
lblMultipleClipsSelected->setAlignment(Qt::AlignCenter);
lblMultipleClipsSelected->setText(tr("(Multiple clips selected)"));
effects_area_layout->addWidget(lblMultipleClipsSelected);
@@ -409,30 +409,33 @@ void EffectControls::setup_ui() {
scrollArea->setWidget(scrollAreaWidgetContents);
splitter->addWidget(scrollArea);
QWidget* keyframeArea = new QWidget(splitter);
QWidget* keyframeArea = new QWidget();
QSizePolicy keyframe_sp;
keyframe_sp.setHorizontalPolicy(QSizePolicy::Minimum);
keyframe_sp.setVerticalPolicy(QSizePolicy::Preferred);
keyframe_sp.setHorizontalStretch(1);
keyframeArea->setSizePolicy(keyframe_sp);
QVBoxLayout* keyframeAreaLayout = new QVBoxLayout(keyframeArea);
keyframeAreaLayout->setSpacing(0);
keyframeAreaLayout->setMargin(0);
headers = new TimelineHeader(keyframeArea);
headers = new TimelineHeader();
keyframeAreaLayout->addWidget(headers);
QWidget* keyframeCenterWidget = new QWidget(keyframeArea);
QWidget* keyframeCenterWidget = new QWidget();
QHBoxLayout* keyframeCenterLayout = new QHBoxLayout(keyframeCenterWidget);
keyframeCenterLayout->setSpacing(0);
keyframeCenterLayout->setMargin(0);
keyframeView = new KeyframeView(keyframeCenterWidget);
keyframeView = new KeyframeView();
keyframeCenterLayout->addWidget(keyframeView);
verticalScrollBar = new QScrollBar(keyframeCenterWidget);
verticalScrollBar = new QScrollBar();
verticalScrollBar->setOrientation(Qt::Vertical);
keyframeCenterLayout->addWidget(verticalScrollBar);
@@ -440,7 +443,7 @@ void EffectControls::setup_ui() {
keyframeAreaLayout->addWidget(keyframeCenterWidget);
horizontalScrollBar = new ResizableScrollBar(keyframeArea);
horizontalScrollBar = new ResizableScrollBar();
horizontalScrollBar->setOrientation(Qt::Horizontal);
keyframeAreaLayout->addWidget(horizontalScrollBar);