X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcresources.h;h=feca1095043be5ebdb31c95cad86e1b851421932;hb=5621db270ccbeabc106e0f438941dba6f930652b;hp=8ff046490d423555a99fecd7489af29f1a6e8728;hpb=3ac72077bee819333ea9e8c3c3307b529ecf3647;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bcresources.h b/cinelerra-5.1/guicast/bcresources.h
index 8ff04649..feca1095 100644
--- a/cinelerra-5.1/guicast/bcresources.h
+++ b/cinelerra-5.1/guicast/bcresources.h
@@ -165,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;
@@ -195,6 +196,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;
@@ -304,33 +306,32 @@ 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();
 
@@ -360,7 +361,9 @@ 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);
@@ -387,6 +390,7 @@ public:
 	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];
@@ -413,7 +417,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);