X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_hulk%2Fhulktheme.C;h=fffc6b45de013392095957244ddf4bd1e88bb420;hp=57ada334709ab0e6095128f7c67d0eeca38870d9;hb=540f653df26e5e2d1249de1f7a1a3d888dddf341;hpb=ed1cab1d6cbde6129bbd09b9609f7bba03ab610f

diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
index 57ada334..fffc6b45 100644
--- a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
+++ b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
@@ -69,10 +69,7 @@ HULKTHEMEMain::~HULKTHEMEMain()
 {
 }
 
-const char* HULKTHEMEMain::plugin_title()
-{
-	return _("Hulk");
-}
+const char* HULKTHEMEMain::plugin_title() { return N_("Hulk"); }
 
 Theme* HULKTHEMEMain::new_theme()
 {
@@ -112,6 +109,7 @@ void HULKTHEME::initialize()
 
 	resources->text_default = 0x001000;
 	resources->text_background = 0x75b697;
+	resources->text_background_disarmed = 0xce00ff;
 	resources->text_border1 = 0x202020;
 	resources->text_border2 = 0x75b697;
 	resources->text_border3 = 0x75b697;
@@ -219,49 +217,58 @@ void HULKTHEME::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");
+		"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",
 		"filebox_bigbutton_up.png",
 		"filebox_bigbutton_hi.png",
-		"filebox_bigbutton_dn.png");
+		"filebox_bigbutton_dn.png",
+		"filebox_descend");
 
 	resources->usethis_button_images =
 		resources->ok_images = new_button("ok.png",
 		"filebox_bigbutton_up.png",
 		"filebox_bigbutton_hi.png",
-		"filebox_bigbutton_dn.png");
+		"filebox_bigbutton_dn.png",
+		"ok_button");
 
 	new_button("ok.png",
 		"new_bigbutton_up.png",
@@ -272,7 +279,8 @@ void HULKTHEME::initialize()
 	resources->cancel_images = new_button("cancel.png",
 		"filebox_bigbutton_up.png",
 		"filebox_bigbutton_hi.png",
-		"filebox_bigbutton_dn.png");
+		"filebox_bigbutton_dn.png",
+		"cancel_button");
 
 	new_button("cancel.png",
 		"new_bigbutton_up.png",
@@ -360,7 +368,8 @@ void HULKTHEME::initialize()
 		"editpanel_up.png",
 		"editpanel_hi.png",
 		"editpanel_dn.png",
-		"editpanel_hi.png");
+		"editpanel_hi.png",
+		"listbox_button");
 	resources->listbox_column = new_image_set(3,
 		"column_up.png",
 		"column_hi.png",
@@ -515,10 +524,10 @@ void HULKTHEME::initialize()
 	setformat_w = get_image("setformat_bg")->get_w();
 	setformat_h = get_image("setformat_bg")->get_h();
 	setformat_x1 = 15;
-	setformat_x2 = 100;
+	setformat_x2 = 110;
 
 	setformat_x3 = 315;
-	setformat_x4 = 415;
+	setformat_x4 = 425;
 	setformat_y1 = 20;
 	setformat_y2 = 85;
 	setformat_y3 = 125;
@@ -614,11 +623,24 @@ void HULKTHEME::initialize()
 		"ff_down.png",
 		"ff_checkedhi.png");
 
+	proxy_toggle = new_image_set(5,
+		"proxy_up.png",
+		"proxy_hi.png",
+		"proxy_chkd.png",
+		"proxy_down.png",
+		"proxy_chkdhi.png");
+
 	shbtn_data = new_image_set(3,
 		"shbtn_up.png",
 		"shbtn_hi.png",
 		"shbtn_dn.png");
 
+	new_image_set("preset_edit",
+		3,
+		"preset_edit0.png",
+		"preset_edit1.png",
+		"preset_edit2.png");
+
 	new_image_set("histogram_carrot",
 		5,
 		"histogram_carrot_up.png",
@@ -645,7 +667,7 @@ void HULKTHEME::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.png",
+	new_toggle("histogram_toggle.png",
 		editpanel_up,
 		editpanel_hi,
 		editpanel_checked,
@@ -682,7 +704,7 @@ void HULKTHEME::initialize()
 		"scope_toggle");
 
 	new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-	new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+	new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
 	new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
@@ -700,12 +722,12 @@ void HULKTHEME::initialize()
 	new_button("nextedit.png", editpanel_up, editpanel_hi, editpanel_dn, "nextedit");
 	new_button("prevedit.png", editpanel_up, editpanel_hi, editpanel_dn, "prevedit");
 	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("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");