X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_cakewalk%2Fcakewalk.C;h=b6194ec22f24c6264f6e5d46c3ce36257f7221e5;hp=f3c1cde75f118c5d9b1005ffc001c26e938688c8;hb=84ac8a2bb3357c04a3f67cf763b0f61ddbbd021d;hpb=caf23b6b8e0024c33390ddaa165e11956e66f1c2

diff --git a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
index f3c1cde7..b6194ec2 100644
--- a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
+++ b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
@@ -439,6 +439,11 @@ void CAKEWALKTHEME::initialize()
   "tumble_hi.png",
   "tumble_bottom.png",
   "tumble_top.png");
+ new_image_set("tumblepatch_data", 4,
+  "tumblepatch_up.png",
+  "tumblepatch_hi.png",
+  "tumblepatch_bottom.png",
+  "tumblepatch_top.png");
  resources->listbox_button = new_button4(
   "listbox_button.png",
   "editpanel_up.png",
@@ -669,6 +674,14 @@ void CAKEWALKTHEME::initialize()
       "patch_dn.png",
       "patch_checkedhi.png",
       "drawpatch_data");
+ new_toggle("masterpatch.png",
+      "patch_up.png",
+      "patch_hi.png",
+      "patch_checked.png",
+      "patch_dn.png",
+      "patch_checkedhi.png",
+      "masterpatch_data");
+
  new_image_set("mutepatch_data",
       5,
       "mutepatch_up.png",
@@ -885,6 +898,9 @@ void CAKEWALKTHEME::initialize()
  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");
@@ -894,6 +910,28 @@ void CAKEWALKTHEME::initialize()
  new_button("wrench.png",
       editpanel_up, editpanel_hi, editpanel_dn,
       "wrench");
+
+ 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]));
+
  VFrame *transport_up = new_image("transportup.png");
  VFrame *transport_hi = new_image("transporthi.png");
  VFrame *transport_dn = new_image("transportdn.png");
@@ -980,6 +1018,18 @@ void CAKEWALKTHEME::initialize()
       new_image("locklabels_dn.png"),
       new_image("locklabels_unlockedhi.png"),
       "locklabels");
+ 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");
  VFrame *cpanel_up = new_image("cpanel_up.png");
  VFrame *cpanel_hi = new_image("cpanel_hi.png");
  VFrame *cpanel_dn = new_image("cpanel_dn.png");
@@ -1023,6 +1073,18 @@ void CAKEWALKTHEME::initialize()
       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",
       "mask_scale_x");
@@ -1036,7 +1098,7 @@ void CAKEWALKTHEME::initialize()
 }
 void CAKEWALKTHEME::get_vwindow_sizes(VWindowGUI *gui)
 {
- int edit_w = EditPanel::calculate_w(mwindow, 0, xS(10));
+ int edit_w = EditPanel::calculate_w(mwindow, 0, 12);
  int transport_w = PlayTransport::get_transport_width(mwindow) + toggle_margin;
  vtimebar_h = yS(16);
  int division_w = xS(30);
@@ -1072,7 +1134,7 @@ void CAKEWALKTHEME::get_vwindow_sizes(VWindowGUI *gui)
    get_image_set("autokeyframe")[0]->get_h() -
    widget_border;
   vdivision_x = xS(280);
-  vtime_x = vedit_x + xS(65);
+  vtime_x = vedit_x + xS(85);
   vtime_y = vedit_y + yS(28);
  } else {
   buttons_h = vtimebar_h +