X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blond_cv%2Fblondcvtheme.C;h=a7bc2bab905f5664662e4effac5628f2eace831a;hb=702161ddaf384a773831f1643fca0a54133625b2;hp=52951ba5566c3c5ec4f22b1ad59a1a33ac68478a;hpb=0fbaff5c59fa1a3b93f5f9d344451f6aa57778d4;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
index 52951ba5..a7bc2bab 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)
@@ -644,6 +642,20 @@ void BlondCVTheme::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",
@@ -671,7 +683,46 @@ void BlondCVTheme::initialize()
 	new_button("bottom_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "bottom_justify");
 	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_button("lok.png", editpanel_up, editpanel_hi, editpanel_dn, "lok");
+
+	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);
@@ -868,8 +919,8 @@ void BlondCVTheme::get_mwindow_sizes(MWindowGUI *gui, int w, int h)
 {
 	mbuttons_x = 0;
 	mbuttons_y = gui->mainmenu->get_h();
-	mbuttons_w = w;
-	mbuttons_h = mbutton_left->get_h();
+	mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_p_toggle[0]->get_w()+2);
+	mbuttons_h = get_image("mbutton_bg")->get_h();
 	mclock_x = 10;
 	mclock_y = mbuttons_y + mbuttons_h + CWINDOW_METER_MARGIN;
 	mclock_w = get_image("clock_bg")->get_w() - 40;