add focus centroid to masking, mod mask reset/mode btns, add sticky to mask fade...
authorGood Guy <good1.2guy@gmail.com>
Thu, 16 May 2019 20:39:28 +0000 (14:39 -0600)
committerGood Guy <good1.2guy@gmail.com>
Thu, 16 May 2019 20:39:28 +0000 (14:39 -0600)
109 files changed:
cinelerra-5.1/cinelerra/cwindowgui.C
cinelerra-5.1/cinelerra/cwindowgui.h
cinelerra-5.1/cinelerra/cwindowtool.C
cinelerra-5.1/cinelerra/cwindowtool.h
cinelerra-5.1/cinelerra/cwindowtool.inc
cinelerra-5.1/plugins/theme_blond/blondtheme.C
cinelerra-5.1/plugins/theme_blond/data/mask_mode_chkd.png
cinelerra-5.1/plugins/theme_blond/data/mask_mode_chkdhi.png
cinelerra-5.1/plugins/theme_blond/data/mask_mode_down.png
cinelerra-5.1/plugins/theme_blond/data/mask_mode_hi.png
cinelerra-5.1/plugins/theme_blond/data/mask_mode_up.png
cinelerra-5.1/plugins/theme_blond/data/reset.png
cinelerra-5.1/plugins/theme_blond/data/reset_dn.png
cinelerra-5.1/plugins/theme_blond/data/reset_hi.png
cinelerra-5.1/plugins/theme_blond/data/reset_up.png
cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_chkd.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_chkdhi.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_down.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_hi.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_up.png
cinelerra-5.1/plugins/theme_blond_cv/data/reset.png
cinelerra-5.1/plugins/theme_blond_cv/data/reset_dn.png
cinelerra-5.1/plugins/theme_blond_cv/data/reset_hi.png
cinelerra-5.1/plugins/theme_blond_cv/data/reset_up.png
cinelerra-5.1/plugins/theme_blue/bluetheme.C
cinelerra-5.1/plugins/theme_blue/data/mask_mode_chkd.png
cinelerra-5.1/plugins/theme_blue/data/mask_mode_chkdhi.png
cinelerra-5.1/plugins/theme_blue/data/mask_mode_down.png
cinelerra-5.1/plugins/theme_blue/data/mask_mode_hi.png
cinelerra-5.1/plugins/theme_blue/data/mask_mode_up.png
cinelerra-5.1/plugins/theme_blue/data/reset.png
cinelerra-5.1/plugins/theme_blue/data/reset_dn.png
cinelerra-5.1/plugins/theme_blue/data/reset_hi.png
cinelerra-5.1/plugins/theme_blue/data/reset_up.png
cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_chkd.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_chkdhi.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_down.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_hi.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_up.png
cinelerra-5.1/plugins/theme_blue_dot/data/reset.png
cinelerra-5.1/plugins/theme_blue_dot/data/reset_dn.png
cinelerra-5.1/plugins/theme_blue_dot/data/reset_hi.png
cinelerra-5.1/plugins/theme_blue_dot/data/reset_up.png
cinelerra-5.1/plugins/theme_bright/brighttheme.C
cinelerra-5.1/plugins/theme_bright/data/mask_mode_chkd.png
cinelerra-5.1/plugins/theme_bright/data/mask_mode_chkdhi.png
cinelerra-5.1/plugins/theme_bright/data/mask_mode_down.png
cinelerra-5.1/plugins/theme_bright/data/mask_mode_hi.png
cinelerra-5.1/plugins/theme_bright/data/mask_mode_up.png
cinelerra-5.1/plugins/theme_bright/data/reset.png
cinelerra-5.1/plugins/theme_bright/data/reset_dn.png
cinelerra-5.1/plugins/theme_bright/data/reset_hi.png
cinelerra-5.1/plugins/theme_bright/data/reset_up.png
cinelerra-5.1/plugins/theme_hulk/data/mask_mode_chkd.png
cinelerra-5.1/plugins/theme_hulk/data/mask_mode_chkdhi.png
cinelerra-5.1/plugins/theme_hulk/data/mask_mode_down.png
cinelerra-5.1/plugins/theme_hulk/data/mask_mode_hi.png
cinelerra-5.1/plugins/theme_hulk/data/mask_mode_up.png
cinelerra-5.1/plugins/theme_hulk/data/reset.png
cinelerra-5.1/plugins/theme_hulk/data/reset_dn.png
cinelerra-5.1/plugins/theme_hulk/data/reset_hi.png
cinelerra-5.1/plugins/theme_hulk/data/reset_up.png
cinelerra-5.1/plugins/theme_hulk/hulktheme.C
cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_chkd.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_chkdhi.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_down.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_hi.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_up.png
cinelerra-5.1/plugins/theme_neophyte/data/reset.png
cinelerra-5.1/plugins/theme_neophyte/data/reset_dn.png
cinelerra-5.1/plugins/theme_neophyte/data/reset_hi.png
cinelerra-5.1/plugins/theme_neophyte/data/reset_up.png
cinelerra-5.1/plugins/theme_neophyte/neophyte.C
cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_chkd.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_chkdhi.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_down.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_hi.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_up.png
cinelerra-5.1/plugins/theme_pinklady/data/reset.png
cinelerra-5.1/plugins/theme_pinklady/data/reset_dn.png
cinelerra-5.1/plugins/theme_pinklady/data/reset_hi.png
cinelerra-5.1/plugins/theme_pinklady/data/reset_up.png
cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
cinelerra-5.1/plugins/theme_suv/data/mask_mode_chkd.png
cinelerra-5.1/plugins/theme_suv/data/mask_mode_chkdhi.png
cinelerra-5.1/plugins/theme_suv/data/mask_mode_down.png
cinelerra-5.1/plugins/theme_suv/data/mask_mode_hi.png
cinelerra-5.1/plugins/theme_suv/data/mask_mode_up.png
cinelerra-5.1/plugins/theme_suv/data/reset.png
cinelerra-5.1/plugins/theme_suv/data/reset.svg
cinelerra-5.1/plugins/theme_suv/data/reset_dn.png
cinelerra-5.1/plugins/theme_suv/data/reset_dn.svg [new file with mode: 0644]
cinelerra-5.1/plugins/theme_suv/data/reset_hi.png
cinelerra-5.1/plugins/theme_suv/data/reset_hi.svg [new file with mode: 0644]
cinelerra-5.1/plugins/theme_suv/data/reset_up.png
cinelerra-5.1/plugins/theme_suv/data/reset_up.svg [new file with mode: 0644]
cinelerra-5.1/plugins/theme_suv/suv.C
cinelerra-5.1/plugins/theme_unflat/data/mask_mode_chkd.png
cinelerra-5.1/plugins/theme_unflat/data/mask_mode_chkdhi.png
cinelerra-5.1/plugins/theme_unflat/data/mask_mode_down.png
cinelerra-5.1/plugins/theme_unflat/data/mask_mode_hi.png
cinelerra-5.1/plugins/theme_unflat/data/mask_mode_up.png
cinelerra-5.1/plugins/theme_unflat/data/reset.png
cinelerra-5.1/plugins/theme_unflat/data/reset_dn.png
cinelerra-5.1/plugins/theme_unflat/data/reset_hi.png
cinelerra-5.1/plugins/theme_unflat/data/reset_up.png
cinelerra-5.1/plugins/theme_unflat/unflattheme.C

