X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blond%2Fblondtheme.C;h=1c36dbd504b35f8f4e3aab712e57b4aae983f7b0;hb=fb661e853152fd63537629a20f493a4cdcd4f019;hp=ce13c51f6fc76a83ca9f1165b4322243f5e9d609;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
index ce13c51f..1c36dbd5 100644
--- a/cinelerra-5.1/plugins/theme_blond/blondtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
@@ -97,6 +97,7 @@ BlondTheme::~BlondTheme()
 	delete keyframe_data;
 	delete maskkeyframe_data;
 	delete modekeyframe_data;
+	delete hardedge_data;
 	delete pankeyframe_data;
 	delete projectorkeyframe_data;
 }
@@ -275,6 +276,12 @@ void BlondTheme::initialize()
 		"new_bigbutton_dn.png",
 		"new_ok_images");
 
+	new_button("reset.png",
+		"reset_up.png",
+		"reset_hi.png",
+		"reset_dn.png",
+		"reset_button");
+
 	resources->cancel_images = new_button("cancel.png",
 		"filebox_bigbutton_up.png",
 		"filebox_bigbutton_hi.png",
@@ -287,6 +294,38 @@ void BlondTheme::initialize()
 		"new_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");
+
 	resources->medium_7segment = new_image_set(TOTAL_7SEGMENT,
 		"0.png",
 		"1.png",
@@ -506,6 +545,7 @@ void BlondTheme::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");
@@ -636,6 +676,13 @@ void BlondTheme::initialize()
 		"proxy_s_down.png",
 		"proxy_s_chkdhi.png");
 
+	mask_mode_toggle = new_image_set(5,
+		"mask_mode_up.png",
+		"mask_mode_hi.png",
+		"mask_mode_chkd.png",
+		"mask_mode_down.png",
+		"mask_mode_chkdhi.png");
+
 	shbtn_data = new_image_set(3,
 		"shbtn_up.png",
 		"shbtn_hi.png",
@@ -824,6 +871,15 @@ void BlondTheme::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_xup.png",    "mask_scale_xuphi.png",
+		"mask_scale_xchkd.png",  "mask_scale_xdown.png",  "mask_scale_xchkdhi.png",
+		"mask_scale_x");
+	new_toggle("mask_scale_y.png",   "mask_scale_yup.png",    "mask_scale_yuphi.png",
+		"mask_scale_ychkd.png",  "mask_scale_ydown.png",  "mask_scale_ychkdhi.png",
+		"mask_scale_y");
+	new_toggle("mask_scale_xy.png",  "mask_scale_xyup.png",   "mask_scale_xyuphi.png",
+		"mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+		"mask_scale_xy");
 
 	flush_images();
 
@@ -866,6 +922,7 @@ void BlondTheme::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"));
 }