From: Good Guy Date: Sun, 14 Jul 2019 01:28:08 +0000 (-0600) Subject: upgrade bld_prep.sh debian libpng, add rectify timeline audio pref, rework maskgui... X-Git-Tag: 2019-08~18 X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=commitdiff_plain;h=8cad02a7b02e4a8543bc5514892b51aed877a193 upgrade bld_prep.sh debian libpng, add rectify timeline audio pref, rework maskgui layout yet again, igors icons, indexfile size in kb, mask_scale toggle imgs --- diff --git a/cinelerra-5.1/blds/bld_prepare.sh b/cinelerra-5.1/blds/bld_prepare.sh index 188d6281..9c6f2dcd 100755 --- a/cinelerra-5.1/blds/bld_prepare.sh +++ b/cinelerra-5.1/blds/bld_prepare.sh @@ -74,7 +74,7 @@ case "$dir" in #debian 32bit: export ac_cv_header_xmmintrin_h=no "debian") apt-get -f -y install apt-file sox nasm yasm g++ build-essential zlib1g-dev \ - texinfo libpng12-dev freeglut3-dev libxv-dev libasound2-dev libbz2-dev \ + texinfo libpng-dev freeglut3-dev libxv-dev libasound2-dev libbz2-dev \ libncurses5-dev libxinerama-dev libfreetype6-dev libxft-dev libgif-dev \ libtiff5-dev exuberant-ctags ttf-bitstream-vera xfonts-75dpi xfonts-100dpi \ fonts-dejavu libopenexr-dev festival libfftw3-dev gdb libusb-1.0-0-dev \ diff --git a/cinelerra-5.1/cinelerra/appearanceprefs.C b/cinelerra-5.1/cinelerra/appearanceprefs.C index 143e8407..79c2c03b 100644 --- a/cinelerra-5.1/cinelerra/appearanceprefs.C +++ b/cinelerra-5.1/cinelerra/appearanceprefs.C @@ -219,6 +219,9 @@ void AppearancePrefs::create_objects() CtrlToggle *ctrl_toggle = new CtrlToggle(x1, y1, pwindow); add_subwindow(ctrl_toggle); y1 += ctrl_toggle->get_h() + 5; + RectifyAudioToggle *rect_toggle = new RectifyAudioToggle(x1, y1, pwindow); + add_subwindow(rect_toggle); + y1 += rect_toggle->get_h() + 5; if( y < y1 ) y = y1; } @@ -777,3 +780,16 @@ int CtrlToggle::handle_event() return 1; } +RectifyAudioToggle::RectifyAudioToggle(int x, int y, PreferencesWindow *pwindow) + : BC_CheckBox(x, y, + pwindow->thread->preferences->rectify_audio, _("Timeline Rectify Audio")) +{ + this->pwindow = pwindow; +} + +int RectifyAudioToggle::handle_event() +{ + pwindow->thread->preferences->rectify_audio = get_value(); + return 1; +} + diff --git a/cinelerra-5.1/cinelerra/appearanceprefs.h b/cinelerra-5.1/cinelerra/appearanceprefs.h index 483e7f10..c83a04da 100644 --- a/cinelerra-5.1/cinelerra/appearanceprefs.h +++ b/cinelerra-5.1/cinelerra/appearanceprefs.h @@ -366,4 +366,12 @@ public: PreferencesWindow *pwindow; }; +class RectifyAudioToggle : public BC_CheckBox +{ +public: + RectifyAudioToggle(int x, int y, PreferencesWindow *pwindow); + int handle_event(); + PreferencesWindow *pwindow; +}; + #endif diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C index 1b874d35..cb84022f 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.C +++ b/cinelerra-5.1/cinelerra/cwindowtool.C @@ -2491,7 +2491,7 @@ int CWindowMaskGangFeather::handle_event() CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread) : CWindowToolGUI(mwindow, thread, - _(PROGRAM_NAME ": Mask"), 460, 700) + _(PROGRAM_NAME ": Mask"), 440, 700) { this->mwindow = mwindow; this->thread = thread; @@ -2552,15 +2552,6 @@ void CWindowMaskGUI::create_objects() add_subwindow(mask_clr = new CWindowMaskClrMask(mwindow, this, clr_x, y)); add_subwindow(mask_del = new CWindowMaskDelMask(mwindow, this, del_x, y)); y += mask_name->get_h() + 2*margin; - add_subwindow(title = new BC_Title(x, y, _("Presets:"))); - add_subwindow(mask_shape = new CWindowMaskShape(mwindow, this)); - mask_shape->create_objects(); - add_subwindow(mask_load = new CWindowMaskLoad(mwindow, this, x2=x1, y, 80)); - x2 += mask_load->get_w() + 2*margin; - add_subwindow(mask_save = new CWindowMaskSave(mwindow, this, x2, y, 80)); - x2 += mask_save->get_w() + 2*margin; - add_subwindow(mask_delete = new CWindowMaskDelete(mwindow, this, x2, y, 80)); - y += mask_load->get_h() + 2*margin; BC_Bar *bar; // add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x)); // y += bar->get_h() + 2*margin; @@ -2585,8 +2576,6 @@ void CWindowMaskGUI::create_objects() mask_blabels[i] = new BC_Title(x2+tx, y, text); add_subwindow(mask_blabels[i]); } - x2 += margin; - add_subwindow(mask_center = new CWindowMaskCenter(mwindow, this, x2, y, 80)); y += mask_blabels[0]->get_h() + margin; add_subwindow(mask_unclr = new CWindowMaskUnclear(mwindow, this, x, y, x1-x-2*margin)); x2 = x1; @@ -2594,11 +2583,46 @@ void CWindowMaskGUI::create_objects() mask_enables[i] = new CWindowMaskEnable(mwindow, this, x2, y, i, 1); add_subwindow(mask_enables[i]); } - x2 += margin; - add_subwindow(mask_normal = new CWindowMaskNormal(mwindow, this, x2, y, 80)); y += mask_enables[0]->get_h() + 2*margin; - add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Fade & Feather"))); + add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Presets shapes"))); y += title_bar->get_h() + margin; + int x3 = get_w()/5+1, x4 = (5*get_w())/8 + 1; + add_subwindow(mask_shape_sqr = new CWindowMaskShape(mwindow, this, + "mask_prst_sqr_images", MASK_SHAPE_SQUARE, x2=x3, y, _("Square"))); + x2 += mask_shape_sqr->get_w() + 2*margin; + add_subwindow(mask_shape_crc = new CWindowMaskShape(mwindow, this, + "mask_prst_crc_images", MASK_SHAPE_CIRCLE, x2, y, _("Circle"))); + x2 += mask_shape_crc->get_w() + 2*margin; + add_subwindow(mask_shape_tri = new CWindowMaskShape(mwindow, this, + "mask_prst_tri_images", MASK_SHAPE_TRIANGLE, x2, y, _("Triangle"))); + x2 += mask_shape_tri->get_w() + 2*margin; + add_subwindow(mask_shape_ovl = new CWindowMaskShape(mwindow, this, + "mask_prst_ovl_images", MASK_SHAPE_OVAL, x2, y, _("Oval"))); + x2 += mask_shape_ovl->get_w() + 2*margin; + add_subwindow(mask_load_list = new CWindowMaskLoadList(mwindow, this)); + add_subwindow(mask_load = new CWindowMaskLoad(mwindow, this, x2=x4, y, 80)); + x2 += mask_load->get_w() + 2*margin; + add_subwindow(mask_save = new CWindowMaskSave(mwindow, this, x2, y, 80)); + x2 += mask_save->get_w() + 2*margin; + add_subwindow(mask_delete = new CWindowMaskDelete(mwindow, this, x2, y, 80)); + y += mask_load->get_h() + 2*margin; + add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Position & Scale"))); + y += title_bar->get_h() + 2*margin; + add_subwindow(mask_center = new CWindowMaskCenter(mwindow, this, x2=x3, y, 80)); + x2 += mask_center->get_w() + 2*margin; + add_subwindow(mask_normal = new CWindowMaskNormal(mwindow, this, x2, y, 80)); + + add_subwindow(mask_scale_x = new CWindowMaskScaleXY(mwindow, this, + x2=x4, y, theme->get_image_set("mask_scale_x"), 0, 0, _("scale x"))); + x2 += mask_scale_x->get_w() + 2*margin; + add_subwindow(mask_scale_y = new CWindowMaskScaleXY(mwindow, this, + x2, y, theme->get_image_set("mask_scale_y"), 0, 1, _("scale y"))); + x2 += mask_scale_y->get_w() + 2*margin; + add_subwindow(mask_scale_xy = new CWindowMaskScaleXY(mwindow, this, + x2, y, theme->get_image_set("mask_scale_xy"), 1, 2, _("scale xy"))); + y += mask_center->get_h() + 2*margin; + add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Fade & Feather"))); + y += title_bar->get_h() + 2*margin; add_subwindow(title = new BC_Title(x, y, _("Fade:"))); fade = new CWindowMaskFade(mwindow, this, x1, y); @@ -2623,11 +2647,11 @@ void CWindowMaskGUI::create_objects() add_subwindow(title = new BC_Title(x, y, _("Point:"))); active_point = new CWindowMaskAffectedPoint(mwindow, this, x1, y); active_point->create_objects(); - int x3 = x1 + active_point->get_w() + 4*margin; + x3 = x1 + active_point->get_w() + 4*margin; // typ=0, this mask, this point add_subwindow(mask_pnt_linear = new CWindowMaskSmoothButton(mwindow, this, _("linear point"), 0, 0, x3, y, "mask_pnt_linear_images")); - int x4 = x3 + mask_pnt_linear->get_w() + 2*margin; + x4 = x3 + mask_pnt_linear->get_w() + 2*margin; add_subwindow(mask_pnt_smooth = new CWindowMaskSmoothButton(mwindow, this, _("smooth point"), 0, 1, x4, y, "mask_pnt_smooth_images")); add_subwindow(del_point = new CWindowMaskDelPoint(mwindow, this, del_x, y)); @@ -2659,8 +2683,6 @@ void CWindowMaskGUI::create_objects() float cx = mwindow->edl->session->output_w / 2.f; focus_x = new CWindowCoord(this, x1, y, cx); focus_x->create_objects(); - x2 = x1 + focus_x->get_w() + 3*margin; - add_subwindow(title = new BC_Title(x2, y, _("Scaling Mode:"))); x2 = clr_x - 2*margin - CWindowMaskFocus::calculate_w(this); add_subwindow(focus = new CWindowMaskFocus(mwindow, this, x2, y)); add_subwindow(gang_focus = new CWindowMaskGangFocus(mwindow, this, clr_x, y)); @@ -2669,16 +2691,7 @@ void CWindowMaskGUI::create_objects() float cy = mwindow->edl->session->output_h / 2.f; focus_y = new CWindowCoord(this, x1, y, cy); focus_y->create_objects(); - x2 = x1 + focus_y->get_w() + 3*margin; - add_subwindow(mask_scale_x = new CWindowMaskScaleXY(mwindow, this, - x2, y, theme->get_image_set("mask_scale_x"), 0, 0, _("scale x"))); - x2 += mask_scale_x->get_w() + margin; - add_subwindow(mask_scale_y = new CWindowMaskScaleXY(mwindow, this, - x2, y, theme->get_image_set("mask_scale_y"), 0, 1, _("scale y"))); - x2 += mask_scale_y->get_w() + margin; - add_subwindow(mask_scale_xy = new CWindowMaskScaleXY(mwindow, this, - x2, y, theme->get_image_set("mask_scale_xy"), 1, 2, _("scale xy"))); - y += focus_x->get_h() + 2*margin; + y += focus_y->get_h() + 2*margin; add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x)); y += bar->get_h() + margin; add_subwindow(this->apply_before_plugins = new CWindowMaskBeforePlugins(this, 10, y)); @@ -3084,9 +3097,73 @@ int CWindowMaskGUI::normal_mask() } +CWindowMaskLoadList::CWindowMaskLoadList(MWindow *mwindow, CWindowMaskGUI *gui) + : BC_ListBox(-1, -1, 1, 1, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1) +{ + this->mwindow = mwindow; + this->gui = gui; + set_use_button(0); +} + +CWindowMaskLoadList::~CWindowMaskLoadList() +{ +} + + +int CWindowMaskLoadList::handle_event() +{ + MaskAutos *autos; + MaskAuto *keyframe; + Track *track; + MaskPoint *point; + SubMask *mask; +#ifdef USE_KEYFRAME_SPANNING + int create_it = 0; +#else + int create_it = 1; +#endif + + mwindow->undo->update_undo_before(_("mask shape"), this); + +// Get existing keyframe + gui->get_keyframe(track, autos, keyframe, + mask, point, create_it); + CWindowMaskItem *item = (CWindowMaskItem *) get_selection(0, 0); + if( track && item ) { +#ifdef USE_KEYFRAME_SPANNING + MaskAuto temp_keyframe(mwindow->edl, autos); + temp_keyframe.copy_data(keyframe); + keyframe = &temp_keyframe; + mask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask); +#endif + ArrayList masks; + gui->load_masks(masks); + mask->copy_from(*masks[item->id], 0); + masks.remove_all_objects(); +#ifdef USE_KEYFRAME_SPANNING + autos->update_parameter(keyframe); +#endif + gui->update(); + gui->update_preview(1); + } + mwindow->undo->update_undo_after(_("mask shape"), LOAD_AUTOMATION); + return 1; +} + +void CWindowMaskLoadList::create_objects() +{ + shape_items.remove_all_objects(); + ArrayList masks; + gui->load_masks(masks); + for( int i=0; iname, i)); + masks.remove_all_objects(); + update(&shape_items, 0, 0, 1); +} + CWindowMaskLoad::CWindowMaskLoad(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y, int w) - : BC_GenericButton(x, y, w, _("Load")) + : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_load_images")) { this->mwindow = mwindow; this->gui = gui; @@ -3095,16 +3172,16 @@ CWindowMaskLoad::CWindowMaskLoad(MWindow *mwindow, int CWindowMaskLoad::handle_event() { - gui->mask_shape->create_objects(); + gui->mask_load_list->create_objects(); int px, py; get_abs_cursor(px, py); - return gui->mask_shape->activate(px, py, 120,160); + return gui->mask_load_list->activate(px, py, 120,160); } CWindowMaskSave::CWindowMaskSave(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y, int w) - : BC_GenericButton(x, y, w, _("Save")) + : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_save_images")) { this->mwindow = mwindow; this->gui = gui; @@ -3240,7 +3317,7 @@ void CWindowMaskPresetText::update_items() CWindowMaskDelete::CWindowMaskDelete(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y, int w) - : BC_GenericButton(x, y, w, _("Del")) + : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_trsh_images")) { this->mwindow = mwindow; this->gui = gui; @@ -3260,7 +3337,7 @@ int CWindowMaskDelete::handle_event() CWindowMaskCenter::CWindowMaskCenter(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y, int w) - : BC_GenericButton(x, y, w, _("Center")) + : BC_Button(x, y, mwindow->theme->get_image_set("mask_pstn_cen_images")) { this->mwindow = mwindow; this->gui = gui; @@ -3275,7 +3352,7 @@ int CWindowMaskCenter::handle_event() CWindowMaskNormal::CWindowMaskNormal(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y, int w) - : BC_GenericButton(x, y, w, _("Normal")) + : BC_Button(x, y, mwindow->theme->get_image_set("mask_pstn_nrm_images")) { this->mwindow = mwindow; this->gui = gui; @@ -3288,12 +3365,14 @@ int CWindowMaskNormal::handle_event() } -CWindowMaskShape::CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui) - : BC_ListBox(-1, -1, 1, 1, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1) +CWindowMaskShape::CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui, + const char *images, int shape, int x, int y, const char *tip) + : BC_Button(x, y, mwindow->theme->get_image_set(images)) { this->mwindow = mwindow; this->gui = gui; - set_use_button(0); + this->shape = shape; + set_tooltip(tip); } CWindowMaskShape::~CWindowMaskShape() @@ -3369,14 +3448,6 @@ void CWindowMaskShape::builtin_shape(int i, SubMask *sub_mask) } } -void CWindowMaskShape::load_shape(int i, SubMask *sub_mask) -{ - ArrayList masks; - gui->load_masks(masks); - sub_mask->copy_from(*masks[i], 0); - masks.remove_all_objects(); -} - int CWindowMaskShape::handle_event() { MaskAutos *autos; @@ -3395,20 +3466,15 @@ int CWindowMaskShape::handle_event() // Get existing keyframe gui->get_keyframe(track, autos, keyframe, mask, point, create_it); - CWindowMaskItem *item = (CWindowMaskItem *) get_selection(0, 0); - if( track && item ) { + if( track ) { #ifdef USE_KEYFRAME_SPANNING MaskAuto temp_keyframe(mwindow->edl, autos); temp_keyframe.copy_data(keyframe); keyframe = &temp_keyframe; mask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask); #endif - int k = item->id; if( mask ) { - if( k < MASK_SHAPE_BUILTIN ) - builtin_shape(k, mask); - else - load_shape(k-MASK_SHAPE_BUILTIN, mask); + builtin_shape(shape, mask); #ifdef USE_KEYFRAME_SPANNING autos->update_parameter(keyframe); #endif @@ -3420,22 +3486,6 @@ int CWindowMaskShape::handle_event() return 1; } -void CWindowMaskShape::create_objects() -{ - shape_items.remove_all_objects(); - shape_items.append(new CWindowMaskItem(_("square"), MASK_SHAPE_SQUARE)); - shape_items.append(new CWindowMaskItem(_("circle"), MASK_SHAPE_CIRCLE)); - shape_items.append(new CWindowMaskItem(_("triangle"), MASK_SHAPE_TRIANGLE)); - shape_items.append(new CWindowMaskItem(_("oval"), MASK_SHAPE_OVAL)); - ArrayList masks; - gui->load_masks(masks); - int id = MASK_SHAPE_BUILTIN; - for( int i=0; iname, id++)); - masks.remove_all_objects(); - update(&shape_items, 0, 0, 1); -} - void CWindowMaskGUI::load_masks(ArrayList &masks) { char path[BCTEXTLEN]; diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h index 6a9c0f77..49e8e271 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.h +++ b/cinelerra-5.1/cinelerra/cwindowtool.h @@ -31,6 +31,12 @@ #include "maskautos.inc" #include "mwindow.inc" +enum { + MASK_SHAPE_SQUARE, + MASK_SHAPE_CIRCLE, + MASK_SHAPE_TRIANGLE, + MASK_SHAPE_OVAL, +}; // This common thread supports all the tool GUI's. class CWindowTool : public Thread @@ -463,7 +469,20 @@ public: CWindowMaskGUI *gui; }; -class CWindowMaskLoad : public BC_GenericButton +class CWindowMaskLoadList : public BC_ListBox +{ +public: + CWindowMaskLoadList(MWindow *mwindow, CWindowMaskGUI *gui); + ~CWindowMaskLoadList(); + void create_objects(); + int handle_event(); + + MWindow *mwindow; + CWindowMaskGUI *gui; + CWindowMaskItems shape_items; +}; + +class CWindowMaskLoad : public BC_Button { public: CWindowMaskLoad(MWindow *mwindow, CWindowMaskGUI *gui, @@ -474,7 +493,7 @@ public: CWindowMaskGUI *gui; }; -class CWindowMaskSave : public BC_GenericButton +class CWindowMaskSave : public BC_Button { public: CWindowMaskSave(MWindow *mwindow, CWindowMaskGUI *gui, @@ -527,7 +546,7 @@ public: CWindowMaskItems mask_items; }; -class CWindowMaskDelete : public BC_GenericButton +class CWindowMaskDelete : public BC_Button { public: CWindowMaskDelete(MWindow *mwindow, CWindowMaskGUI *gui, @@ -538,7 +557,7 @@ public: CWindowMaskGUI *gui; }; -class CWindowMaskCenter : public BC_GenericButton +class CWindowMaskCenter : public BC_Button { public: CWindowMaskCenter(MWindow *mwindow, CWindowMaskGUI *gui, @@ -549,7 +568,7 @@ public: CWindowMaskGUI *gui; }; -class CWindowMaskNormal : public BC_GenericButton +class CWindowMaskNormal : public BC_Button { public: CWindowMaskNormal(MWindow *mwindow, CWindowMaskGUI *gui, @@ -560,21 +579,18 @@ public: CWindowMaskGUI *gui; }; -class CWindowMaskShape : public BC_ListBox +class CWindowMaskShape : public BC_Button { public: - enum { MASK_SHAPE_SQUARE, MASK_SHAPE_CIRCLE, - MASK_SHAPE_TRIANGLE, MASK_SHAPE_OVAL, - MASK_SHAPE_BUILTIN }; - CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui); + CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui, + const char *images, int shape, int x, int y, const char *tip); ~CWindowMaskShape(); - void create_objects(); void builtin_shape(int i, SubMask *sub_mask); - void load_shape(int i, SubMask *sub_mask); int handle_event(); MWindow *mwindow; CWindowMaskGUI *gui; + int shape; CWindowMaskItems shape_items; }; @@ -620,9 +636,13 @@ public: CWindowMaskDelMask *mask_del; CWindowMaskUnclear *mask_unclr; CWindowMaskClrMask *mask_clr; - CWindowMaskShape *mask_shape; - CWindowMaskSave *mask_save; + CWindowMaskShape *mask_shape_sqr; + CWindowMaskShape *mask_shape_crc; + CWindowMaskShape *mask_shape_tri; + CWindowMaskShape *mask_shape_ovl; + CWindowMaskLoadList *mask_load_list; CWindowMaskLoad *mask_load; + CWindowMaskSave *mask_save; CWindowMaskDelete *mask_delete; CWindowMaskPresetDialog *preset_dialog; CWindowMaskCenter *mask_center; diff --git a/cinelerra-5.1/cinelerra/cwindowtool.inc b/cinelerra-5.1/cinelerra/cwindowtool.inc index bb2f6004..0400264a 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.inc +++ b/cinelerra-5.1/cinelerra/cwindowtool.inc @@ -55,6 +55,7 @@ class CWindowMaskFeather; class CWindowMaskFeatherSlider; class CWindowMaskGangFeather; class CWindowMaskBeforePlugins; +class CWindowMaskLoadList; class CWindowMaskLoad; class CWindowMaskSave; class CWindowMaskPresetDialog; diff --git a/cinelerra-5.1/cinelerra/indexfile.C b/cinelerra-5.1/cinelerra/indexfile.C index c063b44c..7bbd2955 100644 --- a/cinelerra-5.1/cinelerra/indexfile.C +++ b/cinelerra-5.1/cinelerra/indexfile.C @@ -689,7 +689,10 @@ SET_TRACE // Start and length of fragment to read from file in bytes. float *buffer = 0; int buffer_shared = 0; - int center_pixel = mwindow->edl->local_session->zoom_track / 2; + int rect_audio = mwindow->preferences->rectify_audio;; + int center_pixel = !rect_audio ? + mwindow->edl->local_session->zoom_track / 2 : + mwindow->edl->local_session->zoom_track; if( edit->track->show_titles() ) center_pixel += mwindow->theme->get_image("title_bg_data")->get_h(); @@ -726,8 +729,10 @@ SET_TRACE int prev_y1 = center_pixel; int prev_y2 = center_pixel; int first_frame = 1; - int zoom_y = mwindow->edl->local_session->zoom_y, zoom_y2 = zoom_y / 2; - int max_y = center_pixel + zoom_y2 - 1; + int zoom_y = !rect_audio ? + mwindow->edl->local_session->zoom_y / 2 : + mwindow->edl->local_session->zoom_y; + int max_y = center_pixel + zoom_y - 1; edit_position = (x + pixmap->pixmap_x - virtual_edit_x) * project_zoom; int64_t speed_position = edit->startsource; speed_position += !speed_autos ? edit_position : @@ -739,8 +744,8 @@ SET_TRACE SET_TRACE for( int64_t x1=0; x1pixmap_x - virtual_edit_x) * project_zoom; int64_t speed_position = edit->startsource; @@ -751,12 +756,14 @@ SET_TRACE int64_t k = 2 * index_position - start_index; CLAMP(k, 0, length_index); while( i < k ) { - highsample = MAX(highsample, buffer[i]); ++i; - lowsample = MIN(lowsample, buffer[i]); ++i; + float high = !rect_audio ? buffer[i] : fabsf(buffer[i]); + highsample = MAX(highsample, high); ++i; + float low = !rect_audio ? buffer[i] : fabsf(buffer[i]); + lowsample = MIN(lowsample, low); ++i; } - int y1 = (int)(center_pixel - highsample * zoom_y2); - int y2 = (int)(center_pixel - lowsample * zoom_y2); + int y1 = (int)(center_pixel - highsample * zoom_y); + int y2 = (int)(center_pixel - lowsample * zoom_y); CLAMP(y1, 0, max_y); int next_y1 = y1; CLAMP(y2, 0, max_y); int next_y2 = y2; //printf("draw_line (%f,%f) = %d,%d, %d,%d\n", lowsample, highsample, x2, y1, x2, y2); diff --git a/cinelerra-5.1/cinelerra/interfaceprefs.C b/cinelerra-5.1/cinelerra/interfaceprefs.C index b75c0bfc..c7dcc8a0 100644 --- a/cinelerra-5.1/cinelerra/interfaceprefs.C +++ b/cinelerra-5.1/cinelerra/interfaceprefs.C @@ -215,9 +215,9 @@ void InterfacePrefs::create_objects() _("Index Path"), _("Select the directory for index files"), 1)); y += 30; - add_subwindow(new BC_Title(x, y + 5, _("Size of index file:"), + add_subwindow(new BC_Title(x, y + 5, _("Size of index file in KB:"), MEDIUMFONT, resources->text_default)); - sprintf(string, "%jd", pwindow->thread->preferences->index_size); + sprintf(string, "%jd", pwindow->thread->preferences->index_size/1024); add_subwindow(isize = new IndexSize(x + 230, y, pwindow, string)); add_subwindow(new ScanCommercials(pwindow, 400,y)); @@ -274,8 +274,8 @@ int IndexSize::handle_event() { long result; - result = atol(get_text()); - if(result < 64000) result = 64000; + result = atol(get_text()) * 1024; + if( result < 65536 ) result = 65536; //if(result < 500000) result = 500000; pwindow->thread->preferences->index_size = result; return 0; diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C index 8ead6cdc..a3ebc48f 100644 --- a/cinelerra-5.1/cinelerra/preferences.C +++ b/cinelerra-5.1/cinelerra/preferences.C @@ -100,6 +100,7 @@ Preferences::Preferences() yuv_color_range = BC_COLORS_JPEG; autocolor_assets = 0; ctrl_toggle = 0; + rectify_audio = 0; // Default brender asset brender_asset = new Asset; @@ -220,6 +221,7 @@ void Preferences::copy_from(Preferences *that) yuv_color_range = that->yuv_color_range; autocolor_assets = that->autocolor_assets; ctrl_toggle = that->ctrl_toggle; + rectify_audio = that->rectify_audio; renderfarm_nodes.remove_all_objects(); renderfarm_ports.remove_all(); renderfarm_enabled.remove_all(); @@ -363,6 +365,7 @@ int Preferences::load_defaults(BC_Hash *defaults) yuv_color_range = defaults->get("YUV_COLOR_RANGE", yuv_color_range); autocolor_assets = defaults->get("AUTOCOLOR_ASSETS", autocolor_assets); ctrl_toggle = defaults->get("CTRL_TOGGLE", ctrl_toggle); + rectify_audio = defaults->get("RECTIFY_AUDIO", rectify_audio); use_brender = defaults->get("USE_BRENDER", use_brender); brender_fragment = defaults->get("BRENDER_FRAGMENT", brender_fragment); cache_size = defaults->get("CACHE_SIZE", cache_size); @@ -505,6 +508,7 @@ int Preferences::save_defaults(BC_Hash *defaults) defaults->update("YUV_COLOR_RANGE", yuv_color_range); defaults->update("AUTOCOLOR_ASSETS", autocolor_assets); defaults->update("CTRL_TOGGLE", ctrl_toggle); + defaults->update("RECTIFY_AUDIO", rectify_audio); brender_asset->save_defaults(defaults, "BRENDER_", 1, 1, 1, 0, 0); defaults->update("USE_BRENDER", use_brender); defaults->update("BRENDER_FRAGMENT", brender_fragment); diff --git a/cinelerra-5.1/cinelerra/preferences.h b/cinelerra-5.1/cinelerra/preferences.h index 6a8f174a..edb28712 100644 --- a/cinelerra-5.1/cinelerra/preferences.h +++ b/cinelerra-5.1/cinelerra/preferences.h @@ -137,6 +137,8 @@ public: int autocolor_assets; // ctrl_toggle && !ctrl_down() clears selection before toggle int ctrl_toggle; +// rectify timeline audio waveform + int rectify_audio; // Default positions for channels int channel_positions[MAXCHANNELS][MAXCHANNELS]; diff --git a/cinelerra-5.1/cinelerra/resourcepixmap.C b/cinelerra-5.1/cinelerra/resourcepixmap.C index 86fb5023..66073a08 100644 --- a/cinelerra-5.1/cinelerra/resourcepixmap.C +++ b/cinelerra-5.1/cinelerra/resourcepixmap.C @@ -385,10 +385,15 @@ void ResourcePixmap::draw_audio_source(TrackCanvas *canvas, Edit *edit, int x, i { w++; Indexable *indexable = edit->get_source(); - int center_pixel = mwindow->edl->local_session->zoom_track / 2; + int rect_audio = mwindow->preferences->rectify_audio; + int center_pixel = !rect_audio ? + mwindow->edl->local_session->zoom_track / 2 : + mwindow->edl->local_session->zoom_track ; if( edit->track->show_titles() ) center_pixel += mwindow->theme->get_image("title_bg_data")->get_h(); - int64_t scale_y = mwindow->edl->local_session->zoom_y; + int64_t scale_y = !rect_audio ? + mwindow->edl->local_session->zoom_y : + mwindow->edl->local_session->zoom_y * 2; int y_max = center_pixel + scale_y / 2 - 1; double project_zoom = mwindow->edl->local_session->zoom_sample; @@ -469,7 +474,8 @@ void ResourcePixmap::draw_audio_source(TrackCanvas *canvas, Edit *edit, int x, i if( !result ) { double *samples = buffer->get_data(); - int y1 = center_pixel - samples[0] * scale_y / 2; + double sample = !rect_audio ? samples[0] : fabs(samples[0]); + int y1 = center_pixel - sample * scale_y / 2; int y2 = CLIP(y1, 0, y_max); for( int x0=0; x0draw_line(x0, y0, x2, y2, this); @@ -517,10 +524,12 @@ void ResourcePixmap::draw_audio_source(TrackCanvas *canvas, Edit *edit, int x, i WaveCacheItem *item = mwindow->wave_cache->get_wave(indexable->id, edit->channel, prev_position, next_position); if( item ) { + double item_low = !rect_audio ? item->low : fabs(item->low); //printf("ResourcePixmap::draw_audio_source %d\n", __LINE__); - int y_lo = (int)(center_pixel - item->low * scale_y / 2); + int y_lo = (int)(center_pixel - item_low * scale_y / 2); int y1 = CLIP(y_lo, 0, y_max); - int y_hi = (int)(center_pixel - item->high * scale_y / 2); + double item_high = !rect_audio ? item->high : fabs(item->high); + int y_hi = (int)(center_pixel - item_high * scale_y / 2); int y2 = CLIP(y_hi, 0, y_max); if( !first_pixel ) { y_lo = MIN(y1,prev_y2); @@ -551,15 +560,19 @@ void ResourcePixmap::draw_audio_source(TrackCanvas *canvas, Edit *edit, int x, i void ResourcePixmap::draw_wave(TrackCanvas *canvas, int x, double high, double low) { - int top_pixel = 0; - if( mwindow->edl->session->show_titles ) - top_pixel += mwindow->theme->get_image("title_bg_data")->get_h(); - int center_pixel = mwindow->edl->local_session->zoom_track / 2 + top_pixel; + int rect_audio = mwindow->preferences->rectify_audio; + if( rect_audio ) { low = fabs(low); high = fabs(high); } + int top_pixel = mwindow->edl->session->show_titles ? 0 : + mwindow->theme->get_image("title_bg_data")->get_h(); + int center_pixel = !rect_audio ? + mwindow->edl->local_session->zoom_track / 2 + top_pixel : + mwindow->edl->local_session->zoom_track + top_pixel ; + int scale_y = !rect_audio ? + mwindow->edl->local_session->zoom_y / 2 : + mwindow->edl->local_session->zoom_y ; int bottom_pixel = top_pixel + mwindow->edl->local_session->zoom_track; - int y1 = (int)(center_pixel - - low * mwindow->edl->local_session->zoom_y / 2); - int y2 = (int)(center_pixel - - high * mwindow->edl->local_session->zoom_y / 2); + int y1 = (int)(center_pixel - low * scale_y); + int y2 = (int)(center_pixel - high * scale_y); CLAMP(y1, top_pixel, bottom_pixel); CLAMP(y2, top_pixel, bottom_pixel); canvas->set_color(mwindow->theme->audio_color); diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C index 1c36dbd5..16080ee4 100644 --- a/cinelerra-5.1/plugins/theme_blond/blondtheme.C +++ b/cinelerra-5.1/plugins/theme_blond/blondtheme.C @@ -326,27 +326,58 @@ void BlondTheme::initialize() "mask_button_dn.png", "mask_all_smooth_images"); + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); + "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png", + "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png", + "d.png", "e.png", "f.png", "space.png", "dash.png"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); @@ -871,14 +902,14 @@ void BlondTheme::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png", - "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png", + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", "mask_scale_x"); - new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png", - "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png", + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", "mask_scale_y"); - new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png", - "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png", + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", "mask_scale_xy"); flush_images(); diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_blond/data/mask_all_linear.png index f6481eba..001d0e96 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_blond/data/mask_all_smooth.png index 369ddaaf..49fa6d1f 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_blond/data/mask_button_dn.png index 3ce3ed80..9d9eefe6 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_button_hi.png index 1ad1a999..d0863324 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_blond/data/mask_button_up.png index d633ed4e..bf161e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_blond/data/mask_crv_linear.png index 98f9a833..776f9779 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_blond/data/mask_crv_smooth.png index 1feb15c9..2670fdbf 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_linear.png index 8dd77d34..1301f2f7 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_smooth.png index fee20de6..7a8c72ec 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_prst_crc.png b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_crc.png new file mode 100644 index 00000000..93f70938 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_crc.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_prst_load.png b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_load.png new file mode 100644 index 00000000..61b83323 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_load.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_prst_ovl.png b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_ovl.png new file mode 100644 index 00000000..04c715bb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_ovl.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_prst_save.png b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_save.png new file mode 100644 index 00000000..af16bf08 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_save.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_prst_sqr.png b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_sqr.png new file mode 100644 index 00000000..122d95f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_sqr.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_prst_tri.png b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_tri.png new file mode 100644 index 00000000..7308b9d5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_tri.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_prst_trsh.png b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_trsh.png new file mode 100644 index 00000000..8737a2da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_prst_trsh.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_pstn_cen.png b/cinelerra-5.1/plugins/theme_blond/data/mask_pstn_cen.png new file mode 100644 index 00000000..f85de232 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_pstn_cen.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_pstn_nrm.png b/cinelerra-5.1/plugins/theme_blond/data/mask_pstn_nrm.png new file mode 100644 index 00000000..7429a5e1 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_pstn_nrm.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_chkd.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_chkd.png new file mode 100644 index 00000000..0cbf693c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_chkdhi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_chkdhi.png new file mode 100644 index 00000000..ec9bfda7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_up.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_up.png new file mode 100644 index 00000000..4de2f64f Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_uphi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_uphi.png new file mode 100644 index 00000000..643aaa15 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_x.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_x.png index 13f4ab95..0105df6e 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_x.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_x.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xchkd.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xchkd.png deleted file mode 100644 index 7a7f2030..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xchkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xchkdhi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xchkdhi.png deleted file mode 100644 index ca3c8a16..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xchkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xdown.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xdown.png index c7a23dd8..0a12d2de 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xdown.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xdown.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xup.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xup.png deleted file mode 100644 index e4dd16c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xuphi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xuphi.png deleted file mode 100644 index 14b76042..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xy.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xy.png index 13f4ab95..11b4bd82 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xy.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xy.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xychkd.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xychkd.png deleted file mode 100644 index 495fb1a3..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xychkdhi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xychkdhi.png deleted file mode 100644 index 4a7ab1dd..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xydown.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xydown.png index 5fcfeb05..66bca32e 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xydown.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xydown.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xyup.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xyup.png deleted file mode 100644 index 866a80a9..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xyup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xyuphi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xyuphi.png deleted file mode 100644 index 57bf5afd..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_xyuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_y.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_y.png index 13f4ab95..92766e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_y.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_y.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_ychkd.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_ychkd.png deleted file mode 100644 index e286be6d..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_ychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_ychkdhi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_ychkdhi.png deleted file mode 100644 index 068d09c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_ychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_ydown.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_ydown.png index 658e7d55..425e800d 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_ydown.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_ydown.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_yup.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_yup.png deleted file mode 100644 index b44eadce..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_yup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_yuphi.png b/cinelerra-5.1/plugins/theme_blond/data/mask_scale_yuphi.png deleted file mode 100644 index 4ce9d2b3..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_scale_yuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C index 5476cf6a..c2023221 100644 --- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C +++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C @@ -379,6 +379,54 @@ void BlondCVTheme::initialize() "mask_button_dn.png", "mask_all_smooth_images"); + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + new_toggle("loadmode_new.png", "loadmode_up.png", "loadmode_hi.png", @@ -914,14 +962,14 @@ void BlondCVTheme::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png", - "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png", + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", "mask_scale_x"); - new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png", - "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png", + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", "mask_scale_y"); - new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png", - "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png", + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", "mask_scale_xy"); flush_images(); diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_linear.png index f6481eba..001d0e96 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_smooth.png index 369ddaaf..49fa6d1f 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_dn.png index 3ce3ed80..5b98a3c1 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_hi.png index 1ad1a999..5d836896 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_up.png index d633ed4e..ac9b2bc9 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_linear.png index 98f9a833..776f9779 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_smooth.png index 1feb15c9..2670fdbf 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_linear.png index 8dd77d34..1301f2f7 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_smooth.png index fee20de6..7a8c72ec 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_crc.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_crc.png new file mode 100644 index 00000000..93f70938 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_crc.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_load.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_load.png new file mode 100644 index 00000000..61b83323 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_load.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_ovl.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_ovl.png new file mode 100644 index 00000000..04c715bb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_ovl.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_save.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_save.png new file mode 100644 index 00000000..af16bf08 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_save.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_sqr.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_sqr.png new file mode 100644 index 00000000..122d95f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_sqr.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_tri.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_tri.png new file mode 100644 index 00000000..7308b9d5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_tri.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_trsh.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_trsh.png new file mode 100644 index 00000000..8737a2da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_prst_trsh.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pstn_cen.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pstn_cen.png new file mode 100644 index 00000000..f85de232 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pstn_cen.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pstn_nrm.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pstn_nrm.png new file mode 100644 index 00000000..7429a5e1 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pstn_nrm.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_chkd.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_chkd.png new file mode 100644 index 00000000..0cbf693c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_chkdhi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_chkdhi.png new file mode 100644 index 00000000..ec9bfda7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_up.png new file mode 100644 index 00000000..4de2f64f Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_uphi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_uphi.png new file mode 100644 index 00000000..643aaa15 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_x.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_x.png index 13f4ab95..0105df6e 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_x.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_x.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xchkd.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xchkd.png deleted file mode 100644 index 7a7f2030..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xchkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xchkdhi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xchkdhi.png deleted file mode 100644 index ca3c8a16..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xchkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xdown.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xdown.png index c7a23dd8..0a12d2de 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xdown.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xdown.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xup.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xup.png deleted file mode 100644 index e4dd16c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xuphi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xuphi.png deleted file mode 100644 index 14b76042..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xy.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xy.png index 13f4ab95..11b4bd82 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xy.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xy.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xychkd.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xychkd.png deleted file mode 100644 index 495fb1a3..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xychkdhi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xychkdhi.png deleted file mode 100644 index 4a7ab1dd..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xydown.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xydown.png index 5fcfeb05..66bca32e 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xydown.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xydown.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xyup.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xyup.png deleted file mode 100644 index 866a80a9..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xyup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xyuphi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xyuphi.png deleted file mode 100644 index 57bf5afd..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_xyuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_y.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_y.png index 13f4ab95..92766e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_y.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_y.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_ychkd.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_ychkd.png deleted file mode 100644 index e286be6d..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_ychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_ychkdhi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_ychkdhi.png deleted file mode 100644 index 068d09c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_ychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_ydown.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_ydown.png index 658e7d55..425e800d 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_ydown.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_ydown.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_yup.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_yup.png deleted file mode 100644 index b44eadce..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_yup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_yuphi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_yuphi.png deleted file mode 100644 index 4ce9d2b3..00000000 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_scale_yuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/bluetheme.C b/cinelerra-5.1/plugins/theme_blue/bluetheme.C index e1e5bb0f..c96fd666 100644 --- a/cinelerra-5.1/plugins/theme_blue/bluetheme.C +++ b/cinelerra-5.1/plugins/theme_blue/bluetheme.C @@ -326,27 +326,58 @@ void BlueDotTheme::initialize() "mask_button_dn.png", "mask_all_smooth_images"); + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); + "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png", + "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png", + "d.png", "e.png", "f.png", "space.png", "dash.png"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); @@ -870,14 +901,14 @@ void BlueDotTheme::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png", - "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png", + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", "mask_scale_x"); - new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png", - "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png", + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", "mask_scale_y"); - new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png", - "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png", + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", "mask_scale_xy"); flush_images(); diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_blue/data/mask_all_linear.png index f6481eba..ec43b0b9 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_blue/data/mask_all_smooth.png index 369ddaaf..4cab563c 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_blue/data/mask_button_dn.png index 3ce3ed80..35a37147 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_button_hi.png index 1ad1a999..9fb80b7b 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_blue/data/mask_button_up.png index d633ed4e..fc52498d 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_blue/data/mask_crv_linear.png index 98f9a833..e2093bf6 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_blue/data/mask_crv_smooth.png index 1feb15c9..32fe205a 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_linear.png index 8dd77d34..79835735 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_smooth.png index fee20de6..92173d38 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_prst_crc.png b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_crc.png new file mode 100644 index 00000000..93f70938 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_crc.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_prst_load.png b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_load.png new file mode 100644 index 00000000..61b83323 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_load.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_prst_ovl.png b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_ovl.png new file mode 100644 index 00000000..04c715bb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_ovl.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_prst_save.png b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_save.png new file mode 100644 index 00000000..af16bf08 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_save.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_prst_sqr.png b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_sqr.png new file mode 100644 index 00000000..122d95f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_sqr.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_prst_tri.png b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_tri.png new file mode 100644 index 00000000..7308b9d5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_tri.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_prst_trsh.png b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_trsh.png new file mode 100644 index 00000000..8737a2da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_prst_trsh.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_pstn_cen.png b/cinelerra-5.1/plugins/theme_blue/data/mask_pstn_cen.png new file mode 100644 index 00000000..f85de232 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_pstn_cen.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_pstn_nrm.png b/cinelerra-5.1/plugins/theme_blue/data/mask_pstn_nrm.png new file mode 100644 index 00000000..7429a5e1 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_pstn_nrm.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_chkd.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_chkd.png new file mode 100644 index 00000000..0cbf693c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_chkdhi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_chkdhi.png new file mode 100644 index 00000000..ec9bfda7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_up.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_up.png new file mode 100644 index 00000000..4de2f64f Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_uphi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_uphi.png new file mode 100644 index 00000000..643aaa15 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_x.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_x.png index 13f4ab95..0105df6e 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_x.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_x.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xchkd.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xchkd.png deleted file mode 100644 index 7a7f2030..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xchkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xchkdhi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xchkdhi.png deleted file mode 100644 index ca3c8a16..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xchkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xdown.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xdown.png index c7a23dd8..0a12d2de 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xdown.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xdown.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xup.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xup.png deleted file mode 100644 index e4dd16c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xuphi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xuphi.png deleted file mode 100644 index 14b76042..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xy.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xy.png index 13f4ab95..11b4bd82 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xy.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xy.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xychkd.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xychkd.png deleted file mode 100644 index 495fb1a3..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xychkdhi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xychkdhi.png deleted file mode 100644 index 4a7ab1dd..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xydown.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xydown.png index 5fcfeb05..66bca32e 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xydown.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xydown.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xyup.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xyup.png deleted file mode 100644 index 866a80a9..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xyup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xyuphi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xyuphi.png deleted file mode 100644 index 57bf5afd..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_xyuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_y.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_y.png index 13f4ab95..92766e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_y.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_y.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_ychkd.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_ychkd.png deleted file mode 100644 index e286be6d..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_ychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_ychkdhi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_ychkdhi.png deleted file mode 100644 index 068d09c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_ychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_ydown.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_ydown.png index 658e7d55..425e800d 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_ydown.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_ydown.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_yup.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_yup.png deleted file mode 100644 index b44eadce..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_yup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_yuphi.png b/cinelerra-5.1/plugins/theme_blue/data/mask_scale_yuphi.png deleted file mode 100644 index 4ce9d2b3..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_scale_yuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C index 091c0200..e6df2973 100644 --- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C +++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C @@ -339,28 +339,61 @@ void BlueDotTheme::initialize() resources->bar_data = new_image("bar", "bar.png"); + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + //clock font resources->medium_7segment = new_image_set(20, - "black_0.png", - "black_1.png", - "black_2.png", - "black_3.png", - "black_4.png", - "black_5.png", - "black_6.png", - "black_7.png", - "black_8.png", - "black_9.png", - "black_colon.png", - "black_period.png", - "black_a.png", - "black_b.png", - "black_c.png", - "black_d.png", - "black_e.png", - "black_f.png", - "black_space.png", - "black_dash.png"); + "black_0.png", "black_1.png", "black_2.png", "black_3.png", + "black_4.png", "black_5.png", "black_6.png", "black_7.png", + "black_8.png", "black_9.png", "black_colon.png", "black_period.png", + "black_a.png", "black_b.png", "black_c.png", "black_d.png", + "black_e.png", "black_f.png", "black_space.png", "black_dash.png"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); @@ -937,14 +970,14 @@ void BlueDotTheme::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png", - "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png", + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", "mask_scale_x"); - new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png", - "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png", + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", "mask_scale_y"); - new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png", - "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png", + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", "mask_scale_xy"); flush_images(); diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_linear.png index f6481eba..79ecf247 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_smooth.png index 369ddaaf..98d511ea 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_dn.png index 3ce3ed80..80cb7a62 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_hi.png index 1ad1a999..88ca0fff 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_up.png index d633ed4e..996aa58c 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_linear.png index 98f9a833..b82dd90e 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_smooth.png index 1feb15c9..dc5e344a 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_linear.png index 8dd77d34..1e77fd3d 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_smooth.png index fee20de6..ed476ee2 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_crc.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_crc.png new file mode 100644 index 00000000..93f70938 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_crc.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_load.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_load.png new file mode 100644 index 00000000..61b83323 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_load.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_ovl.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_ovl.png new file mode 100644 index 00000000..04c715bb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_ovl.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_save.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_save.png new file mode 100644 index 00000000..af16bf08 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_save.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_sqr.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_sqr.png new file mode 100644 index 00000000..122d95f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_sqr.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_tri.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_tri.png new file mode 100644 index 00000000..7308b9d5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_tri.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_trsh.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_trsh.png new file mode 100644 index 00000000..8737a2da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_prst_trsh.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pstn_cen.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pstn_cen.png new file mode 100644 index 00000000..f85de232 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pstn_cen.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pstn_nrm.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pstn_nrm.png new file mode 100644 index 00000000..7429a5e1 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pstn_nrm.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_chkd.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_chkd.png new file mode 100644 index 00000000..0cbf693c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_chkdhi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_chkdhi.png new file mode 100644 index 00000000..ec9bfda7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_up.png new file mode 100644 index 00000000..4de2f64f Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_uphi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_uphi.png new file mode 100644 index 00000000..643aaa15 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_x.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_x.png index 13f4ab95..0105df6e 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_x.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_x.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xchkd.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xchkd.png deleted file mode 100644 index 7a7f2030..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xchkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xchkdhi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xchkdhi.png deleted file mode 100644 index ca3c8a16..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xchkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xdown.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xdown.png index c7a23dd8..0a12d2de 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xdown.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xdown.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xup.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xup.png deleted file mode 100644 index e4dd16c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xuphi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xuphi.png deleted file mode 100644 index 14b76042..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xy.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xy.png index 13f4ab95..11b4bd82 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xy.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xy.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xychkd.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xychkd.png deleted file mode 100644 index 495fb1a3..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xychkdhi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xychkdhi.png deleted file mode 100644 index 4a7ab1dd..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xydown.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xydown.png index 5fcfeb05..66bca32e 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xydown.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xydown.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xyup.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xyup.png deleted file mode 100644 index 866a80a9..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xyup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xyuphi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xyuphi.png deleted file mode 100644 index 57bf5afd..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_xyuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_y.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_y.png index 13f4ab95..92766e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_y.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_y.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_ychkd.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_ychkd.png deleted file mode 100644 index e286be6d..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_ychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_ychkdhi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_ychkdhi.png deleted file mode 100644 index 068d09c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_ychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_ydown.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_ydown.png index 658e7d55..425e800d 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_ydown.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_ydown.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_yup.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_yup.png deleted file mode 100644 index b44eadce..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_yup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_yuphi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_yuphi.png deleted file mode 100644 index 4ce9d2b3..00000000 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_scale_yuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C index 14833e11..b48a9aa8 100644 --- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C +++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C @@ -333,27 +333,58 @@ void BrightTheme::initialize() "mask_button_dn.png", "mask_all_smooth_images"); + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); + "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png", + "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png", + "d.png", "e.png", "f.png", "space.png", "dash.png"); resources->bar_data = new_image("bar", "bar.png"); @@ -877,14 +908,14 @@ void BrightTheme::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png", - "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png", + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", "mask_scale_x"); - new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png", - "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png", + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", "mask_scale_y"); - new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png", - "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png", + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", "mask_scale_xy"); flush_images(); diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_bright/data/mask_all_linear.png index f6481eba..2986a690 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_bright/data/mask_all_smooth.png index 369ddaaf..088fb31b 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_bright/data/mask_button_dn.png index 3ce3ed80..8f117f2a 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_button_hi.png index 1ad1a999..c9005881 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_bright/data/mask_button_up.png index d633ed4e..830d9b3c 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_bright/data/mask_crv_linear.png index 98f9a833..e9dffdcf 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_bright/data/mask_crv_smooth.png index 1feb15c9..92943913 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_linear.png index 8dd77d34..ac17b251 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_smooth.png index fee20de6..6564e98e 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_prst_crc.png b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_crc.png new file mode 100644 index 00000000..93f70938 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_crc.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_prst_load.png b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_load.png new file mode 100644 index 00000000..61b83323 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_load.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_prst_ovl.png b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_ovl.png new file mode 100644 index 00000000..04c715bb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_ovl.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_prst_save.png b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_save.png new file mode 100644 index 00000000..af16bf08 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_save.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_prst_sqr.png b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_sqr.png new file mode 100644 index 00000000..122d95f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_sqr.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_prst_tri.png b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_tri.png new file mode 100644 index 00000000..7308b9d5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_tri.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_prst_trsh.png b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_trsh.png new file mode 100644 index 00000000..8737a2da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_prst_trsh.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_pstn_cen.png b/cinelerra-5.1/plugins/theme_bright/data/mask_pstn_cen.png new file mode 100644 index 00000000..f85de232 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_pstn_cen.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_pstn_nrm.png b/cinelerra-5.1/plugins/theme_bright/data/mask_pstn_nrm.png new file mode 100644 index 00000000..7429a5e1 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_pstn_nrm.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_chkd.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_chkd.png new file mode 100644 index 00000000..0cbf693c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_chkdhi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_chkdhi.png new file mode 100644 index 00000000..ec9bfda7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_up.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_up.png new file mode 100644 index 00000000..4de2f64f Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_up.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_uphi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_uphi.png new file mode 100644 index 00000000..643aaa15 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_x.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_x.png index 13f4ab95..0105df6e 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_x.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_x.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xchkd.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xchkd.png deleted file mode 100644 index 7a7f2030..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xchkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xchkdhi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xchkdhi.png deleted file mode 100644 index ca3c8a16..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xchkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xdown.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xdown.png index c7a23dd8..0a12d2de 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xdown.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xdown.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xup.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xup.png deleted file mode 100644 index e4dd16c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xuphi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xuphi.png deleted file mode 100644 index 14b76042..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xy.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xy.png index 13f4ab95..11b4bd82 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xy.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xy.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xychkd.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xychkd.png deleted file mode 100644 index 495fb1a3..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xychkdhi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xychkdhi.png deleted file mode 100644 index 4a7ab1dd..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xydown.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xydown.png index 5fcfeb05..66bca32e 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xydown.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xydown.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xyup.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xyup.png deleted file mode 100644 index 866a80a9..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xyup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xyuphi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xyuphi.png deleted file mode 100644 index 57bf5afd..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_xyuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_y.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_y.png index 13f4ab95..92766e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_y.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_y.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_ychkd.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_ychkd.png deleted file mode 100644 index e286be6d..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_ychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_ychkdhi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_ychkdhi.png deleted file mode 100644 index 068d09c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_ychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_ydown.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_ydown.png index 658e7d55..425e800d 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_ydown.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_ydown.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_yup.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_yup.png deleted file mode 100644 index b44eadce..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_yup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_yuphi.png b/cinelerra-5.1/plugins/theme_bright/data/mask_scale_yuphi.png deleted file mode 100644 index 4ce9d2b3..00000000 Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_scale_yuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C index 919a0516..60542e2f 100644 --- a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C +++ b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C @@ -314,6 +314,54 @@ void CAKEWALKTHEME::initialize() "mask_button_hi.png", "mask_button_dn.png", "mask_all_smooth_images"); + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); resources->min_menu_w = 96; @@ -946,14 +994,14 @@ void CAKEWALKTHEME::initialize() editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png", - "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png", + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", "mask_scale_x"); - new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png", - "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png", + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", "mask_scale_y"); - new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png", - "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png", + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", "mask_scale_xy"); flush_images(); } diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_linear.png index f6481eba..f560cd2a 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_smooth.png index 369ddaaf..71ad4cda 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_dn.png index 3ce3ed80..260d66a4 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_hi.png index 1ad1a999..d7a212f2 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_up.png index d633ed4e..260d66a4 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_linear.png index 98f9a833..83361d35 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_smooth.png index 1feb15c9..07807051 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_linear.png index 8dd77d34..38e03e4c 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_smooth.png index fee20de6..be94f5dd 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_crc.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_crc.png new file mode 100644 index 00000000..93f70938 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_crc.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_load.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_load.png new file mode 100644 index 00000000..61b83323 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_load.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_ovl.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_ovl.png new file mode 100644 index 00000000..04c715bb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_ovl.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_save.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_save.png new file mode 100644 index 00000000..af16bf08 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_save.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_sqr.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_sqr.png new file mode 100644 index 00000000..122d95f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_sqr.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_tri.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_tri.png new file mode 100644 index 00000000..7308b9d5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_tri.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_trsh.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_trsh.png new file mode 100644 index 00000000..8737a2da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_prst_trsh.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pstn_cen.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pstn_cen.png new file mode 100644 index 00000000..f85de232 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pstn_cen.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pstn_nrm.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pstn_nrm.png new file mode 100644 index 00000000..7429a5e1 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pstn_nrm.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_chkd.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_chkd.png new file mode 100644 index 00000000..0cbf693c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_chkdhi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_chkdhi.png new file mode 100644 index 00000000..ec9bfda7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_up.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_up.png new file mode 100644 index 00000000..4de2f64f Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_up.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_uphi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_uphi.png new file mode 100644 index 00000000..643aaa15 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_x.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_x.png index 13f4ab95..0105df6e 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_x.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_x.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xchkd.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xchkd.png deleted file mode 100644 index 7a7f2030..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xchkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xchkdhi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xchkdhi.png deleted file mode 100644 index ca3c8a16..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xchkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xdown.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xdown.png index c7a23dd8..0a12d2de 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xdown.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xdown.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xup.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xup.png deleted file mode 100644 index e4dd16c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xuphi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xuphi.png deleted file mode 100644 index 14b76042..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xy.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xy.png index 13f4ab95..11b4bd82 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xy.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xy.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xychkd.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xychkd.png deleted file mode 100644 index 495fb1a3..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xychkdhi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xychkdhi.png deleted file mode 100644 index 4a7ab1dd..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xydown.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xydown.png index 5fcfeb05..66bca32e 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xydown.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xydown.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xyup.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xyup.png deleted file mode 100644 index 866a80a9..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xyup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xyuphi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xyuphi.png deleted file mode 100644 index 57bf5afd..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_xyuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_y.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_y.png index 13f4ab95..92766e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_y.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_y.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_ychkd.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_ychkd.png deleted file mode 100644 index e286be6d..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_ychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_ychkdhi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_ychkdhi.png deleted file mode 100644 index 068d09c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_ychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_ydown.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_ydown.png index 658e7d55..425e800d 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_ydown.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_ydown.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_yup.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_yup.png deleted file mode 100644 index b44eadce..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_yup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_yuphi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_yuphi.png deleted file mode 100644 index 4ce9d2b3..00000000 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_scale_yuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_all_linear.png index f6481eba..1f18bc8b 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_all_smooth.png index 369ddaaf..8eeff647 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_dn.png index 3ce3ed80..6290fe52 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_hi.png index 1ad1a999..51f166c7 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_up.png index d633ed4e..bcbdc94d 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_linear.png index 98f9a833..b595aba6 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_smooth.png index 1feb15c9..8e002eaf 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_linear.png index 8dd77d34..8106a3ce 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_smooth.png index fee20de6..748b9748 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_crc.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_crc.png new file mode 100644 index 00000000..93f70938 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_crc.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_load.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_load.png new file mode 100644 index 00000000..61b83323 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_load.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_ovl.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_ovl.png new file mode 100644 index 00000000..04c715bb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_ovl.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_save.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_save.png new file mode 100644 index 00000000..af16bf08 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_save.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_sqr.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_sqr.png new file mode 100644 index 00000000..122d95f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_sqr.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_tri.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_tri.png new file mode 100644 index 00000000..7308b9d5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_tri.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_trsh.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_trsh.png new file mode 100644 index 00000000..8737a2da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_prst_trsh.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_pstn_cen.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_pstn_cen.png new file mode 100644 index 00000000..f85de232 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_pstn_cen.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_pstn_nrm.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_pstn_nrm.png new file mode 100644 index 00000000..7429a5e1 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_pstn_nrm.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_chkd.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_chkd.png new file mode 100644 index 00000000..0cbf693c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_chkdhi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_chkdhi.png new file mode 100644 index 00000000..ec9bfda7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_up.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_up.png new file mode 100644 index 00000000..4de2f64f Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_up.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_uphi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_uphi.png new file mode 100644 index 00000000..643aaa15 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_x.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_x.png index 13f4ab95..0105df6e 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_x.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_x.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xchkd.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xchkd.png deleted file mode 100644 index 7a7f2030..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xchkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xchkdhi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xchkdhi.png deleted file mode 100644 index ca3c8a16..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xchkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xdown.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xdown.png index c7a23dd8..0a12d2de 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xdown.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xdown.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xup.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xup.png deleted file mode 100644 index e4dd16c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xuphi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xuphi.png deleted file mode 100644 index 14b76042..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xy.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xy.png index 13f4ab95..11b4bd82 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xy.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xy.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xychkd.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xychkd.png deleted file mode 100644 index 495fb1a3..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xychkdhi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xychkdhi.png deleted file mode 100644 index 4a7ab1dd..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xydown.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xydown.png index 5fcfeb05..66bca32e 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xydown.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xydown.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xyup.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xyup.png deleted file mode 100644 index 866a80a9..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xyup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xyuphi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xyuphi.png deleted file mode 100644 index 57bf5afd..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_xyuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_y.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_y.png index 13f4ab95..92766e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_y.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_y.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_ychkd.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_ychkd.png deleted file mode 100644 index e286be6d..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_ychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_ychkdhi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_ychkdhi.png deleted file mode 100644 index 068d09c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_ychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_ydown.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_ydown.png index 658e7d55..425e800d 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_ydown.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_ydown.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_yup.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_yup.png deleted file mode 100644 index b44eadce..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_yup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_yuphi.png b/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_yuphi.png deleted file mode 100644 index 4ce9d2b3..00000000 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_scale_yuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C index 5f944d13..19abed45 100644 --- a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C +++ b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C @@ -327,27 +327,58 @@ void HULKTHEME::initialize() "mask_button_dn.png", "mask_all_smooth_images"); + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); + "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png", + "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png", + "d.png", "e.png", "f.png", "space.png", "dash.png"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); @@ -872,14 +903,14 @@ void HULKTHEME::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png", - "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png", + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", "mask_scale_x"); - new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png", - "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png", + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", "mask_scale_y"); - new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png", - "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png", + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", "mask_scale_xy"); flush_images(); diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_dn.png index 3ce3ed80..482709c0 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_hi.png index 1ad1a999..f62794b5 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_up.png index d633ed4e..312a2b26 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_crc.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_crc.png new file mode 100644 index 00000000..93f70938 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_crc.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_load.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_load.png new file mode 100644 index 00000000..61b83323 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_load.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_ovl.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_ovl.png new file mode 100644 index 00000000..04c715bb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_ovl.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_save.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_save.png new file mode 100644 index 00000000..af16bf08 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_save.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_sqr.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_sqr.png new file mode 100644 index 00000000..122d95f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_sqr.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_tri.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_tri.png new file mode 100644 index 00000000..7308b9d5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_tri.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_trsh.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_trsh.png new file mode 100644 index 00000000..8737a2da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_prst_trsh.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_pstn_cen.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_pstn_cen.png new file mode 100644 index 00000000..f85de232 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_pstn_cen.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_pstn_nrm.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_pstn_nrm.png new file mode 100644 index 00000000..7429a5e1 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_pstn_nrm.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_chkd.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_chkd.png new file mode 100644 index 00000000..0cbf693c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_chkdhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_chkdhi.png new file mode 100644 index 00000000..ec9bfda7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_up.png new file mode 100644 index 00000000..4de2f64f Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_uphi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_uphi.png new file mode 100644 index 00000000..643aaa15 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_x.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_x.png index 13f4ab95..0105df6e 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_x.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_x.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xchkd.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xchkd.png deleted file mode 100644 index 7a7f2030..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xchkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xchkdhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xchkdhi.png deleted file mode 100644 index ca3c8a16..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xchkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xdown.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xdown.png index c7a23dd8..0a12d2de 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xdown.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xdown.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xup.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xup.png deleted file mode 100644 index e4dd16c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xuphi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xuphi.png deleted file mode 100644 index 14b76042..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xy.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xy.png index 13f4ab95..11b4bd82 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xy.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xy.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xychkd.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xychkd.png deleted file mode 100644 index 495fb1a3..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xychkdhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xychkdhi.png deleted file mode 100644 index 4a7ab1dd..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xydown.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xydown.png index 5fcfeb05..66bca32e 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xydown.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xydown.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xyup.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xyup.png deleted file mode 100644 index 866a80a9..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xyup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xyuphi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xyuphi.png deleted file mode 100644 index 57bf5afd..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_xyuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_y.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_y.png index 13f4ab95..92766e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_y.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_y.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_ychkd.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_ychkd.png deleted file mode 100644 index e286be6d..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_ychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_ychkdhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_ychkdhi.png deleted file mode 100644 index 068d09c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_ychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_ydown.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_ydown.png index 658e7d55..425e800d 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_ydown.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_ydown.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_yup.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_yup.png deleted file mode 100644 index b44eadce..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_yup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_yuphi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_yuphi.png deleted file mode 100644 index 4ce9d2b3..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_scale_yuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/reset.png b/cinelerra-5.1/plugins/theme_neophyte/data/reset.png old mode 100644 new mode 100755 index 7b724665..2718f345 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 old mode 100644 new mode 100755 index 711f216f..a44d640d 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 old mode 100644 new mode 100755 index a462dcfc..a492077a 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 old mode 100644 new mode 100755 index d70b6bd3..0d813739 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 65f87afb..900964c8 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C +++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C @@ -406,28 +406,59 @@ void NEOPHYTETHEME::initialize() "mask_button_dn.png", "mask_all_smooth_images"); + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + // Clock - is not used (AFAIK). See also clock color. // resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - // "0.png", - // "1.png", - // "2.png", - // "3.png", - // "4.png", - // "5.png", - // "6.png", - // "7.png", - // "8.png", - // "9.png", - // "colon.png", - // "period.png", - // "a.png", - // "b.png", - // "c.png", - // "d.png", - // "e.png", - // "f.png", - // "space.png", - // "dash.png"); + // "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png", + // "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png", + // "d.png", "e.png", "f.png", "space.png", "dash.png"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); @@ -1112,14 +1143,14 @@ void NEOPHYTETHEME::initialize() editpanel_dn, editpanel_checkedhi, "tan_linear"); - new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png", - "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png", + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", "mask_scale_x"); - new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png", - "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png", + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", "mask_scale_y"); - new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png", - "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png", + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", "mask_scale_xy"); flush_images(); diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_linear.png index f6481eba..0f47ec5c 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_smooth.png index 369ddaaf..83b80fc0 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_dn.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_dn.png index 3ce3ed80..d9eef067 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_hi.png index 1ad1a999..0ff5bf47 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_up.png index d633ed4e..a89301fb 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_up.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_linear.png index 98f9a833..c3ea87d8 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_smooth.png index 1feb15c9..5938a8c8 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_linear.png index 8dd77d34..e207cab9 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_smooth.png index fee20de6..7e765435 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_crc.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_crc.png new file mode 100644 index 00000000..93f70938 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_crc.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_load.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_load.png new file mode 100644 index 00000000..61b83323 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_load.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_ovl.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_ovl.png new file mode 100644 index 00000000..04c715bb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_ovl.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_save.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_save.png new file mode 100644 index 00000000..af16bf08 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_save.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_sqr.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_sqr.png new file mode 100644 index 00000000..122d95f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_sqr.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_tri.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_tri.png new file mode 100644 index 00000000..7308b9d5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_tri.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_trsh.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_trsh.png new file mode 100644 index 00000000..8737a2da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_prst_trsh.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_pstn_cen.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pstn_cen.png new file mode 100644 index 00000000..f85de232 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pstn_cen.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_pstn_nrm.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pstn_nrm.png new file mode 100644 index 00000000..7429a5e1 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pstn_nrm.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_chkd.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_chkd.png new file mode 100644 index 00000000..0cbf693c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_chkdhi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_chkdhi.png new file mode 100644 index 00000000..ec9bfda7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_up.png new file mode 100644 index 00000000..4de2f64f Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_up.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_uphi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_uphi.png new file mode 100644 index 00000000..643aaa15 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_x.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_x.png index 13f4ab95..0105df6e 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_x.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_x.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xchkd.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xchkd.png deleted file mode 100644 index 7a7f2030..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xchkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xchkdhi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xchkdhi.png deleted file mode 100644 index ca3c8a16..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xchkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xdown.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xdown.png index c7a23dd8..0a12d2de 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xdown.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xdown.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xup.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xup.png deleted file mode 100644 index e4dd16c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xuphi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xuphi.png deleted file mode 100644 index 14b76042..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xy.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xy.png index 13f4ab95..11b4bd82 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xy.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xy.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xychkd.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xychkd.png deleted file mode 100644 index 495fb1a3..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xychkdhi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xychkdhi.png deleted file mode 100644 index 4a7ab1dd..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xydown.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xydown.png index 5fcfeb05..66bca32e 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xydown.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xydown.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xyup.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xyup.png deleted file mode 100644 index 866a80a9..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xyup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xyuphi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xyuphi.png deleted file mode 100644 index 57bf5afd..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_xyuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_y.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_y.png index 13f4ab95..92766e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_y.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_y.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_ychkd.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_ychkd.png deleted file mode 100644 index e286be6d..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_ychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_ychkdhi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_ychkdhi.png deleted file mode 100644 index 068d09c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_ychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_ydown.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_ydown.png index 658e7d55..425e800d 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_ydown.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_ydown.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_yup.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_yup.png deleted file mode 100644 index b44eadce..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_yup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_yuphi.png b/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_yuphi.png deleted file mode 100644 index 4ce9d2b3..00000000 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_scale_yuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C index ccc09e5b..c2ad6e10 100644 --- a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C +++ b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C @@ -312,27 +312,58 @@ void PINKLADY::initialize() "mask_button_dn.png", "mask_all_smooth_images"); + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); + "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png", + "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png", + "d.png", "e.png", "f.png", "space.png", "dash.png"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); @@ -857,14 +888,14 @@ void PINKLADY::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png", - "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png", + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", "mask_scale_x"); - new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png", - "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png", + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", "mask_scale_y"); - new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png", - "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png", + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", "mask_scale_xy"); flush_images(); diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_prst_crc.png b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_crc.png new file mode 100644 index 00000000..93f70938 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_crc.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_prst_load.png b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_load.png new file mode 100644 index 00000000..61b83323 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_load.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_prst_ovl.png b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_ovl.png new file mode 100644 index 00000000..04c715bb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_ovl.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_prst_save.png b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_save.png new file mode 100644 index 00000000..af16bf08 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_save.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_prst_sqr.png b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_sqr.png new file mode 100644 index 00000000..122d95f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_sqr.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_prst_tri.png b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_tri.png new file mode 100644 index 00000000..7308b9d5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_tri.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_prst_trsh.png b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_trsh.png new file mode 100644 index 00000000..8737a2da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_prst_trsh.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_pstn_cen.png b/cinelerra-5.1/plugins/theme_suv/data/mask_pstn_cen.png new file mode 100644 index 00000000..f85de232 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_pstn_cen.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_pstn_nrm.png b/cinelerra-5.1/plugins/theme_suv/data/mask_pstn_nrm.png new file mode 100644 index 00000000..7429a5e1 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_pstn_nrm.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_chkd.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_chkd.png new file mode 100644 index 00000000..0cbf693c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_chkdhi.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_chkdhi.png new file mode 100644 index 00000000..c025760b Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_up.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_up.png new file mode 100644 index 00000000..4de2f64f Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_up.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_uphi.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_uphi.png new file mode 100644 index 00000000..643aaa15 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_x.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_x.png index 13f4ab95..0105df6e 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_x.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_x.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xchkd.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xchkd.png deleted file mode 100644 index 7a7f2030..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xchkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xchkdhi.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xchkdhi.png deleted file mode 100644 index ca3c8a16..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xchkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xdown.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xdown.png index c7a23dd8..0a12d2de 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xdown.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xdown.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xup.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xup.png deleted file mode 100644 index e4dd16c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xuphi.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xuphi.png deleted file mode 100644 index 14b76042..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xy.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xy.png index 13f4ab95..11b4bd82 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xy.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xy.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xychkd.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xychkd.png deleted file mode 100644 index 495fb1a3..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xychkdhi.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xychkdhi.png deleted file mode 100644 index 4a7ab1dd..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xydown.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xydown.png index 5fcfeb05..66bca32e 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xydown.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xydown.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xyup.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xyup.png deleted file mode 100644 index 866a80a9..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xyup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xyuphi.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xyuphi.png deleted file mode 100644 index 57bf5afd..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_xyuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_y.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_y.png index 13f4ab95..92766e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_y.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_y.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_ychkd.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_ychkd.png deleted file mode 100644 index e286be6d..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_ychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_ychkdhi.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_ychkdhi.png deleted file mode 100644 index 068d09c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_ychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_ydown.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_ydown.png index 658e7d55..425e800d 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_ydown.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_ydown.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_yup.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_yup.png deleted file mode 100644 index b44eadce..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_yup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_yuphi.png b/cinelerra-5.1/plugins/theme_suv/data/mask_scale_yuphi.png deleted file mode 100644 index 4ce9d2b3..00000000 Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_scale_yuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_suv/suv.C b/cinelerra-5.1/plugins/theme_suv/suv.C index a8891f50..46b4441f 100644 --- a/cinelerra-5.1/plugins/theme_suv/suv.C +++ b/cinelerra-5.1/plugins/theme_suv/suv.C @@ -323,27 +323,58 @@ void SUV::initialize() "mask_button_dn.png", "mask_all_smooth_images"); + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); + "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png", + "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png", + "d.png", "e.png", "f.png", "space.png", "dash.png"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); @@ -858,14 +889,14 @@ void SUV::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png", - "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png", + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", "mask_scale_x"); - new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png", - "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png", + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", "mask_scale_y"); - new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png", - "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png", + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", "mask_scale_xy"); flush_images(); diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_all_linear.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_all_linear.png index f6481eba..fc26659d 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_all_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_all_smooth.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_all_smooth.png index 369ddaaf..045643c5 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_all_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_linear.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_linear.png index 98f9a833..b49d03a2 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_smooth.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_smooth.png index 1feb15c9..7e1f41fd 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_linear.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_linear.png index 8dd77d34..97d7c1f6 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_linear.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_smooth.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_smooth.png index fee20de6..8e2e8c31 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_smooth.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_crc.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_crc.png new file mode 100644 index 00000000..93f70938 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_crc.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_load.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_load.png new file mode 100644 index 00000000..61b83323 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_load.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_ovl.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_ovl.png new file mode 100644 index 00000000..04c715bb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_ovl.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_save.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_save.png new file mode 100644 index 00000000..af16bf08 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_save.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_sqr.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_sqr.png new file mode 100644 index 00000000..122d95f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_sqr.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_tri.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_tri.png new file mode 100644 index 00000000..7308b9d5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_tri.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_trsh.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_trsh.png new file mode 100644 index 00000000..8737a2da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_prst_trsh.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_pstn_cen.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_pstn_cen.png new file mode 100644 index 00000000..f85de232 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_pstn_cen.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_pstn_nrm.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_pstn_nrm.png new file mode 100644 index 00000000..7429a5e1 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_pstn_nrm.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_chkd.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_chkd.png new file mode 100644 index 00000000..0cbf693c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_chkdhi.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_chkdhi.png new file mode 100644 index 00000000..ec9bfda7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_up.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_up.png new file mode 100644 index 00000000..4de2f64f Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_up.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_uphi.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_uphi.png new file mode 100644 index 00000000..643aaa15 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_x.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_x.png index 13f4ab95..0105df6e 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_x.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_x.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xchkd.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xchkd.png deleted file mode 100644 index 7a7f2030..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xchkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xchkdhi.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xchkdhi.png deleted file mode 100644 index ca3c8a16..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xchkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xdown.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xdown.png index c7a23dd8..0a12d2de 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xdown.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xdown.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xup.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xup.png deleted file mode 100644 index e4dd16c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xuphi.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xuphi.png deleted file mode 100644 index 14b76042..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xy.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xy.png index 13f4ab95..11b4bd82 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xy.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xy.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xychkd.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xychkd.png deleted file mode 100644 index 495fb1a3..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xychkdhi.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xychkdhi.png deleted file mode 100644 index 4a7ab1dd..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xydown.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xydown.png index 5fcfeb05..66bca32e 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xydown.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xydown.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xyup.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xyup.png deleted file mode 100644 index 866a80a9..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xyup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xyuphi.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xyuphi.png deleted file mode 100644 index 57bf5afd..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_xyuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_y.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_y.png index 13f4ab95..92766e8e 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_y.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_y.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_ychkd.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_ychkd.png deleted file mode 100644 index e286be6d..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_ychkd.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_ychkdhi.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_ychkdhi.png deleted file mode 100644 index 068d09c2..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_ychkdhi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_ydown.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_ydown.png index 658e7d55..425e800d 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_ydown.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_ydown.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_yup.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_yup.png deleted file mode 100644 index b44eadce..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_yup.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_yuphi.png b/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_yuphi.png deleted file mode 100644 index 4ce9d2b3..00000000 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_scale_yuphi.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C index 4c074232..c6b1cf28 100644 --- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C +++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C @@ -321,27 +321,58 @@ void UNFLATTHEME::initialize() "mask_button_dn.png", "mask_all_smooth_images"); + new_button("mask_prst_sqr.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_sqr_images"); + new_button("mask_prst_crc.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_crc_images"); + new_button("mask_prst_tri.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_tri_images"); + new_button("mask_prst_ovl.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_ovl_images"); + + new_button("mask_prst_load.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_load_images"); + new_button("mask_prst_save.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_save_images"); + new_button("mask_prst_trsh.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_prst_trsh_images"); + + new_button("mask_pstn_cen.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_cen_images"); + new_button("mask_pstn_nrm.png", + "mask_button_up.png", + "mask_button_hi.png", + "mask_button_dn.png", + "mask_pstn_nrm_images"); + resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); + "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png", + "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png", + "d.png", "e.png", "f.png", "space.png", "dash.png"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); @@ -866,14 +897,14 @@ void UNFLATTHEME::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png", - "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png", + new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png", "mask_scale_x"); - new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png", - "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png", + new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png", "mask_scale_y"); - new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png", - "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png", + new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png", + "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png", "mask_scale_xy"); flush_images();