X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_neophyte%2Fneophyte.C;h=744f5dcfaed4fccff08d5f7c3c940d94ef7308d3;hb=c9c0e07706fad701a70ee0d1ffb0fcb6304f138c;hp=8cb04d01a55b8f9c4b22646993c334025e756a97;hpb=4c207ab325a8e8e6b79a9a18d4647273b5f59f93;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
index 8cb04d01..744f5dcf 100644
--- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
+++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
@@ -196,7 +196,7 @@ void NEOPHYTETHEME::initialize()
 	recordgui_variable_color = RED;
 	      
 	channel_position_color = ComicYellow; // Set Format, speaker numbers 
-	resources->meter_title_w = xS(25);
+	resources->meter_title_w = xS(28);
 
 	// (asset) edit info text color
 	edit_font_color = ComicYellow; // ? ../../cinelerra/theme.h:282
@@ -549,6 +549,11 @@ void NEOPHYTETHEME::initialize()
 		"tumble_hi.png",
 		"tumble_bottom.png",
 		"tumble_top.png");
+	new_image_set("tumblepatch_data", 4,
+		"tumblepatch_up.png",
+		"tumblepatch_hi.png",
+		"tumblepatch_bottom.png",
+		"tumblepatch_top.png");
 	resources->listbox_button = new_button4(
 		"listbox_button.png",
 		"editpanel_up.png",
@@ -808,6 +813,14 @@ void NEOPHYTETHEME::initialize()
 			   "patch_checkedhi.png",
 			   "drawpatch_data");
 
+	new_toggle("masterpatch.png",
+			   "patch_up.png",
+			   "patch_hi.png",
+			   "patch_checked.png",
+			   "patch_dn.png",
+			   "patch_checkedhi.png",
+			   "masterpatch_data");
+
 	new_image_set("mutepatch_data",
 				  5,
 				  "mutepatch_up.png",
@@ -1029,6 +1042,9 @@ void NEOPHYTETHEME::initialize()
 	new_button("goto.png",
 			   editpanel_up, editpanel_hi, editpanel_dn,
 			   "goto");
+	new_button("clapper.png",
+			   editpanel_up, editpanel_hi, editpanel_dn,
+			   "clapperbutton");
 	new_button("top_justify.png",
 			   editpanel_up, editpanel_hi, editpanel_dn,
 			   "top_justify");
@@ -1130,6 +1146,18 @@ void NEOPHYTETHEME::initialize()
 			   new_image("locklabels_dn.png"), // can't have seperate down for each!!??
 			   new_image("locklabels_unlockedhi.png"),
 			   "locklabels");
+	new_toggle("gang0.png",
+			   editpanel_up, editpanel_hi, editpanel_checked,
+			   editpanel_dn, editpanel_checkedhi,
+			   "gang0");
+	new_toggle("gang1.png",
+			   editpanel_up, editpanel_hi, editpanel_checked,
+			   editpanel_dn, editpanel_checkedhi,
+			   "gang1");
+	new_toggle("gang2.png",
+			   editpanel_up, editpanel_hi, editpanel_checked,
+			   editpanel_dn, editpanel_checkedhi,
+			   "gang2");
 
 	VFrame *cpanel_up = new_image("cpanel_up.png");
 	VFrame *cpanel_hi = new_image("cpanel_hi.png");
@@ -1193,7 +1221,7 @@ void NEOPHYTETHEME::initialize()
 // Re-align the Clock. theme.c:931 
 void NEOPHYTETHEME::get_vwindow_sizes(VWindowGUI *gui)
 {
-	int edit_w = EditPanel::calculate_w(mwindow, 0, xS(10));
+	int edit_w = EditPanel::calculate_w(mwindow, 0, 12);
 	int transport_w = PlayTransport::get_transport_width(mwindow) + toggle_margin;
 	vtimebar_h = yS(16);       // The height of the position indicator
 	int division_w = xS(30);
@@ -1260,7 +1288,8 @@ void NEOPHYTETHEME::get_vwindow_sizes(VWindowGUI *gui)
 
 		vdivision_x = vedit_x + edit_w + division_w;
 		vtime_x = vdivision_x + vtime_border;
-		vtime_y = vedit_y + widget_border - 7; // vertical height concentric at button height
+		// vertical height concentric at button height
+		vtime_y = vedit_y + widget_border - yS(7);
 	}
 
 	// vtimebar_x = vcanvas_x;