X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fplugins%2Ftheme_cakewalk%2Fcakewalk.C;h=a3e8fde3317661ca3f4da95f56a8a092effa408a;hb=8e69e9e7ab87fd5c273ce30a05c9973e786467d9;hp=ac1f5159d61ce0ef1c006b94a8a7547bd04b6c52;hpb=853b81c6d430bd41037984ecc95fd304fd98964e;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
index ac1f5159..a3e8fde3 100644
--- a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
+++ b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
@@ -65,6 +65,7 @@ CAKEWALKTHEME::~CAKEWALKTHEME()
  delete keyframe_data;
  delete maskkeyframe_data;
  delete modekeyframe_data;
+ delete hardedge_data;
  delete pankeyframe_data;
  delete projectorkeyframe_data;
 }
@@ -266,12 +267,11 @@ void CAKEWALKTHEME::initialize()
   "new_bigbutton_hi.png",
   "new_bigbutton_dn.png",
   "new_ok_images");
-        new_button(
-  "reset.png",
-                "reset_up.png",
-                "reset_dn.png",
-                "reset_hi.png",
-                "reset_button");
+ new_button( "reset.png",
+  "reset_up.png",
+  "reset_hi.png",
+  "reset_dn.png",
+  "reset_button");
  resources->cancel_images = new_button(
   "cancel.png",
   "filebox_bigbutton_up.png",
@@ -284,6 +284,84 @@ void CAKEWALKTHEME::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");
+
  resources->bar_data = new_image("bar", "bar.png");
  resources->check = new_image("check", "check.png");
  resources->min_menu_w = 96;
@@ -514,6 +592,7 @@ void CAKEWALKTHEME::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");
  new_image("vbuttons_left", "vbuttons_left.png");
  new_image("vbuttons_right", "vbuttons_right.png");
  new_image("vclock", "vclock.png");
@@ -915,6 +994,15 @@ void CAKEWALKTHEME::initialize()
       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();
 }
 void CAKEWALKTHEME::get_vwindow_sizes(VWindowGUI *gui)
@@ -997,6 +1085,7 @@ void CAKEWALKTHEME::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"));
 }