X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_bright%2Fbrighttheme.C;h=c953613f4f7decb1b498f0931f82f8b334aab16d;hp=3c7f56d333268608fb772bcc9442c6789b523b0b;hb=b41dd1dd566139b56bafbe84e95be600b2f5ddfc;hpb=da1e39d85e138b0d552e932d875c05e8dc743244

diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C
index 3c7f56d3..c953613f 100644
--- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C
+++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C
@@ -289,6 +289,12 @@ void BrightTheme::initialize()
 		"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",
 		"bigbutton_up.png",
 		"bigbutton_hi.png",
@@ -301,27 +307,90 @@ void BrightTheme::initialize()
 		"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");
 
@@ -813,6 +882,7 @@ void BrightTheme::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",
@@ -845,6 +915,15 @@ void BrightTheme::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();
 
@@ -953,7 +1032,10 @@ void BrightTheme::draw_mwindow_bg(MWindowGUI *gui)
 		mbuttons_y - 1);
 
 	gui->draw_vframe(get_image("panel_divider"),
-		mbuttons_x + 320,
+		mbuttons_x + 294,
+		mbuttons_y - 1);
+	gui->draw_vframe(get_image("panel_divider"),
+		mbuttons_x + 396,
 		mbuttons_y - 1);
 
 // Clock