X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_unflat%2Funflattheme.C;h=5a72f3e754230ee6fb85ad713a05cd0dabeed465;hb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da;hp=1f3b5bf58938f0e6b2ab4ef512d9b4ff1d12cfe1;hpb=7b05ad287956f8bd00836d9b5fb39f899a5fb641;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
index 1f3b5bf5..5a72f3e7 100644
--- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
+++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
@@ -63,10 +63,7 @@ UNFLATTHEMEMain::~UNFLATTHEMEMain()
 {
 }
 
-const char* UNFLATTHEMEMain::plugin_title()
-{
-	return _("UnFlat");
-}
+const char* UNFLATTHEMEMain::plugin_title() { return N_("UnFlat"); }
 
 Theme* UNFLATTHEMEMain::new_theme()
 {
@@ -106,6 +103,7 @@ void UNFLATTHEME::initialize()
 
 	resources->text_default = 0xbfbfbf;
 	resources->text_background = 0x333333;
+	resources->text_background_disarmed = 0xaf0000;
 	resources->text_border1 = 0x202020;
 	resources->text_border2 = 0x333333;
 	resources->text_border3 = 0x333333;
@@ -520,10 +518,10 @@ void UNFLATTHEME::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;
@@ -619,11 +617,31 @@ void UNFLATTHEME::initialize()
 		"ff_down.png",
 		"ff_checkedhi.png");
 
+	proxy_p_toggle = new_image_set(5,
+		"proxy_p_up.png",
+		"proxy_p_hi.png",
+		"proxy_p_chkd.png",
+		"proxy_p_down.png",
+		"proxy_p_chkdhi.png");
+
+	proxy_s_toggle = new_image_set(5,
+		"proxy_s_up.png",
+		"proxy_s_hi.png",
+		"proxy_s_chkd.png",
+		"proxy_s_down.png",
+		"proxy_s_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",
@@ -650,7 +668,7 @@ void UNFLATTHEME::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,
@@ -687,7 +705,7 @@ void UNFLATTHEME::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");