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

[goodguy/history.git] / cinelerra-5.1 / plugins / theme_blue_dot / bluedottheme.C

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
index 1eed422dbc5945ce4ecafcec0de5513263e4a10d..fff94e711e36d8a29170bf49e6b4e21d734d6018 100644 (file)
--- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
+++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
@@ -114,6 +114,7 @@ void BlueDotTheme::initialize()
        // COPIED FROM DEFAULT THEME 1>>
        resources->text_default = 0x000000;
        resources->text_background = 0xffffff;
+       resources->text_background_disarmed = 0xff3939;
                //listbox borders
        resources->text_border1 = 0x4a484a; // (top outer)
        resources->text_border2 = 0x000000; // (top inner)
@@ -666,6 +667,20 @@ void BlueDotTheme::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",
@@ -694,6 +709,7 @@ void BlueDotTheme::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_toggle.png",
                editpanel_up,
@@ -944,7 +960,7 @@ void BlueDotTheme::get_mwindow_sizes(MWindowGUI *gui, int w, int h)
 // Position of menu buttons (start, stop, ff, etc.)
        mbuttons_x = 0;
        mbuttons_y = gui->mainmenu->get_h();
-       mbuttons_w = w;
+       mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_p_toggle[0]->get_w()+2);
        mbuttons_h = get_image("mbutton_left")->get_h();
        mclock_x = 20;          //x position of digits in clock window
        mclock_y = mbuttons_y + 1 + mbuttons_h + CWINDOW_METER_MARGIN;