X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fplugins%2Ftheme_hulk%2Fhulktheme.C;h=1fc23d87959c4aea10fd8b2def9a4a6fc03d0503;hb=620f70a943c1f47880ec68a908aa03bf463e741f;hp=082b9654acf1237e48450caaa84bf4e2660ed2e9;hpb=4742c7a3793e92da3e3e46a32e1a4aa4d4c6b366;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
index 082b9654..1fc23d87 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;
 }
@@ -294,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");
@@ -513,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");
@@ -806,6 +871,7 @@ void HULKTHEME::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",
@@ -838,6 +904,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();
 
@@ -881,6 +956,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"));
 }
@@ -950,7 +1026,7 @@ void HULKTHEME::draw_mwindow_bg(MWindowGUI *gui)
 		x - toggle_margin / 2 - pdw / 2 + 2,
 		mbuttons_y - 1);
 
-	x += 2 * get_image("autokeyframe")->get_w() + toggle_margin;    // the state toggle buttons
+	x += 3 * get_image("autokeyframe")->get_w() + toggle_margin;    // the state toggle buttons
 	gui->draw_vframe(get_image("panel_divider"),
 		x - toggle_margin / 2 - pdw / 2 + 2,
 		mbuttons_y - 1);