mask xy scale, mask boundary only overlay, fix 8 char mask nm bug, rework maskgui...

[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 b23ddf59b7a995de2109467bc0f5376d61f7980b..65f87afb523841eb0dfc69e5ad8b868e6f168823 100644 (file)
--- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
+++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
@@ -94,6 +94,7 @@ NEOPHYTETHEME::~NEOPHYTETHEME()
        delete keyframe_data;
        delete maskkeyframe_data;
        delete modekeyframe_data;
+       delete hardedge_data;
        delete pankeyframe_data;
        delete projectorkeyframe_data;
 }
@@ -354,6 +355,12 @@ void NEOPHYTETHEME::initialize()
                "new_bigbutton_hi.png",
                "new_bigbutton_dn.png",
                "new_ok_images");
+        new_button(
+               "reset.png",
+                "reset_up.png",
+                "reset_dn.png",
+                "reset_hi.png",
+                "reset_button");
        resources->cancel_images = new_button(
                "cancel.png",
                "filebox_bigbutton_up.png",
@@ -366,6 +373,39 @@ void NEOPHYTETHEME::initialize()
                "new_bigbutton_hi.png",
                "new_bigbutton_dn.png",
                "new_cancel_images");
+
+       new_button("mask_pnt_linear.png",
+               "mask_button_up.png",
+               "mask_button_hi.png",
+               "mask_button_dn.png",
+               "mask_pnt_linear_images");
+       new_button("mask_crv_linear.png",
+               "mask_button_up.png",
+               "mask_button_hi.png",
+               "mask_button_dn.png",
+               "mask_crv_linear_images");
+       new_button("mask_all_linear.png",
+               "mask_button_up.png",
+               "mask_button_hi.png",
+               "mask_button_dn.png",
+               "mask_all_linear_images");
+
+       new_button("mask_pnt_smooth.png",
+               "mask_button_up.png",
+               "mask_button_hi.png",
+               "mask_button_dn.png",
+               "mask_pnt_smooth_images");
+       new_button("mask_crv_smooth.png",
+               "mask_button_up.png",
+               "mask_button_hi.png",
+               "mask_button_dn.png",
+               "mask_crv_smooth_images");
+       new_button("mask_all_smooth.png",
+               "mask_button_up.png",
+               "mask_button_hi.png",
+               "mask_button_dn.png",
+               "mask_all_smooth_images");
+
        // Clock - is not used (AFAIK). See also clock color.
        // resources->medium_7segment = new_image_set(TOTAL_7SEGMENT,
        //      "0.png",
@@ -643,6 +683,7 @@ void NEOPHYTETHEME::initialize()
        new_image("cbuttons_left", "cbuttons_left.png");
        new_image("cbuttons_right", "cbuttons_right.png");
        new_image("cmeter_bg", "cmeter_bg.png");
+       new_image("cwindow_focus", "cwindow_focus.png");
        
        // VWindow
        /* The red position indicator is currently only 5 px high.
@@ -766,6 +807,12 @@ void NEOPHYTETHEME::initialize()
                "proxy_s_chkd.png",
                "proxy_s_down.png",
                "proxy_s_chkdhi.png");
+       mask_mode_toggle = new_image_set(5,
+               "mask_mode_up.png",
+               "mask_mode_hi.png",
+               "mask_mode_chkd.png",
+               "mask_mode_down.png",
+               "mask_mode_chkdhi.png");
        shbtn_data = new_image_set(
                3,
                "shbtn_up.png",
@@ -1065,6 +1112,16 @@ void NEOPHYTETHEME::initialize()
                           editpanel_dn, editpanel_checkedhi,
                           "tan_linear");
 
+       new_toggle("mask_scale_x.png",   "mask_scale_xup.png",    "mask_scale_xuphi.png",
+               "mask_scale_xchkd.png",  "mask_scale_xdown.png",  "mask_scale_xchkdhi.png",
+               "mask_scale_x");
+       new_toggle("mask_scale_y.png",   "mask_scale_yup.png",    "mask_scale_yuphi.png",
+               "mask_scale_ychkd.png",  "mask_scale_ydown.png",  "mask_scale_ychkdhi.png",
+               "mask_scale_y");
+       new_toggle("mask_scale_xy.png",  "mask_scale_xyup.png",   "mask_scale_xyuphi.png",
+               "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+               "mask_scale_xy");
+
        flush_images();
 }
 
@@ -1173,6 +1230,7 @@ void NEOPHYTETHEME::build_overlays()
        camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
        maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
        modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+       hardedge_data = new VFramePng(get_image_data("hardedge.png"));
        pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
        projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
 }