Skip to content

Commit

Permalink
Fixed Preferences->Video Levels.
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Sep 19, 2024
1 parent 17414ac commit 8f1ab2e
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 26 deletions.
2 changes: 2 additions & 0 deletions src/docs/HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
53 changes: 27 additions & 26 deletions src/lib/mrvWidgets/mrvPreferencesUI.fl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -704,28 +705,28 @@ 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 {} {
label {From File}
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 {
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 8f1ab2e

Please sign in to comment.