X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcresources.C;h=e340060099810ba20429b593bceaca7ab9bd80e7;hb=5621db270ccbeabc106e0f438941dba6f930652b;hp=2ab104e094b78244b1c586b7c6a1de38a8c1eff0;hpb=5e3715ec449272335bab3419bf21ed4cd6d4bcbf;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/bcresources.C b/cinelerra-5.1/guicast/bcresources.C index 2ab104e0..e3400600 100644 --- a/cinelerra-5.1/guicast/bcresources.C +++ b/cinelerra-5.1/guicast/bcresources.C @@ -200,22 +200,34 @@ suffix_to_type_t BC_Resources::suffix_to_type[] = { "aac", ICON_SOUND }, { "ac3", ICON_SOUND }, { "dts", ICON_SOUND }, + { "f4a", ICON_SOUND }, { "flac", ICON_SOUND }, + { "m4a", ICON_SOUND }, { "mp2", ICON_SOUND }, { "mp3", ICON_SOUND }, + { "mpc", ICON_SOUND }, + { "oga", ICON_SOUND }, + { "ogg", ICON_SOUND }, + { "opus", ICON_SOUND }, + { "ra", ICON_SOUND }, + { "tta", ICON_SOUND }, + { "vox", ICON_SOUND }, { "wav", ICON_SOUND }, { "wma", ICON_SOUND }, - { "wmv", ICON_SOUND }, + { "3gp", ICON_FILM }, { "avi", ICON_FILM }, { "bmp", ICON_FILM }, { "cr2", ICON_FILM }, { "dnxhd", ICON_FILM }, - { "dvd", ICON_FILM }, + { "drc", ICON_FILM }, { "dv", ICON_FILM }, + { "dvd", ICON_FILM }, + { "exr", ICON_FILM }, { "f4v", ICON_FILM }, { "flv", ICON_FILM }, { "gif", ICON_FILM }, { "gxf", ICON_FILM }, + { "h263", ICON_FILM }, { "h264", ICON_FILM }, { "h265", ICON_FILM }, { "hevc", ICON_FILM }, @@ -225,15 +237,17 @@ suffix_to_type_t BC_Resources::suffix_to_type[] = { "m2t", ICON_FILM }, { "m2ts", ICON_FILM }, { "m2v", ICON_FILM }, + { "m4p", ICON_FILM }, { "m4v", ICON_FILM }, { "mkv", ICON_FILM }, { "mov", ICON_FILM }, { "mp4", ICON_FILM }, + { "mpe", ICON_FILM }, { "mpeg", ICON_FILM }, { "mpg", ICON_FILM }, + { "mpv", ICON_FILM }, { "mts", ICON_FILM }, { "mxf", ICON_FILM }, - { "ogg", ICON_FILM }, { "ogv", ICON_FILM }, { "pcm", ICON_FILM }, { "pgm", ICON_FILM }, @@ -241,14 +255,17 @@ suffix_to_type_t BC_Resources::suffix_to_type[] = { "ppm", ICON_FILM }, { "qt", ICON_FILM }, { "rm", ICON_FILM }, + { "rmvb", ICON_FILM }, + { "rv", ICON_FILM }, { "swf", ICON_FILM }, - { "tiff", ICON_FILM }, { "tif", ICON_FILM }, + { "tiff", ICON_FILM }, { "ts", ICON_FILM }, { "vob", ICON_FILM }, { "vts", ICON_FILM }, { "webm", ICON_FILM }, { "webp", ICON_FILM }, + { "wmv", ICON_FILM }, { "xml", ICON_FILM }, { "y4m", ICON_FILM }, { 0, 0 }, @@ -330,6 +347,7 @@ VFrame *BC_Resources::default_filebox_newfolder_images[3] = { 0, }; VFrame *BC_Resources::default_filebox_rename_images[3] = { 0, }; VFrame *BC_Resources::default_filebox_delete_images[3] = { 0, }; VFrame *BC_Resources::default_filebox_reload_images[3] = { 0, }; +VFrame *BC_Resources::default_filebox_szfmt_images[12] = { 0, }; VFrame *BC_Resources::default_listbox_button[4] = { 0, }; VFrame *BC_Resources::default_listbox_bg = 0; VFrame *BC_Resources::default_listbox_expand[5] = { 0, }; @@ -473,59 +491,85 @@ new_vframes(3,default_menubar_data, #include "images/file_text_up_png.h" #include "images/file_text_hi_png.h" #include "images/file_text_dn_png.h" -#include "images/file_icons_up_png.h" -#include "images/file_icons_hi_png.h" -#include "images/file_icons_dn_png.h" -#include "images/file_newfolder_up_png.h" -#include "images/file_newfolder_hi_png.h" -#include "images/file_newfolder_dn_png.h" -#include "images/file_rename_up_png.h" -#include "images/file_rename_hi_png.h" -#include "images/file_rename_dn_png.h" -#include "images/file_updir_up_png.h" -#include "images/file_updir_hi_png.h" -#include "images/file_updir_dn_png.h" -#include "images/file_delete_up_png.h" -#include "images/file_delete_hi_png.h" -#include "images/file_delete_dn_png.h" -#include "images/file_reload_up_png.h" -#include "images/file_reload_hi_png.h" -#include "images/file_reload_dn_png.h" new_vframes(3,default_filebox_text_images, new VFramePng(file_text_up_png), new VFramePng(file_text_hi_png), new VFramePng(file_text_dn_png)); +#include "images/file_icons_up_png.h" +#include "images/file_icons_hi_png.h" +#include "images/file_icons_dn_png.h" new_vframes(3,default_filebox_icons_images, new VFramePng(file_icons_up_png), new VFramePng(file_icons_hi_png), new VFramePng(file_icons_dn_png)); +#include "images/file_updir_up_png.h" +#include "images/file_updir_hi_png.h" +#include "images/file_updir_dn_png.h" new_vframes(3,default_filebox_updir_images, new VFramePng(file_updir_up_png), new VFramePng(file_updir_hi_png), new VFramePng(file_updir_dn_png)); +#include "images/file_newfolder_up_png.h" +#include "images/file_newfolder_hi_png.h" +#include "images/file_newfolder_dn_png.h" new_vframes(3,default_filebox_newfolder_images, new VFramePng(file_newfolder_up_png), new VFramePng(file_newfolder_hi_png), new VFramePng(file_newfolder_dn_png)); +#include "images/file_rename_up_png.h" +#include "images/file_rename_hi_png.h" +#include "images/file_rename_dn_png.h" new_vframes(3,default_filebox_rename_images, new VFramePng(file_rename_up_png), new VFramePng(file_rename_hi_png), new VFramePng(file_rename_dn_png)); +#include "images/file_delete_up_png.h" +#include "images/file_delete_hi_png.h" +#include "images/file_delete_dn_png.h" new_vframes(3,default_filebox_delete_images, new VFramePng(file_delete_up_png), new VFramePng(file_delete_hi_png), new VFramePng(file_delete_dn_png)); +#include "images/file_reload_up_png.h" +#include "images/file_reload_hi_png.h" +#include "images/file_reload_dn_png.h" new_vframes(3,default_filebox_reload_images, new VFramePng(file_reload_up_png), new VFramePng(file_reload_hi_png), new VFramePng(file_reload_dn_png)); +#include "images/file_size_capb_up_png.h" +#include "images/file_size_capb_hi_png.h" +#include "images/file_size_capb_dn_png.h" +#include "images/file_size_lwrb_up_png.h" +#include "images/file_size_lwrb_hi_png.h" +#include "images/file_size_lwrb_dn_png.h" +#include "images/file_size_semi_up_png.h" +#include "images/file_size_semi_hi_png.h" +#include "images/file_size_semi_dn_png.h" +#include "images/file_size_zero_up_png.h" +#include "images/file_size_zero_hi_png.h" +#include "images/file_size_zero_dn_png.h" +new_vframes(12,default_filebox_szfmt_images, + new VFramePng(file_size_zero_up_png), + new VFramePng(file_size_zero_hi_png), + new VFramePng(file_size_zero_dn_png), + new VFramePng(file_size_lwrb_up_png), + new VFramePng(file_size_lwrb_hi_png), + new VFramePng(file_size_lwrb_dn_png), + new VFramePng(file_size_capb_up_png), + new VFramePng(file_size_capb_hi_png), + new VFramePng(file_size_capb_dn_png), + new VFramePng(file_size_semi_up_png), + new VFramePng(file_size_semi_hi_png), + new VFramePng(file_size_semi_dn_png)); + #include "images/listbox_button_dn_png.h" #include "images/listbox_button_hi_png.h" #include "images/listbox_button_up_png.h" @@ -715,6 +759,7 @@ new_vframes(20,default_medium_7segment, text_default = BLACK; highlight_inverse = WHITE ^ BLUE; text_background = WHITE; + text_background_disarmed = 0xc08080; text_background_hi = LTYELLOW; text_background_noborder_hi = LTGREY; text_background_noborder = -1; @@ -766,6 +811,8 @@ new_vframes(20,default_medium_7segment, filebox_rename_images = default_filebox_rename_images; filebox_delete_images = default_filebox_delete_images; filebox_reload_images = default_filebox_reload_images; + filebox_szfmt_images = default_filebox_szfmt_images; + filebox_size_format = FILEBOX_SIZE_RAW; directory_color = BLUE; file_color = BLACK; @@ -842,6 +889,7 @@ BC_Resources::~BC_Resources() del_vframes(default_filebox_rename_images, 3); del_vframes(default_filebox_delete_images, 3); del_vframes(default_filebox_reload_images, 3); + del_vframes(default_filebox_szfmt_images, 12); del_vframes(default_listbox_button, 4); delete default_listbox_bg; del_vframes(default_listbox_expand, 5); @@ -1328,7 +1376,7 @@ int BC_Resources::init_fontconfig(const char *search_path) entry->registry = cstrdup("utf"); entry->encoding = cstrdup("8"); - if(!FcPatternGetString(font, FC_STYLE, 0, &style) == FcResultMatch) + if( FcPatternGetString(font, FC_STYLE, 0, &style) != FcResultMatch ) force_style = 0; // If font has a style unmanaged by titler plugin, force style to be displayed on name