X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_pinklady%2Fpinkladytheme.C;h=45189e10362d8b6138d0d5b2034bd4233f2050a6;hp=3b47f7ea36e879da43ca9690df08396f82113f18;hb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da;hpb=7b05ad287956f8bd00836d9b5fb39f899a5fb641

diff --git a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
index 3b47f7ea..45189e10 100644
--- a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
+++ b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
@@ -60,10 +60,7 @@ PINKLADYMain::~PINKLADYMain()
 {
 }
 
-const char* PINKLADYMain::plugin_title()
-{
-	return _("PinkLady");
-}
+const char* PINKLADYMain::plugin_title() { return N_("PinkLady"); }
 
 Theme* PINKLADYMain::new_theme()
 {
@@ -97,6 +94,7 @@ void PINKLADY::initialize()
 
 	resources->text_default = 0x1b0f11;
 	resources->text_background = 0xffb1d0;
+	resources->text_background_disarmed = 0x0000ff;
 	resources->text_border1 = 0x202020;
 	resources->text_border2 = 0xffb1d0;
 	resources->text_border3 = 0xffb1d0;
@@ -511,10 +509,10 @@ void PINKLADY::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;
@@ -610,11 +608,31 @@ void PINKLADY::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",
@@ -641,7 +659,7 @@ void PINKLADY::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,
@@ -678,7 +696,7 @@ void PINKLADY::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");