X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blue_dot%2Fbluedottheme.C;h=6203e863de9d3e5a8959b41e8f42b26de25d331c;hp=def4e98855d098bb8b6a6018c23bff9478cd6588;hb=0fd1b583cf9d14672c35f7369ba88388413be4f7;hpb=0c4a2483761f458447fc3fa451bf1271caa75df5 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C index def4e988..6203e863 100644 --- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C +++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C @@ -204,13 +204,28 @@ void BlueDotTheme::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_nested"); + "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"); //There are differences here, but we won't change until the end. //Specific to BD @@ -424,6 +439,11 @@ void BlueDotTheme::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_image_set(4, "listbox_button_up.png", "listbox_button_hi.png", @@ -568,6 +588,7 @@ void BlueDotTheme::initialize() //Here an improvement may be needed new_image_set("zoombar_menu", 3, "generic_up.png", "generic_hi.png", "generic_dn.png"); new_image_set("zoombar_tumbler", 4, "tumble_up.png", "tumble_hi.png", "tumble_bottom.png", "tumble_top.png"); + new_image_set("auto_range", 4, "autorange_up.png", "autorange_hi.png", "autorange_bottom.png", "autorange_top.png"); //Graphic Copied from default. Improve!! new_image_set("mode_popup", 3, "generic_up.png", "generic_hi.png", "generic_dn.png"); @@ -677,6 +698,14 @@ void BlueDotTheme::initialize() "drawpatch_dn.png", "drawpatch_checkedhi.png"); + 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, @@ -844,10 +873,28 @@ void BlueDotTheme::initialize() splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn, "slicebutton"); new_button("toclip.png", editpanel_up, editpanel_hi, editpanel_dn, "toclip"); 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"); new_button("undo.png", editpanel_up, editpanel_hi, editpanel_dn, "undo"); new_button("wrench.png", "editpanelW_up.png", "editpanelW_hi.png", "editpanelW_dn.png", "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])); + //Make transparent borders #define TRANSPORT_LEFT_IMAGES "transport_left_up.png", "transport_left_hi.png", "transport_left_dn.png" #define TRANSPORT_CENTER_IMAGES "transport_center_up.png", "transport_center_hi.png", "transport_center_dn.png" @@ -919,6 +966,9 @@ void BlueDotTheme::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"); //Is that necessary?? VFrame *cpanel_up = new_image("editpanel_up.png"); @@ -938,23 +988,12 @@ void BlueDotTheme::initialize() new_toggle("titlesafe.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "titlesafe"); new_toggle("toolwindow.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "tool"); - -// Maybe we can live without the commented part -// MIHA: Commented out in favor of default version M4>> -// new_toggle("camera.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi,"camera"); -// new_toggle("crop.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi,"crop"); -// new_toggle("eyedrop.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi,"eyedrop"); -// new_toggle("magnify.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi,"magnify"); -// new_toggle("mask.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi,"mask"); -// new_toggle("projector.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi,"projector"); -// new_toggle("protect.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi,"protect"); -// new_toggle("titlesafe.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi,"titlesafe"); -// new_toggle("toolwindow.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi,"tool"); -// MIHA: Commented out in favor of default version M4<< - // toggle for tangent mode (compositor/tool window) new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", 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", @@ -980,7 +1019,7 @@ void BlueDotTheme::initialize() resources->medium_font = cstrdup(string); channel_position_color = MEYELLOW; - resources->meter_title_w = xS(25); + resources->meter_title_w = xS(28); // (asset) edit info text color edit_font_color = BLACK;