X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blond_cv%2Fblondcvtheme.C;h=0ee14d330ca7716e533a18cb9aa12a16cac58d31;hp=be0e7a734a14271933625b7ebd3c9352e4bf970f;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=723142d62d61cde588e961426440f839ca9dcda9

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
index be0e7a73..0ee14d33 100644
--- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
@@ -159,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)
@@ -641,6 +642,13 @@ void BlondCVTheme::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",
@@ -903,8 +911,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_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;