X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_cakewalk%2Fcakewalk.C;h=9a42c48e6221db729f577d1be3babb9872bfcb94;hb=0fd1b583cf9d14672c35f7369ba88388413be4f7;hp=7145dd5c0a203b3ab848fede999b2d7e3ea29a71;hpb=0c4a2483761f458447fc3fa451bf1271caa75df5;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 7145dd5c..9a42c48e 100644 --- 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", @@ -571,6 +591,11 @@ void CAKEWALKTHEME::initialize() "zoomtumble_hi.png", "zoomtumble_bottom.png", "zoomtumble_top.png"); +new_image_set("auto_range", 4, + "autorange_up.png", + "autorange_hi.png", + "autorange_bottom.png", + "autorange_top.png"); new_image_set("mode_popup", 3, "mode_up.png", "mode_hi.png", "mode_dn.png"); new_image("mode_add", "mode_add.png"); @@ -654,6 +679,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", @@ -870,6 +903,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"); @@ -879,6 +915,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"); @@ -965,6 +1023,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"); @@ -1008,6 +1078,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"); @@ -1021,7 +1103,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 +1139,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 +