fix awdw solo vicon crash, fix nested clip for binfolders, open edit edl

[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 d30150e083efd9c8e86c9bf3dc892981b1ebd6d8..2a0d2f03ef09b4c5cd242a6e21c7ffd88075abc0 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 
        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
 
        // (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");
                "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(
        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_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",
        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");
                "tumble_hi.png",
                "tumble_bottom.png",
                "tumble_top.png");

+       resources->tumblepatch_data = new_image_set(4,
+               "tumblepatch_up.png",
+               "tumblepatch_hi.png",
+               "tumblepatch_bottom.png",
+               "tumblepatch_top.png");

        resources->listbox_button = new_button4(
                "listbox_button.png",
                "editpanel_up.png",
        resources->listbox_button = new_button4(
                "listbox_button.png",
                "editpanel_up.png",


@@ -1175,7 +1198,7 @@ void NEOPHYTETHEME::initialize()
 // Re-align the Clock. theme.c:931 
 void NEOPHYTETHEME::get_vwindow_sizes(VWindowGUI *gui)
 {
 // 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);
        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 +1265,8 @@ void NEOPHYTETHEME::get_vwindow_sizes(VWindowGUI *gui)
 
                vdivision_x = vedit_x + edit_w + division_w;
                vtime_x = vdivision_x + vtime_border;
 
                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;
        }
 
        // vtimebar_x = vcanvas_x;


@@ -1266,9 +1290,9 @@ void NEOPHYTETHEME::build_bg_data()
        new_image1("resource128", "resource128.png");
        new_image1("resource64", "resource64.png");
        new_image1("resource32", "resource32.png");
        new_image1("resource128", "resource128.png");
        new_image1("resource64", "resource64.png");
        new_image1("resource32", "resource32.png");

-       new_image1("plugin_bg_data", "plugin_bg.png");
-       new_image1("title_bg_data", "title_bg.png");
-       new_image1("vtimebar_bg_data", "vwindow_timebar.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");

 }
 
 void NEOPHYTETHEME::build_overlays()
 }
 
 void NEOPHYTETHEME::build_overlays()