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=e5b1829c93ef06f09c88a8c6ffd74fd4e0551d75;hb=540f653df26e5e2d1249de1f7a1a3d888dddf341;hpb=7b05ad287956f8bd00836d9b5fb39f899a5fb641

diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
index e5b1829c..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;
@@ -526,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;
@@ -625,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",
@@ -656,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,
@@ -693,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");