X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blue_dot%2Fbluedottheme.C;h=0725792904b45ea4e40aa7a741de15ceff1c01ee;hb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da;hp=5d6e3ef21ace264a4b69a0a5365ad21a9ee86e2a;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
index 5d6e3ef2..07257929 100644
--- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
+++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
@@ -70,10 +70,7 @@ BlueDotThemeMain::~BlueDotThemeMain()
 {
 }
 
-const char* BlueDotThemeMain::plugin_title()
-{
-	return _("Blue Dot");
-}
+const char* BlueDotThemeMain::plugin_title() { return N_("Blue Dot"); }
 
 Theme* BlueDotThemeMain::new_theme()
 {
@@ -117,6 +114,7 @@ void BlueDotTheme::initialize()
 	// COPIED FROM DEFAULT THEME 1>>
 	resources->text_default = 0x000000;
 	resources->text_background = 0xffffff;
+	resources->text_background_disarmed = 0xff3939;
 		//listbox borders
 	resources->text_border1 = 0x4a484a; // (top outer)
 	resources->text_border2 = 0x000000; // (top inner)
@@ -279,7 +277,8 @@ void BlueDotTheme::initialize()
 		resources->ok_images = new_button("ok.png",
 		"generic_up.png",
 		"generic_hi.png",
-		"generic_dn.png");
+		"generic_dn.png",
+		"ok_button");
 
 	new_button("ok.png",
 		"generic_up.png",
@@ -290,7 +289,8 @@ void BlueDotTheme::initialize()
 	resources->cancel_images = new_button("cancel.png",
 		"generic_up.png",
 		"generic_hi.png",
-		"generic_dn.png");
+		"generic_dn.png",
+		"cancel_button");
 
 	new_button("cancel.png",
 		"generic_up.png",
@@ -667,11 +667,31 @@ void BlueDotTheme::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");
+
 	statusbar_cancel_data = new_image_set(3,
 		"statusbar_cancel_up.png",
 		"statusbar_cancel_hi.png",
@@ -690,6 +710,44 @@ void BlueDotTheme::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_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");
 
 	new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
 	new_button("commercial.png", editpanel_up, editpanel_hi, editpanel_dn, "commercial");
@@ -705,15 +763,15 @@ void BlueDotTheme::initialize()
 	new_button("nextlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "nextlabel");
 	new_button("outpoint.png", editpanel_up, editpanel_hi, editpanel_dn, "outbutton");
 //	outdelete_data = new_button("clearoutpoint.png", editpanel_up, editpanel_hi, editpanel_dn);   //Specific to BD
-	over_button = new_button("over.png", editpanel_up, editpanel_hi, editpanel_dn);
-	overwrite_data = new_button("overwrite.png", editpanel_up, editpanel_hi, editpanel_dn);
+	over_button = new_button("over.png", editpanel_up, editpanel_hi, editpanel_dn, "overbutton");
+	overwrite_data = new_button("overwrite.png", editpanel_up, editpanel_hi, editpanel_dn, "overwritebutton");
 	new_button("paste.png", editpanel_up, editpanel_hi, editpanel_dn, "paste");
 	new_button("prevlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "prevlabel");
 	new_button("nextedit.png", editpanel_up, editpanel_hi, editpanel_dn, "nextedit");
 	new_button("prevedit.png", editpanel_up, editpanel_hi, editpanel_dn, "prevedit");
 	new_button("redo.png", editpanel_up, editpanel_hi, editpanel_dn, "redo");
 	new_button("right_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "right_justify");
-	splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn);
+	splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn, "slicebutton");
 	new_button("toclip.png", editpanel_up, editpanel_hi, editpanel_dn, "toclip");
 	new_button("goto.png", editpanel_up, editpanel_hi, editpanel_dn, "goto");
 	new_button("top_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "top_justify");
@@ -901,7 +959,7 @@ void BlueDotTheme::get_mwindow_sizes(MWindowGUI *gui, int w, int h)
 // Position of menu buttons (start, stop, ff, etc.)
 	mbuttons_x = 0;
 	mbuttons_y = gui->mainmenu->get_h();
-	mbuttons_w = w;
+	mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_p_toggle[0]->get_w()+2);
 	mbuttons_h = get_image("mbutton_left")->get_h();
 	mclock_x = 20;		//x position of digits in clock window
 	mclock_y = mbuttons_y + 1 + mbuttons_h + CWINDOW_METER_MARGIN;
@@ -1138,7 +1196,6 @@ void BlueDotTheme::build_icons()
 	new_image("cwindow_icon", "heroine_icon.png");
 	new_image("awindow_icon", "heroine_icon.png");
 	new_image("record_icon", "heroine_icon.png");
-	new_image("clip_icon", "clip_icon.png");
 }