X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_unflat%2Funflattheme.C;h=4c0742320572530d128dfc595245069bcf2a3840;hp=be1da538803ca6ab84520cf7feff653d7e6eba36;hb=fb661e853152fd63537629a20f493a4cdcd4f019;hpb=c857b2fb7965d27d86d5785fb9f1b8957a871a1a;ds=sidebyside

diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
index be1da538..4c074232 100644
--- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
+++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
@@ -92,6 +92,7 @@ UNFLATTHEME::~UNFLATTHEME()
 	delete keyframe_data;
 	delete maskkeyframe_data;
 	delete modekeyframe_data;
+	delete hardedge_data;
 	delete pankeyframe_data;
 	delete projectorkeyframe_data;
 }
@@ -270,11 +271,11 @@ void UNFLATTHEME::initialize()
 		"new_bigbutton_dn.png",
 		"new_ok_images");
 
-        new_button("reset.png",
-                "reset_up.png",
-                "reset_dn.png",
-                "reset_hi.png",
-                "reset_button");
+	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",
@@ -288,6 +289,38 @@ void UNFLATTHEME::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",
@@ -507,6 +540,7 @@ void UNFLATTHEME::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");
@@ -832,6 +866,15 @@ void UNFLATTHEME::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();
 
@@ -872,6 +915,7 @@ void UNFLATTHEME::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"));
 }