X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blond_cv%2Fblondcvtheme.C;h=fc9c629fcfbffd1d08b24075089de2f4fde89929;hb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da;hp=e4e4460fa98201b8cfd4fac20dca103ddbbdf173;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C index e4e4460f..fc9c629f 100644 --- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C +++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C @@ -67,10 +67,7 @@ BlondCVThemeMain::~BlondCVThemeMain() { } -const char* BlondCVThemeMain::plugin_title() -{ - return _("Blond-cv"); -} +const char* BlondCVThemeMain::plugin_title() { return N_("Blond-cv"); } Theme* BlondCVThemeMain::new_theme() { @@ -118,6 +115,16 @@ void BlondCVTheme::initialize() "hslider_bg_up.png", "hslider_bg_hi.png", "hslider_bg_dn.png"); + resources->vertical_slider_data = new_image_set(6, + "hslider_fg_up.png", + "hslider_fg_hi.png", + "hslider_fg_dn.png", + "hslider_bg_up.png", + "hslider_bg_hi.png", + "hslider_bg_dn.png"); + for( int i=0; i<6; ++i ) + resources->vertical_slider_data[i]->rotate90(); + resources->progress_images = new_image_set(2, "progress_bg.png", "progress_hi.png"); @@ -152,6 +159,7 @@ void BlondCVTheme::initialize() resources->text_default = 0x000000; resources->text_background = 0xffffff; + resources->text_background_disarmed = 0xff0000; resources->text_border1 = 0x4a484a; // (top outer) resources->text_border2 = 0x000000; // (top inner) resources->text_border3 = 0xacaeac; // (bottom inner) @@ -243,18 +251,13 @@ void BlondCVTheme::initialize() resources->ok_images = new_button("ok.png", "generic_up.png", "generic_hi.png", - "generic_dn.png"); + "generic_dn.png", + "ok_button"); resources->dirbox_margin = 50; resources->filebox_margin = 101; resources->file_color = 0x000000; resources->directory_color = 0x0000ff; - resources->cancel_images = new_button("cancel.png", - "generic_up.png", - "generic_hi.png", - "generic_dn.png"); - - // Record windows rgui_batch = new_image("recordgui_batch.png"); @@ -266,44 +269,58 @@ void BlondCVTheme::initialize() resources->filebox_icons_images = new_button("icons.png", "fileboxbutton_up.png", "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); + "fileboxbutton_dn.png", + "filebox_icons"); resources->filebox_text_images = new_button("text.png", "fileboxbutton_up.png", "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); + "fileboxbutton_dn.png", + "filebox_text"); resources->filebox_newfolder_images = new_button("folder.png", "fileboxbutton_up.png", "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); + "fileboxbutton_dn.png", + "filebox_newfolder"); + + resources->filebox_rename_images = new_button("rename.png", + "fileboxbutton_up.png", + "fileboxbutton_hi.png", + "fileboxbutton_dn.png", + "filebox_rename"); resources->filebox_updir_images = new_button("updir.png", "fileboxbutton_up.png", "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); + "fileboxbutton_dn.png", + "filebox_updir"); resources->filebox_delete_images = new_button("delete.png", "fileboxbutton_up.png", "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); + "fileboxbutton_dn.png", + "filebox_delete"); resources->filebox_reload_images = new_button("reload.png", "fileboxbutton_up.png", "fileboxbutton_hi.png", - "fileboxbutton_dn.png"); + "fileboxbutton_dn.png", + "filebox_reload"); resources->filebox_descend_images = new_button("openfolder.png", "generic_up.png", "generic_hi.png", - "generic_dn.png"); + "generic_dn.png", + "filebox_descend"); resources->usethis_button_images = resources->ok_images = new_button("ok.png", "generic_up.png", "generic_hi.png", - "generic_dn.png"); + "generic_dn.png", + "ok_button"); new_button("ok.png", "generic_up.png", @@ -314,7 +331,8 @@ void BlondCVTheme::initialize() resources->cancel_images = new_button("cancel.png", "generic_up.png", "generic_hi.png", - "generic_dn.png"); + "generic_dn.png", + "cancel_button"); new_button("cancel.png", "generic_up.png", @@ -624,11 +642,31 @@ void BlondCVTheme::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"); + statusbar_cancel_data = new_image_set(3, "statusbar_cancel_up.png", "statusbar_cancel_hi.png", @@ -646,6 +684,44 @@ void BlondCVTheme::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"); //bottom_justify = new_button("bottom_justify.png", editpanel_up, editpanel_hi, editpanel_dn); //center_justify = new_button("center_justify.png", editpanel_up, editpanel_hi, editpanel_dn); @@ -662,15 +738,15 @@ void BlondCVTheme::initialize() new_button("middle_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "middle_justify"); new_button("nextlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "nextlabel"); new_button("outpoint.png", editpanel_up, editpanel_hi, editpanel_dn, "outbutton"); - over_button = new_button("over.png", editpanel_up, editpanel_hi, editpanel_dn); - overwrite_data = new_button("overwrite.png", editpanel_up, editpanel_hi, editpanel_dn); + over_button = new_button("over.png", editpanel_up, editpanel_hi, editpanel_dn, "overbutton"); + overwrite_data = new_button("overwrite.png", editpanel_up, editpanel_hi, editpanel_dn, "overwritebutton"); new_button("paste.png", editpanel_up, editpanel_hi, editpanel_dn, "paste"); new_button("prevlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "prevlabel"); new_button("nextedit.png", editpanel_up, editpanel_hi, editpanel_dn, "nextedit"); new_button("prevedit.png", editpanel_up, editpanel_hi, editpanel_dn, "prevedit"); new_button("redo.png", editpanel_up, editpanel_hi, editpanel_dn, "redo"); new_button("right_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "right_justify"); - splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn); + splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn, "slicebutton"); new_button("toclip.png", editpanel_up, editpanel_hi, editpanel_dn, "toclip"); new_button("goto.png", editpanel_up, editpanel_hi, editpanel_dn, "goto"); new_button("top_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "top_justify"); @@ -842,8 +918,8 @@ void BlondCVTheme::get_mwindow_sizes(MWindowGUI *gui, int w, int h) { mbuttons_x = 0; mbuttons_y = gui->mainmenu->get_h(); - mbuttons_w = w; - mbuttons_h = mbutton_left->get_h(); + 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 = 10; mclock_y = mbuttons_y + mbuttons_h + CWINDOW_METER_MARGIN; mclock_w = get_image("clock_bg")->get_w() - 40; @@ -1065,7 +1141,6 @@ void BlondCVTheme::build_icons() new_image("cwindow_icon", "heroine_icon.png"); new_image("awindow_icon", "heroine_icon.png"); new_image("record_icon", "heroine_icon.png"); - new_image("clip_icon", "clip_icon.png"); }