X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_cakewalk%2Fcakewalk.C;h=22d2d554cb76893cbb7187c3755ad958588d735c;hb=48a6854a1ca58aa291ffc6fe3a48807492dfbef7;hp=f3c1cde75f118c5d9b1005ffc001c26e938688c8;hpb=caf23b6b8e0024c33390ddaa165e11956e66f1c2;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 f3c1cde7..22d2d554 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", @@ -980,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"); @@ -1036,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); @@ -1072,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 +