X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_hulk%2Fhulktheme.C;h=19abed45ffbfad6f91553c7d6c19002109491fce;hp=cd479fcf13458e435922c1f2ca2a9abe8f298a0f;hb=8cad02a7b02e4a8543bc5514892b51aed877a193;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
index cd479fcf..19abed45 100644
--- a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
+++ b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
@@ -98,6 +98,7 @@ HULKTHEME::~HULKTHEME()
 	delete keyframe_data;
 	delete maskkeyframe_data;
 	delete modekeyframe_data;
+	delete hardedge_data;
 	delete pankeyframe_data;
 	delete projectorkeyframe_data;
 }
@@ -276,6 +277,12 @@ void HULKTHEME::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",
@@ -288,27 +295,90 @@ void HULKTHEME::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");
+
+	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");
 	resources->check = new_image("check", "check.png");
@@ -507,6 +577,7 @@ void HULKTHEME::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");
@@ -637,6 +708,13 @@ void HULKTHEME::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",
@@ -825,6 +903,15 @@ void HULKTHEME::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();
 
@@ -868,6 +955,7 @@ void HULKTHEME::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"));
 }