X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftheme.C;h=7bbcceb65eeef15e17f237c8cfc9bae1cae06acc;hp=bddba8783277c220524e45b5d42fdb5577a5ef93;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=9d832a1fff11b11aaa1108c460690ed05e2bdc05

diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C
index bddba878..7bbcceb6 100644
--- a/cinelerra-5.1/cinelerra/theme.C
+++ b/cinelerra-5.1/cinelerra/theme.C
@@ -57,7 +57,7 @@
 #include <string.h>
 
 #define NEW_VFRAME \
-new VFrame(0, -1, default_data.get_w(), default_data.get_h(), BC_RGBA8888, -1)
+new VFrame(default_data.get_w(), default_data.get_h(), BC_RGBA8888)
 
 Theme::Theme()
  : BC_Theme()
@@ -128,6 +128,7 @@ Theme::Theme()
 	edithandleout_data = 0;
 	extract_data = 0;
 	ffmpeg_toggle = 0;
+	proxy_toggle = 0;
 	infoasset_data = 0;
 	in_point = 0;
 	insert_data = 0;
@@ -238,6 +239,8 @@ void Theme::initialize()
 	new_image("awindow_icon", "heroine_icon.png");
 	new_image("record_icon", "heroine_icon.png");
 	new_image("clip_icon", "clip_icon.png");
+	new_image_set("mixpatch_data", 5, "mixpatch_up.png", "mixpatch_hi.png",
+		"mixpatch_checked.png", "mixpatch_dn.png", "mixpatch_checkedhi.png");
 
 
 	new_image("aeffect_icon", "aeffect_icon.png");
@@ -263,22 +266,44 @@ void Theme::build_menus()
 	aspect_ratios.append(new BC_ListBoxItem("2.35:1"));
 	aspect_ratios.append(new BC_ListBoxItem("2.66:1"));
 
-	frame_sizes.append(new BC_ListBoxItem("128x96"));
-	frame_sizes.append(new BC_ListBoxItem("160x120"));
-	frame_sizes.append(new BC_ListBoxItem("320x240"));
-	frame_sizes.append(new BC_ListBoxItem("360x240"));
-	frame_sizes.append(new BC_ListBoxItem("400x300"));
-	frame_sizes.append(new BC_ListBoxItem("640x400"));
-	frame_sizes.append(new BC_ListBoxItem("640x480"));
-	frame_sizes.append(new BC_ListBoxItem("720x480"));
-	frame_sizes.append(new BC_ListBoxItem("800x600"));
-	frame_sizes.append(new BC_ListBoxItem("1024x768"));
-	frame_sizes.append(new BC_ListBoxItem("1280x720"));
-	frame_sizes.append(new BC_ListBoxItem("1280x1024"));
-	frame_sizes.append(new BC_ListBoxItem("1600x1200"));
-	frame_sizes.append(new BC_ListBoxItem("1920x1080"));
-	frame_sizes.append(new BC_ListBoxItem("3840x2160"));
-	frame_sizes.append(new BC_ListBoxItem("4096x1720"));
+	frame_sizes.append(new BC_ListBoxItem("128x96     "));
+	frame_sizes.append(new BC_ListBoxItem("160x120    "));
+	frame_sizes.append(new BC_ListBoxItem("320x240    "));
+	frame_sizes.append(new BC_ListBoxItem("360x240    "));
+	frame_sizes.append(new BC_ListBoxItem("400x300    "));
+	frame_sizes.append(new BC_ListBoxItem("640x360    nHD"));
+	frame_sizes.append(new BC_ListBoxItem("640x400    "));
+	frame_sizes.append(new BC_ListBoxItem("640x480    VGA"));
+	frame_sizes.append(new BC_ListBoxItem("720x480    NTSC"));
+	frame_sizes.append(new BC_ListBoxItem("720x576    PAL"));
+	frame_sizes.append(new BC_ListBoxItem("768x432    "));
+	frame_sizes.append(new BC_ListBoxItem("800x450    "));
+	frame_sizes.append(new BC_ListBoxItem("800x600    SVGA"));
+	frame_sizes.append(new BC_ListBoxItem("896x504    "));
+	frame_sizes.append(new BC_ListBoxItem("960x540    qHD"));
+	frame_sizes.append(new BC_ListBoxItem("1024x576   "));
+	frame_sizes.append(new BC_ListBoxItem("1024x768   XGA"));
+	frame_sizes.append(new BC_ListBoxItem("1152x648   "));
+	frame_sizes.append(new BC_ListBoxItem("1280x720   HD"));
+	frame_sizes.append(new BC_ListBoxItem("1280x1024  SXGA"));
+	frame_sizes.append(new BC_ListBoxItem("1366x768   WXGA"));
+	frame_sizes.append(new BC_ListBoxItem("1600x900   HD+"));
+	frame_sizes.append(new BC_ListBoxItem("1600x1200  UXGA"));
+	frame_sizes.append(new BC_ListBoxItem("1920x1080  Full HD"));
+	frame_sizes.append(new BC_ListBoxItem("2048x1152  "));
+	frame_sizes.append(new BC_ListBoxItem("2304x1296  "));
+	frame_sizes.append(new BC_ListBoxItem("2560x1440  QHD"));
+	frame_sizes.append(new BC_ListBoxItem("2880x1620  "));
+	frame_sizes.append(new BC_ListBoxItem("3200x1800  QHD+"));
+	frame_sizes.append(new BC_ListBoxItem("3520x1980  "));
+	frame_sizes.append(new BC_ListBoxItem("3840x2160  4K UHD"));
+	frame_sizes.append(new BC_ListBoxItem("4096x2304  Full 4K UHD"));
+	frame_sizes.append(new BC_ListBoxItem("4480x2520  "));
+	frame_sizes.append(new BC_ListBoxItem("5120x2880  5K UHD"));
+	frame_sizes.append(new BC_ListBoxItem("5760x3240  "));
+	frame_sizes.append(new BC_ListBoxItem("6400x3600  "));
+	frame_sizes.append(new BC_ListBoxItem("7040x3960  "));
+	frame_sizes.append(new BC_ListBoxItem("7680x4320  8K UHD"));
 
 	sample_rates.append(new BC_ListBoxItem("8000"));
 	sample_rates.append(new BC_ListBoxItem("16000"));
@@ -572,7 +597,7 @@ void Theme::get_mwindow_sizes(MWindowGUI *gui, int w, int h)
 {
 	mbuttons_x = 0;
 	mbuttons_y = gui->menu_h() + 1;
-	mbuttons_w = gui->menu_w();
+	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 = window_border - 5;
 	mclock_y = mbuttons_y - 1 + mbuttons_h;
@@ -951,8 +976,8 @@ void Theme::get_vwindow_sizes(VWindowGUI *gui)
 			widget_border;
 
 		vdivision_x = 280;
-		vtime_x = vdivision_x;
-		vtime_y = vedit_y + 20;
+		vtime_x = vedit_x + 20; //vdivision_x;
+		vtime_y = vedit_y + 30; //+ 20;
 	}
 	else
 	{