From 8f1ab2ea2c0123413e7c923e2c01bc6dccd0e4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Wed, 18 Sep 2024 21:39:49 -0300 Subject: [PATCH] Fixed Preferences->Video Levels. --- src/docs/HISTORY.md | 2 + src/lib/mrvWidgets/mrvPreferencesUI.fl | 53 +++++++++++++------------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/docs/HISTORY.md b/src/docs/HISTORY.md index 68d892306..1653749ce 100644 --- a/src/docs/HISTORY.md +++ b/src/docs/HISTORY.md @@ -40,6 +40,8 @@ v1.2.8 - Made "Advanced Settings" in Save Movie options store its settings. - Made tlRender FFmpeg's write always print out the color space, color TRC and color primaries used when saving. +- Preferences->Render->Video Levels had Full Range and Legal Range reverse. + Fixed. v1.2.7 diff --git a/src/lib/mrvWidgets/mrvPreferencesUI.fl b/src/lib/mrvWidgets/mrvPreferencesUI.fl index 66ab05b44..ef553c0b3 100644 --- a/src/lib/mrvWidgets/mrvPreferencesUI.fl +++ b/src/lib/mrvWidgets/mrvPreferencesUI.fl @@ -34,52 +34,53 @@ decl {\#include "mrvCore/mrvFonts.h"} {public global decl {\#include "mrvCore/mrvI8N.h"} {public global } -decl {\#include "mrViewer.h"} {selected public global +decl {\#include "mrViewer.h"} {public global } -decl {\#include "make_ocio_chooser.h"} {selected public global +decl {\#include "make_ocio_chooser.h"} {public global } -decl {\#include "mrvWidgets/mrvPopupMenu.h"} {selected public global +decl {\#include "mrvWidgets/mrvPopupMenu.h"} {public global } -decl {\#include "mrvWidgets/mrvPreferencesTree.h"} {selected public global +decl {\#include "mrvWidgets/mrvPreferencesTree.h"} {public global } -decl {\#include "mrvFl/mrvOCIO.h"} {selected private global +decl {\#include "mrvFl/mrvOCIO.h"} {private global } -decl {\#include "mrvFl/mrvFileRequester.h"} {selected public global +decl {\#include "mrvFl/mrvFileRequester.h"} {public global } -decl {\#include "mrvWidgets/mrvOCIOBrowser.h"} {selected public global +decl {\#include "mrvWidgets/mrvOCIOBrowser.h"} {public global } -decl {\#include "mrvWidgets/mrvChoice.h"} {selected public global +decl {\#include "mrvWidgets/mrvChoice.h"} {public global } -decl {\#include "mrvWidgets/mrvButton.h"} {selected public global +decl {\#include "mrvWidgets/mrvButton.h"} {public global } -decl {\#include "mrvWidgets/mrvPathMappingBrowser.h"} {selected public global +decl {\#include "mrvWidgets/mrvPathMappingBrowser.h"} {public global } -decl {\#include "mrvWidgets/mrvBrowser.h"} {selected public global +decl {\#include "mrvWidgets/mrvBrowser.h"} {public global } -decl {\#include "mrvFl/mrvPathMapping.h"} {selected public global +decl {\#include "mrvFl/mrvPathMapping.h"} {public global } -decl {\#include "mrvFl/mrvPreferences.h"} {selected public global +decl {\#include "mrvFl/mrvPreferences.h"} {public global } -decl {\#include "mrvCore/mrvPathMapping.h"} {selected public global +decl {\#include "mrvCore/mrvPathMapping.h"} {public global } -decl {\#include "mrvCore/mrvMedia.h"} {selected public global +decl {\#include "mrvCore/mrvMedia.h"} {public global } -class PreferencesUI {} { +class PreferencesUI {open +} { decl {ViewerUI* main;} {private local } Function {make_window(ViewerUI* m)} {open private @@ -88,8 +89,8 @@ class PreferencesUI {} { label Preferences user_data this user_data_type {PreferencesUI*} callback {o->hide();} open - xywh {0 0 853 467} type Double resizable - code0 {main = m;} visible + xywh {106 119 853 467} type Double hide resizable + code0 {main = m;} } { Fl_Group {} {open xywh {0 0 853 466} box FLAT_BOX @@ -704,15 +705,15 @@ v->uiWindowYSize->value( v->main->uiMain->h() );} } } Fl_Group {} { - label Render - xywh {288 37 555 360} box EMBOSSED_BOX align 5 hide + label Render open + xywh {288 37 555 360} box EMBOSSED_BOX align 5 } { Fl_Group {} { label Render open xywh {301 132 531 170} box ROUNDED_BOX } { Fl_Choice uiPrefsVideoLevels { - label {Video Levels} + label {Video Levels} open xywh {513 146 135 25} down_box BORDER_BOX } { MenuItem {} { @@ -720,12 +721,12 @@ v->uiWindowYSize->value( v->main->uiMain->h() );} xywh {20 20 100 20} } MenuItem {} { - label {Legal Range} - xywh {30 30 100 20} + label {Full Range} selected + xywh {40 40 100 20} } MenuItem {} { - label {Full Range} - xywh {40 40 100 20} + label {Legal Range} + xywh {30 30 100 20} } } Fl_Choice uiPrefsAlphaBlend { @@ -1022,7 +1023,7 @@ v->uiPrefsFPS->value( g );} } Fl_Group {} { label OCIO - xywh {288 37 555 360} box EMBOSSED_BOX align 5 + xywh {288 37 555 360} box EMBOSSED_BOX align 5 hide } { Fl_Group {} { label OCIO open