index af4d818..fbbcbe7 100644 (file)
@@ -1792,9 +1792,26 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender,
                }
 //printf("CWindowCanvas::do_mask 1\n");
 
+               BC_WindowBase *cvs_win = get_canvas();
                if(draw) {
-                       get_canvas()->draw_polygon(&x_points, &y_points);
-                       get_canvas()->set_opaque();
+                       cvs_win->draw_polygon(&x_points, &y_points);
+                       cvs_win->set_opaque();
+               }
+               if( draw && gui->tool_panel ) {
+                       CWindowMaskGUI *mask_gui = (CWindowMaskGUI*)gui->tool_panel->tool_gui;
+                       if( mask_gui && mask_gui->focused ) {
+                               float fx = atof(mask_gui->focus_x->get_text());
+                               float fy = atof(mask_gui->focus_y->get_text());
+                               output_to_canvas(mwindow->edl, 0, fx, fy);
+                               float r = bmax(cvs_win->get_w(), cvs_win->get_h());
+                               float d = 0.005*r;
+                               cvs_win->set_line_width((int)(0.0025*r) + 1);
+                               cvs_win->set_color(BLUE);
+                               cvs_win->draw_line(fx-d,fy-d, fx+d, fy+d);
+                               cvs_win->draw_line(fx-d,fy+d, fx+d, fy-d);
+                               cvs_win->set_line_width(0);
+                               cvs_win->set_color(WHITE);
+                       }
                }
 //printf("CWindowCanvas::do_mask 1\n");
        }
@@ -2086,14 +2103,21 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender,
                                float st = sin(theta), ct = cos(theta);
                                gui->x_origin = mask_cursor_x;
                                gui->y_origin = mask_cursor_y;
+                               if( gui->tool_panel ) {
+                                       CWindowMaskGUI *mask_gui = (CWindowMaskGUI*)gui->tool_panel->tool_gui;
+                                       if( mask_gui && mask_gui->focused ) {
+                                               gui->x_origin = atof(mask_gui->focus_x->get_text());
+                                               gui->y_origin = atof(mask_gui->focus_y->get_text());
+                                       }
+                               }
                                for( int i=0; i<mask_points.size(); ++i ) {
                                        MaskPoint *point = mask_points.values[i];
-                                       float px = point->x - mask_cursor_x;
-                                       float py = point->y - mask_cursor_y;
+                                       float px = point->x - gui->x_origin;
+                                       float py = point->y - gui->y_origin;
                                        float nx = !rotate ? px*scale : px*ct + py*st;
                                        float ny = !rotate ? py*scale : py*ct - px*st;
-                                       point->x = nx + mask_cursor_x;
-                                       point->y = ny + mask_cursor_y;
+                                       point->x = nx + gui->x_origin;
+                                       point->y = ny + gui->y_origin;
                                }
                                break; }
                        }
@@ -2173,6 +2197,20 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender,
        return result;
 }
 
+int CWindowCanvas::do_mask_focus()
+{
+       CWindowMaskGUI *mask_gui = (CWindowMaskGUI*) gui->tool_panel->tool_gui;
+       float cx = get_cursor_x(), cy = get_cursor_y();
+       canvas_to_output(mwindow->edl, 0, cx, cy);
+       int v = mask_gui->focused ? 0 : 1;
+       get_canvas()->unlock_window();
+       mask_gui->lock_window("CWindowCanvas::do_mask_focus");
+       mask_gui->set_focused(v, cx, cy);
+       mask_gui->unlock_window();
+       get_canvas()->lock_window("CWindowCanvas::do_mask_focus");
+       return 1;
+}
+
 int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
 {
        int result = 0;
@@ -3283,7 +3321,7 @@ int CWindowCanvas::button_press_event()
 
 // Scroll view
        if( mwindow->edl->session->cwindow_operation != CWINDOW_PROTECT &&
-           get_buttonpress() == 2 )
+           get_buttonpress() == MIDDLE_BUTTON && !get_canvas()->shift_down() )
        {
                gui->current_operation = CWINDOW_SCROLL;
                result = 1;
@@ -3318,6 +3356,11 @@ int CWindowCanvas::button_press_event()
                                case LEFT_BUTTON:
                                        result = do_mask(redraw, rerender, 1, 0, 0);
                                        break;
+                               case MIDDLE_BUTTON: {  // && shift_down()
+                                       result = do_mask_focus();
+                                       redraw = 1;
+                                       redraw_canvas = 1;
+                                       break; }
                                case WHEEL_UP:
                                case WHEEL_DOWN:
                                        result = do_mask(redraw, rerender, 1, 1, 0);
index 33cf9bf..83b9243 100644 (file)
@@ -284,6 +284,7 @@ public:
                int button_press,
                int cursor_motion,
                int draw);
+       int do_mask_focus();
        void draw_refresh(int flash = 1);
        int need_overlays();
        void draw_overlays();
index 4a76981..e077be3 100644 (file)
@@ -23,6 +23,7 @@
 
 #include "automation.h"
 #include "bccolors.h"
+#include "bctimer.h"
 #include "clip.h"
 #include "condition.h"
 #include "cpanel.h"
@@ -1561,6 +1562,7 @@ int CWindowMaskDelMask::handle_event()
        Track *track;
        MaskPoint *point;
        SubMask *mask;
