X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Ftheme.C;h=65865a24bb2f3ce5cee7a1672a68e9cee2a3fe89;hb=21eb2e0b479adf7bf846b835e5c7d9613b6f1a6d;hp=a04d01fef4d68da521cda261ff6478f7034b5f8d;hpb=48c313de28fe6d39d9431dbe2dca6ffb176541ff;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C
index a04d01fe..65865a24 100644
--- a/cinelerra-5.1/cinelerra/theme.C
+++ b/cinelerra-5.1/cinelerra/theme.C
@@ -128,6 +128,8 @@ Theme::Theme()
 	edithandleout_data = 0;
 	extract_data = 0;
 	ffmpeg_toggle = 0;
+	proxy_s_toggle = 0;
+	proxy_p_toggle = 0;
 	infoasset_data = 0;
 	in_point = 0;
 	insert_data = 0;
@@ -265,22 +267,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"));
@@ -574,7 +598,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_p_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;