X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_neophyte%2Fneophyte.C;h=0ec9ad120dad9da814dbd1ed291954bf3bdd248f;hp=019db9de0898510c3b912935074309f6a600f4bc;hb=2ff681c423ff0f83efbaed49aa37195a3b37f6db;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33 diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C index 019db9de..0ec9ad12 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C +++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C @@ -196,7 +196,7 @@ void NEOPHYTETHEME::initialize() recordgui_variable_color = RED; channel_position_color = ComicYellow; // Set Format, speaker numbers - resources->meter_title_w = xS(25); + resources->meter_title_w = xS(28); // (asset) edit info text color edit_font_color = ComicYellow; // ? ../../cinelerra/theme.h:282 @@ -287,14 +287,32 @@ void NEOPHYTETHEME::initialize() "loadmode_dn.png", "loadmode_checkedhi.png", "loadmode_resource"); + new_toggle( - "loadmode_nested.png", + "loadmode_edl_clip.png", "loadmode_up.png", "loadmode_hi.png", "loadmode_checked.png", "loadmode_dn.png", "loadmode_checkedhi.png", - "loadmode_nested"); + "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_edl_fileref"); + resources->filebox_icons_images = new_button( "icons.png", "fileboxbutton_up.png", @@ -531,6 +549,11 @@ void NEOPHYTETHEME::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", @@ -689,6 +712,11 @@ void NEOPHYTETHEME::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"); @@ -790,6 +818,14 @@ void NEOPHYTETHEME::initialize() "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", @@ -1011,6 +1047,9 @@ void NEOPHYTETHEME::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"); @@ -1021,6 +1060,23 @@ void NEOPHYTETHEME::initialize() 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"); @@ -1112,6 +1168,18 @@ void NEOPHYTETHEME::initialize() new_image("locklabels_dn.png"), // can't have seperate down for each!!?? 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"); @@ -1158,6 +1226,18 @@ void NEOPHYTETHEME::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", @@ -1175,7 +1255,7 @@ void NEOPHYTETHEME::initialize() // Re-align the Clock. theme.c:931 void NEOPHYTETHEME::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); // The height of the position indicator int division_w = xS(30); @@ -1242,7 +1322,8 @@ void NEOPHYTETHEME::get_vwindow_sizes(VWindowGUI *gui) vdivision_x = vedit_x + edit_w + division_w; vtime_x = vdivision_x + vtime_border; - vtime_y = vedit_y + widget_border - 7; // vertical height concentric at button height + // vertical height concentric at button height + vtime_y = vedit_y + widget_border - yS(7); } // vtimebar_x = vcanvas_x; @@ -1260,12 +1341,12 @@ void NEOPHYTETHEME::build_bg_data() // Audio settings channel_position_data = new VFramePng(get_image_data("channel_position.png")); // Track bitmaps - new_image("resource1024", "resource1024.png"); - new_image("resource512", "resource512.png"); - new_image("resource256", "resource256.png"); - new_image("resource128", "resource128.png"); - new_image("resource64", "resource64.png"); - new_image("resource32", "resource32.png"); + new_image1("resource1024", "resource1024.png"); + new_image1("resource512", "resource512.png"); + new_image1("resource256", "resource256.png"); + new_image1("resource128", "resource128.png"); + new_image1("resource64", "resource64.png"); + new_image1("resource32", "resource32.png"); new_image("plugin_bg_data", "plugin_bg.png"); new_image("title_bg_data", "title_bg.png"); new_image("vtimebar_bg_data", "vwindow_timebar.png");