From: Good Guy Date: Fri, 5 Jul 2019 20:34:49 +0000 (-0600) Subject: fixes for colorpicker loops/deadlocks, add mask smooth_buttons, rm orig mask_smooth X-Git-Tag: 2019-08~21 X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=56923cfe421f547a8ba1c6a4a6e9225877b121c6;p=goodguy%2Fcinelerra.git fixes for colorpicker loops/deadlocks, add mask smooth_buttons, rm orig mask_smooth --- diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C index 72efa4a6..57601d7e 100644 --- a/cinelerra-5.1/cinelerra/colorpicker.C +++ b/cinelerra-5.1/cinelerra/colorpicker.C @@ -311,7 +311,9 @@ void ColorWindow::update_display() int ColorWindow::handle_event() { + unlock_window(); thread->handle_new_color(rgb888(), alpha8()); + lock_window("ColorWindow::handle_event"); return 1; } diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C index 1c715f9d..dfd8bddf 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.C +++ b/cinelerra-5.1/cinelerra/cwindowtool.C @@ -2317,37 +2317,24 @@ int CWindowMaskGangFocus::handle_event() } -CWindowMaskSmooth::CWindowMaskSmooth(MWindow *mwindow, - CWindowMaskGUI *gui, int x, int y) - : BC_GenericButton(x, y, _("Smooth")) +CWindowMaskSmoothButton::CWindowMaskSmoothButton(MWindow *mwindow, CWindowMaskGUI *gui, + const char *tip, int type, int on, int x, int y, const char *images) + : BC_Button(x, y, mwindow->theme->get_image_set(images)) { this->mwindow = mwindow; this->gui = gui; - set_tooltip(_("Smooth boundary")); -} -int CWindowMaskSmooth::handle_event() -{ - return gui->smooth_mask(0); + this->type = type; + this->on = on; + set_tooltip(tip); } -CWindowMaskGangSmooth::CWindowMaskGangSmooth(MWindow *mwindow, - CWindowMaskGUI *gui, int x, int y) - : BC_Button(x, y, mwindow->theme->get_image_set("gangpatch_data")) +int CWindowMaskSmoothButton::handle_event() { - this->mwindow = mwindow; - this->gui = gui; - set_tooltip(_("Smooth All")); -} -int CWindowMaskGangSmooth::handle_event() -{ - return gui->smooth_mask(1); + return gui->smooth_mask(type, on); } CWindowMaskBeforePlugins::CWindowMaskBeforePlugins(CWindowMaskGUI *gui, int x, int y) - : BC_CheckBox(x, - y, - 1, - _("Apply mask before plugins")) + : BC_CheckBox(x, y, 1, _("Apply mask before plugins")) { this->gui = gui; } @@ -2577,19 +2564,37 @@ void CWindowMaskGUI::create_objects() add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Mask Points"))); y += title_bar->get_h() + margin; + x1 = x + 60; add_subwindow(title = new BC_Title(x, y, _("Point:"))); active_point = new CWindowMaskAffectedPoint(mwindow, this, x1, y); active_point->create_objects(); + int x3 = x1 + active_point->get_w() + 4*margin; +// typ=0, this mask, this point + add_subwindow(mask_pnt_linear = new CWindowMaskSmoothButton(mwindow, this, + _("sharp point"), 0, 0, x3, y, "mask_pnt_linear_images")); + int x4 = x3 + mask_pnt_linear->get_w() + 2*margin; + add_subwindow(mask_pnt_smooth = new CWindowMaskSmoothButton(mwindow, this, + _("smooth point"), 0, 1, x4, y, "mask_pnt_smooth_images")); add_subwindow(del_point = new CWindowMaskDelPoint(mwindow, this, del_x, y)); y += active_point->get_h() + margin; add_subwindow(title = new BC_Title(x, y, "X:")); this->x = new CWindowCoord(this, x1, y, (float)0.0); this->x->create_objects(); +// typ>0, this mask, all points + add_subwindow(mask_crv_linear = new CWindowMaskSmoothButton(mwindow, this, + _("sharp curve"), 1, 0, x3, y, "mask_crv_linear_images")); + add_subwindow(mask_crv_smooth = new CWindowMaskSmoothButton(mwindow, this, + _("smooth curve"), 1, 1, x4, y, "mask_crv_smooth_images")); add_subwindow(draw_markers = new CWindowMaskDrawMarkers(mwindow, this, del_x, y)); y += this->x->get_h() + margin; add_subwindow(title = new BC_Title(x, y, "Y:")); this->y = new CWindowCoord(this, x1, y, (float)0.0); this->y->create_objects(); +// typ<0, all masks, all points + add_subwindow(mask_all_linear = new CWindowMaskSmoothButton(mwindow, this, + _("sharp all"), -1, 0, x3, y, "mask_all_linear_images")); + add_subwindow(mask_all_smooth = new CWindowMaskSmoothButton(mwindow, this, + _("smooth all"), -1, 1, x4, y, "mask_all_smooth_images")); add_subwindow(draw_boundary = new CWindowMaskDrawBoundary(mwindow, this, del_x, y)); y += this->y->get_h() + 2*margin; add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Pivot Point"))); @@ -2606,8 +2611,6 @@ void CWindowMaskGUI::create_objects() float cy = mwindow->edl->session->output_h / 2.f; focus_y = new CWindowCoord(this, x1, y, cy); focus_y->create_objects(); - add_subwindow(smooth = new CWindowMaskSmooth(mwindow, this, del_x, y)); - add_subwindow(gang_smooth = new CWindowMaskGangSmooth(mwindow, this, clr_x, y)); y += focus_x->get_h() + 2*margin; BC_Bar *bar; add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x)); @@ -2797,7 +2800,11 @@ void CWindowMaskGUI::update_buttons(MaskAuto *keyframe, int k) } } -int CWindowMaskGUI::smooth_mask(int gang) +// typ=0, this mask, this point +// typ>0, this mask, all points +// typ<0, all masks, all points +// dxy= on? pt[+1]-pt[-1] : dxy=0 +int CWindowMaskGUI::smooth_mask(int typ, int on) { MaskAutos *autos; MaskAuto *keyframe; @@ -2822,20 +2829,23 @@ int CWindowMaskGUI::smooth_mask(int gang) keyframe = &temp_keyframe; #endif int k = mwindow->edl->session->cwindow_mask; - int n = gang ? keyframe->masks.size() : k+1; - for( int j=gang? 0 : k; j=0 ? k+1 : keyframe->masks.size(); + for( int j=typ<0? 0 : k; jget_submask(j); ArrayList &points = sub_mask->points; int psz = points.size(); if( psz < 3 ) continue; - for( int i=0; icwindow->gui->affected_point; + int m = typ ? psz : l+1; + for( int i=typ<0? 0 : l; i= psz ) i1 = 0; MaskPoint *p0 = points[i0]; MaskPoint *p = points[i]; MaskPoint *p1 = points[i1]; - float dx = p1->x - p0->x, dy = p1->y - p0->y; + float dx = !on ? 0 : p1->x - p0->x; + float dy = !on ? 0 : p1->y - p0->y; p->control_x1 = -dx/4; p->control_y1 = -dy/4; p->control_x2 = dx/4; p->control_y2 = dy/4; } diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h index 5654e882..7340fa8c 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.h +++ b/cinelerra-5.1/cinelerra/cwindowtool.h @@ -323,24 +323,15 @@ public: CWindowMaskGUI *gui; }; -class CWindowMaskSmooth : public BC_GenericButton +class CWindowMaskSmoothButton : public BC_Button { public: - CWindowMaskSmooth(MWindow *mwindow, CWindowMaskGUI *gui, - int x, int y); - int handle_event(); - MWindow *mwindow; - CWindowMaskGUI *gui; -}; - -class CWindowMaskGangSmooth : public BC_Button -{ -public: - CWindowMaskGangSmooth(MWindow *mwindow, CWindowMaskGUI *gui, - int x, int y); + CWindowMaskSmoothButton(MWindow *mwindow, CWindowMaskGUI *gui, + const char *tip, int type, int on, int x, int y, const char *images); int handle_event(); MWindow *mwindow; CWindowMaskGUI *gui; + int type, on; }; class CWindowMaskAffectedPoint : public BC_TumbleTextBox @@ -479,7 +470,7 @@ public: void handle_event(); void set_focused(int v, float cx, float cy); void update_buttons(MaskAuto *keyframe, int k); - int smooth_mask(int gang); + int smooth_mask(int typ, int on); void get_keyframe(Track* &track, MaskAutos* &autos, MaskAuto* &keyframe, SubMask* &mask, MaskPoint* &point, int create_it); @@ -499,12 +490,13 @@ public: CWindowMaskGangFader *gang_fader; CWindowMaskAffectedPoint *active_point; CWindowMaskDelPoint *del_point; + CWindowMaskSmoothButton *mask_pnt_linear, *mask_pnt_smooth; + CWindowMaskSmoothButton *mask_crv_linear, *mask_crv_smooth; + CWindowMaskSmoothButton *mask_all_linear, *mask_all_smooth; CWindowCoord *x, *y; CWindowMaskFocus *focus; int focused; CWindowMaskGangFocus *gang_focus; - CWindowMaskSmooth *smooth; - CWindowMaskGangSmooth *gang_smooth; CWindowMaskHelp *help; int helped, help_y, help_h; CWindowMaskDrawMarkers *draw_markers; diff --git a/cinelerra-5.1/cinelerra/gwindowgui.C b/cinelerra-5.1/cinelerra/gwindowgui.C index f90a3878..09a09cb8 100644 --- a/cinelerra-5.1/cinelerra/gwindowgui.C +++ b/cinelerra-5.1/cinelerra/gwindowgui.C @@ -209,7 +209,6 @@ GWindowColorButton::~GWindowColorButton() int GWindowColorButton::handle_new_color(int color, int alpha) { this->color = color; - color_thread->update_lock->unlock(); return 1; } diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C index 10f4285b..c3765dfe 100644 --- a/cinelerra-5.1/plugins/theme_blond/blondtheme.C +++ b/cinelerra-5.1/plugins/theme_blond/blondtheme.C @@ -294,6 +294,38 @@ void BlondTheme::initialize() "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"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, "0.png", "1.png", diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_blond/data/mask_all_linear.png new file mode 100644 index 00000000..631bfa46 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_blond/data/mask_all_smooth.png new file mode 100644 index 00000000..ce744bea Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_blond/data/mask_button_dn.png new file mode 100644 index 00000000..ab723604 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_button_hi.png new file mode 100644 index 00000000..439138b3 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_blond/data/mask_button_up.png new file mode 100644 index 00000000..3839f00e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_blond/data/mask_crv_linear.png new file mode 100644 index 00000000..4e1a8d74 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_blond/data/mask_crv_smooth.png new file mode 100644 index 00000000..d6060559 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_linear.png new file mode 100644 index 00000000..65b3b9ce Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_smooth.png new file mode 100644 index 00000000..ce02e4c2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C index 46c12e6d..54bc1ec6 100644 --- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C +++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C @@ -347,6 +347,38 @@ void BlondCVTheme::initialize() "generic_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"); + new_toggle("loadmode_new.png", "loadmode_up.png", "loadmode_hi.png", diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_linear.png new file mode 100644 index 00000000..631bfa46 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_smooth.png new file mode 100644 index 00000000..ce744bea Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_dn.png new file mode 100644 index 00000000..ab723604 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_hi.png new file mode 100644 index 00000000..439138b3 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_up.png new file mode 100644 index 00000000..3839f00e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_linear.png new file mode 100644 index 00000000..4e1a8d74 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_smooth.png new file mode 100644 index 00000000..d6060559 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_linear.png new file mode 100644 index 00000000..65b3b9ce Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_smooth.png new file mode 100644 index 00000000..ce02e4c2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/bluetheme.C b/cinelerra-5.1/plugins/theme_blue/bluetheme.C index 0fa46e8e..9f231805 100644 --- a/cinelerra-5.1/plugins/theme_blue/bluetheme.C +++ b/cinelerra-5.1/plugins/theme_blue/bluetheme.C @@ -294,6 +294,38 @@ void BlueDotTheme::initialize() "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"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, "0.png", "1.png", diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_blue/data/mask_all_linear.png new file mode 100644 index 00000000..631bfa46 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_blue/data/mask_all_smooth.png new file mode 100644 index 00000000..ce744bea Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_blue/data/mask_button_dn.png new file mode 100644 index 00000000..ab723604 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_button_hi.png new file mode 100644 index 00000000..439138b3 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_blue/data/mask_button_up.png new file mode 100644 index 00000000..3839f00e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_blue/data/mask_crv_linear.png new file mode 100644 index 00000000..4e1a8d74 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_blue/data/mask_crv_smooth.png new file mode 100644 index 00000000..d6060559 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_linear.png new file mode 100644 index 00000000..65b3b9ce Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_smooth.png new file mode 100644 index 00000000..ce02e4c2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C index 49508a9d..7b5ef9e5 100644 --- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C +++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C @@ -305,6 +305,38 @@ void BlueDotTheme::initialize() "generic_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"); + resources->bar_data = new_image("bar", "bar.png"); //clock font diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_linear.png new file mode 100644 index 00000000..631bfa46 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_smooth.png new file mode 100644 index 00000000..ce744bea Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_dn.png new file mode 100644 index 00000000..ab723604 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_hi.png new file mode 100644 index 00000000..439138b3 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_up.png new file mode 100644 index 00000000..3839f00e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_linear.png new file mode 100644 index 00000000..4e1a8d74 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_smooth.png new file mode 100644 index 00000000..d6060559 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_linear.png new file mode 100644 index 00000000..65b3b9ce Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_smooth.png new file mode 100644 index 00000000..ce02e4c2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C index 3c7f56d3..282ce97a 100644 --- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C +++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C @@ -301,6 +301,38 @@ void BrightTheme::initialize() "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"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, "0.png", "1.png", diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_bright/data/mask_all_linear.png new file mode 100644 index 00000000..631bfa46 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_bright/data/mask_all_smooth.png new file mode 100644 index 00000000..ce744bea Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_bright/data/mask_button_dn.png new file mode 100644 index 00000000..ab723604 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_button_hi.png new file mode 100644 index 00000000..439138b3 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_bright/data/mask_button_up.png new file mode 100644 index 00000000..3839f00e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_bright/data/mask_crv_linear.png new file mode 100644 index 00000000..4e1a8d74 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_bright/data/mask_crv_smooth.png new file mode 100644 index 00000000..d6060559 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_linear.png new file mode 100644 index 00000000..65b3b9ce Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_smooth.png new file mode 100644 index 00000000..ce02e4c2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C index 97620ca0..4c4e39d7 100644 --- a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C +++ b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C @@ -267,12 +267,11 @@ void CAKEWALKTHEME::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"); + 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", @@ -285,6 +284,36 @@ void CAKEWALKTHEME::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"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); resources->min_menu_w = 96; diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_linear.png new file mode 100644 index 00000000..631bfa46 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_smooth.png new file mode 100644 index 00000000..ce744bea Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_dn.png new file mode 100644 index 00000000..ab723604 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_hi.png new file mode 100644 index 00000000..439138b3 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_up.png new file mode 100644 index 00000000..3839f00e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_linear.png new file mode 100644 index 00000000..4e1a8d74 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_smooth.png new file mode 100644 index 00000000..d6060559 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_linear.png new file mode 100644 index 00000000..65b3b9ce Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_smooth.png new file mode 100644 index 00000000..ce02e4c2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_all_linear.png new file mode 100644 index 00000000..631bfa46 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_all_smooth.png new file mode 100644 index 00000000..ce744bea Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_dn.png new file mode 100644 index 00000000..ab723604 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_hi.png new file mode 100644 index 00000000..439138b3 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_up.png new file mode 100644 index 00000000..3839f00e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_linear.png new file mode 100644 index 00000000..4e1a8d74 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_smooth.png new file mode 100644 index 00000000..d6060559 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_linear.png new file mode 100644 index 00000000..65b3b9ce Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_smooth.png new file mode 100644 index 00000000..ce02e4c2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C index ca798198..0f9ddb7a 100644 --- a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C +++ b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C @@ -295,6 +295,38 @@ void HULKTHEME::initialize() "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"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, "0.png", "1.png", diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_all_linear.png new file mode 100644 index 00000000..631bfa46 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_all_smooth.png new file mode 100644 index 00000000..ce744bea Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_dn.png new file mode 100644 index 00000000..ab723604 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_hi.png new file mode 100644 index 00000000..439138b3 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_up.png new file mode 100644 index 00000000..3839f00e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_linear.png new file mode 100644 index 00000000..4e1a8d74 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_smooth.png new file mode 100644 index 00000000..d6060559 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_linear.png new file mode 100644 index 00000000..65b3b9ce Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_smooth.png new file mode 100644 index 00000000..ce02e4c2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C index 24fec36c..8e55b5e7 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C +++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C @@ -373,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", diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_linear.png new file mode 100644 index 00000000..631bfa46 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_smooth.png new file mode 100644 index 00000000..ce744bea Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_dn.png new file mode 100644 index 00000000..ab723604 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_hi.png new file mode 100644 index 00000000..439138b3 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_up.png new file mode 100644 index 00000000..3839f00e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_linear.png new file mode 100644 index 00000000..4e1a8d74 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_smooth.png new file mode 100644 index 00000000..d6060559 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_linear.png new file mode 100644 index 00000000..65b3b9ce Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_smooth.png new file mode 100644 index 00000000..ce02e4c2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C index 0dce66d6..02fa02ec 100644 --- a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C +++ b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C @@ -280,6 +280,38 @@ void PINKLADY::initialize() "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"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, "0.png", "1.png", diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_suv/data/mask_all_linear.png new file mode 100644 index 00000000..631bfa46 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_suv/data/mask_all_smooth.png new file mode 100644 index 00000000..ce744bea Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_suv/data/mask_button_dn.png new file mode 100644 index 00000000..ab723604 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_suv/data/mask_button_hi.png new file mode 100644 index 00000000..439138b3 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_suv/data/mask_button_up.png new file mode 100644 index 00000000..3839f00e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_suv/data/mask_crv_linear.png new file mode 100644 index 00000000..4e1a8d74 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_suv/data/mask_crv_smooth.png new file mode 100644 index 00000000..d6060559 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_suv/data/mask_pnt_linear.png new file mode 100644 index 00000000..65b3b9ce Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_suv/data/mask_pnt_smooth.png new file mode 100644 index 00000000..ce02e4c2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/suv.C b/cinelerra-5.1/plugins/theme_suv/suv.C index 4fae7dbb..75402dc2 100644 --- a/cinelerra-5.1/plugins/theme_suv/suv.C +++ b/cinelerra-5.1/plugins/theme_suv/suv.C @@ -291,6 +291,38 @@ void SUV::initialize() "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"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, "0.png", "1.png", diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_all_linear.png new file mode 100644 index 00000000..631bfa46 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_all_smooth.png new file mode 100644 index 00000000..ce744bea Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_button_dn.png new file mode 100644 index 00000000..ab723604 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_button_hi.png new file mode 100644 index 00000000..439138b3 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_button_up.png new file mode 100644 index 00000000..3839f00e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_linear.png new file mode 100644 index 00000000..4e1a8d74 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_smooth.png new file mode 100644 index 00000000..d6060559 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_linear.png new file mode 100644 index 00000000..65b3b9ce Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_smooth.png new file mode 100644 index 00000000..ce02e4c2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C index fa449a4a..af3bff4b 100644 --- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C +++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C @@ -289,6 +289,38 @@ void UNFLATTHEME::initialize() "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"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, "0.png", "1.png",