X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcresources.h;h=369d196c5734e4e8bb987af9fa6c90c2b3005e2a;hp=82a3c3be65ad5e36a3359e20d0f3c6e51111399d;hb=04031cc2a664d2a6d9d2a37954c55cc68742d78c;hpb=6fd57106820e676e368399d16b925bdc78d34621 diff --git a/cinelerra-5.1/guicast/bcresources.h b/cinelerra-5.1/guicast/bcresources.h index 82a3c3be..369d196c 100644 --- a/cinelerra-5.1/guicast/bcresources.h +++ b/cinelerra-5.1/guicast/bcresources.h @@ -139,7 +139,8 @@ public: // color for progress text int progress_text; - +// set focus on enter + int grab_input_focus; int menu_highlighted_fontcolor; @@ -153,6 +154,7 @@ public: int tooltip_delay; int tooltip_bg_color; int tooltips_enabled; + int textbox_focus_policy; int audiovideo_color; @@ -163,6 +165,7 @@ public: int text_border2; int text_border2_hi; int text_background; + int text_background_disarmed; int text_background_hi; int text_background_noborder_hi; int text_border3; @@ -170,6 +173,7 @@ public: int text_border4; int text_highlight; int text_inactive_highlight; + int text_selected_highlight; // Not used int text_background_noborder; @@ -181,6 +185,8 @@ public: static VFrame *bg_image; static VFrame *menu_bg; +// default icon + VFrame *default_icon; // Buttons VFrame **ok_images; VFrame **cancel_images; @@ -192,6 +198,7 @@ public: VFrame **filebox_descend_images; VFrame **filebox_delete_images; VFrame **filebox_reload_images; + VFrame **filebox_szfmt_images; // Generic button images VFrame **generic_button_images; @@ -274,7 +281,7 @@ public: int drag_radius; // Filebox - static suffix_to_type_t suffix_to_type[TOTAL_SUFFIXES]; + static suffix_to_type_t suffix_to_type[]; VFrame **type_to_icon; // Display mode for fileboxes int filebox_mode; @@ -301,34 +308,34 @@ public: int directory_color; int file_color; double font_scale, icon_scale; - // fonts - static const char *small_font; - static const char *medium_font; - static const char *large_font; - static const char *big_font; -// Backup of fonts in case the first choices don't exist - static const char *small_font2; - static const char *medium_font2; - static const char *large_font2; - static const char *big_font2; + static const char *small_font, *small_font2; + static const char *medium_font, *medium_font2; + static const char *large_font, *large_font2; + static const char *big_font, *big_font2; + static const char *clock_font, *clock_font2; static const char *small_fontset; static const char *medium_fontset; static const char *large_fontset; static const char *big_fontset; + static const char *clock_fontset; static const char *small_font_xft, *small_b_font_xft; static const char *medium_font_xft, *medium_b_font_xft; static const char *large_font_xft, *large_b_font_xft; static const char *big_font_xft, *big_b_font_xft; + static const char *clock_font_xft, *clock_b_font_xft; // Backup of fonts in case the first choices don't exist static const char *small_font_xft2; static const char *medium_font_xft2; static const char *large_font_xft2; static const char *big_font_xft2; + static const char *clock_font_xft2; + void init_font_defs(double scale); + void finit_font_defs(); VFrame **medium_7segment; @@ -356,7 +363,48 @@ public: static size_t encode(const char *from_enc, const char *to_enc, char *input, int input_length, char *output, int output_length); static int find_font_by_char(FT_ULong char_code, char *path_new, const FT_Face oldface); + static int font_debug; static void dump_fonts(FILE *fp = stdout); + static void dump_font_entry(FILE *fp, const char *cp, BC_FontEntry *ep); + + static void new_vframes(int n, VFrame *vframes[], ...); + static void del_vframes(VFrame *vframes[], int n); +// default images + static VFrame *default_type_to_icon[6]; + static VFrame *default_bar; + static VFrame *default_cancel_images[3]; + static VFrame *default_ok_images[3]; + static VFrame *default_usethis_images[3]; +#if 0 + static VFrame *default_checkbox_images[5]; + static VFrame *default_radial_images[5]; + static VFrame *default_label_images[5]; +#endif + static VFrame *default_menuitem_data[3]; + static VFrame *default_menubar_data[3]; + static VFrame *default_menu_popup_bg; + static VFrame *default_menu_bar_bg; + static VFrame *default_check_image; + static VFrame *default_filebox_text_images[3]; + static VFrame *default_filebox_icons_images[3]; + static VFrame *default_filebox_updir_images[3]; + static VFrame *default_filebox_newfolder_images[3]; + static VFrame *default_filebox_rename_images[3]; + static VFrame *default_filebox_delete_images[3]; + static VFrame *default_filebox_reload_images[3]; + static VFrame *default_filebox_szfmt_images[12]; + static VFrame *default_listbox_button[4]; + static VFrame *default_listbox_bg; + static VFrame *default_listbox_expand[5]; + static VFrame *default_listbox_column[3]; + static VFrame *default_listbox_up; + static VFrame *default_listbox_dn; + static VFrame *default_pot_images[3]; + static VFrame *default_progress_images[2]; + static VFrame *default_medium_7segment[20]; + static VFrame *default_vscroll_data[10]; + static VFrame *default_hscroll_data[10]; + static VFrame *default_icon_img; // Make VFrame use shm int vframe_shm; @@ -374,7 +422,8 @@ public: int use_xvideo; // Seems to help if only 1 window is created at a time. Mutex *create_window_lock; - +// size raw, 1000, 1024, thou + int filebox_size_format; private: // Test for availability of shared memory pixmaps void init_shm(BC_WindowBase *window);