X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_cakewalk%2Fcakewalk.C;h=28f68fc50b4351cef2e97858bc7ddf9ec0f56084;hb=2fba7eab40198b35d9edb20c16bcc1b8c262f7a2;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..28f68fc5 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", @@ -1021,7 +1036,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 +1072,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 +