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

preferences: removed integer quality modes

Browse Source
This commit is contained in:
itsmattkc
2020-05-02 15:36:35 +10:00
parent 6a50c0a66d
commit 4f23db02db
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dialog/preferences/tabs/preferencesqualitytab.cpp
+14 -4
View File
@@ -26,7 +26,6 @@
#include "audio/sampleformat.h" #include "audio/sampleformat.h"
#include "render/colormanager.h" #include "render/colormanager.h"
#include "render/pixelformat.h"
OLIVE_NAMESPACE_ENTER OLIVE_NAMESPACE_ENTER
@@ -49,12 +48,12 @@ PreferencesQualityTab::PreferencesQualityTab()
quality_stack_ = new QStackedWidget(); quality_stack_ = new QStackedWidget();
offline_group_ = new PreferencesQualityGroup(tr("Offline Quality")); offline_group_ = new PreferencesQualityGroup(tr("Offline Quality"));
offline_group_->bit_depth_combobox()->setCurrentIndex(PixelFormat::instance()->GetConfiguredFormatForMode(RenderMode::kOffline)); offline_group_->SetBitDepth(PixelFormat::instance()->GetConfiguredFormatForMode(RenderMode::kOffline));
offline_group_->ocio_method()->setCurrentIndex(ColorManager::GetOCIOMethodForMode(RenderMode::kOffline)); offline_group_->ocio_method()->setCurrentIndex(ColorManager::GetOCIOMethodForMode(RenderMode::kOffline));
quality_stack_->addWidget(offline_group_); quality_stack_->addWidget(offline_group_);
online_group_ = new PreferencesQualityGroup(tr("Online Quality")); online_group_ = new PreferencesQualityGroup(tr("Online Quality"));
online_group_->bit_depth_combobox()->setCurrentIndex(PixelFormat::instance()->GetConfiguredFormatForMode(RenderMode::kOnline)); online_group_->SetBitDepth(PixelFormat::instance()->GetConfiguredFormatForMode(RenderMode::kOnline));
online_group_->ocio_method()->setCurrentIndex(ColorManager::GetOCIOMethodForMode(RenderMode::kOnline)); online_group_->ocio_method()->setCurrentIndex(ColorManager::GetOCIOMethodForMode(RenderMode::kOnline));
quality_stack_->addWidget(online_group_); quality_stack_->addWidget(online_group_);
@@ -92,7 +91,8 @@ PreferencesQualityGroup::PreferencesQualityGroup(const QString &title, QWidget *
PixelFormat::Format pix_fmt = static_cast<PixelFormat::Format>(i); PixelFormat::Format pix_fmt = static_cast<PixelFormat::Format>(i);
// We always render with an alpha channel internally // We always render with an alpha channel internally
if (PixelFormat::FormatHasAlphaChannel(pix_fmt)) { if (PixelFormat::FormatHasAlphaChannel(pix_fmt)
&& PixelFormat::FormatIsFloat(pix_fmt)) {
bit_depth_combobox_->addItem(PixelFormat::GetName(pix_fmt), bit_depth_combobox_->addItem(PixelFormat::GetName(pix_fmt),
i); i);
} }
@@ -112,6 +112,16 @@ PreferencesQualityGroup::PreferencesQualityGroup(const QString &title, QWidget *
quality_outer_layout->addStretch(); quality_outer_layout->addStretch();
} }
void PreferencesQualityGroup::SetBitDepth(PixelFormat::Format f)
{
for (int i=0;i<bit_depth_combobox_->count();i++) {
if (bit_depth_combobox_->itemData(i) == f) {
bit_depth_combobox_->setCurrentIndex(i);
break;
}
}
}
QComboBox *PreferencesQualityGroup::bit_depth_combobox() QComboBox *PreferencesQualityGroup::bit_depth_combobox()
{ {
return bit_depth_combobox_; return bit_depth_combobox_;
app/dialog/preferences/tabs/preferencesqualitytab.h
+3
View File
@@ -26,6 +26,7 @@
#include <QGroupBox> #include <QGroupBox>
#include <QStackedWidget> #include <QStackedWidget>
#include "render/pixelformat.h"
#include "preferencestab.h" #include "preferencestab.h"
OLIVE_NAMESPACE_ENTER OLIVE_NAMESPACE_ENTER
@@ -36,6 +37,8 @@ class PreferencesQualityGroup : public QGroupBox
public: public:
PreferencesQualityGroup(const QString& title, QWidget* parent = nullptr); PreferencesQualityGroup(const QString& title, QWidget* parent = nullptr);
void SetBitDepth(PixelFormat::Format f);
QComboBox* bit_depth_combobox(); QComboBox* bit_depth_combobox();
QComboBox* ocio_method(); QComboBox* ocio_method();