X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fappearanceprefs.C;h=1c6be93189ed3c0467c92317da382b2d08c5e1fc;hb=fa27f905f12b15ae84eb1b3ffcd12e09d6d02660;hp=b3718b755876affa5e6f5ff72dbc5a43ec8c2690;hpb=4c207ab325a8e8e6b79a9a18d4647273b5f59f93;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/appearanceprefs.C b/cinelerra-5.1/cinelerra/appearanceprefs.C index b3718b75..1c6be931 100644 --- a/cinelerra-5.1/cinelerra/appearanceprefs.C +++ b/cinelerra-5.1/cinelerra/appearanceprefs.C @@ -178,18 +178,17 @@ void AppearancePrefs::create_objects() x2, y, xS(80), yS(24), clr_color, clr_alpha)); draw_3d_border(x2-2,y-2, xS(80)+4,xS(24)+4, 1); cwdw_bg_color->create_objects(); + x2 += cwdw_bg_color->get_w(); y += ys35; - x = x1; - add_subwindow(title = new BC_Title(x, y, _("YUV color space:"))); - x += title->get_w() + margin; + add_subwindow(title = new BC_Title(x1, y, _("YUV color space:"))); + x = x2 - xS(120); add_subwindow(yuv_color_space = new YuvColorSpace(x, y, pwindow)); yuv_color_space->create_objects(); y += yuv_color_space->get_h() + ys5; - x = x1; - add_subwindow(title = new BC_Title(x, y, _("YUV color range:"))); - x += title->get_w() + margin; + add_subwindow(title = new BC_Title(x1, y, _("YUV color range:"))); + x = x2 - xS(100); add_subwindow(yuv_color_range = new YuvColorRange(x, y, pwindow)); yuv_color_range->create_objects(); y += yuv_color_range->get_h() + ys35; @@ -214,10 +213,13 @@ void AppearancePrefs::create_objects() BD_WarnRoot *bdwr_warn = new BD_WarnRoot(pwindow, x, y); add_subwindow(bdwr_warn); y += bdwr_warn->get_h() + ys5; + UseWarnFileRef *warn_ref = new UseWarnFileRef(pwindow, x, y); + add_subwindow(warn_ref); + y += warn_ref->get_h() + ys5; x = get_w() / 3 + xs30; y = y1; - add_subwindow(title = new BC_Title(x1, y, _("Flags:"), LARGEFONT, + add_subwindow(title = new BC_Title(x, y, _("Flags:"), LARGEFONT, resources->text_default)); y += title->get_h() + ys10; y1 = y; @@ -628,6 +630,20 @@ int BD_WarnRoot::handle_event() return 1; } +UseWarnFileRef::UseWarnFileRef(PreferencesWindow *pwindow, int x, int y) + : BC_CheckBox(x, y, pwindow->thread->preferences->warn_fileref, + _("Warn on creating file references")) +{ + this->pwindow = pwindow; +} + +int UseWarnFileRef::handle_event() +{ + pwindow->thread->preferences->warn_fileref = get_value(); + return 1; +} + + PopupMenuBtnup::PopupMenuBtnup(PreferencesWindow *pwindow, int x, int y) : BC_CheckBox(x, y, pwindow->thread->preferences->popupmenu_btnup, _("Popups activate on button up")) @@ -733,9 +749,9 @@ int HighlightInverseColor::handle_event() const char *YuvColorSpace::color_space[] = { - N_("BT601"), - N_("BT709"), - N_("BT2020"), + N_("BT601"), // COLOR_SPACE_BT601 + N_("BT709"), // COLOR_SPACE_BT709 + N_("BT2020"), // COLOR_SPACE_BT2020 }; YuvColorSpace::YuvColorSpace(int x, int y, PreferencesWindow *pwindow) @@ -777,8 +793,8 @@ int YuvColorSpaceItem::handle_event() const char *YuvColorRange::color_range[] = { - N_("JPEG"), - N_("MPEG"), + N_("JPEG"), // COLOR_RANGE_JPEG + N_("MPEG"), // COLOR_RANGE_MPEG }; YuvColorRange::YuvColorRange(int x, int y, PreferencesWindow *pwindow)