olaf neophyte and de.po updates, valgrind tweaks, delete green lady, inkscape dpi=96

[goodguy/history.git] / cinelerra-5.1 / cinelerra / theme.C

diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C
index a04d01fef4d68da521cda261ff6478f7034b5f8d..96f8b80f9f95b2aaa89c472b2b6fbb2fb416f661 100644 (file)
--- a/cinelerra-5.1/cinelerra/theme.C
+++ b/cinelerra-5.1/cinelerra/theme.C
@@ -78,6 +78,7 @@ Theme::Theme()
        BC_WindowBase::get_resources()->recursive_resizing = 0;
        audio_color = BLACK;
        fade_h = 22;
+       inout_highlight_color = GREEN;
        meter_h = 17;
        mode_h = 30;
        pan_h = 32;
@@ -95,8 +96,8 @@ Theme::Theme()
        loadmode_w = 350;
        czoom_w = 80;
 
-#include "data/about_png.h"
-       about_bg = new VFramePng(about_png);
+#include "data/about_bg_png.h"
+       about_bg = new VFramePng(about_bg_png);
 
        pane_color = BLACK;
        drag_pane_color = WHITE;
@@ -128,6 +129,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 +268,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 +599,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;