X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_cakewalk%2Fcakewalk.C;h=ed6294ff8f417ddfbf7dad853ff33bff2213fcdf;hb=6d8835a537ca709e122226506548de0d4942aa32;hp=919a0516f20025e973f531dc019e08f7b5c794e6;hpb=fb661e853152fd63537629a20f493a4cdcd4f019;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 919a0516..ed6294ff 100644
--- a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
+++ b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
@@ -269,8 +269,8 @@ void CAKEWALKTHEME::initialize()
   "new_ok_images");
  new_button( "reset.png",
   "reset_up.png",
-  "reset_dn.png",
   "reset_hi.png",
+  "reset_dn.png",
   "reset_button");
  resources->cancel_images = new_button(
   "cancel.png",
@@ -314,6 +314,54 @@ void CAKEWALKTHEME::initialize()
   "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;
@@ -888,6 +936,10 @@ void CAKEWALKTHEME::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,
@@ -946,14 +998,14 @@ void CAKEWALKTHEME::initialize()
       editpanel_up, editpanel_hi, editpanel_checked,
       editpanel_dn, editpanel_checkedhi,
       "tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
-  "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ 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_yup.png", "mask_scale_yuphi.png",
-  "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ 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_xyup.png", "mask_scale_xyuphi.png",
-  "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ 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();
 }
@@ -1062,7 +1114,7 @@ void CAKEWALKTHEME::draw_mwindow_bg(MWindowGUI *gui)
  gui->draw_vframe(get_image("panel_divider"),
       x - toggle_margin / 2 - pdw / 2 + 2,
       mbuttons_y - 1);
- x += 2 * get_image("autokeyframe")->get_w() + toggle_margin;
+ x += 3 * get_image("autokeyframe")->get_w() + toggle_margin;
  gui->draw_vframe(get_image("panel_divider"),
       x - toggle_margin / 2 - pdw / 2 + 2,
       mbuttons_y - 1);