X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blond_cv%2Fblondcvtheme.C;h=fdbffc8a0bae091f86f79a6dd768073f0bbb821c;hp=ff4bef774ed38a335cbb25799d59ea81d64f931e;hb=214bd0ba9e21635e03d0c0e2b2ae1a7e9170583c;hpb=ed1cab1d6cbde6129bbd09b9609f7bba03ab610f

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
index ff4bef77..fdbffc8a 100644
--- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
@@ -67,10 +67,7 @@ BlondCVThemeMain::~BlondCVThemeMain()
 {
 }
 
-const char* BlondCVThemeMain::plugin_title()
-{
-	return _("Blond-cv");
-}
+const char* BlondCVThemeMain::plugin_title() { return N_("Blond-cv"); }
 
 Theme* BlondCVThemeMain::new_theme()
 {
@@ -162,6 +159,7 @@ void BlondCVTheme::initialize()
 
 	resources->text_default = 0x000000;
 	resources->text_background = 0xffffff;
+	resources->text_background_disarmed = 0xff0000;
 	resources->text_border1 = 0x4a484a; // (top outer)
 	resources->text_border2 = 0x000000; // (top inner)
 	resources->text_border3 = 0xacaeac; // (bottom inner)
@@ -253,18 +251,13 @@ void BlondCVTheme::initialize()
 	resources->ok_images = new_button("ok.png",
 			"generic_up.png",
 			"generic_hi.png",
-			"generic_dn.png");
+			"generic_dn.png",
+			"ok_button");
 
 	resources->dirbox_margin = 50;
 	resources->filebox_margin = 101;
 	resources->file_color = 0x000000;
 	resources->directory_color = 0x0000ff;
-	resources->cancel_images = new_button("cancel.png",
-			"generic_up.png",
-			"generic_hi.png",
-			"generic_dn.png");
-
-
 
 // Record windows
 	rgui_batch = new_image("recordgui_batch.png");
@@ -276,44 +269,58 @@ void BlondCVTheme::initialize()
 	resources->filebox_icons_images = new_button("icons.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_icons");
 
 	resources->filebox_text_images = new_button("text.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_text");
 
 	resources->filebox_newfolder_images = new_button("folder.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_newfolder");
+
+	resources->filebox_rename_images = new_button("rename.png",
+		"fileboxbutton_up.png",
+		"fileboxbutton_hi.png",
+		"fileboxbutton_dn.png",
+		"filebox_rename");
 
 	resources->filebox_updir_images = new_button("updir.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_updir");
 
 	resources->filebox_delete_images = new_button("delete.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_delete");
 
 	resources->filebox_reload_images = new_button("reload.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_reload");
 
 
 	resources->filebox_descend_images = new_button("openfolder.png",
 		"generic_up.png",
 		"generic_hi.png",
-		"generic_dn.png");
+		"generic_dn.png",
+		"filebox_descend");
 
 	resources->usethis_button_images =
 		resources->ok_images = new_button("ok.png",
 		"generic_up.png",
 		"generic_hi.png",
-		"generic_dn.png");
+		"generic_dn.png",
+		"ok_button");
 
 	new_button("ok.png",
 		"generic_up.png",
@@ -324,7 +331,8 @@ void BlondCVTheme::initialize()
 	resources->cancel_images = new_button("cancel.png",
 		"generic_up.png",
 		"generic_hi.png",
-		"generic_dn.png");
+		"generic_dn.png",
+		"cancel_button");
 
 	new_button("cancel.png",
 		"generic_up.png",
@@ -639,6 +647,12 @@ void BlondCVTheme::initialize()
 		"shbtn_hi.png",
 		"shbtn_dn.png");
 
+	new_image_set("preset_edit",
+		3,
+		"preset_edit0.png",
+		"preset_edit1.png",
+		"preset_edit2.png");
+
 	statusbar_cancel_data = new_image_set(3,
 		"statusbar_cancel_up.png",
 		"statusbar_cancel_hi.png",
@@ -656,6 +670,44 @@ void BlondCVTheme::initialize()
 	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_toggle.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_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 	//bottom_justify = new_button("bottom_justify.png", editpanel_up, editpanel_hi, editpanel_dn);
 	//center_justify = new_button("center_justify.png", editpanel_up, editpanel_hi, editpanel_dn);
@@ -672,15 +724,15 @@ void BlondCVTheme::initialize()
 	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("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);
+	over_button = new_button("over.png", editpanel_up, editpanel_hi, editpanel_dn, "overbutton");
+	overwrite_data = new_button("overwrite.png", editpanel_up, editpanel_hi, editpanel_dn, "overwritebutton");
 	new_button("paste.png", editpanel_up, editpanel_hi, editpanel_dn, "paste");
 	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("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);
+	splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn, "slicebutton");
 	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");
@@ -1075,7 +1127,6 @@ void BlondCVTheme::build_icons()
 	new_image("cwindow_icon", "heroine_icon.png");
 	new_image("awindow_icon", "heroine_icon.png");
 	new_image("record_icon", "heroine_icon.png");
-	new_image("clip_icon", "clip_icon.png");
 }