X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fplugins%2Fblondtheme%2Fblondtheme.C;h=47a1758e1da600e03facad2f2d52348918a4959b;hb=310cfd249d955850c39757d80e07949ad4fef205;hp=89dc4983c60448a886b7c9dbe6189ea7da3b8239;hpb=2d99bb8ce591f05a31464b517d85dc2bc35b2abe;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/plugins/blondtheme/blondtheme.C b/cinelerra-5.0/plugins/blondtheme/blondtheme.C
index 89dc4983..47a1758e 100644
--- a/cinelerra-5.0/plugins/blondtheme/blondtheme.C
+++ b/cinelerra-5.0/plugins/blondtheme/blondtheme.C
@@ -68,7 +68,7 @@ BlondThemeMain::~BlondThemeMain()
 
 const char* BlondThemeMain::plugin_title()
 {
-	return "Blond-cv";
+	return _("Blond-cv");
 }
 
 Theme* BlondThemeMain::new_theme()
@@ -93,6 +93,14 @@ BlondTheme::BlondTheme()
 
 BlondTheme::~BlondTheme()
 {
+	delete camerakeyframe_data;
+	delete channel_bg_data;
+	delete channel_position_data;
+	delete keyframe_data;
+	delete maskkeyframe_data;
+	delete modekeyframe_data;
+	delete pankeyframe_data;
+	delete projectorkeyframe_data;
 }
 
 void BlondTheme::initialize()
@@ -313,6 +321,63 @@ void BlondTheme::initialize()
 		"generic_dn.png",
 		"new_cancel_images");
 
+	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->bar_data = new_image("bar", "bar.png");
 
 
@@ -547,6 +612,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",
@@ -722,7 +798,7 @@ void BlondTheme::initialize()
 	title_color = WHITE;
 	recordgui_fixed_color = YELLOW;
 	recordgui_variable_color = RED;
-	resources->medium_font = N_("-*-helvetica-bold-r-normal-*-14-*");
+	resources->medium_font = "-*-helvetica-bold-r-normal-*-14-*";
 
 	channel_position_color = MEYELLOW;
 	resources->meter_title_w = 25;
@@ -988,8 +1064,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 +1083,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"));
 }