X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blue_dot%2Fbluedottheme.C;h=0725792904b45ea4e40aa7a741de15ceff1c01ee;hb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da;hp=260afb7e2a576c8f07fa7cb6f6636f0f548b0a96;hpb=0fbaff5c59fa1a3b93f5f9d344451f6aa57778d4;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C index 260afb7e..07257929 100644 --- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C +++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C @@ -70,10 +70,7 @@ BlueDotThemeMain::~BlueDotThemeMain() { } -const char* BlueDotThemeMain::plugin_title() -{ - return _("Blue Dot"); -} +const char* BlueDotThemeMain::plugin_title() { return N_("Blue Dot"); } Theme* BlueDotThemeMain::new_theme() { @@ -117,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) @@ -669,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", @@ -698,6 +710,44 @@ void BlueDotTheme::initialize() 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_toggle("histogram_toggle.png", + editpanel_up, + editpanel_hi, + editpanel_checked, + editpanel_dn, + editpanel_checkedhi, + "histogram_toggle"); + new_toggle("histogram_rgb.png", + editpanel_up, + editpanel_hi, + editpanel_checked, + editpanel_dn, + editpanel_checkedhi, + "histogram_rgb_toggle"); + new_toggle("waveform.png", + editpanel_up, + editpanel_hi, + editpanel_checked, + editpanel_dn, + editpanel_checkedhi, + "waveform_toggle"); + new_toggle("waveform_rgb.png", + editpanel_up, + editpanel_hi, + editpanel_checked, + editpanel_dn, + editpanel_checkedhi, + "waveform_rgb_toggle"); + new_toggle("scope.png", + editpanel_up, + editpanel_hi, + editpanel_checked, + editpanel_dn, + editpanel_checkedhi, + "scope_toggle"); + + new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture"); + new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img"); new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy"); new_button("commercial.png", editpanel_up, editpanel_hi, editpanel_dn, "commercial"); @@ -909,7 +959,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;