X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blond_cv%2Fblondcvtheme.C;h=0321c395134a6ba3ff3b2db74e4b3a5a209d0551;hp=38276f904264fa0aaa8ecca00d9a0abc6372e160;hb=HEAD;hpb=1529091cdf16df199a901aabe6e8fa1813a933af

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
index 38276f90..72286527 100644
--- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -120,7 +121,7 @@ void BlondCVTheme::initialize()
 		"tumble_hi.png",
 		"tumble_botdn.png",
 		"tumble_topdn.png");
-	resources->tumblepatch_data = new_image_set(4,
+	new_image_set("tumblepatch_data", 4,
 		"tumblepatch_up.png",
 		"tumblepatch_hi.png",
 		"tumblepatch_bottom.png",
@@ -594,6 +595,7 @@ void BlondCVTheme::initialize()
 
 	new_image_set("zoombar_menu", 3, "generic_up.png", "generic_hi.png", "generic_dn.png");
 	new_image_set("zoombar_tumbler", 4, "tumble_up.png", "tumble_hi.png", "tumble_bottom.png", "tumble_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, "generic_up.png", "generic_hi.png", "generic_dn.png");
 	new_image("mode_add", "mode_add.png");
@@ -854,11 +856,29 @@ void BlondCVTheme::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");
 	//wrench_data = new_button("wrench.png", editpanel_up, editpanel_hi, editpanel_dn);
 
+	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]));
+
 // CWindow icons
 	new_image("cwindow_inactive", "cwindow_inactive.png");
 	new_image("cwindow_active", "cwindow_active.png");
@@ -915,6 +935,9 @@ void BlondCVTheme::initialize()
 	//show_meters = new_toggle("show_meters.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi);
 	//titlesafe_data = new_toggle("titlesafe.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi);
 	//tool_data = new_toggle("toolwindow.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi);
+	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");
 	new_toggle("eyedrop.png",
 		editpanel_up,
 		editpanel_hi,
@@ -971,6 +994,9 @@ void BlondCVTheme::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",