pluginclient cr=apply in option value textbox, add loop_mode for vwdw

[goodguy/cinelerra.git] / cinelerra-5.1 / plugins / theme_cakewalk / cakewalk.C

diff --git a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
index 7145dd5c0a203b3ab848fede999b2d7e3ea29a71..22d2d554cb76893cbb7187c3755ad958588d735c 100644 (file)
--- a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
+++ b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
@@ -132,7 +132,7 @@ void CAKEWALKTHEME::initialize()
  recordgui_fixed_color = MeterGreen;
  recordgui_variable_color = MeterYellow;
  channel_position_color = MeterYellow;
- resources->meter_title_w = xS(25);
+ resources->meter_title_w = xS(28);
  edit_font_color = ComicYellow;
  assetedit_color = TextFgBright;
  timebar_cursor_color = WHITE;
@@ -199,14 +199,29 @@ void CAKEWALKTHEME::initialize()
   "loadmode_dn.png",
   "loadmode_checkedhi.png",
   "loadmode_resource");
- new_toggle(
-  "loadmode_nested.png",
+
+ new_toggle("loadmode_edl_clip.png",
+  "loadmode_up.png",
+  "loadmode_hi.png",
+  "loadmode_checked.png",
+  "loadmode_dn.png",
+  "loadmode_checkedhi.png",
+  "loadmode_edl_clip");
+ new_toggle("loadmode_edl_nested.png",
+  "loadmode_up.png",
+  "loadmode_hi.png",
+  "loadmode_checked.png",
+  "loadmode_dn.png",
+  "loadmode_checkedhi.png",
+  "loadmode_edl_nested");
+ new_toggle("loadmode_edl_fileref.png",
   "loadmode_up.png",
   "loadmode_hi.png",
   "loadmode_checked.png",
   "loadmode_dn.png",
   "loadmode_checkedhi.png",
-  "loadmode_nested");
+  "loadmode_edl_fileref");
+
  resources->filebox_icons_images = new_button(
   "icons.png",
   "fileboxbutton_up.png",
@@ -424,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",
@@ -654,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",
@@ -965,6 +993,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");
@@ -1021,7 +1061,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);
@@ -1057,7 +1097,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 +