X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fplugins%2Ftheme_bright%2Fbrighttheme.C;h=ffb70f3291654a39248b661c6aea259652830fb4;hb=6d8835a537ca709e122226506548de0d4942aa32;hp=4a2735ef236cf07f296375dffaa51c42a74c289c;hpb=4742c7a3793e92da3e3e46a32e1a4aa4d4c6b366;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C index 4a2735ef..ffb70f32 100644 --- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C +++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C @@ -95,6 +95,7 @@ BrightTheme::~BrightTheme() delete keyframe_data; delete maskkeyframe_data; delete modekeyframe_data; + delete hardedge_data; delete pankeyframe_data; delete projectorkeyframe_data; } @@ -300,27 +301,90 @@ void BrightTheme::initialize() "bigbutton_dn.png", "new_cancel_images"); + new_button("mask_pnt_linear.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pnt_linear_images"); + new_button("mask_crv_linear.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_crv_linear_images"); + new_button("mask_all_linear.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_all_linear_images"); + + new_button("mask_pnt_smooth.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pnt_smooth_images"); + new_button("mask_crv_smooth.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_crv_smooth_images"); + new_button("mask_all_smooth.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_all_smooth_images"); + + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); + "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png", + "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png", + "d.png", "e.png", "f.png", "space.png", "dash.png"); resources->bar_data = new_image("bar", "bar.png"); @@ -518,6 +582,7 @@ void BrightTheme::initialize() new_image("cbuttons_left", "cbuttons_left.png"); new_image("cbuttons_right", "cbuttons_right.png"); new_image("cmeter_bg", "cmeter_bg.png"); + new_image("cwindow_focus", "cwindow_focus.png"); // VWindow new_image("vbuttons_left", "vbuttons_left.png"); @@ -811,6 +876,7 @@ void BrightTheme::initialize() new_toggle("arrow.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "arrow"); new_toggle("autokeyframe.png", transport_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "autokeyframe"); + new_toggle("spankeyframe.png", transport_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "spankeyframe"); new_toggle("ibeam.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "ibeam"); new_toggle("show_meters.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "meters"); new_toggle("blank30x30.png", @@ -843,6 +909,15 @@ void BrightTheme::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", + "mask_scale_x"); + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", + "mask_scale_y"); + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", + "mask_scale_xy"); flush_images(); @@ -882,6 +957,7 @@ void BrightTheme::build_overlays() camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png")); maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png")); modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png")); + hardedge_data = new VFramePng(get_image_data("hardedge.png")); pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png")); projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png")); } @@ -950,7 +1026,10 @@ void BrightTheme::draw_mwindow_bg(MWindowGUI *gui) mbuttons_y - 1); gui->draw_vframe(get_image("panel_divider"), - mbuttons_x + 320, + mbuttons_x + 294, + mbuttons_y - 1); + gui->draw_vframe(get_image("panel_divider"), + mbuttons_x + 396, mbuttons_y - 1); // Clock