From: Good Guy Date: Thu, 16 May 2019 20:39:28 +0000 (-0600) Subject: add focus centroid to masking, mod mask reset/mode btns, add sticky to mask fade... X-Git-Tag: 2019-08~51 X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=4742c7a3793e92da3e3e46a32e1a4aa4d4c6b366;p=goodguy%2Fcinelerra.git add focus centroid to masking, mod mask reset/mode btns, add sticky to mask fade, rework mask gui layout --- diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C index af4d818d..fbbcbe76 100644 --- a/cinelerra-5.1/cinelerra/cwindowgui.C +++ b/cinelerra-5.1/cinelerra/cwindowgui.C @@ -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; ix - 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); diff --git a/cinelerra-5.1/cinelerra/cwindowgui.h b/cinelerra-5.1/cinelerra/cwindowgui.h index 33cf9bf6..83b92434 100644 --- a/cinelerra-5.1/cinelerra/cwindowgui.h +++ b/cinelerra-5.1/cinelerra/cwindowgui.h @@ -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(); diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C index 4a76981c..e077be34 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.C +++ b/cinelerra-5.1/cinelerra/cwindowtool.C @@ -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, diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h index 1eb5002e..4691fc07 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.h +++ b/cinelerra-5.1/cinelerra/cwindowtool.h @@ -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; diff --git a/cinelerra-5.1/cinelerra/cwindowtool.inc b/cinelerra-5.1/cinelerra/cwindowtool.inc index 0d284c05..9fd83c54 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.inc +++ b/cinelerra-5.1/cinelerra/cwindowtool.inc @@ -22,22 +22,24 @@ #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; diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C index 5423dde9..da215d57 100644 --- a/cinelerra-5.1/plugins/theme_blond/blondtheme.C +++ b/cinelerra-5.1/plugins/theme_blond/blondtheme.C @@ -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", diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_mode_chkd.png b/cinelerra-5.1/plugins/theme_blond/data/mask_mode_chkd.png index f02f1ad4..640451fa 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_mode_chkdhi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_mode_chkdhi.png index 2c24ad8b..e80cc7fe 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_mode_down.png b/cinelerra-5.1/plugins/theme_blond/data/mask_mode_down.png index c5946a09..bbb92173 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_mode_hi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_mode_hi.png index f3f30607..c2344ca5 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_mode_up.png b/cinelerra-5.1/plugins/theme_blond/data/mask_mode_up.png index 566432c7..d268936a 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond/data/reset.png b/cinelerra-5.1/plugins/theme_blond/data/reset.png index bd714a16..7b724665 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/reset.png and b/cinelerra-5.1/plugins/theme_blond/data/reset.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/reset_dn.png b/cinelerra-5.1/plugins/theme_blond/data/reset_dn.png index 3362081b..711f216f 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond/data/reset_hi.png b/cinelerra-5.1/plugins/theme_blond/data/reset_hi.png index 49bfefe9..a462dcfc 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond/data/reset_up.png b/cinelerra-5.1/plugins/theme_blond/data/reset_up.png index a9ced0f8..d70b6bd3 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C index 2ae27160..246aab94 100644 --- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C +++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C @@ -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", diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_chkd.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_chkd.png index f02f1ad4..640451fa 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_chkdhi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_chkdhi.png index 2c24ad8b..e80cc7fe 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_down.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_down.png index c5946a09..bbb92173 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_hi.png index f3f30607..c2344ca5 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_mode_up.png index 566432c7..d268936a 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/reset.png b/cinelerra-5.1/plugins/theme_blond_cv/data/reset.png index bd714a16..7b724665 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/reset_dn.png b/cinelerra-5.1/plugins/theme_blond_cv/data/reset_dn.png index 3362081b..711f216f 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/reset_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/reset_hi.png index 49bfefe9..a462dcfc 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/reset_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/reset_up.png index a9ced0f8..d70b6bd3 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue/bluetheme.C b/cinelerra-5.1/plugins/theme_blue/bluetheme.C index 4f2785de..63216e41 100644 --- a/cinelerra-5.1/plugins/theme_blue/bluetheme.C +++ b/cinelerra-5.1/plugins/theme_blue/bluetheme.C @@ -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", diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_mode_chkd.png b/cinelerra-5.1/plugins/theme_blue/data/mask_mode_chkd.png index f02f1ad4..640451fa 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_mode_chkdhi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_mode_chkdhi.png index 2c24ad8b..e80cc7fe 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_mode_down.png b/cinelerra-5.1/plugins/theme_blue/data/mask_mode_down.png index c5946a09..bbb92173 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_mode_hi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_mode_hi.png index f3f30607..c2344ca5 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_mode_up.png b/cinelerra-5.1/plugins/theme_blue/data/mask_mode_up.png index 566432c7..d268936a 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue/data/reset.png b/cinelerra-5.1/plugins/theme_blue/data/reset.png index bd714a16..7b724665 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/reset.png and b/cinelerra-5.1/plugins/theme_blue/data/reset.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/reset_dn.png b/cinelerra-5.1/plugins/theme_blue/data/reset_dn.png index 3362081b..711f216f 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue/data/reset_hi.png b/cinelerra-5.1/plugins/theme_blue/data/reset_hi.png index 49bfefe9..a462dcfc 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue/data/reset_up.png b/cinelerra-5.1/plugins/theme_blue/data/reset_up.png index a9ced0f8..d70b6bd3 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C index b2f3565a..7d43a698 100644 --- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C +++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C @@ -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", diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_chkd.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_chkd.png index f02f1ad4..640451fa 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_chkdhi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_chkdhi.png index 2c24ad8b..e80cc7fe 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_down.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_down.png index c5946a09..bbb92173 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_hi.png index f3f30607..c2344ca5 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_mode_up.png index 566432c7..d268936a 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/reset.png b/cinelerra-5.1/plugins/theme_blue_dot/data/reset.png index bd714a16..7b724665 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/reset_dn.png b/cinelerra-5.1/plugins/theme_blue_dot/data/reset_dn.png index 3362081b..711f216f 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/reset_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/reset_hi.png index 49bfefe9..a462dcfc 100644 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 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/reset_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/reset_up.png index a9ced0f8..d70b6bd3 100644 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 diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C index a33d70e6..4a2735ef 100644 --- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C +++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C @@ -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", diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_mode_chkd.png b/cinelerra-5.1/plugins/theme_bright/data/mask_mode_chkd.png index f02f1ad4..640451fa 100644 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 diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_mode_chkdhi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_mode_chkdhi.png index 2c24ad8b..e80cc7fe 100644 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 diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_mode_down.png b/cinelerra-5.1/plugins/theme_bright/data/mask_mode_down.png index c5946a09..bbb92173 100644 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 diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_mode_hi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_mode_hi.png index f3f30607..c2344ca5 100644 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 diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_mode_up.png b/cinelerra-5.1/plugins/theme_bright/data/mask_mode_up.png index 566432c7..d268936a 100644 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 diff --git a/cinelerra-5.1/plugins/theme_bright/data/reset.png b/cinelerra-5.1/plugins/theme_bright/data/reset.png index bd714a16..7b724665 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/reset.png and b/cinelerra-5.1/plugins/theme_bright/data/reset.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/reset_dn.png b/cinelerra-5.1/plugins/theme_bright/data/reset_dn.png index 3362081b..711f216f 100644 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 diff --git a/cinelerra-5.1/plugins/theme_bright/data/reset_hi.png b/cinelerra-5.1/plugins/theme_bright/data/reset_hi.png index 49bfefe9..a462dcfc 100644 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 diff --git a/cinelerra-5.1/plugins/theme_bright/data/reset_up.png b/cinelerra-5.1/plugins/theme_bright/data/reset_up.png index a9ced0f8..d70b6bd3 100644 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 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_chkd.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_chkd.png index f02f1ad4..640451fa 100644 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 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_chkdhi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_chkdhi.png index 2c24ad8b..e80cc7fe 100644 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 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_down.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_down.png index c5946a09..bbb92173 100644 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 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_hi.png index f3f30607..c2344ca5 100644 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 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_up.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_mode_up.png index 566432c7..d268936a 100644 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 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/reset.png b/cinelerra-5.1/plugins/theme_hulk/data/reset.png index bd714a16..7b724665 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/reset.png and b/cinelerra-5.1/plugins/theme_hulk/data/reset.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/reset_dn.png b/cinelerra-5.1/plugins/theme_hulk/data/reset_dn.png index 3362081b..711f216f 100644 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 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/reset_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/reset_hi.png index 49bfefe9..a462dcfc 100644 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 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/reset_up.png b/cinelerra-5.1/plugins/theme_hulk/data/reset_up.png index a9ced0f8..d70b6bd3 100644 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 diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C index 42bfe88e..082b9654 100644 --- a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C +++ b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C @@ -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", diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_chkd.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_chkd.png index f02f1ad4..640451fa 100644 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 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_chkdhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_chkdhi.png index 2c24ad8b..e80cc7fe 100644 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 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_down.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_down.png index c5946a09..bbb92173 100644 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 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_hi.png index f3f30607..c2344ca5 100644 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 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_mode_up.png index 566432c7..d268936a 100644 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 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/reset.png b/cinelerra-5.1/plugins/theme_neophyte/data/reset.png index bd714a16..7b724665 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/reset.png and b/cinelerra-5.1/plugins/theme_neophyte/data/reset.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/reset_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/reset_dn.png index 3362081b..711f216f 100644 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 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/reset_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/reset_hi.png index 49bfefe9..a462dcfc 100644 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 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/reset_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/reset_up.png index a9ced0f8..d70b6bd3 100644 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 diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C index de9d59c0..4ac06493 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C +++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C @@ -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", diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_chkd.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_chkd.png index f02f1ad4..640451fa 100644 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 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_chkdhi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_chkdhi.png index 2c24ad8b..e80cc7fe 100644 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 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_down.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_down.png index c5946a09..bbb92173 100644 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 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_hi.png index f3f30607..c2344ca5 100644 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 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_mode_up.png index 566432c7..d268936a 100644 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 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/reset.png b/cinelerra-5.1/plugins/theme_pinklady/data/reset.png index bd714a16..7b724665 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/reset.png and b/cinelerra-5.1/plugins/theme_pinklady/data/reset.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/reset_dn.png b/cinelerra-5.1/plugins/theme_pinklady/data/reset_dn.png index 3362081b..711f216f 100644 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 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/reset_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/reset_hi.png index 49bfefe9..a462dcfc 100644 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 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/reset_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/reset_up.png index a9ced0f8..d70b6bd3 100644 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 diff --git a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C index 9a8c6322..671da394 100644 --- a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C +++ b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C @@ -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", diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_mode_chkd.png b/cinelerra-5.1/plugins/theme_suv/data/mask_mode_chkd.png index f02f1ad4..640451fa 100644 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 diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_mode_chkdhi.png b/cinelerra-5.1/plugins/theme_suv/data/mask_mode_chkdhi.png index 2c24ad8b..e80cc7fe 100644 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 diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_mode_down.png b/cinelerra-5.1/plugins/theme_suv/data/mask_mode_down.png index c5946a09..bbb92173 100644 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 diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_mode_hi.png b/cinelerra-5.1/plugins/theme_suv/data/mask_mode_hi.png index f3f30607..c2344ca5 100644 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 diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_mode_up.png b/cinelerra-5.1/plugins/theme_suv/data/mask_mode_up.png index 566432c7..d268936a 100644 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 diff --git a/cinelerra-5.1/plugins/theme_suv/data/reset.png b/cinelerra-5.1/plugins/theme_suv/data/reset.png index bd714a16..7b724665 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/reset.png and b/cinelerra-5.1/plugins/theme_suv/data/reset.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/reset.svg b/cinelerra-5.1/plugins/theme_suv/data/reset.svg index b3778c7b..7eabe28e 100644 --- a/cinelerra-5.1/plugins/theme_suv/data/reset.svg +++ b/cinelerra-5.1/plugins/theme_suv/data/reset.svg @@ -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)"> @@ -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" @@ -109,7 +109,7 @@ image/svg+xml - + @@ -134,7 +134,7 @@ inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-292.76665)"> + transform="translate(0,-290.64998)"> - - + + + + + + diff --git a/cinelerra-5.1/plugins/theme_suv/data/reset_dn.png b/cinelerra-5.1/plugins/theme_suv/data/reset_dn.png index 3362081b..711f216f 100644 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 index 00000000..3dbde73c --- /dev/null +++ b/cinelerra-5.1/plugins/theme_suv/data/reset_dn.svg @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/cinelerra-5.1/plugins/theme_suv/data/reset_hi.png b/cinelerra-5.1/plugins/theme_suv/data/reset_hi.png index 49bfefe9..a462dcfc 100644 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 index 00000000..3c471def --- /dev/null +++ b/cinelerra-5.1/plugins/theme_suv/data/reset_hi.svg @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/cinelerra-5.1/plugins/theme_suv/data/reset_up.png b/cinelerra-5.1/plugins/theme_suv/data/reset_up.png index a9ced0f8..d70b6bd3 100644 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 index 00000000..0bf60195 --- /dev/null +++ b/cinelerra-5.1/plugins/theme_suv/data/reset_up.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/cinelerra-5.1/plugins/theme_suv/suv.C b/cinelerra-5.1/plugins/theme_suv/suv.C index c1aacc25..3c6de6f2 100644 --- a/cinelerra-5.1/plugins/theme_suv/suv.C +++ b/cinelerra-5.1/plugins/theme_suv/suv.C @@ -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", diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_chkd.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_chkd.png index f02f1ad4..640451fa 100644 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 diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_chkdhi.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_chkdhi.png index 2c24ad8b..e80cc7fe 100644 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 diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_down.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_down.png index c5946a09..bbb92173 100644 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 diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_hi.png index f3f30607..c2344ca5 100644 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 diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_up.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_mode_up.png index 566432c7..d268936a 100644 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 diff --git a/cinelerra-5.1/plugins/theme_unflat/data/reset.png b/cinelerra-5.1/plugins/theme_unflat/data/reset.png index bd714a16..7b724665 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/reset.png and b/cinelerra-5.1/plugins/theme_unflat/data/reset.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/reset_dn.png b/cinelerra-5.1/plugins/theme_unflat/data/reset_dn.png index 3362081b..711f216f 100644 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 diff --git a/cinelerra-5.1/plugins/theme_unflat/data/reset_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/reset_hi.png index 49bfefe9..a462dcfc 100644 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 diff --git a/cinelerra-5.1/plugins/theme_unflat/data/reset_up.png b/cinelerra-5.1/plugins/theme_unflat/data/reset_up.png index a9ced0f8..d70b6bd3 100644 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 diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C index be1da538..def4469b 100644 --- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C +++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C @@ -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",