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=9052377883e942a611315b959ba6d30805500150;hp=e5d1dd3d2907c6d4dd716e130f6b10bef3bcb89c;hb=HEAD;hpb=1529091cdf16df199a901aabe6e8fa1813a933af

diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
index e5d1dd3d..1922f850 100644
--- a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
+++ b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
@@ -445,7 +445,7 @@ void HULKTHEME::initialize()
 		"tumble_hi.png",
 		"tumble_bottom.png",
 		"tumble_top.png");
-	resources->tumblepatch_data = new_image_set(4,
+	new_image_set("tumblepatch_data", 4,
 		"tumblepatch_up.png",
 		"tumblepatch_hi.png",
 		"tumblepatch_bottom.png",
@@ -575,6 +575,7 @@ void HULKTHEME::initialize()
 
 	new_image_set("zoombar_menu", 3, "zoompopup_up.png", "zoompopup_hi.png", "zoompopup_dn.png");
 	new_image_set("zoombar_tumbler", 4, "zoomtumble_up.png", "zoomtumble_hi.png", "zoomtumble_bottom.png", "zoomtumble_top.png");
+	new_image_set("auto_range", 4, "autorange_up.png", "autorange_hi.png", "autorange_bottom.png", "autorange_top.png");
 
 	new_image_set("mode_popup", 3, "mode_up.png", "mode_hi.png", "mode_dn.png");
 	new_image("mode_add", "mode_add.png");
@@ -658,6 +659,14 @@ void HULKTHEME::initialize()
 		"patch_checkedhi.png",
 		"drawpatch_data");
 
+	new_toggle("masterpatch.png",
+		"patch_up.png",
+		"patch_hi.png",
+		"patch_checked.png",
+		"patch_dn.png",
+		"patch_checkedhi.png",
+		"masterpatch_data");
+
 
 	new_image_set("mutepatch_data",
 		5,
@@ -830,10 +839,27 @@ void HULKTHEME::initialize()
 	splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn, "slicebutton");
 	new_button("toclip.png", editpanel_up, editpanel_hi, editpanel_dn, "toclip");
 	new_button("goto.png", editpanel_up, editpanel_hi, editpanel_dn, "goto");
+	new_button("clapper.png", editpanel_up, editpanel_hi, editpanel_dn, "clapperbutton");
 	new_button("top_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "top_justify");
 	new_button("undo.png", editpanel_up, editpanel_hi, editpanel_dn, "undo");
 	new_button("wrench.png", editpanel_up, editpanel_hi, editpanel_dn, "wrench");
 
+	VFrame **edge_on  = new_toggle("edge_on.png",
+		editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "edge_on");
+	VFrame **edge_off = new_toggle("edge_off.png",
+		editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "edge_off");
+	new_image_set_images("bump_edge", 5,
+		new VFrame(*edge_off[0]), new VFrame(*edge_off[1]),
+		new VFrame(*edge_on[0]),  new VFrame(*edge_off[3]),
+		new VFrame(*edge_on[4]));
+	VFrame **span_on  = new_toggle("span_on.png",
+		editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "span_on");
+	VFrame **span_off = new_toggle("span_off.png",
+		editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "span_off");
+	new_image_set_images("bump_span", 5,
+		 new VFrame(*span_off[0]),  new VFrame(*span_off[1]),
+		 new VFrame(*span_on[0]), new VFrame(*span_off[3]),
+		 new VFrame(*span_on[4]));
 
 	VFrame *transport_up = new_image("transportup.png");
 	VFrame *transport_hi = new_image("transporthi.png");
@@ -895,6 +921,9 @@ void HULKTHEME::initialize()
 		   new_image("locklabels_dn.png"), // can't have seperate down for each!!??
 		   new_image("locklabels_unlockedhi.png"),
 		   "locklabels");
+	new_toggle("gang0.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "gang0");
+	new_toggle("gang1.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "gang1");
+	new_toggle("gang2.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "gang2");
 
 	VFrame *cpanel_up = new_image("cpanel_up.png");
 	VFrame *cpanel_hi = new_image("cpanel_hi.png");
@@ -917,6 +946,9 @@ void HULKTHEME::initialize()
 	// toggle for tangent mode (compositor/tool window)
 	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("tan_tangent.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_tangent");
+	new_toggle("tan_free.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_free");
+	new_toggle("tan_bump.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_bump");
 
 	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",