X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blond%2Fblondtheme.C;h=93f4da0bd50de178b6595ff103bdfcdf219def40;hp=6d3920c6371171315b0da0fdc6f612f8312ac39a;hb=214bd0ba9e21635e03d0c0e2b2ae1a7e9170583c;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C index 6d3920c6..93f4da0b 100644 --- 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; @@ -218,49 +216,58 @@ void BlondTheme::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"); + "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", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png", - "filebox_bigbutton_dn.png"); + "filebox_bigbutton_dn.png", + "filebox_descend"); resources->usethis_button_images = resources->ok_images = new_button("ok.png", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png", - "filebox_bigbutton_dn.png"); + "filebox_bigbutton_dn.png", + "ok_button"); new_button("ok.png", "new_bigbutton_up.png", @@ -271,7 +278,8 @@ void BlondTheme::initialize() resources->cancel_images = new_button("cancel.png", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png", - "filebox_bigbutton_dn.png"); + "filebox_bigbutton_dn.png", + "cancel_button"); new_button("cancel.png", "new_bigbutton_up.png", @@ -337,6 +345,16 @@ void BlondTheme::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"); @@ -349,7 +367,8 @@ void BlondTheme::initialize() "editpanel_up.png", "editpanel_hi.png", "editpanel_dn.png", - "editpanel_hi.png"); + "editpanel_hi.png", + "listbox_button"); resources->listbox_column = new_image_set(3, "column_up.png", "column_hi.png", @@ -504,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; @@ -608,6 +627,12 @@ void BlondTheme::initialize() "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", @@ -634,7 +659,7 @@ void BlondTheme::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.png", + new_toggle("histogram_toggle.png", editpanel_up, editpanel_hi, editpanel_checked, @@ -671,7 +696,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"); @@ -689,12 +714,12 @@ void BlondTheme::initialize() new_button("nextedit.png", editpanel_up, editpanel_hi, editpanel_dn, "nextedit"); new_button("prevedit.png", editpanel_up, editpanel_hi, editpanel_dn, "prevedit"); 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("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"); @@ -927,7 +952,7 @@ void BlondTheme::draw_mwindow_bg(MWindowGUI *gui) // Zoombar gui->set_color(0xcecea2); - gui->draw_box(mzoom_x, + gui->draw_box(mzoom_x, mzoom_y, mwindow->session->mwindow_w, 25);