From: Good Guy Date: Mon, 21 Dec 2015 20:33:42 +0000 (-0700) Subject: add scaled icon data X-Git-Url: http://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=ac6cc6b87e596ffb6cc0e3c5b965f99893e70acd;p=goodguy%2Fhistory.git add scaled icon data --- diff --git a/cinelerra-5.0/cinelerra/awindowgui.C b/cinelerra-5.0/cinelerra/awindowgui.C index d2a87597..3e4c383b 100644 --- a/cinelerra-5.0/cinelerra/awindowgui.C +++ b/cinelerra-5.0/cinelerra/awindowgui.C @@ -201,7 +201,7 @@ void AssetPicon::create_objects() int pixmap_w, pixmap_h; const int debug = 0; - pixmap_h = 50; + pixmap_h = 50 * BC_WindowBase::get_resources()->icon_scale; if(debug) printf("AssetPicon::create_objects %d\n", __LINE__); if(indexable) @@ -496,11 +496,11 @@ SET_TRACE vtransition_icon = new BC_Pixmap(this, vtransition_vframe, PIXMAP_ALPHA); aeffect_vframe = mwindow->theme->get_image("aeffect_icon"); aeffect_icon = new BC_Pixmap(this, aeffect_vframe, PIXMAP_ALPHA); - ladspa_vframe = new VFrame(lad_picon_png); + ladspa_vframe = new VFramePng(lad_picon_png); ladspa_icon = new BC_Pixmap(this, ladspa_vframe, PIXMAP_ALPHA); - ff_aud_vframe = new VFrame(ff_audio_png); + ff_aud_vframe = new VFramePng(ff_audio_png); ff_aud_icon = new BC_Pixmap(this, ff_aud_vframe, PIXMAP_ALPHA); - ff_vid_vframe = new VFrame(ff_video_png); + ff_vid_vframe = new VFramePng(ff_video_png); ff_vid_icon = new BC_Pixmap(this, ff_vid_vframe, PIXMAP_ALPHA); veffect_vframe = mwindow->theme->get_image("veffect_icon"); veffect_icon = new BC_Pixmap(this, veffect_vframe, PIXMAP_ALPHA); diff --git a/cinelerra-5.0/cinelerra/data/ff_checked_png.h b/cinelerra-5.0/cinelerra/data/ff_checked_png.h deleted file mode 100644 index f0f41185..00000000 --- a/cinelerra-5.0/cinelerra/data/ff_checked_png.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef FF_CHECKED_PNG_H -#define FF_CHECKED_PNG_H - -static unsigned char ff_checked_png[] = -{ - 0x00, 0x00, 0x02, 0xe6, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x19, 0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xe9, 0x85, - 0x63, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xa6, - 0xee, 0x94, 0x12, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, - 0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, - 0x07, 0xdf, 0x07, 0x09, 0x11, 0x0b, 0x05, 0x6e, 0xee, 0x73, 0xc3, 0x00, 0x00, 0x00, 0x1d, 0x74, - 0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x54, 0x68, 0x65, 0x20, 0x47, 0x49, 0x4d, 0x50, - 0xef, 0x64, 0x25, 0x6e, 0x00, 0x00, 0x02, 0x4a, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0x96, - 0xcf, 0x4f, 0x13, 0x41, 0x14, 0xc7, 0x3f, 0xb5, 0x3f, 0x28, 0x8d, 0xb5, 0x4a, 0x0b, 0x46, 0x04, - 0xa5, 0x51, 0x63, 0x62, 0x91, 0x62, 0x00, 0x0f, 0x2a, 0x46, 0xf1, 0x66, 0x62, 0xf4, 0xe4, 0x81, - 0x70, 0xd5, 0x7f, 0xc0, 0x83, 0x67, 0x63, 0x34, 0x9a, 0x78, 0x36, 0x1e, 0x3c, 0x73, 0xe0, 0x68, - 0x13, 0x8d, 0x31, 0x9a, 0x1e, 0x94, 0xc4, 0x26, 0x42, 0x8c, 0x52, 0x38, 0x48, 0x0a, 0xa9, 0xd6, - 0x96, 0x20, 0x6d, 0xda, 0xb2, 0x80, 0xa5, 0x3b, 0x1e, 0x66, 0xe9, 0x76, 0xd9, 0xb4, 0x6c, 0xcc, - 0xe2, 0xc1, 0x4d, 0x26, 0x6f, 0xe6, 0xbd, 0xef, 0xcc, 0x77, 0xe7, 0xbd, 0x37, 0x6f, 0x06, 0xfe, - 0x97, 0xcf, 0xb1, 0x1b, 0x8b, 0x5e, 0x9e, 0x60, 0xc4, 0xa1, 0xf2, 0xd8, 0xe1, 0xe0, 0x00, 0x80, - 0x0b, 0x40, 0x28, 0xdc, 0xb1, 0x8b, 0x20, 0xa7, 0xe0, 0x7d, 0x34, 0xcd, 0xd5, 0x54, 0x89, 0x30, - 0x40, 0xa9, 0x42, 0xca, 0xa5, 0xd9, 0x9e, 0xd8, 0x45, 0x32, 0xb5, 0x0c, 0xbf, 0xd6, 0xc1, 0xef, - 0x96, 0xe3, 0x62, 0x85, 0x07, 0x7b, 0xec, 0x74, 0xd3, 0x5c, 0x01, 0xe2, 0x19, 0x10, 0xda, 0xb8, - 0x3f, 0x08, 0x4a, 0x95, 0x71, 0xdb, 0x48, 0xd6, 0x37, 0x21, 0xfe, 0x03, 0x32, 0xab, 0x72, 0x1c, - 0xf2, 0xc2, 0x48, 0x17, 0x7c, 0x1c, 0x25, 0x67, 0x1b, 0xc9, 0xbb, 0x0c, 0x4c, 0xe6, 0xf4, 0xf1, - 0x95, 0x2e, 0x38, 0x13, 0x92, 0x7d, 0x5b, 0x48, 0xa6, 0x97, 0xe1, 0x4d, 0x1a, 0x84, 0xe6, 0xa7, - 0xa1, 0x0e, 0xb8, 0xd4, 0xb9, 0x0d, 0x24, 0x14, 0x84, 0x50, 0x10, 0x5f, 0x12, 0x08, 0x40, 0x74, - 0x48, 0x7c, 0xc3, 0xa6, 0x82, 0xb8, 0x65, 0x11, 0x57, 0x85, 0xdb, 0x06, 0x92, 0x87, 0xf7, 0x24, - 0xc9, 0x0d, 0x9f, 0x0e, 0x52, 0xcf, 0x23, 0x2a, 0x65, 0xc4, 0x7c, 0x16, 0xb1, 0x51, 0x36, 0xe2, - 0xae, 0xd7, 0xe1, 0x92, 0x11, 0xc4, 0x58, 0x0c, 0x11, 0x4b, 0x4a, 0xcc, 0x56, 0x33, 0xb9, 0xeb, - 0xfd, 0xa4, 0x94, 0x17, 0xfc, 0xba, 0x6e, 0xe9, 0x38, 0x3c, 0x9f, 0x85, 0xa7, 0x5f, 0x61, 0xa1, - 0x68, 0xc4, 0x9d, 0xf5, 0xe9, 0xb8, 0x74, 0x8f, 0x8c, 0xc1, 0x70, 0xa7, 0xd9, 0x9d, 0x06, 0x92, - 0xd9, 0x39, 0x6d, 0xb2, 0x57, 0xd7, 0xbd, 0xda, 0x07, 0x1f, 0xb2, 0x90, 0x5b, 0x83, 0x6f, 0x45, - 0x23, 0xae, 0xd7, 0x65, 0xfc, 0x99, 0x8b, 0x87, 0x20, 0xe0, 0xd9, 0x81, 0x24, 0x93, 0x95, 0xb2, - 0x5b, 0xd1, 0x75, 0xa9, 0xa3, 0x7a, 0x3f, 0x99, 0x97, 0xa9, 0xba, 0x85, 0x3b, 0x55, 0xd1, 0x6d, - 0xc1, 0x41, 0x18, 0x68, 0x6f, 0x92, 0x1d, 0x42, 0x41, 0x94, 0x96, 0xa4, 0x9f, 0xdd, 0x20, 0x36, - 0x76, 0x08, 0xe6, 0x35, 0x8b, 0x38, 0x75, 0x42, 0xc6, 0xa4, 0xb6, 0xe1, 0x97, 0xaf, 0x75, 0x17, - 0x78, 0x36, 0xe5, 0xa9, 0xfd, 0x79, 0x18, 0xee, 0x3e, 0x33, 0xfe, 0x50, 0x29, 0x01, 0xb1, 0xfb, - 0x10, 0x75, 0x82, 0xa7, 0x2a, 0x71, 0xe5, 0x30, 0xf8, 0x67, 0x1a, 0x57, 0xde, 0x9a, 0xbb, 0xde, - 0xc6, 0xcd, 0x41, 0x4f, 0xf7, 0x98, 0x77, 0x3d, 0x93, 0x90, 0x72, 0xa0, 0x55, 0xd7, 0xb5, 0xf4, - 0x35, 0x3f, 0x47, 0x35, 0x92, 0x4f, 0x53, 0x52, 0x0e, 0xef, 0xd5, 0x8d, 0x8b, 0x61, 0xf3, 0x84, - 0x95, 0x79, 0x29, 0x07, 0xeb, 0x48, 0xdc, 0xfd, 0x16, 0x49, 0x52, 0x0b, 0x5a, 0x51, 0x73, 0x36, - 0xdf, 0x49, 0x59, 0x0b, 0x7a, 0xb4, 0x3e, 0x65, 0x7a, 0x2d, 0x92, 0xe4, 0x0b, 0x52, 0x1e, 0x29, - 0xe8, 0xc6, 0xfc, 0x09, 0xf3, 0x84, 0xdf, 0x5a, 0x01, 0x8c, 0xd4, 0x65, 0x20, 0xa7, 0x9b, 0x93, - 0xd4, 0x02, 0xaf, 0xae, 0x1a, 0x0d, 0xaa, 0x80, 0xee, 0x24, 0x2c, 0x66, 0x8d, 0xfa, 0xb1, 0x17, - 0x70, 0x72, 0x3f, 0x7c, 0x0f, 0x43, 0xa0, 0xcd, 0xda, 0xd5, 0xda, 0xb0, 0x40, 0x3a, 0x1d, 0x10, - 0x0d, 0x81, 0x7b, 0xdb, 0x2a, 0x43, 0xed, 0x70, 0xf3, 0x18, 0x44, 0xda, 0xac, 0x17, 0x50, 0x57, - 0x33, 0x63, 0x5f, 0x50, 0x56, 0xd3, 0xcf, 0x2b, 0x10, 0x6a, 0x95, 0x97, 0xd0, 0xb9, 0x83, 0x10, - 0x68, 0xf9, 0x8b, 0x87, 0x84, 0x50, 0x18, 0xdd, 0xb5, 0x97, 0x8a, 0x8f, 0xf1, 0x7f, 0xf2, 0x24, - 0xfa, 0x03, 0x94, 0x8b, 0x11, 0x95, 0x0e, 0x2b, 0x5e, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, - 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 -}; - -#endif diff --git a/cinelerra-5.0/cinelerra/data/ff_checkedhi_png.h b/cinelerra-5.0/cinelerra/data/ff_checkedhi_png.h deleted file mode 100644 index e8af30d5..00000000 --- a/cinelerra-5.0/cinelerra/data/ff_checkedhi_png.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef FF_CHECKEDHI_PNG_H -#define FF_CHECKEDHI_PNG_H - -static unsigned char ff_checkedhi_png[] = -{ - 0x00, 0x00, 0x03, 0x45, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x19, 0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xe9, 0x85, - 0x63, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xa6, - 0xee, 0x94, 0x12, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, - 0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, - 0x07, 0xdf, 0x07, 0x09, 0x11, 0x11, 0x2e, 0x72, 0x7f, 0x70, 0x58, 0x00, 0x00, 0x00, 0x1d, 0x74, - 0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x54, 0x68, 0x65, 0x20, 0x47, 0x49, 0x4d, 0x50, - 0xef, 0x64, 0x25, 0x6e, 0x00, 0x00, 0x02, 0xa9, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0x96, - 0xdf, 0x4b, 0x14, 0x51, 0x14, 0xc7, 0x3f, 0xb6, 0xe3, 0xaa, 0xeb, 0xcf, 0x74, 0xd3, 0x7e, 0xa8, - 0xeb, 0x96, 0x51, 0xe4, 0x6f, 0xcc, 0x20, 0x51, 0x11, 0x7b, 0xe9, 0xa5, 0xb7, 0x28, 0x90, 0xea, - 0xad, 0x9e, 0x7b, 0x13, 0x7a, 0x0d, 0xa4, 0xbf, 0x20, 0x2a, 0x7b, 0x4a, 0xb0, 0x22, 0x24, 0x50, - 0x29, 0x42, 0x12, 0x41, 0x0b, 0x92, 0xd4, 0x6a, 0x53, 0x83, 0x34, 0xdd, 0xd6, 0xd6, 0x1f, 0x85, - 0x6b, 0x39, 0xbb, 0xe5, 0xfe, 0x3a, 0x3d, 0x8c, 0x8e, 0x3b, 0x6e, 0x6c, 0x1b, 0x6d, 0x2f, 0x5d, - 0x18, 0xce, 0xcc, 0x39, 0xdf, 0x7b, 0x3f, 0xf7, 0xcc, 0xb9, 0xf7, 0xce, 0xc0, 0xff, 0xd2, 0x92, - 0x00, 0x44, 0x44, 0x12, 0x39, 0xe8, 0xd8, 0xf2, 0x00, 0x1d, 0xaf, 0xda, 0x50, 0x03, 0x1e, 0x16, - 0xbc, 0x33, 0x33, 0x3b, 0x12, 0x3d, 0x6b, 0xd5, 0xff, 0x8d, 0x21, 0x57, 0x37, 0x6a, 0xc0, 0x03, - 0x80, 0x80, 0x27, 0xe1, 0x90, 0xa1, 0xf9, 0x6e, 0x46, 0x17, 0xfb, 0xf5, 0x67, 0x81, 0xae, 0x84, - 0x42, 0xde, 0xad, 0xbc, 0x64, 0xd0, 0x75, 0x1f, 0x21, 0x0c, 0x40, 0x75, 0x7e, 0x0b, 0xbe, 0x50, - 0x02, 0x21, 0x3f, 0x82, 0x3e, 0x06, 0x3f, 0xde, 0xc3, 0xad, 0x4e, 0x03, 0x60, 0x4d, 0x2b, 0xa4, - 0xa5, 0xb8, 0x95, 0x17, 0xad, 0x2c, 0x25, 0x0c, 0x32, 0xe0, 0xba, 0xcb, 0x73, 0x77, 0x8f, 0xbe, - 0x9e, 0x4e, 0x94, 0xb4, 0x52, 0x53, 0xd0, 0x0c, 0x40, 0x42, 0x20, 0xe3, 0x4b, 0x83, 0xf4, 0xcf, - 0x76, 0x22, 0xa2, 0xbd, 0xa6, 0xba, 0xdd, 0x27, 0x69, 0x2e, 0x3a, 0x6b, 0x14, 0xc9, 0x46, 0x73, - 0x38, 0x1c, 0x02, 0x48, 0x3e, 0x88, 0xc4, 0xb8, 0xc2, 0x20, 0x17, 0xe3, 0xd4, 0x85, 0xe0, 0x92, - 0x21, 0x93, 0xde, 0xde, 0x5e, 0x00, 0xea, 0x2d, 0x96, 0xcd, 0x95, 0x81, 0x34, 0x35, 0x11, 0x0c, - 0xf9, 0xf9, 0xe0, 0x71, 0xe0, 0x0f, 0xad, 0x83, 0x08, 0xd7, 0xda, 0xdb, 0xe9, 0x00, 0x8e, 0x47, - 0xe8, 0xa6, 0xca, 0x52, 0x39, 0xdf, 0x57, 0x4a, 0xdf, 0xfb, 0x9b, 0x3a, 0x26, 0x49, 0x04, 0x13, - 0xdc, 0x32, 0x40, 0x86, 0x87, 0x87, 0x01, 0x68, 0xc8, 0xca, 0xd2, 0x7d, 0xcb, 0xa5, 0x39, 0xdc, - 0x7e, 0x73, 0x85, 0xeb, 0xe3, 0x97, 0x99, 0x5b, 0x7d, 0x6b, 0xd0, 0x1d, 0x4b, 0x4f, 0xd6, 0x75, - 0x2e, 0xbb, 0x99, 0x9a, 0xfc, 0x16, 0x1a, 0x8b, 0x4f, 0x47, 0xbd, 0x4e, 0x03, 0x64, 0x6a, 0x6a, - 0x4a, 0xeb, 0x9c, 0x9a, 0xa2, 0xfb, 0x1e, 0x67, 0x8c, 0xf2, 0xec, 0xd3, 0x43, 0x96, 0x7c, 0x4e, - 0xa6, 0xbf, 0x8e, 0x1b, 0x74, 0xe5, 0x26, 0x7f, 0xc4, 0x64, 0x76, 0xd2, 0x54, 0x78, 0x9a, 0x6c, - 0x73, 0x6e, 0x14, 0x44, 0x11, 0xc1, 0x42, 0xb0, 0x1b, 0xf0, 0xe2, 0x76, 0xbb, 0x00, 0x28, 0xf2, - 0x2e, 0xe8, 0x82, 0x59, 0x9b, 0x0f, 0x08, 0x00, 0x30, 0xf9, 0xb9, 0x93, 0x96, 0x3d, 0x61, 0x5d, - 0x77, 0x24, 0xb0, 0xae, 0xeb, 0xf2, 0xea, 0xf6, 0x53, 0x6b, 0x75, 0x43, 0xf0, 0x4e, 0xc4, 0xf0, - 0xe9, 0x88, 0x60, 0x41, 0x7c, 0xd8, 0xe4, 0x7b, 0x85, 0xac, 0x2d, 0xa7, 0x0b, 0x20, 0xc9, 0x20, - 0xeb, 0xbf, 0x29, 0xe6, 0xa9, 0x38, 0x75, 0xe1, 0x07, 0x36, 0x11, 0x1f, 0x36, 0x05, 0x80, 0xb0, - 0x63, 0xee, 0xd1, 0x13, 0x4a, 0x00, 0xca, 0x15, 0x30, 0x07, 0xb5, 0x62, 0x2e, 0xec, 0x83, 0xb6, - 0x1b, 0xc6, 0xd4, 0xd7, 0x46, 0xa0, 0xf7, 0x2a, 0x54, 0x99, 0xc0, 0x1c, 0xd2, 0x74, 0xaa, 0x1d, - 0x32, 0x27, 0x7e, 0x75, 0xf2, 0x3a, 0xe7, 0x0c, 0x35, 0x79, 0x3a, 0xa8, 0xd9, 0x86, 0xcc, 0x2d, - 0xa1, 0xab, 0x24, 0x7a, 0x4f, 0x4c, 0x8c, 0x68, 0xb6, 0x36, 0x6d, 0xcb, 0x97, 0x52, 0x19, 0x7b, - 0x1f, 0xe9, 0x90, 0xd1, 0x31, 0xcd, 0x36, 0x66, 0x6c, 0x05, 0x9d, 0xf6, 0xe8, 0x0e, 0x2b, 0x33, - 0x9a, 0x3d, 0x1a, 0x01, 0x49, 0xae, 0x8e, 0x13, 0x32, 0x3b, 0xa7, 0xd9, 0x6a, 0x53, 0xec, 0x4c, - 0xd4, 0x45, 0xcd, 0x56, 0x45, 0xae, 0xcb, 0xf2, 0x38, 0x21, 0x9e, 0x55, 0xcd, 0x16, 0xaf, 0x6e, - 0x05, 0x3d, 0x07, 0xa3, 0x3b, 0xf8, 0xbd, 0x9a, 0x2d, 0xf3, 0x45, 0x38, 0x2b, 0x62, 0x43, 0x94, - 0xcd, 0x9b, 0xb0, 0xd7, 0x18, 0x08, 0x0b, 0x14, 0x4d, 0x82, 0x73, 0xd1, 0xe8, 0x3f, 0xd7, 0x03, - 0x87, 0x72, 0x60, 0xde, 0x0e, 0xd9, 0xb9, 0x1b, 0x05, 0x26, 0xce, 0x4c, 0xb6, 0x37, 0x53, 0x12, - 0x54, 0x59, 0x21, 0x79, 0xdb, 0x28, 0x75, 0xbb, 0xe0, 0xcc, 0x01, 0x28, 0xcb, 0x8d, 0xff, 0x00, - 0x55, 0x62, 0x05, 0x2b, 0xf3, 0xa0, 0x79, 0x2f, 0xbc, 0x5e, 0x01, 0x6b, 0x1a, 0x54, 0xe7, 0x41, - 0x7d, 0x01, 0x64, 0xa7, 0xfc, 0xd9, 0x29, 0x1d, 0x13, 0x62, 0x51, 0xe0, 0xc2, 0xe1, 0xbf, 0xff, - 0x14, 0x28, 0x04, 0x50, 0x51, 0xe8, 0x42, 0xb0, 0xfe, 0x83, 0xbf, 0xa1, 0x2f, 0x04, 0x50, 0x7f, - 0x02, 0x91, 0x2e, 0x3b, 0x98, 0x8a, 0xc8, 0xcf, 0x93, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, - 0x44, 0xae, 0x42, 0x60, 0x82 -}; - -#endif diff --git a/cinelerra-5.0/cinelerra/data/ff_down_png.h b/cinelerra-5.0/cinelerra/data/ff_down_png.h deleted file mode 100644 index 69255cd2..00000000 --- a/cinelerra-5.0/cinelerra/data/ff_down_png.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef FF_DOWN_PNG_H -#define FF_DOWN_PNG_H - -static unsigned char ff_down_png[] = -{ - 0x00, 0x00, 0x02, 0xe4, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x19, 0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xe9, 0x85, - 0x63, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0, - 0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, - 0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, - 0x07, 0xdf, 0x07, 0x09, 0x11, 0x02, 0x24, 0xf3, 0x45, 0xd8, 0xd4, 0x00, 0x00, 0x00, 0x1d, 0x74, - 0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x54, 0x68, 0x65, 0x20, 0x47, 0x49, 0x4d, 0x50, - 0xef, 0x64, 0x25, 0x6e, 0x00, 0x00, 0x02, 0x48, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0x96, - 0x4d, 0x68, 0x13, 0x41, 0x14, 0xc7, 0x7f, 0x93, 0x66, 0x37, 0x86, 0x6a, 0x6b, 0xac, 0xb4, 0x7a, - 0xa8, 0x62, 0x45, 0x0f, 0xa5, 0x24, 0x48, 0x05, 0x05, 0x0f, 0x2a, 0x7e, 0xf6, 0x10, 0xc5, 0x8b, - 0xf8, 0x75, 0x30, 0x07, 0x05, 0x11, 0x7a, 0x2c, 0x78, 0xcc, 0x51, 0x05, 0xa9, 0x39, 0x78, 0xf1, - 0xe2, 0xc1, 0x93, 0x78, 0xf0, 0xa4, 0x82, 0x55, 0xa4, 0x8a, 0x3d, 0x1b, 0x51, 0x11, 0xa5, 0x05, - 0x0f, 0xad, 0x60, 0xd3, 0xe6, 0x43, 0x93, 0xcd, 0xc7, 0x66, 0x3c, 0xec, 0x66, 0xb3, 0xbb, 0xf9, - 0x5a, 0x25, 0xbd, 0x38, 0xb0, 0xcc, 0xec, 0xcc, 0x7b, 0xfc, 0xe6, 0x3f, 0xef, 0xcd, 0xdb, 0x85, - 0xff, 0xa5, 0x89, 0x5d, 0xe7, 0x39, 0x3e, 0x3f, 0xc2, 0x53, 0x09, 0x02, 0x01, 0xd2, 0xb6, 0xd6, - 0xd4, 0x01, 0xa4, 0xa8, 0xa2, 0x0b, 0xa8, 0x19, 0x4b, 0x21, 0x1b, 0x1f, 0xa4, 0xb1, 0x3a, 0xb2, - 0xc0, 0x0b, 0xff, 0xd7, 0xdd, 0xcc, 0xf4, 0x54, 0x10, 0x55, 0x3f, 0x3e, 0x2f, 0xbb, 0x92, 0x20, - 0xe8, 0xf1, 0x66, 0x0b, 0xd0, 0x97, 0x25, 0xe1, 0x23, 0x4e, 0x35, 0xb4, 0xc2, 0xb5, 0xb5, 0x38, - 0xa6, 0x2d, 0x8b, 0xac, 0xce, 0xcd, 0xf0, 0xda, 0x07, 0xb0, 0x3c, 0xc8, 0xfd, 0x80, 0x46, 0xa1, - 0xdb, 0x90, 0x4d, 0x2b, 0x9c, 0x05, 0x4c, 0xd9, 0x71, 0x64, 0xb0, 0xc0, 0x85, 0x6e, 0x02, 0xfa, - 0x32, 0xe4, 0x3e, 0x8d, 0xf1, 0xb2, 0x0e, 0x01, 0xd2, 0x09, 0x9e, 0xf4, 0xfe, 0x62, 0xb1, 0x5b, - 0x90, 0x80, 0xc6, 0x75, 0xe2, 0x46, 0xf0, 0x1d, 0x01, 0x14, 0x92, 0x09, 0x7b, 0x7a, 0xfd, 0x6b, - 0xf3, 0xe9, 0xe8, 0x3f, 0x87, 0x78, 0xd8, 0x6a, 0x7d, 0x0c, 0x90, 0x83, 0x20, 0x65, 0x9b, 0xa7, - 0x0a, 0xf2, 0x8a, 0x47, 0x3b, 0x1d, 0xae, 0xfa, 0x5d, 0x90, 0x28, 0x40, 0x44, 0x01, 0xca, 0xc6, - 0x35, 0x98, 0xdd, 0x06, 0x87, 0x62, 0x2e, 0xab, 0x37, 0xc0, 0x2b, 0x38, 0xd6, 0xc4, 0x2e, 0xa0, - 0x91, 0x2f, 0xde, 0xa4, 0xd7, 0xa1, 0xcc, 0xe5, 0x7e, 0x00, 0x60, 0x5c, 0xa0, 0xd5, 0x26, 0x92, - 0x43, 0x4d, 0xf4, 0x7e, 0x37, 0xba, 0x88, 0x5a, 0x9f, 0xaa, 0xd9, 0x05, 0x0b, 0xc4, 0x1a, 0x8e, - 0xcf, 0xf5, 0x3e, 0x0a, 0x70, 0xb8, 0xc4, 0x8f, 0xb6, 0x90, 0x65, 0xa3, 0x0b, 0x2b, 0x4e, 0x48, - 0x30, 0xcf, 0x6a, 0x3a, 0xc1, 0xa3, 0x4e, 0x90, 0xad, 0x00, 0x7b, 0xc0, 0xdf, 0x16, 0x92, 0x33, - 0x95, 0xe8, 0x4e, 0x88, 0x52, 0xe2, 0x62, 0xa7, 0xa4, 0x58, 0x0f, 0x48, 0x05, 0x64, 0xb1, 0x43, - 0x30, 0xa3, 0x1e, 0xed, 0x2a, 0x70, 0x0a, 0x6c, 0x3b, 0x06, 0x26, 0xcc, 0xf3, 0x2a, 0xab, 0xa0, - 0x48, 0x20, 0xa3, 0xb2, 0x14, 0xba, 0x61, 0xa8, 0xb3, 0xda, 0x47, 0xe0, 0x31, 0x84, 0x05, 0xa8, - 0xd2, 0x08, 0xfa, 0x97, 0x01, 0xd8, 0x7f, 0x89, 0x83, 0x99, 0xbb, 0xcc, 0x36, 0x4d, 0x69, 0xdb, - 0xf8, 0x08, 0xc0, 0x5e, 0xeb, 0x30, 0xa0, 0xbf, 0xc4, 0xdb, 0xe0, 0x6f, 0x52, 0x0e, 0x8f, 0x79, - 0x33, 0x1e, 0x81, 0xfa, 0xd4, 0xb7, 0x7e, 0xf2, 0xad, 0x00, 0x6e, 0xc8, 0xb8, 0x99, 0x5e, 0x39, - 0x5b, 0xc5, 0x7d, 0xaf, 0x54, 0x88, 0x3a, 0x2e, 0xe8, 0x52, 0x63, 0x66, 0x6d, 0xcf, 0xf0, 0xa0, - 0xed, 0xe5, 0xb4, 0x8d, 0x77, 0x00, 0xec, 0x03, 0xdd, 0x06, 0x49, 0x66, 0xa7, 0x99, 0xdb, 0x90, - 0xe5, 0xb3, 0x65, 0x95, 0x36, 0x95, 0xd8, 0x3c, 0x47, 0x53, 0x3c, 0xf7, 0x0a, 0x09, 0x01, 0xec, - 0x34, 0x7b, 0x80, 0x0a, 0x24, 0x01, 0xca, 0x2a, 0x27, 0x2c, 0x35, 0x66, 0xad, 0x8e, 0x68, 0x75, - 0xc7, 0x9a, 0x5d, 0xcb, 0x2f, 0xa3, 0xd7, 0x7a, 0xb4, 0x71, 0x92, 0x67, 0xe9, 0x10, 0x27, 0x5d, - 0x95, 0xf6, 0x43, 0x76, 0x9a, 0x70, 0xc7, 0x5a, 0xe6, 0x15, 0xa2, 0xad, 0xe3, 0x9c, 0x23, 0x36, - 0x12, 0xca, 0x0a, 0xa7, 0x3d, 0x15, 0x4c, 0xcf, 0x90, 0x5b, 0x64, 0x06, 0x52, 0xdc, 0xb1, 0x94, - 0xa5, 0x79, 0x57, 0xb8, 0xcd, 0x42, 0x57, 0x21, 0x00, 0xa9, 0xcd, 0x4c, 0x05, 0xf3, 0x14, 0x4d, - 0x15, 0x67, 0xd6, 0xec, 0xf7, 0x66, 0x38, 0xc6, 0xd1, 0xe1, 0xcb, 0xdc, 0xfb, 0x1b, 0x9f, 0x3f, - 0x0e, 0x24, 0xf6, 0x30, 0x0e, 0xa3, 0x4f, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, - 0xae, 0x42, 0x60, 0x82 -}; - -#endif diff --git a/cinelerra-5.0/cinelerra/data/ff_hi_png.h b/cinelerra-5.0/cinelerra/data/ff_hi_png.h deleted file mode 100644 index bc5c80f8..00000000 --- a/cinelerra-5.0/cinelerra/data/ff_hi_png.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef FF_HI_PNG_H -#define FF_HI_PNG_H - -static unsigned char ff_hi_png[] = -{ - 0x00, 0x00, 0x01, 0xa9, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x19, 0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xe9, 0x85, - 0x63, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0, - 0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, - 0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, - 0x07, 0xdf, 0x07, 0x09, 0x11, 0x05, 0x17, 0x03, 0xd4, 0x2f, 0x05, 0x00, 0x00, 0x00, 0x1d, 0x74, - 0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x54, 0x68, 0x65, 0x20, 0x47, 0x49, 0x4d, 0x50, - 0xef, 0x64, 0x25, 0x6e, 0x00, 0x00, 0x01, 0x0d, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x95, - 0x31, 0x6a, 0x42, 0x41, 0x10, 0x86, 0xbf, 0x27, 0x46, 0x51, 0xb0, 0x0a, 0xc4, 0x33, 0x08, 0xc6, - 0x94, 0x16, 0xc9, 0x15, 0x02, 0xb9, 0x84, 0xa9, 0xbc, 0x83, 0xd8, 0x08, 0x5e, 0x45, 0x3c, 0x86, - 0xa4, 0xb0, 0xd3, 0x20, 0x49, 0x9a, 0x94, 0x26, 0xa4, 0x0a, 0x08, 0x26, 0x0a, 0xbe, 0x49, 0x31, - 0x4f, 0xf6, 0xe9, 0x5b, 0x7c, 0xd3, 0x18, 0x44, 0x5d, 0x58, 0x06, 0x76, 0xbf, 0xd9, 0x7f, 0x76, - 0x66, 0x97, 0x81, 0x63, 0x19, 0x01, 0x80, 0xcc, 0x91, 0xbd, 0x09, 0x14, 0x09, 0x32, 0xff, 0x71, - 0x93, 0xb3, 0xc8, 0x89, 0x8a, 0xb0, 0x7e, 0xc2, 0x32, 0x47, 0x9e, 0x87, 0x08, 0x20, 0x57, 0x20, - 0xb2, 0x63, 0x86, 0x20, 0x0d, 0x23, 0xb7, 0x82, 0xc7, 0x0d, 0x91, 0x4e, 0x5b, 0x45, 0x1e, 0x8a, - 0x0e, 0x0a, 0x6f, 0x75, 0x2f, 0x3e, 0xad, 0xdc, 0xfa, 0xff, 0x6d, 0xa4, 0x6b, 0xf0, 0xa4, 0xf6, - 0xae, 0x14, 0x5b, 0xbc, 0x4e, 0xde, 0xdc, 0xca, 0x79, 0x6b, 0xf2, 0xf2, 0xaa, 0xb6, 0x5e, 0x88, - 0x2d, 0x56, 0x93, 0x4e, 0x56, 0xce, 0x2b, 0x32, 0xfd, 0x54, 0x5b, 0x59, 0xee, 0x76, 0xb6, 0x72, - 0x89, 0xc2, 0xcf, 0xbe, 0x34, 0xcf, 0x17, 0x20, 0x8b, 0x94, 0x62, 0xde, 0x1b, 0xb9, 0xb0, 0xa7, - 0x35, 0xc9, 0x02, 0x04, 0x5d, 0x60, 0x12, 0x45, 0x17, 0x40, 0x4e, 0x40, 0x80, 0xb7, 0x4b, 0xa8, - 0x34, 0xb7, 0x22, 0x9a, 0x00, 0x7d, 0xa8, 0xa5, 0x71, 0xb8, 0x33, 0x5d, 0xba, 0xde, 0xd5, 0xd4, - 0xf2, 0x8e, 0x19, 0x97, 0x3d, 0x8e, 0x56, 0xce, 0x5b, 0x93, 0x0f, 0x35, 0x37, 0x39, 0xb7, 0x39, - 0xf2, 0x39, 0x5b, 0x39, 0xaf, 0xc8, 0x77, 0x14, 0x61, 0x26, 0x25, 0x42, 0x2b, 0xe7, 0x15, 0xf9, - 0x89, 0x22, 0xfc, 0x4d, 0x71, 0xb6, 0x72, 0xdb, 0x9d, 0x91, 0xd6, 0xfe, 0x3a, 0x23, 0xed, 0x73, - 0x67, 0x3c, 0xc4, 0xf1, 0x07, 0x96, 0x96, 0xc1, 0x5b, 0x6b, 0x8a, 0xbe, 0x4a, 0x00, 0x00, 0x00, - 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 -}; - -#endif diff --git a/cinelerra-5.0/cinelerra/data/ff_up_png.h b/cinelerra-5.0/cinelerra/data/ff_up_png.h deleted file mode 100644 index 9478493b..00000000 --- a/cinelerra-5.0/cinelerra/data/ff_up_png.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef FF_UP_PNG_H -#define FF_UP_PNG_H - -static unsigned char ff_up_png[] = -{ - 0x00, 0x00, 0x02, 0xbc, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x19, 0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xe9, 0x85, - 0x63, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0, - 0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, - 0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, - 0x07, 0xdf, 0x07, 0x09, 0x11, 0x01, 0x1f, 0x69, 0x63, 0x62, 0x33, 0x00, 0x00, 0x00, 0x1d, 0x74, - 0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x54, 0x68, 0x65, 0x20, 0x47, 0x49, 0x4d, 0x50, - 0xef, 0x64, 0x25, 0x6e, 0x00, 0x00, 0x02, 0x20, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0x95, - 0xbf, 0x4f, 0x53, 0x51, 0x14, 0xc7, 0x3f, 0xb7, 0xed, 0x83, 0x3e, 0x5e, 0x5b, 0x4a, 0x30, 0x28, - 0x24, 0x10, 0x1d, 0x48, 0x2c, 0xca, 0x23, 0x92, 0x3a, 0x10, 0x06, 0x49, 0x84, 0xc1, 0x01, 0xe3, - 0x9f, 0xa0, 0x03, 0xba, 0x18, 0xa2, 0x10, 0xe7, 0xc6, 0xb5, 0x9b, 0x8b, 0x26, 0x6e, 0x2e, 0x86, - 0xc1, 0xa4, 0x31, 0x0e, 0xc6, 0x45, 0x12, 0x1c, 0x5c, 0x1c, 0xc4, 0xe0, 0xa0, 0x03, 0x83, 0x0e, - 0xfe, 0x48, 0x43, 0xb0, 0xa5, 0x79, 0xef, 0x59, 0xca, 0x75, 0xb8, 0x4f, 0x4a, 0xdb, 0xf7, 0xda, - 0xd7, 0xf0, 0x5c, 0x3c, 0xc9, 0xcd, 0x4d, 0xce, 0xfd, 0xde, 0xfb, 0x3d, 0xdf, 0x73, 0x4e, 0xce, - 0x8d, 0xd2, 0x85, 0x8d, 0x5e, 0xe7, 0x61, 0xff, 0x05, 0x9c, 0xd2, 0x7b, 0xb6, 0xbb, 0xb9, 0x27, - 0x82, 0x02, 0x8d, 0x55, 0x86, 0x2a, 0x06, 0x3f, 0x74, 0x0b, 0xc7, 0xea, 0xc3, 0xe0, 0x3e, 0xb5, - 0xa0, 0x77, 0x23, 0x41, 0x81, 0x5a, 0x95, 0x02, 0x02, 0xac, 0x3e, 0x7a, 0x07, 0x8b, 0xe4, 0x43, - 0x57, 0xa2, 0xdf, 0xe3, 0x8c, 0xa5, 0xb3, 0x7d, 0x88, 0x96, 0x10, 0xb7, 0x49, 0xdb, 0x79, 0x7e, - 0x85, 0xa6, 0x44, 0xab, 0xf2, 0xbc, 0x21, 0x1c, 0x01, 0x71, 0x9b, 0xb5, 0xd0, 0x94, 0x24, 0xef, - 0x72, 0xae, 0x9c, 0x64, 0xab, 0x05, 0xa9, 0xd4, 0x8c, 0xd9, 0x79, 0xbe, 0x86, 0xa1, 0xa4, 0xe0, - 0x19, 0x8a, 0x00, 0xed, 0x37, 0xaf, 0x8e, 0x9d, 0xae, 0xc4, 0x0a, 0xd3, 0xe5, 0x24, 0xe3, 0x7e, - 0xe7, 0xe5, 0x14, 0x99, 0xd4, 0x1d, 0x66, 0x8e, 0xab, 0xa4, 0xd0, 0x36, 0xa1, 0x02, 0xaa, 0x31, - 0x5e, 0xd0, 0xa5, 0x9d, 0x07, 0xe4, 0x10, 0x48, 0xd9, 0x66, 0x1d, 0x80, 0x5c, 0x0a, 0x88, 0xab, - 0xc1, 0xcd, 0x58, 0x13, 0xc9, 0x22, 0xc0, 0x34, 0x54, 0x00, 0x43, 0x02, 0x1b, 0x63, 0x30, 0x77, - 0xa3, 0x09, 0xf5, 0x06, 0x78, 0x0d, 0x0b, 0x1a, 0x50, 0x05, 0xa9, 0xbc, 0x1b, 0x11, 0xb8, 0x14, - 0x24, 0x5d, 0xb3, 0x00, 0xd9, 0x28, 0xce, 0x5f, 0xc7, 0x87, 0x93, 0x1e, 0xb7, 0xbe, 0xa8, 0x6d, - 0xaa, 0xa7, 0xee, 0x5a, 0x1f, 0x45, 0x0f, 0x5a, 0x93, 0x09, 0x80, 0xb3, 0x06, 0xe9, 0xb6, 0x24, - 0x45, 0xb5, 0x99, 0x5a, 0xdd, 0xb5, 0x36, 0x49, 0x96, 0x1c, 0xf1, 0x20, 0x24, 0xc3, 0x00, 0x93, - 0xb2, 0xee, 0xf7, 0x24, 0x29, 0xbb, 0x4a, 0x8e, 0x4c, 0xaf, 0xcd, 0x61, 0xc4, 0xc0, 0x0e, 0x4f, - 0x3a, 0x15, 0x3d, 0x01, 0x48, 0x0d, 0xa4, 0xd3, 0xa1, 0x98, 0x8b, 0x01, 0x71, 0xfb, 0x70, 0x15, - 0xe0, 0x68, 0xe1, 0xaf, 0x00, 0x64, 0x04, 0xf4, 0x48, 0x55, 0xcc, 0x4f, 0x83, 0x90, 0xb9, 0xdd, - 0x14, 0xca, 0x47, 0xe0, 0x19, 0x98, 0x3e, 0xb8, 0xd4, 0x2e, 0xef, 0x4a, 0x0f, 0xb8, 0xe8, 0x97, - 0xae, 0x79, 0x00, 0xb3, 0xb7, 0xee, 0xf0, 0x4c, 0x95, 0xfb, 0x93, 0xf8, 0xe1, 0x4a, 0xfd, 0x64, - 0x13, 0x2b, 0x98, 0x9e, 0x24, 0x22, 0xce, 0x42, 0x73, 0xc7, 0x6c, 0x7a, 0x91, 0x7c, 0x6b, 0xed, - 0xac, 0x06, 0x9c, 0x00, 0x29, 0x78, 0xd9, 0x4a, 0x92, 0x43, 0x48, 0xc9, 0x69, 0x00, 0x33, 0xd2, - 0x41, 0xc9, 0xae, 0xab, 0xa4, 0x0d, 0xae, 0x92, 0x60, 0x24, 0xbd, 0xcc, 0xb5, 0x06, 0x92, 0x89, - 0x2d, 0x2e, 0xe3, 0xa8, 0x01, 0x32, 0x65, 0x77, 0x20, 0xb1, 0x5c, 0x25, 0x1d, 0x70, 0x96, 0xce, - 0x53, 0x72, 0xea, 0x4d, 0x01, 0x70, 0x6a, 0x89, 0x9d, 0xef, 0x23, 0x0c, 0x10, 0xb2, 0x9d, 0xf8, - 0xc9, 0xad, 0xe2, 0x23, 0x1e, 0x8b, 0x99, 0x79, 0xe6, 0xde, 0xce, 0xb2, 0xce, 0x3f, 0xb0, 0xe8, - 0x3e, 0x07, 0xb5, 0x18, 0x5a, 0xac, 0x94, 0x62, 0x59, 0xdf, 0x63, 0xcf, 0x2d, 0x9a, 0x90, 0x1e, - 0x4b, 0x9d, 0xa8, 0x76, 0x95, 0x11, 0xa2, 0xd2, 0xff, 0xb3, 0x93, 0x87, 0xe9, 0x51, 0x03, 0x4d, - 0x8e, 0x7f, 0x56, 0x5d, 0xfb, 0x7f, 0xd8, 0x1f, 0xe8, 0x76, 0xd1, 0x05, 0x73, 0xc4, 0x26, 0x32, - 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 -}; - -#endif diff --git a/cinelerra-5.0/cinelerra/data/mode_add.png b/cinelerra-5.0/cinelerra/data/mode_add.png deleted file mode 100644 index 7240a9e3..00000000 Binary files a/cinelerra-5.0/cinelerra/data/mode_add.png and /dev/null differ diff --git a/cinelerra-5.0/cinelerra/data/mode_divide.png b/cinelerra-5.0/cinelerra/data/mode_divide.png deleted file mode 100644 index 6364592f..00000000 Binary files a/cinelerra-5.0/cinelerra/data/mode_divide.png and /dev/null differ diff --git a/cinelerra-5.0/cinelerra/data/mode_multiply.png b/cinelerra-5.0/cinelerra/data/mode_multiply.png deleted file mode 100644 index 67322a37..00000000 Binary files a/cinelerra-5.0/cinelerra/data/mode_multiply.png and /dev/null differ diff --git a/cinelerra-5.0/cinelerra/data/mode_normal.png b/cinelerra-5.0/cinelerra/data/mode_normal.png deleted file mode 100644 index f0450486..00000000 Binary files a/cinelerra-5.0/cinelerra/data/mode_normal.png and /dev/null differ diff --git a/cinelerra-5.0/cinelerra/data/mode_replace.png b/cinelerra-5.0/cinelerra/data/mode_replace.png deleted file mode 100644 index ebf83beb..00000000 Binary files a/cinelerra-5.0/cinelerra/data/mode_replace.png and /dev/null differ diff --git a/cinelerra-5.0/cinelerra/data/mode_subtract.png b/cinelerra-5.0/cinelerra/data/mode_subtract.png deleted file mode 100644 index 568a4ec3..00000000 Binary files a/cinelerra-5.0/cinelerra/data/mode_subtract.png and /dev/null differ diff --git a/cinelerra-5.0/cinelerra/data/shbtn_dn_png.h b/cinelerra-5.0/cinelerra/data/shbtn_dn_png.h deleted file mode 100644 index 9575afa1..00000000 --- a/cinelerra-5.0/cinelerra/data/shbtn_dn_png.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef SHBTN_DN_PNG_H -#define SHBTN_DN_PNG_H - -static unsigned char shbtn_dn_png[] = -{ - 0x00, 0x00, 0x03, 0x65, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x19, 0x08, 0x02, 0x00, 0x00, 0x00, 0x4b, 0x8b, 0x12, - 0x34, 0x00, 0x00, 0x00, 0x1e, 0x74, 0x45, 0x58, 0x74, 0x44, 0x61, 0x74, 0x65, 0x00, 0x54, 0x68, - 0x75, 0x20, 0x41, 0x75, 0x67, 0x20, 0x20, 0x36, 0x20, 0x31, 0x34, 0x3a, 0x34, 0x31, 0x3a, 0x35, - 0x35, 0x20, 0x32, 0x30, 0x31, 0x35, 0x0a, 0x1b, 0xc8, 0xd9, 0x67, 0x00, 0x00, 0x03, 0x02, 0x49, - 0x44, 0x41, 0x54, 0x38, 0x8d, 0xad, 0x94, 0xcf, 0x6b, 0x5c, 0x55, 0x14, 0xc7, 0x3f, 0xe7, 0xdc, - 0xfb, 0x32, 0xf9, 0x31, 0xd1, 0x30, 0xc4, 0xd8, 0xda, 0x68, 0xc5, 0xba, 0x72, 0xe1, 0x46, 0xd2, - 0xa2, 0x20, 0xa2, 0x0b, 0x71, 0x63, 0x2b, 0x9a, 0x2c, 0x52, 0xa7, 0x6a, 0xff, 0x81, 0xae, 0x2c, - 0x74, 0xe3, 0x3f, 0x60, 0x6d, 0x50, 0x68, 0xd0, 0x22, 0x42, 0x15, 0x8a, 0x74, 0xef, 0x4a, 0xb4, - 0x5a, 0x97, 0x8a, 0x42, 0x5d, 0x28, 0xfe, 0xc0, 0x85, 0x48, 0x7e, 0x8d, 0x43, 0x4c, 0x53, 0x93, - 0x99, 0xb9, 0xef, 0xde, 0xe3, 0x62, 0xe6, 0x4d, 0x33, 0x66, 0x12, 0x47, 0xf1, 0x2c, 0x2e, 0x97, - 0xf7, 0xde, 0xf9, 0xdc, 0xef, 0x39, 0xe7, 0xdd, 0xaf, 0xbc, 0x77, 0xe5, 0x2a, 0xff, 0x47, 0x2c, - 0xbe, 0x75, 0xc1, 0x8f, 0x8e, 0x8e, 0x02, 0x60, 0x22, 0xff, 0x89, 0x61, 0x18, 0x02, 0xa8, 0xaa, - 0x07, 0xcc, 0xf8, 0xea, 0xa7, 0xa9, 0x1f, 0x7e, 0xf1, 0x10, 0xff, 0x2d, 0x2a, 0x2b, 0x65, 0x4f, - 0x1f, 0xad, 0x57, 0xc6, 0x1a, 0x80, 0x07, 0x1a, 0x79, 0x76, 0xf9, 0xe3, 0x87, 0xd6, 0x6f, 0x8d, - 0x01, 0x88, 0x40, 0x3f, 0x85, 0x7f, 0x7b, 0x66, 0x20, 0x60, 0x06, 0x82, 0x7e, 0x57, 0x7d, 0xf2, - 0xe7, 0x0e, 0xcb, 0x8c, 0x3c, 0x66, 0x58, 0x04, 0x30, 0x41, 0xc0, 0x00, 0xe9, 0xc9, 0xb7, 0x7e, - 0x2c, 0x00, 0x5a, 0xf9, 0x48, 0x7b, 0xef, 0x8b, 0x77, 0xe9, 0x89, 0x87, 0x7f, 0xcd, 0x7c, 0xea, - 0xa7, 0x61, 0xcf, 0x08, 0xb9, 0x5e, 0xff, 0xf6, 0x70, 0xf7, 0x9c, 0x82, 0x95, 0x5a, 0x73, 0x8f, - 0x7f, 0x6f, 0x61, 0xbd, 0xd1, 0xd8, 0x9e, 0x9c, 0x9c, 0x1a, 0x90, 0xf5, 0x67, 0x33, 0xbb, 0x7e, - 0xe3, 0x5e, 0xd2, 0x76, 0xfb, 0x78, 0x2d, 0x74, 0x05, 0x90, 0x5b, 0x9b, 0x37, 0x17, 0x17, 0xce, - 0xaf, 0xad, 0xad, 0x0c, 0xc8, 0x02, 0xb0, 0x84, 0xb5, 0xda, 0xd2, 0x0a, 0x16, 0xb9, 0x88, 0x20, - 0xb2, 0xbc, 0xb4, 0x7c, 0xf1, 0xc2, 0xeb, 0xb5, 0xb5, 0x55, 0x19, 0x2c, 0x48, 0x11, 0x5a, 0x6d, - 0x84, 0x02, 0x08, 0x48, 0x2e, 0xc2, 0xc4, 0x44, 0xe5, 0xbe, 0xfb, 0x0f, 0xaf, 0xae, 0xac, 0x2c, - 0xbe, 0xf9, 0x46, 0xbd, 0x5e, 0x1b, 0x88, 0x65, 0x09, 0xc9, 0xdb, 0x1d, 0x2b, 0x74, 0x49, 0x54, - 0xd5, 0x72, 0xb9, 0x7c, 0xe6, 0xd5, 0x73, 0x0f, 0x1c, 0x79, 0x70, 0x75, 0x69, 0xf9, 0xe2, 0xc2, - 0xf9, 0x7a, 0xbd, 0xa6, 0xff, 0x10, 0x42, 0x8a, 0xb8, 0xd0, 0xa3, 0x4b, 0x24, 0xf7, 0xce, 0x79, - 0xef, 0x27, 0x27, 0xef, 0x3a, 0x73, 0xf6, 0xdc, 0x81, 0x7b, 0x0e, 0xb6, 0x71, 0x8d, 0xc6, 0xb6, - 0xdf, 0x27, 0x9c, 0xef, 0xe8, 0xea, 0xce, 0x51, 0x40, 0x25, 0x2f, 0x97, 0xc7, 0xc7, 0x47, 0x22, - 0xf0, 0xcd, 0xd7, 0x5f, 0x6e, 0xde, 0xdc, 0x54, 0xe7, 0x8e, 0x3d, 0xfa, 0xd8, 0xd4, 0xd4, 0xdd, - 0xde, 0xb9, 0xbd, 0xfa, 0x2e, 0xde, 0x61, 0xd1, 0xf9, 0xd8, 0xae, 0xd1, 0x77, 0x74, 0x69, 0xee, - 0x9d, 0x73, 0x8e, 0xcf, 0xae, 0x7d, 0x72, 0xf9, 0xd2, 0xdb, 0x21, 0x84, 0x13, 0x73, 0x73, 0x27, - 0x5f, 0x7c, 0xd9, 0xed, 0x0d, 0x02, 0xbc, 0x73, 0xa4, 0xa8, 0x1a, 0x6f, 0xff, 0xab, 0x22, 0xa8, - 0x44, 0x15, 0xa9, 0xd5, 0x6a, 0xef, 0xbf, 0xfb, 0x4e, 0x08, 0xe1, 0xf8, 0xec, 0x6c, 0xf5, 0xa5, - 0xd3, 0x2a, 0x0a, 0x98, 0x99, 0x99, 0xf5, 0x65, 0xa9, 0x2a, 0x16, 0x55, 0xd3, 0x6d, 0x5d, 0x86, - 0xa8, 0x26, 0x71, 0x1a, 0x63, 0xcc, 0xf3, 0xf8, 0xec, 0x0b, 0xb3, 0xd5, 0x53, 0xa7, 0xbb, 0x8a, - 0x3e, 0xbc, 0xf2, 0xc1, 0x17, 0x9f, 0x5f, 0xdb, 0x0d, 0x1a, 0x19, 0x19, 0x39, 0xfb, 0xda, 0x02, - 0x16, 0xb5, 0x90, 0xee, 0x01, 0x15, 0x44, 0x93, 0x13, 0x75, 0xce, 0x9d, 0x98, 0x9b, 0x9b, 0x9f, - 0x3f, 0xb5, 0xb3, 0xb4, 0x46, 0xb3, 0xb9, 0xb9, 0xb1, 0xb1, 0x9b, 0x95, 0x87, 0x20, 0x22, 0xa4, - 0x24, 0xba, 0x83, 0x85, 0xa0, 0x62, 0xa2, 0x3a, 0x7d, 0xe8, 0x50, 0xb5, 0xfa, 0x8a, 0xaa, 0xee, - 0xcc, 0x99, 0x3f, 0x59, 0x3d, 0xfe, 0xdc, 0xf3, 0xbb, 0x59, 0x82, 0x0c, 0x8f, 0x95, 0xb1, 0x28, - 0xda, 0xb9, 0x90, 0x9d, 0xfb, 0x28, 0x92, 0x2e, 0x5d, 0x1d, 0x2a, 0x0d, 0xb9, 0x1d, 0x3e, 0xd1, - 0xbd, 0xe3, 0x15, 0xa8, 0xd0, 0xcf, 0x34, 0x9a, 0x41, 0xb0, 0xa8, 0x4a, 0xef, 0x1c, 0xc5, 0x3e, - 0xfa, 0xb4, 0xc8, 0xee, 0xf1, 0x9c, 0xfe, 0x5d, 0xc7, 0xba, 0xe8, 0xd4, 0x35, 0xe4, 0x8e, 0x2e, - 0x3f, 0xfe, 0x3b, 0xcd, 0x1b, 0x90, 0xa1, 0x07, 0x90, 0x3b, 0xc1, 0x15, 0x2c, 0xa1, 0xf3, 0x6d, - 0xef, 0x6a, 0x40, 0x80, 0xba, 0xb8, 0x0d, 0x1d, 0x9b, 0x81, 0xd5, 0x0e, 0x4b, 0xcc, 0x26, 0x66, - 0x9e, 0x5a, 0x6e, 0xcc, 0x84, 0x3f, 0x8c, 0x21, 0x5c, 0x09, 0x5f, 0x22, 0x2b, 0x99, 0xcf, 0xc4, - 0x67, 0x68, 0x86, 0x2a, 0x29, 0x91, 0x02, 0x79, 0x20, 0x6f, 0x11, 0x9a, 0x84, 0x26, 0xa9, 0x09, - 0x81, 0xe1, 0x83, 0xa5, 0xe1, 0xca, 0x3a, 0xac, 0x75, 0x58, 0x43, 0x12, 0x9f, 0x39, 0xf2, 0xdb, - 0xf4, 0x68, 0x25, 0x34, 0x11, 0x45, 0x1c, 0xea, 0x50, 0x45, 0x1d, 0xea, 0x10, 0x87, 0x2a, 0x16, - 0x49, 0x89, 0xd4, 0x5e, 0xf3, 0xce, 0xde, 0x12, 0x77, 0x94, 0x5b, 0xc7, 0xa6, 0x96, 0x62, 0x2e, - 0x45, 0x8d, 0x96, 0x1e, 0x91, 0x1f, 0x8f, 0x4e, 0x8b, 0xed, 0x6b, 0xcb, 0xc5, 0xf8, 0x7a, 0xfb, - 0x66, 0x96, 0xe7, 0x85, 0xaf, 0x6e, 0x6d, 0x6d, 0xed, 0x9b, 0x3b, 0x48, 0x08, 0x90, 0x52, 0xfa, - 0x0b, 0x6b, 0xce, 0x33, 0x2d, 0x13, 0xac, 0xbb, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, - 0x44, 0xae, 0x42, 0x60, 0x82 -}; - -#endif diff --git a/cinelerra-5.0/cinelerra/data/shbtn_hi_png.h b/cinelerra-5.0/cinelerra/data/shbtn_hi_png.h deleted file mode 100644 index 64bc6dcc..00000000 --- a/cinelerra-5.0/cinelerra/data/shbtn_hi_png.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef SHBTN_HI_PNG_H -#define SHBTN_HI_PNG_H - -static unsigned char shbtn_hi_png[] = -{ - 0x00, 0x00, 0x03, 0x59, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x19, 0x08, 0x02, 0x00, 0x00, 0x00, 0x4b, 0x8b, 0x12, - 0x34, 0x00, 0x00, 0x00, 0x1e, 0x74, 0x45, 0x58, 0x74, 0x44, 0x61, 0x74, 0x65, 0x00, 0x54, 0x68, - 0x75, 0x20, 0x41, 0x75, 0x67, 0x20, 0x20, 0x36, 0x20, 0x31, 0x34, 0x3a, 0x34, 0x31, 0x3a, 0x35, - 0x35, 0x20, 0x32, 0x30, 0x31, 0x35, 0x0a, 0x1b, 0xc8, 0xd9, 0x67, 0x00, 0x00, 0x02, 0xf6, 0x49, - 0x44, 0x41, 0x54, 0x38, 0x8d, 0xad, 0x94, 0xc1, 0x6b, 0x5c, 0x55, 0x14, 0xc6, 0x7f, 0xe7, 0xde, - 0x37, 0x13, 0x4c, 0x3b, 0x96, 0x24, 0xb8, 0x48, 0x41, 0xa4, 0x33, 0xa1, 0x05, 0x91, 0x6c, 0x6c, - 0x25, 0x74, 0xd5, 0x45, 0xc4, 0x60, 0x17, 0xee, 0x93, 0x42, 0x18, 0x04, 0x71, 0x1d, 0x5c, 0x04, - 0x61, 0xb2, 0x08, 0xe4, 0x0f, 0x70, 0x13, 0x4b, 0xfd, 0x0f, 0xec, 0xd2, 0x85, 0x10, 0xdd, 0xd9, - 0x5d, 0xe9, 0xe0, 0x22, 0x90, 0x8c, 0x21, 0x12, 0x51, 0x17, 0x99, 0x10, 0x4d, 0x4d, 0xa7, 0xcd, - 0xcc, 0xbd, 0xef, 0x1c, 0x17, 0xef, 0xcd, 0xe4, 0x85, 0xa4, 0x69, 0x2a, 0x9e, 0xcd, 0x7b, 0xef, - 0xde, 0xf7, 0x7e, 0xef, 0xfb, 0xbe, 0x7b, 0xef, 0x91, 0x95, 0x95, 0x15, 0xfe, 0x8f, 0x5a, 0x58, - 0x58, 0x48, 0xf6, 0xf7, 0xf7, 0x01, 0x10, 0xb5, 0xff, 0x82, 0x10, 0x10, 0x31, 0x33, 0x53, 0xd5, - 0x04, 0x10, 0xe1, 0xa3, 0xc9, 0xdf, 0xaf, 0x8e, 0x1e, 0xe2, 0xfd, 0xeb, 0x91, 0x8c, 0xd8, 0x0d, - 0x3f, 0xb5, 0xaa, 0xbf, 0xb6, 0xdf, 0x00, 0x12, 0x60, 0xf4, 0x72, 0xfa, 0x61, 0x6d, 0x8d, 0xf0, - 0x4f, 0x3e, 0xcf, 0xeb, 0x28, 0x1c, 0xa6, 0x32, 0x79, 0xe7, 0xab, 0xb5, 0x5b, 0x39, 0xcb, 0x3b, - 0xc3, 0xba, 0xb8, 0x24, 0x17, 0x9d, 0xa3, 0x14, 0x03, 0x04, 0x11, 0x00, 0xd3, 0xdc, 0x53, 0xf6, - 0x98, 0xcf, 0x02, 0x0c, 0x95, 0x3a, 0xd9, 0x6d, 0x92, 0x0f, 0x38, 0xff, 0x5b, 0xe7, 0xe6, 0xf3, - 0x6e, 0x02, 0x60, 0x86, 0x9c, 0x30, 0x92, 0xff, 0xe3, 0x94, 0xc1, 0xe1, 0xa1, 0xf8, 0xce, 0xa5, - 0xc7, 0x88, 0xe3, 0x04, 0x4b, 0xca, 0xdf, 0x6f, 0xde, 0x91, 0xa1, 0xab, 0x95, 0x4a, 0x65, 0x7b, - 0x7b, 0xfb, 0x82, 0xfe, 0xde, 0xba, 0x12, 0x3f, 0xbf, 0xf9, 0x04, 0x19, 0xce, 0xf5, 0x0c, 0x58, - 0x66, 0x36, 0x3e, 0x3e, 0x3e, 0x3b, 0x37, 0x57, 0x9b, 0x98, 0xb0, 0x0b, 0x17, 0xe2, 0x91, 0x72, - 0x81, 0x65, 0x40, 0x49, 0x55, 0xcd, 0x0c, 0x98, 0x9d, 0x9d, 0xad, 0xd5, 0x6a, 0x7a, 0xb1, 0x02, - 0x87, 0x2b, 0x65, 0x11, 0xf4, 0x59, 0x9a, 0xa8, 0xda, 0xce, 0xce, 0x8e, 0xaa, 0x02, 0x73, 0xf7, - 0xee, 0x5d, 0xab, 0x56, 0x2f, 0x80, 0x32, 0x70, 0xa4, 0x49, 0x96, 0x66, 0x9f, 0x25, 0x3e, 0xc6, - 0xb8, 0xbb, 0xbb, 0xfb, 0xcd, 0x83, 0x07, 0x31, 0x46, 0x60, 0x7e, 0x7e, 0xfe, 0x5a, 0xb5, 0x1a, - 0x5f, 0x55, 0x38, 0x4f, 0x28, 0x1d, 0x7b, 0x34, 0x03, 0x2d, 0x77, 0x7b, 0xbd, 0xa3, 0xa3, 0xa3, - 0x56, 0xab, 0xb5, 0xba, 0xba, 0x9a, 0xcd, 0xd5, 0xeb, 0xf5, 0x91, 0x91, 0x91, 0xa3, 0x97, 0x57, - 0xb7, 0xd7, 0x43, 0xbc, 0x59, 0xae, 0x2b, 0xc9, 0x59, 0x3e, 0x69, 0xb7, 0xf7, 0xda, 0x07, 0x02, - 0x7c, 0x7c, 0xf7, 0x6e, 0xc6, 0xda, 0xda, 0xda, 0xda, 0xd8, 0xd8, 0xe8, 0x85, 0xf0, 0xd2, 0x85, - 0x0c, 0x86, 0x77, 0x69, 0xf0, 0x98, 0x15, 0x58, 0x56, 0xea, 0x85, 0x10, 0x82, 0xd4, 0xeb, 0xf5, - 0xe9, 0xe9, 0x69, 0xe0, 0x97, 0x56, 0x6b, 0x79, 0x79, 0x39, 0xc4, 0x78, 0xce, 0x9e, 0xe8, 0x05, - 0xc3, 0x7b, 0xb3, 0x7c, 0x63, 0x25, 0x64, 0x5b, 0xda, 0x7c, 0x9a, 0xea, 0x8d, 0x1b, 0xef, 0xce, - 0xcc, 0xcc, 0x00, 0xad, 0x56, 0xab, 0xd1, 0x68, 0x64, 0xeb, 0x20, 0x22, 0xce, 0xb9, 0x33, 0x59, - 0x31, 0x8d, 0x38, 0x9f, 0x46, 0x77, 0xec, 0x11, 0x33, 0x70, 0x69, 0x8c, 0xe5, 0x72, 0x19, 0xd8, - 0xdc, 0xdc, 0x6c, 0x34, 0x1a, 0xa1, 0x6f, 0x6d, 0x71, 0x71, 0x71, 0x6a, 0x6a, 0xea, 0x4c, 0xd6, - 0x97, 0x5f, 0x7c, 0x8a, 0x38, 0xd3, 0xfc, 0x58, 0x25, 0x80, 0x9a, 0x61, 0x3e, 0xa6, 0x69, 0x08, - 0x61, 0x7d, 0x7d, 0x7d, 0x69, 0x69, 0x29, 0x14, 0x32, 0x3a, 0x7d, 0x78, 0x06, 0x95, 0xaa, 0xe2, - 0xbc, 0x46, 0x8a, 0xd9, 0x0b, 0xe6, 0x54, 0xb5, 0xd9, 0x6c, 0x36, 0x9b, 0xcd, 0x34, 0x4d, 0x8b, - 0x1f, 0x7c, 0x7d, 0xff, 0xfe, 0xb7, 0x0f, 0x1f, 0x9e, 0x06, 0x99, 0xea, 0xdf, 0x7b, 0x7b, 0xe0, - 0xcd, 0x0a, 0xba, 0xcc, 0x00, 0xff, 0xd9, 0x27, 0x87, 0x87, 0x1d, 0x45, 0x0a, 0x67, 0x3b, 0xef, - 0x04, 0x4f, 0x61, 0xeb, 0x4c, 0x5d, 0x95, 0x4b, 0x82, 0xf3, 0xd6, 0xef, 0xa2, 0x19, 0xcb, 0x50, - 0xb9, 0xfd, 0xde, 0xa0, 0x7f, 0x9d, 0x63, 0x6b, 0xd0, 0xda, 0x06, 0xbd, 0xc9, 0xa9, 0x72, 0xcc, - 0xc2, 0xa0, 0x33, 0xca, 0xdb, 0x1f, 0xa0, 0x01, 0xdb, 0x45, 0x9f, 0x82, 0xe2, 0x40, 0x8d, 0xfc, - 0x3d, 0x3d, 0x09, 0x32, 0x9c, 0x40, 0x02, 0x23, 0xe8, 0x15, 0x9e, 0xff, 0x01, 0xa3, 0x7d, 0x5d, - 0x0e, 0x7e, 0x5e, 0xe3, 0xd9, 0x23, 0xde, 0x14, 0xba, 0x90, 0x42, 0x0f, 0xcc, 0x11, 0x40, 0x21, - 0xed, 0x43, 0x3c, 0x94, 0xc0, 0x1b, 0x62, 0x94, 0xa0, 0x0c, 0x43, 0xd0, 0xee, 0xda, 0x5f, 0x13, - 0xc6, 0xf5, 0x9c, 0x75, 0x18, 0xdc, 0x8f, 0x7b, 0x93, 0x13, 0x2f, 0xfe, 0xf4, 0xc3, 0x42, 0x04, - 0x43, 0xa2, 0x61, 0x98, 0x89, 0xa8, 0x61, 0x10, 0x21, 0x01, 0xc1, 0x9c, 0x88, 0x98, 0x79, 0xc1, - 0x81, 0x40, 0xc2, 0x8b, 0x67, 0x97, 0x7f, 0xe8, 0x5c, 0xf7, 0xa2, 0x39, 0x4b, 0x5c, 0xf2, 0x5d, - 0x7a, 0x2b, 0x3d, 0x78, 0x9f, 0x83, 0x42, 0x2c, 0x72, 0x66, 0x2b, 0x2d, 0x5c, 0x04, 0x0c, 0x11, - 0x29, 0x25, 0x2e, 0x1b, 0x4a, 0xc6, 0xc6, 0xc6, 0xf2, 0x30, 0xe5, 0x9c, 0xc8, 0xcf, 0x5d, 0x0b, - 0x33, 0xc0, 0x39, 0xf7, 0x2f, 0xae, 0xae, 0x0c, 0x96, 0xa0, 0xc1, 0xbd, 0x20, 0x00, 0x00, 0x00, - 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 -}; - -#endif diff --git a/cinelerra-5.0/cinelerra/data/shbtn_up_png.h b/cinelerra-5.0/cinelerra/data/shbtn_up_png.h deleted file mode 100644 index 30bf5d1a..00000000 --- a/cinelerra-5.0/cinelerra/data/shbtn_up_png.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef SHBTN_UP_PNG_H -#define SHBTN_UP_PNG_H - -static unsigned char shbtn_up_png[] = -{ - 0x00, 0x00, 0x03, 0x54, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x19, 0x08, 0x02, 0x00, 0x00, 0x00, 0x4b, 0x8b, 0x12, - 0x34, 0x00, 0x00, 0x00, 0x1e, 0x74, 0x45, 0x58, 0x74, 0x44, 0x61, 0x74, 0x65, 0x00, 0x54, 0x68, - 0x75, 0x20, 0x41, 0x75, 0x67, 0x20, 0x20, 0x36, 0x20, 0x31, 0x34, 0x3a, 0x34, 0x31, 0x3a, 0x35, - 0x35, 0x20, 0x32, 0x30, 0x31, 0x35, 0x0a, 0x1b, 0xc8, 0xd9, 0x67, 0x00, 0x00, 0x02, 0xf1, 0x49, - 0x44, 0x41, 0x54, 0x38, 0x8d, 0xad, 0x94, 0x4d, 0x6b, 0x1b, 0x57, 0x14, 0x86, 0xdf, 0x73, 0x3f, - 0x46, 0xa3, 0x52, 0xd7, 0x36, 0x92, 0xb5, 0x90, 0x4a, 0x37, 0x81, 0xd0, 0xd2, 0x42, 0x08, 0xc9, - 0x22, 0x5b, 0xa7, 0x24, 0xf9, 0x03, 0x86, 0x40, 0xfc, 0x03, 0x6a, 0xdc, 0x9d, 0x3f, 0xb4, 0xcf, - 0xa2, 0x8b, 0xb8, 0x7f, 0xa2, 0xa8, 0x16, 0x8e, 0xed, 0x85, 0x17, 0x21, 0x9b, 0x6c, 0x12, 0x28, - 0xa6, 0xd4, 0x98, 0x40, 0x36, 0x59, 0x78, 0x11, 0x43, 0x12, 0x19, 0x8a, 0x2a, 0xdb, 0x21, 0x92, - 0xe5, 0x48, 0x73, 0xce, 0xc9, 0x62, 0x46, 0xd2, 0xf8, 0xa3, 0x46, 0x09, 0x79, 0xb9, 0x8b, 0x99, - 0x7b, 0xe6, 0x3e, 0x73, 0xce, 0xb9, 0xf7, 0xbe, 0x34, 0x35, 0x35, 0x85, 0x2f, 0xa1, 0xb9, 0xb9, - 0x39, 0xd7, 0x6e, 0xb7, 0x01, 0xa8, 0x42, 0x3f, 0x97, 0x62, 0x08, 0xaa, 0x2a, 0x22, 0x0e, 0x00, - 0xa0, 0x37, 0x2e, 0xff, 0xf7, 0xe3, 0xa5, 0x08, 0x64, 0x3f, 0x91, 0xa3, 0x9d, 0xe3, 0xe8, 0xf1, - 0x3f, 0xb9, 0xfd, 0x56, 0x08, 0xc0, 0x01, 0x08, 0x7d, 0x34, 0x73, 0xe7, 0xe5, 0xc4, 0xd7, 0x2d, - 0xc4, 0x19, 0x02, 0x20, 0x0c, 0x9b, 0x27, 0x01, 0xfc, 0xc3, 0x1f, 0x4f, 0x2f, 0x25, 0x2c, 0x43, - 0xea, 0x5d, 0x17, 0x26, 0x4e, 0x4a, 0xa1, 0x00, 0x25, 0x8f, 0x18, 0xbc, 0x9c, 0x41, 0x24, 0x51, - 0x78, 0xdf, 0x8e, 0xe7, 0x5c, 0x2f, 0x66, 0x9e, 0xbc, 0xf8, 0xae, 0xc3, 0x26, 0xf9, 0xa2, 0xbf, - 0x5c, 0x53, 0x8b, 0x4f, 0xd7, 0x87, 0xc0, 0xf1, 0xed, 0x2b, 0xaf, 0xfb, 0xb1, 0x1e, 0xcb, 0x04, - 0xcb, 0x7f, 0x7d, 0x4f, 0x6e, 0x2c, 0x0c, 0xc3, 0x46, 0xa3, 0x31, 0x5c, 0x79, 0xf8, 0x2a, 0xd3, - 0xbd, 0x7d, 0xf5, 0x2d, 0x28, 0x9b, 0x30, 0x7a, 0xbf, 0xf5, 0xaa, 0x18, 0x19, 0x19, 0x59, 0x58, - 0x5c, 0x9c, 0x98, 0x98, 0xd0, 0x61, 0x05, 0x90, 0x05, 0x65, 0x52, 0x2c, 0x05, 0xe0, 0xe3, 0x60, - 0xa9, 0x54, 0x5a, 0x2c, 0x97, 0x0b, 0x85, 0xc2, 0x70, 0x2c, 0x01, 0x19, 0x90, 0x3f, 0xc9, 0x12, - 0xab, 0xaa, 0x87, 0x87, 0x87, 0xbb, 0xbb, 0xbb, 0xc5, 0x62, 0x71, 0x7e, 0x7e, 0x3e, 0x97, 0xcb, - 0x0d, 0x97, 0x97, 0x41, 0x72, 0xb0, 0xfa, 0x35, 0xaa, 0x53, 0x95, 0x66, 0xb3, 0xf9, 0xfb, 0xd2, - 0xd2, 0xce, 0xce, 0x4e, 0xb1, 0x54, 0x5a, 0x2c, 0x97, 0x73, 0xf9, 0xbc, 0x5c, 0x28, 0x15, 0x81, - 0xb1, 0x27, 0x58, 0x0a, 0xa8, 0xba, 0x28, 0xe2, 0x28, 0x8a, 0xea, 0xf5, 0xfa, 0xd2, 0x83, 0x07, - 0xb5, 0x5a, 0xad, 0x58, 0x2c, 0x2e, 0x2c, 0x2c, 0x84, 0x61, 0x18, 0x5d, 0x20, 0x66, 0x90, 0x85, - 0xb8, 0x78, 0x27, 0x1d, 0x00, 0x55, 0x88, 0xba, 0x56, 0xab, 0xd9, 0x6c, 0x5b, 0x00, 0xd7, 0xae, - 0x5f, 0x1f, 0x1d, 0x1d, 0x65, 0xe6, 0xcd, 0xcd, 0xcd, 0x7a, 0xbd, 0xce, 0xcc, 0xff, 0xbb, 0x91, - 0xcc, 0x20, 0x2b, 0x6c, 0x53, 0x67, 0x42, 0x21, 0x62, 0x99, 0x85, 0x19, 0x93, 0x93, 0x93, 0xb3, - 0xb3, 0xb3, 0xde, 0xfb, 0xd5, 0x87, 0x0f, 0xab, 0xd5, 0xea, 0x45, 0x20, 0x80, 0x59, 0x60, 0x0c, - 0xcb, 0x29, 0x96, 0x1a, 0x11, 0xc9, 0xe7, 0x0b, 0xbf, 0xcc, 0xcc, 0x78, 0xef, 0xd7, 0xd7, 0xd6, - 0x2a, 0x95, 0x8a, 0x88, 0x00, 0x20, 0x22, 0xa2, 0xf3, 0x8e, 0x3e, 0xc0, 0x22, 0x20, 0x2b, 0x6c, - 0x06, 0x2c, 0x05, 0x54, 0x8c, 0x88, 0x58, 0x6b, 0x9d, 0x73, 0xeb, 0xeb, 0xeb, 0x7f, 0x56, 0x2a, - 0xfd, 0x8c, 0xee, 0x4d, 0x4f, 0xff, 0x7c, 0xf3, 0xe6, 0x59, 0x50, 0xeb, 0xe8, 0xe8, 0xb7, 0xfb, - 0x65, 0x18, 0x2b, 0xac, 0x29, 0x56, 0x9c, 0x97, 0x2a, 0x33, 0xaf, 0xad, 0xae, 0xae, 0xac, 0xac, - 0xa4, 0x4b, 0xcb, 0x86, 0xe1, 0xe8, 0xd8, 0xd8, 0x59, 0x96, 0xf3, 0x5e, 0x55, 0x41, 0x46, 0x85, - 0x06, 0xbd, 0x07, 0x20, 0x62, 0x54, 0x64, 0x6f, 0x6f, 0x6f, 0x79, 0x79, 0x39, 0x2e, 0xad, 0xaf, - 0x6a, 0xb5, 0xba, 0xb1, 0xb1, 0x71, 0x96, 0xa5, 0xaa, 0xc7, 0x47, 0x4d, 0x18, 0x2b, 0x92, 0x5c, - 0xc8, 0x7e, 0xbf, 0xe8, 0xd7, 0xbb, 0xdc, 0xe9, 0xf2, 0xe0, 0x36, 0x0f, 0x6c, 0xe7, 0x00, 0x38, - 0x38, 0xb7, 0x5f, 0x81, 0x07, 0xc8, 0xaa, 0xa4, 0x6b, 0x04, 0x54, 0x69, 0xea, 0xd6, 0x49, 0xc7, - 0x3a, 0xdf, 0xc2, 0xd2, 0x16, 0x14, 0x87, 0x8d, 0x6a, 0xda, 0x27, 0x14, 0xd1, 0xfb, 0xbc, 0x86, - 0x3f, 0x91, 0x46, 0x90, 0x7f, 0xa1, 0xef, 0x00, 0x01, 0x69, 0xca, 0xb9, 0x35, 0x59, 0xd9, 0xf3, - 0x2c, 0x90, 0x02, 0x01, 0x30, 0x2e, 0xfc, 0x0d, 0xb7, 0x9e, 0x03, 0x85, 0x1e, 0x8b, 0xd0, 0xd8, - 0x7a, 0xf6, 0x6d, 0xb8, 0x9d, 0x19, 0x27, 0x7c, 0xa0, 0xe8, 0x83, 0x76, 0x8f, 0xd1, 0xe9, 0x50, - 0xd4, 0x41, 0xb7, 0x03, 0x8e, 0xa0, 0x02, 0x22, 0x58, 0x0f, 0x1f, 0xc0, 0x07, 0xf0, 0x21, 0x82, - 0x00, 0x26, 0x03, 0xca, 0xa0, 0x5d, 0x3b, 0x6e, 0xef, 0x8f, 0x0f, 0x58, 0x1d, 0xb5, 0x8f, 0x5e, - 0x95, 0xde, 0x1c, 0xed, 0x07, 0x21, 0x29, 0x43, 0xe2, 0x21, 0xe0, 0xde, 0xb3, 0x0a, 0xc8, 0xc2, - 0x18, 0x18, 0x0b, 0x6b, 0x61, 0x7a, 0x83, 0x0c, 0xde, 0xbd, 0x0f, 0xfe, 0xae, 0x17, 0x8d, 0xd5, - 0x84, 0x45, 0xc6, 0x6e, 0xcb, 0xe5, 0xad, 0xb7, 0xa7, 0xdb, 0x73, 0x9e, 0x95, 0x9e, 0x16, 0x11, - 0xac, 0x4d, 0x5a, 0xeb, 0xb2, 0xd9, 0xec, 0x60, 0xfa, 0x33, 0xa4, 0x09, 0xdf, 0x18, 0xf3, 0x11, - 0xba, 0x5e, 0x1c, 0xa5, 0xd9, 0x76, 0x8d, 0xe2, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, - 0xae, 0x42, 0x60, 0x82 -}; - -#endif diff --git a/cinelerra-5.0/cinelerra/filescene.C b/cinelerra-5.0/cinelerra/filescene.C index 8e0ce29a..ace2c080 100644 --- a/cinelerra-5.0/cinelerra/filescene.C +++ b/cinelerra-5.0/cinelerra/filescene.C @@ -1853,7 +1853,7 @@ VFrame* SceneTokens::load_image(char *path) data[1] = (size >> 16) & 0xff; data[2] = (size >> 8) & 0xff; data[3] = size & 0xff; - result = new VFrame(data); + result = new VFramePng(data, 1.); delete [] data; diff --git a/cinelerra-5.0/cinelerra/mbuttons.C b/cinelerra-5.0/cinelerra/mbuttons.C index fff91679..ab9e27fe 100644 --- a/cinelerra-5.0/cinelerra/mbuttons.C +++ b/cinelerra-5.0/cinelerra/mbuttons.C @@ -170,23 +170,9 @@ MainEditing::MainEditing(MWindow *mwindow, MButtons *mbuttons, int x, int y) } -#include "data/ff_checked_png.h" -#include "data/ff_down_png.h" -#include "data/ff_checkedhi_png.h" -#include "data/ff_up_png.h" -#include "data/ff_hi_png.h" - -static VFrame *ff_images[] = { - new VFrame(ff_up_png), - new VFrame(ff_hi_png), - new VFrame(ff_checked_png), - new VFrame(ff_down_png), - new VFrame(ff_checkedhi_png) -}; - MainFFMpegToggle::MainFFMpegToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y) - : BC_Toggle(x - ff_images[0]->get_w(), y, &ff_images[0], - mwindow->preferences->ffmpeg_early_probe) + : BC_Toggle(x - mwindow->theme->ffmpeg_toggle[0]->get_w(), y, + mwindow->theme->ffmpeg_toggle, mwindow->preferences->ffmpeg_early_probe) { this->mwindow = mwindow; this->mbuttons = mbuttons; diff --git a/cinelerra-5.0/cinelerra/mwindow.C b/cinelerra-5.0/cinelerra/mwindow.C index 31835cc5..18488f84 100644 --- a/cinelerra-5.0/cinelerra/mwindow.C +++ b/cinelerra-5.0/cinelerra/mwindow.C @@ -1793,7 +1793,7 @@ void MWindow::create_objects(int want_gui, void MWindow::show_splash() { #include "data/heroine_logo11_png.h" - VFrame *frame = new VFrame(heroine_logo11_png); + VFrame *frame = new VFramePng(heroine_logo11_png); BC_DisplayInfo display_info; splash_window = new SplashGUI(frame, display_info.get_root_w() / 2 - frame->get_w() / 2, diff --git a/cinelerra-5.0/cinelerra/patchbay.C b/cinelerra-5.0/cinelerra/patchbay.C index 813268d3..5810ba4c 100644 --- a/cinelerra-5.0/cinelerra/patchbay.C +++ b/cinelerra-5.0/cinelerra/patchbay.C @@ -184,29 +184,29 @@ void PatchBay::create_objects() // Create icons for mode types static const char *mode_types[] = { - _("mode_normal"), - _("mode_add"), - _("mode_subtract"), - _("mode_multiply"), - _("mode_divide"), - _("mode_replace"), - _("mode_max"), - _("mode_min"), - _("mode_average"), - _("mode_darken"), - _("mode_lighten"), - _("mode_dst"), - _("mode_dstatop"), - _("mode_dstin"), - _("mode_dstout"), - _("mode_dstover"), - _("mode_src"), - _("mode_srcatop"), - _("mode_srcin"), - _("mode_srcout"), - _("mode_srcover"), - _("mode_or"), - _("mode_xor"), + "mode_normal", + "mode_add", + "mode_subtract", + "mode_multiply", + "mode_divide", + "mode_replace", + "mode_max", + "mode_min", + "mode_average", + "mode_darken", + "mode_lighten", + "mode_dst", + "mode_dstatop", + "mode_dstin", + "mode_dstout", + "mode_dstover", + "mode_src", + "mode_srcatop", + "mode_srcin", + "mode_srcout", + "mode_srcover", + "mode_or", + "mode_xor", }; for( int mode=0; modeicon_scale; + vframe = new VFramePng(bfr, st.st_size, scale, scale); if( (w=vframe->get_w()) <= 0 || (h=vframe->get_h()) <= 0 || vframe->get_data() == 0 ) ret = 1; } diff --git a/cinelerra-5.0/cinelerra/samples.C b/cinelerra-5.0/cinelerra/samples.C index 1ff75633..4e30c6ba 100644 --- a/cinelerra-5.0/cinelerra/samples.C +++ b/cinelerra-5.0/cinelerra/samples.C @@ -168,51 +168,3 @@ int Samples::get_offset() return offset; } -int Samples::filefork_size() -{ - return 12; -} - -void Samples::to_filefork(unsigned char *buffer) -{ - *(int*)(buffer + 0) = shmid; - *(int*)(buffer + 4) = allocated; - *(int*)(buffer + 8) = offset; -// printf("Samples::to_filefork %d shmid=%d allocated=%d offset=%d data=%p\n", -// __LINE__, -// shmid, -// allocated, -// offset, -// data); -} - -void Samples::from_filefork(unsigned char *buffer) -{ -// printf("Samples::from_filefork %d %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", -// __LINE__, -// buffer[0], -// buffer[1], -// buffer[2], -// buffer[3], -// buffer[4], -// buffer[5], -// buffer[6], -// buffer[7], -// buffer[8], -// buffer[9], -// buffer[10], -// buffer[11]); - clear_objects(); - shmid = *(int*)(buffer + 0); - allocated = *(int*)(buffer + 4); - offset = *(int*)(buffer + 8); - data = (double*)shmat(shmid, NULL, 0); -// printf("Samples::from_filefork %d shmid=%d allocated=%d offset=%d data=%p\n", -// __LINE__, -// shmid, -// allocated, -// offset, -// data); -} - - diff --git a/cinelerra-5.0/cinelerra/samples.h b/cinelerra-5.0/cinelerra/samples.h index ea75bf58..7198929c 100644 --- a/cinelerra-5.0/cinelerra/samples.h +++ b/cinelerra-5.0/cinelerra/samples.h @@ -51,11 +51,6 @@ public: void set_offset(int offset); int get_offset(); - - static int filefork_size(); - void to_filefork(unsigned char *buffer); - void from_filefork(unsigned char *buffer); - private: int shmid; double *data; diff --git a/cinelerra-5.0/cinelerra/shbtnprefs.C b/cinelerra-5.0/cinelerra/shbtnprefs.C index 7c6a5f41..737c84c8 100644 --- a/cinelerra-5.0/cinelerra/shbtnprefs.C +++ b/cinelerra-5.0/cinelerra/shbtnprefs.C @@ -3,9 +3,11 @@ #include "bcdialog.h" #include "language.h" #include "mainerror.h" +#include "mwindow.h" #include "shbtnprefs.h" #include "preferences.h" #include "preferencesthread.h" +#include "theme.h" #include @@ -327,18 +329,8 @@ int MainShBtnItem::handle_event() return 1; } -#include "data/shbtn_up_png.h" -#include "data/shbtn_hi_png.h" -#include "data/shbtn_dn_png.h" - -static VFrame *shbtn_images[] = { - new VFrame(shbtn_up_png), - new VFrame(shbtn_hi_png), - new VFrame(shbtn_dn_png), -}; - MainShBtns::MainShBtns(MWindow *mwindow, int x, int y) - : BC_PopupMenu(x, y, 0, "", -1, shbtn_images) + : BC_PopupMenu(x, y, 0, "", -1, mwindow->theme->shbtn_data) { this->mwindow = mwindow; set_tooltip(_("shell cmds")); diff --git a/cinelerra-5.0/cinelerra/theme.C b/cinelerra-5.0/cinelerra/theme.C index f3137a25..ef69bb42 100644 --- a/cinelerra-5.0/cinelerra/theme.C +++ b/cinelerra-5.0/cinelerra/theme.C @@ -96,7 +96,7 @@ Theme::Theme() loadmode_w = 350; #include "data/about_png.h" - about_bg = new VFrame(about_png); + about_bg = new VFramePng(about_png); pane_color = BLACK; drag_pane_color = WHITE; @@ -342,7 +342,7 @@ void Theme::build_transport(char *title, int third) { if(!png_overlay) return; - VFrame default_data(png_overlay); + VFramePng default_data(png_overlay); VFrame *data[3]; data[0] = NEW_VFRAME; data[1] = NEW_VFRAME; @@ -396,7 +396,7 @@ void Theme::build_patches(VFrame** &data, int region) { if(!png_overlay || !bg_data) return; - VFrame default_data(png_overlay); + VFramePng default_data(png_overlay); data = new VFrame*[5]; data[0] = NEW_VFRAME; data[1] = NEW_VFRAME; @@ -449,7 +449,7 @@ void Theme::build_button(VFrame** &data, VFrame *dn_vframe) { if(!png_overlay) return; - VFrame default_data(png_overlay); + VFramePng default_data(png_overlay); if(!up_vframe || !hi_vframe || !dn_vframe) return; data = new VFrame*[3]; @@ -472,7 +472,7 @@ void Theme::build_button(VFrame** &data, VFrame *at_vframe) { if(!png_overlay) return; - VFrame default_data(png_overlay); + VFramePng default_data(png_overlay); if(!up_vframe || !hi_vframe || !dn_vframe) return; data = new VFrame*[4]; @@ -503,7 +503,7 @@ void Theme::build_toggle(VFrame** &data, !checked_vframe || !dn_vframe || !checkedhi_vframe) return; - VFrame default_data(png_overlay); + VFramePng default_data(png_overlay); data = new VFrame*[5]; data[0] = NEW_VFRAME; data[1] = NEW_VFRAME; diff --git a/cinelerra-5.0/cinelerra/theme.h b/cinelerra-5.0/cinelerra/theme.h index 5f844f75..277a848e 100644 --- a/cinelerra-5.0/cinelerra/theme.h +++ b/cinelerra-5.0/cinelerra/theme.h @@ -328,6 +328,7 @@ public: VFrame **edithandlein_data; VFrame **edithandleout_data; VFrame **extract_data; + VFrame **ffmpeg_toggle; VFrame **infoasset_data; VFrame **in_point; VFrame **insert_data; @@ -358,6 +359,7 @@ public: VFrame **reverse_data; VFrame **rewind_data; VFrame **select_data; + VFrame **shbtn_data; VFrame **splice_data; VFrame **start_over_data; VFrame **statusbar_cancel_data; diff --git a/cinelerra-5.0/guicast/bcbitmap.C b/cinelerra-5.0/guicast/bcbitmap.C index dedb03b4..e9118da4 100644 --- a/cinelerra-5.0/guicast/bcbitmap.C +++ b/cinelerra-5.0/guicast/bcbitmap.C @@ -270,12 +270,10 @@ BC_XImage::~BC_XImage() } -BC_Bitmap::BC_Bitmap(BC_WindowBase *parent_window, unsigned char *png_data) +BC_Bitmap::BC_Bitmap(BC_WindowBase *parent_window, unsigned char *png_data, double scale) { // Decompress data into a temporary vframe - VFrame frame; - - frame.read_png(png_data); + VFramePng frame(png_data, scale); avail_lock = 0; // Initialize the bitmap diff --git a/cinelerra-5.0/guicast/bcbitmap.h b/cinelerra-5.0/guicast/bcbitmap.h index 7b93c9ff..1d89a44d 100644 --- a/cinelerra-5.0/guicast/bcbitmap.h +++ b/cinelerra-5.0/guicast/bcbitmap.h @@ -196,7 +196,7 @@ class BC_Bitmap public: enum { bmXNone, bmXImage, bmXShmImage, bmXvImage, bmXvShmImage }; - BC_Bitmap(BC_WindowBase *parent_window, unsigned char *png_data); + BC_Bitmap(BC_WindowBase *parent_window, unsigned char *png_data, double scale=1); BC_Bitmap(BC_WindowBase *parent_window, VFrame *frame); // Shared memory is a problem in X because it's asynchronous and there's diff --git a/cinelerra-5.0/guicast/bcmenupopup.C b/cinelerra-5.0/guicast/bcmenupopup.C index f03d64fe..8cd5b6b4 100644 --- a/cinelerra-5.0/guicast/bcmenupopup.C +++ b/cinelerra-5.0/guicast/bcmenupopup.C @@ -387,8 +387,8 @@ int BC_MenuPopup::get_dimensions() menu_items.values[i]->h = 5; else { -// menu_items.values[i]->h = top_level->get_text_height(MEDIUMFONT) + 4; - menu_items.values[i]->h = item_bg[0]->get_h(); + menu_items.values[i]->h = item_bg[0] ? item_bg[0]->get_h() : + top_level->get_text_height(MEDIUMFONT) + 4; } menu_items.values[i]->y = h; diff --git a/cinelerra-5.0/guicast/bcresources.C b/cinelerra-5.0/guicast/bcresources.C index 7ac9096b..5e1e4e62 100644 --- a/cinelerra-5.0/guicast/bcresources.C +++ b/cinelerra-5.0/guicast/bcresources.C @@ -209,20 +209,20 @@ BC_Resources::BC_Resources() { synchronous = 0; vframe_shm = 0; + display_info = new BC_DisplayInfo("", 0); - double scale = 1; - char *font_scale = getenv("BC_FONT_SCALE"); - if( !font_scale ) { - int display_w = display_info->get_root_w(); - int display_h = display_info->get_root_h(); - int display_size = display_h < display_w ? display_h : display_w; - scale = display_size / 1000.; - } - else { - double env_scale = atof(font_scale); - if( env_scale > 0 ) scale = env_scale; - } - init_font_defs(scale); + int display_w = display_info->get_root_w(); + int display_h = display_info->get_root_h(); + int display_size = display_h < display_w ? display_h : display_w; + double default_scale = display_size/1000.; + char *env = getenv("BC_FONT_SCALE"); + font_scale = env ? atof(env) : default_scale; + if( font_scale <= 0 ) font_scale = 1; + init_font_defs(font_scale); + env = getenv("BC_ICON_SCALE"); + icon_scale = env ? atof(env) : default_scale; + if( icon_scale <= 0 ) icon_scale = 1; + id_lock = new Mutex("BC_Resources::id_lock"); create_window_lock = new Mutex("BC_Resources::create_window_lock", 1); id = 0; @@ -246,17 +246,17 @@ BC_Resources::BC_Resources() #include "images/file_column_png.h" static VFrame* default_type_to_icon[] = { - new VFrame(file_folder_png), - new VFrame(file_unknown_png), - new VFrame(file_film_png), - new VFrame(file_sound_png), - new VFrame(file_column_png) + new VFramePng(file_folder_png), + new VFramePng(file_unknown_png), + new VFramePng(file_film_png), + new VFramePng(file_sound_png), + new VFramePng(file_column_png) }; type_to_icon = default_type_to_icon; #include "images/bar_png.h" - static VFrame* default_bar = new VFrame(bar_png); + static VFrame* default_bar = new VFramePng(bar_png); bar_data = default_bar; @@ -265,9 +265,9 @@ BC_Resources::BC_Resources() #include "images/cancel_dn_png.h" static VFrame* default_cancel_images[] = { - new VFrame(cancel_up_png), - new VFrame(cancel_hi_png), - new VFrame(cancel_dn_png) + new VFramePng(cancel_up_png), + new VFramePng(cancel_hi_png), + new VFramePng(cancel_dn_png) }; #include "images/ok_up_png.h" @@ -275,9 +275,9 @@ BC_Resources::BC_Resources() #include "images/ok_dn_png.h" static VFrame* default_ok_images[] = { - new VFrame(ok_up_png), - new VFrame(ok_hi_png), - new VFrame(ok_dn_png) + new VFramePng(ok_up_png), + new VFramePng(ok_hi_png), + new VFramePng(ok_dn_png) }; #include "images/usethis_up_png.h" @@ -285,9 +285,9 @@ BC_Resources::BC_Resources() #include "images/usethis_dn_png.h" static VFrame* default_usethis_images[] = { - new VFrame(usethis_up_png), - new VFrame(usethis_uphi_png), - new VFrame(usethis_dn_png) + new VFramePng(usethis_up_png), + new VFramePng(usethis_uphi_png), + new VFramePng(usethis_dn_png) }; #if 0 @@ -298,11 +298,11 @@ BC_Resources::BC_Resources() #include "images/checkbox_hi_png.h" static VFrame* default_checkbox_images[] = { - new VFrame(checkbox_up_png), - new VFrame(checkbox_hi_png), - new VFrame(checkbox_checked_png), - new VFrame(checkbox_dn_png), - new VFrame(checkbox_checkedhi_png) + new VFramePng(checkbox_up_png), + new VFramePng(checkbox_hi_png), + new VFramePng(checkbox_checked_png), + new VFramePng(checkbox_dn_png), + new VFramePng(checkbox_checkedhi_png) }; #include "images/radial_checked_png.h" @@ -312,25 +312,25 @@ BC_Resources::BC_Resources() #include "images/radial_hi_png.h" static VFrame* default_radial_images[] = { - new VFrame(radial_up_png), - new VFrame(radial_hi_png), - new VFrame(radial_checked_png), - new VFrame(radial_dn_png), - new VFrame(radial_checkedhi_png) + new VFramePng(radial_up_png), + new VFramePng(radial_hi_png), + new VFramePng(radial_checked_png), + new VFramePng(radial_dn_png), + new VFramePng(radial_checkedhi_png) }; static VFrame* default_label_images[] = { - new VFrame(radial_up_png), - new VFrame(radial_hi_png), - new VFrame(radial_checked_png), - new VFrame(radial_dn_png), - new VFrame(radial_checkedhi_png) + new VFramePng(radial_up_png), + new VFramePng(radial_hi_png), + new VFramePng(radial_checked_png), + new VFramePng(radial_dn_png), + new VFramePng(radial_checkedhi_png) }; #endif #include "images/check_png.h" - static VFrame* default_check_image = new VFrame(check_png); + static VFrame* default_check_image = new VFramePng(check_png); check = default_check_image; #include "images/file_text_up_png.h" @@ -356,52 +356,52 @@ BC_Resources::BC_Resources() #include "images/file_reload_dn_png.h" static VFrame* default_filebox_text_images[] = { - new VFrame(file_text_up_png), - new VFrame(file_text_hi_png), - new VFrame(file_text_dn_png) + new VFramePng(file_text_up_png), + new VFramePng(file_text_hi_png), + new VFramePng(file_text_dn_png) }; static VFrame* default_filebox_icons_images[] = { - new VFrame(file_icons_up_png), - new VFrame(file_icons_hi_png), - new VFrame(file_icons_dn_png) + new VFramePng(file_icons_up_png), + new VFramePng(file_icons_hi_png), + new VFramePng(file_icons_dn_png) }; static VFrame* default_filebox_updir_images[] = { - new VFrame(file_updir_up_png), - new VFrame(file_updir_hi_png), - new VFrame(file_updir_dn_png) + new VFramePng(file_updir_up_png), + new VFramePng(file_updir_hi_png), + new VFramePng(file_updir_dn_png) }; static VFrame* default_filebox_newfolder_images[] = { - new VFrame(file_newfolder_up_png), - new VFrame(file_newfolder_hi_png), - new VFrame(file_newfolder_dn_png) + new VFramePng(file_newfolder_up_png), + new VFramePng(file_newfolder_hi_png), + new VFramePng(file_newfolder_dn_png) }; static VFrame* default_filebox_rename_images[] = { - new VFrame(file_rename_up_png), - new VFrame(file_rename_hi_png), - new VFrame(file_rename_dn_png) + new VFramePng(file_rename_up_png), + new VFramePng(file_rename_hi_png), + new VFramePng(file_rename_dn_png) }; static VFrame* default_filebox_delete_images[] = { - new VFrame(file_delete_up_png), - new VFrame(file_delete_hi_png), - new VFrame(file_delete_dn_png) + new VFramePng(file_delete_up_png), + new VFramePng(file_delete_hi_png), + new VFramePng(file_delete_dn_png) }; static VFrame* default_filebox_reload_images[] = { - new VFrame(file_reload_up_png), - new VFrame(file_reload_hi_png), - new VFrame(file_reload_dn_png) + new VFramePng(file_reload_up_png), + new VFramePng(file_reload_hi_png), + new VFramePng(file_reload_dn_png) }; #include "images/listbox_button_dn_png.h" @@ -410,10 +410,10 @@ BC_Resources::BC_Resources() #include "images/listbox_button_disabled_png.h" static VFrame* default_listbox_button[] = { - new VFrame(listbox_button_up_png), - new VFrame(listbox_button_hi_png), - new VFrame(listbox_button_dn_png), - new VFrame(listbox_button_disabled_png) + new VFramePng(listbox_button_up_png), + new VFramePng(listbox_button_hi_png), + new VFramePng(listbox_button_dn_png), + new VFramePng(listbox_button_disabled_png) }; listbox_button = default_listbox_button; @@ -428,11 +428,11 @@ BC_Resources::BC_Resources() #include "images/listbox_expanduphi_png.h" static VFrame* default_listbox_expand[] = { - new VFrame(listbox_expandup_png), - new VFrame(listbox_expanduphi_png), - new VFrame(listbox_expandchecked_png), - new VFrame(listbox_expanddn_png), - new VFrame(listbox_expandcheckedhi_png), + new VFramePng(listbox_expandup_png), + new VFramePng(listbox_expanduphi_png), + new VFramePng(listbox_expandchecked_png), + new VFramePng(listbox_expanddn_png), + new VFramePng(listbox_expandcheckedhi_png), }; listbox_expand = default_listbox_expand; @@ -441,17 +441,17 @@ BC_Resources::BC_Resources() #include "images/listbox_columndn_png.h" static VFrame* default_listbox_column[] = { - new VFrame(listbox_columnup_png), - new VFrame(listbox_columnhi_png), - new VFrame(listbox_columndn_png) + new VFramePng(listbox_columnup_png), + new VFramePng(listbox_columnhi_png), + new VFramePng(listbox_columndn_png) }; listbox_column = default_listbox_column; #include "images/listbox_up_png.h" #include "images/listbox_dn_png.h" - listbox_up = new VFrame(listbox_up_png); - listbox_dn = new VFrame(listbox_dn_png); + listbox_up = new VFramePng(listbox_up_png); + listbox_dn = new VFramePng(listbox_dn_png); listbox_title_overlap = 0; listbox_title_margin = 0; listbox_title_color = BLACK; @@ -473,17 +473,17 @@ BC_Resources::BC_Resources() #include "images/pot_dn_png.h" static VFrame *default_pot_images[] = { - new VFrame(pot_up_png), - new VFrame(pot_hi_png), - new VFrame(pot_dn_png) + new VFramePng(pot_up_png), + new VFramePng(pot_hi_png), + new VFramePng(pot_dn_png) }; #include "images/progress_up_png.h" #include "images/progress_hi_png.h" static VFrame* default_progress_images[] = { - new VFrame(progress_up_png), - new VFrame(progress_hi_png) + new VFramePng(progress_up_png), + new VFramePng(progress_hi_png) }; pan_data = 0; @@ -511,26 +511,26 @@ BC_Resources::BC_Resources() #include "images/7seg_small/dash_png.h" static VFrame* default_medium_7segment[] = { - new VFrame(_0_png), - new VFrame(_1_png), - new VFrame(_2_png), - new VFrame(_3_png), - new VFrame(_4_png), - new VFrame(_5_png), - new VFrame(_6_png), - new VFrame(_7_png), - new VFrame(_8_png), - new VFrame(_9_png), - new VFrame(colon_png), - new VFrame(period_png), - new VFrame(a_png), - new VFrame(b_png), - new VFrame(c_png), - new VFrame(d_png), - new VFrame(e_png), - new VFrame(f_png), - new VFrame(space_png), - new VFrame(dash_png) + new VFramePng(_0_png), + new VFramePng(_1_png), + new VFramePng(_2_png), + new VFramePng(_3_png), + new VFramePng(_4_png), + new VFramePng(_5_png), + new VFramePng(_6_png), + new VFramePng(_7_png), + new VFramePng(_8_png), + new VFramePng(_9_png), + new VFramePng(colon_png), + new VFramePng(period_png), + new VFramePng(a_png), + new VFramePng(b_png), + new VFramePng(c_png), + new VFramePng(d_png), + new VFramePng(e_png), + new VFramePng(f_png), + new VFramePng(space_png), + new VFramePng(dash_png) }; generic_button_margin = 15; @@ -589,24 +589,24 @@ BC_Resources::BC_Resources() static VFrame *default_menuitem_data[] = { - new VFrame(menuitem_up_png), - new VFrame(menuitem_hi_png), - new VFrame(menuitem_dn_png), + new VFramePng(menuitem_up_png), + new VFramePng(menuitem_hi_png), + new VFramePng(menuitem_dn_png), }; menu_item_bg = default_menuitem_data; static VFrame *default_menubar_data[] = { - new VFrame(menubar_up_png), - new VFrame(menubar_hi_png), - new VFrame(menubar_dn_png), + new VFramePng(menubar_up_png), + new VFramePng(menubar_hi_png), + new VFramePng(menubar_dn_png), }; menu_title_bg = default_menubar_data; - menu_popup_bg = new VFrame(menu_popup_bg_png); + menu_popup_bg = new VFramePng(menu_popup_bg_png); - menu_bar_bg = new VFrame(menubar_bg_png); + menu_bar_bg = new VFramePng(menubar_bg_png); popupmenu_images = 0; diff --git a/cinelerra-5.0/guicast/bcresources.h b/cinelerra-5.0/guicast/bcresources.h index be9cee01..8d3ef55c 100644 --- a/cinelerra-5.0/guicast/bcresources.h +++ b/cinelerra-5.0/guicast/bcresources.h @@ -303,7 +303,7 @@ public: int dirbox_margin; int directory_color; int file_color; - + double font_scale, icon_scale; // fonts static const char *small_font; diff --git a/cinelerra-5.0/guicast/bctheme.C b/cinelerra-5.0/guicast/bctheme.C index 73f8d658..8268620f 100644 --- a/cinelerra-5.0/guicast/bctheme.C +++ b/cinelerra-5.0/guicast/bctheme.C @@ -19,6 +19,7 @@ * */ +#include "bcresources.h" #include "bctheme.h" #include "bcwindowbase.h" #include "clip.h" @@ -35,8 +36,6 @@ BC_Theme::BC_Theme() contents_ptr = 0; last_image = 0; last_pointer = 0; - - } BC_Theme::~BC_Theme() @@ -58,7 +57,6 @@ BC_Resources* BC_Theme::get_resources() return BC_WindowBase::get_resources(); } - // These create single images for storage in the image_sets table. VFrame* BC_Theme::new_image(const char *title, const char *path) { @@ -66,7 +64,7 @@ VFrame* BC_Theme::new_image(const char *title, const char *path) if(existing_image) return existing_image; BC_ThemeSet *result = new BC_ThemeSet(1, 0, title); - result->data[0] = new VFrame(get_image_data(path)); + result->data[0] = new VFramePng(get_image_data(path)); image_sets.append(result); return result->data[0]; } @@ -222,7 +220,7 @@ VFrame** BC_Theme::new_button(const char *overlay_path, const char *dn_path, const char *title) { - VFrame default_data(get_image_data(overlay_path)); + VFramePng default_data(get_image_data(overlay_path)); BC_ThemeSet *result = new BC_ThemeSet(3, 1, title ? title : ""); if(title) image_sets.append(result); @@ -244,7 +242,7 @@ VFrame** BC_Theme::new_button4(const char *overlay_path, const char *disabled_path, const char *title) { - VFrame default_data(get_image_data(overlay_path)); + VFramePng default_data(get_image_data(overlay_path)); BC_ThemeSet *result = new BC_ThemeSet(4, 1, title ? title : ""); if(title) image_sets.append(result); @@ -266,7 +264,7 @@ VFrame** BC_Theme::new_button(const char *overlay_path, VFrame *dn, const char *title) { - VFrame default_data(get_image_data(overlay_path)); + VFramePng default_data(get_image_data(overlay_path)); BC_ThemeSet *result = new BC_ThemeSet(3, 0, title ? title : ""); if(title) image_sets.append(result); @@ -287,7 +285,7 @@ VFrame** BC_Theme::new_toggle(const char *overlay_path, const char *checkedhi_path, const char *title) { - VFrame default_data(get_image_data(overlay_path)); + VFramePng default_data(get_image_data(overlay_path)); BC_ThemeSet *result = new BC_ThemeSet(5, 1, title ? title : ""); if(title) image_sets.append(result); @@ -309,7 +307,7 @@ VFrame** BC_Theme::new_toggle(const char *overlay_path, VFrame *checkedhi, const char *title) { - VFrame default_data(get_image_data(overlay_path)); + VFramePng default_data(get_image_data(overlay_path)); BC_ThemeSet *result = new BC_ThemeSet(5, 0, title ? title : ""); if(title) image_sets.append(result); diff --git a/cinelerra-5.0/guicast/vframe.C b/cinelerra-5.0/guicast/vframe.C index d40d7270..1eec314b 100644 --- a/cinelerra-5.0/guicast/vframe.C +++ b/cinelerra-5.0/guicast/vframe.C @@ -79,20 +79,27 @@ VFrameScene::~VFrameScene() //static BCCounter counter; -VFrame::VFrame(unsigned char *png_data) +VFramePng::VFramePng(unsigned char *png_data, double scale) { - reset_parameters(1); - params = new BC_Hash; - read_png(png_data); + long image_size = + ((long)png_data[0] << 24) | ((long)png_data[1] << 16) | + ((long)png_data[2] << 8) | (long)png_data[3]; + if( !scale ) scale = BC_WindowBase::get_resources()->icon_scale; + read_png(png_data+4, image_size, scale, scale); } -VFrame::VFrame(unsigned char *png_data, long image_size) +VFramePng::VFramePng(unsigned char *png_data, long image_size, double xscale, double yscale) { - reset_parameters(1); - params = new BC_Hash; - read_png(png_data, image_size); + if( !xscale ) xscale = BC_WindowBase::get_resources()->icon_scale; + if( !yscale ) yscale = BC_WindowBase::get_resources()->icon_scale; + read_png(png_data, image_size, xscale, yscale); } +VFramePng::~VFramePng() +{ +} + + VFrame::VFrame(VFrame &frame) { reset_parameters(1); @@ -662,7 +669,7 @@ UNBUFFER(data); return 0; } -int VFrame::read_png(const unsigned char *data, long img_sz) +int VFramePng::read_png(const unsigned char *data, long sz, double xscale, double yscale) { // Test for RAW format if(data[0] == 'R' && data[1] == 'A' && data[2] == 'W' && data[3] == ' ') { @@ -687,7 +694,7 @@ int VFrame::read_png(const unsigned char *data, long img_sz) int new_color_model; image_offset = 0; - image = data; image_size = img_sz; + image = data; image_size = sz; png_set_read_fn(png_ptr, this, PngReadFunction::png_read_function); png_read_info(png_ptr, info_ptr); @@ -753,18 +760,17 @@ int VFrame::read_png(const unsigned char *data, long img_sz) printf("VFrame::read_png %d: unknown file format" " 0x%02x 0x%02x 0x%02x 0x%02x\n", __LINE__, data[4], data[5], data[6], data[7]); + return 1; + } + int ww = w * xscale, hh = h * yscale; + if( ww != w || hh != h ) { + VFrame vframe(*this); + reallocate(NULL, -1, 0, 0, 0, ww, hh, color_model, -1); + transfer_from(&vframe); } return 0; } -int VFrame::read_png(const unsigned char *data) -{ - long img_sz = - ((long)data[0] << 24) | ((long)data[1] << 16) | - ((long)data[2] << 8) | (long)data[3]; - return read_png(data+4, img_sz); -} - int VFrame::write_png(const char *path) { png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); @@ -1285,79 +1291,6 @@ void VFrame::dump() w, h, color_model, rows, use_shm, shmid); } -int VFrame::filefork_size() -{ - return sizeof(int) * 13 + sizeof(long); -} - - -void VFrame::to_filefork(unsigned char *buffer) -{ - *(int*)(buffer + 0) = shmid; - *(int*)(buffer + 4) = y_offset; - *(int*)(buffer + 8) = u_offset; - *(int*)(buffer + 12) = v_offset; - *(int*)(buffer + 16) = w; - *(int*)(buffer + 20) = h; - *(int*)(buffer + 24) = color_model; - *(int*)(buffer + 28) = bytes_per_line; - *(int*)(buffer + 32) = compressed_allocated; - *(int*)(buffer + 36) = compressed_size; - *(int*)(buffer + 40) = is_keyframe; - *(int*)(buffer + 44) = status; - *(long*)(buffer + 48) = sequence_number; - - -//printf("VFrame::to_filefork %d %lld\n", __LINE__, sequence_number); -// printf("VFrame::to_filefork %d", __LINE__); -// for(int i = 0; i < 40; i++) -// { -// printf(" %02x", buffer[i]); -// } -// printf("\n"); -// dump(); -} - - -void VFrame::from_filefork(unsigned char *buffer) -{ -// This frame will always be preallocated shared memory -//printf("VFrame::from_filefork %d %d\n", __LINE__, *(int*)(buffer + 24)); - if(*(int*)(buffer + 24) == BC_COMPRESSED) - { - set_compressed_memory(0, - *(int*)(buffer + 0), // shmid - *(int*)(buffer + 36), // compressed_size - *(int*)(buffer + 32)); // compressed_allocated - color_model = BC_COMPRESSED; -//printf("VFrame::from_filefork %d %d\n", __LINE__, get_compressed_size()); - - } - else - { -// printf("VFrame::from_filefork %d", __LINE__); -// for(int i = 0; i < 40; i++) -// { -// printf(" %02x", buffer[i]); -// } -// printf("\n"); - reallocate(0, - *(int*)(buffer + 0), // shmid - *(int*)(buffer + 4), // y_offset - *(int*)(buffer + 8), // u_offset - *(int*)(buffer + 12), // v_offset - *(int*)(buffer + 16), // w - *(int*)(buffer + 20), // h - *(int*)(buffer + 24), // colormodel - *(int*)(buffer + 28)); // bytes per line -//dump(); - } - - is_keyframe = *(int*)(buffer + 40); - status = *(int*)(buffer + 44); - sequence_number = *(long*)(buffer + 48); -//printf("VFrame::from_filefork %d %lld\n", __LINE__, sequence_number); -} int VFrame::get_memory_usage() { diff --git a/cinelerra-5.0/guicast/vframe.h b/cinelerra-5.0/guicast/vframe.h index 694bfaa9..57596891 100644 --- a/cinelerra-5.0/guicast/vframe.h +++ b/cinelerra-5.0/guicast/vframe.h @@ -32,9 +32,6 @@ #include "bccmodels.h" #include "vframe.inc" -class PngReadFunction; - - // Maximum number of prev or next effects to be pushed onto the stacks. #define MAX_STACK_ELEMENTS 255 @@ -52,6 +49,8 @@ public: class VFrame { + friend class VFramePng; + friend class PngReadFunction; public: // Create new frame with shared data if *data is nonzero. // Pass 0 to *data & -1 to shmid if private data is desired. @@ -80,16 +79,11 @@ public: int color_model, long bytes_per_line); -// Create a frame with the png image - VFrame(unsigned char *png_data); - VFrame(unsigned char *png_data, long image_size); VFrame(VFrame &vframe); // Create new frame for compressed data. VFrame(); ~VFrame(); - friend class PngReadFunction; - // Return 1 if the colormodel and dimensions are the same // Used by FrameCache int equivalent(VFrame *src, int test_stacks = 0); @@ -118,9 +112,6 @@ public: int data_size, int data_allocated); -// Read a PNG into the frame with alpha - int read_png(const unsigned char *data); - int read_png(const unsigned char *data, long image_size); // Write a PNG for debugging int write_png(const char *path); @@ -366,13 +357,6 @@ public: void dump_params(); -// Shared memory utils - static int filefork_size(); - - void to_filefork(unsigned char *buffer); - - void from_filefork(unsigned char *buffer); - private: // 3D scene graphs @@ -464,5 +448,14 @@ private: BC_Hash *params; }; +// Create a frame with the png image +class VFramePng : public VFrame { +// Read a PNG into the frame with alpha + int read_png(const unsigned char *data, long image_size, double xscale, double yscale); +public: + VFramePng(unsigned char *png_data, double scale=0); + VFramePng(unsigned char *png_data, long image_size, double xs=0, double ys=0); + ~VFramePng(); +}; #endif diff --git a/cinelerra-5.0/guicast/vframe.inc b/cinelerra-5.0/guicast/vframe.inc index e39f442d..d2978ec8 100644 --- a/cinelerra-5.0/guicast/vframe.inc +++ b/cinelerra-5.0/guicast/vframe.inc @@ -23,7 +23,8 @@ #define VFRAME_INC class VFrame; +class VFramePng; class VFrameScene; - +class PngReadFunction; #endif diff --git a/cinelerra-5.0/plugin_defs b/cinelerra-5.0/plugin_defs index ea285b63..30d79de1 100644 --- a/cinelerra-5.0/plugin_defs +++ b/cinelerra-5.0/plugin_defs @@ -104,7 +104,6 @@ interpolatevideo := video_tools invertvideo := video_tools linearblur := video_tools loopvideo := video_tools -lof := video_tools motion2 := video_tools motionblur := video_tools motion := video_tools diff --git a/cinelerra-5.0/plugins/4k/4k.C b/cinelerra-5.0/plugins/4k/4k.C deleted file mode 100644 index 7268be7f..00000000 --- a/cinelerra-5.0/plugins/4k/4k.C +++ /dev/null @@ -1,1026 +0,0 @@ - -/* - * CINELERRA - * Copyright (C) 1997-2014 Adam Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#include "bcsignals.h" -#include "clip.h" -#include "cwindowgui.h" -#include "4k.h" -#include "edl.h" -#include "edlsession.h" -#include "mainmenu.h" -#include "mainsession.h" -#include "mbuttons.h" -#include "meterpanel.h" -#include "mwindow.h" -#include "mwindowgui.h" -#include "new.h" -#include "patchbay.h" -#include "preferencesthread.h" -#include "recordgui.h" -#include "recordmonitor.h" -#include "setformat.h" -#include "statusbar.h" -#include "timebar.h" -#include "trackcanvas.h" -#include "vframe.h" -#include "vwindowgui.h" - - - - -PluginClient* new_plugin(PluginServer *server) -{ - return new FourKMain(server); -} - - - - - - - -FourKMain::FourKMain(PluginServer *server) - : PluginTClient(server) -{ -} - -FourKMain::~FourKMain() -{ -} - -const char* FourKMain::plugin_title() -{ - return _("4K"); -} - -Theme* FourKMain::new_theme() -{ - theme = new FourK; - extern unsigned char _binary_4k_data_start[]; - theme->set_data(_binary_4k_data_start); - return theme; -} - - - - - - - - -FourK::FourK() - : Theme() -{ -} - -FourK::~FourK() -{ -} - -void FourK::initialize() -{ - BC_Resources *resources = BC_WindowBase::get_resources(); - - resources->small_font_xft = N_("Sans-13"); - resources->medium_font_xft = N_("Sans-17"); - resources->large_font_xft = N_("Sans-17:style=bold"); - - resources->text_default = 0xbfbfbf; - resources->text_background = 0x373737; - resources->text_border1 = 0x202020; - resources->text_border2 = 0x373737; - resources->text_border3 = 0x373737; - resources->text_border4 = 0x969696; - resources->text_inactive_highlight = 0x707070; - - resources->bg_color = 0x484848; - resources->border_light2 = resources->bg_color; - resources->border_shadow2 = resources->bg_color; - resources->default_text_color = 0xbfbfbf; - resources->menu_title_text = 0xbfbfbf; - resources->popup_title_text = 0xbfbfbf; - resources->menu_item_text = 0xbfbfbf; - resources->menu_highlighted_fontcolor = WHITE; - resources->generic_button_margin = 30; - resources->pot_needle_color = resources->text_default; - resources->pot_offset = 1; - resources->progress_text = resources->text_default; - resources->meter_font_color = resources->default_text_color; - - resources->menu_light = 0xababab; - resources->menu_highlighted = 0x6f6f6f; - resources->menu_down = 0x4b4b4b; - resources->menu_up = 0x4b4b4b; - resources->menu_shadow = 0x202020; - resources->popupmenu_margin = 15; - resources->popupmenu_triangle_margin = 15; - - resources->listbox_title_color = 0xbfbfbf; - - resources->listbox_title_margin = 20; - resources->listbox_title_hotspot = 20; - resources->listbox_border1 = 0x1a1a1a; - resources->listbox_border2 = 0x373737; - resources->listbox_border3 = 0x373737; - resources->listbox_border4 = 0x646464; - resources->listbox_highlighted = 0x505050; - resources->listbox_inactive = 0x373737; - resources->listbox_bg = 0; - resources->listbox_text = 0xbfbfbf; - - resources->filebox_margin = 130; - resources->file_color = 0xbfbfbf; - resources->directory_color = 0xa0a0ff; - - - new_toggle("loadmode_new.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_new"); - new_toggle("loadmode_none.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_none"); - new_toggle("loadmode_newcat.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_newcat"); - new_toggle("loadmode_cat.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_cat"); - new_toggle("loadmode_newtracks.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_newtracks"); - new_toggle("loadmode_paste.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_paste"); - new_toggle("loadmode_resource.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_resource"); - new_toggle("loadmode_nested.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_nested"); - - - - resources->filebox_icons_images = new_button("icons.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_text_images = new_button("text.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_newfolder_images = new_button("folder.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_rename_images = new_button("rename.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_updir_images = new_button("updir.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_delete_images = new_button("delete.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_reload_images = new_button("reload.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - - resources->filebox_descend_images = new_button("openfolder.png", - "filebox_bigbutton_up.png", - "filebox_bigbutton_hi.png", - "filebox_bigbutton_dn.png"); - - resources->usethis_button_images = - resources->ok_images = new_button("ok.png", - "filebox_bigbutton_up.png", - "filebox_bigbutton_hi.png", - "filebox_bigbutton_dn.png"); - - new_button("ok.png", - "new_bigbutton_up.png", - "new_bigbutton_hi.png", - "new_bigbutton_dn.png", - "new_ok_images"); - - resources->cancel_images = new_button("cancel.png", - "filebox_bigbutton_up.png", - "filebox_bigbutton_hi.png", - "filebox_bigbutton_dn.png"); - - new_button("cancel.png", - "new_bigbutton_up.png", - "new_bigbutton_hi.png", - "new_bigbutton_dn.png", - "new_cancel_images"); - - resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); - - resources->bar_data = new_image("bar", "bar.png"); - resources->check = new_image("check", "check.png"); - - resources->min_menu_w = 96; - resources->menu_popup_bg = new_image("menu_popup_bg.png"); - resources->menu_item_bg = new_image_set(3, - "menuitem_up.png", - "menuitem_hi.png", - "menuitem_dn.png"); - resources->menu_bar_bg = new_image("menubar_bg.png"); - resources->menu_title_bg = new_image_set(3, - "menubar_up.png", - "menubar_hi.png", - "menubar_dn.png"); - - - resources->popupmenu_images = 0; -// new_image_set(3, -// "menupopup_up.png", -// "menupopup_hi.png", -// "menupopup_dn.png"); - - resources->toggle_highlight_bg = new_image("toggle_highlight_bg", - "text_highlight.png"); - - resources->generic_button_images = new_image_set(3, - "generic_up.png", - "generic_hi.png", - "generic_dn.png"); - resources->horizontal_slider_data = new_image_set(6, - "hslider_fg_up.png", - "hslider_fg_hi.png", - "hslider_fg_dn.png", - "hslider_bg_up.png", - "hslider_bg_hi.png", - "hslider_bg_dn.png"); - resources->progress_images = new_image_set(2, - "progress_bg.png", - "progress_hi.png"); - resources->tumble_data = new_image_set(4, - "tumble_up.png", - "tumble_hi.png", - "tumble_bottom.png", - "tumble_top.png"); - resources->listbox_button = new_button4("listbox_button.png", - "editpanel_up.png", - "editpanel_hi.png", - "editpanel_dn.png", - "editpanel_hi.png"); - resources->listbox_column = new_image_set(3, - "column_up.png", - "column_hi.png", - "column_dn.png"); - resources->listbox_up = new_image("listbox_up.png"); - resources->listbox_dn = new_image("listbox_dn.png"); - resources->pan_data = new_image_set(7, - "pan_up.png", - "pan_hi.png", - "pan_popup.png", - "pan_channel.png", - "pan_stick.png", - "pan_channel_small.png", - "pan_stick_small.png"); - resources->pan_text_color = WHITE; - - resources->pot_images = new_image_set(3, - "pot_up.png", - "pot_hi.png", - "pot_dn.png"); - - resources->checkbox_images = new_image_set(5, - "checkbox_up.png", - "checkbox_hi.png", - "checkbox_checked.png", - "checkbox_dn.png", - "checkbox_checkedhi.png"); - - resources->radial_images = new_image_set(5, - "radial_up.png", - "radial_hi.png", - "radial_checked.png", - "radial_dn.png", - "radial_checkedhi.png"); - - resources->xmeter_images = new_image_set(7, - "xmeter_normal.png", - "xmeter_green.png", - "xmeter_red.png", - "xmeter_yellow.png", - "xmeter_white.png", - "xmeter_over.png", - "downmix51_2.png"); - resources->ymeter_images = new_image_set(7, - "ymeter_normal.png", - "ymeter_green.png", - "ymeter_red.png", - "ymeter_yellow.png", - "ymeter_white.png", - "ymeter_over.png", - "downmix51_2.png"); - - resources->hscroll_data = new_image_set(10, - "hscroll_handle_up.png", - "hscroll_handle_hi.png", - "hscroll_handle_dn.png", - "hscroll_handle_bg.png", - "hscroll_left_up.png", - "hscroll_left_hi.png", - "hscroll_left_dn.png", - "hscroll_right_up.png", - "hscroll_right_hi.png", - "hscroll_right_dn.png"); - - resources->vscroll_data = new_image_set(10, - "vscroll_handle_up.png", - "vscroll_handle_hi.png", - "vscroll_handle_dn.png", - "vscroll_handle_bg.png", - "vscroll_left_up.png", - "vscroll_left_hi.png", - "vscroll_left_dn.png", - "vscroll_right_up.png", - "vscroll_right_hi.png", - "vscroll_right_dn.png"); - resources->scroll_minhandle = 20; - - - new_button("prevtip.png", "tipbutton_up.png", "tipbutton_hi.png", "tipbutton_dn.png", "prev_tip"); - new_button("nexttip.png", "tipbutton_up.png", "tipbutton_hi.png", "tipbutton_dn.png", "next_tip"); - new_button("closetip.png", "tipbutton_up.png", "tipbutton_hi.png", "tipbutton_dn.png", "close_tip"); - new_button("swap_extents.png", - "editpanel_up.png", - "editpanel_hi.png", - "editpanel_dn.png", - "swap_extents"); - - -// Record windows - - - preferences_category_overlap = 0; - preferencescategory_x = 0; - preferencescategory_y = 5; - preferencestitle_x = 5; - preferencestitle_y = 10; - preferencesoptions_x = 5; - preferencesoptions_y = 0; - -// MWindow - message_normal = resources->text_default; - audio_color = GREEN; - mtransport_margin = 16; - toggle_margin = 16; - - new_button("pane.png", "pane_up.png", "pane_hi.png", "pane_dn.png", "pane"); - new_image_set("xpane", 3, "xpane_up.png", "xpane_hi.png", "xpane_dn.png"); - new_image_set("ypane", 3, "ypane_up.png", "ypane_hi.png", "ypane_dn.png"); - - new_image("mbutton_bg", "mbutton_bg.png"); - new_image("timebar_bg", "timebar_bg_flat.png"); - new_image("timebar_brender", "timebar_brender.png"); - new_image("clock_bg", "mclock_flat.png"); - new_image("patchbay_bg", "patchbay_bg.png"); - new_image("statusbar", "statusbar.png"); -// new_image("mscroll_filler", "mscroll_filler.png"); - - new_image_set("zoombar_menu", 3, "zoompopup_up.png", "zoompopup_hi.png", "zoompopup_dn.png"); - new_image_set("zoombar_tumbler", 4, "zoomtumble_up.png", "zoomtumble_hi.png", "zoomtumble_bottom.png", "zoomtumble_top.png"); - new_image_set("plugin_on", 5, "plugin_on.png", "plugin_onhi.png", "plugin_onselect.png", "plugin_ondn.png", "plugin_onselecthi.png"); - new_image_set("plugin_show", 5, "plugin_show.png", "plugin_showhi.png", "plugin_showselect.png", "plugin_showdn.png", "plugin_showselecthi.png"); - -// CWindow - new_image("cpanel_bg", "cpanel_bg.png"); - new_image("cbuttons_left", "cbuttons_left.png"); - new_image("cbuttons_right", "cbuttons_right.png"); - new_image("cmeter_bg", "cmeter_bg.png"); - -// VWindow - new_image("vbuttons_left", "vbuttons_left.png"); - new_image("vclock", "vclock.png"); - - new_image("preferences_bg", "preferences_bg.png"); - - - new_image("new_bg", "new_bg.png"); - new_image("setformat_bg", "setformat_bg.png"); - - - timebar_view_data = new_image("timebar_view.png"); - - setformat_w = get_image("setformat_bg")->get_w(); - setformat_h = get_image("setformat_bg")->get_h(); - setformat_x1 = 15; - setformat_x2 = 100; - - setformat_x3 = 315; - setformat_x4 = 415; - setformat_y1 = 20; - setformat_y2 = 85; - setformat_y3 = 125; - setformat_margin = 30; - setformat_channels_x = 25; - setformat_channels_y = 242; - setformat_channels_w = 250; - setformat_channels_h = 250; - - loadfile_pad = get_image_set("loadmode_new")[0]->get_h() + 10; - browse_pad = 20; - - - new_toggle("playpatch.png", - "patch_up.png", - "patch_hi.png", - "patch_checked.png", - "patch_dn.png", - "patch_checkedhi.png", - "playpatch_data"); - - new_toggle("recordpatch.png", - "patch_up.png", - "patch_hi.png", - "patch_checked.png", - "patch_dn.png", - "patch_checkedhi.png", - "recordpatch_data"); - - new_toggle("gangpatch.png", - "patch_up.png", - "patch_hi.png", - "patch_checked.png", - "patch_dn.png", - "patch_checkedhi.png", - "gangpatch_data"); - - new_toggle("drawpatch.png", - "patch_up.png", - "patch_hi.png", - "patch_checked.png", - "patch_dn.png", - "patch_checkedhi.png", - "drawpatch_data"); - - - new_image_set("mutepatch_data", - 5, - "mutepatch_up.png", - "mutepatch_hi.png", - "mutepatch_checked.png", - "mutepatch_dn.png", - "mutepatch_checkedhi.png"); - - new_image_set("expandpatch_data", - 5, - "expandpatch_up.png", - "expandpatch_hi.png", - "expandpatch_checked.png", - "expandpatch_dn.png", - "expandpatch_checkedhi.png"); - - build_bg_data(); - build_overlays(); - - - - - out_point = new_image_set(5, - "out_up.png", - "out_hi.png", - "out_checked.png", - "out_dn.png", - "out_checkedhi.png"); - in_point = new_image_set(5, - "in_up.png", - "in_hi.png", - "in_checked.png", - "in_dn.png", - "in_checkedhi.png"); - - label_toggle = new_image_set(5, - "labeltoggle_up.png", - "labeltoggle_uphi.png", - "label_checked.png", - "labeltoggle_dn.png", - "label_checkedhi.png"); - - new_image_set("histogram_carrot", - 5, - "histogram_carrot_up.png", - "histogram_carrot_hi.png", - "histogram_carrot_checked.png", - "histogram_carrot_dn.png", - "histogram_carrot_checkedhi.png"); - - - statusbar_cancel_data = new_image_set(3, - "statusbar_cancel_up.png", - "statusbar_cancel_hi.png", - "statusbar_cancel_dn.png"); - - - VFrame *editpanel_up = new_image("editpanel_up.png"); - VFrame *editpanel_hi = new_image("editpanel_hi.png"); - VFrame *editpanel_dn = new_image("editpanel_dn.png"); - VFrame *editpanel_checked = new_image("editpanel_checked.png"); - VFrame *editpanel_checkedhi = new_image("editpanel_checkedhi.png"); - - new_image("panel_divider", "panel_divider.png"); - new_button("bottom_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "bottom_justify"); - new_button("center_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "center_justify"); - new_button("channel.png", editpanel_up, editpanel_hi, editpanel_dn, "channel"); - - new_toggle("histogram.png", - editpanel_up, - editpanel_hi, - editpanel_checked, - editpanel_dn, - editpanel_checkedhi, - "histogram_toggle"); - new_toggle("histogram_rgb.png", - editpanel_up, - editpanel_hi, - editpanel_checked, - editpanel_dn, - editpanel_checkedhi, - "histogram_rgb_toggle"); - new_toggle("waveform.png", - editpanel_up, - editpanel_hi, - editpanel_checked, - editpanel_dn, - editpanel_checkedhi, - "waveform_toggle"); - new_toggle("waveform_rgb.png", - editpanel_up, - editpanel_hi, - editpanel_checked, - editpanel_dn, - editpanel_checkedhi, - "waveform_rgb_toggle"); - new_toggle("scope.png", - editpanel_up, - editpanel_hi, - editpanel_checked, - editpanel_dn, - editpanel_checkedhi, - "scope_toggle"); - - new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture"); - new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram"); - - - new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy"); - new_button("commercial.png", editpanel_up, editpanel_hi, editpanel_dn, "commercial"); - new_button("cut.png", editpanel_up, editpanel_hi, editpanel_dn, "cut"); - new_button("fit.png", editpanel_up, editpanel_hi, editpanel_dn, "fit"); - new_button("fitautos.png", editpanel_up, editpanel_hi, editpanel_dn, "fitautos"); - new_button("inpoint.png", editpanel_up, editpanel_hi, editpanel_dn, "inbutton"); - new_button("label.png", editpanel_up, editpanel_hi, editpanel_dn, "labelbutton"); - new_button("left_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "left_justify"); - new_button("magnify.png", editpanel_up, editpanel_hi, editpanel_dn, "magnify_button"); - new_button("middle_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "middle_justify"); - new_button("nextlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "nextlabel"); - new_button("prevlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "prevlabel"); - new_button("nextedit.png", editpanel_up, editpanel_hi, editpanel_dn, "nextedit"); - new_button("prevedit.png", editpanel_up, editpanel_hi, editpanel_dn, "prevedit"); - new_button("outpoint.png", editpanel_up, editpanel_hi, editpanel_dn, "outbutton"); - over_button = new_button("over.png", editpanel_up, editpanel_hi, editpanel_dn); - overwrite_data = new_button("overwrite.png", editpanel_up, editpanel_hi, editpanel_dn); - new_button("paste.png", editpanel_up, editpanel_hi, editpanel_dn, "paste"); - new_button("redo.png", editpanel_up, editpanel_hi, editpanel_dn, "redo"); - new_button("right_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "right_justify"); - splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn); - new_button("toclip.png", editpanel_up, editpanel_hi, editpanel_dn, "toclip"); - new_button("goto.png", editpanel_up, editpanel_hi, editpanel_dn, "goto"); - new_button("top_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "top_justify"); - new_button("undo.png", editpanel_up, editpanel_hi, editpanel_dn, "undo"); - new_button("wrench.png", editpanel_up, editpanel_hi, editpanel_dn, "wrench"); - - - VFrame *transport_up = new_image("transportup.png"); - VFrame *transport_hi = new_image("transporthi.png"); - VFrame *transport_dn = new_image("transportdn.png"); - - new_button("end.png", transport_up, transport_hi, transport_dn, "end"); - new_button("fastfwd.png", transport_up, transport_hi, transport_dn, "fastfwd"); - new_button("fastrev.png", transport_up, transport_hi, transport_dn, "fastrev"); - new_button("play.png", transport_up, transport_hi, transport_dn, "play"); - new_button("framefwd.png", transport_up, transport_hi, transport_dn, "framefwd"); - new_button("framerev.png", transport_up, transport_hi, transport_dn, "framerev"); - new_button("pause.png", transport_up, transport_hi, transport_dn, "pause"); - new_button("record.png", transport_up, transport_hi, transport_dn, "record"); - new_button("singleframe.png", transport_up, transport_hi, transport_dn, "recframe"); - new_button("reverse.png", transport_up, transport_hi, transport_dn, "reverse"); - new_button("rewind.png", transport_up, transport_hi, transport_dn, "rewind"); - new_button("stop.png", transport_up, transport_hi, transport_dn, "stop"); - new_button("stop.png", transport_up, transport_hi, transport_dn, "stoprec"); - - - -// CWindow icons - new_image("cwindow_inactive", "cwindow_inactive.png"); - new_image("cwindow_active", "cwindow_active.png"); - - - - new_image_set("category_button", - 3, - "preferencesbutton_dn.png", - "preferencesbutton_dnhi.png", - "preferencesbutton_dnlo.png"); - - new_image_set("category_button_checked", - 3, - "preferencesbutton_up.png", - "preferencesbutton_uphi.png", - "preferencesbutton_dnlo.png"); - - - - - - new_image_set("color3way_point", - 3, - "color3way_up.png", - "color3way_hi.png", - "color3way_dn.png"); - - new_toggle("arrow.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "arrow"); - new_toggle("autokeyframe.png", transport_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "autokeyframe"); - new_toggle("ibeam.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "ibeam"); - new_toggle("show_meters.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "meters"); - new_toggle("blank30x30.png", - new_image("locklabels_locked.png"), - new_image("locklabels_lockedhi.png"), - new_image("locklabels_unlocked.png"), - new_image("locklabels_dn.png"), // can't have seperate down for each!!?? - new_image("locklabels_unlockedhi.png"), - "locklabels"); - - VFrame *cpanel_up = new_image("cpanel_up.png"); - VFrame *cpanel_hi = new_image("cpanel_hi.png"); - VFrame *cpanel_dn = new_image("cpanel_dn.png"); - VFrame *cpanel_checked = new_image("cpanel_checked.png"); - VFrame *cpanel_checkedhi = new_image("cpanel_checkedhi.png"); - - - new_toggle("camera.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "camera"); - new_toggle("crop.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "crop"); - new_toggle("eyedrop.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "eyedrop"); - new_toggle("magnify.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "magnify"); - new_toggle("mask.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "mask"); - new_toggle("ruler.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "ruler"); - new_toggle("projector.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "projector"); - new_toggle("protect.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "protect"); - new_toggle("titlesafe.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "titlesafe"); - new_toggle("toolwindow.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "tool"); - - // toggle for tangent mode (compositor/tool window) - new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); - new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - - - flush_images(); - - title_font = MEDIUMFONT_3D; - title_color = 0xbfbfbf; - recordgui_fixed_color = YELLOW; - recordgui_variable_color = RED; - - channel_position_color = MEYELLOW; - resources->meter_title_w = 25; - - // (asset) edit info text color - edit_font_color = YELLOW; -} - -#define VWINDOW_METER_MARGIN 5 - - - - - - - - - - - -void FourK::build_bg_data() -{ -// Audio settings - channel_position_data = new VFrame(get_image_data("channel_position.png")); - -// Track bitmaps - new_image("resource1024", "resource1024.png"); - new_image("resource512", "resource512.png"); - new_image("resource256", "resource256.png"); - new_image("resource128", "resource128.png"); - new_image("resource64", "resource64.png"); - new_image("resource32", "resource32.png"); - new_image("plugin_bg_data", "plugin_bg.png"); - new_image("title_bg_data", "title_bg.png"); - new_image("vtimebar_bg_data", "vwindow_timebar.png"); -} - - - -void FourK::build_overlays() -{ - keyframe_data = new VFrame(get_image_data("keyframe.png")); - camerakeyframe_data = new VFrame(get_image_data("camerakeyframe.png")); - maskkeyframe_data = new VFrame(get_image_data("maskkeyframe.png")); - modekeyframe_data = new VFrame(get_image_data("modekeyframe.png")); - pankeyframe_data = new VFrame(get_image_data("pankeyframe.png")); - projectorkeyframe_data = new VFrame(get_image_data("projectorkeyframe.png")); -} - - - - - - - - - -void FourK::draw_rwindow_bg(RecordGUI *gui) -{ -// int y; -// int margin = 50; -// int margin2 = 80; -// gui->draw_9segment(recordgui_batch_x - margin, -// 0, -// mwindow->session->rwindow_w - recordgui_status_x + margin, -// recordgui_buttons_y, -// rgui_batch); -// gui->draw_3segmenth(recordgui_options_x - margin2, -// recordgui_buttons_y - 5, -// mwindow->session->rwindow_w - recordgui_options_x + margin2, -// rgui_controls); -// y = recordgui_buttons_y - 5 + rgui_controls->get_h(); -// gui->draw_9segment(0, -// y, -// mwindow->session->rwindow_w, -// mwindow->session->rwindow_h - y, -// rgui_list); -} - -void FourK::draw_rmonitor_bg(RecordMonitorGUI *gui) -{ -// int margin = 45; -// int panel_w = 300; -// int x = rmonitor_meter_x - margin; -// int w = mwindow->session->rmonitor_w - x; -// if(w < rmonitor_meters->get_w()) w = rmonitor_meters->get_w(); -// gui->clear_box(0, -// 0, -// mwindow->session->rmonitor_w, -// mwindow->session->rmonitor_h); -// gui->draw_9segment(x, -// 0, -// w, -// mwindow->session->rmonitor_h, -// rmonitor_meters); -} - - - - - - -void FourK::draw_mwindow_bg(MWindowGUI *gui) -{ -// Button bar - gui->draw_3segmenth(mbuttons_x, - mbuttons_y - 1, - mwindow->session->mwindow_w, - get_image("mbutton_bg")); - - int pdw = get_image("panel_divider")->get_w(); - int x = mbuttons_x; - x += 9 * get_image("play")->get_w(); - x += mtransport_margin; // the control buttons - - gui->draw_vframe(get_image("panel_divider"), - x - toggle_margin / 2 - pdw / 2 + 2, - mbuttons_y - 1); - x += 2 * get_image("arrow")->get_w() + toggle_margin; // the mode buttons - - gui->draw_vframe(get_image("panel_divider"), - x - toggle_margin / 2 - pdw / 2 + 2, - mbuttons_y - 1); - x += 2 * get_image("autokeyframe")->get_w() + toggle_margin; // the state toggle buttons - - gui->draw_vframe(get_image("panel_divider"), - x - toggle_margin / 2 - pdw / 2 + 2, - mbuttons_y - 1); - -// Clock - gui->draw_3segmenth(0, - mbuttons_y - 1 + get_image("mbutton_bg")->get_h(), - get_image("patchbay_bg")->get_w(), - get_image("clock_bg")); - -// Patchbay -//printf("FourK::draw_mwindow_bg %d %d %d\n", __LINE__, -//mclock_h, -//mtimebar_h); - gui->draw_3segmentv(patchbay_x, - patchbay_y, - patchbay_h, - get_image("patchbay_bg")); - -// Track canvas - gui->set_color(BLACK); - gui->draw_box(mcanvas_x + get_image("patchbay_bg")->get_w(), - mcanvas_y + mtimebar_h, - mcanvas_w - BC_ScrollBar::get_span(SCROLL_VERT), - mcanvas_h - BC_ScrollBar::get_span(SCROLL_HORIZ) - mtimebar_h); - -// Timebar - gui->draw_3segmenth(mtimebar_x, - mtimebar_y, - mtimebar_w, - get_image("timebar_bg")); - -// Zoombar - gui->set_color(0x373737); - gui->draw_box(mzoom_x, - mzoom_y, - mwindow->session->mwindow_w, - 25); - -// Scrollbar filler -// gui->draw_vframe(get_image("mscroll_filler"), -// mcanvas_x + mcanvas_w - BC_ScrollBar::get_span(SCROLL_VERT), -// mcanvas_y + mcanvas_h - BC_ScrollBar::get_span(SCROLL_HORIZ)); - -// Status - gui->draw_3segmenth(mzoom_x, - mzoom_y, - mzoom_w, - get_image("statusbar")); - - -} - -void FourK::draw_cwindow_bg(CWindowGUI *gui) -{ - gui->draw_3segmentv(0, 0, ccomposite_h, get_image("cpanel_bg")); - - gui->draw_3segmenth(0, ccomposite_h, cstatus_x, get_image("cbuttons_left")); - - if(mwindow->edl->session->cwindow_meter) - { - gui->draw_3segmenth(cstatus_x, - ccomposite_h, - cmeter_x - widget_border - cstatus_x, - get_image("cbuttons_right")); - gui->draw_9segment(cmeter_x - widget_border, - 0, - mwindow->session->cwindow_w - cmeter_x + widget_border, - mwindow->session->cwindow_h, - get_image("cmeter_bg")); - } - else - { - gui->draw_3segmenth(cstatus_x, - ccomposite_h, - cmeter_x - widget_border - cstatus_x + 100, - get_image("cbuttons_right")); - } -} - -void FourK::draw_vwindow_bg(VWindowGUI *gui) -{ - gui->draw_3segmenth(0, - vcanvas_h, - vdivision_x, - get_image("vbuttons_left")); - if(mwindow->edl->session->vwindow_meter) - { - gui->draw_3segmenth(vdivision_x, - vcanvas_h, - vmeter_x - widget_border - vdivision_x, - get_image("cbuttons_right")); - gui->draw_9segment(vmeter_x - widget_border, - 0, - mwindow->session->vwindow_w - vmeter_x + widget_border, - mwindow->session->vwindow_h, - get_image("cmeter_bg")); - } - else - { - gui->draw_3segmenth(vdivision_x, - vcanvas_h, - vmeter_x - widget_border - vdivision_x + 100, - get_image("cbuttons_right")); - } - -// Clock border - gui->draw_3segmenth(vtime_x - 20, - vtime_y - 1, - vtime_w + 40, - get_image("vclock")); -} - - -void FourK::draw_preferences_bg(PreferencesWindow *gui) -{ - gui->draw_vframe(get_image("preferences_bg"), 0, 0); -} - -void FourK::draw_new_bg(NewWindow *gui) -{ - gui->draw_vframe(get_image("new_bg"), 0, 0); -} - -void FourK::draw_setformat_bg(SetFormatWindow *gui) -{ - gui->draw_vframe(get_image("setformat_bg"), 0, 0); -} - - - - - - - diff --git a/cinelerra-5.0/plugins/4k/4k.h b/cinelerra-5.0/plugins/4k/4k.h deleted file mode 100644 index 37de898a..00000000 --- a/cinelerra-5.0/plugins/4k/4k.h +++ /dev/null @@ -1,77 +0,0 @@ - -/* - * CINELERRA - * Copyright (C) 2008 Adam Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#ifndef DEFAULTTHEME_H -#define DEFAULTTHEME_H - -#include "new.inc" -#include "plugintclient.h" -#include "preferencesthread.inc" -#include "statusbar.inc" -#include "theme.h" -#include "timebar.inc" - -class FourK : public Theme -{ -public: - FourK(); - ~FourK(); - - void initialize(); - void draw_mwindow_bg(MWindowGUI *gui); - - void draw_rwindow_bg(RecordGUI *gui); - void draw_rmonitor_bg(RecordMonitorGUI *gui); - void draw_cwindow_bg(CWindowGUI *gui); - void draw_vwindow_bg(VWindowGUI *gui); - void draw_preferences_bg(PreferencesWindow *gui); - - - void draw_new_bg(NewWindow *gui); - void draw_setformat_bg(SetFormatWindow *gui); - -private: - void build_bg_data(); - void build_patches(); - void build_overlays(); - - - - - -}; - - - -class FourKMain : public PluginTClient -{ -public: - FourKMain(PluginServer *server); - ~FourKMain(); - - const char* plugin_title(); - Theme* new_theme(); - - FourK *theme; -}; - - -#endif diff --git a/cinelerra-5.0/plugins/4k/Makefile b/cinelerra-5.0/plugins/4k/Makefile deleted file mode 100644 index 295124d9..00000000 --- a/cinelerra-5.0/plugins/4k/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -include ../../global_config - -PLUGIN = 4k -OBJS = $(OBJDIR)/4k.o -OUTPUT_THEME = $(OUTPUT) - -AVC_DIR := $(shell cd ../../thirdparty/libavc*; pwd) -CFLAGS += -I$(AVC_DIR) - -include ../../plugin_config - -$(OBJDIR)/4k.o: 4k.C - diff --git a/cinelerra-5.0/plugins/4k/data/0.png b/cinelerra-5.0/plugins/4k/data/0.png deleted file mode 100644 index 56171ca3..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/0.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/1.png b/cinelerra-5.0/plugins/4k/data/1.png deleted file mode 100644 index 6eac7177..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/1.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/2.png b/cinelerra-5.0/plugins/4k/data/2.png deleted file mode 100644 index 915fe064..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/2.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/3.png b/cinelerra-5.0/plugins/4k/data/3.png deleted file mode 100644 index fccbfb70..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/3.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/4.png b/cinelerra-5.0/plugins/4k/data/4.png deleted file mode 100644 index 74f9f117..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/4.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/5.png b/cinelerra-5.0/plugins/4k/data/5.png deleted file mode 100644 index ef37107d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/5.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/6.png b/cinelerra-5.0/plugins/4k/data/6.png deleted file mode 100644 index 8e5dbed3..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/6.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/7.png b/cinelerra-5.0/plugins/4k/data/7.png deleted file mode 100644 index e06668f5..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/7.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/8.png b/cinelerra-5.0/plugins/4k/data/8.png deleted file mode 100644 index 4c9fef86..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/8.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/9.png b/cinelerra-5.0/plugins/4k/data/9.png deleted file mode 100644 index e09afffe..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/9.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/a.png b/cinelerra-5.0/plugins/4k/data/a.png deleted file mode 100644 index 12bf179e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/a.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/about.png b/cinelerra-5.0/plugins/4k/data/about.png deleted file mode 100644 index 4fa4ec1f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/about.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/about_bg.png b/cinelerra-5.0/plugins/4k/data/about_bg.png deleted file mode 100644 index bf0f1ad2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/about_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/aeffect_icon.png b/cinelerra-5.0/plugins/4k/data/aeffect_icon.png deleted file mode 100644 index 5a69c3a9..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/aeffect_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/antenna.png b/cinelerra-5.0/plugins/4k/data/antenna.png deleted file mode 100644 index 06072e5a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/antenna.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/arrow.png b/cinelerra-5.0/plugins/4k/data/arrow.png deleted file mode 100644 index 1bb480bc..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/arrow.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/atransition_icon.png b/cinelerra-5.0/plugins/4k/data/atransition_icon.png deleted file mode 100644 index d73ccb1f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/atransition_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/autokeyframe.png b/cinelerra-5.0/plugins/4k/data/autokeyframe.png deleted file mode 100644 index 47e6f76d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/autokeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/b.png b/cinelerra-5.0/plugins/4k/data/b.png deleted file mode 100644 index 9f94f172..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/b.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_dn.png b/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_dn.png deleted file mode 100644 index 985c7cb0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_dnhi.png b/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_dnhi.png deleted file mode 100644 index 441138e2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_dnhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_dnlo.png b/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_dnlo.png deleted file mode 100644 index 2b6a3ce8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_dnlo.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_up.png b/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_up.png deleted file mode 100644 index 3223ec6f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_uphi.png b/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_uphi.png deleted file mode 100644 index a77c8527..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bak/preferencesbutton_uphi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_dn.png b/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_dn.png deleted file mode 100644 index 511905e1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_dnhi.png b/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_dnhi.png deleted file mode 100644 index 8757b3f1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_dnhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_dnlo.png b/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_dnlo.png deleted file mode 100644 index cf3c9dfc..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_dnlo.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_up.png b/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_up.png deleted file mode 100644 index 45daa5c0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_uphi.png b/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_uphi.png deleted file mode 100644 index 3e35fb58..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bak2/preferencesbutton_uphi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bar.png b/cinelerra-5.0/plugins/4k/data/bar.png deleted file mode 100644 index a1e237cf..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bar.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/blank30x30.png b/cinelerra-5.0/plugins/4k/data/blank30x30.png deleted file mode 100644 index 39c5e55a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/blank30x30.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/bottom_justify.png b/cinelerra-5.0/plugins/4k/data/bottom_justify.png deleted file mode 100644 index 110d09f6..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/bottom_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/buttonbar.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/buttonbar.xcf.bz2 deleted file mode 100644 index baf5c8cd..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/buttonbar.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/c.png b/cinelerra-5.0/plugins/4k/data/c.png deleted file mode 100644 index 644986ad..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/c.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/camera.png b/cinelerra-5.0/plugins/4k/data/camera.png deleted file mode 100644 index eb9cc288..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/camera.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/camerakeyframe.png b/cinelerra-5.0/plugins/4k/data/camerakeyframe.png deleted file mode 100644 index 0fefa82a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/camerakeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cancel.png b/cinelerra-5.0/plugins/4k/data/cancel.png deleted file mode 100644 index 87299a7d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cancel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cbuttons_left.png b/cinelerra-5.0/plugins/4k/data/cbuttons_left.png deleted file mode 100644 index 9890741c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cbuttons_left.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cbuttons_right.png b/cinelerra-5.0/plugins/4k/data/cbuttons_right.png deleted file mode 100644 index ab695b6b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cbuttons_right.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/center_justify.png b/cinelerra-5.0/plugins/4k/data/center_justify.png deleted file mode 100644 index 022c12bf..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/center_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/channel.png b/cinelerra-5.0/plugins/4k/data/channel.png deleted file mode 100644 index 3f88a8ff..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/channel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/channel_position.png b/cinelerra-5.0/plugins/4k/data/channel_position.png deleted file mode 100644 index c6c49aa0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/channel_position.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/check.png b/cinelerra-5.0/plugins/4k/data/check.png deleted file mode 100644 index 1354b863..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/check.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/checkbox_checked.png b/cinelerra-5.0/plugins/4k/data/checkbox_checked.png deleted file mode 100644 index c115c32d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/checkbox_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/checkbox_checkedhi.png b/cinelerra-5.0/plugins/4k/data/checkbox_checkedhi.png deleted file mode 100644 index 046ff11f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/checkbox_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/checkbox_dn.png b/cinelerra-5.0/plugins/4k/data/checkbox_dn.png deleted file mode 100644 index fb34441c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/checkbox_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/checkbox_hi.png b/cinelerra-5.0/plugins/4k/data/checkbox_hi.png deleted file mode 100644 index 3a8c6ad5..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/checkbox_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/checkbox_up.png b/cinelerra-5.0/plugins/4k/data/checkbox_up.png deleted file mode 100644 index 02f3d54f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/checkbox_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/clearinpoint.png b/cinelerra-5.0/plugins/4k/data/clearinpoint.png deleted file mode 100644 index 36356b7d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/clearinpoint.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/clearoutpoint.png b/cinelerra-5.0/plugins/4k/data/clearoutpoint.png deleted file mode 100644 index 6b05707f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/clearoutpoint.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/clip_icon.png b/cinelerra-5.0/plugins/4k/data/clip_icon.png deleted file mode 100644 index 9b1d2787..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/clip_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/closetip.png b/cinelerra-5.0/plugins/4k/data/closetip.png deleted file mode 100644 index 75125cb9..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/closetip.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cmeter_bg.png b/cinelerra-5.0/plugins/4k/data/cmeter_bg.png deleted file mode 100644 index 35a80c4d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cmeter_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/colon.png b/cinelerra-5.0/plugins/4k/data/colon.png deleted file mode 100644 index 0e1c835c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/colon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/color3way_dn.png b/cinelerra-5.0/plugins/4k/data/color3way_dn.png deleted file mode 100644 index fad9ed65..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/color3way_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/color3way_hi.png b/cinelerra-5.0/plugins/4k/data/color3way_hi.png deleted file mode 100644 index a9377da6..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/color3way_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/color3way_point.png b/cinelerra-5.0/plugins/4k/data/color3way_point.png deleted file mode 100644 index 1934b8e0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/color3way_point.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/color3way_up.png b/cinelerra-5.0/plugins/4k/data/color3way_up.png deleted file mode 100644 index e2fef63c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/color3way_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/column_dn.png b/cinelerra-5.0/plugins/4k/data/column_dn.png deleted file mode 100644 index 6201333f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/column_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/column_hi.png b/cinelerra-5.0/plugins/4k/data/column_hi.png deleted file mode 100644 index fe6c180a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/column_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/column_up.png b/cinelerra-5.0/plugins/4k/data/column_up.png deleted file mode 100644 index 0709e162..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/column_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/commercial.png b/cinelerra-5.0/plugins/4k/data/commercial.png deleted file mode 100644 index a1eae6e0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/commercial.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/configure.png b/cinelerra-5.0/plugins/4k/data/configure.png deleted file mode 100644 index 4b20dbcd..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/configure.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/copy.png b/cinelerra-5.0/plugins/4k/data/copy.png deleted file mode 100644 index b82d4fb4..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/copy.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cpanel_bg.png b/cinelerra-5.0/plugins/4k/data/cpanel_bg.png deleted file mode 100644 index bbb0ca92..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cpanel_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cpanel_checked.png b/cinelerra-5.0/plugins/4k/data/cpanel_checked.png deleted file mode 100644 index 6f36c7e3..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cpanel_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cpanel_checkedhi.png b/cinelerra-5.0/plugins/4k/data/cpanel_checkedhi.png deleted file mode 100644 index 1a660646..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cpanel_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cpanel_dn.png b/cinelerra-5.0/plugins/4k/data/cpanel_dn.png deleted file mode 100644 index 1418124a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cpanel_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cpanel_hi.png b/cinelerra-5.0/plugins/4k/data/cpanel_hi.png deleted file mode 100644 index aca8c70a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cpanel_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cpanel_up.png b/cinelerra-5.0/plugins/4k/data/cpanel_up.png deleted file mode 100644 index 59f34c9f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cpanel_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/crop.png b/cinelerra-5.0/plugins/4k/data/crop.png deleted file mode 100644 index 2eea5ccd..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/crop.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cut.png b/cinelerra-5.0/plugins/4k/data/cut.png deleted file mode 100644 index 174d2ef5..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cut.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cwindow_active.png b/cinelerra-5.0/plugins/4k/data/cwindow_active.png deleted file mode 100644 index 259fb44b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cwindow_active.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/cwindow_inactive.png b/cinelerra-5.0/plugins/4k/data/cwindow_inactive.png deleted file mode 100644 index b0687d95..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/cwindow_inactive.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/d.png b/cinelerra-5.0/plugins/4k/data/d.png deleted file mode 100644 index 3bfdc6bd..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/d.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/dash.png b/cinelerra-5.0/plugins/4k/data/dash.png deleted file mode 100644 index 01321e98..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/dash.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/delete.png b/cinelerra-5.0/plugins/4k/data/delete.png deleted file mode 100644 index 200b9ea4..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/delete.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/downmix51_2.png b/cinelerra-5.0/plugins/4k/data/downmix51_2.png deleted file mode 100644 index 3cbcaf72..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/downmix51_2.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/drawpatch.png b/cinelerra-5.0/plugins/4k/data/drawpatch.png deleted file mode 100644 index 5cff6410..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/drawpatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/duplex.png b/cinelerra-5.0/plugins/4k/data/duplex.png deleted file mode 100644 index 4abd4e7c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/duplex.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/e.png b/cinelerra-5.0/plugins/4k/data/e.png deleted file mode 100644 index 20892c45..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/e.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/editpanel.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/editpanel.xcf.bz2 deleted file mode 100644 index 95ef5bf7..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/editpanel.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/editpanel_checked.png b/cinelerra-5.0/plugins/4k/data/editpanel_checked.png deleted file mode 100644 index 4176c68c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/editpanel_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/editpanel_checkedhi.png b/cinelerra-5.0/plugins/4k/data/editpanel_checkedhi.png deleted file mode 100644 index 9d27df7f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/editpanel_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/editpanel_dn.png b/cinelerra-5.0/plugins/4k/data/editpanel_dn.png deleted file mode 100644 index 4322c944..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/editpanel_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/editpanel_hi.png b/cinelerra-5.0/plugins/4k/data/editpanel_hi.png deleted file mode 100644 index f6355f6f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/editpanel_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/editpanel_up.png b/cinelerra-5.0/plugins/4k/data/editpanel_up.png deleted file mode 100644 index 8332f5e1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/editpanel_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/end.png b/cinelerra-5.0/plugins/4k/data/end.png deleted file mode 100644 index b4f801ad..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/end.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/expandpatch.png b/cinelerra-5.0/plugins/4k/data/expandpatch.png deleted file mode 100644 index b5067efe..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/expandpatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/expandpatch.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/expandpatch.xcf.bz2 deleted file mode 100644 index 836453e5..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/expandpatch.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/expandpatch_checked.png b/cinelerra-5.0/plugins/4k/data/expandpatch_checked.png deleted file mode 100644 index b83cb92d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/expandpatch_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/expandpatch_checkedhi.png b/cinelerra-5.0/plugins/4k/data/expandpatch_checkedhi.png deleted file mode 100644 index ed3d3d74..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/expandpatch_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/expandpatch_dn.png b/cinelerra-5.0/plugins/4k/data/expandpatch_dn.png deleted file mode 100644 index 19783442..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/expandpatch_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/expandpatch_hi.png b/cinelerra-5.0/plugins/4k/data/expandpatch_hi.png deleted file mode 100644 index 37da94c1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/expandpatch_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/expandpatch_up.png b/cinelerra-5.0/plugins/4k/data/expandpatch_up.png deleted file mode 100644 index 0d9ec4ff..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/expandpatch_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/eyedrop.png b/cinelerra-5.0/plugins/4k/data/eyedrop.png deleted file mode 100644 index 48a51160..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/eyedrop.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/f.png b/cinelerra-5.0/plugins/4k/data/f.png deleted file mode 100644 index 0f5047bb..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/f.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/fastfwd.png b/cinelerra-5.0/plugins/4k/data/fastfwd.png deleted file mode 100644 index 572d3c29..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/fastfwd.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/fastrev.png b/cinelerra-5.0/plugins/4k/data/fastrev.png deleted file mode 100644 index 5a1553af..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/fastrev.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/filebox.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/filebox.xcf.bz2 deleted file mode 100644 index 87aaa3af..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/filebox.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/filebox_bigbutton_dn.png b/cinelerra-5.0/plugins/4k/data/filebox_bigbutton_dn.png deleted file mode 100644 index 33b57d4d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/filebox_bigbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/filebox_bigbutton_hi.png b/cinelerra-5.0/plugins/4k/data/filebox_bigbutton_hi.png deleted file mode 100644 index 9a4c83bd..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/filebox_bigbutton_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/filebox_bigbutton_up.png b/cinelerra-5.0/plugins/4k/data/filebox_bigbutton_up.png deleted file mode 100644 index 80e8504e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/filebox_bigbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/fileboxbutton_dn.png b/cinelerra-5.0/plugins/4k/data/fileboxbutton_dn.png deleted file mode 100644 index 101f4c27..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/fileboxbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/fileboxbutton_hi.png b/cinelerra-5.0/plugins/4k/data/fileboxbutton_hi.png deleted file mode 100644 index 3b56bfc6..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/fileboxbutton_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/fileboxbutton_up.png b/cinelerra-5.0/plugins/4k/data/fileboxbutton_up.png deleted file mode 100644 index 6037ac78..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/fileboxbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/fit.png b/cinelerra-5.0/plugins/4k/data/fit.png deleted file mode 100644 index 5523ef36..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/fit.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/fitautos.png b/cinelerra-5.0/plugins/4k/data/fitautos.png deleted file mode 100644 index 4de2f6ea..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/fitautos.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/folder.png b/cinelerra-5.0/plugins/4k/data/folder.png deleted file mode 100644 index 8acd4dec..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/folder.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/framefwd.png b/cinelerra-5.0/plugins/4k/data/framefwd.png deleted file mode 100644 index 08097d60..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/framefwd.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/framerev.png b/cinelerra-5.0/plugins/4k/data/framerev.png deleted file mode 100644 index 84ab6b3f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/framerev.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/gangpatch.png b/cinelerra-5.0/plugins/4k/data/gangpatch.png deleted file mode 100644 index 6b1e606b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/gangpatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/generic_dn.png b/cinelerra-5.0/plugins/4k/data/generic_dn.png deleted file mode 100644 index 2df647d3..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/generic_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/generic_hi.png b/cinelerra-5.0/plugins/4k/data/generic_hi.png deleted file mode 100644 index ee3928ba..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/generic_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/generic_up.png b/cinelerra-5.0/plugins/4k/data/generic_up.png deleted file mode 100644 index 46efb79f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/generic_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/generickeyframe.png b/cinelerra-5.0/plugins/4k/data/generickeyframe.png deleted file mode 100644 index e3a95cc4..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/generickeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/goto.png b/cinelerra-5.0/plugins/4k/data/goto.png deleted file mode 100644 index 513f964f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/goto.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/heroine_icon.png b/cinelerra-5.0/plugins/4k/data/heroine_icon.png deleted file mode 100644 index 8694da90..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/heroine_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/histogram.png b/cinelerra-5.0/plugins/4k/data/histogram.png deleted file mode 100644 index 0f7da6eb..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/histogram.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/histogram_carrot_checked.png b/cinelerra-5.0/plugins/4k/data/histogram_carrot_checked.png deleted file mode 100644 index 8e5840a9..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/histogram_carrot_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/histogram_carrot_checkedhi.png b/cinelerra-5.0/plugins/4k/data/histogram_carrot_checkedhi.png deleted file mode 100644 index 1fcfff69..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/histogram_carrot_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/histogram_carrot_dn.png b/cinelerra-5.0/plugins/4k/data/histogram_carrot_dn.png deleted file mode 100644 index 0fb61fb1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/histogram_carrot_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/histogram_carrot_hi.png b/cinelerra-5.0/plugins/4k/data/histogram_carrot_hi.png deleted file mode 100644 index 81d78997..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/histogram_carrot_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/histogram_carrot_up.png b/cinelerra-5.0/plugins/4k/data/histogram_carrot_up.png deleted file mode 100644 index cfd43b2f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/histogram_carrot_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/histogram_rgb.png b/cinelerra-5.0/plugins/4k/data/histogram_rgb.png deleted file mode 100644 index a68050a1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/histogram_rgb.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hscroll_handle_bg.png b/cinelerra-5.0/plugins/4k/data/hscroll_handle_bg.png deleted file mode 100644 index 0e722adb..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hscroll_handle_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hscroll_handle_dn.png b/cinelerra-5.0/plugins/4k/data/hscroll_handle_dn.png deleted file mode 100644 index 05b0533d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hscroll_handle_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hscroll_handle_hi.png b/cinelerra-5.0/plugins/4k/data/hscroll_handle_hi.png deleted file mode 100644 index 6e4dd55d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hscroll_handle_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hscroll_handle_up.png b/cinelerra-5.0/plugins/4k/data/hscroll_handle_up.png deleted file mode 100644 index a19784ce..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hscroll_handle_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hscroll_left_dn.png b/cinelerra-5.0/plugins/4k/data/hscroll_left_dn.png deleted file mode 100644 index 830d3a78..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hscroll_left_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hscroll_left_hi.png b/cinelerra-5.0/plugins/4k/data/hscroll_left_hi.png deleted file mode 100644 index 66dbf22b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hscroll_left_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hscroll_left_up.png b/cinelerra-5.0/plugins/4k/data/hscroll_left_up.png deleted file mode 100644 index 62eb0059..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hscroll_left_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hscroll_right_dn.png b/cinelerra-5.0/plugins/4k/data/hscroll_right_dn.png deleted file mode 100644 index 078c6534..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hscroll_right_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hscroll_right_hi.png b/cinelerra-5.0/plugins/4k/data/hscroll_right_hi.png deleted file mode 100644 index 7e507298..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hscroll_right_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hscroll_right_up.png b/cinelerra-5.0/plugins/4k/data/hscroll_right_up.png deleted file mode 100644 index 2b57c724..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hscroll_right_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hslider_bg_dn.png b/cinelerra-5.0/plugins/4k/data/hslider_bg_dn.png deleted file mode 100644 index 27e78d65..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hslider_bg_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hslider_bg_hi.png b/cinelerra-5.0/plugins/4k/data/hslider_bg_hi.png deleted file mode 100644 index 872e5b20..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hslider_bg_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hslider_bg_up.png b/cinelerra-5.0/plugins/4k/data/hslider_bg_up.png deleted file mode 100644 index 467c174a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hslider_bg_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hslider_fg_dn.png b/cinelerra-5.0/plugins/4k/data/hslider_fg_dn.png deleted file mode 100644 index d2da18e9..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hslider_fg_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hslider_fg_hi.png b/cinelerra-5.0/plugins/4k/data/hslider_fg_hi.png deleted file mode 100644 index 553fd9f2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hslider_fg_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/hslider_fg_up.png b/cinelerra-5.0/plugins/4k/data/hslider_fg_up.png deleted file mode 100644 index 58aae510..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/hslider_fg_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ibeam.png b/cinelerra-5.0/plugins/4k/data/ibeam.png deleted file mode 100644 index ab84d1ca..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ibeam.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/icons.png b/cinelerra-5.0/plugins/4k/data/icons.png deleted file mode 100644 index bfde0416..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/icons.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/in_checked.png b/cinelerra-5.0/plugins/4k/data/in_checked.png deleted file mode 100644 index 5b22ecbf..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/in_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/in_checkedhi.png b/cinelerra-5.0/plugins/4k/data/in_checkedhi.png deleted file mode 100644 index f1323992..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/in_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/in_dn.png b/cinelerra-5.0/plugins/4k/data/in_dn.png deleted file mode 100644 index d5517b46..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/in_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/in_hi.png b/cinelerra-5.0/plugins/4k/data/in_hi.png deleted file mode 100644 index db52c7b6..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/in_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/in_up.png b/cinelerra-5.0/plugins/4k/data/in_up.png deleted file mode 100644 index e89aecba..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/in_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/inpoint.png b/cinelerra-5.0/plugins/4k/data/inpoint.png deleted file mode 100644 index 727c8fd1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/inpoint.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/keyframe.png b/cinelerra-5.0/plugins/4k/data/keyframe.png deleted file mode 100644 index aca4d93b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/keyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/label.png b/cinelerra-5.0/plugins/4k/data/label.png deleted file mode 100644 index f9744afb..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/label.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/label_checked.png b/cinelerra-5.0/plugins/4k/data/label_checked.png deleted file mode 100644 index aaf69d3e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/label_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/label_checkedhi.png b/cinelerra-5.0/plugins/4k/data/label_checkedhi.png deleted file mode 100644 index 93322250..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/label_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/labeltoggle_dn.png b/cinelerra-5.0/plugins/4k/data/labeltoggle_dn.png deleted file mode 100644 index f8ce2b51..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/labeltoggle_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/labeltoggle_up.png b/cinelerra-5.0/plugins/4k/data/labeltoggle_up.png deleted file mode 100644 index 0d09e344..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/labeltoggle_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/labeltoggle_uphi.png b/cinelerra-5.0/plugins/4k/data/labeltoggle_uphi.png deleted file mode 100644 index 40164d2d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/labeltoggle_uphi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/left_justify.png b/cinelerra-5.0/plugins/4k/data/left_justify.png deleted file mode 100644 index ca8c76a9..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/left_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/listbox_button.png b/cinelerra-5.0/plugins/4k/data/listbox_button.png deleted file mode 100644 index 691d32a7..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/listbox_button.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/listbox_dn.png b/cinelerra-5.0/plugins/4k/data/listbox_dn.png deleted file mode 100644 index a897a681..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/listbox_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/listbox_up.png b/cinelerra-5.0/plugins/4k/data/listbox_up.png deleted file mode 100644 index 13adce2a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/listbox_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_cat.png b/cinelerra-5.0/plugins/4k/data/loadmode_cat.png deleted file mode 100644 index a103c436..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_cat.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_checked.png b/cinelerra-5.0/plugins/4k/data/loadmode_checked.png deleted file mode 100644 index b3701565..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_checkedhi.png b/cinelerra-5.0/plugins/4k/data/loadmode_checkedhi.png deleted file mode 100644 index 2a5c484e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_dn.png b/cinelerra-5.0/plugins/4k/data/loadmode_dn.png deleted file mode 100644 index 0f5ceeef..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_hi.png b/cinelerra-5.0/plugins/4k/data/loadmode_hi.png deleted file mode 100644 index dded1505..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_nested.png b/cinelerra-5.0/plugins/4k/data/loadmode_nested.png deleted file mode 100644 index a1bb86b5..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_nested.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_new.png b/cinelerra-5.0/plugins/4k/data/loadmode_new.png deleted file mode 100644 index 11d5a0df..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_new.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_newcat.png b/cinelerra-5.0/plugins/4k/data/loadmode_newcat.png deleted file mode 100644 index ac851116..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_newcat.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_newtracks.png b/cinelerra-5.0/plugins/4k/data/loadmode_newtracks.png deleted file mode 100644 index 017ef88b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_newtracks.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_none.png b/cinelerra-5.0/plugins/4k/data/loadmode_none.png deleted file mode 100644 index 6efb68f3..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_none.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_paste.png b/cinelerra-5.0/plugins/4k/data/loadmode_paste.png deleted file mode 100644 index f1bcef7c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_paste.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_resource.png b/cinelerra-5.0/plugins/4k/data/loadmode_resource.png deleted file mode 100644 index c1efcf44..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_resource.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/loadmode_up.png b/cinelerra-5.0/plugins/4k/data/loadmode_up.png deleted file mode 100644 index 1bd32e7f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/loadmode_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/locklabels_dn.png b/cinelerra-5.0/plugins/4k/data/locklabels_dn.png deleted file mode 100644 index 0a1563b4..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/locklabels_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/locklabels_locked.png b/cinelerra-5.0/plugins/4k/data/locklabels_locked.png deleted file mode 100644 index f4963ed2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/locklabels_locked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/locklabels_lockedhi.png b/cinelerra-5.0/plugins/4k/data/locklabels_lockedhi.png deleted file mode 100644 index 236325e6..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/locklabels_lockedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/locklabels_unlocked.png b/cinelerra-5.0/plugins/4k/data/locklabels_unlocked.png deleted file mode 100644 index 5b16bec7..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/locklabels_unlocked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/locklabels_unlockedhi.png b/cinelerra-5.0/plugins/4k/data/locklabels_unlockedhi.png deleted file mode 100644 index f16e0c1d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/locklabels_unlockedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/magnify.png b/cinelerra-5.0/plugins/4k/data/magnify.png deleted file mode 100644 index ad712ae4..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/magnify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mainwindow.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/mainwindow.xcf.bz2 deleted file mode 100644 index 121232f2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mainwindow.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mask.png b/cinelerra-5.0/plugins/4k/data/mask.png deleted file mode 100644 index 4d11bcf9..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mask.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/maskkeyframe.png b/cinelerra-5.0/plugins/4k/data/maskkeyframe.png deleted file mode 100644 index 28d6f707..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/maskkeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mbutton_bg.png b/cinelerra-5.0/plugins/4k/data/mbutton_bg.png deleted file mode 100644 index ca111827..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mbutton_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mclock_flat.png b/cinelerra-5.0/plugins/4k/data/mclock_flat.png deleted file mode 100644 index 471cf972..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mclock_flat.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menu.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/menu.xcf.bz2 deleted file mode 100644 index 8c49073d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menu.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menu_popup_bg.png b/cinelerra-5.0/plugins/4k/data/menu_popup_bg.png deleted file mode 100644 index 4dbb903b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menu_popup_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menubar_bg.png b/cinelerra-5.0/plugins/4k/data/menubar_bg.png deleted file mode 100644 index c9dbd359..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menubar_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menubar_dn.png b/cinelerra-5.0/plugins/4k/data/menubar_dn.png deleted file mode 100644 index f51f146d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menubar_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menubar_hi.png b/cinelerra-5.0/plugins/4k/data/menubar_hi.png deleted file mode 100644 index 270b883d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menubar_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menubar_up.png b/cinelerra-5.0/plugins/4k/data/menubar_up.png deleted file mode 100644 index b6ab3be2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menubar_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menuitem_dn.png b/cinelerra-5.0/plugins/4k/data/menuitem_dn.png deleted file mode 100644 index c101e239..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menuitem_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menuitem_hi.png b/cinelerra-5.0/plugins/4k/data/menuitem_hi.png deleted file mode 100644 index f029ffd9..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menuitem_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menuitem_up.png b/cinelerra-5.0/plugins/4k/data/menuitem_up.png deleted file mode 100644 index 3826da23..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menuitem_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menupopup_dn.png b/cinelerra-5.0/plugins/4k/data/menupopup_dn.png deleted file mode 100644 index 342a6c0c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menupopup_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menupopup_hi.png b/cinelerra-5.0/plugins/4k/data/menupopup_hi.png deleted file mode 100644 index 74940ead..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menupopup_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menupopup_up.png b/cinelerra-5.0/plugins/4k/data/menupopup_up.png deleted file mode 100644 index d535ce8b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menupopup_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menutitle_dn.png b/cinelerra-5.0/plugins/4k/data/menutitle_dn.png deleted file mode 100644 index f6643fa8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menutitle_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menutitle_hi.png b/cinelerra-5.0/plugins/4k/data/menutitle_hi.png deleted file mode 100644 index 6c64d7f2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menutitle_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/menutitle_up.png b/cinelerra-5.0/plugins/4k/data/menutitle_up.png deleted file mode 100644 index 3d0ea8c8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/menutitle_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/middle_justify.png b/cinelerra-5.0/plugins/4k/data/middle_justify.png deleted file mode 100644 index b7081c82..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/middle_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_add.png b/cinelerra-5.0/plugins/4k/data/mode_add.png deleted file mode 100644 index 3e130cc8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_add.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_average.png b/cinelerra-5.0/plugins/4k/data/mode_average.png deleted file mode 100644 index 3edf8524..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_average.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_darken.png b/cinelerra-5.0/plugins/4k/data/mode_darken.png deleted file mode 100644 index 2c3f6c8a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_darken.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_divide.png b/cinelerra-5.0/plugins/4k/data/mode_divide.png deleted file mode 100644 index 4af0eff6..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_divide.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_dn.png b/cinelerra-5.0/plugins/4k/data/mode_dn.png deleted file mode 100644 index 78b5b0d0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_dst.png b/cinelerra-5.0/plugins/4k/data/mode_dst.png deleted file mode 100644 index 933eb89c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_dst.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_dstatop.png b/cinelerra-5.0/plugins/4k/data/mode_dstatop.png deleted file mode 100644 index 8ac13873..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_dstatop.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_dstin.png b/cinelerra-5.0/plugins/4k/data/mode_dstin.png deleted file mode 100644 index 7fab8e1b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_dstin.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_dstout.png b/cinelerra-5.0/plugins/4k/data/mode_dstout.png deleted file mode 100644 index 09cfb006..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_dstout.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_dstover.png b/cinelerra-5.0/plugins/4k/data/mode_dstover.png deleted file mode 100644 index d9328280..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_dstover.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_hi.png b/cinelerra-5.0/plugins/4k/data/mode_hi.png deleted file mode 100644 index 4c927459..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_lighten.png b/cinelerra-5.0/plugins/4k/data/mode_lighten.png deleted file mode 100644 index fa9a5877..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_lighten.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_max.png b/cinelerra-5.0/plugins/4k/data/mode_max.png deleted file mode 100644 index 8674f1b2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_max.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_min.png b/cinelerra-5.0/plugins/4k/data/mode_min.png deleted file mode 100644 index b21e080e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_min.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_multiply.png b/cinelerra-5.0/plugins/4k/data/mode_multiply.png deleted file mode 100644 index 77b8fce8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_multiply.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_normal.png b/cinelerra-5.0/plugins/4k/data/mode_normal.png deleted file mode 100644 index df5af6fd..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_normal.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_or.png b/cinelerra-5.0/plugins/4k/data/mode_or.png deleted file mode 100644 index 9a531226..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_or.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_replace.png b/cinelerra-5.0/plugins/4k/data/mode_replace.png deleted file mode 100644 index 51aa6e43..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_replace.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_src.png b/cinelerra-5.0/plugins/4k/data/mode_src.png deleted file mode 100644 index 1b0038d8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_src.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_srcatop.png b/cinelerra-5.0/plugins/4k/data/mode_srcatop.png deleted file mode 100644 index 36426557..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_srcatop.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_srcin.png b/cinelerra-5.0/plugins/4k/data/mode_srcin.png deleted file mode 100644 index 31bcc425..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_srcin.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_srcout.png b/cinelerra-5.0/plugins/4k/data/mode_srcout.png deleted file mode 100644 index 6119c40a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_srcout.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_srcover.png b/cinelerra-5.0/plugins/4k/data/mode_srcover.png deleted file mode 100644 index a8ff0f26..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_srcover.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_subtract.png b/cinelerra-5.0/plugins/4k/data/mode_subtract.png deleted file mode 100644 index 35b7bcee..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_subtract.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_up.png b/cinelerra-5.0/plugins/4k/data/mode_up.png deleted file mode 100644 index a1c22a40..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mode_xor.png b/cinelerra-5.0/plugins/4k/data/mode_xor.png deleted file mode 100644 index c7f6765a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mode_xor.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/modekeyframe.png b/cinelerra-5.0/plugins/4k/data/modekeyframe.png deleted file mode 100644 index 0b14af85..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/modekeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mscroll_filler.png b/cinelerra-5.0/plugins/4k/data/mscroll_filler.png deleted file mode 100644 index 320695ba..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mscroll_filler.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mtimebar.png b/cinelerra-5.0/plugins/4k/data/mtimebar.png deleted file mode 100644 index e59afe74..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mtimebar.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mutepatch.png b/cinelerra-5.0/plugins/4k/data/mutepatch.png deleted file mode 100644 index adb2a934..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mutepatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mutepatch.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/mutepatch.xcf.bz2 deleted file mode 100644 index 12f3d9df..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mutepatch.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mutepatch_checked.png b/cinelerra-5.0/plugins/4k/data/mutepatch_checked.png deleted file mode 100644 index 482d22eb..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mutepatch_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mutepatch_checkedhi.png b/cinelerra-5.0/plugins/4k/data/mutepatch_checkedhi.png deleted file mode 100644 index f856fb2e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mutepatch_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mutepatch_dn.png b/cinelerra-5.0/plugins/4k/data/mutepatch_dn.png deleted file mode 100644 index 1de6242b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mutepatch_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mutepatch_hi.png b/cinelerra-5.0/plugins/4k/data/mutepatch_hi.png deleted file mode 100644 index 1dadc9b2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mutepatch_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/mutepatch_up.png b/cinelerra-5.0/plugins/4k/data/mutepatch_up.png deleted file mode 100644 index 80789f94..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/mutepatch_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/new.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/new.xcf.bz2 deleted file mode 100644 index 7b5c23db..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/new.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/new_bg.png b/cinelerra-5.0/plugins/4k/data/new_bg.png deleted file mode 100644 index f9f6730c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/new_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/new_bigbutton_dn.png b/cinelerra-5.0/plugins/4k/data/new_bigbutton_dn.png deleted file mode 100644 index ce02a72b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/new_bigbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/new_bigbutton_hi.png b/cinelerra-5.0/plugins/4k/data/new_bigbutton_hi.png deleted file mode 100644 index a0fa6805..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/new_bigbutton_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/new_bigbutton_up.png b/cinelerra-5.0/plugins/4k/data/new_bigbutton_up.png deleted file mode 100644 index 886ac237..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/new_bigbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/nextedit.png b/cinelerra-5.0/plugins/4k/data/nextedit.png deleted file mode 100644 index 7e85145e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/nextedit.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/nextlabel.png b/cinelerra-5.0/plugins/4k/data/nextlabel.png deleted file mode 100644 index 980f9669..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/nextlabel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/nexttip.png b/cinelerra-5.0/plugins/4k/data/nexttip.png deleted file mode 100644 index ef04f404..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/nexttip.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ok.png b/cinelerra-5.0/plugins/4k/data/ok.png deleted file mode 100644 index 15dfcc1d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ok.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/openfolder.png b/cinelerra-5.0/plugins/4k/data/openfolder.png deleted file mode 100644 index 95d9e591..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/openfolder.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/out_checked.png b/cinelerra-5.0/plugins/4k/data/out_checked.png deleted file mode 100644 index 730196c5..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/out_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/out_checkedhi.png b/cinelerra-5.0/plugins/4k/data/out_checkedhi.png deleted file mode 100644 index 186a292e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/out_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/out_dn.png b/cinelerra-5.0/plugins/4k/data/out_dn.png deleted file mode 100644 index 5299bbe1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/out_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/out_hi.png b/cinelerra-5.0/plugins/4k/data/out_hi.png deleted file mode 100644 index bf6aabbe..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/out_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/out_up.png b/cinelerra-5.0/plugins/4k/data/out_up.png deleted file mode 100644 index 973bf38d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/out_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/outpoint.png b/cinelerra-5.0/plugins/4k/data/outpoint.png deleted file mode 100644 index a1387d27..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/outpoint.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/over.png b/cinelerra-5.0/plugins/4k/data/over.png deleted file mode 100644 index e1378d48..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/over.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/overwrite.png b/cinelerra-5.0/plugins/4k/data/overwrite.png deleted file mode 100644 index ce21cc98..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/overwrite.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pan_channel.png b/cinelerra-5.0/plugins/4k/data/pan_channel.png deleted file mode 100644 index 8986edf8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pan_channel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pan_channel_small.png b/cinelerra-5.0/plugins/4k/data/pan_channel_small.png deleted file mode 100644 index 332849dd..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pan_channel_small.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pan_hi.png b/cinelerra-5.0/plugins/4k/data/pan_hi.png deleted file mode 100644 index 2fa43d1c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pan_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pan_popup.png b/cinelerra-5.0/plugins/4k/data/pan_popup.png deleted file mode 100644 index 29a77e55..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pan_popup.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pan_stick.png b/cinelerra-5.0/plugins/4k/data/pan_stick.png deleted file mode 100644 index 7923a1c9..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pan_stick.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pan_stick_small.png b/cinelerra-5.0/plugins/4k/data/pan_stick_small.png deleted file mode 100644 index 4d09d4a8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pan_stick_small.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pan_up.png b/cinelerra-5.0/plugins/4k/data/pan_up.png deleted file mode 100644 index 2d878111..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pan_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pane.png b/cinelerra-5.0/plugins/4k/data/pane.png deleted file mode 100644 index 37259445..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pane.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pane_dn.png b/cinelerra-5.0/plugins/4k/data/pane_dn.png deleted file mode 100644 index 9206a712..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pane_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pane_hi.png b/cinelerra-5.0/plugins/4k/data/pane_hi.png deleted file mode 100644 index 52e881dc..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pane_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pane_up.png b/cinelerra-5.0/plugins/4k/data/pane_up.png deleted file mode 100644 index ab12e210..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pane_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/panel_divider.png b/cinelerra-5.0/plugins/4k/data/panel_divider.png deleted file mode 100644 index f9b5e9c9..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/panel_divider.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pankeyframe.png b/cinelerra-5.0/plugins/4k/data/pankeyframe.png deleted file mode 100644 index 65f86f0c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pankeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/paste.png b/cinelerra-5.0/plugins/4k/data/paste.png deleted file mode 100644 index d28aa0d6..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/paste.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/patch_checked.png b/cinelerra-5.0/plugins/4k/data/patch_checked.png deleted file mode 100644 index 082adb5c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/patch_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/patch_checkedhi.png b/cinelerra-5.0/plugins/4k/data/patch_checkedhi.png deleted file mode 100644 index 96cc44cf..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/patch_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/patch_dn.png b/cinelerra-5.0/plugins/4k/data/patch_dn.png deleted file mode 100644 index 4086fb9e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/patch_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/patch_hi.png b/cinelerra-5.0/plugins/4k/data/patch_hi.png deleted file mode 100644 index c411933b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/patch_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/patch_up.png b/cinelerra-5.0/plugins/4k/data/patch_up.png deleted file mode 100644 index 54c2c633..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/patch_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/patchbay_bg.png b/cinelerra-5.0/plugins/4k/data/patchbay_bg.png deleted file mode 100644 index 475e5f14..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/patchbay_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/patches.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/patches.xcf.bz2 deleted file mode 100644 index 275778f7..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/patches.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pause.png b/cinelerra-5.0/plugins/4k/data/pause.png deleted file mode 100644 index 59d015bb..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pause.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/period.png b/cinelerra-5.0/plugins/4k/data/period.png deleted file mode 100644 index 072f5e5b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/period.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/picture.png b/cinelerra-5.0/plugins/4k/data/picture.png deleted file mode 100644 index c634d408..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/picture.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/play.png b/cinelerra-5.0/plugins/4k/data/play.png deleted file mode 100644 index 05c4eab6..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/play.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/playpatch.png b/cinelerra-5.0/plugins/4k/data/playpatch.png deleted file mode 100644 index ea784b04..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/playpatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/plugin.xcf.bz2 deleted file mode 100644 index a5974377..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin_bg.png b/cinelerra-5.0/plugins/4k/data/plugin_bg.png deleted file mode 100644 index 99ecaa21..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin_on.png b/cinelerra-5.0/plugins/4k/data/plugin_on.png deleted file mode 100644 index f5e05cfe..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin_on.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin_ondn.png b/cinelerra-5.0/plugins/4k/data/plugin_ondn.png deleted file mode 100644 index d5599d14..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin_ondn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin_onhi.png b/cinelerra-5.0/plugins/4k/data/plugin_onhi.png deleted file mode 100644 index 0b03ba5f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin_onhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin_onselect.png b/cinelerra-5.0/plugins/4k/data/plugin_onselect.png deleted file mode 100644 index f648acd2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin_onselect.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin_onselecthi.png b/cinelerra-5.0/plugins/4k/data/plugin_onselecthi.png deleted file mode 100644 index 500cef35..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin_onselecthi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin_show.png b/cinelerra-5.0/plugins/4k/data/plugin_show.png deleted file mode 100644 index a59b549d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin_show.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin_showdn.png b/cinelerra-5.0/plugins/4k/data/plugin_showdn.png deleted file mode 100644 index 90afae7c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin_showdn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin_showhi.png b/cinelerra-5.0/plugins/4k/data/plugin_showhi.png deleted file mode 100644 index 439585b5..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin_showhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin_showselect.png b/cinelerra-5.0/plugins/4k/data/plugin_showselect.png deleted file mode 100644 index fbb3f760..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin_showselect.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/plugin_showselecthi.png b/cinelerra-5.0/plugins/4k/data/plugin_showselecthi.png deleted file mode 100644 index 5f98a4a0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/plugin_showselecthi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pot.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/pot.xcf.bz2 deleted file mode 100644 index c3997b9a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pot.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pot_dn.png b/cinelerra-5.0/plugins/4k/data/pot_dn.png deleted file mode 100644 index a5c996c1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pot_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pot_hi.png b/cinelerra-5.0/plugins/4k/data/pot_hi.png deleted file mode 100644 index c64127c1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pot_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/pot_up.png b/cinelerra-5.0/plugins/4k/data/pot_up.png deleted file mode 100644 index 97957f26..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/pot_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/preferences_bg.png b/cinelerra-5.0/plugins/4k/data/preferences_bg.png deleted file mode 100644 index 8d9ea644..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/preferences_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/preferencesbutton_dn.png b/cinelerra-5.0/plugins/4k/data/preferencesbutton_dn.png deleted file mode 100644 index 985c7cb0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/preferencesbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/preferencesbutton_dnhi.png b/cinelerra-5.0/plugins/4k/data/preferencesbutton_dnhi.png deleted file mode 100644 index dc132991..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/preferencesbutton_dnhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/preferencesbutton_dnlo.png b/cinelerra-5.0/plugins/4k/data/preferencesbutton_dnlo.png deleted file mode 100644 index 692a9021..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/preferencesbutton_dnlo.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/preferencesbutton_up.png b/cinelerra-5.0/plugins/4k/data/preferencesbutton_up.png deleted file mode 100644 index 3223ec6f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/preferencesbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/preferencesbutton_uphi.png b/cinelerra-5.0/plugins/4k/data/preferencesbutton_uphi.png deleted file mode 100644 index a77c8527..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/preferencesbutton_uphi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/prevedit.png b/cinelerra-5.0/plugins/4k/data/prevedit.png deleted file mode 100644 index bbbb3c5f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/prevedit.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/prevlabel.png b/cinelerra-5.0/plugins/4k/data/prevlabel.png deleted file mode 100644 index 717cd401..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/prevlabel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/prevtip.png b/cinelerra-5.0/plugins/4k/data/prevtip.png deleted file mode 100644 index 234ff2ba..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/prevtip.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/progress_bg.png b/cinelerra-5.0/plugins/4k/data/progress_bg.png deleted file mode 100644 index 1b0468a7..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/progress_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/progress_hi.png b/cinelerra-5.0/plugins/4k/data/progress_hi.png deleted file mode 100644 index 3dfe11ad..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/progress_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/projector.png b/cinelerra-5.0/plugins/4k/data/projector.png deleted file mode 100644 index 31a053f4..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/projector.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/projectorkeyframe.png b/cinelerra-5.0/plugins/4k/data/projectorkeyframe.png deleted file mode 100644 index 4aaea3c6..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/projectorkeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/protect.png b/cinelerra-5.0/plugins/4k/data/protect.png deleted file mode 100644 index 4c78a905..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/protect.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/radial.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/radial.xcf.bz2 deleted file mode 100644 index 5722e9a7..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/radial.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/radial_checked.png b/cinelerra-5.0/plugins/4k/data/radial_checked.png deleted file mode 100644 index 12f6374e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/radial_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/radial_checkedhi.png b/cinelerra-5.0/plugins/4k/data/radial_checkedhi.png deleted file mode 100644 index 9ff3e709..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/radial_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/radial_dn.png b/cinelerra-5.0/plugins/4k/data/radial_dn.png deleted file mode 100644 index 7647ab7d..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/radial_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/radial_hi.png b/cinelerra-5.0/plugins/4k/data/radial_hi.png deleted file mode 100644 index 4c4bbfa7..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/radial_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/radial_up.png b/cinelerra-5.0/plugins/4k/data/radial_up.png deleted file mode 100644 index b361f826..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/radial_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/record.png b/cinelerra-5.0/plugins/4k/data/record.png deleted file mode 100644 index d15bfed1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/record.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/recordpatch.png b/cinelerra-5.0/plugins/4k/data/recordpatch.png deleted file mode 100644 index 8746ceed..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/recordpatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/redo.png b/cinelerra-5.0/plugins/4k/data/redo.png deleted file mode 100644 index 55f8115e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/redo.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/reload.png b/cinelerra-5.0/plugins/4k/data/reload.png deleted file mode 100644 index ff0478aa..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/reload.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/rename.png b/cinelerra-5.0/plugins/4k/data/rename.png deleted file mode 100644 index 71e36db8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/rename.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/resource1024.png b/cinelerra-5.0/plugins/4k/data/resource1024.png deleted file mode 100644 index 67da059c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/resource1024.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/resource128.png b/cinelerra-5.0/plugins/4k/data/resource128.png deleted file mode 100644 index 2e3e90b7..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/resource128.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/resource256.png b/cinelerra-5.0/plugins/4k/data/resource256.png deleted file mode 100644 index 6d31a0f1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/resource256.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/resource32.png b/cinelerra-5.0/plugins/4k/data/resource32.png deleted file mode 100644 index 9fe5d9d0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/resource32.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/resource512.png b/cinelerra-5.0/plugins/4k/data/resource512.png deleted file mode 100644 index 439b624f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/resource512.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/resource64.png b/cinelerra-5.0/plugins/4k/data/resource64.png deleted file mode 100644 index 1035e24a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/resource64.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/reverse.png b/cinelerra-5.0/plugins/4k/data/reverse.png deleted file mode 100644 index 01201336..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/reverse.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/rewind.png b/cinelerra-5.0/plugins/4k/data/rewind.png deleted file mode 100644 index 14357bb0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/rewind.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/right_justify.png b/cinelerra-5.0/plugins/4k/data/right_justify.png deleted file mode 100644 index bf6b6706..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/right_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ruler.png b/cinelerra-5.0/plugins/4k/data/ruler.png deleted file mode 100644 index b28a223a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ruler.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/scope.png b/cinelerra-5.0/plugins/4k/data/scope.png deleted file mode 100644 index bef250d8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/scope.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/setformat_bg.png b/cinelerra-5.0/plugins/4k/data/setformat_bg.png deleted file mode 100644 index f0b95fc5..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/setformat_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/show_meters.png b/cinelerra-5.0/plugins/4k/data/show_meters.png deleted file mode 100644 index 057785eb..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/show_meters.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/singleframe.png b/cinelerra-5.0/plugins/4k/data/singleframe.png deleted file mode 100644 index e13a7a34..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/singleframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/space.png b/cinelerra-5.0/plugins/4k/data/space.png deleted file mode 100644 index c8147f05..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/space.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/splice.png b/cinelerra-5.0/plugins/4k/data/splice.png deleted file mode 100644 index 77d34008..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/splice.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/statusbar.png b/cinelerra-5.0/plugins/4k/data/statusbar.png deleted file mode 100644 index 4dc5b96b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/statusbar.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/statusbar_cancel.png b/cinelerra-5.0/plugins/4k/data/statusbar_cancel.png deleted file mode 100644 index ec5309ed..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/statusbar_cancel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/statusbar_cancel_dn.png b/cinelerra-5.0/plugins/4k/data/statusbar_cancel_dn.png deleted file mode 100644 index 5e96b013..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/statusbar_cancel_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/statusbar_cancel_hi.png b/cinelerra-5.0/plugins/4k/data/statusbar_cancel_hi.png deleted file mode 100644 index 40e98bd2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/statusbar_cancel_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/statusbar_cancel_up.png b/cinelerra-5.0/plugins/4k/data/statusbar_cancel_up.png deleted file mode 100644 index 6186769c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/statusbar_cancel_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/stop.png b/cinelerra-5.0/plugins/4k/data/stop.png deleted file mode 100644 index 5c3d9ac1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/stop.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/swap_extents.png b/cinelerra-5.0/plugins/4k/data/swap_extents.png deleted file mode 100644 index e5915cd0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/swap_extents.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/tan_linear.png b/cinelerra-5.0/plugins/4k/data/tan_linear.png deleted file mode 100644 index dbc70edf..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/tan_linear.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/tan_smooth.png b/cinelerra-5.0/plugins/4k/data/tan_smooth.png deleted file mode 100644 index 4dc63b10..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/tan_smooth.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/text.png b/cinelerra-5.0/plugins/4k/data/text.png deleted file mode 100644 index a8065bb2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/text.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/text_highlight.png b/cinelerra-5.0/plugins/4k/data/text_highlight.png deleted file mode 100644 index 8bb91268..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/text_highlight.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/timebar_bg_flat.png b/cinelerra-5.0/plugins/4k/data/timebar_bg_flat.png deleted file mode 100644 index 3ee6abe4..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/timebar_bg_flat.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/timebar_brender.png b/cinelerra-5.0/plugins/4k/data/timebar_brender.png deleted file mode 100644 index 13045cb4..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/timebar_brender.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/timebar_view.png b/cinelerra-5.0/plugins/4k/data/timebar_view.png deleted file mode 100644 index fed4b1fa..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/timebar_view.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/tipbutton_dn.png b/cinelerra-5.0/plugins/4k/data/tipbutton_dn.png deleted file mode 100644 index fa3de52e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/tipbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/tipbutton_hi.png b/cinelerra-5.0/plugins/4k/data/tipbutton_hi.png deleted file mode 100644 index 1e4edf97..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/tipbutton_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/tipbutton_up.png b/cinelerra-5.0/plugins/4k/data/tipbutton_up.png deleted file mode 100644 index 4e0284a4..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/tipbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/title_bg.png b/cinelerra-5.0/plugins/4k/data/title_bg.png deleted file mode 100644 index 2ee44717..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/title_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/titlesafe.png b/cinelerra-5.0/plugins/4k/data/titlesafe.png deleted file mode 100644 index 00b08860..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/titlesafe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/toclip.png b/cinelerra-5.0/plugins/4k/data/toclip.png deleted file mode 100644 index 48d2f52b..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/toclip.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/toolwindow.png b/cinelerra-5.0/plugins/4k/data/toolwindow.png deleted file mode 100644 index 366c11a4..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/toolwindow.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/top_justify.png b/cinelerra-5.0/plugins/4k/data/top_justify.png deleted file mode 100644 index 8170bbc8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/top_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/transportdn.png b/cinelerra-5.0/plugins/4k/data/transportdn.png deleted file mode 100644 index 4322c944..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/transportdn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/transportend.png b/cinelerra-5.0/plugins/4k/data/transportend.png deleted file mode 100644 index c5abc093..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/transportend.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/transporthi.png b/cinelerra-5.0/plugins/4k/data/transporthi.png deleted file mode 100644 index f6355f6f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/transporthi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/transportup.png b/cinelerra-5.0/plugins/4k/data/transportup.png deleted file mode 100644 index 8332f5e1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/transportup.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/tumble_bottom.png b/cinelerra-5.0/plugins/4k/data/tumble_bottom.png deleted file mode 100644 index 1687644f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/tumble_bottom.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/tumble_hi.png b/cinelerra-5.0/plugins/4k/data/tumble_hi.png deleted file mode 100644 index 61616e42..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/tumble_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/tumble_top.png b/cinelerra-5.0/plugins/4k/data/tumble_top.png deleted file mode 100644 index 03907dd0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/tumble_top.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/tumble_up.png b/cinelerra-5.0/plugins/4k/data/tumble_up.png deleted file mode 100644 index eb608b00..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/tumble_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/undo.png b/cinelerra-5.0/plugins/4k/data/undo.png deleted file mode 100644 index cc93b5ac..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/undo.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/updir.png b/cinelerra-5.0/plugins/4k/data/updir.png deleted file mode 100644 index 91fb90cb..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/updir.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vbuttons_left.png b/cinelerra-5.0/plugins/4k/data/vbuttons_left.png deleted file mode 100644 index 6f233dea..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vbuttons_left.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vclock.png b/cinelerra-5.0/plugins/4k/data/vclock.png deleted file mode 100644 index 81a91e36..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vclock.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/veffect_icon.png b/cinelerra-5.0/plugins/4k/data/veffect_icon.png deleted file mode 100644 index e2816133..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/veffect_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vscroll_handle_bg.png b/cinelerra-5.0/plugins/4k/data/vscroll_handle_bg.png deleted file mode 100644 index 6e999c46..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vscroll_handle_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vscroll_handle_dn.png b/cinelerra-5.0/plugins/4k/data/vscroll_handle_dn.png deleted file mode 100644 index 0bde47bb..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vscroll_handle_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vscroll_handle_hi.png b/cinelerra-5.0/plugins/4k/data/vscroll_handle_hi.png deleted file mode 100644 index f452a530..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vscroll_handle_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vscroll_handle_up.png b/cinelerra-5.0/plugins/4k/data/vscroll_handle_up.png deleted file mode 100644 index bcef19ae..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vscroll_handle_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vscroll_left_dn.png b/cinelerra-5.0/plugins/4k/data/vscroll_left_dn.png deleted file mode 100644 index e9ac6448..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vscroll_left_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vscroll_left_hi.png b/cinelerra-5.0/plugins/4k/data/vscroll_left_hi.png deleted file mode 100644 index c2b318d1..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vscroll_left_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vscroll_left_up.png b/cinelerra-5.0/plugins/4k/data/vscroll_left_up.png deleted file mode 100644 index 9e3bddf3..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vscroll_left_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vscroll_right_dn.png b/cinelerra-5.0/plugins/4k/data/vscroll_right_dn.png deleted file mode 100644 index 8aa68524..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vscroll_right_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vscroll_right_hi.png b/cinelerra-5.0/plugins/4k/data/vscroll_right_hi.png deleted file mode 100644 index 880a749e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vscroll_right_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vscroll_right_up.png b/cinelerra-5.0/plugins/4k/data/vscroll_right_up.png deleted file mode 100644 index 8b15b2ae..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vscroll_right_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vtransition_icon.png b/cinelerra-5.0/plugins/4k/data/vtransition_icon.png deleted file mode 100644 index d73ccb1f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vtransition_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/vwindow_timebar.png b/cinelerra-5.0/plugins/4k/data/vwindow_timebar.png deleted file mode 100644 index 8cba4622..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/vwindow_timebar.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/waveform.png b/cinelerra-5.0/plugins/4k/data/waveform.png deleted file mode 100644 index fb81e31a..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/waveform.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/waveform_rgb.png b/cinelerra-5.0/plugins/4k/data/waveform_rgb.png deleted file mode 100644 index c529ce15..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/waveform_rgb.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/wrench.png b/cinelerra-5.0/plugins/4k/data/wrench.png deleted file mode 100644 index d68e3528..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/wrench.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/xmeter_green.png b/cinelerra-5.0/plugins/4k/data/xmeter_green.png deleted file mode 100644 index 2f298d36..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/xmeter_green.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/xmeter_normal.png b/cinelerra-5.0/plugins/4k/data/xmeter_normal.png deleted file mode 100644 index bc158a24..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/xmeter_normal.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/xmeter_over.png b/cinelerra-5.0/plugins/4k/data/xmeter_over.png deleted file mode 100644 index cf5f5280..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/xmeter_over.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/xmeter_red.png b/cinelerra-5.0/plugins/4k/data/xmeter_red.png deleted file mode 100644 index 3f74e640..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/xmeter_red.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/xmeter_white.png b/cinelerra-5.0/plugins/4k/data/xmeter_white.png deleted file mode 100644 index 4c6158b9..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/xmeter_white.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/xmeter_yellow.png b/cinelerra-5.0/plugins/4k/data/xmeter_yellow.png deleted file mode 100644 index e55bb541..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/xmeter_yellow.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/xpane_dn.png b/cinelerra-5.0/plugins/4k/data/xpane_dn.png deleted file mode 100644 index 80a7337f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/xpane_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/xpane_hi.png b/cinelerra-5.0/plugins/4k/data/xpane_hi.png deleted file mode 100644 index 436c0803..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/xpane_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/xpane_up.png b/cinelerra-5.0/plugins/4k/data/xpane_up.png deleted file mode 100644 index 007cf7a0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/xpane_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ymeter_green.png b/cinelerra-5.0/plugins/4k/data/ymeter_green.png deleted file mode 100644 index 161d344c..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ymeter_green.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ymeter_normal.png b/cinelerra-5.0/plugins/4k/data/ymeter_normal.png deleted file mode 100644 index 364cda00..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ymeter_normal.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ymeter_over.png b/cinelerra-5.0/plugins/4k/data/ymeter_over.png deleted file mode 100644 index 7ae2e6ca..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ymeter_over.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ymeter_red.png b/cinelerra-5.0/plugins/4k/data/ymeter_red.png deleted file mode 100644 index 4c25cfe8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ymeter_red.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ymeter_white.png b/cinelerra-5.0/plugins/4k/data/ymeter_white.png deleted file mode 100644 index 4d2c8b22..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ymeter_white.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ymeter_yellow.png b/cinelerra-5.0/plugins/4k/data/ymeter_yellow.png deleted file mode 100644 index 781fc4f7..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ymeter_yellow.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ypane_dn.png b/cinelerra-5.0/plugins/4k/data/ypane_dn.png deleted file mode 100644 index 2f7c4dee..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ypane_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ypane_hi.png b/cinelerra-5.0/plugins/4k/data/ypane_hi.png deleted file mode 100644 index dff6eae9..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ypane_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/ypane_up.png b/cinelerra-5.0/plugins/4k/data/ypane_up.png deleted file mode 100644 index 321bf0c8..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/ypane_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/zoompopup_dn.png b/cinelerra-5.0/plugins/4k/data/zoompopup_dn.png deleted file mode 100644 index 65e6f9dd..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/zoompopup_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/zoompopup_hi.png b/cinelerra-5.0/plugins/4k/data/zoompopup_hi.png deleted file mode 100644 index 811a7ff2..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/zoompopup_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/zoompopup_up.png b/cinelerra-5.0/plugins/4k/data/zoompopup_up.png deleted file mode 100644 index 64d11ff0..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/zoompopup_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/zoomtumble.xcf.bz2 b/cinelerra-5.0/plugins/4k/data/zoomtumble.xcf.bz2 deleted file mode 100644 index 008f9695..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/zoomtumble.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/zoomtumble_bottom.png b/cinelerra-5.0/plugins/4k/data/zoomtumble_bottom.png deleted file mode 100644 index 3ba43475..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/zoomtumble_bottom.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/zoomtumble_hi.png b/cinelerra-5.0/plugins/4k/data/zoomtumble_hi.png deleted file mode 100644 index 53457042..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/zoomtumble_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/zoomtumble_top.png b/cinelerra-5.0/plugins/4k/data/zoomtumble_top.png deleted file mode 100644 index a749c25f..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/zoomtumble_top.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/4k/data/zoomtumble_up.png b/cinelerra-5.0/plugins/4k/data/zoomtumble_up.png deleted file mode 100644 index f0f4f59e..00000000 Binary files a/cinelerra-5.0/plugins/4k/data/zoomtumble_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/5k.C b/cinelerra-5.0/plugins/5k/5k.C deleted file mode 100644 index 04ef6ad4..00000000 --- a/cinelerra-5.0/plugins/5k/5k.C +++ /dev/null @@ -1,1034 +0,0 @@ - -/* - * CINELERRA - * Copyright (C) 1997-2014 Adam Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#include "bcsignals.h" -#include "clip.h" -#include "cwindowgui.h" -#include "5k.h" -#include "edl.h" -#include "edlsession.h" -#include "mainmenu.h" -#include "mainsession.h" -#include "mbuttons.h" -#include "meterpanel.h" -#include "mwindow.h" -#include "mwindowgui.h" -#include "new.h" -#include "patchbay.h" -#include "preferencesthread.h" -#include "recordgui.h" -#include "recordmonitor.h" -#include "setformat.h" -#include "statusbar.h" -#include "timebar.h" -#include "trackcanvas.h" -#include "vframe.h" -#include "vwindowgui.h" - - - - -PluginClient* new_plugin(PluginServer *server) -{ - return new FiveKMain(server); -} - - - - - - - -FiveKMain::FiveKMain(PluginServer *server) - : PluginTClient(server) -{ -} - -FiveKMain::~FiveKMain() -{ -} - -const char* FiveKMain::plugin_title() -{ - return _("5k"); -} - -Theme* FiveKMain::new_theme() -{ - theme = new FiveK; - extern unsigned char _binary_5k_data_start[]; - theme->set_data(_binary_5k_data_start); - return theme; -} - - - - - - - - -FiveK::FiveK() - : Theme() -{ -} - -FiveK::~FiveK() -{ -} - -void FiveK::initialize() -{ - BC_Resources *resources = BC_WindowBase::get_resources(); - - - resources->small_font_xft = N_("Sans-18"); - resources->medium_font_xft = N_("Sans-22"); - resources->large_font_xft = N_("Sans-22:style=bold"); - - - - - resources->text_default = 0xbfbfbf; - resources->text_background = 0x373737; - resources->text_border1 = 0x202020; - resources->text_border2 = 0x373737; - resources->text_border3 = 0x373737; - resources->text_border4 = 0x969696; - resources->text_inactive_highlight = 0x707070; - - resources->bg_color = 0x484848; - resources->border_light2 = resources->bg_color; - resources->border_shadow2 = resources->bg_color; - resources->default_text_color = 0xbfbfbf; - resources->menu_title_text = 0xbfbfbf; - resources->popup_title_text = 0xbfbfbf; - resources->menu_item_text = 0xbfbfbf; - resources->menu_highlighted_fontcolor = WHITE; - resources->generic_button_margin = 30; - resources->pot_needle_color = resources->text_default; - resources->pot_offset = 1; - resources->progress_text = resources->text_default; - resources->meter_font_color = resources->default_text_color; - - resources->menu_light = 0xababab; - resources->menu_highlighted = 0x6f6f6f; - resources->menu_down = 0x4b4b4b; - resources->menu_up = 0x4b4b4b; - resources->menu_shadow = 0x202020; - resources->popupmenu_margin = 15; - resources->popupmenu_triangle_margin = 15; - - resources->listbox_title_color = 0xbfbfbf; - - resources->listbox_title_margin = 20; - resources->listbox_title_hotspot = 20; - resources->listbox_border1 = 0x1a1a1a; - resources->listbox_border2 = 0x373737; - resources->listbox_border3 = 0x373737; - resources->listbox_border4 = 0x646464; - resources->listbox_highlighted = 0x505050; - resources->listbox_inactive = 0x373737; - resources->listbox_bg = 0; - resources->listbox_text = 0xbfbfbf; - - resources->filebox_margin = 130; - resources->file_color = 0xbfbfbf; - resources->directory_color = 0xa0a0ff; - - - new_toggle("loadmode_new.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_new"); - new_toggle("loadmode_none.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_none"); - new_toggle("loadmode_newcat.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_newcat"); - new_toggle("loadmode_cat.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_cat"); - new_toggle("loadmode_newtracks.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_newtracks"); - new_toggle("loadmode_paste.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_paste"); - new_toggle("loadmode_resource.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_resource"); - new_toggle("loadmode_nested.png", - "loadmode_up.png", - "loadmode_hi.png", - "loadmode_checked.png", - "loadmode_dn.png", - "loadmode_checkedhi.png", - "loadmode_nested"); - - - - resources->filebox_icons_images = new_button("icons.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_text_images = new_button("text.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_newfolder_images = new_button("folder.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_rename_images = new_button("rename.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_updir_images = new_button("updir.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_delete_images = new_button("delete.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - resources->filebox_reload_images = new_button("reload.png", - "fileboxbutton_up.png", - "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); - - - resources->filebox_descend_images = new_button("openfolder.png", - "filebox_bigbutton_up.png", - "filebox_bigbutton_hi.png", - "filebox_bigbutton_dn.png"); - - resources->usethis_button_images = - resources->ok_images = new_button("ok.png", - "filebox_bigbutton_up.png", - "filebox_bigbutton_hi.png", - "filebox_bigbutton_dn.png"); - - new_button("ok.png", - "new_bigbutton_up.png", - "new_bigbutton_hi.png", - "new_bigbutton_dn.png", - "new_ok_images"); - - resources->cancel_images = new_button("cancel.png", - "filebox_bigbutton_up.png", - "filebox_bigbutton_hi.png", - "filebox_bigbutton_dn.png"); - - new_button("cancel.png", - "new_bigbutton_up.png", - "new_bigbutton_hi.png", - "new_bigbutton_dn.png", - "new_cancel_images"); - - resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); - - resources->bar_data = new_image("bar", "bar.png"); - resources->check = new_image("check", "check.png"); - - resources->min_menu_w = 96; - resources->menu_popup_bg = new_image("menu_popup_bg.png"); - resources->menu_item_bg = new_image_set(3, - "menuitem_up.png", - "menuitem_hi.png", - "menuitem_dn.png"); - resources->menu_bar_bg = new_image("menubar_bg.png"); - resources->menu_title_bg = new_image_set(3, - "menubar_up.png", - "menubar_hi.png", - "menubar_dn.png"); - - - resources->popupmenu_images = 0; -// new_image_set(3, -// "menupopup_up.png", -// "menupopup_hi.png", -// "menupopup_dn.png"); - - resources->toggle_highlight_bg = new_image("toggle_highlight_bg", - "text_highlight.png"); - - resources->generic_button_images = new_image_set(3, - "generic_up.png", - "generic_hi.png", - "generic_dn.png"); - resources->horizontal_slider_data = new_image_set(6, - "hslider_fg_up.png", - "hslider_fg_hi.png", - "hslider_fg_dn.png", - "hslider_bg_up.png", - "hslider_bg_hi.png", - "hslider_bg_dn.png"); - resources->progress_images = new_image_set(2, - "progress_bg.png", - "progress_hi.png"); - resources->tumble_data = new_image_set(4, - "tumble_up.png", - "tumble_hi.png", - "tumble_bottom.png", - "tumble_top.png"); - resources->listbox_button = new_button4("listbox_button.png", - "editpanel_up.png", - "editpanel_hi.png", - "editpanel_dn.png", - "editpanel_hi.png"); - resources->listbox_column = new_image_set(3, - "column_up.png", - "column_hi.png", - "column_dn.png"); - resources->listbox_up = new_image("listbox_up.png"); - resources->listbox_dn = new_image("listbox_dn.png"); - resources->pan_data = new_image_set(7, - "pan_up.png", - "pan_hi.png", - "pan_popup.png", - "pan_channel.png", - "pan_stick.png", - "pan_channel_small.png", - "pan_stick_small.png"); - resources->pan_text_color = WHITE; - - resources->pot_images = new_image_set(3, - "pot_up.png", - "pot_hi.png", - "pot_dn.png"); - - resources->checkbox_images = new_image_set(5, - "checkbox_up.png", - "checkbox_hi.png", - "checkbox_checked.png", - "checkbox_dn.png", - "checkbox_checkedhi.png"); - - resources->radial_images = new_image_set(5, - "radial_up.png", - "radial_hi.png", - "radial_checked.png", - "radial_dn.png", - "radial_checkedhi.png"); - - resources->xmeter_images = new_image_set(7, - "xmeter_normal.png", - "xmeter_green.png", - "xmeter_red.png", - "xmeter_yellow.png", - "xmeter_white.png", - "xmeter_over.png", - "downmix51_2.png"); - resources->ymeter_images = new_image_set(7, - "ymeter_normal.png", - "ymeter_green.png", - "ymeter_red.png", - "ymeter_yellow.png", - "ymeter_white.png", - "ymeter_over.png", - "downmix51_2.png"); - - resources->hscroll_data = new_image_set(10, - "hscroll_handle_up.png", - "hscroll_handle_hi.png", - "hscroll_handle_dn.png", - "hscroll_handle_bg.png", - "hscroll_left_up.png", - "hscroll_left_hi.png", - "hscroll_left_dn.png", - "hscroll_right_up.png", - "hscroll_right_hi.png", - "hscroll_right_dn.png"); - - resources->vscroll_data = new_image_set(10, - "vscroll_handle_up.png", - "vscroll_handle_hi.png", - "vscroll_handle_dn.png", - "vscroll_handle_bg.png", - "vscroll_left_up.png", - "vscroll_left_hi.png", - "vscroll_left_dn.png", - "vscroll_right_up.png", - "vscroll_right_hi.png", - "vscroll_right_dn.png"); - resources->scroll_minhandle = 20; - - - new_button("prevtip.png", "tipbutton_up.png", "tipbutton_hi.png", "tipbutton_dn.png", "prev_tip"); - new_button("nexttip.png", "tipbutton_up.png", "tipbutton_hi.png", "tipbutton_dn.png", "next_tip"); - new_button("closetip.png", "tipbutton_up.png", "tipbutton_hi.png", "tipbutton_dn.png", "close_tip"); - new_button("swap_extents.png", - "editpanel_up.png", - "editpanel_hi.png", - "editpanel_dn.png", - "swap_extents"); - - -// Record windows - - - preferences_category_overlap = 0; - preferencescategory_x = 0; - preferencescategory_y = 5; - preferencestitle_x = 5; - preferencestitle_y = 10; - preferencesoptions_x = 5; - preferencesoptions_y = 0; - -// MWindow - message_normal = resources->text_default; - audio_color = GREEN; - mtransport_margin = 16; - toggle_margin = 16; - - new_button("pane.png", "pane_up.png", "pane_hi.png", "pane_dn.png", "pane"); - new_image_set("xpane", 3, "xpane_up.png", "xpane_hi.png", "xpane_dn.png"); - new_image_set("ypane", 3, "ypane_up.png", "ypane_hi.png", "ypane_dn.png"); - - new_image("mbutton_bg", "mbutton_bg.png"); - new_image("timebar_bg", "timebar_bg_flat.png"); - new_image("timebar_brender", "timebar_brender.png"); - new_image("clock_bg", "mclock_flat.png"); - new_image("patchbay_bg", "patchbay_bg.png"); - new_image("statusbar", "statusbar.png"); -// new_image("mscroll_filler", "mscroll_filler.png"); - - new_image_set("zoombar_menu", 3, "zoompopup_up.png", "zoompopup_hi.png", "zoompopup_dn.png"); - new_image_set("zoombar_tumbler", 4, "zoomtumble_up.png", "zoomtumble_hi.png", "zoomtumble_bottom.png", "zoomtumble_top.png"); - new_image_set("plugin_on", 5, "plugin_on.png", "plugin_onhi.png", "plugin_onselect.png", "plugin_ondn.png", "plugin_onselecthi.png"); - new_image_set("plugin_show", 5, "plugin_show.png", "plugin_showhi.png", "plugin_showselect.png", "plugin_showdn.png", "plugin_showselecthi.png"); - -// CWindow - new_image("cpanel_bg", "cpanel_bg.png"); - new_image("cbuttons_left", "cbuttons_left.png"); - new_image("cbuttons_right", "cbuttons_right.png"); - new_image("cmeter_bg", "cmeter_bg.png"); - -// VWindow - new_image("vbuttons_left", "vbuttons_left.png"); - new_image("vclock", "vclock.png"); - - new_image("preferences_bg", "preferences_bg.png"); - - - new_image("new_bg", "new_bg.png"); - new_image("setformat_bg", "setformat_bg.png"); - - - timebar_view_data = new_image("timebar_view.png"); - - setformat_w = get_image("setformat_bg")->get_w(); - setformat_h = get_image("setformat_bg")->get_h(); - setformat_x1 = 15; - setformat_x2 = 100; - - setformat_x3 = 315; - setformat_x4 = 415; - setformat_y1 = 20; - setformat_y2 = 85; - setformat_y3 = 125; - setformat_margin = 30; - setformat_channels_x = 25; - setformat_channels_y = 242; - setformat_channels_w = 250; - setformat_channels_h = 250; - - loadfile_pad = get_image_set("loadmode_new")[0]->get_h() + 10; - browse_pad = 20; - - - new_toggle("playpatch.png", - "patch_up.png", - "patch_hi.png", - "patch_checked.png", - "patch_dn.png", - "patch_checkedhi.png", - "playpatch_data"); - - new_toggle("recordpatch.png", - "patch_up.png", - "patch_hi.png", - "patch_checked.png", - "patch_dn.png", - "patch_checkedhi.png", - "recordpatch_data"); - - new_toggle("gangpatch.png", - "patch_up.png", - "patch_hi.png", - "patch_checked.png", - "patch_dn.png", - "patch_checkedhi.png", - "gangpatch_data"); - - new_toggle("drawpatch.png", - "patch_up.png", - "patch_hi.png", - "patch_checked.png", - "patch_dn.png", - "patch_checkedhi.png", - "drawpatch_data"); - - - new_image_set("mutepatch_data", - 5, - "mutepatch_up.png", - "mutepatch_hi.png", - "mutepatch_checked.png", - "mutepatch_dn.png", - "mutepatch_checkedhi.png"); - - new_image_set("expandpatch_data", - 5, - "expandpatch_up.png", - "expandpatch_hi.png", - "expandpatch_checked.png", - "expandpatch_dn.png", - "expandpatch_checkedhi.png"); - - build_bg_data(); - build_overlays(); - - - - - out_point = new_image_set(5, - "out_up.png", - "out_hi.png", - "out_checked.png", - "out_dn.png", - "out_checkedhi.png"); - in_point = new_image_set(5, - "in_up.png", - "in_hi.png", - "in_checked.png", - "in_dn.png", - "in_checkedhi.png"); - - label_toggle = new_image_set(5, - "labeltoggle_up.png", - "labeltoggle_uphi.png", - "label_checked.png", - "labeltoggle_dn.png", - "label_checkedhi.png"); - - new_image_set("histogram_carrot", - 5, - "histogram_carrot_up.png", - "histogram_carrot_hi.png", - "histogram_carrot_checked.png", - "histogram_carrot_dn.png", - "histogram_carrot_checkedhi.png"); - - - statusbar_cancel_data = new_image_set(3, - "statusbar_cancel_up.png", - "statusbar_cancel_hi.png", - "statusbar_cancel_dn.png"); - - - VFrame *editpanel_up = new_image("editpanel_up.png"); - VFrame *editpanel_hi = new_image("editpanel_hi.png"); - VFrame *editpanel_dn = new_image("editpanel_dn.png"); - VFrame *editpanel_checked = new_image("editpanel_checked.png"); - VFrame *editpanel_checkedhi = new_image("editpanel_checkedhi.png"); - - new_image("panel_divider", "panel_divider.png"); - new_button("bottom_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "bottom_justify"); - new_button("center_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "center_justify"); - new_button("channel.png", editpanel_up, editpanel_hi, editpanel_dn, "channel"); - - new_toggle("histogram.png", - editpanel_up, - editpanel_hi, - editpanel_checked, - editpanel_dn, - editpanel_checkedhi, - "histogram_toggle"); - new_toggle("histogram_rgb.png", - editpanel_up, - editpanel_hi, - editpanel_checked, - editpanel_dn, - editpanel_checkedhi, - "histogram_rgb_toggle"); - new_toggle("waveform.png", - editpanel_up, - editpanel_hi, - editpanel_checked, - editpanel_dn, - editpanel_checkedhi, - "waveform_toggle"); - new_toggle("waveform_rgb.png", - editpanel_up, - editpanel_hi, - editpanel_checked, - editpanel_dn, - editpanel_checkedhi, - "waveform_rgb_toggle"); - new_toggle("scope.png", - editpanel_up, - editpanel_hi, - editpanel_checked, - editpanel_dn, - editpanel_checkedhi, - "scope_toggle"); - - new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture"); - new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram"); - - - new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy"); - new_button("commercial.png", editpanel_up, editpanel_hi, editpanel_dn, "commercial"); - new_button("cut.png", editpanel_up, editpanel_hi, editpanel_dn, "cut"); - new_button("fit.png", editpanel_up, editpanel_hi, editpanel_dn, "fit"); - new_button("fitautos.png", editpanel_up, editpanel_hi, editpanel_dn, "fitautos"); - new_button("inpoint.png", editpanel_up, editpanel_hi, editpanel_dn, "inbutton"); - new_button("label.png", editpanel_up, editpanel_hi, editpanel_dn, "labelbutton"); - new_button("left_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "left_justify"); - new_button("magnify.png", editpanel_up, editpanel_hi, editpanel_dn, "magnify_button"); - new_button("middle_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "middle_justify"); - new_button("nextlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "nextlabel"); - new_button("prevlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "prevlabel"); - new_button("nextedit.png", editpanel_up, editpanel_hi, editpanel_dn, "nextedit"); - new_button("prevedit.png", editpanel_up, editpanel_hi, editpanel_dn, "prevedit"); - new_button("outpoint.png", editpanel_up, editpanel_hi, editpanel_dn, "outbutton"); - over_button = new_button("over.png", editpanel_up, editpanel_hi, editpanel_dn); - overwrite_data = new_button("overwrite.png", editpanel_up, editpanel_hi, editpanel_dn); - new_button("paste.png", editpanel_up, editpanel_hi, editpanel_dn, "paste"); - new_button("redo.png", editpanel_up, editpanel_hi, editpanel_dn, "redo"); - new_button("right_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "right_justify"); - splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn); - new_button("toclip.png", editpanel_up, editpanel_hi, editpanel_dn, "toclip"); - new_button("goto.png", editpanel_up, editpanel_hi, editpanel_dn, "goto"); - new_button("top_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "top_justify"); - new_button("undo.png", editpanel_up, editpanel_hi, editpanel_dn, "undo"); - new_button("wrench.png", editpanel_up, editpanel_hi, editpanel_dn, "wrench"); - - - VFrame *transport_up = new_image("transportup.png"); - VFrame *transport_hi = new_image("transporthi.png"); - VFrame *transport_dn = new_image("transportdn.png"); - - new_button("end.png", transport_up, transport_hi, transport_dn, "end"); - new_button("fastfwd.png", transport_up, transport_hi, transport_dn, "fastfwd"); - new_button("fastrev.png", transport_up, transport_hi, transport_dn, "fastrev"); - new_button("play.png", transport_up, transport_hi, transport_dn, "play"); - new_button("framefwd.png", transport_up, transport_hi, transport_dn, "framefwd"); - new_button("framerev.png", transport_up, transport_hi, transport_dn, "framerev"); - new_button("pause.png", transport_up, transport_hi, transport_dn, "pause"); - new_button("record.png", transport_up, transport_hi, transport_dn, "record"); - new_button("singleframe.png", transport_up, transport_hi, transport_dn, "recframe"); - new_button("reverse.png", transport_up, transport_hi, transport_dn, "reverse"); - new_button("rewind.png", transport_up, transport_hi, transport_dn, "rewind"); - new_button("stop.png", transport_up, transport_hi, transport_dn, "stop"); - new_button("stop.png", transport_up, transport_hi, transport_dn, "stoprec"); - - - -// CWindow icons - new_image("cwindow_inactive", "cwindow_inactive.png"); - new_image("cwindow_active", "cwindow_active.png"); - - - - new_image_set("category_button", - 3, - "preferencesbutton_dn.png", - "preferencesbutton_dnhi.png", - "preferencesbutton_dnlo.png"); - - new_image_set("category_button_checked", - 3, - "preferencesbutton_up.png", - "preferencesbutton_uphi.png", - "preferencesbutton_dnlo.png"); - - - - - - new_image_set("color3way_point", - 3, - "color3way_up.png", - "color3way_hi.png", - "color3way_dn.png"); - - new_toggle("arrow.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "arrow"); - new_toggle("autokeyframe.png", transport_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "autokeyframe"); - new_toggle("ibeam.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "ibeam"); - new_toggle("show_meters.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "meters"); - new_toggle("blank30x30.png", - new_image("locklabels_locked.png"), - new_image("locklabels_lockedhi.png"), - new_image("locklabels_unlocked.png"), - new_image("locklabels_dn.png"), // can't have seperate down for each!!?? - new_image("locklabels_unlockedhi.png"), - "locklabels"); - - VFrame *cpanel_up = new_image("cpanel_up.png"); - VFrame *cpanel_hi = new_image("cpanel_hi.png"); - VFrame *cpanel_dn = new_image("cpanel_dn.png"); - VFrame *cpanel_checked = new_image("cpanel_checked.png"); - VFrame *cpanel_checkedhi = new_image("cpanel_checkedhi.png"); - - - new_toggle("camera.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "camera"); - new_toggle("crop.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "crop"); - new_toggle("eyedrop.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "eyedrop"); - new_toggle("magnify.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "magnify"); - new_toggle("mask.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "mask"); - new_toggle("ruler.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "ruler"); - new_toggle("projector.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "projector"); - new_toggle("protect.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "protect"); - new_toggle("titlesafe.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "titlesafe"); - new_toggle("toolwindow.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "tool"); - - // toggle for tangent mode (compositor/tool window) - new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); - new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - - - flush_images(); - - title_font = MEDIUMFONT_3D; - title_color = 0xbfbfbf; - recordgui_fixed_color = YELLOW; - recordgui_variable_color = RED; - - channel_position_color = MEYELLOW; - resources->meter_title_w = 25; - - // (asset) edit info text color - edit_font_color = YELLOW; -} - -#define VWINDOW_METER_MARGIN 5 - - - - - - - - - - - -void FiveK::build_bg_data() -{ -// Audio settings - channel_position_data = new VFrame(get_image_data("channel_position.png")); - -// Track bitmaps - new_image("resource1024", "resource1024.png"); - new_image("resource512", "resource512.png"); - new_image("resource256", "resource256.png"); - new_image("resource128", "resource128.png"); - new_image("resource64", "resource64.png"); - new_image("resource32", "resource32.png"); - new_image("plugin_bg_data", "plugin_bg.png"); - new_image("title_bg_data", "title_bg.png"); - new_image("vtimebar_bg_data", "vwindow_timebar.png"); -} - - - -void FiveK::build_overlays() -{ - keyframe_data = new VFrame(get_image_data("keyframe3.png")); - camerakeyframe_data = new VFrame(get_image_data("camerakeyframe.png")); - maskkeyframe_data = new VFrame(get_image_data("maskkeyframe.png")); - modekeyframe_data = new VFrame(get_image_data("modekeyframe.png")); - pankeyframe_data = new VFrame(get_image_data("pankeyframe.png")); - projectorkeyframe_data = new VFrame(get_image_data("projectorkeyframe.png")); -} - - - - - - - - - -void FiveK::draw_rwindow_bg(RecordGUI *gui) -{ -// int y; -// int margin = 50; -// int margin2 = 80; -// gui->draw_9segment(recordgui_batch_x - margin, -// 0, -// mwindow->session->rwindow_w - recordgui_status_x + margin, -// recordgui_buttons_y, -// rgui_batch); -// gui->draw_3segmenth(recordgui_options_x - margin2, -// recordgui_buttons_y - 5, -// mwindow->session->rwindow_w - recordgui_options_x + margin2, -// rgui_controls); -// y = recordgui_buttons_y - 5 + rgui_controls->get_h(); -// gui->draw_9segment(0, -// y, -// mwindow->session->rwindow_w, -// mwindow->session->rwindow_h - y, -// rgui_list); -} - -void FiveK::draw_rmonitor_bg(RecordMonitorGUI *gui) -{ -// int margin = 45; -// int panel_w = 300; -// int x = rmonitor_meter_x - margin; -// int w = mwindow->session->rmonitor_w - x; -// if(w < rmonitor_meters->get_w()) w = rmonitor_meters->get_w(); -// gui->clear_box(0, -// 0, -// mwindow->session->rmonitor_w, -// mwindow->session->rmonitor_h); -// gui->draw_9segment(x, -// 0, -// w, -// mwindow->session->rmonitor_h, -// rmonitor_meters); -} - - - -void FiveK::get_mwindow_sizes(MWindowGUI *gui, int w, int h) -{ - Theme::get_mwindow_sizes(gui, w, h); - mclock_w = get_image("clock_bg")->get_w() - 60; -} - - -void FiveK::draw_mwindow_bg(MWindowGUI *gui) -{ -// Button bar - gui->draw_3segmenth(mbuttons_x, - mbuttons_y - 1, - mwindow->session->mwindow_w, - get_image("mbutton_bg")); - - int pdw = get_image("panel_divider")->get_w(); - int x = mbuttons_x; - x += 9 * get_image("play")->get_w(); - x += mtransport_margin; // the control buttons - - gui->draw_vframe(get_image("panel_divider"), - x - toggle_margin / 2 - pdw / 2 + 2, - mbuttons_y - 1); - x += 2 * get_image("arrow")->get_w() + toggle_margin; // the mode buttons - - gui->draw_vframe(get_image("panel_divider"), - x - toggle_margin / 2 - pdw / 2 + 2, - mbuttons_y - 1); - x += 2 * get_image("autokeyframe")->get_w() + toggle_margin; // the state toggle buttons - - gui->draw_vframe(get_image("panel_divider"), - x - toggle_margin / 2 - pdw / 2 + 2, - mbuttons_y - 1); - -// Clock - gui->draw_3segmenth(0, - mbuttons_y - 1 + get_image("mbutton_bg")->get_h(), - get_image("patchbay_bg")->get_w(), - get_image("clock_bg")); - -// Patchbay -//printf("FiveK::draw_mwindow_bg %d %d %d\n", __LINE__, -//mclock_h, -//mtimebar_h); - gui->draw_3segmentv(patchbay_x, - patchbay_y, - patchbay_h, - get_image("patchbay_bg")); - -// Track canvas - gui->set_color(BLACK); - gui->draw_box(mcanvas_x + get_image("patchbay_bg")->get_w(), - mcanvas_y + mtimebar_h, - mcanvas_w - BC_ScrollBar::get_span(SCROLL_VERT), - mcanvas_h - BC_ScrollBar::get_span(SCROLL_HORIZ) - mtimebar_h); - -// Timebar - gui->draw_3segmenth(mtimebar_x, - mtimebar_y, - mtimebar_w, - get_image("timebar_bg")); - -// Zoombar - gui->set_color(0x373737); - gui->draw_box(mzoom_x, - mzoom_y, - mwindow->session->mwindow_w, - 25); - -// Scrollbar filler -// gui->draw_vframe(get_image("mscroll_filler"), -// mcanvas_x + mcanvas_w - BC_ScrollBar::get_span(SCROLL_VERT), -// mcanvas_y + mcanvas_h - BC_ScrollBar::get_span(SCROLL_HORIZ)); - -// Status - gui->draw_3segmenth(mzoom_x, - mzoom_y, - mzoom_w, - get_image("statusbar")); - - -} - -void FiveK::draw_cwindow_bg(CWindowGUI *gui) -{ - gui->draw_3segmentv(0, 0, ccomposite_h, get_image("cpanel_bg")); - - gui->draw_3segmenth(0, ccomposite_h, cstatus_x, get_image("cbuttons_left")); - - if(mwindow->edl->session->cwindow_meter) - { - gui->draw_3segmenth(cstatus_x, - ccomposite_h, - cmeter_x - widget_border - cstatus_x, - get_image("cbuttons_right")); - gui->draw_9segment(cmeter_x - widget_border, - 0, - mwindow->session->cwindow_w - cmeter_x + widget_border, - mwindow->session->cwindow_h, - get_image("cmeter_bg")); - } - else - { - gui->draw_3segmenth(cstatus_x, - ccomposite_h, - cmeter_x - widget_border - cstatus_x + 100, - get_image("cbuttons_right")); - } -} - -void FiveK::draw_vwindow_bg(VWindowGUI *gui) -{ - gui->draw_3segmenth(0, - vcanvas_h, - vdivision_x, - get_image("vbuttons_left")); - if(mwindow->edl->session->vwindow_meter) - { - gui->draw_3segmenth(vdivision_x, - vcanvas_h, - vmeter_x - widget_border - vdivision_x, - get_image("cbuttons_right")); - gui->draw_9segment(vmeter_x - widget_border, - 0, - mwindow->session->vwindow_w - vmeter_x + widget_border, - mwindow->session->vwindow_h, - get_image("cmeter_bg")); - } - else - { - gui->draw_3segmenth(vdivision_x, - vcanvas_h, - vmeter_x - widget_border - vdivision_x + 100, - get_image("cbuttons_right")); - } - -// Clock border - gui->draw_3segmenth(vtime_x - 20, - vtime_y - 1, - vtime_w + 40, - get_image("vclock")); -} - - -void FiveK::draw_preferences_bg(PreferencesWindow *gui) -{ - gui->draw_vframe(get_image("preferences_bg"), 0, 0); -} - -void FiveK::draw_new_bg(NewWindow *gui) -{ - gui->draw_vframe(get_image("new_bg"), 0, 0); -} - -void FiveK::draw_setformat_bg(SetFormatWindow *gui) -{ - gui->draw_vframe(get_image("setformat_bg"), 0, 0); -} - - - - - - - diff --git a/cinelerra-5.0/plugins/5k/5k.h b/cinelerra-5.0/plugins/5k/5k.h deleted file mode 100644 index 14c48741..00000000 --- a/cinelerra-5.0/plugins/5k/5k.h +++ /dev/null @@ -1,78 +0,0 @@ - -/* - * CINELERRA - * Copyright (C) 2008 Adam Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#ifndef DEFAULTTHEME_H -#define DEFAULTTHEME_H - -#include "new.inc" -#include "plugintclient.h" -#include "preferencesthread.inc" -#include "statusbar.inc" -#include "theme.h" -#include "timebar.inc" - -class FiveK : public Theme -{ -public: - FiveK(); - ~FiveK(); - - void initialize(); - void get_mwindow_sizes(MWindowGUI *gui, int w, int h); - void draw_mwindow_bg(MWindowGUI *gui); - - void draw_rwindow_bg(RecordGUI *gui); - void draw_rmonitor_bg(RecordMonitorGUI *gui); - void draw_cwindow_bg(CWindowGUI *gui); - void draw_vwindow_bg(VWindowGUI *gui); - void draw_preferences_bg(PreferencesWindow *gui); - - - void draw_new_bg(NewWindow *gui); - void draw_setformat_bg(SetFormatWindow *gui); - -private: - void build_bg_data(); - void build_patches(); - void build_overlays(); - - - - - -}; - - - -class FiveKMain : public PluginTClient -{ -public: - FiveKMain(PluginServer *server); - ~FiveKMain(); - - const char* plugin_title(); - Theme* new_theme(); - - FiveK *theme; -}; - - -#endif diff --git a/cinelerra-5.0/plugins/5k/Makefile b/cinelerra-5.0/plugins/5k/Makefile deleted file mode 100644 index f70659dd..00000000 --- a/cinelerra-5.0/plugins/5k/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -include ../../global_config - -PLUGIN = 5k -OBJS = $(OBJDIR)/5k.o -OUTPUT_THEME = $(OUTPUT) - -AVC_DIR := $(shell cd ../../thirdparty/libavc*; pwd) -CFLAGS += -I$(AVC_DIR) - -include ../../plugin_config - -$(OBJDIR)/5k.o: 5k.C - diff --git a/cinelerra-5.0/plugins/5k/data/0.png b/cinelerra-5.0/plugins/5k/data/0.png deleted file mode 100644 index 196fb15a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/0.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/1.png b/cinelerra-5.0/plugins/5k/data/1.png deleted file mode 100644 index 184ba0d7..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/1.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/2.png b/cinelerra-5.0/plugins/5k/data/2.png deleted file mode 100644 index 309a0ecd..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/2.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/3.png b/cinelerra-5.0/plugins/5k/data/3.png deleted file mode 100644 index 29959f16..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/3.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/4.png b/cinelerra-5.0/plugins/5k/data/4.png deleted file mode 100644 index 0b850cdf..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/4.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/5.png b/cinelerra-5.0/plugins/5k/data/5.png deleted file mode 100644 index 96971b66..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/5.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/6.png b/cinelerra-5.0/plugins/5k/data/6.png deleted file mode 100644 index 93cb3aaa..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/6.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/7.png b/cinelerra-5.0/plugins/5k/data/7.png deleted file mode 100644 index 09fdade8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/7.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/8.png b/cinelerra-5.0/plugins/5k/data/8.png deleted file mode 100644 index 694d48d6..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/8.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/9.png b/cinelerra-5.0/plugins/5k/data/9.png deleted file mode 100644 index 5506e358..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/9.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/a.png b/cinelerra-5.0/plugins/5k/data/a.png deleted file mode 100644 index 2ae2c525..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/a.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/about.png b/cinelerra-5.0/plugins/5k/data/about.png deleted file mode 100644 index 4fa4ec1f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/about.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/about_bg.png b/cinelerra-5.0/plugins/5k/data/about_bg.png deleted file mode 100644 index bf0f1ad2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/about_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/aeffect_icon.png b/cinelerra-5.0/plugins/5k/data/aeffect_icon.png deleted file mode 100644 index 5a69c3a9..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/aeffect_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/antenna.png b/cinelerra-5.0/plugins/5k/data/antenna.png deleted file mode 100644 index 06072e5a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/antenna.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/arrow.png b/cinelerra-5.0/plugins/5k/data/arrow.png deleted file mode 100644 index c5e4d4c6..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/arrow.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/atransition_icon.png b/cinelerra-5.0/plugins/5k/data/atransition_icon.png deleted file mode 100644 index d73ccb1f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/atransition_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/autokeyframe.png b/cinelerra-5.0/plugins/5k/data/autokeyframe.png deleted file mode 100644 index a65f1e73..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/autokeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/b.png b/cinelerra-5.0/plugins/5k/data/b.png deleted file mode 100644 index 9d7a6975..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/b.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_dn.png b/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_dn.png deleted file mode 100644 index 985c7cb0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_dnhi.png b/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_dnhi.png deleted file mode 100644 index 441138e2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_dnhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_dnlo.png b/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_dnlo.png deleted file mode 100644 index 2b6a3ce8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_dnlo.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_up.png b/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_up.png deleted file mode 100644 index 3223ec6f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_uphi.png b/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_uphi.png deleted file mode 100644 index a77c8527..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bak/preferencesbutton_uphi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_dn.png b/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_dn.png deleted file mode 100644 index 511905e1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_dnhi.png b/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_dnhi.png deleted file mode 100644 index 8757b3f1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_dnhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_dnlo.png b/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_dnlo.png deleted file mode 100644 index cf3c9dfc..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_dnlo.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_up.png b/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_up.png deleted file mode 100644 index 45daa5c0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_uphi.png b/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_uphi.png deleted file mode 100644 index 3e35fb58..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bak2/preferencesbutton_uphi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bar.png b/cinelerra-5.0/plugins/5k/data/bar.png deleted file mode 100644 index a1e237cf..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bar.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/blank30x30.png b/cinelerra-5.0/plugins/5k/data/blank30x30.png deleted file mode 100644 index 39c5e55a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/blank30x30.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/bottom_justify.png b/cinelerra-5.0/plugins/5k/data/bottom_justify.png deleted file mode 100644 index 110d09f6..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/bottom_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/buttonbar.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/buttonbar.xcf.bz2 deleted file mode 100644 index baf5c8cd..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/buttonbar.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/c.png b/cinelerra-5.0/plugins/5k/data/c.png deleted file mode 100644 index bfee0220..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/c.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/camera.png b/cinelerra-5.0/plugins/5k/data/camera.png deleted file mode 100644 index eb9cc288..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/camera.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/camerakeyframe.png b/cinelerra-5.0/plugins/5k/data/camerakeyframe.png deleted file mode 100644 index 0fefa82a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/camerakeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cancel.png b/cinelerra-5.0/plugins/5k/data/cancel.png deleted file mode 100644 index 87299a7d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cancel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cbuttons_left.png b/cinelerra-5.0/plugins/5k/data/cbuttons_left.png deleted file mode 100644 index 9890741c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cbuttons_left.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cbuttons_right.png b/cinelerra-5.0/plugins/5k/data/cbuttons_right.png deleted file mode 100644 index ab695b6b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cbuttons_right.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/center_justify.png b/cinelerra-5.0/plugins/5k/data/center_justify.png deleted file mode 100644 index 022c12bf..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/center_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/channel.png b/cinelerra-5.0/plugins/5k/data/channel.png deleted file mode 100644 index 3f88a8ff..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/channel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/channel_position.png b/cinelerra-5.0/plugins/5k/data/channel_position.png deleted file mode 100644 index c6c49aa0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/channel_position.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/check.png b/cinelerra-5.0/plugins/5k/data/check.png deleted file mode 100644 index 64deb932..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/check.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/checkbox_checked.png b/cinelerra-5.0/plugins/5k/data/checkbox_checked.png deleted file mode 100644 index c115c32d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/checkbox_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/checkbox_checkedhi.png b/cinelerra-5.0/plugins/5k/data/checkbox_checkedhi.png deleted file mode 100644 index 046ff11f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/checkbox_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/checkbox_dn.png b/cinelerra-5.0/plugins/5k/data/checkbox_dn.png deleted file mode 100644 index fb34441c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/checkbox_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/checkbox_hi.png b/cinelerra-5.0/plugins/5k/data/checkbox_hi.png deleted file mode 100644 index 3a8c6ad5..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/checkbox_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/checkbox_up.png b/cinelerra-5.0/plugins/5k/data/checkbox_up.png deleted file mode 100644 index 02f3d54f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/checkbox_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/clearinpoint.png b/cinelerra-5.0/plugins/5k/data/clearinpoint.png deleted file mode 100644 index 36356b7d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/clearinpoint.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/clearoutpoint.png b/cinelerra-5.0/plugins/5k/data/clearoutpoint.png deleted file mode 100644 index 6b05707f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/clearoutpoint.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/clip_icon.png b/cinelerra-5.0/plugins/5k/data/clip_icon.png deleted file mode 100644 index 9b1d2787..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/clip_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/clock.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/clock.xcf.bz2 deleted file mode 100644 index ba8e66d5..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/clock.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/closetip.png b/cinelerra-5.0/plugins/5k/data/closetip.png deleted file mode 100644 index 75125cb9..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/closetip.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cmeter_bg.png b/cinelerra-5.0/plugins/5k/data/cmeter_bg.png deleted file mode 100644 index 35a80c4d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cmeter_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/colon.png b/cinelerra-5.0/plugins/5k/data/colon.png deleted file mode 100644 index 5c642350..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/colon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/color3way_dn.png b/cinelerra-5.0/plugins/5k/data/color3way_dn.png deleted file mode 100644 index fad9ed65..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/color3way_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/color3way_hi.png b/cinelerra-5.0/plugins/5k/data/color3way_hi.png deleted file mode 100644 index a9377da6..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/color3way_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/color3way_point.png b/cinelerra-5.0/plugins/5k/data/color3way_point.png deleted file mode 100644 index 1934b8e0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/color3way_point.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/color3way_up.png b/cinelerra-5.0/plugins/5k/data/color3way_up.png deleted file mode 100644 index e2fef63c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/color3way_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/column_dn.png b/cinelerra-5.0/plugins/5k/data/column_dn.png deleted file mode 100644 index 6201333f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/column_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/column_hi.png b/cinelerra-5.0/plugins/5k/data/column_hi.png deleted file mode 100644 index fe6c180a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/column_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/column_up.png b/cinelerra-5.0/plugins/5k/data/column_up.png deleted file mode 100644 index 0709e162..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/column_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/commercial.png b/cinelerra-5.0/plugins/5k/data/commercial.png deleted file mode 100644 index a1eae6e0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/commercial.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/configure.png b/cinelerra-5.0/plugins/5k/data/configure.png deleted file mode 100644 index 4b20dbcd..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/configure.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/copy.png b/cinelerra-5.0/plugins/5k/data/copy.png deleted file mode 100644 index b82d4fb4..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/copy.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cpanel_bg.png b/cinelerra-5.0/plugins/5k/data/cpanel_bg.png deleted file mode 100644 index bbb0ca92..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cpanel_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cpanel_checked.png b/cinelerra-5.0/plugins/5k/data/cpanel_checked.png deleted file mode 100644 index 6f36c7e3..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cpanel_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cpanel_checkedhi.png b/cinelerra-5.0/plugins/5k/data/cpanel_checkedhi.png deleted file mode 100644 index 1a660646..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cpanel_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cpanel_dn.png b/cinelerra-5.0/plugins/5k/data/cpanel_dn.png deleted file mode 100644 index 1418124a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cpanel_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cpanel_hi.png b/cinelerra-5.0/plugins/5k/data/cpanel_hi.png deleted file mode 100644 index aca8c70a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cpanel_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cpanel_up.png b/cinelerra-5.0/plugins/5k/data/cpanel_up.png deleted file mode 100644 index 59f34c9f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cpanel_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/crop.png b/cinelerra-5.0/plugins/5k/data/crop.png deleted file mode 100644 index 2eea5ccd..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/crop.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cut.png b/cinelerra-5.0/plugins/5k/data/cut.png deleted file mode 100644 index 174d2ef5..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cut.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cwindow_active.png b/cinelerra-5.0/plugins/5k/data/cwindow_active.png deleted file mode 100644 index 259fb44b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cwindow_active.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/cwindow_inactive.png b/cinelerra-5.0/plugins/5k/data/cwindow_inactive.png deleted file mode 100644 index b0687d95..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/cwindow_inactive.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/d.png b/cinelerra-5.0/plugins/5k/data/d.png deleted file mode 100644 index 6b0f4f5c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/d.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/dash.png b/cinelerra-5.0/plugins/5k/data/dash.png deleted file mode 100644 index 01321e98..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/dash.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/delete.png b/cinelerra-5.0/plugins/5k/data/delete.png deleted file mode 100644 index 200b9ea4..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/delete.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/downmix51_2.png b/cinelerra-5.0/plugins/5k/data/downmix51_2.png deleted file mode 100644 index 3cbcaf72..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/downmix51_2.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/drawpatch.png b/cinelerra-5.0/plugins/5k/data/drawpatch.png deleted file mode 100644 index 5cff6410..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/drawpatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/duplex.png b/cinelerra-5.0/plugins/5k/data/duplex.png deleted file mode 100644 index 4abd4e7c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/duplex.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/e.png b/cinelerra-5.0/plugins/5k/data/e.png deleted file mode 100644 index 8b12e9a1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/e.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/editpanel.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/editpanel.xcf.bz2 deleted file mode 100644 index f05913bd..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/editpanel.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/editpanel_checked.png b/cinelerra-5.0/plugins/5k/data/editpanel_checked.png deleted file mode 100644 index 1226b363..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/editpanel_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/editpanel_checkedhi.png b/cinelerra-5.0/plugins/5k/data/editpanel_checkedhi.png deleted file mode 100644 index 36fbc74c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/editpanel_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/editpanel_dn.png b/cinelerra-5.0/plugins/5k/data/editpanel_dn.png deleted file mode 100644 index ad4fa60a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/editpanel_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/editpanel_hi.png b/cinelerra-5.0/plugins/5k/data/editpanel_hi.png deleted file mode 100644 index 8434e66d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/editpanel_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/editpanel_up.png b/cinelerra-5.0/plugins/5k/data/editpanel_up.png deleted file mode 100644 index f964f994..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/editpanel_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/end.png b/cinelerra-5.0/plugins/5k/data/end.png deleted file mode 100644 index 4f33e729..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/end.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/expandpatch.png b/cinelerra-5.0/plugins/5k/data/expandpatch.png deleted file mode 100644 index b5067efe..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/expandpatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/expandpatch_checked.png b/cinelerra-5.0/plugins/5k/data/expandpatch_checked.png deleted file mode 100644 index b83cb92d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/expandpatch_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/expandpatch_checkedhi.png b/cinelerra-5.0/plugins/5k/data/expandpatch_checkedhi.png deleted file mode 100644 index ed3d3d74..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/expandpatch_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/expandpatch_dn.png b/cinelerra-5.0/plugins/5k/data/expandpatch_dn.png deleted file mode 100644 index 19783442..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/expandpatch_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/expandpatch_hi.png b/cinelerra-5.0/plugins/5k/data/expandpatch_hi.png deleted file mode 100644 index 37da94c1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/expandpatch_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/expandpatch_up.png b/cinelerra-5.0/plugins/5k/data/expandpatch_up.png deleted file mode 100644 index 0d9ec4ff..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/expandpatch_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/eyedrop.png b/cinelerra-5.0/plugins/5k/data/eyedrop.png deleted file mode 100644 index 48a51160..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/eyedrop.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/f.png b/cinelerra-5.0/plugins/5k/data/f.png deleted file mode 100644 index 654d96e9..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/f.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/fastfwd.png b/cinelerra-5.0/plugins/5k/data/fastfwd.png deleted file mode 100644 index 9d086956..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/fastfwd.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/fastrev.png b/cinelerra-5.0/plugins/5k/data/fastrev.png deleted file mode 100644 index 3b9b909b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/fastrev.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/filebox.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/filebox.xcf.bz2 deleted file mode 100644 index 87aaa3af..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/filebox.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/filebox_bigbutton_dn.png b/cinelerra-5.0/plugins/5k/data/filebox_bigbutton_dn.png deleted file mode 100644 index 33b57d4d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/filebox_bigbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/filebox_bigbutton_hi.png b/cinelerra-5.0/plugins/5k/data/filebox_bigbutton_hi.png deleted file mode 100644 index 9a4c83bd..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/filebox_bigbutton_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/filebox_bigbutton_up.png b/cinelerra-5.0/plugins/5k/data/filebox_bigbutton_up.png deleted file mode 100644 index 80e8504e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/filebox_bigbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/fileboxbutton_dn.png b/cinelerra-5.0/plugins/5k/data/fileboxbutton_dn.png deleted file mode 100644 index 101f4c27..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/fileboxbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/fileboxbutton_hi.png b/cinelerra-5.0/plugins/5k/data/fileboxbutton_hi.png deleted file mode 100644 index 3b56bfc6..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/fileboxbutton_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/fileboxbutton_up.png b/cinelerra-5.0/plugins/5k/data/fileboxbutton_up.png deleted file mode 100644 index 6037ac78..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/fileboxbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/fit.png b/cinelerra-5.0/plugins/5k/data/fit.png deleted file mode 100644 index 31ae12eb..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/fit.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/fitautos.png b/cinelerra-5.0/plugins/5k/data/fitautos.png deleted file mode 100644 index 2c4e7af0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/fitautos.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/folder.png b/cinelerra-5.0/plugins/5k/data/folder.png deleted file mode 100644 index 8acd4dec..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/folder.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/framefwd.png b/cinelerra-5.0/plugins/5k/data/framefwd.png deleted file mode 100644 index 8333728b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/framefwd.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/framerev.png b/cinelerra-5.0/plugins/5k/data/framerev.png deleted file mode 100644 index a0d3c18f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/framerev.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/gangpatch.png b/cinelerra-5.0/plugins/5k/data/gangpatch.png deleted file mode 100644 index 6b1e606b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/gangpatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/generic_dn.png b/cinelerra-5.0/plugins/5k/data/generic_dn.png deleted file mode 100644 index 2df647d3..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/generic_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/generic_hi.png b/cinelerra-5.0/plugins/5k/data/generic_hi.png deleted file mode 100644 index ee3928ba..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/generic_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/generic_up.png b/cinelerra-5.0/plugins/5k/data/generic_up.png deleted file mode 100644 index 46efb79f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/generic_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/generickeyframe.png b/cinelerra-5.0/plugins/5k/data/generickeyframe.png deleted file mode 100644 index e3a95cc4..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/generickeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/goto.png b/cinelerra-5.0/plugins/5k/data/goto.png deleted file mode 100644 index 513f964f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/goto.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/heroine_icon.png b/cinelerra-5.0/plugins/5k/data/heroine_icon.png deleted file mode 100644 index 8694da90..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/heroine_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/histogram.png b/cinelerra-5.0/plugins/5k/data/histogram.png deleted file mode 100644 index 0f7da6eb..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/histogram.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/histogram_carrot_checked.png b/cinelerra-5.0/plugins/5k/data/histogram_carrot_checked.png deleted file mode 100644 index 8e5840a9..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/histogram_carrot_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/histogram_carrot_checkedhi.png b/cinelerra-5.0/plugins/5k/data/histogram_carrot_checkedhi.png deleted file mode 100644 index 1fcfff69..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/histogram_carrot_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/histogram_carrot_dn.png b/cinelerra-5.0/plugins/5k/data/histogram_carrot_dn.png deleted file mode 100644 index 0fb61fb1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/histogram_carrot_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/histogram_carrot_hi.png b/cinelerra-5.0/plugins/5k/data/histogram_carrot_hi.png deleted file mode 100644 index 81d78997..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/histogram_carrot_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/histogram_carrot_up.png b/cinelerra-5.0/plugins/5k/data/histogram_carrot_up.png deleted file mode 100644 index cfd43b2f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/histogram_carrot_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/histogram_rgb.png b/cinelerra-5.0/plugins/5k/data/histogram_rgb.png deleted file mode 100644 index a68050a1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/histogram_rgb.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hscroll_handle_bg.png b/cinelerra-5.0/plugins/5k/data/hscroll_handle_bg.png deleted file mode 100644 index 0e722adb..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hscroll_handle_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hscroll_handle_dn.png b/cinelerra-5.0/plugins/5k/data/hscroll_handle_dn.png deleted file mode 100644 index 05b0533d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hscroll_handle_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hscroll_handle_hi.png b/cinelerra-5.0/plugins/5k/data/hscroll_handle_hi.png deleted file mode 100644 index 6e4dd55d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hscroll_handle_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hscroll_handle_up.png b/cinelerra-5.0/plugins/5k/data/hscroll_handle_up.png deleted file mode 100644 index a19784ce..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hscroll_handle_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hscroll_left_dn.png b/cinelerra-5.0/plugins/5k/data/hscroll_left_dn.png deleted file mode 100644 index 830d3a78..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hscroll_left_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hscroll_left_hi.png b/cinelerra-5.0/plugins/5k/data/hscroll_left_hi.png deleted file mode 100644 index 66dbf22b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hscroll_left_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hscroll_left_up.png b/cinelerra-5.0/plugins/5k/data/hscroll_left_up.png deleted file mode 100644 index 62eb0059..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hscroll_left_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hscroll_right_dn.png b/cinelerra-5.0/plugins/5k/data/hscroll_right_dn.png deleted file mode 100644 index 078c6534..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hscroll_right_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hscroll_right_hi.png b/cinelerra-5.0/plugins/5k/data/hscroll_right_hi.png deleted file mode 100644 index 7e507298..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hscroll_right_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hscroll_right_up.png b/cinelerra-5.0/plugins/5k/data/hscroll_right_up.png deleted file mode 100644 index 2b57c724..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hscroll_right_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hslider_bg_dn.png b/cinelerra-5.0/plugins/5k/data/hslider_bg_dn.png deleted file mode 100644 index 27e78d65..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hslider_bg_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hslider_bg_hi.png b/cinelerra-5.0/plugins/5k/data/hslider_bg_hi.png deleted file mode 100644 index 872e5b20..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hslider_bg_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hslider_bg_up.png b/cinelerra-5.0/plugins/5k/data/hslider_bg_up.png deleted file mode 100644 index 467c174a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hslider_bg_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hslider_fg_dn.png b/cinelerra-5.0/plugins/5k/data/hslider_fg_dn.png deleted file mode 100644 index d2da18e9..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hslider_fg_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hslider_fg_hi.png b/cinelerra-5.0/plugins/5k/data/hslider_fg_hi.png deleted file mode 100644 index 553fd9f2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hslider_fg_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/hslider_fg_up.png b/cinelerra-5.0/plugins/5k/data/hslider_fg_up.png deleted file mode 100644 index 58aae510..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/hslider_fg_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ibeam.png b/cinelerra-5.0/plugins/5k/data/ibeam.png deleted file mode 100644 index 1fd1e111..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ibeam.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/icons.png b/cinelerra-5.0/plugins/5k/data/icons.png deleted file mode 100644 index bfde0416..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/icons.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/in_checked.png b/cinelerra-5.0/plugins/5k/data/in_checked.png deleted file mode 100644 index 5b22ecbf..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/in_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/in_checkedhi.png b/cinelerra-5.0/plugins/5k/data/in_checkedhi.png deleted file mode 100644 index f1323992..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/in_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/in_dn.png b/cinelerra-5.0/plugins/5k/data/in_dn.png deleted file mode 100644 index d5517b46..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/in_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/in_hi.png b/cinelerra-5.0/plugins/5k/data/in_hi.png deleted file mode 100644 index db52c7b6..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/in_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/in_up.png b/cinelerra-5.0/plugins/5k/data/in_up.png deleted file mode 100644 index e89aecba..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/in_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/inpoint.png b/cinelerra-5.0/plugins/5k/data/inpoint.png deleted file mode 100644 index facf490b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/inpoint.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/keyframe.png b/cinelerra-5.0/plugins/5k/data/keyframe.png deleted file mode 100644 index ea305d8f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/keyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/keyframe2.png b/cinelerra-5.0/plugins/5k/data/keyframe2.png deleted file mode 100644 index 065e99c8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/keyframe2.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/keyframe3.png b/cinelerra-5.0/plugins/5k/data/keyframe3.png deleted file mode 100644 index bb6febbc..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/keyframe3.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/label.png b/cinelerra-5.0/plugins/5k/data/label.png deleted file mode 100644 index f9744afb..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/label.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/label_checked.png b/cinelerra-5.0/plugins/5k/data/label_checked.png deleted file mode 100644 index aaf69d3e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/label_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/label_checkedhi.png b/cinelerra-5.0/plugins/5k/data/label_checkedhi.png deleted file mode 100644 index 93322250..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/label_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/labeltoggle_dn.png b/cinelerra-5.0/plugins/5k/data/labeltoggle_dn.png deleted file mode 100644 index f8ce2b51..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/labeltoggle_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/labeltoggle_up.png b/cinelerra-5.0/plugins/5k/data/labeltoggle_up.png deleted file mode 100644 index 0d09e344..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/labeltoggle_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/labeltoggle_uphi.png b/cinelerra-5.0/plugins/5k/data/labeltoggle_uphi.png deleted file mode 100644 index 40164d2d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/labeltoggle_uphi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/left_justify.png b/cinelerra-5.0/plugins/5k/data/left_justify.png deleted file mode 100644 index ca8c76a9..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/left_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/listbox_button.png b/cinelerra-5.0/plugins/5k/data/listbox_button.png deleted file mode 100644 index 691d32a7..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/listbox_button.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/listbox_dn.png b/cinelerra-5.0/plugins/5k/data/listbox_dn.png deleted file mode 100644 index a897a681..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/listbox_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/listbox_up.png b/cinelerra-5.0/plugins/5k/data/listbox_up.png deleted file mode 100644 index 13adce2a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/listbox_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_cat.png b/cinelerra-5.0/plugins/5k/data/loadmode_cat.png deleted file mode 100644 index a103c436..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_cat.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_checked.png b/cinelerra-5.0/plugins/5k/data/loadmode_checked.png deleted file mode 100644 index b3701565..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_checkedhi.png b/cinelerra-5.0/plugins/5k/data/loadmode_checkedhi.png deleted file mode 100644 index 2a5c484e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_dn.png b/cinelerra-5.0/plugins/5k/data/loadmode_dn.png deleted file mode 100644 index 0f5ceeef..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_hi.png b/cinelerra-5.0/plugins/5k/data/loadmode_hi.png deleted file mode 100644 index dded1505..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_nested.png b/cinelerra-5.0/plugins/5k/data/loadmode_nested.png deleted file mode 100644 index a1bb86b5..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_nested.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_new.png b/cinelerra-5.0/plugins/5k/data/loadmode_new.png deleted file mode 100644 index 11d5a0df..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_new.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_newcat.png b/cinelerra-5.0/plugins/5k/data/loadmode_newcat.png deleted file mode 100644 index ac851116..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_newcat.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_newtracks.png b/cinelerra-5.0/plugins/5k/data/loadmode_newtracks.png deleted file mode 100644 index 017ef88b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_newtracks.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_none.png b/cinelerra-5.0/plugins/5k/data/loadmode_none.png deleted file mode 100644 index 6efb68f3..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_none.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_paste.png b/cinelerra-5.0/plugins/5k/data/loadmode_paste.png deleted file mode 100644 index f1bcef7c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_paste.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_resource.png b/cinelerra-5.0/plugins/5k/data/loadmode_resource.png deleted file mode 100644 index c1efcf44..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_resource.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/loadmode_up.png b/cinelerra-5.0/plugins/5k/data/loadmode_up.png deleted file mode 100644 index 1bd32e7f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/loadmode_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/locklabels_dn.png b/cinelerra-5.0/plugins/5k/data/locklabels_dn.png deleted file mode 100644 index 0a1563b4..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/locklabels_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/locklabels_locked.png b/cinelerra-5.0/plugins/5k/data/locklabels_locked.png deleted file mode 100644 index f4963ed2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/locklabels_locked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/locklabels_lockedhi.png b/cinelerra-5.0/plugins/5k/data/locklabels_lockedhi.png deleted file mode 100644 index 236325e6..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/locklabels_lockedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/locklabels_unlocked.png b/cinelerra-5.0/plugins/5k/data/locklabels_unlocked.png deleted file mode 100644 index 5b16bec7..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/locklabels_unlocked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/locklabels_unlockedhi.png b/cinelerra-5.0/plugins/5k/data/locklabels_unlockedhi.png deleted file mode 100644 index f16e0c1d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/locklabels_unlockedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/magnify.png b/cinelerra-5.0/plugins/5k/data/magnify.png deleted file mode 100644 index ad712ae4..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/magnify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mainwindow.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/mainwindow.xcf.bz2 deleted file mode 100644 index 121232f2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mainwindow.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mask.png b/cinelerra-5.0/plugins/5k/data/mask.png deleted file mode 100644 index 4d11bcf9..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mask.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/maskkeyframe.png b/cinelerra-5.0/plugins/5k/data/maskkeyframe.png deleted file mode 100644 index 28d6f707..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/maskkeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mbutton_bg.png b/cinelerra-5.0/plugins/5k/data/mbutton_bg.png deleted file mode 100644 index 09b3a310..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mbutton_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mclock.png b/cinelerra-5.0/plugins/5k/data/mclock.png deleted file mode 100644 index 601f493a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mclock.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mclock_flat.png b/cinelerra-5.0/plugins/5k/data/mclock_flat.png deleted file mode 100644 index 49348f9a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mclock_flat.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menu.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/menu.xcf.bz2 deleted file mode 100644 index 8c49073d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menu.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menu_popup_bg.png b/cinelerra-5.0/plugins/5k/data/menu_popup_bg.png deleted file mode 100644 index ec7e94cb..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menu_popup_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menubar_bg.png b/cinelerra-5.0/plugins/5k/data/menubar_bg.png deleted file mode 100644 index e9966f62..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menubar_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menubar_dn.png b/cinelerra-5.0/plugins/5k/data/menubar_dn.png deleted file mode 100644 index e650da29..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menubar_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menubar_hi.png b/cinelerra-5.0/plugins/5k/data/menubar_hi.png deleted file mode 100644 index 2c11d137..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menubar_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menubar_up.png b/cinelerra-5.0/plugins/5k/data/menubar_up.png deleted file mode 100644 index 4373f938..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menubar_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menuitem_dn.png b/cinelerra-5.0/plugins/5k/data/menuitem_dn.png deleted file mode 100644 index 31ce2dbc..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menuitem_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menuitem_hi.png b/cinelerra-5.0/plugins/5k/data/menuitem_hi.png deleted file mode 100644 index 502b4b43..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menuitem_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menuitem_up.png b/cinelerra-5.0/plugins/5k/data/menuitem_up.png deleted file mode 100644 index ab22938d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menuitem_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menupopup_dn.png b/cinelerra-5.0/plugins/5k/data/menupopup_dn.png deleted file mode 100644 index 342a6c0c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menupopup_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menupopup_hi.png b/cinelerra-5.0/plugins/5k/data/menupopup_hi.png deleted file mode 100644 index 74940ead..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menupopup_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menupopup_up.png b/cinelerra-5.0/plugins/5k/data/menupopup_up.png deleted file mode 100644 index d535ce8b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menupopup_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menutitle_dn.png b/cinelerra-5.0/plugins/5k/data/menutitle_dn.png deleted file mode 100644 index f6643fa8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menutitle_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menutitle_hi.png b/cinelerra-5.0/plugins/5k/data/menutitle_hi.png deleted file mode 100644 index 6c64d7f2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menutitle_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/menutitle_up.png b/cinelerra-5.0/plugins/5k/data/menutitle_up.png deleted file mode 100644 index 3d0ea8c8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/menutitle_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/middle_justify.png b/cinelerra-5.0/plugins/5k/data/middle_justify.png deleted file mode 100644 index b7081c82..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/middle_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_add.png b/cinelerra-5.0/plugins/5k/data/mode_add.png deleted file mode 100644 index 3e130cc8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_add.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_average.png b/cinelerra-5.0/plugins/5k/data/mode_average.png deleted file mode 100644 index 3edf8524..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_average.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_darken.png b/cinelerra-5.0/plugins/5k/data/mode_darken.png deleted file mode 100644 index 2c3f6c8a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_darken.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_divide.png b/cinelerra-5.0/plugins/5k/data/mode_divide.png deleted file mode 100644 index 4af0eff6..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_divide.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_dn.png b/cinelerra-5.0/plugins/5k/data/mode_dn.png deleted file mode 100644 index 78b5b0d0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_dst.png b/cinelerra-5.0/plugins/5k/data/mode_dst.png deleted file mode 100644 index 933eb89c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_dst.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_dstatop.png b/cinelerra-5.0/plugins/5k/data/mode_dstatop.png deleted file mode 100644 index 8ac13873..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_dstatop.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_dstin.png b/cinelerra-5.0/plugins/5k/data/mode_dstin.png deleted file mode 100644 index 7fab8e1b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_dstin.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_dstout.png b/cinelerra-5.0/plugins/5k/data/mode_dstout.png deleted file mode 100644 index 09cfb006..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_dstout.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_dstover.png b/cinelerra-5.0/plugins/5k/data/mode_dstover.png deleted file mode 100644 index d9328280..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_dstover.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_hi.png b/cinelerra-5.0/plugins/5k/data/mode_hi.png deleted file mode 100644 index 4c927459..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_lighten.png b/cinelerra-5.0/plugins/5k/data/mode_lighten.png deleted file mode 100644 index fa9a5877..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_lighten.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_max.png b/cinelerra-5.0/plugins/5k/data/mode_max.png deleted file mode 100644 index 8674f1b2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_max.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_min.png b/cinelerra-5.0/plugins/5k/data/mode_min.png deleted file mode 100644 index b21e080e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_min.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_multiply.png b/cinelerra-5.0/plugins/5k/data/mode_multiply.png deleted file mode 100644 index 77b8fce8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_multiply.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_normal.png b/cinelerra-5.0/plugins/5k/data/mode_normal.png deleted file mode 100644 index df5af6fd..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_normal.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_or.png b/cinelerra-5.0/plugins/5k/data/mode_or.png deleted file mode 100644 index 9a531226..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_or.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_replace.png b/cinelerra-5.0/plugins/5k/data/mode_replace.png deleted file mode 100644 index 51aa6e43..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_replace.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_src.png b/cinelerra-5.0/plugins/5k/data/mode_src.png deleted file mode 100644 index 1b0038d8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_src.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_srcatop.png b/cinelerra-5.0/plugins/5k/data/mode_srcatop.png deleted file mode 100644 index 36426557..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_srcatop.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_srcin.png b/cinelerra-5.0/plugins/5k/data/mode_srcin.png deleted file mode 100644 index 31bcc425..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_srcin.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_srcout.png b/cinelerra-5.0/plugins/5k/data/mode_srcout.png deleted file mode 100644 index 6119c40a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_srcout.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_srcover.png b/cinelerra-5.0/plugins/5k/data/mode_srcover.png deleted file mode 100644 index a8ff0f26..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_srcover.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_subtract.png b/cinelerra-5.0/plugins/5k/data/mode_subtract.png deleted file mode 100644 index 35b7bcee..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_subtract.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_up.png b/cinelerra-5.0/plugins/5k/data/mode_up.png deleted file mode 100644 index a1c22a40..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mode_xor.png b/cinelerra-5.0/plugins/5k/data/mode_xor.png deleted file mode 100644 index c7f6765a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mode_xor.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/modekeyframe.png b/cinelerra-5.0/plugins/5k/data/modekeyframe.png deleted file mode 100644 index 0b14af85..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/modekeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mscroll_filler.png b/cinelerra-5.0/plugins/5k/data/mscroll_filler.png deleted file mode 100644 index 320695ba..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mscroll_filler.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mutepatch.png b/cinelerra-5.0/plugins/5k/data/mutepatch.png deleted file mode 100644 index adb2a934..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mutepatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mutepatch_checked.png b/cinelerra-5.0/plugins/5k/data/mutepatch_checked.png deleted file mode 100644 index 482d22eb..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mutepatch_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mutepatch_checkedhi.png b/cinelerra-5.0/plugins/5k/data/mutepatch_checkedhi.png deleted file mode 100644 index f856fb2e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mutepatch_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mutepatch_dn.png b/cinelerra-5.0/plugins/5k/data/mutepatch_dn.png deleted file mode 100644 index 1de6242b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mutepatch_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mutepatch_hi.png b/cinelerra-5.0/plugins/5k/data/mutepatch_hi.png deleted file mode 100644 index 1dadc9b2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mutepatch_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/mutepatch_up.png b/cinelerra-5.0/plugins/5k/data/mutepatch_up.png deleted file mode 100644 index 80789f94..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/mutepatch_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/new.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/new.xcf.bz2 deleted file mode 100644 index 7b5c23db..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/new.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/new_bg.png b/cinelerra-5.0/plugins/5k/data/new_bg.png deleted file mode 100644 index f9f6730c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/new_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/new_bigbutton_dn.png b/cinelerra-5.0/plugins/5k/data/new_bigbutton_dn.png deleted file mode 100644 index ce02a72b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/new_bigbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/new_bigbutton_hi.png b/cinelerra-5.0/plugins/5k/data/new_bigbutton_hi.png deleted file mode 100644 index a0fa6805..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/new_bigbutton_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/new_bigbutton_up.png b/cinelerra-5.0/plugins/5k/data/new_bigbutton_up.png deleted file mode 100644 index 886ac237..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/new_bigbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/nextedit.png b/cinelerra-5.0/plugins/5k/data/nextedit.png deleted file mode 100644 index 7e85145e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/nextedit.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/nextlabel.png b/cinelerra-5.0/plugins/5k/data/nextlabel.png deleted file mode 100644 index 980f9669..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/nextlabel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/nexttip.png b/cinelerra-5.0/plugins/5k/data/nexttip.png deleted file mode 100644 index ef04f404..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/nexttip.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ok.png b/cinelerra-5.0/plugins/5k/data/ok.png deleted file mode 100644 index 15dfcc1d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ok.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/openfolder.png b/cinelerra-5.0/plugins/5k/data/openfolder.png deleted file mode 100644 index 95d9e591..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/openfolder.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/out_checked.png b/cinelerra-5.0/plugins/5k/data/out_checked.png deleted file mode 100644 index 730196c5..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/out_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/out_checkedhi.png b/cinelerra-5.0/plugins/5k/data/out_checkedhi.png deleted file mode 100644 index 186a292e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/out_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/out_dn.png b/cinelerra-5.0/plugins/5k/data/out_dn.png deleted file mode 100644 index 5299bbe1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/out_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/out_hi.png b/cinelerra-5.0/plugins/5k/data/out_hi.png deleted file mode 100644 index bf6aabbe..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/out_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/out_up.png b/cinelerra-5.0/plugins/5k/data/out_up.png deleted file mode 100644 index 973bf38d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/out_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/outpoint.png b/cinelerra-5.0/plugins/5k/data/outpoint.png deleted file mode 100644 index d36e4e1d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/outpoint.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/over.png b/cinelerra-5.0/plugins/5k/data/over.png deleted file mode 100644 index e1378d48..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/over.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/overwrite.png b/cinelerra-5.0/plugins/5k/data/overwrite.png deleted file mode 100644 index ce21cc98..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/overwrite.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pan_channel.png b/cinelerra-5.0/plugins/5k/data/pan_channel.png deleted file mode 100644 index 8986edf8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pan_channel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pan_channel_small.png b/cinelerra-5.0/plugins/5k/data/pan_channel_small.png deleted file mode 100644 index 332849dd..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pan_channel_small.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pan_hi.png b/cinelerra-5.0/plugins/5k/data/pan_hi.png deleted file mode 100644 index 2fa43d1c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pan_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pan_popup.png b/cinelerra-5.0/plugins/5k/data/pan_popup.png deleted file mode 100644 index 29a77e55..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pan_popup.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pan_stick.png b/cinelerra-5.0/plugins/5k/data/pan_stick.png deleted file mode 100644 index 7923a1c9..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pan_stick.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pan_stick_small.png b/cinelerra-5.0/plugins/5k/data/pan_stick_small.png deleted file mode 100644 index 4d09d4a8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pan_stick_small.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pan_up.png b/cinelerra-5.0/plugins/5k/data/pan_up.png deleted file mode 100644 index 2d878111..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pan_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pane.png b/cinelerra-5.0/plugins/5k/data/pane.png deleted file mode 100644 index 37259445..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pane.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pane_dn.png b/cinelerra-5.0/plugins/5k/data/pane_dn.png deleted file mode 100644 index 9206a712..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pane_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pane_hi.png b/cinelerra-5.0/plugins/5k/data/pane_hi.png deleted file mode 100644 index 52e881dc..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pane_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pane_up.png b/cinelerra-5.0/plugins/5k/data/pane_up.png deleted file mode 100644 index ab12e210..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pane_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/panel_divider.png b/cinelerra-5.0/plugins/5k/data/panel_divider.png deleted file mode 100644 index f9b5e9c9..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/panel_divider.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pankeyframe.png b/cinelerra-5.0/plugins/5k/data/pankeyframe.png deleted file mode 100644 index 65f86f0c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pankeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/paste.png b/cinelerra-5.0/plugins/5k/data/paste.png deleted file mode 100644 index d28aa0d6..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/paste.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/patch_checked.png b/cinelerra-5.0/plugins/5k/data/patch_checked.png deleted file mode 100644 index 082adb5c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/patch_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/patch_checkedhi.png b/cinelerra-5.0/plugins/5k/data/patch_checkedhi.png deleted file mode 100644 index 96cc44cf..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/patch_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/patch_dn.png b/cinelerra-5.0/plugins/5k/data/patch_dn.png deleted file mode 100644 index 4086fb9e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/patch_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/patch_hi.png b/cinelerra-5.0/plugins/5k/data/patch_hi.png deleted file mode 100644 index c411933b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/patch_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/patch_up.png b/cinelerra-5.0/plugins/5k/data/patch_up.png deleted file mode 100644 index 54c2c633..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/patch_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/patchbay_bg.png b/cinelerra-5.0/plugins/5k/data/patchbay_bg.png deleted file mode 100644 index 3cb92f5c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/patchbay_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/patches.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/patches.xcf.bz2 deleted file mode 100644 index 275778f7..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/patches.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pause.png b/cinelerra-5.0/plugins/5k/data/pause.png deleted file mode 100644 index 59d015bb..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pause.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/period.png b/cinelerra-5.0/plugins/5k/data/period.png deleted file mode 100644 index 792d1509..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/period.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/picture.png b/cinelerra-5.0/plugins/5k/data/picture.png deleted file mode 100644 index c634d408..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/picture.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/play.png b/cinelerra-5.0/plugins/5k/data/play.png deleted file mode 100644 index a9c5cc40..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/play.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/playpatch.png b/cinelerra-5.0/plugins/5k/data/playpatch.png deleted file mode 100644 index ea784b04..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/playpatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/plugin.xcf.bz2 deleted file mode 100644 index a5974377..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin_bg.png b/cinelerra-5.0/plugins/5k/data/plugin_bg.png deleted file mode 100644 index 99ecaa21..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin_on.png b/cinelerra-5.0/plugins/5k/data/plugin_on.png deleted file mode 100644 index f5e05cfe..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin_on.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin_ondn.png b/cinelerra-5.0/plugins/5k/data/plugin_ondn.png deleted file mode 100644 index d5599d14..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin_ondn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin_onhi.png b/cinelerra-5.0/plugins/5k/data/plugin_onhi.png deleted file mode 100644 index 0b03ba5f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin_onhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin_onselect.png b/cinelerra-5.0/plugins/5k/data/plugin_onselect.png deleted file mode 100644 index f648acd2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin_onselect.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin_onselecthi.png b/cinelerra-5.0/plugins/5k/data/plugin_onselecthi.png deleted file mode 100644 index 500cef35..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin_onselecthi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin_show.png b/cinelerra-5.0/plugins/5k/data/plugin_show.png deleted file mode 100644 index a59b549d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin_show.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin_showdn.png b/cinelerra-5.0/plugins/5k/data/plugin_showdn.png deleted file mode 100644 index 90afae7c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin_showdn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin_showhi.png b/cinelerra-5.0/plugins/5k/data/plugin_showhi.png deleted file mode 100644 index 439585b5..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin_showhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin_showselect.png b/cinelerra-5.0/plugins/5k/data/plugin_showselect.png deleted file mode 100644 index fbb3f760..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin_showselect.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/plugin_showselecthi.png b/cinelerra-5.0/plugins/5k/data/plugin_showselecthi.png deleted file mode 100644 index 5f98a4a0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/plugin_showselecthi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pot.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/pot.xcf.bz2 deleted file mode 100644 index c3997b9a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pot.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pot_dn.png b/cinelerra-5.0/plugins/5k/data/pot_dn.png deleted file mode 100644 index a5c996c1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pot_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pot_hi.png b/cinelerra-5.0/plugins/5k/data/pot_hi.png deleted file mode 100644 index c64127c1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pot_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/pot_up.png b/cinelerra-5.0/plugins/5k/data/pot_up.png deleted file mode 100644 index 97957f26..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/pot_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/preferences_bg.png b/cinelerra-5.0/plugins/5k/data/preferences_bg.png deleted file mode 100644 index 8d9ea644..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/preferences_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/preferencesbutton_dn.png b/cinelerra-5.0/plugins/5k/data/preferencesbutton_dn.png deleted file mode 100644 index 985c7cb0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/preferencesbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/preferencesbutton_dnhi.png b/cinelerra-5.0/plugins/5k/data/preferencesbutton_dnhi.png deleted file mode 100644 index dc132991..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/preferencesbutton_dnhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/preferencesbutton_dnlo.png b/cinelerra-5.0/plugins/5k/data/preferencesbutton_dnlo.png deleted file mode 100644 index 692a9021..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/preferencesbutton_dnlo.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/preferencesbutton_up.png b/cinelerra-5.0/plugins/5k/data/preferencesbutton_up.png deleted file mode 100644 index 3223ec6f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/preferencesbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/preferencesbutton_uphi.png b/cinelerra-5.0/plugins/5k/data/preferencesbutton_uphi.png deleted file mode 100644 index a77c8527..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/preferencesbutton_uphi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/prevedit.png b/cinelerra-5.0/plugins/5k/data/prevedit.png deleted file mode 100644 index bbbb3c5f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/prevedit.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/prevlabel.png b/cinelerra-5.0/plugins/5k/data/prevlabel.png deleted file mode 100644 index 717cd401..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/prevlabel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/prevtip.png b/cinelerra-5.0/plugins/5k/data/prevtip.png deleted file mode 100644 index 234ff2ba..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/prevtip.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/progress_bg.png b/cinelerra-5.0/plugins/5k/data/progress_bg.png deleted file mode 100644 index 1b0468a7..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/progress_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/progress_hi.png b/cinelerra-5.0/plugins/5k/data/progress_hi.png deleted file mode 100644 index 3dfe11ad..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/progress_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/projector.png b/cinelerra-5.0/plugins/5k/data/projector.png deleted file mode 100644 index 31a053f4..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/projector.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/projectorkeyframe.png b/cinelerra-5.0/plugins/5k/data/projectorkeyframe.png deleted file mode 100644 index 4aaea3c6..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/projectorkeyframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/protect.png b/cinelerra-5.0/plugins/5k/data/protect.png deleted file mode 100644 index 4c78a905..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/protect.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/radial.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/radial.xcf.bz2 deleted file mode 100644 index 5722e9a7..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/radial.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/radial_checked.png b/cinelerra-5.0/plugins/5k/data/radial_checked.png deleted file mode 100644 index 12f6374e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/radial_checked.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/radial_checkedhi.png b/cinelerra-5.0/plugins/5k/data/radial_checkedhi.png deleted file mode 100644 index 9ff3e709..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/radial_checkedhi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/radial_dn.png b/cinelerra-5.0/plugins/5k/data/radial_dn.png deleted file mode 100644 index 7647ab7d..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/radial_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/radial_hi.png b/cinelerra-5.0/plugins/5k/data/radial_hi.png deleted file mode 100644 index 4c4bbfa7..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/radial_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/radial_up.png b/cinelerra-5.0/plugins/5k/data/radial_up.png deleted file mode 100644 index b361f826..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/radial_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/record.png b/cinelerra-5.0/plugins/5k/data/record.png deleted file mode 100644 index d15bfed1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/record.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/recordpatch.png b/cinelerra-5.0/plugins/5k/data/recordpatch.png deleted file mode 100644 index 8746ceed..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/recordpatch.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/redo.png b/cinelerra-5.0/plugins/5k/data/redo.png deleted file mode 100644 index 5984dead..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/redo.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/reload.png b/cinelerra-5.0/plugins/5k/data/reload.png deleted file mode 100644 index ff0478aa..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/reload.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/rename.png b/cinelerra-5.0/plugins/5k/data/rename.png deleted file mode 100644 index 71e36db8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/rename.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/resource1024.png b/cinelerra-5.0/plugins/5k/data/resource1024.png deleted file mode 100644 index 67da059c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/resource1024.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/resource128.png b/cinelerra-5.0/plugins/5k/data/resource128.png deleted file mode 100644 index 2e3e90b7..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/resource128.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/resource256.png b/cinelerra-5.0/plugins/5k/data/resource256.png deleted file mode 100644 index 6d31a0f1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/resource256.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/resource32.png b/cinelerra-5.0/plugins/5k/data/resource32.png deleted file mode 100644 index 9fe5d9d0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/resource32.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/resource512.png b/cinelerra-5.0/plugins/5k/data/resource512.png deleted file mode 100644 index 439b624f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/resource512.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/resource64.png b/cinelerra-5.0/plugins/5k/data/resource64.png deleted file mode 100644 index 1035e24a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/resource64.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/reverse.png b/cinelerra-5.0/plugins/5k/data/reverse.png deleted file mode 100644 index 6ff15be7..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/reverse.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/rewind.png b/cinelerra-5.0/plugins/5k/data/rewind.png deleted file mode 100644 index 0d82573a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/rewind.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/right_justify.png b/cinelerra-5.0/plugins/5k/data/right_justify.png deleted file mode 100644 index bf6b6706..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/right_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ruler.png b/cinelerra-5.0/plugins/5k/data/ruler.png deleted file mode 100644 index b28a223a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ruler.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/scope.png b/cinelerra-5.0/plugins/5k/data/scope.png deleted file mode 100644 index bef250d8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/scope.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/setformat_bg.png b/cinelerra-5.0/plugins/5k/data/setformat_bg.png deleted file mode 100644 index f0b95fc5..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/setformat_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/show_meters.png b/cinelerra-5.0/plugins/5k/data/show_meters.png deleted file mode 100644 index 057785eb..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/show_meters.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/singleframe.png b/cinelerra-5.0/plugins/5k/data/singleframe.png deleted file mode 100644 index e13a7a34..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/singleframe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/space.png b/cinelerra-5.0/plugins/5k/data/space.png deleted file mode 100644 index c8147f05..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/space.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/splice.png b/cinelerra-5.0/plugins/5k/data/splice.png deleted file mode 100644 index 77d34008..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/splice.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/statusbar.png b/cinelerra-5.0/plugins/5k/data/statusbar.png deleted file mode 100644 index 4dc5b96b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/statusbar.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/statusbar_cancel.png b/cinelerra-5.0/plugins/5k/data/statusbar_cancel.png deleted file mode 100644 index ec5309ed..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/statusbar_cancel.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/statusbar_cancel_dn.png b/cinelerra-5.0/plugins/5k/data/statusbar_cancel_dn.png deleted file mode 100644 index 5e96b013..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/statusbar_cancel_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/statusbar_cancel_hi.png b/cinelerra-5.0/plugins/5k/data/statusbar_cancel_hi.png deleted file mode 100644 index 40e98bd2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/statusbar_cancel_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/statusbar_cancel_up.png b/cinelerra-5.0/plugins/5k/data/statusbar_cancel_up.png deleted file mode 100644 index 6186769c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/statusbar_cancel_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/stop.png b/cinelerra-5.0/plugins/5k/data/stop.png deleted file mode 100644 index b7f33464..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/stop.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/swap_extents.png b/cinelerra-5.0/plugins/5k/data/swap_extents.png deleted file mode 100644 index e5915cd0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/swap_extents.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/tan_linear.png b/cinelerra-5.0/plugins/5k/data/tan_linear.png deleted file mode 100644 index dbc70edf..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/tan_linear.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/tan_smooth.png b/cinelerra-5.0/plugins/5k/data/tan_smooth.png deleted file mode 100644 index 4dc63b10..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/tan_smooth.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/text.png b/cinelerra-5.0/plugins/5k/data/text.png deleted file mode 100644 index a8065bb2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/text.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/text_highlight.png b/cinelerra-5.0/plugins/5k/data/text_highlight.png deleted file mode 100644 index 8bb91268..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/text_highlight.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/timebar_bg_flat.png b/cinelerra-5.0/plugins/5k/data/timebar_bg_flat.png deleted file mode 100644 index c01c9557..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/timebar_bg_flat.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/timebar_brender.png b/cinelerra-5.0/plugins/5k/data/timebar_brender.png deleted file mode 100644 index 13045cb4..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/timebar_brender.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/timebar_view.png b/cinelerra-5.0/plugins/5k/data/timebar_view.png deleted file mode 100644 index fed4b1fa..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/timebar_view.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/tipbutton_dn.png b/cinelerra-5.0/plugins/5k/data/tipbutton_dn.png deleted file mode 100644 index fa3de52e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/tipbutton_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/tipbutton_hi.png b/cinelerra-5.0/plugins/5k/data/tipbutton_hi.png deleted file mode 100644 index 1e4edf97..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/tipbutton_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/tipbutton_up.png b/cinelerra-5.0/plugins/5k/data/tipbutton_up.png deleted file mode 100644 index 4e0284a4..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/tipbutton_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/title_bg.png b/cinelerra-5.0/plugins/5k/data/title_bg.png deleted file mode 100644 index 2ee44717..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/title_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/titlesafe.png b/cinelerra-5.0/plugins/5k/data/titlesafe.png deleted file mode 100644 index 00b08860..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/titlesafe.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/toclip.png b/cinelerra-5.0/plugins/5k/data/toclip.png deleted file mode 100644 index 48d2f52b..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/toclip.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/toolwindow.png b/cinelerra-5.0/plugins/5k/data/toolwindow.png deleted file mode 100644 index 366c11a4..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/toolwindow.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/top_justify.png b/cinelerra-5.0/plugins/5k/data/top_justify.png deleted file mode 100644 index 8170bbc8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/top_justify.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/transportdn.png b/cinelerra-5.0/plugins/5k/data/transportdn.png deleted file mode 100644 index dac1ba1a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/transportdn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/transportend.png b/cinelerra-5.0/plugins/5k/data/transportend.png deleted file mode 100644 index c5abc093..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/transportend.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/transporthi.png b/cinelerra-5.0/plugins/5k/data/transporthi.png deleted file mode 100644 index e5d02334..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/transporthi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/transportup.png b/cinelerra-5.0/plugins/5k/data/transportup.png deleted file mode 100644 index d6d05ff8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/transportup.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/tumble_bottom.png b/cinelerra-5.0/plugins/5k/data/tumble_bottom.png deleted file mode 100644 index 1687644f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/tumble_bottom.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/tumble_hi.png b/cinelerra-5.0/plugins/5k/data/tumble_hi.png deleted file mode 100644 index 61616e42..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/tumble_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/tumble_top.png b/cinelerra-5.0/plugins/5k/data/tumble_top.png deleted file mode 100644 index 03907dd0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/tumble_top.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/tumble_up.png b/cinelerra-5.0/plugins/5k/data/tumble_up.png deleted file mode 100644 index eb608b00..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/tumble_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/undo.png b/cinelerra-5.0/plugins/5k/data/undo.png deleted file mode 100644 index aa86a360..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/undo.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/updir.png b/cinelerra-5.0/plugins/5k/data/updir.png deleted file mode 100644 index 91fb90cb..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/updir.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vbuttons_left.png b/cinelerra-5.0/plugins/5k/data/vbuttons_left.png deleted file mode 100644 index 6f233dea..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vbuttons_left.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vclock.png b/cinelerra-5.0/plugins/5k/data/vclock.png deleted file mode 100644 index 81a91e36..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vclock.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/veffect_icon.png b/cinelerra-5.0/plugins/5k/data/veffect_icon.png deleted file mode 100644 index e2816133..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/veffect_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vscroll_handle_bg.png b/cinelerra-5.0/plugins/5k/data/vscroll_handle_bg.png deleted file mode 100644 index 6e999c46..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vscroll_handle_bg.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vscroll_handle_dn.png b/cinelerra-5.0/plugins/5k/data/vscroll_handle_dn.png deleted file mode 100644 index 0bde47bb..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vscroll_handle_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vscroll_handle_hi.png b/cinelerra-5.0/plugins/5k/data/vscroll_handle_hi.png deleted file mode 100644 index f452a530..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vscroll_handle_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vscroll_handle_up.png b/cinelerra-5.0/plugins/5k/data/vscroll_handle_up.png deleted file mode 100644 index bcef19ae..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vscroll_handle_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vscroll_left_dn.png b/cinelerra-5.0/plugins/5k/data/vscroll_left_dn.png deleted file mode 100644 index e9ac6448..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vscroll_left_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vscroll_left_hi.png b/cinelerra-5.0/plugins/5k/data/vscroll_left_hi.png deleted file mode 100644 index c2b318d1..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vscroll_left_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vscroll_left_up.png b/cinelerra-5.0/plugins/5k/data/vscroll_left_up.png deleted file mode 100644 index 9e3bddf3..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vscroll_left_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vscroll_right_dn.png b/cinelerra-5.0/plugins/5k/data/vscroll_right_dn.png deleted file mode 100644 index 8aa68524..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vscroll_right_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vscroll_right_hi.png b/cinelerra-5.0/plugins/5k/data/vscroll_right_hi.png deleted file mode 100644 index 880a749e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vscroll_right_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vscroll_right_up.png b/cinelerra-5.0/plugins/5k/data/vscroll_right_up.png deleted file mode 100644 index 8b15b2ae..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vscroll_right_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vtransition_icon.png b/cinelerra-5.0/plugins/5k/data/vtransition_icon.png deleted file mode 100644 index d73ccb1f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vtransition_icon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/vwindow_timebar.png b/cinelerra-5.0/plugins/5k/data/vwindow_timebar.png deleted file mode 100644 index 8cba4622..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/vwindow_timebar.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/waveform.png b/cinelerra-5.0/plugins/5k/data/waveform.png deleted file mode 100644 index fb81e31a..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/waveform.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/waveform_rgb.png b/cinelerra-5.0/plugins/5k/data/waveform_rgb.png deleted file mode 100644 index c529ce15..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/waveform_rgb.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/wrench.png b/cinelerra-5.0/plugins/5k/data/wrench.png deleted file mode 100644 index d68e3528..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/wrench.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/xmeter_green.png b/cinelerra-5.0/plugins/5k/data/xmeter_green.png deleted file mode 100644 index 2f298d36..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/xmeter_green.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/xmeter_normal.png b/cinelerra-5.0/plugins/5k/data/xmeter_normal.png deleted file mode 100644 index bc158a24..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/xmeter_normal.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/xmeter_over.png b/cinelerra-5.0/plugins/5k/data/xmeter_over.png deleted file mode 100644 index cf5f5280..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/xmeter_over.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/xmeter_red.png b/cinelerra-5.0/plugins/5k/data/xmeter_red.png deleted file mode 100644 index 3f74e640..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/xmeter_red.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/xmeter_white.png b/cinelerra-5.0/plugins/5k/data/xmeter_white.png deleted file mode 100644 index 4c6158b9..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/xmeter_white.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/xmeter_yellow.png b/cinelerra-5.0/plugins/5k/data/xmeter_yellow.png deleted file mode 100644 index e55bb541..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/xmeter_yellow.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/xpane_dn.png b/cinelerra-5.0/plugins/5k/data/xpane_dn.png deleted file mode 100644 index 80a7337f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/xpane_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/xpane_hi.png b/cinelerra-5.0/plugins/5k/data/xpane_hi.png deleted file mode 100644 index 436c0803..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/xpane_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/xpane_up.png b/cinelerra-5.0/plugins/5k/data/xpane_up.png deleted file mode 100644 index 007cf7a0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/xpane_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ymeter_green.png b/cinelerra-5.0/plugins/5k/data/ymeter_green.png deleted file mode 100644 index 161d344c..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ymeter_green.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ymeter_normal.png b/cinelerra-5.0/plugins/5k/data/ymeter_normal.png deleted file mode 100644 index 364cda00..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ymeter_normal.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ymeter_over.png b/cinelerra-5.0/plugins/5k/data/ymeter_over.png deleted file mode 100644 index 7ae2e6ca..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ymeter_over.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ymeter_red.png b/cinelerra-5.0/plugins/5k/data/ymeter_red.png deleted file mode 100644 index 4c25cfe8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ymeter_red.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ymeter_white.png b/cinelerra-5.0/plugins/5k/data/ymeter_white.png deleted file mode 100644 index 4d2c8b22..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ymeter_white.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ymeter_yellow.png b/cinelerra-5.0/plugins/5k/data/ymeter_yellow.png deleted file mode 100644 index 781fc4f7..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ymeter_yellow.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ypane_dn.png b/cinelerra-5.0/plugins/5k/data/ypane_dn.png deleted file mode 100644 index 2f7c4dee..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ypane_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ypane_hi.png b/cinelerra-5.0/plugins/5k/data/ypane_hi.png deleted file mode 100644 index dff6eae9..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ypane_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/ypane_up.png b/cinelerra-5.0/plugins/5k/data/ypane_up.png deleted file mode 100644 index 321bf0c8..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/ypane_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/zoompopup_dn.png b/cinelerra-5.0/plugins/5k/data/zoompopup_dn.png deleted file mode 100644 index 65e6f9dd..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/zoompopup_dn.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/zoompopup_hi.png b/cinelerra-5.0/plugins/5k/data/zoompopup_hi.png deleted file mode 100644 index 811a7ff2..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/zoompopup_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/zoompopup_up.png b/cinelerra-5.0/plugins/5k/data/zoompopup_up.png deleted file mode 100644 index 64d11ff0..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/zoompopup_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/zoomtumble.xcf.bz2 b/cinelerra-5.0/plugins/5k/data/zoomtumble.xcf.bz2 deleted file mode 100644 index 008f9695..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/zoomtumble.xcf.bz2 and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/zoomtumble_bottom.png b/cinelerra-5.0/plugins/5k/data/zoomtumble_bottom.png deleted file mode 100644 index 3ba43475..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/zoomtumble_bottom.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/zoomtumble_hi.png b/cinelerra-5.0/plugins/5k/data/zoomtumble_hi.png deleted file mode 100644 index 53457042..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/zoomtumble_hi.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/zoomtumble_top.png b/cinelerra-5.0/plugins/5k/data/zoomtumble_top.png deleted file mode 100644 index a749c25f..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/zoomtumble_top.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/5k/data/zoomtumble_up.png b/cinelerra-5.0/plugins/5k/data/zoomtumble_up.png deleted file mode 100644 index f0f4f59e..00000000 Binary files a/cinelerra-5.0/plugins/5k/data/zoomtumble_up.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/Makefile b/cinelerra-5.0/plugins/Makefile index 1153b322..2dc33dc5 100644 --- a/cinelerra-5.0/plugins/Makefile +++ b/cinelerra-5.0/plugins/Makefile @@ -8,8 +8,6 @@ include ../global_config DIRS = \ 1080to480 \ 1080to540 \ - 4k \ - 5k \ 720to480 \ aging \ audioscope \ @@ -76,7 +74,6 @@ DIRS = \ linearblur \ liveaudio \ livevideo \ - lof \ loopaudio \ loopvideo \ motion \ diff --git a/cinelerra-5.0/plugins/blondtheme/blondtheme.C b/cinelerra-5.0/plugins/blondtheme/blondtheme.C index 4d314a23..1ee3f367 100644 --- a/cinelerra-5.0/plugins/blondtheme/blondtheme.C +++ b/cinelerra-5.0/plugins/blondtheme/blondtheme.C @@ -547,6 +547,17 @@ void BlondTheme::initialize() "labeltoggle_dn.png", "label_checkedhi.png"); + ffmpeg_toggle = new_image_set(5, + "ff_up.png", + "ff_hi.png", + "ff_checked.png", + "ff_down.png", + "ff_checkedhi.png"); + + shbtn_data = new_image_set(3, + "shbtn_up.png", + "shbtn_hi.png", + "shbtn_dn.png"); statusbar_cancel_data = new_image_set(3, "statusbar_cancel_up.png", @@ -988,8 +999,8 @@ void BlondTheme::build_icons() void BlondTheme::build_bg_data() { // Audio settings - channel_bg_data = new VFrame(get_image_data("channel_bg.png")); - channel_position_data = new VFrame(get_image_data("channel_position.png")); + channel_bg_data = new VFramePng(get_image_data("channel_bg.png")); + channel_position_data = new VFramePng(get_image_data("channel_position.png")); // Track bitmaps new_image("resource1024", "resource1024.png"); @@ -1007,12 +1018,12 @@ void BlondTheme::build_bg_data() void BlondTheme::build_overlays() { - keyframe_data = new VFrame(get_image_data("keyframe3.png")); - camerakeyframe_data = new VFrame(get_image_data("camerakeyframe.png")); - maskkeyframe_data = new VFrame(get_image_data("maskkeyframe.png")); - modekeyframe_data = new VFrame(get_image_data("modekeyframe.png")); - pankeyframe_data = new VFrame(get_image_data("pankeyframe.png")); - projectorkeyframe_data = new VFrame(get_image_data("projectorkeyframe.png")); + keyframe_data = new VFramePng(get_image_data("keyframe3.png")); + camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png")); + maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png")); + modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png")); + pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png")); + projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png")); } diff --git a/cinelerra-5.0/plugins/blondtheme/data/ff_audio.png b/cinelerra-5.0/plugins/blondtheme/data/ff_audio.png new file mode 100644 index 00000000..c62e4073 Binary files /dev/null and b/cinelerra-5.0/plugins/blondtheme/data/ff_audio.png differ diff --git a/cinelerra-5.0/cinelerra/data/ff_checked.png b/cinelerra-5.0/plugins/blondtheme/data/ff_checked.png similarity index 100% rename from cinelerra-5.0/cinelerra/data/ff_checked.png rename to cinelerra-5.0/plugins/blondtheme/data/ff_checked.png diff --git a/cinelerra-5.0/cinelerra/data/ff_checkedhi.png b/cinelerra-5.0/plugins/blondtheme/data/ff_checkedhi.png similarity index 100% rename from cinelerra-5.0/cinelerra/data/ff_checkedhi.png rename to cinelerra-5.0/plugins/blondtheme/data/ff_checkedhi.png diff --git a/cinelerra-5.0/cinelerra/data/ff_down.png b/cinelerra-5.0/plugins/blondtheme/data/ff_down.png similarity index 100% rename from cinelerra-5.0/cinelerra/data/ff_down.png rename to cinelerra-5.0/plugins/blondtheme/data/ff_down.png diff --git a/cinelerra-5.0/cinelerra/data/ff_hi.png b/cinelerra-5.0/plugins/blondtheme/data/ff_hi.png similarity index 100% rename from cinelerra-5.0/cinelerra/data/ff_hi.png rename to cinelerra-5.0/plugins/blondtheme/data/ff_hi.png diff --git a/cinelerra-5.0/cinelerra/data/ff_up.png b/cinelerra-5.0/plugins/blondtheme/data/ff_up.png similarity index 100% rename from cinelerra-5.0/cinelerra/data/ff_up.png rename to cinelerra-5.0/plugins/blondtheme/data/ff_up.png diff --git a/cinelerra-5.0/plugins/blondtheme/data/ff_video.png b/cinelerra-5.0/plugins/blondtheme/data/ff_video.png new file mode 100644 index 00000000..73c231ba Binary files /dev/null and b/cinelerra-5.0/plugins/blondtheme/data/ff_video.png differ diff --git a/cinelerra-5.0/cinelerra/data/shbtn_dn.png b/cinelerra-5.0/plugins/blondtheme/data/shbtn_dn.png similarity index 100% rename from cinelerra-5.0/cinelerra/data/shbtn_dn.png rename to cinelerra-5.0/plugins/blondtheme/data/shbtn_dn.png diff --git a/cinelerra-5.0/cinelerra/data/shbtn_hi.png b/cinelerra-5.0/plugins/blondtheme/data/shbtn_hi.png similarity index 100% rename from cinelerra-5.0/cinelerra/data/shbtn_hi.png rename to cinelerra-5.0/plugins/blondtheme/data/shbtn_hi.png diff --git a/cinelerra-5.0/cinelerra/data/shbtn_up.png b/cinelerra-5.0/plugins/blondtheme/data/shbtn_up.png similarity index 100% rename from cinelerra-5.0/cinelerra/data/shbtn_up.png rename to cinelerra-5.0/plugins/blondtheme/data/shbtn_up.png diff --git a/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C b/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C index a9c6af38..82d27732 100644 --- a/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C +++ b/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C @@ -573,6 +573,17 @@ void BlueDotTheme::initialize() "labeltoggle_dn.png", "label_checkedhi.png"); + ffmpeg_toggle = new_image_set(5, + "ff_up.png", + "ff_hi.png", + "ff_checked.png", + "ff_down.png", + "ff_checkedhi.png"); + + shbtn_data = new_image_set(3, + "shbtn_up.png", + "shbtn_hi.png", + "shbtn_dn.png"); statusbar_cancel_data = new_image_set(3, "statusbar_cancel_up.png", @@ -1041,8 +1052,8 @@ void BlueDotTheme::build_icons() void BlueDotTheme::build_bg_data() { // Audio settings - channel_bg_data = new VFrame(get_image_data("channel_bg.png")); - channel_position_data = new VFrame(get_image_data("channel_position.png")); + channel_bg_data = new VFramePng(get_image_data("channel_bg.png")); + channel_position_data = new VFramePng(get_image_data("channel_position.png")); // Track bitmaps new_image("resource1024", "resource1024.png"); @@ -1061,12 +1072,12 @@ void BlueDotTheme::build_bg_data() //Graphic Copied from default. Improve!! -- use your imagination void BlueDotTheme::build_overlays() { - keyframe_data = new VFrame(get_image_data("keyframe3.png")); - camerakeyframe_data = new VFrame(get_image_data("camerakeyframe.png")); - maskkeyframe_data = new VFrame(get_image_data("maskkeyframe.png")); - modekeyframe_data = new VFrame(get_image_data("modekeyframe.png")); - pankeyframe_data = new VFrame(get_image_data("pankeyframe.png")); - projectorkeyframe_data = new VFrame(get_image_data("projectorkeyframe.png")); + keyframe_data = new VFramePng(get_image_data("keyframe3.png")); + camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png")); + maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png")); + modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png")); + pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png")); + projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png")); } diff --git a/cinelerra-5.0/plugins/bluedottheme/data/ff_audio.png b/cinelerra-5.0/plugins/bluedottheme/data/ff_audio.png new file mode 100644 index 00000000..c62e4073 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/ff_audio.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/ff_checked.png b/cinelerra-5.0/plugins/bluedottheme/data/ff_checked.png new file mode 100644 index 00000000..9e07d526 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/ff_checked.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/ff_checkedhi.png b/cinelerra-5.0/plugins/bluedottheme/data/ff_checkedhi.png new file mode 100644 index 00000000..0a6b5246 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/ff_checkedhi.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/ff_down.png b/cinelerra-5.0/plugins/bluedottheme/data/ff_down.png new file mode 100644 index 00000000..5a0194df Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/ff_down.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/ff_hi.png b/cinelerra-5.0/plugins/bluedottheme/data/ff_hi.png new file mode 100644 index 00000000..237bcfca Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/ff_hi.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/ff_up.png b/cinelerra-5.0/plugins/bluedottheme/data/ff_up.png new file mode 100644 index 00000000..1da63a00 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/ff_up.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/ff_video.png b/cinelerra-5.0/plugins/bluedottheme/data/ff_video.png new file mode 100644 index 00000000..73c231ba Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/ff_video.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/shbtn_dn.png b/cinelerra-5.0/plugins/bluedottheme/data/shbtn_dn.png new file mode 100644 index 00000000..19f4322e Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/shbtn_dn.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/shbtn_hi.png b/cinelerra-5.0/plugins/bluedottheme/data/shbtn_hi.png new file mode 100644 index 00000000..f6471607 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/shbtn_hi.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/shbtn_up.png b/cinelerra-5.0/plugins/bluedottheme/data/shbtn_up.png new file mode 100644 index 00000000..ff9b68f5 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/shbtn_up.png differ diff --git a/cinelerra-5.0/plugins/brighttheme/brighttheme.C b/cinelerra-5.0/plugins/brighttheme/brighttheme.C index d0a5e1d5..b5d7b501 100644 --- a/cinelerra-5.0/plugins/brighttheme/brighttheme.C +++ b/cinelerra-5.0/plugins/brighttheme/brighttheme.C @@ -595,6 +595,18 @@ void BrightTheme::initialize() "labeltoggle_dn.png", "label_checkedhi.png"); + ffmpeg_toggle = new_image_set(5, + "ff_up.png", + "ff_hi.png", + "ff_checked.png", + "ff_down.png", + "ff_checkedhi.png"); + + shbtn_data = new_image_set(3, + "shbtn_up.png", + "shbtn_hi.png", + "shbtn_dn.png"); + new_image_set("histogram_carrot", 5, "histogram_carrot_up.png", @@ -787,7 +799,7 @@ void BrightTheme::initialize() void BrightTheme::build_bg_data() { // Audio settings - channel_position_data = new VFrame(get_image_data("channel_position.png")); + channel_position_data = new VFramePng(get_image_data("channel_position.png")); // Track bitmaps new_image("resource1024", "resource1024.png"); @@ -805,12 +817,12 @@ void BrightTheme::build_bg_data() void BrightTheme::build_overlays() { - keyframe_data = new VFrame(get_image_data("keyframe3.png")); - camerakeyframe_data = new VFrame(get_image_data("camerakeyframe.png")); - maskkeyframe_data = new VFrame(get_image_data("maskkeyframe.png")); - modekeyframe_data = new VFrame(get_image_data("modekeyframe.png")); - pankeyframe_data = new VFrame(get_image_data("pankeyframe.png")); - projectorkeyframe_data = new VFrame(get_image_data("projectorkeyframe.png")); + keyframe_data = new VFramePng(get_image_data("keyframe3.png")); + camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png")); + maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png")); + modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png")); + pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png")); + projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png")); } diff --git a/cinelerra-5.0/plugins/brighttheme/data/ff_audio.png b/cinelerra-5.0/plugins/brighttheme/data/ff_audio.png new file mode 100644 index 00000000..c62e4073 Binary files /dev/null and b/cinelerra-5.0/plugins/brighttheme/data/ff_audio.png differ diff --git a/cinelerra-5.0/plugins/brighttheme/data/ff_checked.png b/cinelerra-5.0/plugins/brighttheme/data/ff_checked.png new file mode 100644 index 00000000..9e07d526 Binary files /dev/null and b/cinelerra-5.0/plugins/brighttheme/data/ff_checked.png differ diff --git a/cinelerra-5.0/plugins/brighttheme/data/ff_checkedhi.png b/cinelerra-5.0/plugins/brighttheme/data/ff_checkedhi.png new file mode 100644 index 00000000..0a6b5246 Binary files /dev/null and b/cinelerra-5.0/plugins/brighttheme/data/ff_checkedhi.png differ diff --git a/cinelerra-5.0/plugins/brighttheme/data/ff_down.png b/cinelerra-5.0/plugins/brighttheme/data/ff_down.png new file mode 100644 index 00000000..5a0194df Binary files /dev/null and b/cinelerra-5.0/plugins/brighttheme/data/ff_down.png differ diff --git a/cinelerra-5.0/plugins/brighttheme/data/ff_hi.png b/cinelerra-5.0/plugins/brighttheme/data/ff_hi.png new file mode 100644 index 00000000..237bcfca Binary files /dev/null and b/cinelerra-5.0/plugins/brighttheme/data/ff_hi.png differ diff --git a/cinelerra-5.0/plugins/brighttheme/data/ff_up.png b/cinelerra-5.0/plugins/brighttheme/data/ff_up.png new file mode 100644 index 00000000..1da63a00 Binary files /dev/null and b/cinelerra-5.0/plugins/brighttheme/data/ff_up.png differ diff --git a/cinelerra-5.0/plugins/brighttheme/data/ff_video.png b/cinelerra-5.0/plugins/brighttheme/data/ff_video.png new file mode 100644 index 00000000..73c231ba Binary files /dev/null and b/cinelerra-5.0/plugins/brighttheme/data/ff_video.png differ diff --git a/cinelerra-5.0/plugins/brighttheme/data/shbtn_dn.png b/cinelerra-5.0/plugins/brighttheme/data/shbtn_dn.png new file mode 100644 index 00000000..19f4322e Binary files /dev/null and b/cinelerra-5.0/plugins/brighttheme/data/shbtn_dn.png differ diff --git a/cinelerra-5.0/plugins/brighttheme/data/shbtn_hi.png b/cinelerra-5.0/plugins/brighttheme/data/shbtn_hi.png new file mode 100644 index 00000000..f6471607 Binary files /dev/null and b/cinelerra-5.0/plugins/brighttheme/data/shbtn_hi.png differ diff --git a/cinelerra-5.0/plugins/brighttheme/data/shbtn_up.png b/cinelerra-5.0/plugins/brighttheme/data/shbtn_up.png new file mode 100644 index 00000000..ff9b68f5 Binary files /dev/null and b/cinelerra-5.0/plugins/brighttheme/data/shbtn_up.png differ diff --git a/cinelerra-5.0/plugins/defaulttheme/data/ff_audio.png b/cinelerra-5.0/plugins/defaulttheme/data/ff_audio.png new file mode 100644 index 00000000..c62e4073 Binary files /dev/null and b/cinelerra-5.0/plugins/defaulttheme/data/ff_audio.png differ diff --git a/cinelerra-5.0/plugins/defaulttheme/data/ff_checked.png b/cinelerra-5.0/plugins/defaulttheme/data/ff_checked.png new file mode 100644 index 00000000..9e07d526 Binary files /dev/null and b/cinelerra-5.0/plugins/defaulttheme/data/ff_checked.png differ diff --git a/cinelerra-5.0/plugins/defaulttheme/data/ff_checkedhi.png b/cinelerra-5.0/plugins/defaulttheme/data/ff_checkedhi.png new file mode 100644 index 00000000..0a6b5246 Binary files /dev/null and b/cinelerra-5.0/plugins/defaulttheme/data/ff_checkedhi.png differ diff --git a/cinelerra-5.0/plugins/defaulttheme/data/ff_down.png b/cinelerra-5.0/plugins/defaulttheme/data/ff_down.png new file mode 100644 index 00000000..5a0194df Binary files /dev/null and b/cinelerra-5.0/plugins/defaulttheme/data/ff_down.png differ diff --git a/cinelerra-5.0/plugins/defaulttheme/data/ff_hi.png b/cinelerra-5.0/plugins/defaulttheme/data/ff_hi.png new file mode 100644 index 00000000..237bcfca Binary files /dev/null and b/cinelerra-5.0/plugins/defaulttheme/data/ff_hi.png differ diff --git a/cinelerra-5.0/plugins/defaulttheme/data/ff_up.png b/cinelerra-5.0/plugins/defaulttheme/data/ff_up.png new file mode 100644 index 00000000..1da63a00 Binary files /dev/null and b/cinelerra-5.0/plugins/defaulttheme/data/ff_up.png differ diff --git a/cinelerra-5.0/plugins/defaulttheme/data/ff_video.png b/cinelerra-5.0/plugins/defaulttheme/data/ff_video.png new file mode 100644 index 00000000..73c231ba Binary files /dev/null and b/cinelerra-5.0/plugins/defaulttheme/data/ff_video.png differ diff --git a/cinelerra-5.0/plugins/defaulttheme/data/shbtn_dn.png b/cinelerra-5.0/plugins/defaulttheme/data/shbtn_dn.png new file mode 100644 index 00000000..19f4322e Binary files /dev/null and b/cinelerra-5.0/plugins/defaulttheme/data/shbtn_dn.png differ diff --git a/cinelerra-5.0/plugins/defaulttheme/data/shbtn_hi.png b/cinelerra-5.0/plugins/defaulttheme/data/shbtn_hi.png new file mode 100644 index 00000000..f6471607 Binary files /dev/null and b/cinelerra-5.0/plugins/defaulttheme/data/shbtn_hi.png differ diff --git a/cinelerra-5.0/plugins/defaulttheme/data/shbtn_up.png b/cinelerra-5.0/plugins/defaulttheme/data/shbtn_up.png new file mode 100644 index 00000000..ff9b68f5 Binary files /dev/null and b/cinelerra-5.0/plugins/defaulttheme/data/shbtn_up.png differ diff --git a/cinelerra-5.0/plugins/defaulttheme/defaulttheme.C b/cinelerra-5.0/plugins/defaulttheme/defaulttheme.C index c7b77b87..b57f70d3 100644 --- a/cinelerra-5.0/plugins/defaulttheme/defaulttheme.C +++ b/cinelerra-5.0/plugins/defaulttheme/defaulttheme.C @@ -309,6 +309,17 @@ void DefaultTheme::initialize() "labeltoggle_dn.png", "label_checkedhi.png"); + ffmpeg_toggle = new_image_set(5, + "ff_up.png", + "ff_hi.png", + "ff_checked.png", + "ff_down.png", + "ff_checkedhi.png"); + + shbtn_data = new_image_set(3, + "shbtn_up.png", + "shbtn_hi.png", + "shbtn_dn.png"); statusbar_cancel_data = new_image_set(3, "statusbar_cancel_up.png", diff --git a/cinelerra-5.0/plugins/edge/picon.png b/cinelerra-5.0/plugins/edge/picon.png new file mode 100644 index 00000000..018f595b Binary files /dev/null and b/cinelerra-5.0/plugins/edge/picon.png differ diff --git a/cinelerra-5.0/plugins/lof/Makefile b/cinelerra-5.0/plugins/lof/Makefile deleted file mode 100644 index 88b492ed..00000000 --- a/cinelerra-5.0/plugins/lof/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -include ../../global_config - -OBJS = $(OBJDIR)/lof.o $(OBJDIR)/lofwindow.o - -PLUGIN = lof - -include ../../plugin_config - - -$(OBJDIR)/lof.o: lof.C -$(OBJDIR)/lofwindow.o: lofwindow.C diff --git a/cinelerra-5.0/plugins/lof/lof.C b/cinelerra-5.0/plugins/lof/lof.C deleted file mode 100644 index 3cac11f4..00000000 --- a/cinelerra-5.0/plugins/lof/lof.C +++ /dev/null @@ -1,128 +0,0 @@ - -#include "lofwindow.h" - -// repeat last output frame on read_frame error -// uses vframe.status as read status - -REGISTER_PLUGIN(LofEffect) - -LofConfig::LofConfig() -{ - errs = 0; - miss = 1; - mark = 1; -} - -void LofConfig::copy_from(LofConfig &src) -{ - errs = src.errs; - miss = src.miss; - mark = src.mark; -} - -int LofConfig::equivalent(LofConfig &src) -{ - if( errs != src.errs ) return 0; - if( miss != src.miss ) return 0; - if( mark != src.mark ) return 0; - return 1; -} - -void LofConfig::interpolate(LofConfig &prev, LofConfig &next, - long prev_frame, long next_frame, long current_frame) -{ - copy_from(prev); -} - -LofEffect::LofEffect(PluginServer *server) - : PluginVClient(server) -{ - frm = 0; -} -LofEffect::~LofEffect() -{ - delete frm; -} - -const char* LofEffect::plugin_title() { return _("Last Frame"); } -int LofEffect::is_realtime() { return 1; } - -NEW_WINDOW_MACRO(LofEffect, LofWindow) -LOAD_CONFIGURATION_MACRO(LofEffect, LofConfig) - -void LofEffect::update_gui() -{ - if(thread) { - thread->window->lock_window(); - load_configuration(); - ((LofWindow*)thread->window)->update(); - thread->window->unlock_window(); - } -} - - -void LofEffect::save_data(KeyFrame *keyframe) -{ - FileXML output; - output.set_shared_output(keyframe->get_data(), MESSAGESIZE); - output.tag.set_title("LOF"); - output.tag.set_property("ERRS", config.errs); - output.tag.set_property("MISS", config.miss); - output.tag.set_property("MARK", config.mark); - output.append_tag(); - output.terminate_string(); -} - -void LofEffect::read_data(KeyFrame *keyframe) -{ - FileXML input; - input.set_shared_input(keyframe->get_data(), strlen(keyframe->get_data())); - while(!input.read_tag()) { - if(input.tag.title_is("LOF")) { - config.errs = input.tag.get_property("ERRS", config.errs); - config.miss = input.tag.get_property("MISS", config.miss); - config.mark = input.tag.get_property("MARK", config.mark); - } - } -} - - -int LofEffect::process_buffer(VFrame *frame, int64_t start_position, double frame_rate) -{ - load_configuration(); - int w = frame->get_w(), h = frame->get_h(); - int colormodel = frame->get_color_model(); - if( frm && (frm->get_w() != w || frm->get_h() != h || - frm->get_color_model() != colormodel ) ) { - delete frm; frm = 0; - } - int ret = read_frame(frame, 0, start_position, frame_rate, get_use_opengl()); - if( ret >= 0 ) ret = frame->get_status(); - if( ret > 0 ) { - if( !frm ) - frm = new VFrame(w, h, colormodel, -1); - frm->copy_from(frame); - } - else if( !frm ) - frame->clear_frame(); - else if( (ret < 0 && config.errs) || (!ret && config.miss) ) { - frame->copy_from(frm); - if( config.mark ) { - VFrame dot(1, 1, BC_RGBA8888, -1); - *(uint32_t*)dot.get_rows()[0] = 0xff0000ff; - int scl = 48, sz = 3, ww = w/scl, hh = h/scl; - if( ww < sz ) ww = w > sz ? sz : w; - if( hh < sz ) hh = h > sz ? sz : h; - BC_CModels::transfer( - frame->get_rows(), dot.get_rows(), - frame->get_y(), frame->get_u(), frame->get_v(), - dot.get_y(), dot.get_u(), dot.get_v(), - 0, 0, 1, 1, 0, 0, ww, hh, - dot.get_color_model(), frame->get_color_model(), - 0, dot.get_w(), frame->get_w()); - } - } - return 0; -} - - diff --git a/cinelerra-5.0/plugins/lof/lof.h b/cinelerra-5.0/plugins/lof/lof.h deleted file mode 100644 index 9bdefc8c..00000000 --- a/cinelerra-5.0/plugins/lof/lof.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef LOF_H -#define LOF_H - -#include "filexml.h" -#include "bchash.h" -#include "language.h" -#include "pluginvclient.h" -#include "vframe.h" - -class LofConfig; -class LofEffect; -class LofWindow; - -class LofConfig { -public: - int errs; - int miss; - int mark; - - LofConfig(); - - void copy_from(LofConfig &src); - int equivalent(LofConfig &src); - void interpolate(LofConfig &prev, LofConfig &next, - long prev_frame, long next_frame, long current_frame); -}; - -class LofEffect : public PluginVClient { -public: - LofEffect(PluginServer *server); - ~LofEffect(); - - PLUGIN_CLASS_MEMBERS(LofConfig) - int process_buffer(VFrame *frame, int64_t start_position, double frame_rate); - int is_realtime(); - void save_data(KeyFrame *keyframe); - void read_data(KeyFrame *keyframe); - void update_gui(); - - VFrame *frm; -}; - - -#endif diff --git a/cinelerra-5.0/plugins/lof/lofwindow.C b/cinelerra-5.0/plugins/lof/lofwindow.C deleted file mode 100644 index a2cfa12d..00000000 --- a/cinelerra-5.0/plugins/lof/lofwindow.C +++ /dev/null @@ -1,50 +0,0 @@ -#include "lofwindow.h" -#include "language.h" - -LofWindow::LofWindow(LofEffect *plugin) - : PluginClientWindow(plugin, 260, 160, 260, 160, 0) -{ - this->plugin = plugin; -} - -void LofWindow::create_objects() -{ - int x = 10, y = 10; - BC_Title *title = new BC_Title(x, y, _("Show last good output frame")); - add_subwindow(title); y += title->get_h() + 5; - title = new BC_Title(x+20, y, _("(you should fix the input)")); - add_subwindow(title); y += title->get_h() + 20; - add_tool(errfrms = new LofToggle(this, &plugin->config.errs, x, y, _("errant frames"))); - y += errfrms->get_h() + 5; - add_tool(misfrms = new LofToggle(this, &plugin->config.miss, x, y, _("missed frames"))); - y += misfrms->get_h() + 5; - add_tool(mrkfrms = new LofToggle(this, &plugin->config.mark, x, y, _("mark fixed frames"))); - show_window(); - flush(); -} - -void LofWindow::update() -{ - errfrms->update(plugin->config.errs); - misfrms->update(plugin->config.miss); - mrkfrms->update(plugin->config.mark); -} - -LofToggle::LofToggle(LofWindow *lofwin, int *output, int x, int y, const char *lbl) - : BC_CheckBox(x, y, *output, lbl) -{ - this->lofwin = lofwin; - this->output = output; -} - -LofToggle::~LofToggle() -{ -} - -int LofToggle::handle_event() -{ - *output = get_value(); - lofwin->plugin->send_configure_change(); - return 1; -} - diff --git a/cinelerra-5.0/plugins/lof/lofwindow.h b/cinelerra-5.0/plugins/lof/lofwindow.h deleted file mode 100644 index 9336465a..00000000 --- a/cinelerra-5.0/plugins/lof/lofwindow.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef __LOFWINDOW_H__ -#define __LOFWINDOW_H__ - -#include "lof.h" -#include "pluginvclient.h" - -class LofToggle; -class LofWindow; - -class LofToggle : public BC_CheckBox -{ -public: - LofToggle(LofWindow *lofwin, int *output, int x, int y, const char *lbl); - ~LofToggle(); - int handle_event(); - - LofWindow *lofwin; - int *output; -}; - -class LofWindow : public PluginClientWindow { -public: - LofWindow(LofEffect *plugin); - void create_objects(); - void update(); - LofEffect *plugin; - - LofToggle *errfrms; - LofToggle *misfrms; - LofToggle *mrkfrms; -}; - - -#endif diff --git a/cinelerra-5.0/plugins/lof/picon.png b/cinelerra-5.0/plugins/lof/picon.png deleted file mode 100644 index 41514cad..00000000 Binary files a/cinelerra-5.0/plugins/lof/picon.png and /dev/null differ diff --git a/cinelerra-5.0/plugins/microtheme/data/ff_audio.png b/cinelerra-5.0/plugins/microtheme/data/ff_audio.png new file mode 100644 index 00000000..c62e4073 Binary files /dev/null and b/cinelerra-5.0/plugins/microtheme/data/ff_audio.png differ diff --git a/cinelerra-5.0/plugins/microtheme/data/ff_checked.png b/cinelerra-5.0/plugins/microtheme/data/ff_checked.png new file mode 100644 index 00000000..9e07d526 Binary files /dev/null and b/cinelerra-5.0/plugins/microtheme/data/ff_checked.png differ diff --git a/cinelerra-5.0/plugins/microtheme/data/ff_checkedhi.png b/cinelerra-5.0/plugins/microtheme/data/ff_checkedhi.png new file mode 100644 index 00000000..0a6b5246 Binary files /dev/null and b/cinelerra-5.0/plugins/microtheme/data/ff_checkedhi.png differ diff --git a/cinelerra-5.0/plugins/microtheme/data/ff_down.png b/cinelerra-5.0/plugins/microtheme/data/ff_down.png new file mode 100644 index 00000000..5a0194df Binary files /dev/null and b/cinelerra-5.0/plugins/microtheme/data/ff_down.png differ diff --git a/cinelerra-5.0/plugins/microtheme/data/ff_hi.png b/cinelerra-5.0/plugins/microtheme/data/ff_hi.png new file mode 100644 index 00000000..237bcfca Binary files /dev/null and b/cinelerra-5.0/plugins/microtheme/data/ff_hi.png differ diff --git a/cinelerra-5.0/plugins/microtheme/data/ff_up.png b/cinelerra-5.0/plugins/microtheme/data/ff_up.png new file mode 100644 index 00000000..1da63a00 Binary files /dev/null and b/cinelerra-5.0/plugins/microtheme/data/ff_up.png differ diff --git a/cinelerra-5.0/plugins/microtheme/data/ff_video.png b/cinelerra-5.0/plugins/microtheme/data/ff_video.png new file mode 100644 index 00000000..73c231ba Binary files /dev/null and b/cinelerra-5.0/plugins/microtheme/data/ff_video.png differ diff --git a/cinelerra-5.0/plugins/microtheme/data/shbtn_dn.png b/cinelerra-5.0/plugins/microtheme/data/shbtn_dn.png new file mode 100644 index 00000000..19f4322e Binary files /dev/null and b/cinelerra-5.0/plugins/microtheme/data/shbtn_dn.png differ diff --git a/cinelerra-5.0/plugins/microtheme/data/shbtn_hi.png b/cinelerra-5.0/plugins/microtheme/data/shbtn_hi.png new file mode 100644 index 00000000..f6471607 Binary files /dev/null and b/cinelerra-5.0/plugins/microtheme/data/shbtn_hi.png differ diff --git a/cinelerra-5.0/plugins/microtheme/data/shbtn_up.png b/cinelerra-5.0/plugins/microtheme/data/shbtn_up.png new file mode 100644 index 00000000..ff9b68f5 Binary files /dev/null and b/cinelerra-5.0/plugins/microtheme/data/shbtn_up.png differ diff --git a/cinelerra-5.0/plugins/microtheme/microtheme.C b/cinelerra-5.0/plugins/microtheme/microtheme.C index eb435c40..f1b95493 100644 --- a/cinelerra-5.0/plugins/microtheme/microtheme.C +++ b/cinelerra-5.0/plugins/microtheme/microtheme.C @@ -74,15 +74,15 @@ MicroTheme::~MicroTheme() void MicroTheme::initialize() { //printf("MicroTheme::initialize 1\n"); - mwindow_icon = new VFrame(get_image("mwindow_icon.png")); - vwindow_icon = new VFrame(get_image("mwindow_icon.png")); - cwindow_icon = new VFrame(get_image("mwindow_icon.png")); - awindow_icon = new VFrame(get_image("mwindow_icon.png")); - record_icon = new VFrame(get_image("mwindow_icon.png")); - clip_icon = new VFrame(get_image("clip_icon.png")); + mwindow_icon = new VFramePng(get_image("mwindow_icon.png")); + vwindow_icon = new VFramePng(get_image("mwindow_icon.png")); + cwindow_icon = new VFramePng(get_image("mwindow_icon.png")); + awindow_icon = new VFramePng(get_image("mwindow_icon.png")); + record_icon = new VFramePng(get_image("mwindow_icon.png")); + clip_icon = new VFramePng(get_image("clip_icon.png")); - static VFrame *default_patchbay_bg = new VFrame(get_image("patchbay_bg.png")); + static VFrame *default_patchbay_bg = new VFramePng(get_image("patchbay_bg.png")); BC_WindowBase::get_resources()->bg_color = WHITE; BC_WindowBase::get_resources()->menu_light = WHITE; @@ -92,7 +92,7 @@ void MicroTheme::initialize() BC_WindowBase::get_resources()->menu_shadow = MEGREY; BC_WindowBase::get_resources()->medium_font = "-*-helvetica-medium-r-normal-*-10-*"; - static VFrame* default_listbox_bg = new VFrame(get_image("patchbay_bg.png")); + static VFrame* default_listbox_bg = new VFramePng(get_image("patchbay_bg.png")); BC_WindowBase::get_resources()->listbox_bg = default_listbox_bg; BC_WindowBase::get_resources()->button_light = WHITE; BC_WindowBase::get_resources()->button_up = WHITE; @@ -100,58 +100,58 @@ void MicroTheme::initialize() static VFrame *default_cancel_images[] = { - new VFrame(get_image("cancel_up.png")), new VFrame(get_image("cancel_hi.png")), new VFrame(get_image("cancel_dn.png")) + new VFramePng(get_image("cancel_up.png")), new VFramePng(get_image("cancel_hi.png")), new VFramePng(get_image("cancel_dn.png")) }; BC_WindowBase::get_resources()->cancel_images = default_cancel_images; static VFrame *default_ok_images[] = { - new VFrame(get_image("ok_up.png")), new VFrame(get_image("ok_hi.png")), new VFrame(get_image("ok_dn.png")) + new VFramePng(get_image("ok_up.png")), new VFramePng(get_image("ok_hi.png")), new VFramePng(get_image("ok_dn.png")) }; BC_WindowBase::get_resources()->ok_images = default_ok_images; static VFrame *default_button_images[] = { - new VFrame(get_image("generic_up.png")), new VFrame(get_image("generic_hi.png")), new VFrame(get_image("generic_dn.png")) + new VFramePng(get_image("generic_up.png")), new VFramePng(get_image("generic_hi.png")), new VFramePng(get_image("generic_dn.png")) }; BC_WindowBase::get_resources()->generic_button_images = default_button_images; static VFrame *default_tumble_images[] = { - new VFrame(get_image("tumble_up.png")), new VFrame(get_image("tumble_hi.png")), new VFrame(get_image("tumble_bottomdn.png")), new VFrame(get_image("tumble_topdn.png")) + new VFramePng(get_image("tumble_up.png")), new VFramePng(get_image("tumble_hi.png")), new VFramePng(get_image("tumble_bottomdn.png")), new VFramePng(get_image("tumble_topdn.png")) }; BC_WindowBase::get_resources()->tumble_data = default_tumble_images; static VFrame *default_checkbox_images[] = { - new VFrame(get_image("checkbox_up.png")), new VFrame(get_image("checkbox_hi.png")), new VFrame(get_image("checkbox_checked.png")), new VFrame(get_image("checkbox_dn.png")), new VFrame(get_image("checkbox_checkedhi.png")) + new VFramePng(get_image("checkbox_up.png")), new VFramePng(get_image("checkbox_hi.png")), new VFramePng(get_image("checkbox_checked.png")), new VFramePng(get_image("checkbox_dn.png")), new VFramePng(get_image("checkbox_checkedhi.png")) }; BC_WindowBase::get_resources()->checkbox_images = default_checkbox_images; static VFrame *default_radial_images[] = { - new VFrame(get_image("radial_up.png")), new VFrame(get_image("radial_hi.png")), new VFrame(get_image("radial_checked.png")), new VFrame(get_image("radial_dn.png")), new VFrame(get_image("radial_checkedhi.png")) + new VFramePng(get_image("radial_up.png")), new VFramePng(get_image("radial_hi.png")), new VFramePng(get_image("radial_checked.png")), new VFramePng(get_image("radial_dn.png")), new VFramePng(get_image("radial_checkedhi.png")) }; BC_WindowBase::get_resources()->radial_images = default_radial_images; static VFrame* default_xmeter_data[] = { - new VFrame(get_image("xmeter_normal.png")), - new VFrame(get_image("xmeter_green.png")), - new VFrame(get_image("xmeter_red.png")), - new VFrame(get_image("xmeter_yellow.png")), - new VFrame(get_image("over_horiz.png")) - new VFrame(get_image("downmix51_2.png")) + new VFramePng(get_image("xmeter_normal.png")), + new VFramePng(get_image("xmeter_green.png")), + new VFramePng(get_image("xmeter_red.png")), + new VFramePng(get_image("xmeter_yellow.png")), + new VFramePng(get_image("over_horiz.png")) + new VFramePng(get_image("downmix51_2.png")) }; static VFrame* default_ymeter_data[] = { - new VFrame(get_image("ymeter_normal.png")), - new VFrame(get_image("ymeter_green.png")), - new VFrame(get_image("ymeter_red.png")), - new VFrame(get_image("ymeter_yellow.png")), - new VFrame(get_image("over_vert.png")) - new VFrame(get_image("downmix51_2.png")) + new VFramePng(get_image("ymeter_normal.png")), + new VFramePng(get_image("ymeter_green.png")), + new VFramePng(get_image("ymeter_red.png")), + new VFramePng(get_image("ymeter_yellow.png")), + new VFramePng(get_image("over_vert.png")) + new VFramePng(get_image("downmix51_2.png")) }; BC_WindowBase::get_resources()->xmeter_images = default_xmeter_data; BC_WindowBase::get_resources()->ymeter_images = default_ymeter_data; @@ -162,71 +162,71 @@ void MicroTheme::initialize() static VFrame* default_pan_data[] = { - new VFrame(get_image("pan_up.png")), - new VFrame(get_image("pan_hi.png")), - new VFrame(get_image("pan_popup.png")), - new VFrame(get_image("pan_channel.png")), - new VFrame(get_image("pan_stick.png")), - new VFrame(get_image("pan_channel_small.png")), - new VFrame(get_image("pan_stick_small.png")) + new VFramePng(get_image("pan_up.png")), + new VFramePng(get_image("pan_hi.png")), + new VFramePng(get_image("pan_popup.png")), + new VFramePng(get_image("pan_channel.png")), + new VFramePng(get_image("pan_stick.png")), + new VFramePng(get_image("pan_channel_small.png")), + new VFramePng(get_image("pan_stick_small.png")) }; BC_WindowBase::get_resources()->pan_data = default_pan_data; BC_WindowBase::get_resources()->pan_text_color = BLACK; static VFrame *default_hscroll_data[] = { - new VFrame(get_image("hscroll_handle_up.png")), - new VFrame(get_image("hscroll_handle_hi.png")), - new VFrame(get_image("hscroll_handle_dn.png")), - new VFrame(get_image("hscroll_handle_bg.png")), - new VFrame(get_image("hscroll_left_up.png")), - new VFrame(get_image("hscroll_left_hi.png")), - new VFrame(get_image("hscroll_left_dn.png")), - new VFrame(get_image("hscroll_right_up.png")), - new VFrame(get_image("hscroll_right_hi.png")), - new VFrame(get_image("hscroll_right_dn.png")) + new VFramePng(get_image("hscroll_handle_up.png")), + new VFramePng(get_image("hscroll_handle_hi.png")), + new VFramePng(get_image("hscroll_handle_dn.png")), + new VFramePng(get_image("hscroll_handle_bg.png")), + new VFramePng(get_image("hscroll_left_up.png")), + new VFramePng(get_image("hscroll_left_hi.png")), + new VFramePng(get_image("hscroll_left_dn.png")), + new VFramePng(get_image("hscroll_right_up.png")), + new VFramePng(get_image("hscroll_right_hi.png")), + new VFramePng(get_image("hscroll_right_dn.png")) }; static VFrame *default_vscroll_data[] = { - new VFrame(get_image("vscroll_handle_up.png")), - new VFrame(get_image("vscroll_handle_hi.png")), - new VFrame(get_image("vscroll_handle_dn.png")), - new VFrame(get_image("vscroll_handle_bg.png")), - new VFrame(get_image("vscroll_left_up.png")), - new VFrame(get_image("vscroll_left_hi.png")), - new VFrame(get_image("vscroll_left_dn.png")), - new VFrame(get_image("vscroll_right_up.png")), - new VFrame(get_image("vscroll_right_hi.png")), - new VFrame(get_image("vscroll_right_dn.png")) + new VFramePng(get_image("vscroll_handle_up.png")), + new VFramePng(get_image("vscroll_handle_hi.png")), + new VFramePng(get_image("vscroll_handle_dn.png")), + new VFramePng(get_image("vscroll_handle_bg.png")), + new VFramePng(get_image("vscroll_left_up.png")), + new VFramePng(get_image("vscroll_left_hi.png")), + new VFramePng(get_image("vscroll_left_dn.png")), + new VFramePng(get_image("vscroll_right_up.png")), + new VFramePng(get_image("vscroll_right_hi.png")), + new VFramePng(get_image("vscroll_right_dn.png")) }; BC_WindowBase::get_resources()->hscroll_data = default_hscroll_data; BC_WindowBase::get_resources()->vscroll_data = default_vscroll_data; - channel_bg_data = new VFrame(get_image("channel_bg.png")); - channel_position_data = new VFrame(get_image("channel_position.png")); + channel_bg_data = new VFramePng(get_image("channel_bg.png")); + channel_position_data = new VFramePng(get_image("channel_position.png")); channel_position_color = BLACK; recordgui_fixed_color = BLACK; recordgui_variable_color = RED; patchbay_bg = default_patchbay_bg; - resource1024_bg_data = new VFrame(get_image("resource1024.png")); - resource512_bg_data = new VFrame(get_image("resource512.png")); - resource256_bg_data = new VFrame(get_image("resource256.png")); - resource128_bg_data = new VFrame(get_image("resource128.png")); - resource64_bg_data = new VFrame(get_image("resource64.png")); - resource32_bg_data = new VFrame(get_image("resource32.png")); - plugin_bg_data = new VFrame(get_image("plugin_bg.png")); - title_bg_data = new VFrame(get_image("title_bg.png")); - timebar_bg_data = new VFrame(get_image("timebar_bg.png")); - vtimebar_bg_data = new VFrame(get_image("vwindow_timebar.png")); + resource1024_bg_data = new VFramePng(get_image("resource1024.png")); + resource512_bg_data = new VFramePng(get_image("resource512.png")); + resource256_bg_data = new VFramePng(get_image("resource256.png")); + resource128_bg_data = new VFramePng(get_image("resource128.png")); + resource64_bg_data = new VFramePng(get_image("resource64.png")); + resource32_bg_data = new VFramePng(get_image("resource32.png")); + plugin_bg_data = new VFramePng(get_image("plugin_bg.png")); + title_bg_data = new VFramePng(get_image("title_bg.png")); + timebar_bg_data = new VFramePng(get_image("timebar_bg.png")); + vtimebar_bg_data = new VFramePng(get_image("vwindow_timebar.png")); new_button("pane.png", "pane_up.png", "pane_hi.png", "pane_dn.png", "pane"); - keyframe_data = new VFrame(get_image("keyframe3.png")); - camerakeyframe_data = new VFrame(get_image("camerakeyframe.png")); - maskkeyframe_data = new VFrame(get_image("maskkeyframe.png")); - modekeyframe_data = new VFrame(get_image("modekeyframe.png")); - pankeyframe_data = new VFrame(get_image("pankeyframe.png")); - projectorkeyframe_data = new VFrame(get_image("projectorkeyframe.png")); + keyframe_data = new VFramePng(get_image("keyframe3.png")); + camerakeyframe_data = new VFramePng(get_image("camerakeyframe.png")); + maskkeyframe_data = new VFramePng(get_image("maskkeyframe.png")); + modekeyframe_data = new VFramePng(get_image("modekeyframe.png")); + pankeyframe_data = new VFramePng(get_image("pankeyframe.png")); + projectorkeyframe_data = new VFramePng(get_image("projectorkeyframe.png")); VFrame editpanel_up(get_image("editpanel_up.png")); VFrame editpanel_hi(get_image("editpanel_hi.png")); @@ -234,11 +234,13 @@ void MicroTheme::initialize() VFrame editpanel_checked(get_image("editpanel_checked.png")); VFrame editpanel_checkedhi(get_image("editpanel_checkedhi.png")); - static VFrame *default_inpoint[] = { new VFrame(get_image("out_up.png")), new VFrame(get_image("out_hi.png")), new VFrame(get_image("out_checked.png")), new VFrame(get_image("out_dn.png")), new VFrame(get_image("out_checkedhi.png")) }; - static VFrame *default_labeltoggle[] = { new VFrame(get_image("labeltoggle_up.png")), new VFrame(get_image("labeltoggle_uphi.png")), new VFrame(get_image("label_checked.png")), new VFrame(get_image("labeltoggle_dn.png")), new VFrame(get_image("label_checkedhi.png")) }; - static VFrame *default_outpoint[] = { new VFrame(get_image("in_up.png")), new VFrame(get_image("in_hi.png")), new VFrame(get_image("in_checked.png")), new VFrame(get_image("in_dn.png")), new VFrame(get_image("in_checkedhi.png")) }; - static VFrame *transport_bg[] = { new VFrame(get_image("transportup.png")), new VFrame(get_image("transporthi.png")), new VFrame(get_image("transportdn.png")) }; - static VFrame *patches_bg[] = { new VFrame(get_image("patches_up.png")), new VFrame(get_image("patches_hi.png")), new VFrame(get_image("patches_checked.png")), new VFrame(get_image("patches_dn.png")), new VFrame(get_image("patches_checkedhi.png")) }; + static VFrame *default_inpoint[] = { new VFramePng(get_image("out_up.png")), new VFramePng(get_image("out_hi.png")), new VFramePng(get_image("out_checked.png")), new VFramePng(get_image("out_dn.png")), new VFramePng(get_image("out_checkedhi.png")) }; + static VFrame *default_labeltoggle[] = { new VFramePng(get_image("labeltoggle_up.png")), new VFramePng(get_image("labeltoggle_uphi.png")), new VFramePng(get_image("label_checked.png")), new VFramePng(get_image("labeltoggle_dn.png")), new VFramePng(get_image("label_checkedhi.png")) }; + static VFrame *default_ffmpegtoggle[] = { new VFramePng(get_image("ff_up.png")), new VFramePng(get_image("ff_hi.png")), new VFramePng(get_image("ff_checked.png")), new VFramePng(get_image("ff_down.png")), new VFramePng(get_image("ff_checkedhi.png")) }; + static VFrame *default_shbtndata[] = { new VFramePng(get_image("shbtn_up.png")), new VFramePng(get_image("shbtn_hi.png")), new VFramePng(get_image("shbtn_dn.png")), }; + static VFrame *default_outpoint[] = { new VFramePng(get_image("in_up.png")), new VFramePng(get_image("in_hi.png")), new VFramePng(get_image("in_checked.png")), new VFramePng(get_image("in_dn.png")), new VFramePng(get_image("in_checkedhi.png")) }; + static VFrame *transport_bg[] = { new VFramePng(get_image("transportup.png")), new VFramePng(get_image("transporthi.png")), new VFramePng(get_image("transportdn.png")) }; + static VFrame *patches_bg[] = { new VFramePng(get_image("patches_up.png")), new VFramePng(get_image("patches_hi.png")), new VFramePng(get_image("patches_checked.png")), new VFramePng(get_image("patches_dn.png")), new VFramePng(get_image("patches_checkedhi.png")) }; build_button(BC_WindowBase::get_resources()->filebox_updir_images, get_image("filebox_updir.png"), &editpanel_up, &editpanel_hi, &editpanel_dn); build_button(BC_WindowBase::get_resources()->filebox_newfolder_images, get_image("filebox_newfolder.png"), &editpanel_up, &editpanel_hi, &editpanel_dn); @@ -306,11 +308,11 @@ void MicroTheme::initialize() static VFrame *default_expandpatch_data[] = { - new VFrame(get_image("expandpatch_up.png")), - new VFrame(get_image("expandpatch_hi.png")), - new VFrame(get_image("expandpatch_checked.png")), - new VFrame(get_image("expandpatch_dn.png")), - new VFrame(get_image("expandpatch_checkedhi.png")) + new VFramePng(get_image("expandpatch_up.png")), + new VFramePng(get_image("expandpatch_hi.png")), + new VFramePng(get_image("expandpatch_checked.png")), + new VFramePng(get_image("expandpatch_dn.png")), + new VFramePng(get_image("expandpatch_checkedhi.png")) }; expandpatch_data = default_expandpatch_data; @@ -318,6 +320,8 @@ void MicroTheme::initialize() build_button(wrench_data, get_image("wrench.png"), &editpanel_up, &editpanel_hi, &editpanel_dn); in_point = default_inpoint; label_toggle = default_labeltoggle; + ffmpeg_toggle = default_ffmpegtoggle; + shbtn_data = default_shbtndata; out_point = default_outpoint; fade_h = BC_WindowBase::get_resources()->horizontal_slider_data[0]->get_h(); diff --git a/cinelerra-5.0/plugins/suv/data/ff_audio.png b/cinelerra-5.0/plugins/suv/data/ff_audio.png new file mode 100644 index 00000000..c62e4073 Binary files /dev/null and b/cinelerra-5.0/plugins/suv/data/ff_audio.png differ diff --git a/cinelerra-5.0/plugins/suv/data/ff_checked.png b/cinelerra-5.0/plugins/suv/data/ff_checked.png new file mode 100644 index 00000000..9e07d526 Binary files /dev/null and b/cinelerra-5.0/plugins/suv/data/ff_checked.png differ diff --git a/cinelerra-5.0/plugins/suv/data/ff_checkedhi.png b/cinelerra-5.0/plugins/suv/data/ff_checkedhi.png new file mode 100644 index 00000000..0a6b5246 Binary files /dev/null and b/cinelerra-5.0/plugins/suv/data/ff_checkedhi.png differ diff --git a/cinelerra-5.0/plugins/suv/data/ff_down.png b/cinelerra-5.0/plugins/suv/data/ff_down.png new file mode 100644 index 00000000..5a0194df Binary files /dev/null and b/cinelerra-5.0/plugins/suv/data/ff_down.png differ diff --git a/cinelerra-5.0/plugins/suv/data/ff_hi.png b/cinelerra-5.0/plugins/suv/data/ff_hi.png new file mode 100644 index 00000000..237bcfca Binary files /dev/null and b/cinelerra-5.0/plugins/suv/data/ff_hi.png differ diff --git a/cinelerra-5.0/plugins/suv/data/ff_up.png b/cinelerra-5.0/plugins/suv/data/ff_up.png new file mode 100644 index 00000000..1da63a00 Binary files /dev/null and b/cinelerra-5.0/plugins/suv/data/ff_up.png differ diff --git a/cinelerra-5.0/plugins/suv/data/ff_video.png b/cinelerra-5.0/plugins/suv/data/ff_video.png new file mode 100644 index 00000000..73c231ba Binary files /dev/null and b/cinelerra-5.0/plugins/suv/data/ff_video.png differ diff --git a/cinelerra-5.0/plugins/suv/data/shbtn_dn.png b/cinelerra-5.0/plugins/suv/data/shbtn_dn.png new file mode 100644 index 00000000..19f4322e Binary files /dev/null and b/cinelerra-5.0/plugins/suv/data/shbtn_dn.png differ diff --git a/cinelerra-5.0/plugins/suv/data/shbtn_hi.png b/cinelerra-5.0/plugins/suv/data/shbtn_hi.png new file mode 100644 index 00000000..f6471607 Binary files /dev/null and b/cinelerra-5.0/plugins/suv/data/shbtn_hi.png differ diff --git a/cinelerra-5.0/plugins/suv/data/shbtn_up.png b/cinelerra-5.0/plugins/suv/data/shbtn_up.png new file mode 100644 index 00000000..ff9b68f5 Binary files /dev/null and b/cinelerra-5.0/plugins/suv/data/shbtn_up.png differ diff --git a/cinelerra-5.0/plugins/suv/suv.C b/cinelerra-5.0/plugins/suv/suv.C index 08d4d547..6937885e 100644 --- a/cinelerra-5.0/plugins/suv/suv.C +++ b/cinelerra-5.0/plugins/suv/suv.C @@ -585,6 +585,18 @@ void SUV::initialize() "labeltoggle_dn.png", "label_checkedhi.png"); + ffmpeg_toggle = new_image_set(5, + "ff_up.png", + "ff_hi.png", + "ff_checked.png", + "ff_down.png", + "ff_checkedhi.png"); + + shbtn_data = new_image_set(3, + "shbtn_up.png", + "shbtn_hi.png", + "shbtn_dn.png"); + new_image_set("histogram_carrot", 5, "histogram_carrot_up.png", @@ -791,7 +803,7 @@ void SUV::initialize() void SUV::build_bg_data() { // Audio settings - channel_position_data = new VFrame(get_image_data("channel_position.png")); + channel_position_data = new VFramePng(get_image_data("channel_position.png")); // Track bitmaps new_image("resource1024", "resource1024.png"); @@ -809,12 +821,12 @@ void SUV::build_bg_data() void SUV::build_overlays() { - keyframe_data = new VFrame(get_image_data("keyframe3.png")); - camerakeyframe_data = new VFrame(get_image_data("camerakeyframe.png")); - maskkeyframe_data = new VFrame(get_image_data("maskkeyframe.png")); - modekeyframe_data = new VFrame(get_image_data("modekeyframe.png")); - pankeyframe_data = new VFrame(get_image_data("pankeyframe.png")); - projectorkeyframe_data = new VFrame(get_image_data("projectorkeyframe.png")); + keyframe_data = new VFramePng(get_image_data("keyframe3.png")); + camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png")); + maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png")); + modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png")); + pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png")); + projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png")); } diff --git a/cinelerra-5.0/plugins/svg/svg.C b/cinelerra-5.0/plugins/svg/svg.C index b70860f6..312b0498 100644 --- a/cinelerra-5.0/plugins/svg/svg.C +++ b/cinelerra-5.0/plugins/svg/svg.C @@ -226,7 +226,7 @@ int SvgMain::process_realtime(VFrame *input, VFrame *output) if( png_buffer != MAP_FAILED ) { if( png_buffer[0] == 0x89 && png_buffer[1] == 0x50 && png_buffer[2] == 0x4e && png_buffer[3] == 0x47 ) { - ofrm = new VFrame(png_buffer, st_png.st_size); + ofrm = new VFramePng(png_buffer, st_png.st_size, 1., 1.); if( ofrm->get_color_model() != output->get_color_model() ) { VFrame *vfrm = new VFrame(ofrm->get_w(), ofrm->get_h(), output->get_color_model()); diff --git a/cinelerra-5.0/plugins/synthesizer/synthesizer.C b/cinelerra-5.0/plugins/synthesizer/synthesizer.C index e7fc1333..0188d07f 100644 --- a/cinelerra-5.0/plugins/synthesizer/synthesizer.C +++ b/cinelerra-5.0/plugins/synthesizer/synthesizer.C @@ -660,16 +660,16 @@ void SynthWindow::create_objects() #include "black_dn_png.h" #include "black_checked_png.h" #include "black_checkedhi_png.h" - white_key[0] = new VFrame(white_up_png); - white_key[1] = new VFrame(white_hi_png); - white_key[2] = new VFrame(white_checked_png); - white_key[3] = new VFrame(white_dn_png); - white_key[4] = new VFrame(white_checkedhi_png); - black_key[0] = new VFrame(black_up_png); - black_key[1] = new VFrame(black_hi_png); - black_key[2] = new VFrame(black_checked_png); - black_key[3] = new VFrame(black_dn_png); - black_key[4] = new VFrame(black_checkedhi_png); + white_key[0] = new VFramePng(white_up_png); + white_key[1] = new VFramePng(white_hi_png); + white_key[2] = new VFramePng(white_checked_png); + white_key[3] = new VFramePng(white_dn_png); + white_key[4] = new VFramePng(white_checkedhi_png); + black_key[0] = new VFramePng(black_up_png); + black_key[1] = new VFramePng(black_hi_png); + black_key[2] = new VFramePng(black_checked_png); + black_key[3] = new VFramePng(black_dn_png); + black_key[4] = new VFramePng(black_checkedhi_png); add_subwindow(note_subwindow = new BC_SubWindow(x1,