X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_neophyte%2Fneophyte.C;h=987c761e474d2a723f65d193dd636c112515ae88;hp=de9d59c0f59fd91c9d95b5b5febd056a47dc66e7;hb=b41dd1dd566139b56bafbe84e95be600b2f5ddfc;hpb=c857b2fb7965d27d86d5785fb9f1b8957a871a1a

diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
index de9d59c0..987c761e 100644
--- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
+++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
@@ -94,6 +94,7 @@ NEOPHYTETHEME::~NEOPHYTETHEME()
 	delete keyframe_data;
 	delete maskkeyframe_data;
 	delete modekeyframe_data;
+	delete hardedge_data;
 	delete pankeyframe_data;
 	delete projectorkeyframe_data;
 }
@@ -357,9 +358,15 @@ void NEOPHYTETHEME::initialize()
         new_button(
 		"reset.png",
                 "reset_up.png",
-                "reset_dn.png",
                 "reset_hi.png",
+                "reset_dn.png",
                 "reset_button");
+	new_button(
+		"unclear.png",
+		"unclear_up.png",
+		"unclear_hi.png",
+		"unclear_dn.png",
+		"unclear_button");
 	resources->cancel_images = new_button(
 		"cancel.png",
 		"filebox_bigbutton_up.png",
@@ -372,28 +379,92 @@ void NEOPHYTETHEME::initialize()
 		"new_bigbutton_hi.png",
 		"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");
+
 	// Clock - is not used (AFAIK). See also clock color.
 	// 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");
@@ -649,6 +720,7 @@ void NEOPHYTETHEME::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
 	/* The red position indicator is currently only 5 px high.
@@ -1015,6 +1087,10 @@ void NEOPHYTETHEME::initialize()
 			   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,
@@ -1077,6 +1153,16 @@ void NEOPHYTETHEME::initialize()
 			   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();
 }
 
@@ -1185,6 +1271,7 @@ void NEOPHYTETHEME::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"));
 }
@@ -1249,7 +1336,7 @@ void NEOPHYTETHEME::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);