From: Good Guy Date: Wed, 25 Oct 2017 18:25:29 +0000 (-0600) Subject: bootstrap cinfinity picons, rework picon access, chaninfo tweak X-Git-Url: http://git.cinelerra-gg.org/git/?a=commitdiff_plain;ds=sidebyside;h=15df6cbff7373d232ae0b8dcaecd9aa51ff5c388;hp=a9288f4aa494cc2e76d5eb2f54e2a7561c4a35b4;p=goodguy%2Fhistory.git bootstrap cinfinity picons, rework picon access, chaninfo tweak --- diff --git a/cinelerra-5.1/Makefile.am b/cinelerra-5.1/Makefile.am index 70f4728f..0667d93c 100644 --- a/cinelerra-5.1/Makefile.am +++ b/cinelerra-5.1/Makefile.am @@ -36,7 +36,11 @@ binstall: install-recursive > "bin/applications/$(WANT_CIN).desktop" cp -a image/cin.svg "bin/pixmaps/$(WANT_CIN)".svg cp -a image/cin.xpm "bin/pixmaps/$(WANT_CIN)".xpm - for d in picon*; do cp -a $$d/. bin/plugins/$$d/.; done + mkdir -p bin/plugins/picon/cinfinity + for d in picon/*; do \ + if [ $$d = picon/cinfinity ]; then continue; fi; \ + cp -a $$d bin/plugins/picon/.; \ + done cp -a db/utils/new_db "bin/cin_db" buninstall: diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile index 63869513..acb85aaa 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -456,7 +456,7 @@ $(DCRAW): dcraw.C $(THEME_DATA): cd $(OBJDIR) && \ - $(GUICAST)/$(OBJDIR)/bootstrap theme_data.o $(CINELERRA)/data/mode_*.png + $(GUICAST)/$(OBJDIR)/bootstrap theme_data.o $(TOPDIR)/picon/cinfinity/*.png val-%: @echo $($(subst val-,,$@)) diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index b93b354e..8b3bd1a2 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -519,15 +519,21 @@ VFrame *AWindowGUI::get_picon(const char *name, const char *plugin_icons) { char png_path[BCTEXTLEN]; char *pp = png_path, *ep = pp + sizeof(png_path)-1; - snprintf(pp, ep-pp, "%s/picon_%s/%s.png", + snprintf(pp, ep-pp, "%s/picon/%s/%s.png", File::get_plugin_path(), plugin_icons, name); + if( access(png_path, R_OK) ) return 0; return VFramePng::vframe_png(png_path,0,0); } VFrame *AWindowGUI::get_picon(const char *name) { VFrame *vframe = get_picon(name, mwindow->preferences->plugin_icons); - if( !vframe ) vframe = get_picon(name, DEFAULT_PICON); + if( !vframe ) { + char png_name[BCSTRLEN], *pp = png_name, *ep = pp + sizeof(png_name)-1; + snprintf(pp, ep-pp, "%s.png", name); + unsigned char *data = mwindow->theme->get_image_data(png_name); + if( data ) vframe = new VFramePng(data, 0.); + } return vframe; } @@ -839,17 +845,19 @@ void AWindowRemovePlugin::handle_close_event(int result) snprintf(index_path, sizeof(index_path), "%s/%s", mwindow->preferences->plugin_dir, PLUGIN_FILE); remove(index_path); + char picon_path[BCTEXTLEN]; FileSystem fs; - fs.update(File::get_plugin_path()); + snprintf(picon_path, sizeof(picon_path), "%s/picon", + File::get_plugin_path()); + char png_name[BCSTRLEN], png_path[BCTEXTLEN]; + plugin->get_plugin_png_name(png_name); + fs.update(picon_path); for( int i=0; ipath; if( !fs.is_dir(fs_path) ) continue; - char *cp = strrchr(fs_path,'/'); - cp = !cp ? fs_path : cp+1; - if( strncmp("picon_", cp, 6) ) continue; - char png_path[BCTEXTLEN]; - if( !plugin->get_plugin_png_path(png_path, cp+6) ) - remove(png_path); + snprintf(png_path, sizeof(picon_path), "%s/%s", + fs_path, png_name); + remove(png_path); } delete plugin; plugin = 0; awindow->gui->async_update_assets(); diff --git a/cinelerra-5.1/cinelerra/channelinfo.C b/cinelerra-5.1/cinelerra/channelinfo.C index 4a5bdaad..3d1fa69f 100644 --- a/cinelerra-5.1/cinelerra/channelinfo.C +++ b/cinelerra-5.1/cinelerra/channelinfo.C @@ -262,9 +262,9 @@ void ChanSearchGUI::create_objects() int pady = BC_TextBox::calculate_h(this, MEDIUMFONT, 0, 1) + 5; int padx = BC_Title::calculate_w(this, (char*)"X", MEDIUMFONT); int x = padx/2, y = pady/4; - text_x = x; text_y = y; BC_Title *title = new BC_Title(text_x, text_y, _("Text:"), MEDIUMFONT, YELLOW); add_subwindow(title); x += title->get_w(); + text_x = x; text_y = y; search_text = new ChanSearchText(this, x, y, get_w()-x-10); add_subwindow(search_text); x = padx; y += pady + 5; diff --git a/cinelerra-5.1/cinelerra/pluginserver.C b/cinelerra-5.1/cinelerra/pluginserver.C index e7d121f6..20e08325 100644 --- a/cinelerra-5.1/cinelerra/pluginserver.C +++ b/cinelerra-5.1/cinelerra/pluginserver.C @@ -1222,17 +1222,24 @@ Theme* PluginServer::get_theme() } -int PluginServer::get_plugin_png_path(char *png_path, const char *plugin_icons) +void PluginServer::get_plugin_png_name(char *png_name) { - char *pp = png_path, *ep = pp + BCTEXTLEN-1; - pp += snprintf(pp, ep-pp, "%s/picon_%s/", - File::get_plugin_path(), plugin_icons); + char *pp = png_name, *ep = pp + BCSTRLEN-1; char *cp = strrchr(path, '/'); cp = !cp ? path : cp+1; char *sp = strrchr(cp, '.'); if( !sp ) sp = cp+strlen(cp); while( pp < ep && cp < sp ) *pp++ = *cp++; snprintf(pp, ep-pp, ".png"); +} + +int PluginServer::get_plugin_png_path(char *png_path, const char *plugin_icons) +{ + char png_name[BCSTRLEN]; + get_plugin_png_name(png_name); + char *pp = png_path, *ep = pp + BCTEXTLEN-1; + pp += snprintf(pp, ep-pp, "%s/picon_%s/%s", + File::get_plugin_path(), plugin_icons, png_name); return access(png_path,R_OK) ? 1 : 0; } @@ -1246,8 +1253,12 @@ int PluginServer::get_plugin_png_path(char *png_path) VFrame *PluginServer::get_plugin_images() { char png_path[BCTEXTLEN]; - if( get_plugin_png_path(png_path) ) return 0; - return VFramePng::vframe_png(png_path,0,0); + if( !get_plugin_png_path(png_path) ) + return VFramePng::vframe_png(png_path,0,0); + char png_name[BCSTRLEN]; + get_plugin_png_name(png_name); + unsigned char *data = mwindow->theme->get_image_data(png_name); + return data ? new VFramePng(data, 0.) : 0; } VFrame *PluginServer::get_picon() diff --git a/cinelerra-5.1/cinelerra/pluginserver.h b/cinelerra-5.1/cinelerra/pluginserver.h index 62b65f97..a99dc5d8 100644 --- a/cinelerra-5.1/cinelerra/pluginserver.h +++ b/cinelerra-5.1/cinelerra/pluginserver.h @@ -125,6 +125,7 @@ public: EDL *edl, Plugin *plugin); // close the plugin int close_plugin(); + void get_plugin_png_name(char *png_name); int get_plugin_png_path(char *png_path, const char *plugin_icons); int get_plugin_png_path(char *png_path); void dump(FILE *fp=stdout); diff --git a/cinelerra-5.1/plugins/echo/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/.png similarity index 100% rename from cinelerra-5.1/plugins/echo/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/.png diff --git a/cinelerra-5.1/plugins/1080to480/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/1080to480.png similarity index 100% rename from cinelerra-5.1/plugins/1080to480/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/1080to480.png diff --git a/cinelerra-5.1/plugins/1080to540/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/1080to540.png similarity index 100% rename from cinelerra-5.1/plugins/1080to540/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/1080to540.png diff --git a/cinelerra-5.1/plugins/C41/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/C41.png similarity index 100% rename from cinelerra-5.1/plugins/C41/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/C41.png diff --git a/cinelerra-5.1/picon_cinfinity/aeffect_folder.png b/cinelerra-5.1/picon/cinfinity/aeffect_folder.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/aeffect_folder.png rename to cinelerra-5.1/picon/cinfinity/aeffect_folder.png diff --git a/cinelerra-5.1/picon_cinfinity/aeffect_icon.png b/cinelerra-5.1/picon/cinfinity/aeffect_icon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/aeffect_icon.png rename to cinelerra-5.1/picon/cinfinity/aeffect_icon.png diff --git a/cinelerra-5.1/plugins/aging/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/aging.png similarity index 100% rename from cinelerra-5.1/plugins/aging/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/aging.png diff --git a/cinelerra-5.1/picon_cinfinity/atransition_folder.png b/cinelerra-5.1/picon/cinfinity/atransition_folder.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/atransition_folder.png rename to cinelerra-5.1/picon/cinfinity/atransition_folder.png diff --git a/cinelerra-5.1/picon_cinfinity/atransition_icon.png b/cinelerra-5.1/picon/cinfinity/atransition_icon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/atransition_icon.png rename to cinelerra-5.1/picon/cinfinity/atransition_icon.png diff --git a/cinelerra-5.1/picon_cinfinity/audio_icon.png b/cinelerra-5.1/picon/cinfinity/audio_icon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/audio_icon.png rename to cinelerra-5.1/picon/cinfinity/audio_icon.png diff --git a/cinelerra-5.1/plugins/audioscope/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/audioscope.png similarity index 100% rename from cinelerra-5.1/plugins/audioscope/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/audioscope.png diff --git a/cinelerra-5.1/plugins/bandslide/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/bandslide.png similarity index 100% rename from cinelerra-5.1/plugins/bandslide/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/bandslide.png diff --git a/cinelerra-5.1/plugins/bandwipe/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/bandwipe.png similarity index 100% rename from cinelerra-5.1/plugins/bandwipe/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/bandwipe.png diff --git a/cinelerra-5.1/plugins/bluebanana/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/bluebanana.png similarity index 100% rename from cinelerra-5.1/plugins/bluebanana/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/bluebanana.png diff --git a/cinelerra-5.1/plugins/blur/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/blur.png similarity index 100% rename from cinelerra-5.1/plugins/blur/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/blur.png diff --git a/cinelerra-5.1/plugins/brightness/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/brightness.png similarity index 100% rename from cinelerra-5.1/plugins/brightness/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/brightness.png diff --git a/cinelerra-5.1/plugins/burn/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/burn.png similarity index 100% rename from cinelerra-5.1/plugins/burn/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/burn.png diff --git a/cinelerra-5.1/plugins/chromakey/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/chromakey.png similarity index 100% rename from cinelerra-5.1/plugins/chromakey/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/chromakey.png diff --git a/cinelerra-5.1/plugins/chromakeyhsv/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/chromakeyhsv.png similarity index 100% rename from cinelerra-5.1/plugins/chromakeyhsv/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/chromakeyhsv.png diff --git a/cinelerra-5.1/picon_cinfinity/clip_folder.png b/cinelerra-5.1/picon/cinfinity/clip_folder.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/clip_folder.png rename to cinelerra-5.1/picon/cinfinity/clip_folder.png diff --git a/cinelerra-5.1/picon_cinfinity/clip_icon.png b/cinelerra-5.1/picon/cinfinity/clip_icon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/clip_icon.png rename to cinelerra-5.1/picon/cinfinity/clip_icon.png diff --git a/cinelerra-5.1/plugins/color3way/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/color3way.png similarity index 100% rename from cinelerra-5.1/plugins/color3way/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/color3way.png diff --git a/cinelerra-5.1/plugins/colorbalance/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/colorbalance.png similarity index 100% rename from cinelerra-5.1/plugins/colorbalance/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/colorbalance.png diff --git a/cinelerra-5.1/plugins/compressor/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/compressor.png similarity index 100% rename from cinelerra-5.1/plugins/compressor/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/compressor.png diff --git a/cinelerra-5.1/plugins/crikey/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/crikey.png similarity index 100% rename from cinelerra-5.1/plugins/crikey/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/crikey.png diff --git a/cinelerra-5.1/plugins/crossfade/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/crossfade.png similarity index 100% rename from cinelerra-5.1/plugins/crossfade/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/crossfade.png diff --git a/cinelerra-5.1/plugins/dcoffset/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/dcoffset.png similarity index 100% rename from cinelerra-5.1/plugins/dcoffset/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/dcoffset.png diff --git a/cinelerra-5.1/plugins/decimate/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/decimate.png similarity index 100% rename from cinelerra-5.1/plugins/decimate/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/decimate.png diff --git a/cinelerra-5.1/plugins/deinterlace-cv/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/deinterlace-cv.png similarity index 100% rename from cinelerra-5.1/plugins/deinterlace-cv/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/deinterlace-cv.png diff --git a/cinelerra-5.1/plugins/deinterlace/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/deinterlace.png similarity index 100% rename from cinelerra-5.1/plugins/deinterlace/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/deinterlace.png diff --git a/cinelerra-5.1/plugins/delayaudio/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/delayaudio.png similarity index 100% rename from cinelerra-5.1/plugins/delayaudio/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/delayaudio.png diff --git a/cinelerra-5.1/plugins/delayvideo/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/delayvideo.png similarity index 100% rename from cinelerra-5.1/plugins/delayvideo/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/delayvideo.png diff --git a/cinelerra-5.1/plugins/denoise/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/denoise.png similarity index 100% rename from cinelerra-5.1/plugins/denoise/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/denoise.png diff --git a/cinelerra-5.1/plugins/denoisefft/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/denoisefft.png similarity index 100% rename from cinelerra-5.1/plugins/denoisefft/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/denoisefft.png diff --git a/cinelerra-5.1/plugins/denoisevideo/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/denoisevideo.png similarity index 100% rename from cinelerra-5.1/plugins/denoisevideo/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/denoisevideo.png diff --git a/cinelerra-5.1/plugins/despike/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/despike.png similarity index 100% rename from cinelerra-5.1/plugins/despike/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/despike.png diff --git a/cinelerra-5.1/plugins/diffkey/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/diffkey.png similarity index 100% rename from cinelerra-5.1/plugins/diffkey/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/diffkey.png diff --git a/cinelerra-5.1/plugins/dissolve/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/dissolve.png similarity index 100% rename from cinelerra-5.1/plugins/dissolve/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/dissolve.png diff --git a/cinelerra-5.1/plugins/dot/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/dot.png similarity index 100% rename from cinelerra-5.1/plugins/dot/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/dot.png diff --git a/cinelerra-5.1/plugins/downsample/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/downsample.png similarity index 100% rename from cinelerra-5.1/plugins/downsample/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/downsample.png diff --git a/cinelerra-5.1/plugins/echocancel/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/echocancel.png similarity index 100% rename from cinelerra-5.1/plugins/echocancel/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/echocancel.png diff --git a/cinelerra-5.1/plugins/edge/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/edge.png similarity index 100% rename from cinelerra-5.1/plugins/edge/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/edge.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_abench.png b/cinelerra-5.1/picon/cinfinity/ff_abench.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_abench.png rename to cinelerra-5.1/picon/cinfinity/ff_abench.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_acompressor.png b/cinelerra-5.1/picon/cinfinity/ff_acompressor.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_acompressor.png rename to cinelerra-5.1/picon/cinfinity/ff_acompressor.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_acrusher.png b/cinelerra-5.1/picon/cinfinity/ff_acrusher.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_acrusher.png rename to cinelerra-5.1/picon/cinfinity/ff_acrusher.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_adelay.png b/cinelerra-5.1/picon/cinfinity/ff_adelay.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_adelay.png rename to cinelerra-5.1/picon/cinfinity/ff_adelay.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_aecho.png b/cinelerra-5.1/picon/cinfinity/ff_aecho.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_aecho.png rename to cinelerra-5.1/picon/cinfinity/ff_aecho.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_aemphasis.png b/cinelerra-5.1/picon/cinfinity/ff_aemphasis.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_aemphasis.png rename to cinelerra-5.1/picon/cinfinity/ff_aemphasis.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_aeval.png b/cinelerra-5.1/picon/cinfinity/ff_aeval.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_aeval.png rename to cinelerra-5.1/picon/cinfinity/ff_aeval.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_afade.png b/cinelerra-5.1/picon/cinfinity/ff_afade.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_afade.png rename to cinelerra-5.1/picon/cinfinity/ff_afade.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_agate.png b/cinelerra-5.1/picon/cinfinity/ff_agate.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_agate.png rename to cinelerra-5.1/picon/cinfinity/ff_agate.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_allpass.png b/cinelerra-5.1/picon/cinfinity/ff_allpass.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_allpass.png rename to cinelerra-5.1/picon/cinfinity/ff_allpass.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_aloop.png b/cinelerra-5.1/picon/cinfinity/ff_aloop.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_aloop.png rename to cinelerra-5.1/picon/cinfinity/ff_aloop.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_aperms.png b/cinelerra-5.1/picon/cinfinity/ff_aperms.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_aperms.png rename to cinelerra-5.1/picon/cinfinity/ff_aperms.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_aphaser.png b/cinelerra-5.1/picon/cinfinity/ff_aphaser.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_aphaser.png rename to cinelerra-5.1/picon/cinfinity/ff_aphaser.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_arealtime.png b/cinelerra-5.1/picon/cinfinity/ff_arealtime.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_arealtime.png rename to cinelerra-5.1/picon/cinfinity/ff_arealtime.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_aresample.png b/cinelerra-5.1/picon/cinfinity/ff_aresample.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_aresample.png rename to cinelerra-5.1/picon/cinfinity/ff_aresample.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_astats.png b/cinelerra-5.1/picon/cinfinity/ff_astats.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_astats.png rename to cinelerra-5.1/picon/cinfinity/ff_astats.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_atadenoise.png b/cinelerra-5.1/picon/cinfinity/ff_atadenoise.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_atadenoise.png rename to cinelerra-5.1/picon/cinfinity/ff_atadenoise.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_atempo.png b/cinelerra-5.1/picon/cinfinity/ff_atempo.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_atempo.png rename to cinelerra-5.1/picon/cinfinity/ff_atempo.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_atrim.png b/cinelerra-5.1/picon/cinfinity/ff_atrim.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_atrim.png rename to cinelerra-5.1/picon/cinfinity/ff_atrim.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_audio.png b/cinelerra-5.1/picon/cinfinity/ff_audio.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_audio.png rename to cinelerra-5.1/picon/cinfinity/ff_audio.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_avgblur.png b/cinelerra-5.1/picon/cinfinity/ff_avgblur.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_avgblur.png rename to cinelerra-5.1/picon/cinfinity/ff_avgblur.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_bandpass.png b/cinelerra-5.1/picon/cinfinity/ff_bandpass.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_bandpass.png rename to cinelerra-5.1/picon/cinfinity/ff_bandpass.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_bandreject.png b/cinelerra-5.1/picon/cinfinity/ff_bandreject.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_bandreject.png rename to cinelerra-5.1/picon/cinfinity/ff_bandreject.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_bass.png b/cinelerra-5.1/picon/cinfinity/ff_bass.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_bass.png rename to cinelerra-5.1/picon/cinfinity/ff_bass.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_bbox.png b/cinelerra-5.1/picon/cinfinity/ff_bbox.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_bbox.png rename to cinelerra-5.1/picon/cinfinity/ff_bbox.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_bench.png b/cinelerra-5.1/picon/cinfinity/ff_bench.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_bench.png rename to cinelerra-5.1/picon/cinfinity/ff_bench.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_biquad.png b/cinelerra-5.1/picon/cinfinity/ff_biquad.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_biquad.png rename to cinelerra-5.1/picon/cinfinity/ff_biquad.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_bitplanenoise.png b/cinelerra-5.1/picon/cinfinity/ff_bitplanenoise.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_bitplanenoise.png rename to cinelerra-5.1/picon/cinfinity/ff_bitplanenoise.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_blackdetect.png b/cinelerra-5.1/picon/cinfinity/ff_blackdetect.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_blackdetect.png rename to cinelerra-5.1/picon/cinfinity/ff_blackdetect.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_blackframe.png b/cinelerra-5.1/picon/cinfinity/ff_blackframe.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_blackframe.png rename to cinelerra-5.1/picon/cinfinity/ff_blackframe.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_boxblur.png b/cinelerra-5.1/picon/cinfinity/ff_boxblur.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_boxblur.png rename to cinelerra-5.1/picon/cinfinity/ff_boxblur.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_bwdif.png b/cinelerra-5.1/picon/cinfinity/ff_bwdif.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_bwdif.png rename to cinelerra-5.1/picon/cinfinity/ff_bwdif.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_chorus.png b/cinelerra-5.1/picon/cinfinity/ff_chorus.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_chorus.png rename to cinelerra-5.1/picon/cinfinity/ff_chorus.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_chromakey.png b/cinelerra-5.1/picon/cinfinity/ff_chromakey.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_chromakey.png rename to cinelerra-5.1/picon/cinfinity/ff_chromakey.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_ciescope.png b/cinelerra-5.1/picon/cinfinity/ff_ciescope.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_ciescope.png rename to cinelerra-5.1/picon/cinfinity/ff_ciescope.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_colorbalance.png b/cinelerra-5.1/picon/cinfinity/ff_colorbalance.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_colorbalance.png rename to cinelerra-5.1/picon/cinfinity/ff_colorbalance.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_colorchannelmixer.png b/cinelerra-5.1/picon/cinfinity/ff_colorchannelmixer.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_colorchannelmixer.png rename to cinelerra-5.1/picon/cinfinity/ff_colorchannelmixer.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_colorkey.png b/cinelerra-5.1/picon/cinfinity/ff_colorkey.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_colorkey.png rename to cinelerra-5.1/picon/cinfinity/ff_colorkey.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_colorlevels.png b/cinelerra-5.1/picon/cinfinity/ff_colorlevels.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_colorlevels.png rename to cinelerra-5.1/picon/cinfinity/ff_colorlevels.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_colormatrix.png b/cinelerra-5.1/picon/cinfinity/ff_colormatrix.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_colormatrix.png rename to cinelerra-5.1/picon/cinfinity/ff_colormatrix.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_compand.png b/cinelerra-5.1/picon/cinfinity/ff_compand.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_compand.png rename to cinelerra-5.1/picon/cinfinity/ff_compand.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_compensationdelay.png b/cinelerra-5.1/picon/cinfinity/ff_compensationdelay.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_compensationdelay.png rename to cinelerra-5.1/picon/cinfinity/ff_compensationdelay.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_cover_rect.png b/cinelerra-5.1/picon/cinfinity/ff_cover_rect.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_cover_rect.png rename to cinelerra-5.1/picon/cinfinity/ff_cover_rect.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_crop.png b/cinelerra-5.1/picon/cinfinity/ff_crop.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_crop.png rename to cinelerra-5.1/picon/cinfinity/ff_crop.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_cropdetect.png b/cinelerra-5.1/picon/cinfinity/ff_cropdetect.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_cropdetect.png rename to cinelerra-5.1/picon/cinfinity/ff_cropdetect.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_crystalizer.png b/cinelerra-5.1/picon/cinfinity/ff_crystalizer.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_crystalizer.png rename to cinelerra-5.1/picon/cinfinity/ff_crystalizer.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_datascope.png b/cinelerra-5.1/picon/cinfinity/ff_datascope.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_datascope.png rename to cinelerra-5.1/picon/cinfinity/ff_datascope.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_dcshift.png b/cinelerra-5.1/picon/cinfinity/ff_dcshift.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_dcshift.png rename to cinelerra-5.1/picon/cinfinity/ff_dcshift.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_deband.png b/cinelerra-5.1/picon/cinfinity/ff_deband.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_deband.png rename to cinelerra-5.1/picon/cinfinity/ff_deband.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_deflate.png b/cinelerra-5.1/picon/cinfinity/ff_deflate.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_deflate.png rename to cinelerra-5.1/picon/cinfinity/ff_deflate.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_dejudder.png b/cinelerra-5.1/picon/cinfinity/ff_dejudder.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_dejudder.png rename to cinelerra-5.1/picon/cinfinity/ff_dejudder.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_delogo.png b/cinelerra-5.1/picon/cinfinity/ff_delogo.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_delogo.png rename to cinelerra-5.1/picon/cinfinity/ff_delogo.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_deshake.png b/cinelerra-5.1/picon/cinfinity/ff_deshake.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_deshake.png rename to cinelerra-5.1/picon/cinfinity/ff_deshake.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_dilation.png b/cinelerra-5.1/picon/cinfinity/ff_dilation.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_dilation.png rename to cinelerra-5.1/picon/cinfinity/ff_dilation.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_drawbox.png b/cinelerra-5.1/picon/cinfinity/ff_drawbox.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_drawbox.png rename to cinelerra-5.1/picon/cinfinity/ff_drawbox.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_drawgraph.png b/cinelerra-5.1/picon/cinfinity/ff_drawgraph.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_drawgraph.png rename to cinelerra-5.1/picon/cinfinity/ff_drawgraph.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_drawgrid.png b/cinelerra-5.1/picon/cinfinity/ff_drawgrid.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_drawgrid.png rename to cinelerra-5.1/picon/cinfinity/ff_drawgrid.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_dynaudnorm.png b/cinelerra-5.1/picon/cinfinity/ff_dynaudnorm.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_dynaudnorm.png rename to cinelerra-5.1/picon/cinfinity/ff_dynaudnorm.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_earwax.png b/cinelerra-5.1/picon/cinfinity/ff_earwax.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_earwax.png rename to cinelerra-5.1/picon/cinfinity/ff_earwax.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_edgedetect.png b/cinelerra-5.1/picon/cinfinity/ff_edgedetect.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_edgedetect.png rename to cinelerra-5.1/picon/cinfinity/ff_edgedetect.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_elbg.png b/cinelerra-5.1/picon/cinfinity/ff_elbg.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_elbg.png rename to cinelerra-5.1/picon/cinfinity/ff_elbg.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_eq.png b/cinelerra-5.1/picon/cinfinity/ff_eq.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_eq.png rename to cinelerra-5.1/picon/cinfinity/ff_eq.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_equalizer.png b/cinelerra-5.1/picon/cinfinity/ff_equalizer.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_equalizer.png rename to cinelerra-5.1/picon/cinfinity/ff_equalizer.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_erosion.png b/cinelerra-5.1/picon/cinfinity/ff_erosion.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_erosion.png rename to cinelerra-5.1/picon/cinfinity/ff_erosion.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_extrastereo.png b/cinelerra-5.1/picon/cinfinity/ff_extrastereo.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_extrastereo.png rename to cinelerra-5.1/picon/cinfinity/ff_extrastereo.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_fade.png b/cinelerra-5.1/picon/cinfinity/ff_fade.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_fade.png rename to cinelerra-5.1/picon/cinfinity/ff_fade.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_fftfilt.png b/cinelerra-5.1/picon/cinfinity/ff_fftfilt.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_fftfilt.png rename to cinelerra-5.1/picon/cinfinity/ff_fftfilt.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_field.png b/cinelerra-5.1/picon/cinfinity/ff_field.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_field.png rename to cinelerra-5.1/picon/cinfinity/ff_field.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_fieldorder.png b/cinelerra-5.1/picon/cinfinity/ff_fieldorder.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_fieldorder.png rename to cinelerra-5.1/picon/cinfinity/ff_fieldorder.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_flanger.png b/cinelerra-5.1/picon/cinfinity/ff_flanger.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_flanger.png rename to cinelerra-5.1/picon/cinfinity/ff_flanger.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_framerate.png b/cinelerra-5.1/picon/cinfinity/ff_framerate.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_framerate.png rename to cinelerra-5.1/picon/cinfinity/ff_framerate.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_fspp.png b/cinelerra-5.1/picon/cinfinity/ff_fspp.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_fspp.png rename to cinelerra-5.1/picon/cinfinity/ff_fspp.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_gblur.png b/cinelerra-5.1/picon/cinfinity/ff_gblur.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_gblur.png rename to cinelerra-5.1/picon/cinfinity/ff_gblur.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_gradfun.png b/cinelerra-5.1/picon/cinfinity/ff_gradfun.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_gradfun.png rename to cinelerra-5.1/picon/cinfinity/ff_gradfun.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_hflip.png b/cinelerra-5.1/picon/cinfinity/ff_hflip.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_hflip.png rename to cinelerra-5.1/picon/cinfinity/ff_hflip.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_highpass.png b/cinelerra-5.1/picon/cinfinity/ff_highpass.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_highpass.png rename to cinelerra-5.1/picon/cinfinity/ff_highpass.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_histeq.png b/cinelerra-5.1/picon/cinfinity/ff_histeq.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_histeq.png rename to cinelerra-5.1/picon/cinfinity/ff_histeq.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_histogram.png b/cinelerra-5.1/picon/cinfinity/ff_histogram.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_histogram.png rename to cinelerra-5.1/picon/cinfinity/ff_histogram.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_hqdn3d.png b/cinelerra-5.1/picon/cinfinity/ff_hqdn3d.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_hqdn3d.png rename to cinelerra-5.1/picon/cinfinity/ff_hqdn3d.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_hqx.png b/cinelerra-5.1/picon/cinfinity/ff_hqx.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_hqx.png rename to cinelerra-5.1/picon/cinfinity/ff_hqx.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_hue.png b/cinelerra-5.1/picon/cinfinity/ff_hue.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_hue.png rename to cinelerra-5.1/picon/cinfinity/ff_hue.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_idet.png b/cinelerra-5.1/picon/cinfinity/ff_idet.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_idet.png rename to cinelerra-5.1/picon/cinfinity/ff_idet.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_il.png b/cinelerra-5.1/picon/cinfinity/ff_il.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_il.png rename to cinelerra-5.1/picon/cinfinity/ff_il.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_inflate.png b/cinelerra-5.1/picon/cinfinity/ff_inflate.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_inflate.png rename to cinelerra-5.1/picon/cinfinity/ff_inflate.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_interlace.png b/cinelerra-5.1/picon/cinfinity/ff_interlace.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_interlace.png rename to cinelerra-5.1/picon/cinfinity/ff_interlace.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_kerndeint.png b/cinelerra-5.1/picon/cinfinity/ff_kerndeint.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_kerndeint.png rename to cinelerra-5.1/picon/cinfinity/ff_kerndeint.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_lenscorrection.png b/cinelerra-5.1/picon/cinfinity/ff_lenscorrection.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_lenscorrection.png rename to cinelerra-5.1/picon/cinfinity/ff_lenscorrection.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_loop.png b/cinelerra-5.1/picon/cinfinity/ff_loop.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_loop.png rename to cinelerra-5.1/picon/cinfinity/ff_loop.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_loudnorm.png b/cinelerra-5.1/picon/cinfinity/ff_loudnorm.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_loudnorm.png rename to cinelerra-5.1/picon/cinfinity/ff_loudnorm.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_lowpass.png b/cinelerra-5.1/picon/cinfinity/ff_lowpass.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_lowpass.png rename to cinelerra-5.1/picon/cinfinity/ff_lowpass.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_lut.png b/cinelerra-5.1/picon/cinfinity/ff_lut.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_lut.png rename to cinelerra-5.1/picon/cinfinity/ff_lut.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_lutrgb.png b/cinelerra-5.1/picon/cinfinity/ff_lutrgb.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_lutrgb.png rename to cinelerra-5.1/picon/cinfinity/ff_lutrgb.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_lutyuv.png b/cinelerra-5.1/picon/cinfinity/ff_lutyuv.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_lutyuv.png rename to cinelerra-5.1/picon/cinfinity/ff_lutyuv.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_mcdeint.png b/cinelerra-5.1/picon/cinfinity/ff_mcdeint.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_mcdeint.png rename to cinelerra-5.1/picon/cinfinity/ff_mcdeint.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_mestimate.png b/cinelerra-5.1/picon/cinfinity/ff_mestimate.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_mestimate.png rename to cinelerra-5.1/picon/cinfinity/ff_mestimate.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_mpdecimate.png b/cinelerra-5.1/picon/cinfinity/ff_mpdecimate.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_mpdecimate.png rename to cinelerra-5.1/picon/cinfinity/ff_mpdecimate.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_negate.png b/cinelerra-5.1/picon/cinfinity/ff_negate.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_negate.png rename to cinelerra-5.1/picon/cinfinity/ff_negate.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_nlmeans.png b/cinelerra-5.1/picon/cinfinity/ff_nlmeans.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_nlmeans.png rename to cinelerra-5.1/picon/cinfinity/ff_nlmeans.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_noise.png b/cinelerra-5.1/picon/cinfinity/ff_noise.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_noise.png rename to cinelerra-5.1/picon/cinfinity/ff_noise.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_owdenoise.png b/cinelerra-5.1/picon/cinfinity/ff_owdenoise.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_owdenoise.png rename to cinelerra-5.1/picon/cinfinity/ff_owdenoise.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_perms.png b/cinelerra-5.1/picon/cinfinity/ff_perms.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_perms.png rename to cinelerra-5.1/picon/cinfinity/ff_perms.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_perspective.png b/cinelerra-5.1/picon/cinfinity/ff_perspective.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_perspective.png rename to cinelerra-5.1/picon/cinfinity/ff_perspective.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_phase.png b/cinelerra-5.1/picon/cinfinity/ff_phase.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_phase.png rename to cinelerra-5.1/picon/cinfinity/ff_phase.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_pp.png b/cinelerra-5.1/picon/cinfinity/ff_pp.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_pp.png rename to cinelerra-5.1/picon/cinfinity/ff_pp.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_pp7.png b/cinelerra-5.1/picon/cinfinity/ff_pp7.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_pp7.png rename to cinelerra-5.1/picon/cinfinity/ff_pp7.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_prewitt.png b/cinelerra-5.1/picon/cinfinity/ff_prewitt.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_prewitt.png rename to cinelerra-5.1/picon/cinfinity/ff_prewitt.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_readeia608.png b/cinelerra-5.1/picon/cinfinity/ff_readeia608.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_readeia608.png rename to cinelerra-5.1/picon/cinfinity/ff_readeia608.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_readvitc.png b/cinelerra-5.1/picon/cinfinity/ff_readvitc.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_readvitc.png rename to cinelerra-5.1/picon/cinfinity/ff_readvitc.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_realtime.png b/cinelerra-5.1/picon/cinfinity/ff_realtime.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_realtime.png rename to cinelerra-5.1/picon/cinfinity/ff_realtime.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_removegrain.png b/cinelerra-5.1/picon/cinfinity/ff_removegrain.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_removegrain.png rename to cinelerra-5.1/picon/cinfinity/ff_removegrain.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_repeatfields.png b/cinelerra-5.1/picon/cinfinity/ff_repeatfields.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_repeatfields.png rename to cinelerra-5.1/picon/cinfinity/ff_repeatfields.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_rotate.png b/cinelerra-5.1/picon/cinfinity/ff_rotate.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_rotate.png rename to cinelerra-5.1/picon/cinfinity/ff_rotate.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_sab.png b/cinelerra-5.1/picon/cinfinity/ff_sab.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_sab.png rename to cinelerra-5.1/picon/cinfinity/ff_sab.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_separatefields.png b/cinelerra-5.1/picon/cinfinity/ff_separatefields.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_separatefields.png rename to cinelerra-5.1/picon/cinfinity/ff_separatefields.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_showinfo.png b/cinelerra-5.1/picon/cinfinity/ff_showinfo.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_showinfo.png rename to cinelerra-5.1/picon/cinfinity/ff_showinfo.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_shuffleframes.png b/cinelerra-5.1/picon/cinfinity/ff_shuffleframes.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_shuffleframes.png rename to cinelerra-5.1/picon/cinfinity/ff_shuffleframes.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_shuffleplanes.png b/cinelerra-5.1/picon/cinfinity/ff_shuffleplanes.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_shuffleplanes.png rename to cinelerra-5.1/picon/cinfinity/ff_shuffleplanes.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_signalstats.png b/cinelerra-5.1/picon/cinfinity/ff_signalstats.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_signalstats.png rename to cinelerra-5.1/picon/cinfinity/ff_signalstats.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_silenceremove.png b/cinelerra-5.1/picon/cinfinity/ff_silenceremove.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_silenceremove.png rename to cinelerra-5.1/picon/cinfinity/ff_silenceremove.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_sine.png b/cinelerra-5.1/picon/cinfinity/ff_sine.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_sine.png rename to cinelerra-5.1/picon/cinfinity/ff_sine.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_smartblur.png b/cinelerra-5.1/picon/cinfinity/ff_smartblur.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_smartblur.png rename to cinelerra-5.1/picon/cinfinity/ff_smartblur.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_sobel.png b/cinelerra-5.1/picon/cinfinity/ff_sobel.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_sobel.png rename to cinelerra-5.1/picon/cinfinity/ff_sobel.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_spp.png b/cinelerra-5.1/picon/cinfinity/ff_spp.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_spp.png rename to cinelerra-5.1/picon/cinfinity/ff_spp.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_stereo3d.png b/cinelerra-5.1/picon/cinfinity/ff_stereo3d.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_stereo3d.png rename to cinelerra-5.1/picon/cinfinity/ff_stereo3d.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_stereotools.png b/cinelerra-5.1/picon/cinfinity/ff_stereotools.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_stereotools.png rename to cinelerra-5.1/picon/cinfinity/ff_stereotools.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_stereowiden.png b/cinelerra-5.1/picon/cinfinity/ff_stereowiden.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_stereowiden.png rename to cinelerra-5.1/picon/cinfinity/ff_stereowiden.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_super2xsai.png b/cinelerra-5.1/picon/cinfinity/ff_super2xsai.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_super2xsai.png rename to cinelerra-5.1/picon/cinfinity/ff_super2xsai.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_swaprect.png b/cinelerra-5.1/picon/cinfinity/ff_swaprect.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_swaprect.png rename to cinelerra-5.1/picon/cinfinity/ff_swaprect.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_swapuv.png b/cinelerra-5.1/picon/cinfinity/ff_swapuv.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_swapuv.png rename to cinelerra-5.1/picon/cinfinity/ff_swapuv.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_tinterlace.png b/cinelerra-5.1/picon/cinfinity/ff_tinterlace.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_tinterlace.png rename to cinelerra-5.1/picon/cinfinity/ff_tinterlace.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_transpose.png b/cinelerra-5.1/picon/cinfinity/ff_transpose.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_transpose.png rename to cinelerra-5.1/picon/cinfinity/ff_transpose.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_treble.png b/cinelerra-5.1/picon/cinfinity/ff_treble.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_treble.png rename to cinelerra-5.1/picon/cinfinity/ff_treble.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_tremolo.png b/cinelerra-5.1/picon/cinfinity/ff_tremolo.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_tremolo.png rename to cinelerra-5.1/picon/cinfinity/ff_tremolo.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_uspp.png b/cinelerra-5.1/picon/cinfinity/ff_uspp.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_uspp.png rename to cinelerra-5.1/picon/cinfinity/ff_uspp.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_vaguedenoiser.png b/cinelerra-5.1/picon/cinfinity/ff_vaguedenoiser.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_vaguedenoiser.png rename to cinelerra-5.1/picon/cinfinity/ff_vaguedenoiser.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_vectorscope.png b/cinelerra-5.1/picon/cinfinity/ff_vectorscope.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_vectorscope.png rename to cinelerra-5.1/picon/cinfinity/ff_vectorscope.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_vflip.png b/cinelerra-5.1/picon/cinfinity/ff_vflip.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_vflip.png rename to cinelerra-5.1/picon/cinfinity/ff_vflip.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_vibrato.png b/cinelerra-5.1/picon/cinfinity/ff_vibrato.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_vibrato.png rename to cinelerra-5.1/picon/cinfinity/ff_vibrato.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_video.png b/cinelerra-5.1/picon/cinfinity/ff_video.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_video.png rename to cinelerra-5.1/picon/cinfinity/ff_video.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_vignette.png b/cinelerra-5.1/picon/cinfinity/ff_vignette.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_vignette.png rename to cinelerra-5.1/picon/cinfinity/ff_vignette.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_volume.png b/cinelerra-5.1/picon/cinfinity/ff_volume.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_volume.png rename to cinelerra-5.1/picon/cinfinity/ff_volume.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_volumedetect.png b/cinelerra-5.1/picon/cinfinity/ff_volumedetect.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_volumedetect.png rename to cinelerra-5.1/picon/cinfinity/ff_volumedetect.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_w3fdif.png b/cinelerra-5.1/picon/cinfinity/ff_w3fdif.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_w3fdif.png rename to cinelerra-5.1/picon/cinfinity/ff_w3fdif.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_waveform.png b/cinelerra-5.1/picon/cinfinity/ff_waveform.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_waveform.png rename to cinelerra-5.1/picon/cinfinity/ff_waveform.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_weave.png b/cinelerra-5.1/picon/cinfinity/ff_weave.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_weave.png rename to cinelerra-5.1/picon/cinfinity/ff_weave.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_xbr.png b/cinelerra-5.1/picon/cinfinity/ff_xbr.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_xbr.png rename to cinelerra-5.1/picon/cinfinity/ff_xbr.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_yadif.png b/cinelerra-5.1/picon/cinfinity/ff_yadif.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_yadif.png rename to cinelerra-5.1/picon/cinfinity/ff_yadif.png diff --git a/cinelerra-5.1/picon_cinfinity/ff_zoompan.png b/cinelerra-5.1/picon/cinfinity/ff_zoompan.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/ff_zoompan.png rename to cinelerra-5.1/picon/cinfinity/ff_zoompan.png diff --git a/cinelerra-5.1/plugins/fieldframe/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/fieldframe.png similarity index 100% rename from cinelerra-5.1/plugins/fieldframe/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/fieldframe.png diff --git a/cinelerra-5.1/picon_cinfinity/film_icon.png b/cinelerra-5.1/picon/cinfinity/film_icon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/film_icon.png rename to cinelerra-5.1/picon/cinfinity/film_icon.png diff --git a/cinelerra-5.1/plugins/findobj/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/findobj.png similarity index 100% rename from cinelerra-5.1/plugins/findobj/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/findobj.png diff --git a/cinelerra-5.1/plugins/flash/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/flash.png similarity index 100% rename from cinelerra-5.1/plugins/flash/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/flash.png diff --git a/cinelerra-5.1/plugins/flip/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/flip.png similarity index 100% rename from cinelerra-5.1/plugins/flip/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/flip.png diff --git a/cinelerra-5.1/picon_cinfinity/folder_icon.png b/cinelerra-5.1/picon/cinfinity/folder_icon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/folder_icon.png rename to cinelerra-5.1/picon/cinfinity/folder_icon.png diff --git a/cinelerra-5.1/plugins/framefield/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/framefield.png similarity index 100% rename from cinelerra-5.1/plugins/framefield/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/framefield.png diff --git a/cinelerra-5.1/plugins/freeverb/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/freeverb.png similarity index 100% rename from cinelerra-5.1/plugins/freeverb/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/freeverb.png diff --git a/cinelerra-5.1/plugins/freezeframe/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/freezeframe.png similarity index 100% rename from cinelerra-5.1/plugins/freezeframe/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/freezeframe.png diff --git a/cinelerra-5.1/plugins/gaborobj/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/gaborobj.png similarity index 100% rename from cinelerra-5.1/plugins/gaborobj/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/gaborobj.png diff --git a/cinelerra-5.1/plugins/gain/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/gain.png similarity index 100% rename from cinelerra-5.1/plugins/gain/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/gain.png diff --git a/cinelerra-5.1/plugins/gamma/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/gamma.png similarity index 100% rename from cinelerra-5.1/plugins/gamma/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/gamma.png diff --git a/cinelerra-5.1/plugins/gradient/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/gradient.png similarity index 100% rename from cinelerra-5.1/plugins/gradient/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/gradient.png diff --git a/cinelerra-5.1/plugins/graphic/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/graphic.png similarity index 100% rename from cinelerra-5.1/plugins/graphic/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/graphic.png diff --git a/cinelerra-5.1/plugins/histogram/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/histogram.png similarity index 100% rename from cinelerra-5.1/plugins/histogram/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/histogram.png diff --git a/cinelerra-5.1/plugins/histogram_bezier/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/histogram_bezier.png similarity index 100% rename from cinelerra-5.1/plugins/histogram_bezier/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/histogram_bezier.png diff --git a/cinelerra-5.1/plugins/holo/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/holo.png similarity index 100% rename from cinelerra-5.1/plugins/holo/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/holo.png diff --git a/cinelerra-5.1/plugins/huesaturation/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/huesaturation.png similarity index 100% rename from cinelerra-5.1/plugins/huesaturation/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/huesaturation.png diff --git a/cinelerra-5.1/plugins/interpolateaudio/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/interpolateaudio.png similarity index 100% rename from cinelerra-5.1/plugins/interpolateaudio/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/interpolateaudio.png diff --git a/cinelerra-5.1/plugins/interpolate/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/interpolatepixels.png similarity index 100% rename from cinelerra-5.1/plugins/interpolate/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/interpolatepixels.png diff --git a/cinelerra-5.1/plugins/interpolatevideo/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/interpolatevideo.png similarity index 100% rename from cinelerra-5.1/plugins/interpolatevideo/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/interpolatevideo.png diff --git a/cinelerra-5.1/plugins/invertaudio/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/invertaudio.png similarity index 100% rename from cinelerra-5.1/plugins/invertaudio/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/invertaudio.png diff --git a/cinelerra-5.1/plugins/invertvideo/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/invertvideo.png similarity index 100% rename from cinelerra-5.1/plugins/invertvideo/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/invertvideo.png diff --git a/cinelerra-5.1/plugins/irissquare/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/irissquare.png similarity index 100% rename from cinelerra-5.1/plugins/irissquare/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/irissquare.png diff --git a/cinelerra-5.1/plugins/ivtc/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/ivtc.png similarity index 100% rename from cinelerra-5.1/plugins/ivtc/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/ivtc.png diff --git a/cinelerra-5.1/picon_cinfinity/label_folder.png b/cinelerra-5.1/picon/cinfinity/label_folder.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/label_folder.png rename to cinelerra-5.1/picon/cinfinity/label_folder.png diff --git a/cinelerra-5.1/picon_cinfinity/label_icon.png b/cinelerra-5.1/picon/cinfinity/label_icon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/label_icon.png rename to cinelerra-5.1/picon/cinfinity/label_icon.png diff --git a/cinelerra-5.1/picon_cinfinity/lad_picon.png b/cinelerra-5.1/picon/cinfinity/lad_picon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/lad_picon.png rename to cinelerra-5.1/picon/cinfinity/lad_picon.png diff --git a/cinelerra-5.1/plugins/lens/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/lens.png similarity index 100% rename from cinelerra-5.1/plugins/lens/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/lens.png diff --git a/cinelerra-5.1/plugins/level/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/leveleffect.png similarity index 100% rename from cinelerra-5.1/plugins/level/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/leveleffect.png diff --git a/cinelerra-5.1/plugins/linearblur/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/linearblur.png similarity index 100% rename from cinelerra-5.1/plugins/linearblur/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/linearblur.png diff --git a/cinelerra-5.1/plugins/liveaudio/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/liveaudio.png similarity index 100% rename from cinelerra-5.1/plugins/liveaudio/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/liveaudio.png diff --git a/cinelerra-5.1/plugins/livevideo/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/livevideo.png similarity index 100% rename from cinelerra-5.1/plugins/livevideo/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/livevideo.png diff --git a/cinelerra-5.1/plugins/loopaudio/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/loopaudio.png similarity index 100% rename from cinelerra-5.1/plugins/loopaudio/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/loopaudio.png diff --git a/cinelerra-5.1/plugins/loopvideo/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/loopvideo.png similarity index 100% rename from cinelerra-5.1/plugins/loopvideo/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/loopvideo.png diff --git a/cinelerra-5.1/picon_cinfinity/media_folder.png b/cinelerra-5.1/picon/cinfinity/media_folder.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/media_folder.png rename to cinelerra-5.1/picon/cinfinity/media_folder.png diff --git a/cinelerra-5.1/plugins/motion-cv/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/motion-cv.png similarity index 100% rename from cinelerra-5.1/plugins/motion-cv/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/motion-cv.png diff --git a/cinelerra-5.1/plugins/motion-hv/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/motion-hv.png similarity index 100% rename from cinelerra-5.1/plugins/motion-hv/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/motion-hv.png diff --git a/cinelerra-5.1/plugins/motion/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/motion.png similarity index 100% rename from cinelerra-5.1/plugins/motion/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/motion.png diff --git a/cinelerra-5.1/plugins/motion2point/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/motion2.png similarity index 100% rename from cinelerra-5.1/plugins/motion2point/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/motion2.png diff --git a/cinelerra-5.1/plugins/motion51/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/motion51.png similarity index 100% rename from cinelerra-5.1/plugins/motion51/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/motion51.png diff --git a/cinelerra-5.1/plugins/motionblur/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/motionblur.png similarity index 100% rename from cinelerra-5.1/plugins/motionblur/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/motionblur.png diff --git a/cinelerra-5.1/plugins/oilpainting/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/oil.png similarity index 100% rename from cinelerra-5.1/plugins/oilpainting/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/oil.png diff --git a/cinelerra-5.1/plugins/overlay/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/overlay.png similarity index 100% rename from cinelerra-5.1/plugins/overlay/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/overlay.png diff --git a/cinelerra-5.1/plugins/overlayaudio/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/overlayaudio.png similarity index 100% rename from cinelerra-5.1/plugins/overlayaudio/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/overlayaudio.png diff --git a/cinelerra-5.1/plugins/parametric/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/parametric.png similarity index 100% rename from cinelerra-5.1/plugins/parametric/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/parametric.png diff --git a/cinelerra-5.1/plugins/perspective/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/perspective.png similarity index 100% rename from cinelerra-5.1/plugins/perspective/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/perspective.png diff --git a/cinelerra-5.1/plugins/photoscale/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/photoscale.png similarity index 100% rename from cinelerra-5.1/plugins/photoscale/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/photoscale.png diff --git a/cinelerra-5.1/plugins/pitch/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/pitch.png similarity index 100% rename from cinelerra-5.1/plugins/pitch/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/pitch.png diff --git a/cinelerra-5.1/plugins/polar/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/polar.png similarity index 100% rename from cinelerra-5.1/plugins/polar/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/polar.png diff --git a/cinelerra-5.1/picon_cinfinity/proxy_folder.png b/cinelerra-5.1/picon/cinfinity/proxy_folder.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/proxy_folder.png rename to cinelerra-5.1/picon/cinfinity/proxy_folder.png diff --git a/cinelerra-5.1/picon_cinfinity/proxy_icon.png b/cinelerra-5.1/picon/cinfinity/proxy_icon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/proxy_icon.png rename to cinelerra-5.1/picon/cinfinity/proxy_icon.png diff --git a/cinelerra-5.1/plugins/radialblur/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/radialblur.png similarity index 100% rename from cinelerra-5.1/plugins/radialblur/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/radialblur.png diff --git a/cinelerra-5.1/plugins/reframert/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/reframert.png similarity index 100% rename from cinelerra-5.1/plugins/reframert/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/reframert.png diff --git a/cinelerra-5.1/plugins/removegaps/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/removegaps.png similarity index 100% rename from cinelerra-5.1/plugins/removegaps/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/removegaps.png diff --git a/cinelerra-5.1/plugins/reroute/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/reroute.png similarity index 100% rename from cinelerra-5.1/plugins/reroute/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/reroute.png diff --git a/cinelerra-5.1/plugins/resamplert/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/resamplert.png similarity index 100% rename from cinelerra-5.1/plugins/resamplert/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/resamplert.png diff --git a/cinelerra-5.1/plugins/reverb/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/reverb.png similarity index 100% rename from cinelerra-5.1/plugins/reverb/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/reverb.png diff --git a/cinelerra-5.1/plugins/reverseaudio/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/reverseaudio.png similarity index 100% rename from cinelerra-5.1/plugins/reverseaudio/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/reverseaudio.png diff --git a/cinelerra-5.1/plugins/reversevideo/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/reversevideo.png similarity index 100% rename from cinelerra-5.1/plugins/reversevideo/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/reversevideo.png diff --git a/cinelerra-5.1/plugins/rgb601/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/rgb601.png similarity index 100% rename from cinelerra-5.1/plugins/rgb601/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/rgb601.png diff --git a/cinelerra-5.1/plugins/rgbshift/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/rgbshift.png similarity index 100% rename from cinelerra-5.1/plugins/rgbshift/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/rgbshift.png diff --git a/cinelerra-5.1/plugins/rotate/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/rotate.png similarity index 100% rename from cinelerra-5.1/plugins/rotate/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/rotate.png diff --git a/cinelerra-5.1/plugins/rumbler/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/rumbler.png similarity index 100% rename from cinelerra-5.1/plugins/rumbler/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/rumbler.png diff --git a/cinelerra-5.1/plugins/scale/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/scale.png similarity index 100% rename from cinelerra-5.1/plugins/scale/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/scale.png diff --git a/cinelerra-5.1/plugins/scaleratio/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/scaleratio.png similarity index 100% rename from cinelerra-5.1/plugins/scaleratio/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/scaleratio.png diff --git a/cinelerra-5.1/plugins/denoiseseltempavg/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/seltempavg.png similarity index 100% rename from cinelerra-5.1/plugins/denoiseseltempavg/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/seltempavg.png diff --git a/cinelerra-5.1/plugins/shapewipe/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/shapewipe.png similarity index 100% rename from cinelerra-5.1/plugins/shapewipe/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/shapewipe.png diff --git a/cinelerra-5.1/plugins/sharpen/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/sharpen.png similarity index 100% rename from cinelerra-5.1/plugins/sharpen/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/sharpen.png diff --git a/cinelerra-5.1/plugins/shiftinterlace/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/shiftinterlace.png similarity index 100% rename from cinelerra-5.1/plugins/shiftinterlace/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/shiftinterlace.png diff --git a/cinelerra-5.1/plugins/slide/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/slide.png similarity index 100% rename from cinelerra-5.1/plugins/slide/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/slide.png diff --git a/cinelerra-5.1/plugins/spectrogram/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/spectrogram.png similarity index 100% rename from cinelerra-5.1/plugins/spectrogram/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/spectrogram.png diff --git a/cinelerra-5.1/plugins/spherecam/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/spherecam.png similarity index 100% rename from cinelerra-5.1/plugins/spherecam/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/spherecam.png diff --git a/cinelerra-5.1/plugins/svg/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/svg.png similarity index 100% rename from cinelerra-5.1/plugins/svg/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/svg.png diff --git a/cinelerra-5.1/plugins/swapchannels/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/swapchannels.png similarity index 100% rename from cinelerra-5.1/plugins/swapchannels/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/swapchannels.png diff --git a/cinelerra-5.1/plugins/swapframes/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/swapframes.png similarity index 100% rename from cinelerra-5.1/plugins/swapframes/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/swapframes.png diff --git a/cinelerra-5.1/plugins/synthesizer/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/synthesizer.png similarity index 100% rename from cinelerra-5.1/plugins/synthesizer/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/synthesizer.png diff --git a/cinelerra-5.1/plugins/threshold/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/threshold.png similarity index 100% rename from cinelerra-5.1/plugins/threshold/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/threshold.png diff --git a/cinelerra-5.1/plugins/timeavg/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/timeavg.png similarity index 100% rename from cinelerra-5.1/plugins/timeavg/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/timeavg.png diff --git a/cinelerra-5.1/plugins/timefront/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/timefront.png similarity index 100% rename from cinelerra-5.1/plugins/timefront/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/timefront.png diff --git a/cinelerra-5.1/plugins/timestretchrt/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/timestretchrt.png similarity index 100% rename from cinelerra-5.1/plugins/timestretchrt/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/timestretchrt.png diff --git a/cinelerra-5.1/plugins/titler/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/titler.png similarity index 100% rename from cinelerra-5.1/plugins/titler/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/titler.png diff --git a/cinelerra-5.1/plugins/translate/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/translate.png similarity index 100% rename from cinelerra-5.1/plugins/translate/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/translate.png diff --git a/cinelerra-5.1/plugins/unsharp/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/unsharp.png similarity index 100% rename from cinelerra-5.1/plugins/unsharp/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/unsharp.png diff --git a/cinelerra-5.1/picon_cinfinity/veffect_folder.png b/cinelerra-5.1/picon/cinfinity/veffect_folder.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/veffect_folder.png rename to cinelerra-5.1/picon/cinfinity/veffect_folder.png diff --git a/cinelerra-5.1/picon_cinfinity/veffect_icon.png b/cinelerra-5.1/picon/cinfinity/veffect_icon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/veffect_icon.png rename to cinelerra-5.1/picon/cinfinity/veffect_icon.png diff --git a/cinelerra-5.1/picon_cinfinity/video_icon.png b/cinelerra-5.1/picon/cinfinity/video_icon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/video_icon.png rename to cinelerra-5.1/picon/cinfinity/video_icon.png diff --git a/cinelerra-5.1/plugins/videoscope/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/videoscope.png similarity index 100% rename from cinelerra-5.1/plugins/videoscope/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/videoscope.png diff --git a/cinelerra-5.1/plugins/vocoder/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/vocoder.png similarity index 100% rename from cinelerra-5.1/plugins/vocoder/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/vocoder.png diff --git a/cinelerra-5.1/picon_cinfinity/vtransition_folder.png b/cinelerra-5.1/picon/cinfinity/vtransition_folder.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/vtransition_folder.png rename to cinelerra-5.1/picon/cinfinity/vtransition_folder.png diff --git a/cinelerra-5.1/picon_cinfinity/vtransition_icon.png b/cinelerra-5.1/picon/cinfinity/vtransition_icon.png similarity index 100% rename from cinelerra-5.1/picon_cinfinity/vtransition_icon.png rename to cinelerra-5.1/picon/cinfinity/vtransition_icon.png diff --git a/cinelerra-5.1/plugins/wave/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/wave.png similarity index 100% rename from cinelerra-5.1/plugins/wave/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/wave.png diff --git a/cinelerra-5.1/plugins/whirl/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/whirl.png similarity index 100% rename from cinelerra-5.1/plugins/whirl/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/whirl.png diff --git a/cinelerra-5.1/plugins/wipe/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/wipe.png similarity index 100% rename from cinelerra-5.1/plugins/wipe/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/wipe.png diff --git a/cinelerra-5.1/plugins/yuv/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/yuv.png similarity index 100% rename from cinelerra-5.1/plugins/yuv/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/yuv.png diff --git a/cinelerra-5.1/plugins/yuv411/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/yuv411.png similarity index 100% rename from cinelerra-5.1/plugins/yuv411/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/yuv411.png diff --git a/cinelerra-5.1/plugins/yuvshift/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/yuvshift.png similarity index 100% rename from cinelerra-5.1/plugins/yuvshift/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/yuvshift.png diff --git a/cinelerra-5.1/plugins/zoom/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/zoom.png similarity index 100% rename from cinelerra-5.1/plugins/zoom/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/zoom.png diff --git a/cinelerra-5.1/plugins/zoomblur/picon_cinfinity.png b/cinelerra-5.1/picon/cinfinity/zoomblur.png similarity index 100% rename from cinelerra-5.1/plugins/zoomblur/picon_cinfinity.png rename to cinelerra-5.1/picon/cinfinity/zoomblur.png diff --git a/cinelerra-5.1/plugins/1080to480/picon_smoother.png b/cinelerra-5.1/picon/original/1080to540.png similarity index 100% rename from cinelerra-5.1/plugins/1080to480/picon_smoother.png rename to cinelerra-5.1/picon/original/1080to540.png diff --git a/cinelerra-5.1/plugins/C41/picon_original.png b/cinelerra-5.1/picon/original/C41.png similarity index 100% rename from cinelerra-5.1/plugins/C41/picon_original.png rename to cinelerra-5.1/picon/original/C41.png diff --git a/cinelerra-5.1/plugins/aging/picon_original.png b/cinelerra-5.1/picon/original/aging.png similarity index 100% rename from cinelerra-5.1/plugins/aging/picon_original.png rename to cinelerra-5.1/picon/original/aging.png diff --git a/cinelerra-5.1/plugins/bandslide/picon_original.png b/cinelerra-5.1/picon/original/bandslide.png similarity index 100% rename from cinelerra-5.1/plugins/bandslide/picon_original.png rename to cinelerra-5.1/picon/original/bandslide.png diff --git a/cinelerra-5.1/plugins/bandwipe/picon_original.png b/cinelerra-5.1/picon/original/bandwipe.png similarity index 100% rename from cinelerra-5.1/plugins/bandwipe/picon_original.png rename to cinelerra-5.1/picon/original/bandwipe.png diff --git a/cinelerra-5.1/plugins/bluebanana/picon_original.png b/cinelerra-5.1/picon/original/bluebanana.png similarity index 100% rename from cinelerra-5.1/plugins/bluebanana/picon_original.png rename to cinelerra-5.1/picon/original/bluebanana.png diff --git a/cinelerra-5.1/plugins/blur/picon_original.png b/cinelerra-5.1/picon/original/blur.png similarity index 100% rename from cinelerra-5.1/plugins/blur/picon_original.png rename to cinelerra-5.1/picon/original/blur.png diff --git a/cinelerra-5.1/plugins/blurzoom/picon_original.png b/cinelerra-5.1/picon/original/blurzoom.png similarity index 100% rename from cinelerra-5.1/plugins/blurzoom/picon_original.png rename to cinelerra-5.1/picon/original/blurzoom.png diff --git a/cinelerra-5.1/plugins/brightness/picon_original.png b/cinelerra-5.1/picon/original/brightness.png similarity index 100% rename from cinelerra-5.1/plugins/brightness/picon_original.png rename to cinelerra-5.1/picon/original/brightness.png diff --git a/cinelerra-5.1/plugins/burn/picon_original.png b/cinelerra-5.1/picon/original/burn.png similarity index 100% rename from cinelerra-5.1/plugins/burn/picon_original.png rename to cinelerra-5.1/picon/original/burn.png diff --git a/cinelerra-5.1/plugins/chromakey/picon_original.png b/cinelerra-5.1/picon/original/chromakey.png similarity index 100% rename from cinelerra-5.1/plugins/chromakey/picon_original.png rename to cinelerra-5.1/picon/original/chromakey.png diff --git a/cinelerra-5.1/plugins/chromakeyhsv/picon_original.png b/cinelerra-5.1/picon/original/chromakeyhsv.png similarity index 100% rename from cinelerra-5.1/plugins/chromakeyhsv/picon_original.png rename to cinelerra-5.1/picon/original/chromakeyhsv.png diff --git a/cinelerra-5.1/plugins/720to480/picon_smoother.png b/cinelerra-5.1/picon/original/colorbalance.png similarity index 100% rename from cinelerra-5.1/plugins/720to480/picon_smoother.png rename to cinelerra-5.1/picon/original/colorbalance.png diff --git a/cinelerra-5.1/plugins/compressor/picon_original.png b/cinelerra-5.1/picon/original/compressor.png similarity index 100% rename from cinelerra-5.1/plugins/compressor/picon_original.png rename to cinelerra-5.1/picon/original/compressor.png diff --git a/cinelerra-5.1/plugins/crossfade/picon_original.png b/cinelerra-5.1/picon/original/crossfade.png similarity index 100% rename from cinelerra-5.1/plugins/crossfade/picon_original.png rename to cinelerra-5.1/picon/original/crossfade.png diff --git a/cinelerra-5.1/plugins/decimate/picon_original.png b/cinelerra-5.1/picon/original/decimate.png similarity index 100% rename from cinelerra-5.1/plugins/decimate/picon_original.png rename to cinelerra-5.1/picon/original/decimate.png diff --git a/cinelerra-5.1/plugins/deinterlace/picon_original.png b/cinelerra-5.1/picon/original/deinterlace.png similarity index 100% rename from cinelerra-5.1/plugins/deinterlace/picon_original.png rename to cinelerra-5.1/picon/original/deinterlace.png diff --git a/cinelerra-5.1/plugins/delayaudio/picon_original.png b/cinelerra-5.1/picon/original/delayaudio.png similarity index 100% rename from cinelerra-5.1/plugins/delayaudio/picon_original.png rename to cinelerra-5.1/picon/original/delayaudio.png diff --git a/cinelerra-5.1/plugins/delayvideo/picon_original.png b/cinelerra-5.1/picon/original/delayvideo.png similarity index 100% rename from cinelerra-5.1/plugins/delayvideo/picon_original.png rename to cinelerra-5.1/picon/original/delayvideo.png diff --git a/cinelerra-5.1/plugins/denoise/picon_original.png b/cinelerra-5.1/picon/original/denoise.png similarity index 100% rename from cinelerra-5.1/plugins/denoise/picon_original.png rename to cinelerra-5.1/picon/original/denoise.png diff --git a/cinelerra-5.1/plugins/denoisefft/picon_original.png b/cinelerra-5.1/picon/original/denoisefft.png similarity index 100% rename from cinelerra-5.1/plugins/denoisefft/picon_original.png rename to cinelerra-5.1/picon/original/denoisefft.png diff --git a/cinelerra-5.1/plugins/denoisemjpeg/picon_original.png b/cinelerra-5.1/picon/original/denoisemjpeg.png similarity index 100% rename from cinelerra-5.1/plugins/denoisemjpeg/picon_original.png rename to cinelerra-5.1/picon/original/denoisemjpeg.png diff --git a/cinelerra-5.1/plugins/denoisevideo/picon_original.png b/cinelerra-5.1/picon/original/denoisevideo.png similarity index 100% rename from cinelerra-5.1/plugins/denoisevideo/picon_original.png rename to cinelerra-5.1/picon/original/denoisevideo.png diff --git a/cinelerra-5.1/plugins/despike/picon_original.png b/cinelerra-5.1/picon/original/despike.png similarity index 100% rename from cinelerra-5.1/plugins/despike/picon_original.png rename to cinelerra-5.1/picon/original/despike.png diff --git a/cinelerra-5.1/plugins/diffkey/picon_original.png b/cinelerra-5.1/picon/original/diffkey.png similarity index 100% rename from cinelerra-5.1/plugins/diffkey/picon_original.png rename to cinelerra-5.1/picon/original/diffkey.png diff --git a/cinelerra-5.1/plugins/dissolve/picon_original.png b/cinelerra-5.1/picon/original/dissolve.png similarity index 100% rename from cinelerra-5.1/plugins/dissolve/picon_original.png rename to cinelerra-5.1/picon/original/dissolve.png diff --git a/cinelerra-5.1/plugins/dot/picon_original.png b/cinelerra-5.1/picon/original/dot.png similarity index 100% rename from cinelerra-5.1/plugins/dot/picon_original.png rename to cinelerra-5.1/picon/original/dot.png diff --git a/cinelerra-5.1/plugins/downsample/picon_original.png b/cinelerra-5.1/picon/original/downsample.png similarity index 100% rename from cinelerra-5.1/plugins/downsample/picon_original.png rename to cinelerra-5.1/picon/original/downsample.png diff --git a/cinelerra-5.1/plugins/fieldframe/picon_original.png b/cinelerra-5.1/picon/original/fieldframe.png similarity index 100% rename from cinelerra-5.1/plugins/fieldframe/picon_original.png rename to cinelerra-5.1/picon/original/fieldframe.png diff --git a/cinelerra-5.1/plugins/flash/picon_original.png b/cinelerra-5.1/picon/original/flash.png similarity index 100% rename from cinelerra-5.1/plugins/flash/picon_original.png rename to cinelerra-5.1/picon/original/flash.png diff --git a/cinelerra-5.1/plugins/flip/picon_original.png b/cinelerra-5.1/picon/original/flip.png similarity index 100% rename from cinelerra-5.1/plugins/flip/picon_original.png rename to cinelerra-5.1/picon/original/flip.png diff --git a/cinelerra-5.1/plugins/framefield/picon_original.png b/cinelerra-5.1/picon/original/framefield.png similarity index 100% rename from cinelerra-5.1/plugins/framefield/picon_original.png rename to cinelerra-5.1/picon/original/framefield.png diff --git a/cinelerra-5.1/plugins/freeverb/picon_original.png b/cinelerra-5.1/picon/original/freeverb.png similarity index 100% rename from cinelerra-5.1/plugins/freeverb/picon_original.png rename to cinelerra-5.1/picon/original/freeverb.png diff --git a/cinelerra-5.1/plugins/freezeframe/picon_original.png b/cinelerra-5.1/picon/original/freezeframe.png similarity index 100% rename from cinelerra-5.1/plugins/freezeframe/picon_original.png rename to cinelerra-5.1/picon/original/freezeframe.png diff --git a/cinelerra-5.1/plugins/gain/picon_original.png b/cinelerra-5.1/picon/original/gain.png similarity index 100% rename from cinelerra-5.1/plugins/gain/picon_original.png rename to cinelerra-5.1/picon/original/gain.png diff --git a/cinelerra-5.1/plugins/gamma/picon_original.png b/cinelerra-5.1/picon/original/gamma.png similarity index 100% rename from cinelerra-5.1/plugins/gamma/picon_original.png rename to cinelerra-5.1/picon/original/gamma.png diff --git a/cinelerra-5.1/plugins/gradient/picon_original.png b/cinelerra-5.1/picon/original/gradient.png similarity index 100% rename from cinelerra-5.1/plugins/gradient/picon_original.png rename to cinelerra-5.1/picon/original/gradient.png diff --git a/cinelerra-5.1/plugins/audioscope/picon_smoother.png b/cinelerra-5.1/picon/original/graphic.png similarity index 100% rename from cinelerra-5.1/plugins/audioscope/picon_smoother.png rename to cinelerra-5.1/picon/original/graphic.png diff --git a/cinelerra-5.1/plugins/histogram/picon_original.png b/cinelerra-5.1/picon/original/histogram.png similarity index 100% rename from cinelerra-5.1/plugins/histogram/picon_original.png rename to cinelerra-5.1/picon/original/histogram.png diff --git a/cinelerra-5.1/plugins/holo/picon_original.png b/cinelerra-5.1/picon/original/holo.png similarity index 100% rename from cinelerra-5.1/plugins/holo/picon_original.png rename to cinelerra-5.1/picon/original/holo.png diff --git a/cinelerra-5.1/plugins/huesaturation/picon_original.png b/cinelerra-5.1/picon/original/huesaturation.png similarity index 100% rename from cinelerra-5.1/plugins/huesaturation/picon_original.png rename to cinelerra-5.1/picon/original/huesaturation.png diff --git a/cinelerra-5.1/plugins/interpolateaudio/picon_original.png b/cinelerra-5.1/picon/original/interpolateaudio.png similarity index 100% rename from cinelerra-5.1/plugins/interpolateaudio/picon_original.png rename to cinelerra-5.1/picon/original/interpolateaudio.png diff --git a/cinelerra-5.1/plugins/interpolate/picon_original.png b/cinelerra-5.1/picon/original/interpolatepixels.png similarity index 100% rename from cinelerra-5.1/plugins/interpolate/picon_original.png rename to cinelerra-5.1/picon/original/interpolatepixels.png diff --git a/cinelerra-5.1/plugins/interpolatevideo/picon_original.png b/cinelerra-5.1/picon/original/interpolatevideo.png similarity index 100% rename from cinelerra-5.1/plugins/interpolatevideo/picon_original.png rename to cinelerra-5.1/picon/original/interpolatevideo.png diff --git a/cinelerra-5.1/plugins/invertaudio/picon_original.png b/cinelerra-5.1/picon/original/invertaudio.png similarity index 100% rename from cinelerra-5.1/plugins/invertaudio/picon_original.png rename to cinelerra-5.1/picon/original/invertaudio.png diff --git a/cinelerra-5.1/plugins/invertvideo/picon_original.png b/cinelerra-5.1/picon/original/invertvideo.png similarity index 100% rename from cinelerra-5.1/plugins/invertvideo/picon_original.png rename to cinelerra-5.1/picon/original/invertvideo.png diff --git a/cinelerra-5.1/plugins/irissquare/picon_original.png b/cinelerra-5.1/picon/original/irissquare.png similarity index 100% rename from cinelerra-5.1/plugins/irissquare/picon_original.png rename to cinelerra-5.1/picon/original/irissquare.png diff --git a/cinelerra-5.1/plugins/ivtc/picon_original.png b/cinelerra-5.1/picon/original/ivtc.png similarity index 100% rename from cinelerra-5.1/plugins/ivtc/picon_original.png rename to cinelerra-5.1/picon/original/ivtc.png diff --git a/cinelerra-5.1/plugins/lens/picon_original.png b/cinelerra-5.1/picon/original/lens.png similarity index 100% rename from cinelerra-5.1/plugins/lens/picon_original.png rename to cinelerra-5.1/picon/original/lens.png diff --git a/cinelerra-5.1/plugins/level/picon_original.png b/cinelerra-5.1/picon/original/leveleffect.png similarity index 100% rename from cinelerra-5.1/plugins/level/picon_original.png rename to cinelerra-5.1/picon/original/leveleffect.png diff --git a/cinelerra-5.1/plugins/linearblur/picon_original.png b/cinelerra-5.1/picon/original/linearblur.png similarity index 100% rename from cinelerra-5.1/plugins/linearblur/picon_original.png rename to cinelerra-5.1/picon/original/linearblur.png diff --git a/cinelerra-5.1/plugins/liveaudio/picon_original.png b/cinelerra-5.1/picon/original/liveaudio.png similarity index 100% rename from cinelerra-5.1/plugins/liveaudio/picon_original.png rename to cinelerra-5.1/picon/original/liveaudio.png diff --git a/cinelerra-5.1/plugins/livevideo/picon_original.png b/cinelerra-5.1/picon/original/livevideo.png similarity index 100% rename from cinelerra-5.1/plugins/livevideo/picon_original.png rename to cinelerra-5.1/picon/original/livevideo.png diff --git a/cinelerra-5.1/plugins/loopaudio/picon_original.png b/cinelerra-5.1/picon/original/loopaudio.png similarity index 100% rename from cinelerra-5.1/plugins/loopaudio/picon_original.png rename to cinelerra-5.1/picon/original/loopaudio.png diff --git a/cinelerra-5.1/plugins/loopvideo/picon_original.png b/cinelerra-5.1/picon/original/loopvideo.png similarity index 100% rename from cinelerra-5.1/plugins/loopvideo/picon_original.png rename to cinelerra-5.1/picon/original/loopvideo.png diff --git a/cinelerra-5.1/plugins/color3way/picon_smoother.png b/cinelerra-5.1/picon/original/motion-hv.png similarity index 100% rename from cinelerra-5.1/plugins/color3way/picon_smoother.png rename to cinelerra-5.1/picon/original/motion-hv.png diff --git a/cinelerra-5.1/plugins/colorbalance/picon_original.png b/cinelerra-5.1/picon/original/motion.png similarity index 100% rename from cinelerra-5.1/plugins/colorbalance/picon_original.png rename to cinelerra-5.1/picon/original/motion.png diff --git a/cinelerra-5.1/plugins/motionblur/picon_original.png b/cinelerra-5.1/picon/original/motionblur.png similarity index 100% rename from cinelerra-5.1/plugins/motionblur/picon_original.png rename to cinelerra-5.1/picon/original/motionblur.png diff --git a/cinelerra-5.1/plugins/normalize/picon_original.png b/cinelerra-5.1/picon/original/normalize.png similarity index 100% rename from cinelerra-5.1/plugins/normalize/picon_original.png rename to cinelerra-5.1/picon/original/normalize.png diff --git a/cinelerra-5.1/plugins/oilpainting/picon_original.png b/cinelerra-5.1/picon/original/oil.png similarity index 100% rename from cinelerra-5.1/plugins/oilpainting/picon_original.png rename to cinelerra-5.1/picon/original/oil.png diff --git a/cinelerra-5.1/plugins/overlay/picon_original.png b/cinelerra-5.1/picon/original/overlay.png similarity index 100% rename from cinelerra-5.1/plugins/overlay/picon_original.png rename to cinelerra-5.1/picon/original/overlay.png diff --git a/cinelerra-5.1/plugins/cdripper/picon_smoother.png b/cinelerra-5.1/picon/original/overlayaudio.png similarity index 100% rename from cinelerra-5.1/plugins/cdripper/picon_smoother.png rename to cinelerra-5.1/picon/original/overlayaudio.png diff --git a/cinelerra-5.1/plugins/parametric/picon_original.png b/cinelerra-5.1/picon/original/parametric.png similarity index 100% rename from cinelerra-5.1/plugins/parametric/picon_original.png rename to cinelerra-5.1/picon/original/parametric.png diff --git a/cinelerra-5.1/plugins/perspective/picon_original.png b/cinelerra-5.1/picon/original/perspective.png similarity index 100% rename from cinelerra-5.1/plugins/perspective/picon_original.png rename to cinelerra-5.1/picon/original/perspective.png diff --git a/cinelerra-5.1/plugins/pitch/picon_original.png b/cinelerra-5.1/picon/original/pitch.png similarity index 100% rename from cinelerra-5.1/plugins/pitch/picon_original.png rename to cinelerra-5.1/picon/original/pitch.png diff --git a/cinelerra-5.1/plugins/polar/picon_original.png b/cinelerra-5.1/picon/original/polar.png similarity index 100% rename from cinelerra-5.1/plugins/polar/picon_original.png rename to cinelerra-5.1/picon/original/polar.png diff --git a/cinelerra-5.1/plugins/radialblur/picon_original.png b/cinelerra-5.1/picon/original/radialblur.png similarity index 100% rename from cinelerra-5.1/plugins/radialblur/picon_original.png rename to cinelerra-5.1/picon/original/radialblur.png diff --git a/cinelerra-5.1/plugins/reframe/picon_original.png b/cinelerra-5.1/picon/original/reframe.png similarity index 100% rename from cinelerra-5.1/plugins/reframe/picon_original.png rename to cinelerra-5.1/picon/original/reframe.png diff --git a/cinelerra-5.1/plugins/reframert/picon_original.png b/cinelerra-5.1/picon/original/reframert.png similarity index 100% rename from cinelerra-5.1/plugins/reframert/picon_original.png rename to cinelerra-5.1/picon/original/reframert.png diff --git a/cinelerra-5.1/plugins/reroute/picon_original.png b/cinelerra-5.1/picon/original/reroute.png similarity index 100% rename from cinelerra-5.1/plugins/reroute/picon_original.png rename to cinelerra-5.1/picon/original/reroute.png diff --git a/cinelerra-5.1/plugins/resample/picon_original.png b/cinelerra-5.1/picon/original/resample.png similarity index 100% rename from cinelerra-5.1/plugins/resample/picon_original.png rename to cinelerra-5.1/picon/original/resample.png diff --git a/cinelerra-5.1/plugins/reverb/picon_original.png b/cinelerra-5.1/picon/original/reverb.png similarity index 100% rename from cinelerra-5.1/plugins/reverb/picon_original.png rename to cinelerra-5.1/picon/original/reverb.png diff --git a/cinelerra-5.1/plugins/reverseaudio/picon_original.png b/cinelerra-5.1/picon/original/reverseaudio.png similarity index 100% rename from cinelerra-5.1/plugins/reverseaudio/picon_original.png rename to cinelerra-5.1/picon/original/reverseaudio.png diff --git a/cinelerra-5.1/plugins/reversevideo/picon_original.png b/cinelerra-5.1/picon/original/reversevideo.png similarity index 100% rename from cinelerra-5.1/plugins/reversevideo/picon_original.png rename to cinelerra-5.1/picon/original/reversevideo.png diff --git a/cinelerra-5.1/plugins/motion-hv/picon_original.png b/cinelerra-5.1/picon/original/rgb601.png similarity index 100% rename from cinelerra-5.1/plugins/motion-hv/picon_original.png rename to cinelerra-5.1/picon/original/rgb601.png diff --git a/cinelerra-5.1/plugins/rotate/picon_original.png b/cinelerra-5.1/picon/original/rotate.png similarity index 100% rename from cinelerra-5.1/plugins/rotate/picon_original.png rename to cinelerra-5.1/picon/original/rotate.png diff --git a/cinelerra-5.1/plugins/rumbler/picon_original.png b/cinelerra-5.1/picon/original/rumbler.png similarity index 100% rename from cinelerra-5.1/plugins/rumbler/picon_original.png rename to cinelerra-5.1/picon/original/rumbler.png diff --git a/cinelerra-5.1/plugins/photoscale/picon_smoother.png b/cinelerra-5.1/picon/original/scale.png similarity index 100% rename from cinelerra-5.1/plugins/photoscale/picon_smoother.png rename to cinelerra-5.1/picon/original/scale.png diff --git a/cinelerra-5.1/plugins/denoiseseltempavg/picon_original.png b/cinelerra-5.1/picon/original/seltempavg.png similarity index 100% rename from cinelerra-5.1/plugins/denoiseseltempavg/picon_original.png rename to cinelerra-5.1/picon/original/seltempavg.png diff --git a/cinelerra-5.1/plugins/shapewipe/picon_original.png b/cinelerra-5.1/picon/original/shapewipe.png similarity index 100% rename from cinelerra-5.1/plugins/shapewipe/picon_original.png rename to cinelerra-5.1/picon/original/shapewipe.png diff --git a/cinelerra-5.1/plugins/sharpen/picon_original.png b/cinelerra-5.1/picon/original/sharpen.png similarity index 100% rename from cinelerra-5.1/plugins/sharpen/picon_original.png rename to cinelerra-5.1/picon/original/sharpen.png diff --git a/cinelerra-5.1/plugins/shiftinterlace/picon_original.png b/cinelerra-5.1/picon/original/shiftinterlace.png similarity index 100% rename from cinelerra-5.1/plugins/shiftinterlace/picon_original.png rename to cinelerra-5.1/picon/original/shiftinterlace.png diff --git a/cinelerra-5.1/plugins/slide/picon_original.png b/cinelerra-5.1/picon/original/slide.png similarity index 100% rename from cinelerra-5.1/plugins/slide/picon_original.png rename to cinelerra-5.1/picon/original/slide.png diff --git a/cinelerra-5.1/plugins/echo/picon_smoother.png b/cinelerra-5.1/picon/original/spectrogram.png similarity index 100% rename from cinelerra-5.1/plugins/echo/picon_smoother.png rename to cinelerra-5.1/picon/original/spectrogram.png diff --git a/cinelerra-5.1/plugins/svg/picon_original.png b/cinelerra-5.1/picon/original/svg.png similarity index 100% rename from cinelerra-5.1/plugins/svg/picon_original.png rename to cinelerra-5.1/picon/original/svg.png diff --git a/cinelerra-5.1/plugins/swapchannels/picon_original.png b/cinelerra-5.1/picon/original/swapchannels.png similarity index 100% rename from cinelerra-5.1/plugins/swapchannels/picon_original.png rename to cinelerra-5.1/picon/original/swapchannels.png diff --git a/cinelerra-5.1/plugins/piano/picon_smoother.png b/cinelerra-5.1/picon/original/synthesizer.png similarity index 100% rename from cinelerra-5.1/plugins/piano/picon_smoother.png rename to cinelerra-5.1/picon/original/synthesizer.png diff --git a/cinelerra-5.1/plugins/threshold/picon_original.png b/cinelerra-5.1/picon/original/threshold.png similarity index 100% rename from cinelerra-5.1/plugins/threshold/picon_original.png rename to cinelerra-5.1/picon/original/threshold.png diff --git a/cinelerra-5.1/plugins/timeavg/picon_original.png b/cinelerra-5.1/picon/original/timeavg.png similarity index 100% rename from cinelerra-5.1/plugins/timeavg/picon_original.png rename to cinelerra-5.1/picon/original/timeavg.png diff --git a/cinelerra-5.1/plugins/timefront/picon_original.png b/cinelerra-5.1/picon/original/timefront.png similarity index 100% rename from cinelerra-5.1/plugins/timefront/picon_original.png rename to cinelerra-5.1/picon/original/timefront.png diff --git a/cinelerra-5.1/plugins/timestretch/picon_original.png b/cinelerra-5.1/picon/original/timestretch.png similarity index 100% rename from cinelerra-5.1/plugins/timestretch/picon_original.png rename to cinelerra-5.1/picon/original/timestretch.png diff --git a/cinelerra-5.1/plugins/titler/picon_original.png b/cinelerra-5.1/picon/original/titler.png similarity index 100% rename from cinelerra-5.1/plugins/titler/picon_original.png rename to cinelerra-5.1/picon/original/titler.png diff --git a/cinelerra-5.1/plugins/translate/picon_original.png b/cinelerra-5.1/picon/original/translate.png similarity index 100% rename from cinelerra-5.1/plugins/translate/picon_original.png rename to cinelerra-5.1/picon/original/translate.png diff --git a/cinelerra-5.1/plugins/unsharp/picon_original.png b/cinelerra-5.1/picon/original/unsharp.png similarity index 100% rename from cinelerra-5.1/plugins/unsharp/picon_original.png rename to cinelerra-5.1/picon/original/unsharp.png diff --git a/cinelerra-5.1/plugins/videoscope/picon_original.png b/cinelerra-5.1/picon/original/videoscope.png similarity index 100% rename from cinelerra-5.1/plugins/videoscope/picon_original.png rename to cinelerra-5.1/picon/original/videoscope.png diff --git a/cinelerra-5.1/plugins/wave/picon_original.png b/cinelerra-5.1/picon/original/wave.png similarity index 100% rename from cinelerra-5.1/plugins/wave/picon_original.png rename to cinelerra-5.1/picon/original/wave.png diff --git a/cinelerra-5.1/plugins/whirl/picon_original.png b/cinelerra-5.1/picon/original/whirl.png similarity index 100% rename from cinelerra-5.1/plugins/whirl/picon_original.png rename to cinelerra-5.1/picon/original/whirl.png diff --git a/cinelerra-5.1/plugins/wipe/picon_original.png b/cinelerra-5.1/picon/original/wipe.png similarity index 100% rename from cinelerra-5.1/plugins/wipe/picon_original.png rename to cinelerra-5.1/picon/original/wipe.png diff --git a/cinelerra-5.1/plugins/motion/picon_original.png b/cinelerra-5.1/picon/original/yuv.png similarity index 100% rename from cinelerra-5.1/plugins/motion/picon_original.png rename to cinelerra-5.1/picon/original/yuv.png diff --git a/cinelerra-5.1/plugins/zoomblur/picon_original.png b/cinelerra-5.1/picon/original/zoomblur.png similarity index 100% rename from cinelerra-5.1/plugins/zoomblur/picon_original.png rename to cinelerra-5.1/picon/original/zoomblur.png diff --git a/cinelerra-5.1/plugins/echocancel/picon_smoother.png b/cinelerra-5.1/picon/smoother/.png similarity index 100% rename from cinelerra-5.1/plugins/echocancel/picon_smoother.png rename to cinelerra-5.1/picon/smoother/.png diff --git a/cinelerra-5.1/plugins/1080to540/picon_original.png b/cinelerra-5.1/picon/smoother/1080to480.png similarity index 100% rename from cinelerra-5.1/plugins/1080to540/picon_original.png rename to cinelerra-5.1/picon/smoother/1080to480.png diff --git a/cinelerra-5.1/plugins/1080to540/picon_smoother.png b/cinelerra-5.1/picon/smoother/1080to540.png similarity index 100% rename from cinelerra-5.1/plugins/1080to540/picon_smoother.png rename to cinelerra-5.1/picon/smoother/1080to540.png diff --git a/cinelerra-5.1/plugins/rgb601/picon_original.png b/cinelerra-5.1/picon/smoother/720to480.png similarity index 100% rename from cinelerra-5.1/plugins/rgb601/picon_original.png rename to cinelerra-5.1/picon/smoother/720to480.png diff --git a/cinelerra-5.1/plugins/C41/picon_smoother.png b/cinelerra-5.1/picon/smoother/C41.png similarity index 100% rename from cinelerra-5.1/plugins/C41/picon_smoother.png rename to cinelerra-5.1/picon/smoother/C41.png diff --git a/cinelerra-5.1/plugins/aging/picon_smoother.png b/cinelerra-5.1/picon/smoother/aging.png similarity index 100% rename from cinelerra-5.1/plugins/aging/picon_smoother.png rename to cinelerra-5.1/picon/smoother/aging.png diff --git a/cinelerra-5.1/plugins/graphic/picon_original.png b/cinelerra-5.1/picon/smoother/audioscope.png similarity index 100% rename from cinelerra-5.1/plugins/graphic/picon_original.png rename to cinelerra-5.1/picon/smoother/audioscope.png diff --git a/cinelerra-5.1/plugins/bandslide/picon_smoother.png b/cinelerra-5.1/picon/smoother/bandslide.png similarity index 100% rename from cinelerra-5.1/plugins/bandslide/picon_smoother.png rename to cinelerra-5.1/picon/smoother/bandslide.png diff --git a/cinelerra-5.1/plugins/bandwipe/picon_smoother.png b/cinelerra-5.1/picon/smoother/bandwipe.png similarity index 100% rename from cinelerra-5.1/plugins/bandwipe/picon_smoother.png rename to cinelerra-5.1/picon/smoother/bandwipe.png diff --git a/cinelerra-5.1/plugins/bluebanana/picon_smoother.png b/cinelerra-5.1/picon/smoother/bluebanana.png similarity index 100% rename from cinelerra-5.1/plugins/bluebanana/picon_smoother.png rename to cinelerra-5.1/picon/smoother/bluebanana.png diff --git a/cinelerra-5.1/plugins/blur/picon_smoother.png b/cinelerra-5.1/picon/smoother/blur.png similarity index 100% rename from cinelerra-5.1/plugins/blur/picon_smoother.png rename to cinelerra-5.1/picon/smoother/blur.png diff --git a/cinelerra-5.1/plugins/blurzoom/picon_smoother.png b/cinelerra-5.1/picon/smoother/blurzoom.png similarity index 100% rename from cinelerra-5.1/plugins/blurzoom/picon_smoother.png rename to cinelerra-5.1/picon/smoother/blurzoom.png diff --git a/cinelerra-5.1/plugins/brightness/picon_smoother.png b/cinelerra-5.1/picon/smoother/brightness.png similarity index 100% rename from cinelerra-5.1/plugins/brightness/picon_smoother.png rename to cinelerra-5.1/picon/smoother/brightness.png diff --git a/cinelerra-5.1/plugins/burn/picon_smoother.png b/cinelerra-5.1/picon/smoother/burn.png similarity index 100% rename from cinelerra-5.1/plugins/burn/picon_smoother.png rename to cinelerra-5.1/picon/smoother/burn.png diff --git a/cinelerra-5.1/plugins/overlayaudio/picon_original.png b/cinelerra-5.1/picon/smoother/cdripper.png similarity index 100% rename from cinelerra-5.1/plugins/overlayaudio/picon_original.png rename to cinelerra-5.1/picon/smoother/cdripper.png diff --git a/cinelerra-5.1/plugins/chromakey/picon_smoother.png b/cinelerra-5.1/picon/smoother/chromakey.png similarity index 100% rename from cinelerra-5.1/plugins/chromakey/picon_smoother.png rename to cinelerra-5.1/picon/smoother/chromakey.png diff --git a/cinelerra-5.1/plugins/chromakeyhsv/picon_smoother.png b/cinelerra-5.1/picon/smoother/chromakeyhsv.png similarity index 100% rename from cinelerra-5.1/plugins/chromakeyhsv/picon_smoother.png rename to cinelerra-5.1/picon/smoother/chromakeyhsv.png diff --git a/cinelerra-5.1/plugins/yuv/picon_original.png b/cinelerra-5.1/picon/smoother/color3way.png similarity index 100% rename from cinelerra-5.1/plugins/yuv/picon_original.png rename to cinelerra-5.1/picon/smoother/color3way.png diff --git a/cinelerra-5.1/plugins/colorbalance/picon_smoother.png b/cinelerra-5.1/picon/smoother/colorbalance.png similarity index 100% rename from cinelerra-5.1/plugins/colorbalance/picon_smoother.png rename to cinelerra-5.1/picon/smoother/colorbalance.png diff --git a/cinelerra-5.1/plugins/compressor/picon_smoother.png b/cinelerra-5.1/picon/smoother/compressor.png similarity index 100% rename from cinelerra-5.1/plugins/compressor/picon_smoother.png rename to cinelerra-5.1/picon/smoother/compressor.png diff --git a/cinelerra-5.1/plugins/crikey/picon_smoother.png b/cinelerra-5.1/picon/smoother/crikey.png similarity index 100% rename from cinelerra-5.1/plugins/crikey/picon_smoother.png rename to cinelerra-5.1/picon/smoother/crikey.png diff --git a/cinelerra-5.1/plugins/crossfade/picon_smoother.png b/cinelerra-5.1/picon/smoother/crossfade.png similarity index 100% rename from cinelerra-5.1/plugins/crossfade/picon_smoother.png rename to cinelerra-5.1/picon/smoother/crossfade.png diff --git a/cinelerra-5.1/plugins/dcoffset/picon_smoother.png b/cinelerra-5.1/picon/smoother/dcoffset.png similarity index 100% rename from cinelerra-5.1/plugins/dcoffset/picon_smoother.png rename to cinelerra-5.1/picon/smoother/dcoffset.png diff --git a/cinelerra-5.1/plugins/decimate/picon_smoother.png b/cinelerra-5.1/picon/smoother/decimate.png similarity index 100% rename from cinelerra-5.1/plugins/decimate/picon_smoother.png rename to cinelerra-5.1/picon/smoother/decimate.png diff --git a/cinelerra-5.1/plugins/deinterlace-cv/picon_smoother.png b/cinelerra-5.1/picon/smoother/deinterlace-cv.png similarity index 100% rename from cinelerra-5.1/plugins/deinterlace-cv/picon_smoother.png rename to cinelerra-5.1/picon/smoother/deinterlace-cv.png diff --git a/cinelerra-5.1/plugins/deinterlace/picon_smoother.png b/cinelerra-5.1/picon/smoother/deinterlace.png similarity index 100% rename from cinelerra-5.1/plugins/deinterlace/picon_smoother.png rename to cinelerra-5.1/picon/smoother/deinterlace.png diff --git a/cinelerra-5.1/plugins/delayaudio/picon_smoother.png b/cinelerra-5.1/picon/smoother/delayaudio.png similarity index 100% rename from cinelerra-5.1/plugins/delayaudio/picon_smoother.png rename to cinelerra-5.1/picon/smoother/delayaudio.png diff --git a/cinelerra-5.1/plugins/delayvideo/picon_smoother.png b/cinelerra-5.1/picon/smoother/delayvideo.png similarity index 100% rename from cinelerra-5.1/plugins/delayvideo/picon_smoother.png rename to cinelerra-5.1/picon/smoother/delayvideo.png diff --git a/cinelerra-5.1/plugins/denoise/picon_smoother.png b/cinelerra-5.1/picon/smoother/denoise.png similarity index 100% rename from cinelerra-5.1/plugins/denoise/picon_smoother.png rename to cinelerra-5.1/picon/smoother/denoise.png diff --git a/cinelerra-5.1/plugins/denoisefft/picon_smoother.png b/cinelerra-5.1/picon/smoother/denoisefft.png similarity index 100% rename from cinelerra-5.1/plugins/denoisefft/picon_smoother.png rename to cinelerra-5.1/picon/smoother/denoisefft.png diff --git a/cinelerra-5.1/plugins/denoisemjpeg/picon_smoother.png b/cinelerra-5.1/picon/smoother/denoisemjpeg.png similarity index 100% rename from cinelerra-5.1/plugins/denoisemjpeg/picon_smoother.png rename to cinelerra-5.1/picon/smoother/denoisemjpeg.png diff --git a/cinelerra-5.1/plugins/denoisevideo/picon_smoother.png b/cinelerra-5.1/picon/smoother/denoisevideo.png similarity index 100% rename from cinelerra-5.1/plugins/denoisevideo/picon_smoother.png rename to cinelerra-5.1/picon/smoother/denoisevideo.png diff --git a/cinelerra-5.1/plugins/despike/picon_smoother.png b/cinelerra-5.1/picon/smoother/despike.png similarity index 100% rename from cinelerra-5.1/plugins/despike/picon_smoother.png rename to cinelerra-5.1/picon/smoother/despike.png diff --git a/cinelerra-5.1/plugins/diffkey/picon_smoother.png b/cinelerra-5.1/picon/smoother/diffkey.png similarity index 100% rename from cinelerra-5.1/plugins/diffkey/picon_smoother.png rename to cinelerra-5.1/picon/smoother/diffkey.png diff --git a/cinelerra-5.1/plugins/dissolve/picon_smoother.png b/cinelerra-5.1/picon/smoother/dissolve.png similarity index 100% rename from cinelerra-5.1/plugins/dissolve/picon_smoother.png rename to cinelerra-5.1/picon/smoother/dissolve.png diff --git a/cinelerra-5.1/plugins/dot/picon_smoother.png b/cinelerra-5.1/picon/smoother/dot.png similarity index 100% rename from cinelerra-5.1/plugins/dot/picon_smoother.png rename to cinelerra-5.1/picon/smoother/dot.png diff --git a/cinelerra-5.1/plugins/downsample/picon_smoother.png b/cinelerra-5.1/picon/smoother/downsample.png similarity index 100% rename from cinelerra-5.1/plugins/downsample/picon_smoother.png rename to cinelerra-5.1/picon/smoother/downsample.png diff --git a/cinelerra-5.1/plugins/spectrogram/picon_original.png b/cinelerra-5.1/picon/smoother/echocancel.png similarity index 100% rename from cinelerra-5.1/plugins/spectrogram/picon_original.png rename to cinelerra-5.1/picon/smoother/echocancel.png diff --git a/cinelerra-5.1/plugins/edge/picon_smoother.png b/cinelerra-5.1/picon/smoother/edge.png similarity index 100% rename from cinelerra-5.1/plugins/edge/picon_smoother.png rename to cinelerra-5.1/picon/smoother/edge.png diff --git a/cinelerra-5.1/plugins/fieldframe/picon_smoother.png b/cinelerra-5.1/picon/smoother/fieldframe.png similarity index 100% rename from cinelerra-5.1/plugins/fieldframe/picon_smoother.png rename to cinelerra-5.1/picon/smoother/fieldframe.png diff --git a/cinelerra-5.1/plugins/findobj/picon_smoother.png b/cinelerra-5.1/picon/smoother/findobj.png similarity index 100% rename from cinelerra-5.1/plugins/findobj/picon_smoother.png rename to cinelerra-5.1/picon/smoother/findobj.png diff --git a/cinelerra-5.1/plugins/flash/picon_smoother.png b/cinelerra-5.1/picon/smoother/flash.png similarity index 100% rename from cinelerra-5.1/plugins/flash/picon_smoother.png rename to cinelerra-5.1/picon/smoother/flash.png diff --git a/cinelerra-5.1/plugins/flip/picon_smoother.png b/cinelerra-5.1/picon/smoother/flip.png similarity index 100% rename from cinelerra-5.1/plugins/flip/picon_smoother.png rename to cinelerra-5.1/picon/smoother/flip.png diff --git a/cinelerra-5.1/plugins/framefield/picon_smoother.png b/cinelerra-5.1/picon/smoother/framefield.png similarity index 100% rename from cinelerra-5.1/plugins/framefield/picon_smoother.png rename to cinelerra-5.1/picon/smoother/framefield.png diff --git a/cinelerra-5.1/plugins/freeverb/picon_smoother.png b/cinelerra-5.1/picon/smoother/freeverb.png similarity index 100% rename from cinelerra-5.1/plugins/freeverb/picon_smoother.png rename to cinelerra-5.1/picon/smoother/freeverb.png diff --git a/cinelerra-5.1/plugins/freezeframe/picon_smoother.png b/cinelerra-5.1/picon/smoother/freezeframe.png similarity index 100% rename from cinelerra-5.1/plugins/freezeframe/picon_smoother.png rename to cinelerra-5.1/picon/smoother/freezeframe.png diff --git a/cinelerra-5.1/plugins/gain/picon_smoother.png b/cinelerra-5.1/picon/smoother/gain.png similarity index 100% rename from cinelerra-5.1/plugins/gain/picon_smoother.png rename to cinelerra-5.1/picon/smoother/gain.png diff --git a/cinelerra-5.1/plugins/gamma/picon_smoother.png b/cinelerra-5.1/picon/smoother/gamma.png similarity index 100% rename from cinelerra-5.1/plugins/gamma/picon_smoother.png rename to cinelerra-5.1/picon/smoother/gamma.png diff --git a/cinelerra-5.1/plugins/gradient/picon_smoother.png b/cinelerra-5.1/picon/smoother/gradient.png similarity index 100% rename from cinelerra-5.1/plugins/gradient/picon_smoother.png rename to cinelerra-5.1/picon/smoother/gradient.png diff --git a/cinelerra-5.1/plugins/graphic/picon_smoother.png b/cinelerra-5.1/picon/smoother/graphic.png similarity index 100% rename from cinelerra-5.1/plugins/graphic/picon_smoother.png rename to cinelerra-5.1/picon/smoother/graphic.png diff --git a/cinelerra-5.1/plugins/greycstoration/picon_smoother.png b/cinelerra-5.1/picon/smoother/greycstoration.png similarity index 100% rename from cinelerra-5.1/plugins/greycstoration/picon_smoother.png rename to cinelerra-5.1/picon/smoother/greycstoration.png diff --git a/cinelerra-5.1/plugins/histogram/picon_smoother.png b/cinelerra-5.1/picon/smoother/histogram.png similarity index 100% rename from cinelerra-5.1/plugins/histogram/picon_smoother.png rename to cinelerra-5.1/picon/smoother/histogram.png diff --git a/cinelerra-5.1/plugins/histogram_bezier/picon_smoother.png b/cinelerra-5.1/picon/smoother/histogram_bezier.png similarity index 100% rename from cinelerra-5.1/plugins/histogram_bezier/picon_smoother.png rename to cinelerra-5.1/picon/smoother/histogram_bezier.png diff --git a/cinelerra-5.1/plugins/holo/picon_smoother.png b/cinelerra-5.1/picon/smoother/holo.png similarity index 100% rename from cinelerra-5.1/plugins/holo/picon_smoother.png rename to cinelerra-5.1/picon/smoother/holo.png diff --git a/cinelerra-5.1/plugins/huesaturation/picon_smoother.png b/cinelerra-5.1/picon/smoother/huesaturation.png similarity index 100% rename from cinelerra-5.1/plugins/huesaturation/picon_smoother.png rename to cinelerra-5.1/picon/smoother/huesaturation.png diff --git a/cinelerra-5.1/plugins/interpolateall/picon_smoother.png b/cinelerra-5.1/picon/smoother/interpolateall.png similarity index 100% rename from cinelerra-5.1/plugins/interpolateall/picon_smoother.png rename to cinelerra-5.1/picon/smoother/interpolateall.png diff --git a/cinelerra-5.1/plugins/interpolateaudio/picon_smoother.png b/cinelerra-5.1/picon/smoother/interpolateaudio.png similarity index 100% rename from cinelerra-5.1/plugins/interpolateaudio/picon_smoother.png rename to cinelerra-5.1/picon/smoother/interpolateaudio.png diff --git a/cinelerra-5.1/plugins/interpolate/picon_smoother.png b/cinelerra-5.1/picon/smoother/interpolatepixels.png similarity index 100% rename from cinelerra-5.1/plugins/interpolate/picon_smoother.png rename to cinelerra-5.1/picon/smoother/interpolatepixels.png diff --git a/cinelerra-5.1/plugins/interpolatevideo/picon_smoother.png b/cinelerra-5.1/picon/smoother/interpolatevideo.png similarity index 100% rename from cinelerra-5.1/plugins/interpolatevideo/picon_smoother.png rename to cinelerra-5.1/picon/smoother/interpolatevideo.png diff --git a/cinelerra-5.1/plugins/invertaudio/picon_smoother.png b/cinelerra-5.1/picon/smoother/invertaudio.png similarity index 100% rename from cinelerra-5.1/plugins/invertaudio/picon_smoother.png rename to cinelerra-5.1/picon/smoother/invertaudio.png diff --git a/cinelerra-5.1/plugins/invertvideo/picon_smoother.png b/cinelerra-5.1/picon/smoother/invertvideo.png similarity index 100% rename from cinelerra-5.1/plugins/invertvideo/picon_smoother.png rename to cinelerra-5.1/picon/smoother/invertvideo.png diff --git a/cinelerra-5.1/plugins/irissquare/picon_smoother.png b/cinelerra-5.1/picon/smoother/irissquare.png similarity index 100% rename from cinelerra-5.1/plugins/irissquare/picon_smoother.png rename to cinelerra-5.1/picon/smoother/irissquare.png diff --git a/cinelerra-5.1/plugins/ivtc/picon_smoother.png b/cinelerra-5.1/picon/smoother/ivtc.png similarity index 100% rename from cinelerra-5.1/plugins/ivtc/picon_smoother.png rename to cinelerra-5.1/picon/smoother/ivtc.png diff --git a/cinelerra-5.1/plugins/lens/picon_smoother.png b/cinelerra-5.1/picon/smoother/lens.png similarity index 100% rename from cinelerra-5.1/plugins/lens/picon_smoother.png rename to cinelerra-5.1/picon/smoother/lens.png diff --git a/cinelerra-5.1/plugins/level/picon_smoother.png b/cinelerra-5.1/picon/smoother/leveleffect.png similarity index 100% rename from cinelerra-5.1/plugins/level/picon_smoother.png rename to cinelerra-5.1/picon/smoother/leveleffect.png diff --git a/cinelerra-5.1/plugins/linearblur/picon_smoother.png b/cinelerra-5.1/picon/smoother/linearblur.png similarity index 100% rename from cinelerra-5.1/plugins/linearblur/picon_smoother.png rename to cinelerra-5.1/picon/smoother/linearblur.png diff --git a/cinelerra-5.1/plugins/liveaudio/picon_smoother.png b/cinelerra-5.1/picon/smoother/liveaudio.png similarity index 100% rename from cinelerra-5.1/plugins/liveaudio/picon_smoother.png rename to cinelerra-5.1/picon/smoother/liveaudio.png diff --git a/cinelerra-5.1/plugins/livevideo/picon_smoother.png b/cinelerra-5.1/picon/smoother/livevideo.png similarity index 100% rename from cinelerra-5.1/plugins/livevideo/picon_smoother.png rename to cinelerra-5.1/picon/smoother/livevideo.png diff --git a/cinelerra-5.1/plugins/loopaudio/picon_smoother.png b/cinelerra-5.1/picon/smoother/loopaudio.png similarity index 100% rename from cinelerra-5.1/plugins/loopaudio/picon_smoother.png rename to cinelerra-5.1/picon/smoother/loopaudio.png diff --git a/cinelerra-5.1/plugins/loopvideo/picon_smoother.png b/cinelerra-5.1/picon/smoother/loopvideo.png similarity index 100% rename from cinelerra-5.1/plugins/loopvideo/picon_smoother.png rename to cinelerra-5.1/picon/smoother/loopvideo.png diff --git a/cinelerra-5.1/plugins/motion-cv/picon_smoother.png b/cinelerra-5.1/picon/smoother/motion-cv.png similarity index 100% rename from cinelerra-5.1/plugins/motion-cv/picon_smoother.png rename to cinelerra-5.1/picon/smoother/motion-cv.png diff --git a/cinelerra-5.1/plugins/motion-hv/picon_smoother.png b/cinelerra-5.1/picon/smoother/motion-hv.png similarity index 100% rename from cinelerra-5.1/plugins/motion-hv/picon_smoother.png rename to cinelerra-5.1/picon/smoother/motion-hv.png diff --git a/cinelerra-5.1/plugins/motion/picon_smoother.png b/cinelerra-5.1/picon/smoother/motion.png similarity index 100% rename from cinelerra-5.1/plugins/motion/picon_smoother.png rename to cinelerra-5.1/picon/smoother/motion.png diff --git a/cinelerra-5.1/plugins/motion2point/picon_smoother.png b/cinelerra-5.1/picon/smoother/motion2.png similarity index 100% rename from cinelerra-5.1/plugins/motion2point/picon_smoother.png rename to cinelerra-5.1/picon/smoother/motion2.png diff --git a/cinelerra-5.1/plugins/motion51/picon_smoother.png b/cinelerra-5.1/picon/smoother/motion51.png similarity index 100% rename from cinelerra-5.1/plugins/motion51/picon_smoother.png rename to cinelerra-5.1/picon/smoother/motion51.png diff --git a/cinelerra-5.1/plugins/motionblur/picon_smoother.png b/cinelerra-5.1/picon/smoother/motionblur.png similarity index 100% rename from cinelerra-5.1/plugins/motionblur/picon_smoother.png rename to cinelerra-5.1/picon/smoother/motionblur.png diff --git a/cinelerra-5.1/plugins/normalize/picon_smoother.png b/cinelerra-5.1/picon/smoother/normalize.png similarity index 100% rename from cinelerra-5.1/plugins/normalize/picon_smoother.png rename to cinelerra-5.1/picon/smoother/normalize.png diff --git a/cinelerra-5.1/plugins/oilpainting/picon_smoother.png b/cinelerra-5.1/picon/smoother/oil.png similarity index 100% rename from cinelerra-5.1/plugins/oilpainting/picon_smoother.png rename to cinelerra-5.1/picon/smoother/oil.png diff --git a/cinelerra-5.1/plugins/overlay/picon_smoother.png b/cinelerra-5.1/picon/smoother/overlay.png similarity index 100% rename from cinelerra-5.1/plugins/overlay/picon_smoother.png rename to cinelerra-5.1/picon/smoother/overlay.png diff --git a/cinelerra-5.1/plugins/overlayaudio/picon_smoother.png b/cinelerra-5.1/picon/smoother/overlayaudio.png similarity index 100% rename from cinelerra-5.1/plugins/overlayaudio/picon_smoother.png rename to cinelerra-5.1/picon/smoother/overlayaudio.png diff --git a/cinelerra-5.1/plugins/parametric/picon_smoother.png b/cinelerra-5.1/picon/smoother/parametric.png similarity index 100% rename from cinelerra-5.1/plugins/parametric/picon_smoother.png rename to cinelerra-5.1/picon/smoother/parametric.png diff --git a/cinelerra-5.1/plugins/perspective/picon_smoother.png b/cinelerra-5.1/picon/smoother/perspective.png similarity index 100% rename from cinelerra-5.1/plugins/perspective/picon_smoother.png rename to cinelerra-5.1/picon/smoother/perspective.png diff --git a/cinelerra-5.1/plugins/scale/picon_original.png b/cinelerra-5.1/picon/smoother/photoscale.png similarity index 100% rename from cinelerra-5.1/plugins/scale/picon_original.png rename to cinelerra-5.1/picon/smoother/photoscale.png diff --git a/cinelerra-5.1/plugins/synthesizer/picon_original.png b/cinelerra-5.1/picon/smoother/piano.png similarity index 100% rename from cinelerra-5.1/plugins/synthesizer/picon_original.png rename to cinelerra-5.1/picon/smoother/piano.png diff --git a/cinelerra-5.1/plugins/pitch/picon_smoother.png b/cinelerra-5.1/picon/smoother/pitch.png similarity index 100% rename from cinelerra-5.1/plugins/pitch/picon_smoother.png rename to cinelerra-5.1/picon/smoother/pitch.png diff --git a/cinelerra-5.1/plugins/polar/picon_smoother.png b/cinelerra-5.1/picon/smoother/polar.png similarity index 100% rename from cinelerra-5.1/plugins/polar/picon_smoother.png rename to cinelerra-5.1/picon/smoother/polar.png diff --git a/cinelerra-5.1/plugins/radialblur/picon_smoother.png b/cinelerra-5.1/picon/smoother/radialblur.png similarity index 100% rename from cinelerra-5.1/plugins/radialblur/picon_smoother.png rename to cinelerra-5.1/picon/smoother/radialblur.png diff --git a/cinelerra-5.1/plugins/reframe/picon_smoother.png b/cinelerra-5.1/picon/smoother/reframe.png similarity index 100% rename from cinelerra-5.1/plugins/reframe/picon_smoother.png rename to cinelerra-5.1/picon/smoother/reframe.png diff --git a/cinelerra-5.1/plugins/reframert/picon_smoother.png b/cinelerra-5.1/picon/smoother/reframert.png similarity index 100% rename from cinelerra-5.1/plugins/reframert/picon_smoother.png rename to cinelerra-5.1/picon/smoother/reframert.png diff --git a/cinelerra-5.1/plugins/removegaps/picon_smoother.png b/cinelerra-5.1/picon/smoother/removegaps.png similarity index 100% rename from cinelerra-5.1/plugins/removegaps/picon_smoother.png rename to cinelerra-5.1/picon/smoother/removegaps.png diff --git a/cinelerra-5.1/plugins/reroute/picon_smoother.png b/cinelerra-5.1/picon/smoother/reroute.png similarity index 100% rename from cinelerra-5.1/plugins/reroute/picon_smoother.png rename to cinelerra-5.1/picon/smoother/reroute.png diff --git a/cinelerra-5.1/plugins/resample/picon_smoother.png b/cinelerra-5.1/picon/smoother/resample.png similarity index 100% rename from cinelerra-5.1/plugins/resample/picon_smoother.png rename to cinelerra-5.1/picon/smoother/resample.png diff --git a/cinelerra-5.1/plugins/resamplert/picon_smoother.png b/cinelerra-5.1/picon/smoother/resamplert.png similarity index 100% rename from cinelerra-5.1/plugins/resamplert/picon_smoother.png rename to cinelerra-5.1/picon/smoother/resamplert.png diff --git a/cinelerra-5.1/plugins/reverb/picon_smoother.png b/cinelerra-5.1/picon/smoother/reverb.png similarity index 100% rename from cinelerra-5.1/plugins/reverb/picon_smoother.png rename to cinelerra-5.1/picon/smoother/reverb.png diff --git a/cinelerra-5.1/plugins/reverseaudio/picon_smoother.png b/cinelerra-5.1/picon/smoother/reverseaudio.png similarity index 100% rename from cinelerra-5.1/plugins/reverseaudio/picon_smoother.png rename to cinelerra-5.1/picon/smoother/reverseaudio.png diff --git a/cinelerra-5.1/plugins/reversevideo/picon_smoother.png b/cinelerra-5.1/picon/smoother/reversevideo.png similarity index 100% rename from cinelerra-5.1/plugins/reversevideo/picon_smoother.png rename to cinelerra-5.1/picon/smoother/reversevideo.png diff --git a/cinelerra-5.1/plugins/rgb601/picon_smoother.png b/cinelerra-5.1/picon/smoother/rgb601.png similarity index 100% rename from cinelerra-5.1/plugins/rgb601/picon_smoother.png rename to cinelerra-5.1/picon/smoother/rgb601.png diff --git a/cinelerra-5.1/plugins/rgbshift/picon_smoother.png b/cinelerra-5.1/picon/smoother/rgbshift.png similarity index 100% rename from cinelerra-5.1/plugins/rgbshift/picon_smoother.png rename to cinelerra-5.1/picon/smoother/rgbshift.png diff --git a/cinelerra-5.1/plugins/rotate/picon_smoother.png b/cinelerra-5.1/picon/smoother/rotate.png similarity index 100% rename from cinelerra-5.1/plugins/rotate/picon_smoother.png rename to cinelerra-5.1/picon/smoother/rotate.png diff --git a/cinelerra-5.1/plugins/rumbler/picon_smoother.png b/cinelerra-5.1/picon/smoother/rumbler.png similarity index 100% rename from cinelerra-5.1/plugins/rumbler/picon_smoother.png rename to cinelerra-5.1/picon/smoother/rumbler.png diff --git a/cinelerra-5.1/plugins/scale/picon_smoother.png b/cinelerra-5.1/picon/smoother/scale.png similarity index 100% rename from cinelerra-5.1/plugins/scale/picon_smoother.png rename to cinelerra-5.1/picon/smoother/scale.png diff --git a/cinelerra-5.1/plugins/scaleratio/picon_smoother.png b/cinelerra-5.1/picon/smoother/scaleratio.png similarity index 100% rename from cinelerra-5.1/plugins/scaleratio/picon_smoother.png rename to cinelerra-5.1/picon/smoother/scaleratio.png diff --git a/cinelerra-5.1/plugins/denoiseseltempavg/picon_smoother.png b/cinelerra-5.1/picon/smoother/seltempavg.png similarity index 100% rename from cinelerra-5.1/plugins/denoiseseltempavg/picon_smoother.png rename to cinelerra-5.1/picon/smoother/seltempavg.png diff --git a/cinelerra-5.1/plugins/shapewipe/picon_smoother.png b/cinelerra-5.1/picon/smoother/shapewipe.png similarity index 100% rename from cinelerra-5.1/plugins/shapewipe/picon_smoother.png rename to cinelerra-5.1/picon/smoother/shapewipe.png diff --git a/cinelerra-5.1/plugins/sharpen/picon_smoother.png b/cinelerra-5.1/picon/smoother/sharpen.png similarity index 100% rename from cinelerra-5.1/plugins/sharpen/picon_smoother.png rename to cinelerra-5.1/picon/smoother/sharpen.png diff --git a/cinelerra-5.1/plugins/shiftinterlace/picon_smoother.png b/cinelerra-5.1/picon/smoother/shiftinterlace.png similarity index 100% rename from cinelerra-5.1/plugins/shiftinterlace/picon_smoother.png rename to cinelerra-5.1/picon/smoother/shiftinterlace.png diff --git a/cinelerra-5.1/plugins/slide/picon_smoother.png b/cinelerra-5.1/picon/smoother/slide.png similarity index 100% rename from cinelerra-5.1/plugins/slide/picon_smoother.png rename to cinelerra-5.1/picon/smoother/slide.png diff --git a/cinelerra-5.1/plugins/spectrogram/picon_smoother.png b/cinelerra-5.1/picon/smoother/spectrogram.png similarity index 100% rename from cinelerra-5.1/plugins/spectrogram/picon_smoother.png rename to cinelerra-5.1/picon/smoother/spectrogram.png diff --git a/cinelerra-5.1/plugins/svg/picon_smoother.png b/cinelerra-5.1/picon/smoother/svg.png similarity index 100% rename from cinelerra-5.1/plugins/svg/picon_smoother.png rename to cinelerra-5.1/picon/smoother/svg.png diff --git a/cinelerra-5.1/plugins/swapchannels/picon_smoother.png b/cinelerra-5.1/picon/smoother/swapchannels.png similarity index 100% rename from cinelerra-5.1/plugins/swapchannels/picon_smoother.png rename to cinelerra-5.1/picon/smoother/swapchannels.png diff --git a/cinelerra-5.1/plugins/swapframes/picon_smoother.png b/cinelerra-5.1/picon/smoother/swapframes.png similarity index 100% rename from cinelerra-5.1/plugins/swapframes/picon_smoother.png rename to cinelerra-5.1/picon/smoother/swapframes.png diff --git a/cinelerra-5.1/plugins/synthesizer/picon_smoother.png b/cinelerra-5.1/picon/smoother/synthesizer.png similarity index 100% rename from cinelerra-5.1/plugins/synthesizer/picon_smoother.png rename to cinelerra-5.1/picon/smoother/synthesizer.png diff --git a/cinelerra-5.1/plugins/threshold/picon_smoother.png b/cinelerra-5.1/picon/smoother/threshold.png similarity index 100% rename from cinelerra-5.1/plugins/threshold/picon_smoother.png rename to cinelerra-5.1/picon/smoother/threshold.png diff --git a/cinelerra-5.1/plugins/timeavg/picon_smoother.png b/cinelerra-5.1/picon/smoother/timeavg.png similarity index 100% rename from cinelerra-5.1/plugins/timeavg/picon_smoother.png rename to cinelerra-5.1/picon/smoother/timeavg.png diff --git a/cinelerra-5.1/plugins/timefront/picon_smoother.png b/cinelerra-5.1/picon/smoother/timefront.png similarity index 100% rename from cinelerra-5.1/plugins/timefront/picon_smoother.png rename to cinelerra-5.1/picon/smoother/timefront.png diff --git a/cinelerra-5.1/plugins/timestretch/picon_smoother.png b/cinelerra-5.1/picon/smoother/timestretch.png similarity index 100% rename from cinelerra-5.1/plugins/timestretch/picon_smoother.png rename to cinelerra-5.1/picon/smoother/timestretch.png diff --git a/cinelerra-5.1/plugins/timestretchrt/picon_smoother.png b/cinelerra-5.1/picon/smoother/timestretchrt.png similarity index 100% rename from cinelerra-5.1/plugins/timestretchrt/picon_smoother.png rename to cinelerra-5.1/picon/smoother/timestretchrt.png diff --git a/cinelerra-5.1/plugins/titler/picon_smoother.png b/cinelerra-5.1/picon/smoother/titler.png similarity index 100% rename from cinelerra-5.1/plugins/titler/picon_smoother.png rename to cinelerra-5.1/picon/smoother/titler.png diff --git a/cinelerra-5.1/plugins/translate/picon_smoother.png b/cinelerra-5.1/picon/smoother/translate.png similarity index 100% rename from cinelerra-5.1/plugins/translate/picon_smoother.png rename to cinelerra-5.1/picon/smoother/translate.png diff --git a/cinelerra-5.1/plugins/unsharp/picon_smoother.png b/cinelerra-5.1/picon/smoother/unsharp.png similarity index 100% rename from cinelerra-5.1/plugins/unsharp/picon_smoother.png rename to cinelerra-5.1/picon/smoother/unsharp.png diff --git a/cinelerra-5.1/plugins/videoscope/picon_smoother.png b/cinelerra-5.1/picon/smoother/videoscope.png similarity index 100% rename from cinelerra-5.1/plugins/videoscope/picon_smoother.png rename to cinelerra-5.1/picon/smoother/videoscope.png diff --git a/cinelerra-5.1/plugins/vocoder/picon_smoother.png b/cinelerra-5.1/picon/smoother/vocoder.png similarity index 100% rename from cinelerra-5.1/plugins/vocoder/picon_smoother.png rename to cinelerra-5.1/picon/smoother/vocoder.png diff --git a/cinelerra-5.1/plugins/wave/picon_smoother.png b/cinelerra-5.1/picon/smoother/wave.png similarity index 100% rename from cinelerra-5.1/plugins/wave/picon_smoother.png rename to cinelerra-5.1/picon/smoother/wave.png diff --git a/cinelerra-5.1/plugins/whirl/picon_smoother.png b/cinelerra-5.1/picon/smoother/whirl.png similarity index 100% rename from cinelerra-5.1/plugins/whirl/picon_smoother.png rename to cinelerra-5.1/picon/smoother/whirl.png diff --git a/cinelerra-5.1/plugins/wipe/picon_smoother.png b/cinelerra-5.1/picon/smoother/wipe.png similarity index 100% rename from cinelerra-5.1/plugins/wipe/picon_smoother.png rename to cinelerra-5.1/picon/smoother/wipe.png diff --git a/cinelerra-5.1/plugins/yuv/picon_smoother.png b/cinelerra-5.1/picon/smoother/yuv.png similarity index 100% rename from cinelerra-5.1/plugins/yuv/picon_smoother.png rename to cinelerra-5.1/picon/smoother/yuv.png diff --git a/cinelerra-5.1/plugins/yuv411/picon_smoother.png b/cinelerra-5.1/picon/smoother/yuv411.png similarity index 100% rename from cinelerra-5.1/plugins/yuv411/picon_smoother.png rename to cinelerra-5.1/picon/smoother/yuv411.png diff --git a/cinelerra-5.1/plugins/yuvshift/picon_smoother.png b/cinelerra-5.1/picon/smoother/yuvshift.png similarity index 100% rename from cinelerra-5.1/plugins/yuvshift/picon_smoother.png rename to cinelerra-5.1/picon/smoother/yuvshift.png diff --git a/cinelerra-5.1/plugins/zoom/picon_smoother.png b/cinelerra-5.1/picon/smoother/zoom.png similarity index 100% rename from cinelerra-5.1/plugins/zoom/picon_smoother.png rename to cinelerra-5.1/picon/smoother/zoom.png diff --git a/cinelerra-5.1/plugins/zoomblur/picon_smoother.png b/cinelerra-5.1/picon/smoother/zoomblur.png similarity index 100% rename from cinelerra-5.1/plugins/zoomblur/picon_smoother.png rename to cinelerra-5.1/picon/smoother/zoomblur.png diff --git a/cinelerra-5.1/plugin_config b/cinelerra-5.1/plugin_config index c4d3516d..de6cb9fc 100644 --- a/cinelerra-5.1/plugin_config +++ b/cinelerra-5.1/plugin_config @@ -8,8 +8,6 @@ $(shell mkdir -p $(OBJDIR)) PLUGIN_DIR := $(BINDIR)/plugins OUTPUT_DIR = $(PLUGIN_DIR)/$($(PLUGIN)) -PLUGIN_PNGS = $(wildcard picon_*.png) -OUTPUT_PNGS = $(foreach png,$(PLUGIN_PNGS), $(PLUGIN_DIR)/$(basename $(png))/$(PLUGIN).png) OUTPUT = $(OUTPUT_DIR)/$(PLUGIN).plugin OUTPUT_G = $(OBJDIR)/$(PLUGIN).debuginfo @@ -18,7 +16,7 @@ $(shell echo $(LFLAGS) > $(OBJDIR)/l_flags) ifeq ($(OUTPUT_THEME),) -$(OUTPUT): $(OBJS) $(OUTPUT_DIR) $(OUTPUT_PNGS) $(OUTPUT_BINS) +$(OUTPUT): $(OBJS) $(OUTPUT_DIR) $(OUTPUT_BINS) $(LDLINKER) -o $(OUTPUT) $(OBJS) $(OUTPUT_BINS) `cat $(OBJDIR)/l_flags` $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G)) $(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT)) @@ -41,10 +39,6 @@ endif $(OUTPUT_DIR): mkdir -p $@ -$(PLUGIN_DIR)/%/$(PLUGIN).png: %.png - $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) - cp -a $< $@ - clean:: rm -f $(OUTPUT) rm -rf $(OBJDIR)