+       int total_points;
 
 // Get existing keyframe
        ((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe, mask, point, 0);
@@ -1572,19 +1574,24 @@ int CWindowMaskDelMask::handle_event()
 // Create temp keyframe
                MaskAuto temp_keyframe(mwindow->edl, autos);
                temp_keyframe.copy_data(keyframe);
-// Update parameter
                SubMask *submask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
                submask->points.remove_all_objects();
+               total_points = 0;
 // Commit change to span of keyframes
                ((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->update_parameter(&temp_keyframe);
 #else
                for(MaskAuto *current = (MaskAuto*)autos->default_auto; current; ) {
                        SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask);
-                       submask->points.remove_all_objects();
+                       submask->points.clear();
                        current = current == (MaskAuto*)autos->default_auto ?
                                (MaskAuto*)autos->first : (MaskAuto*)NEXT;
                }
+               total_points = 0;
 #endif
+               if( mwindow->cwindow->gui->affected_point >= total_points )
+                       mwindow->cwindow->gui->affected_point =
+                               total_points > 0 ? total_points-1 : 0;
+
                gui->update();
                gui->update_preview();
                mwindow->undo->update_undo_after(_("mask delete"), LOAD_AUTOMATION);
@@ -1713,6 +1720,25 @@ int CWindowMaskAffectedPoint::handle_event()
 }
 
 
+CWindowMaskFocus::CWindowMaskFocus(MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
+ : BC_CheckBox(x, y, ((CWindowMaskGUI*)gui)->focused, _("Focus"))
+{
+       this->mwindow = mwindow;
+       this->gui = gui;
+}
+
+CWindowMaskFocus::~CWindowMaskFocus()
+{
+}
+
+int CWindowMaskFocus::handle_event()
+{
+       ((CWindowMaskGUI*)gui)->focused = get_value();
+       gui->update();
+       gui->update_preview();
+       return 1;
+}
+
 CWindowMaskFeather::CWindowMaskFeather(MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
  : BC_TumbleTextBox(gui, 0, 0, 0xff, x, y, 64, 2)
 {
@@ -1871,15 +1897,31 @@ CWindowMaskFadeSlider::CWindowMaskFadeSlider(MWindow *mwindow, CWindowToolGUI *g
 {
        this->mwindow = mwindow;
        this->gui = gui;
+       timer = new Timer();
+       stick = 0;
 }
 
 CWindowMaskFadeSlider::~CWindowMaskFadeSlider()
 {
+       delete timer;
 }
 
 int CWindowMaskFadeSlider::handle_event()
 {
        float v = 100*get_value()/200;
+       if( !v && !stick )
+               stick = 16;
+       else if( stick > 0 ) {
+               int64_t ms = timer->get_difference();
+               if( ms < 1000 ) {
+                       --stick;
+                       if( get_value() == 0 ) return 1;
+                       update(v = 0);
+               }
+               else
+                       stick = 0;
+       }
+       timer->update();
        CWindowMaskGUI *mask_gui = (CWindowMaskGUI*)gui;
        mask_gui->fade->BC_TumbleTextBox::update(v);
        return mask_gui->fade->update_value(v);
@@ -1896,7 +1938,7 @@ CWindowMaskMode::CWindowMaskMode(MWindow *mwindow,
 {
        this->mwindow = mwindow;
        this->gui = gui;
-       set_tooltip(_("Mode"));
+       set_tooltip(_("Subtract/Multiply Alpha"));
 }
 
 CWindowMaskMode::~CWindowMaskMode()
@@ -1933,7 +1975,6 @@ int CWindowMaskMode::handle_event()
        return 1;
 }
 
-
 CWindowMaskBeforePlugins::CWindowMaskBeforePlugins(CWindowToolGUI *gui, int x, int y)
  : BC_CheckBox(x,
        y,
@@ -2024,73 +2065,38 @@ int CWindowMaskClrMask::handle_event()
        return 1;
 }
 
-CWindowMaskClrPoint::CWindowMaskClrPoint(MWindow *mwindow,
+CWindowMaskClrFeather::CWindowMaskClrFeather(MWindow *mwindow,
                CWindowMaskGUI *gui, int x, int y)
  : BC_Button(x, y, mwindow->theme->get_image_set("reset_button"))
 {
        this->mwindow = mwindow;
        this->gui = gui;
-       set_tooltip(_("Delete all points"));
+       set_tooltip(_("Zero Feather"));
 }
-
-CWindowMaskClrPoint::~CWindowMaskClrPoint()
+CWindowMaskClrFeather::~CWindowMaskClrFeather()
 {
 }
 
-int CWindowMaskClrPoint::handle_event()
+int CWindowMaskClrFeather::handle_event()
 {
-       MaskAutos *autos;
-       MaskAuto *keyframe;
-       Track *track;
-       MaskPoint *point;
-       SubMask *mask;
-       int total_points;
-
-// Get existing keyframe
-       ((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe, mask, point, 0);
-       if( track ) {
-               mwindow->undo->update_undo_before(_("clr points"), 0);
-#ifdef USE_KEYFRAME_SPANNING
-// Create temp keyframe
-               MaskAuto temp_keyframe(mwindow->edl, autos);
-               temp_keyframe.copy_data(keyframe);
-               SubMask *submask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
-               submask->points.remove_all_objects();
-               total_points = 0;
-// Commit change to span of keyframes
-               ((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->update_parameter(&temp_keyframe);
-#else
-               MaskAuto *current = (MaskAuto*)autos->default_auto;
-               while( current ) {
-                       SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask);
-                       submask->points.clear();
-                       current = current == (MaskAuto*)autos->default_auto ?
-                               (MaskAuto*)autos->first : (MaskAuto*)NEXT;
-               }
-               total_points = 0;
-#endif
-               if( mwindow->cwindow->gui->affected_point >= total_points )
-                       mwindow->cwindow->gui->affected_point =
-                               total_points > 0 ? total_points-1 : 0;
-
-               gui->update();
-               gui->update_preview();
-               mwindow->undo->update_undo_after(_("clr points"), LOAD_AUTOMATION);
-       }
-
-       return 1;
+       float v = 0;
+       CWindowMaskGUI * mask_gui = (CWindowMaskGUI*)gui;
+       mask_gui->feather->update(v);
+       mask_gui->feather_slider->update(v);
+       return mask_gui->feather->update_value(v);
 }
 
 
 CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow, thread,
-       _(PROGRAM_NAME ": Mask"), 340, 350)
+       _(PROGRAM_NAME ": Mask"), 360, 440)
 {
        this->mwindow = mwindow;
        this->thread = thread;
        active_point = 0;
        fade = 0;
        feather = 0;
+       focused = 0;
 }
 CWindowMaskGUI::~CWindowMaskGUI()
 {
@@ -2114,62 +2120,72 @@ void CWindowMaskGUI::create_objects()
        lock_window("CWindowMaskGUI::create_objects");
        BC_Title *title;
        add_subwindow(title = new BC_Title(x, y, _("Mask:")));
-       int x1 = x + title->get_w() + margin;
-       name = new CWindowMaskName(mwindow, this, x + title->get_w() + margin, y, "");
+       int x1 = x + 70;
+       name = new CWindowMaskName(mwindow, this, x1, y, "");
        name->create_objects();
-       x1 = x + name->get_w() + 2*margin;
        add_subwindow(clr_mask = new CWindowMaskClrMask(mwindow, this, clr_x, y));
        add_subwindow(del_mask = new CWindowMaskDelMask(mwindow, this, del_x, y));
        y += name->get_h() + margin;
        add_subwindow(title = new BC_Title(x, y, _("Fade:")));
-       x1 = x + title->get_w() + margin;
        fade = new CWindowMaskFade(mwindow, this, x1, y);
        fade->create_objects();
-       x1 += fade->get_w() + 2*margin;
-       int w1 = clr_x-2*margin - x1;
-       add_subwindow(fade_slider = new CWindowMaskFadeSlider(mwindow, this, x1, y, w1));
-       x1 += fade_slider->get_w() + 2*margin;
+       int x2 = x1 + fade->get_w() + 2*margin;
+       int w2 = clr_x-2*margin - x2;
+       add_subwindow(fade_slider = new CWindowMaskFadeSlider(mwindow, this, x2, y, w2));
        add_subwindow(mode = new CWindowMaskMode(mwindow, this, clr_x, y));
-       y += fade->get_h() + 3*margin;
+       y += fade->get_h() + margin;
+       add_subwindow(title = new BC_Title(x, y, _("Feather:")));
+       feather = new CWindowMaskFeather(mwindow, this, x1, y);
+       feather->create_objects();
+       x2 = x1 + feather->get_w() + margin;
+       w2 = clr_x - 2*margin - x2;
+       feather_slider = new CWindowMaskFeatherSlider(mwindow, this, x2, y, w2, 0);
+       add_subwindow(feather_slider);
+       add_subwindow(new CWindowMaskClrFeather(mwindow, this, clr_x, y));
+       y += feather->get_h() + 3*margin;
+
        add_subwindow(title = new BC_Title(x, y, _("Point:")));
-       x1 = x + title->get_w() + margin;
        active_point = new CWindowMaskAffectedPoint(mwindow, this, x1, y);
        active_point->create_objects();
-       x1 += active_point->get_w() + margin;
-       add_subwindow(clr_point = new CWindowMaskClrPoint(mwindow, this, clr_x, y));
        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:"));
-       x1 = x + title->get_w() + margin;
        this->x = new CWindowCoord(this, x1, y, (float)0.0);
        this->x->create_objects();
-       x1 += this->x->get_w() + 3*margin;
-       add_subwindow(title = new BC_Title(x1, y, "Y:"));
-       x1 += title->get_w() + margin;
+       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();
-       y += this->x->get_h() + 3*margin;
-       add_subwindow(title = new BC_Title(x, y, _("Feather:")));
-       x1 = x + title->get_w() + margin;
-       feather = new CWindowMaskFeather(mwindow, this, x1, y);
-       feather->create_objects();
-       x1 += feather->get_w() + margin;
-       feather_slider = new CWindowMaskFeatherSlider(mwindow, this, x1, y, 140, 0);
-       add_subwindow(feather_slider);
-       y += feather->get_h() + margin;
+       y += this->y->get_h() + margin;
+       BC_Bar *bar;
+       add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
+       y += bar->get_h() + margin;
+
+       add_subwindow(title = new BC_Title(x, y, "X:"));
+       focus_x = new CWindowCoord(this, x1, y, (float)0.0);
+       focus_x->create_objects();
+       add_subwindow(focus = new CWindowMaskFocus(mwindow, this, del_x, y));
+       y += focus_x->get_h() + margin;
+       add_subwindow(title = new BC_Title(x, y, "Y:"));
+       focus_y = new CWindowCoord(this, x1, y, (float)0.0);
+       focus_y->create_objects();
+       y += focus_x->get_h() + margin;
        add_subwindow(this->apply_before_plugins = new CWindowMaskBeforePlugins(this, 10, y));
-       y += this->apply_before_plugins->get_h() + margin;
+       y += this->apply_before_plugins->get_h();
        add_subwindow(this->disable_opengl_masking = new CWindowDisableOpenGLMasking(this, 10, y));
-       y += this->disable_opengl_masking->get_h() + 3*margin;
-       add_subwindow(new BC_Bar(x, y, get_w()-2*x));
-       y += 2*margin;
+       y += this->disable_opengl_masking->get_h() + margin;
+       add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
+       y += bar->get_h() + margin;
+
+       y += margin;
        add_subwindow(title = new BC_Title(x, y, _(
                "Shift+LMB: move an end point\n"
                "Ctrl+LMB: move a control point\n"
+               "Alt+LMB: to drag translate the mask\n"
+               "Shift+Key Delete to delete the mask\n"
                "Wheel Up/Dn: rotate around pointer\n"
                "Shift+Wheel Up/Dn: scale around pointer\n"
-               "Alt+LMB: to drag translate the mask\n"
-               "Shift+Key Delete to delete the mask")));
+               "Shift+MMB: Toggle focus center at pointer")));
        update();
        unlock_window();
 }
@@ -2242,10 +2258,13 @@ void CWindowMaskGUI::update()
 
 //printf("CWindowMaskGUI::update 1\n");
        active_point->update((int64_t)mwindow->cwindow->gui->affected_point);
-       name->update_items(keyframe);
-       int k = mwindow->edl->session->cwindow_mask;
-       const char *text = k >= 0 && k < keyframe->masks.size() ?
-               keyframe->masks[k]->name : "";
+       const char *text = "";
+       if( keyframe ) {
+               name->update_items(keyframe);
+               int k = mwindow->edl->session->cwindow_mask;
+               if( k >= 0 && k < keyframe->masks.size() )
+                       text = keyframe->masks[k]->name;
+       }
        name->update(text);
 
 //printf("CWindowMaskGUI::update 1\n");
@@ -2311,6 +2330,12 @@ void CWindowMaskGUI::update_preview()
        lock_window("CWindowMaskGUI::update_preview");
 }
 
+void CWindowMaskGUI::set_focused(int v, float cx, float cy)
+{
+       focus_x->update(cx);
+       focus_y->update(cy);
+       focus->update(focused = v);
+}
 
 CWindowRulerGUI::CWindowRulerGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow,
index 1eb5002..4691fc0 100644 (file)
@@ -168,6 +168,8 @@ public:
        char *get_caption() { return 0; }
        MWindow *mwindow;
        CWindowToolGUI *gui;
+       int stick;
+       Timer *timer;
 };
 
 class CWindowMaskMode : public BC_Toggle
@@ -199,6 +201,16 @@ public:
        CWindowToolGUI *gui;
 };
 
+class CWindowMaskFocus : public BC_CheckBox
+{
+public:
+       CWindowMaskFocus(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+       ~CWindowMaskFocus();
+       int handle_event();
+       MWindow *mwindow;
+       CWindowToolGUI *gui;
+};
+
 class CWindowMaskDelPoint : public BC_GenericButton
 {
 public:
@@ -245,12 +257,11 @@ public:
        CWindowMaskGUI *gui;
 };
 
-class CWindowMaskClrPoint : public BC_Button
+class CWindowMaskClrFeather : public BC_Button
 {
 public:
-       CWindowMaskClrPoint(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y);
-       ~CWindowMaskClrPoint();
-
+       CWindowMaskClrFeather(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y);
+       ~CWindowMaskClrFeather();
        int handle_event();
        MWindow *mwindow;
        CWindowMaskGUI *gui;
@@ -279,6 +290,7 @@ public:
        ~CWindowMaskGUI();
        void create_objects();
        void update();
+       void set_focused(int v, float cx, float cy);
        void handle_event();
        void get_keyframe(Track* &track, MaskAutos* &autos, MaskAuto* &keyframe,
                SubMask* &mask, MaskPoint* &point, int create_it);
@@ -291,9 +303,11 @@ public:
        CWindowMaskFadeSlider *fade_slider;
        CWindowMaskMode *mode;
        CWindowMaskAffectedPoint *active_point;
-       CWindowMaskClrPoint *clr_point;
        CWindowMaskDelPoint *del_point;
        CWindowCoord *x, *y;
+       CWindowMaskFocus *focus;
+       int focused;
+       CWindowCoord *focus_x, *focus_y;
        CWindowMaskFeather *feather;
        CWindowMaskFeatherSlider *feather_slider;
        CWindowMaskBeforePlugins *apply_before_plugins;
index 0d284c0..9fd83c5 100644 (file)
 #ifndef CWINDOWTOOL_INC
 #define CWINDOWTOOL_INC
 
-
 class CWindowTool;
 class CWindowToolGUI;
 class CWindowCoord;
 class CWindowCurveToggle;
 class CWindowCropOK;
 class CWindowCropGUI;
-class CWindowMaskList;
+class CWindowMaskItems;
 class CWindowMaskName;
 class CWindowMaskFade;
+class CWindowMaskFadeSlider;
 class CWindowMaskMode;
 class CWindowMaskDelMask;
 class CWindowMaskAffectedPoint;
 class CWindowMaskDelPoint;
 class CWindowMaskFeather;
 class CWindowMaskFeatherSlider;
+class CWindowMaskClrMask;
+class CWindowMaskClrFeather;
 class CWindowMaskBeforePlugins;
 class CWindowDisableOpenGLMasking;
 class CWindowMaskGUI;
index 5423dde..da215d5 100644 (file)
@@ -275,11 +275,11 @@ void BlondTheme::initialize()
                "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_hi.png",
+               "reset_dn.png",
+               "reset_button");
 
        resources->cancel_images = new_button("cancel.png",
                "filebox_bigbutton_up.png",
index f02f1ad..640451f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_mode_chkd.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_mode_chkd.png differ
index 2c24ad8..e80cc7f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_mode_chkdhi.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_mode_chkdhi.png differ
index c5946a0..bbb9217 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_mode_down.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_mode_down.png differ
index f3f3060..c2344ca 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_mode_hi.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_mode_hi.png differ
index 566432c..d268936 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_mode_up.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_mode_up.png differ
index bd714a1..7b72466 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/reset.png and b/cinelerra-5.1/plugins/theme_blond/data/reset.png differ
index 3362081..711f216 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/reset_dn.png and b/cinelerra-5.1/plugins/theme_blond/data/reset_dn.png differ
index 49bfefe..a462dcf 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/reset_hi.png and b/cinelerra-5.1/plugins/theme_blond/data/reset_hi.png differ
index a9ced0f..d70b6bd 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/reset_up.png and b/cinelerra-5.1/plugins/theme_blond/data/reset_up.png differ
index 2ae2716..246aab9 100644 (file)
@@ -328,11 +328,11 @@ void BlondCVTheme::initialize()
                "generic_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_hi.png",
+               "reset_dn.png",
+               "reset_button");
 
        resources->cancel_images = new_button("cancel.png",
                "generic_up.png",
index f02f1ad..640451f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_chkd.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_chkd.png differ
index 2c24ad8..e80cc7f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_chkdhi.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_chkdhi.png differ
index c5946a0..bbb9217 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_down.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_down.png differ
index f3f3060..c2344ca 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_hi.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_hi.png differ
index 566432c..d268936 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_up.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_up.png differ
index bd714a1..7b72466 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/reset.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/reset.png differ
index 3362081..711f216 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/reset_dn.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/reset_dn.png differ
index 49bfefe..a462dcf 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/reset_hi.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/reset_hi.png differ
index a9ced0f..d70b6bd 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/reset_up.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/reset_up.png differ
index 4f2785d..63216e4 100644 (file)
@@ -275,11 +275,11 @@ void BlueDotTheme::initialize()
                "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_hi.png",
+               "reset_dn.png",
+               "reset_button");
 
        resources->cancel_images = new_button("cancel.png",
                "filebox_bigbutton_up.png",
index f02f1ad..640451f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_mode_chkd.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_mode_chkd.png differ
index 2c24ad8..e80cc7f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_mode_chkdhi.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_mode_chkdhi.png differ
index c5946a0..bbb9217 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_mode_down.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_mode_down.png differ
index f3f3060..c2344ca 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_mode_hi.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_mode_hi.png differ
index 566432c..d268936 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_mode_up.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_mode_up.png differ
index bd714a1..7b72466 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/reset.png and b/cinelerra-5.1/plugins/theme_blue/data/reset.png differ
index 3362081..711f216 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/reset_dn.png and b/cinelerra-5.1/plugins/theme_blue/data/reset_dn.png differ
index 49bfefe..a462dcf 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/reset_hi.png and b/cinelerra-5.1/plugins/theme_blue/data/reset_hi.png differ
index a9ced0f..d70b6bd 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/reset_up.png and b/cinelerra-5.1/plugins/theme_blue/data/reset_up.png differ
index b2f3565..7d43a69 100644 (file)
@@ -286,11 +286,11 @@ void BlueDotTheme::initialize()
                "generic_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_hi.png",
+               "reset_dn.png",
+               "reset_button");
 
        resources->cancel_images = new_button("cancel.png",
                "generic_up.png",
index f02f1ad..640451f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_chkd.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_chkd.png differ
index 2c24ad8..e80cc7f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_chkdhi.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_chkdhi.png differ
index c5946a0..bbb9217 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_down.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_down.png differ
index f3f3060..c2344ca 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_hi.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_hi.png differ
index 566432c..d268936 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_up.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_up.png differ
index bd714a1..7b72466 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/reset.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/reset.png differ
index 3362081..711f216 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/reset_dn.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/reset_dn.png differ
index 49bfefe..a462dcf 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/reset_hi.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/reset_hi.png differ
index a9ced0f..d70b6bd 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/reset_up.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/reset_up.png differ
index a33d70e..4a2735e 100644 (file)
@@ -282,11 +282,11 @@ void BrightTheme::initialize()
                "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_hi.png",
+               "reset_dn.png",
+               "reset_button");
 
        resources->cancel_images = new_button("cancel.png",
                "bigbutton_up.png",
index f02f1ad..640451f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_mode_chkd.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_mode_chkd.png differ
index 2c24ad8..e80cc7f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_mode_chkdhi.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_mode_chkdhi.png differ
index c5946a0..bbb9217 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_mode_down.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_mode_down.png differ
index f3f3060..c2344ca 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_mode_hi.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_mode_hi.png differ
index 566432c..d268936 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_mode_up.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_mode_up.png differ
index bd714a1..7b72466 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/reset.png and b/cinelerra-5.1/plugins/theme_bright/data/reset.png differ
index 3362081..711f216 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/reset_dn.png and b/cinelerra-5.1/plugins/theme_bright/data/reset_dn.png differ
index 49bfefe..a462dcf 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/reset_hi.png and b/cinelerra-5.1/plugins/theme_bright/data/reset_hi.png differ
index a9ced0f..d70b6bd 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/reset_up.png and b/cinelerra-5.1/plugins/theme_bright/data/reset_up.png differ
index f02f1ad..640451f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_chkd.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_chkd.png differ
index 2c24ad8..e80cc7f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_chkdhi.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_chkdhi.png differ
index c5946a0..bbb9217 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_down.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_down.png differ
index f3f3060..c2344ca 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_hi.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_hi.png differ
index 566432c..d268936 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_up.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_up.png differ
index bd714a1..7b72466 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/reset.png and b/cinelerra-5.1/plugins/theme_hulk/data/reset.png differ
index 3362081..711f216 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/reset_dn.png and b/cinelerra-5.1/plugins/theme_hulk/data/reset_dn.png differ
index 49bfefe..a462dcf 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/reset_hi.png and b/cinelerra-5.1/plugins/theme_hulk/data/reset_hi.png differ
index a9ced0f..d70b6bd 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/reset_up.png and b/cinelerra-5.1/plugins/theme_hulk/data/reset_up.png differ
index 42bfe88..082b965 100644 (file)
@@ -276,11 +276,11 @@ void HULKTHEME::initialize()
                "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_hi.png",
+               "reset_dn.png",
+               "reset_button");
 
        resources->cancel_images = new_button("cancel.png",
                "filebox_bigbutton_up.png",
index f02f1ad..640451f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_chkd.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_chkd.png differ
index 2c24ad8..e80cc7f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_chkdhi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_chkdhi.png differ
index c5946a0..bbb9217 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_down.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_down.png differ
index f3f3060..c2344ca 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_hi.png differ
index 566432c..d268936 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_up.png differ
index bd714a1..7b72466 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/reset.png and b/cinelerra-5.1/plugins/theme_neophyte/data/reset.png differ
index 3362081..711f216 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/reset_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/reset_dn.png differ
index 49bfefe..a462dcf 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/reset_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/reset_hi.png differ
index a9ced0f..d70b6bd 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/reset_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/reset_up.png differ
index de9d59c..4ac0649 100644 (file)
@@ -354,12 +354,11 @@ 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");
+       new_button("reset.png",
+               "reset_up.png",
+               "reset_hi.png",
+               "reset_dn.png",
+               "reset_button");
        resources->cancel_images = new_button(
                "cancel.png",
                "filebox_bigbutton_up.png",
index f02f1ad..640451f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_chkd.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_chkd.png differ
index 2c24ad8..e80cc7f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_chkdhi.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_chkdhi.png differ
index c5946a0..bbb9217 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_down.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_down.png differ
index f3f3060..c2344ca 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_hi.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_hi.png differ
index 566432c..d268936 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_up.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_up.png differ
index bd714a1..7b72466 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/reset.png and b/cinelerra-5.1/plugins/theme_pinklady/data/reset.png differ
index 3362081..711f216 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/reset_dn.png and b/cinelerra-5.1/plugins/theme_pinklady/data/reset_dn.png differ
index 49bfefe..a462dcf 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/reset_hi.png and b/cinelerra-5.1/plugins/theme_pinklady/data/reset_hi.png differ
index a9ced0f..d70b6bd 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/reset_up.png and b/cinelerra-5.1/plugins/theme_pinklady/data/reset_up.png differ
index 9a8c632..671da39 100644 (file)
@@ -261,11 +261,11 @@ void PINKLADY::initialize()
                "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_hi.png",
+               "reset_dn.png",
+               "reset_button");
 
        resources->cancel_images = new_button("cancel.png",
                "filebox_bigbutton_up.png",
index f02f1ad..640451f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_mode_chkd.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_mode_chkd.png differ
index 2c24ad8..e80cc7f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_mode_chkdhi.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_mode_chkdhi.png differ
index c5946a0..bbb9217 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_mode_down.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_mode_down.png differ
index f3f3060..c2344ca 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_mode_hi.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_mode_hi.png differ
index 566432c..d268936 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_mode_up.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_mode_up.png differ
index bd714a1..7b72466 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/reset.png and b/cinelerra-5.1/plugins/theme_suv/data/reset.png differ
index b3778c7..7eabe28 100644 (file)
@@ -9,15 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   viewBox="0 0 4.2333333 4.2333335"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
    version="1.1"
    id="svg884"
-   inkscape:export-filename="/tmp/reset_hi.png"
-   inkscape:export-xdpi="106.54334"
-   inkscape:export-ydpi="106.54334"
-   sodipodi:docname="r.svg"
+   inkscape:export-filename="/tmp/reset.png"
+   inkscape:export-xdpi="95.699997"
+   inkscape:export-ydpi="95.699997"
+   sodipodi:docname="reset.svg"
    inkscape:version="0.92.4 (unknown)">
   <defs
      id="defs878" />
@@ -29,8 +29,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="32"
-     inkscape:cx="8.2629635"
-     inkscape:cy="8.7057912"
+     inkscape:cx="8.171878"
+     inkscape:cy="10.859367"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
       </cc:Work>
      inkscape:label="Ebene 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-292.76665)">
+     transform="translate(0,-290.64998)">
     <rect
        style="opacity:0.13999999;fill:#ffffff;fill-opacity:0;stroke-width:0.52467513;stroke-miterlimit:4;stroke-dasharray:none"
        id="rect821"
        height="4.2333336"
        x="-6.9388939e-18"
        y="292.76666"
-       ry="0.0081253769" />
-    <path
-       style="opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0.26143712;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 3.2983459,293.35434 a 1.4889471,1.5620282 0 0 0 -1.4889588,1.56204 h 0.4362186 a 1.0528507,1.1045272 0 0 1 1.0527402,-1.10441 1.0528507,1.1045272 0 0 1 1.0527403,1.10441 1.0528507,1.1045272 0 0 1 -1.0527403,1.1044 v 0.45763 a 1.4889471,1.5620282 0 0 0 1.4889589,-1.56203 1.4889471,1.5620282 0 0 0 -1.4889589,-1.56204 z"
-       id="path823"
-       inkscape:connector-curvature="0"
+       ry="0.0081253769"
+       inkscape:export-filename="/tmp/reset.png"
        inkscape:export-xdpi="106.54334"
        inkscape:export-ydpi="106.54334" />
     <path
-       style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.41270712px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 1.1138606,294.65462 h 1.9119255 l -0.9559628,1.45953 z"
-       id="path844"
+       style="fill:none;stroke:#000000;stroke-width:0.31709471px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.15874419,296.81676 0.007988,-6.0075 6.02472591,0.0254 v 6.00609 z"
+       id="path824"
        inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/tmp/reset.png"
        inkscape:export-xdpi="106.54334"
        inkscape:export-ydpi="106.54334" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.24772261px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 0.12408457,296.85988 0.007379,-3.96898 5.56550943,0.0168 v 3.96805 z"
-       id="path824"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+    <g
+       id="g832"
+       transform="translate(0.27285156,-0.01653646)"
+       inkscape:export-filename="/tmp/reset.png"
+       inkscape:export-xdpi="106.54334"
+       inkscape:export-ydpi="106.54334">
+      <path
+         inkscape:export-ydpi="106.54334"
+         inkscape:export-xdpi="106.54334"
+         inkscape:connector-curvature="0"
+         id="path823"
+         d="m 3.1749999,291.70832 a 2.11665,2.1166595 0 0 0 -2.1166665,2.11667 h 0.6201175 a 1.4967063,1.4967131 0 0 1 1.496549,-1.49655 1.4967063,1.4967131 0 0 1 1.4965493,1.49655 1.4967063,1.4967131 0 0 1 -1.4965493,1.49653 v 0.62013 a 2.11665,2.1166595 0 0 0 2.1166668,-2.11666 2.11665,2.1166595 0 0 0 -2.1166668,-2.11667 z"
+         style="opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0.36285505;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:export-ydpi="106.54334"
+         inkscape:export-xdpi="106.54334"
+         inkscape:connector-curvature="0"
+         id="path844"
+         d="M 0.45240226,293.79472 H 2.3643278 l -0.9559628,1.45953 z"
+         style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.41270712px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path831"
+         d="m 2.1745443,296.01606 -0.00827,-0.63665"
+         style="fill:none;stroke:#ffffff;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path833"
+         d="m 1.7694011,295.72668 0.8020182,-0.008"
+         style="fill:none;stroke:#ffffff;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
index 3362081..711f216 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/reset_dn.png and b/cinelerra-5.1/plugins/theme_suv/data/reset_dn.png differ
diff --git a/cinelerra-5.1/plugins/theme_suv/data/reset_dn.svg b/cinelerra-5.1/plugins/theme_suv/data/reset_dn.svg
new file mode 100644 (file)
index 0000000..3dbde73
--- /dev/null
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg884"
+   inkscape:export-filename="/tmp/reset.png"
+   inkscape:export-xdpi="95.699997"
+   inkscape:export-ydpi="95.699997"
+   sodipodi:docname="reset_dn.svg"
+   inkscape:version="0.92.4 (unknown)">
+  <defs
+     id="defs878">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient832">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop828" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop830" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient832"
+       id="radialGradient834"
+       cx="3.1460612"
+       cy="293.81259"
+       fx="3.1460612"
+       fy="293.81259"
+       r="2.4721675"
+       gradientTransform="matrix(1,0,0,1.0033446,0,-0.98267905)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="13.165036"
+     inkscape:cy="10.734367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     units="px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:snap-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       position="0.26458334,2.1166667"
+       orientation="1,0"
+       id="guide1431"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="3.9687501,2.1166667"
+       orientation="1,0"
+       id="guide1433"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,3.9687501"
+       orientation="0,1"
+       id="guide1435"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,0.26458334"
+       orientation="0,1"
+       id="guide1437"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,2.1166667"
+       orientation="1,0"
+       id="guide817"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,2.1166667"
+       orientation="0,1"
+       id="guide819"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="3.4395834,2.1166667"
+       orientation="1,0"
+       id="guide827"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata881">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <rect
+       style="opacity:0.13999999;fill:#ffffff;fill-opacity:0;stroke-width:0.52467513;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect821"
+       width="5.8208332"
+       height="4.2333336"
+       x="-6.9388939e-18"
+       y="292.76666"
+       ry="0.0081253769"
+       inkscape:export-filename="/tmp/reset_dn.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.31709471px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.15874419,296.81676 0.007988,-6.0075 6.02472591,0.0254 v 6.00609 z"
+       id="path824"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/tmp/reset_dn.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96" />
+    <ellipse
+       style="opacity:0.5;fill:url(#radialGradient834);fill-opacity:1;stroke:#000000;stroke-width:0.00820208;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.20416667;paint-order:fill markers stroke"
+       id="path826"
+       cx="3.1460612"
+       cy="293.81259"
+       rx="2.4680665"
+       ry="2.4763348"
+       inkscape:export-filename="/tmp/reset_dn.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96" />
+  </g>
+</svg>
index 49bfefe..a462dcf 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/reset_hi.png and b/cinelerra-5.1/plugins/theme_suv/data/reset_hi.png differ
diff --git a/cinelerra-5.1/plugins/theme_suv/data/reset_hi.svg b/cinelerra-5.1/plugins/theme_suv/data/reset_hi.svg
new file mode 100644 (file)
index 0000000..3c471de
--- /dev/null
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg884"
+   inkscape:export-filename="/tmp/reset.png"
+   inkscape:export-xdpi="95.699997"
+   inkscape:export-ydpi="95.699997"
+   sodipodi:docname="reset_hi.svg"
+   inkscape:version="0.92.4 (unknown)">
+  <defs
+     id="defs878">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient840">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop836" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop838" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient840"
+       id="radialGradient842"
+       cx="3.1791344"
+       cy="293.7919"
+       fx="3.1791344"
+       fy="293.7919"
+       r="2.5465815"
+       gradientTransform="matrix(1,0,0,0.98214263,0,5.2463502)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="9.6186511"
+     inkscape:cy="10.734367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     units="px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:snap-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       position="0.26458334,2.1166667"
+       orientation="1,0"
+       id="guide1431"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="3.9687501,2.1166667"
+       orientation="1,0"
+       id="guide1433"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,3.9687501"
+       orientation="0,1"
+       id="guide1435"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,0.26458334"
+       orientation="0,1"
+       id="guide1437"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,2.1166667"
+       orientation="1,0"
+       id="guide817"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,2.1166667"
+       orientation="0,1"
+       id="guide819"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="3.4395834,2.1166667"
+       orientation="1,0"
+       id="guide827"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata881">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <rect
+       style="opacity:0.13999999;fill:#ffffff;fill-opacity:0;stroke-width:0.52467513;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect821"
+       width="5.8208332"
+       height="4.2333336"
+       x="-6.9388939e-18"
+       y="292.76666"
+       ry="0.0081253769"
+       inkscape:export-filename="/tmp/reset_hi.png"
+       inkscape:export-xdpi="96.000717"
+       inkscape:export-ydpi="96.000717" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.31709471px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.15874419,296.81676 0.007988,-6.0075 6.02472591,0.0254 v 6.00609 z"
+       id="path824"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/tmp/reset_hi.png"
+       inkscape:export-xdpi="96.000717"
+       inkscape:export-ydpi="96.000717" />
+    <ellipse
+       style="opacity:0.5;fill:url(#radialGradient842);fill-opacity:1;stroke:#000000;stroke-width:0.00820208;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.20416667;paint-order:fill markers stroke"
+       id="path834"
+       cx="3.1791344"
+       cy="293.7919"
+       rx="2.5424805"
+       ry="2.4970052"
+       inkscape:export-filename="/tmp/reset_hi.png"
+       inkscape:export-xdpi="96.000717"
+       inkscape:export-ydpi="96.000717" />
+  </g>
+</svg>
index a9ced0f..d70b6bd 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/reset_up.png and b/cinelerra-5.1/plugins/theme_suv/data/reset_up.png differ
diff --git a/cinelerra-5.1/plugins/theme_suv/data/reset_up.svg b/cinelerra-5.1/plugins/theme_suv/data/reset_up.svg
new file mode 100644 (file)
index 0000000..0bf6019
--- /dev/null
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg884"
+   inkscape:export-filename="/tmp/reset_up.png"
+   inkscape:export-xdpi="95.699997"
+   inkscape:export-ydpi="95.699997"
+   sodipodi:docname="reset_up.svg"
+   inkscape:version="0.92.4 (unknown)">
+  <defs
+     id="defs878" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="13.165036"
+     inkscape:cy="10.734367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     units="px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:snap-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       position="0.26458334,2.1166667"
+       orientation="1,0"
+       id="guide1431"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="3.9687501,2.1166667"
+       orientation="1,0"
+       id="guide1433"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,3.9687501"
+       orientation="0,1"
+       id="guide1435"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,0.26458334"
+       orientation="0,1"
+       id="guide1437"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,2.1166667"
+       orientation="1,0"
+       id="guide817"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="2.1166667,2.1166667"
+       orientation="0,1"
+       id="guide819"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="3.4395834,2.1166667"
+       orientation="1,0"
+       id="guide827"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata881">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <rect
+       style="opacity:0.13999999;fill:#ffffff;fill-opacity:0;stroke-width:0.52467513;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect821"
+       width="5.8208332"
+       height="4.2333336"
+       x="-6.9388939e-18"
+       y="292.76666"
+       ry="0.0081253769"
+       inkscape:export-filename="/tmp/reset_hi.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.31709471px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.15874419,296.81676 0.007988,-6.0075 6.02472591,0.0254 v 6.00609 z"
+       id="path824"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/tmp/reset_hi.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96" />
+  </g>
+</svg>
index c1aacc2..3c6de6f 100644 (file)
@@ -274,8 +274,8 @@ void SUV::initialize()
 
        new_button("reset.png",
                "reset_up.png",
-               "reset_dn.png",
                "reset_hi.png",
+               "reset_dn.png",
                "reset_button");
 
        resources->cancel_images = new_button("cancel.png",
index f02f1ad..640451f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_chkd.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_chkd.png differ
index 2c24ad8..e80cc7f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_chkdhi.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_chkdhi.png differ
index c5946a0..bbb9217 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_down.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_down.png differ
index f3f3060..c2344ca 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_hi.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_hi.png differ
index 566432c..d268936 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_up.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_up.png differ
index bd714a1..7b72466 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/reset.png and b/cinelerra-5.1/plugins/theme_unflat/data/reset.png differ
index 3362081..711f216 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/reset_dn.png and b/cinelerra-5.1/plugins/theme_unflat/data/reset_dn.png differ
index 49bfefe..a462dcf 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/reset_hi.png and b/cinelerra-5.1/plugins/theme_unflat/data/reset_hi.png differ
index a9ced0f..d70b6bd 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/reset_up.png and b/cinelerra-5.1/plugins/theme_unflat/data/reset_up.png differ
index be1da53..def4469 100644 (file)
@@ -270,11 +270,11 @@ void UNFLATTHEME::initialize()
                "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_hi.png",
+               "reset_dn.png",
+               "reset_button");
 
        resources->cancel_images = new_button("cancel.png",
                "filebox_bigbutton_up.png",