upgrades to scopewindow, add blurbox, bd.sh sed tab test, tweak clk2play over window...

[goodguy/cinelerra.git] / cinelerra-5.1 / plugins / theme_neophyte / neophyte.C

diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
index b6ca90fe8bafd179d7f2295b61377f725c728987..3a02a47edf38630046168297bfdd19312f648d12 100644 (file)
--- 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_edl_clip.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_edl_clip");
        new_toggle(
-               "loadmode_nested.png",
+               "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");
+
        resources->filebox_icons_images = new_button(
                "icons.png",
                "fileboxbutton_up.png",
@@ -1175,7 +1193,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 +1260,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;