X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fappearanceprefs.C;h=cb0279af049029c02861cfc183700e85052175e0;hp=e27ebd02354ce14628dc61b41046819bcfbaf9fa;hb=9b18af02dc4ccbf052ef9d70180a3d16c0f9848b;hpb=6226b2633b6460755969cb624550854669b1c79f diff --git a/cinelerra-5.1/cinelerra/appearanceprefs.C b/cinelerra-5.1/cinelerra/appearanceprefs.C index e27ebd02..cb0279af 100644 --- a/cinelerra-5.1/cinelerra/appearanceprefs.C +++ b/cinelerra-5.1/cinelerra/appearanceprefs.C @@ -42,8 +42,10 @@ AppearancePrefs::AppearancePrefs(MWindow *mwindow, PreferencesWindow *pwindow) frames = 0; hex = 0; feet = 0; + layout_scale = 0; thumbnails = 0; thumbnail_size = 0; + vicon_size = 0; } AppearancePrefs::~AppearancePrefs() @@ -54,166 +56,209 @@ AppearancePrefs::~AppearancePrefs() delete frames; delete hex; delete feet; + delete layout_scale; delete thumbnails; delete thumbnail_size; + delete vicon_size; } void AppearancePrefs::create_objects() { + int xs5 = xS(5), xs10 = xS(10), xs30 = xS(30); + int ys5 = yS(5), ys10 = yS(10), ys15 = yS(15); + int ys20 = yS(20), ys35 = yS(35); BC_Resources *resources = BC_WindowBase::get_resources(); int margin = mwindow->theme->widget_border; char string[BCTEXTLEN]; int x0 = mwindow->theme->preferencesoptions_x; int y0 = mwindow->theme->preferencesoptions_y; - int x = x0, y = y0, x1 = x + 100; + int x = x0, y = y0, x1 = x + xS(100); - add_subwindow(new BC_Title(x, y, _("Layout:"), LARGEFONT, + BC_Title *title; + add_subwindow(title = new BC_Title(x, y, _("Layout:"), LARGEFONT, resources->text_default)); - y += 35; + y += title->get_h() + ys10; int y1 = y; ViewTheme *theme; add_subwindow(new BC_Title(x, y, _("Theme:"))); add_subwindow(theme = new ViewTheme(x1, y, pwindow)); theme->create_objects(); - y += theme->get_h() + 5; + y += theme->get_h() + ys5; x = x0; ViewPluginIcons *plugin_icons; add_subwindow(new BC_Title(x, y, _("Plugin Icons:"))); add_subwindow(plugin_icons = new ViewPluginIcons(x1, y, pwindow)); plugin_icons->create_objects(); - y += plugin_icons->get_h() + 15; + y += plugin_icons->get_h() + ys15; x1 = get_w()/2; - int x2 = x1 + 160, y2 = y; + int x2 = x1 + xS(160), y2 = y; y = y1; + + add_subwindow(new BC_Title(x1, y, _("Layout Scale:"))); + layout_scale = new ViewLayoutScale(pwindow, this, x2, y); + layout_scale->create_objects(); + y += layout_scale->get_h() + ys5; add_subwindow(new BC_Title(x1, y, _("View thumbnail size:"))); thumbnail_size = new ViewThumbnailSize(pwindow, this, x2, y); thumbnail_size->create_objects(); - y += thumbnail_size->get_h() + 5; - add_subwindow(new BC_Title(x1, y, _("Vicon memory size:"))); + y += thumbnail_size->get_h() + ys5; + add_subwindow(new BC_Title(x1, y, _("Vicon quality:"))); vicon_size = new ViewViconSize(pwindow, this, x2, y); vicon_size->create_objects(); - y += vicon_size->get_h() + 5; + y += vicon_size->get_h() + ys5; add_subwindow(new BC_Title(x1, y, _("Vicon color mode:"))); add_subwindow(vicon_color_mode = new ViewViconColorMode(pwindow, x2, y)); vicon_color_mode->create_objects(); - y += vicon_color_mode->get_h() + 5; + y += vicon_color_mode->get_h() + ys5; y = bmax(y, y2); + y += ys10; + add_subwindow(new BC_Bar(xs5, y, get_w() - xs10)); + y += ys15; - y += 10; - add_subwindow(new BC_Bar(5, y, get_w() - 10)); - y += 15; - - add_subwindow(new BC_Title(x, y, _("Time Format:"), LARGEFONT, - resources->text_default)); - - add_subwindow(new BC_Title(x1, y, _("Flags:"), LARGEFONT, - resources->text_default)); - - y += get_text_height(LARGEFONT) + 5; - y += 10; y1 = y; - + add_subwindow(title = new BC_Title(x, y, _("Time Format:"), LARGEFONT, + resources->text_default)); + y += title->get_h() + ys10; add_subwindow(hms = new TimeFormatHMS(pwindow, this, pwindow->thread->edl->session->time_format == TIME_HMS, x, y)); - y += 20; + y += ys20; add_subwindow(hmsf = new TimeFormatHMSF(pwindow, this, pwindow->thread->edl->session->time_format == TIME_HMSF, x, y)); - y += 20; + y += ys20; add_subwindow(samples = new TimeFormatSamples(pwindow, this, pwindow->thread->edl->session->time_format == TIME_SAMPLES, x, y)); - y += 20; + y += ys20; add_subwindow(hex = new TimeFormatHex(pwindow, this, pwindow->thread->edl->session->time_format == TIME_SAMPLES_HEX, x, y)); - y += 20; + y += ys20; add_subwindow(frames = new TimeFormatFrames(pwindow, this, pwindow->thread->edl->session->time_format == TIME_FRAMES, x, y)); - y += 20; + y += ys20; add_subwindow(feet = new TimeFormatFeet(pwindow, this, pwindow->thread->edl->session->time_format == TIME_FEET_FRAMES, x, y)); - x += feet->get_w() + 15; - BC_Title *title; + x += feet->get_w() + xS(15); add_subwindow(title = new BC_Title(x, y, _("Frames per foot:"))); x += title->get_w() + margin; sprintf(string, "%0.2f", pwindow->thread->edl->session->frames_per_foot); add_subwindow(new TimeFormatFeetSetting(pwindow, - x, y - 5, string)); + x, y - ys5, string)); x = x0; - y += 20; + y += ys20; add_subwindow(seconds = new TimeFormatSeconds(pwindow, this, pwindow->thread->edl->session->time_format == TIME_SECONDS, x, y)); - x = x0; - y += 35; - add_subwindow(new BC_Bar(5, y, get_w()/2 - 30)); - y += 15; - + y += ys35; + y2 = y; + + x = x1; y = y1; add_subwindow(new BC_Title(x, y, _("Color:"), LARGEFONT, resources->text_default)); - y += 35; + y += ys35; add_subwindow(title = new BC_Title(x, y, _("Highlighting Inversion color:"))); x += title->get_w() + margin; char hex_color[BCSTRLEN]; sprintf(hex_color, "%06x", preferences->highlight_inverse); add_subwindow(new HighlightInverseColor(pwindow, x, y, hex_color)); - y += 35; - - x = x0; + x2 = x; x = x1; + y += ys35; + add_subwindow(title = new BC_Title(x, y, _("Composer BG Color:"))); + int clr_color = pwindow->thread->edl->session->cwindow_clear_color; + int clr_alpha = pwindow->thread->edl->session->cwindow_clear_alpha; + add_subwindow(cwdw_bg_color = new Composer_BG_Color(pwindow, + 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(); + y += ys35; + + x = x1; add_subwindow(title = new BC_Title(x, y, _("YUV color space:"))); x += title->get_w() + margin; add_subwindow(yuv_color_space = new YuvColorSpace(x, y, pwindow)); yuv_color_space->create_objects(); - y += yuv_color_space->get_h() + 5; + y += yuv_color_space->get_h() + ys5; - x = x0; + x = x1; add_subwindow(title = new BC_Title(x, y, _("YUV color range:"))); x += title->get_w() + margin; add_subwindow(yuv_color_range = new YuvColorRange(x, y, pwindow)); yuv_color_range->create_objects(); - y += yuv_color_range->get_h() + 5; + y += yuv_color_range->get_h() + ys35; + if( y2 < y ) y2 = y; - UseTipWindow *tip_win = new UseTipWindow(pwindow, x1, y1); + add_subwindow(new BC_Bar(x0, y2, get_w()-x0 - xs30)); + y += ys15; + + x = x0; y1 = y; + add_subwindow(title = new BC_Title(x, y, _("Warnings:"), LARGEFONT, + resources->text_default)); + y += title->get_h() + ys10; + UseWarnIndecies *idx_warn = new UseWarnIndecies(pwindow, x, y); + add_subwindow(idx_warn); + y += idx_warn->get_h() + ys5; + UseWarnVersion *ver_warn = new UseWarnVersion(pwindow, x, y); + add_subwindow(ver_warn); + y += ver_warn->get_h() + ys5; + UseWarnStack *stack_warn = new UseWarnStack(pwindow, x, y); + add_subwindow(stack_warn); + y += stack_warn->get_h() + ys5; + 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(x, y, _("Flags:"), LARGEFONT, + resources->text_default)); + y += title->get_h() + ys10; + y1 = y; + AutocolorAssets *autocolor_assets = new AutocolorAssets(pwindow, x, y); + add_subwindow(autocolor_assets); + y += autocolor_assets->get_h() + ys5; + PerpetualSession *perpetual = new PerpetualSession(x, y, pwindow); + add_subwindow(perpetual); + y += perpetual->get_h() + ys5; + RectifyAudioToggle *rect_toggle = new RectifyAudioToggle(x, y, pwindow); + add_subwindow(rect_toggle); + y += rect_toggle->get_h() + ys5; + CtrlToggle *ctrl_toggle = new CtrlToggle(x, y, pwindow); + add_subwindow(ctrl_toggle); + y += ctrl_toggle->get_h() + ys5; + ForwardRenderDisplacement *displacement = new ForwardRenderDisplacement(pwindow, x, y); + add_subwindow(displacement); + y += displacement->get_h() + ys5; + UseTipWindow *tip_win = new UseTipWindow(pwindow, x, y); add_subwindow(tip_win); - y1 += tip_win->get_h() + 5; - UseWarnIndecies *idx_win = new UseWarnIndecies(pwindow, x1, y1); - add_subwindow(idx_win); - y1 += idx_win->get_h() + 5; - UseWarnVersion *ver_win = new UseWarnVersion(pwindow, x1, y1); - add_subwindow(ver_win); - y1 += ver_win->get_h() + 5; - BD_WarnRoot *bdwr_win = new BD_WarnRoot(pwindow, x1, y1); - add_subwindow(bdwr_win); - y1 += bdwr_win->get_h() + 5; - PopupMenuBtnup *pop_win = new PopupMenuBtnup(pwindow, x1, y1); + y += tip_win->get_h() + ys5; + + x = 2*get_w() / 3 - xs30; + y = y1; + add_subwindow(thumbnails = new ViewThumbnails(x, y, pwindow)); + y += thumbnails->get_h() + ys5; + PopupMenuBtnup *pop_win = new PopupMenuBtnup(pwindow, x, y); add_subwindow(pop_win); - y1 += pop_win->get_h() + 5; - GrabFocusPolicy *grab_input_focus = new GrabFocusPolicy(pwindow, x1, y1); + y += pop_win->get_h() + ys5; + GrabFocusPolicy *grab_input_focus = new GrabFocusPolicy(pwindow, x, y); add_subwindow(grab_input_focus); - y1 += grab_input_focus->get_h() + 5; - ActivateFocusPolicy *focus_activate = new ActivateFocusPolicy(pwindow, x1, y1); + y += grab_input_focus->get_h() + ys5; + ActivateFocusPolicy *focus_activate = new ActivateFocusPolicy(pwindow, x, y); add_subwindow(focus_activate); - y1 += focus_activate->get_h() + 5; - DeactivateFocusPolicy *focus_deactivate = new DeactivateFocusPolicy(pwindow, x1, y1); + y += focus_activate->get_h() + ys5; + DeactivateFocusPolicy *focus_deactivate = new DeactivateFocusPolicy(pwindow, x, y); add_subwindow(focus_deactivate); - y1 += focus_deactivate->get_h() + 5; - ForwardRenderDisplacement *displacement = new ForwardRenderDisplacement(pwindow, x1, y1); - add_subwindow(displacement); - y1 += displacement->get_h() + 5; - add_subwindow(thumbnails = new ViewThumbnails(x1, y1, pwindow)); - y1 += thumbnails->get_h() + 5; - PerpetualSession *perpetual = new PerpetualSession(x1, y1, pwindow); - add_subwindow(perpetual); - y1 += perpetual->get_h() + 5; - if( y < y1 ) y = y1; + y += focus_deactivate->get_h() + ys5; } int AppearancePrefs::update(int new_value) @@ -305,7 +350,7 @@ int TimeFormatFeet::handle_event() } TimeFormatFeetSetting::TimeFormatFeetSetting(PreferencesWindow *pwindow, int x, int y, char *string) - : BC_TextBox(x, y, 90, 1, string) + : BC_TextBox(x, y, xS(90), 1, string) { this->pwindow = pwindow; } int TimeFormatFeetSetting::handle_event() @@ -317,7 +362,7 @@ int TimeFormatFeetSetting::handle_event() ViewTheme::ViewTheme(int x, int y, PreferencesWindow *pwindow) - : BC_PopupMenu(x, y, 200, pwindow->thread->preferences->theme, 1) + : BC_PopupMenu(x, y, xS(200), pwindow->thread->preferences->theme, 1) { this->pwindow = pwindow; } @@ -356,7 +401,7 @@ int ViewThemeItem::handle_event() ViewPluginIcons::ViewPluginIcons(int x, int y, PreferencesWindow *pwindow) - : BC_PopupMenu(x, y, 200, pwindow->thread->preferences->plugin_icons, 1) + : BC_PopupMenu(x, y, xS(200), pwindow->thread->preferences->plugin_icons, 1) { this->pwindow = pwindow; } @@ -401,6 +446,24 @@ int ViewPluginIconItem::handle_event() return 1; } +ViewLayoutScale::ViewLayoutScale(PreferencesWindow *pwindow, + AppearancePrefs *aprefs, int x, int y) + : BC_TumbleTextBox(aprefs, + pwindow->thread->preferences->layout_scale, + 0.f, 10.f, x, y, xS(80), 2) +{ + this->pwindow = pwindow; + this->aprefs = aprefs; + set_increment(0.1); +} + +int ViewLayoutScale::handle_event() +{ + float v = atof(get_text()); + pwindow->thread->preferences->layout_scale = v; + return 1; +} + ViewThumbnails::ViewThumbnails(int x, int y, @@ -423,7 +486,7 @@ ViewThumbnailSize::ViewThumbnailSize(PreferencesWindow *pwindow, AppearancePrefs *aprefs, int x, int y) : BC_TumbleTextBox(aprefs, pwindow->thread->preferences->awindow_picon_h, - 16, 512, x, y, 80) + 16, 512, x, y, xS(80)) { this->pwindow = pwindow; @@ -442,7 +505,7 @@ ViewViconSize::ViewViconSize(PreferencesWindow *pwindow, AppearancePrefs *aprefs, int x, int y) : BC_TumbleTextBox(aprefs, pwindow->thread->preferences->vicon_size, - 16, 512, x, y, 80) + 16, 512, x, y, xS(80)) { this->pwindow = pwindow; @@ -458,7 +521,7 @@ int ViewViconSize::handle_event() } ViewViconColorMode::ViewViconColorMode(PreferencesWindow *pwindow, int x, int y) - : BC_PopupMenu(x, y, 100, + : BC_PopupMenu(x, y, xS(100), _(vicon_color_modes[pwindow->thread->preferences->vicon_color_mode]), 1) { this->pwindow = pwindow; @@ -542,6 +605,19 @@ int UseWarnVersion::handle_event() return 1; } +UseWarnStack::UseWarnStack(PreferencesWindow *pwindow, int x, int y) + : BC_CheckBox(x, y, pwindow->thread->preferences->warn_stack, + _("Stack warns if reference not modified")) +{ + this->pwindow = pwindow; +} + +int UseWarnStack::handle_event() +{ + pwindow->thread->preferences->warn_stack = get_value(); + return 1; +} + BD_WarnRoot::BD_WarnRoot(PreferencesWindow *pwindow, int x, int y) : BC_CheckBox(x, y, pwindow->thread->preferences->bd_warn_root, _("Create Bluray warns if not root")) @@ -555,6 +631,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")) @@ -626,8 +716,21 @@ int ForwardRenderDisplacement::handle_event() return 1; } +AutocolorAssets::AutocolorAssets(PreferencesWindow *pwindow, int x, int y) + : BC_CheckBox(x, y, pwindow->thread->preferences->autocolor_assets, + _("Autocolor assets")) +{ + this->pwindow = pwindow; +} + +int AutocolorAssets::handle_event() +{ + pwindow->thread->preferences->autocolor_assets = get_value(); + return 1; +} + HighlightInverseColor::HighlightInverseColor(PreferencesWindow *pwindow, int x, int y, const char *hex) - : BC_TextBox(x, y, 80, 1, hex) + : BC_TextBox(x, y, xS(80), 1, hex) { this->pwindow = pwindow; } @@ -647,13 +750,13 @@ 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) - : BC_PopupMenu(x, y, 100, + : BC_PopupMenu(x, y, xS(120), _(color_space[pwindow->thread->preferences->yuv_color_space]), 1) { this->pwindow = pwindow; @@ -691,12 +794,12 @@ 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) - : BC_PopupMenu(x, y, 100, + : BC_PopupMenu(x, y, xS(100), _(color_range[pwindow->thread->preferences->yuv_color_range]), 1) { this->pwindow = pwindow; @@ -745,3 +848,57 @@ int PerpetualSession::handle_event() return 1; } +CtrlToggle::CtrlToggle(int x, int y, PreferencesWindow *pwindow) + : BC_CheckBox(x, y, + pwindow->thread->preferences->ctrl_toggle, _("Clears before toggle")) +{ + this->pwindow = pwindow; +} + +int CtrlToggle::handle_event() +{ + pwindow->thread->preferences->ctrl_toggle = get_value(); + return 1; +} + +RectifyAudioToggle::RectifyAudioToggle(int x, int y, PreferencesWindow *pwindow) + : BC_CheckBox(x, y, + pwindow->thread->preferences->rectify_audio, _("Timeline Rectify Audio")) +{ + this->pwindow = pwindow; +} + +int RectifyAudioToggle::handle_event() +{ + pwindow->thread->preferences->rectify_audio = get_value(); + return 1; +} + +Composer_BG_Color::Composer_BG_Color(PreferencesWindow *pwindow, + int x, int y, int w, int h, int color, int alpha) + : ColorBoxButton(_("Composer BG color"), x, y, w, h, color, alpha, 1) +{ + this->pwindow = pwindow; +} + +Composer_BG_Color::~Composer_BG_Color() +{ +} + +void Composer_BG_Color::handle_done_event(int result) +{ + if( result ) { + pwindow->lock_window("Composer_BG_Color::handle_done_event"); + update_gui(orig_color, orig_alpha); + pwindow->unlock_window(); + handle_new_color(orig_color, orig_alpha); + } +} + +int Composer_BG_Color::handle_new_color(int color, int alpha) +{ + pwindow->thread->edl->session->cwindow_clear_color = color; + pwindow->thread->edl->session->cwindow_clear_alpha = alpha; + return 1; +} +