splashgui text clr, faders/speed keyframe popup slider rework, reticle rework

[goodguy/history.git] / cinelerra-5.1 / plugins / theme_blond / blondtheme.C

diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
index a984a92fff43ffb40ea601762fed8cfac3ff4596..ce13c51f6fc76a83ca9f1165b4322243f5e9d609 100644 (file)
--- a/cinelerra-5.1/plugins/theme_blond/blondtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
@@ -68,10 +68,7 @@ BlondThemeMain::~BlondThemeMain()
 {
 }
 
-const char* BlondThemeMain::plugin_title()
-{
-       return _("Blond");
-}
+const char* BlondThemeMain::plugin_title() { return N_("Blond"); }
 
 Theme* BlondThemeMain::new_theme()
 {
@@ -111,6 +108,7 @@ void BlondTheme::initialize()
 
        resources->text_default = 0x000000;
        resources->text_background = 0xcecea2;
+       resources->text_background_disarmed = 0xefeddb;
        resources->text_border1 = 0x202020;
        resources->text_border2 = 0xcecea2;
        resources->text_border3 = 0xcecea2;
@@ -525,10 +523,10 @@ void BlondTheme::initialize()
        setformat_w = get_image("setformat_bg")->get_w();
        setformat_h = get_image("setformat_bg")->get_h();
        setformat_x1 = 15;
-       setformat_x2 = 100;
+       setformat_x2 = 110;
 
        setformat_x3 = 315;
-       setformat_x4 = 415;
+       setformat_x4 = 425;
        setformat_y1 = 20;
        setformat_y2 = 85;
        setformat_y3 = 125;
@@ -624,11 +622,31 @@ void BlondTheme::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");
+
        new_image_set("histogram_carrot",
                5,
                "histogram_carrot_up.png",
@@ -654,8 +672,9 @@ void BlondTheme::initialize()
        new_button("bottom_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "bottom_justify");
        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_button("lok.png", editpanel_up, editpanel_hi, editpanel_dn, "lok");
 
-       new_toggle("histogram.png",
+       new_toggle("histogram_toggle.png",
                editpanel_up,
                editpanel_hi,
                editpanel_checked,
@@ -692,7 +711,7 @@ void BlondTheme::initialize()
                "scope_toggle");
 
        new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-       new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+       new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
        new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");