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

merged some export improvements from another branch

Browse Source
This commit is contained in:
itsmattkc
2020-04-23 01:31:50 +10:00
parent 2b1363d434 1c3c8cd9b2
commit 5c736114d0
20 changed files with 695 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dialog/export/exportvideotab.cpp
+4 -3
View File
@@ -26,6 +26,7 @@
#include <QLabel>
#include "core.h"
#include "render/backend/exportparams.h"
#include "render/colormanager.h"
OLIVE_NAMESPACE_ENTER
@@ -140,9 +141,9 @@ QWidget* ExportVideoTab::SetupResolutionSection()
scaling_method_combobox_ = new QComboBox();
scaling_method_combobox_->setEnabled(false);
scaling_method_combobox_->addItem(tr("Fit"), kFit);
scaling_method_combobox_->addItem(tr("Stretch"), kStretch);
scaling_method_combobox_->addItem(tr("Crop"), kCrop);
scaling_method_combobox_->addItem(tr("Fit"), ExportParams::kFit);
scaling_method_combobox_->addItem(tr("Stretch"), ExportParams::kStretch);
scaling_method_combobox_->addItem(tr("Crop"), ExportParams::kCrop);
layout->addWidget(scaling_method_combobox_, row, 1);
// Automatically enable/disable the scaling method depending on maintain aspect ratio