X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_bright%2Fbrighttheme.C;h=05388641594c6e6c87f9ab2a837a45d1356dccab;hb=673257cc109af5234e4219a6baef9589b83b9359;hp=13664f55c60adc1ad5f42ba3eb8fcc51aa22e272;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C index 13664f55..05388641 100644 --- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C +++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C @@ -259,30 +259,30 @@ void BrightTheme::initialize() resources->filebox_descend_images = new_button("openfolder.png", - "bigbutton_up.png", - "bigbutton_hi.png", + "bigbutton_up.png", + "bigbutton_hi.png", "bigbutton_dn.png"); resources->usethis_button_images = resources->ok_images = new_button("ok.png", - "bigbutton_up.png", - "bigbutton_hi.png", + "bigbutton_up.png", + "bigbutton_hi.png", "bigbutton_dn.png"); new_button("ok.png", - "bigbutton_up.png", - "bigbutton_hi.png", + "bigbutton_up.png", + "bigbutton_hi.png", "bigbutton_dn.png", "new_ok_images"); resources->cancel_images = new_button("cancel.png", - "bigbutton_up.png", - "bigbutton_hi.png", + "bigbutton_up.png", + "bigbutton_hi.png", "bigbutton_dn.png"); new_button("cancel.png", - "bigbutton_up.png", - "bigbutton_hi.png", + "bigbutton_up.png", + "bigbutton_hi.png", "bigbutton_dn.png", "new_cancel_images"); @@ -340,6 +340,16 @@ void BrightTheme::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"); @@ -603,10 +613,10 @@ void BrightTheme::initialize() "label_checkedhi.png"); ffmpeg_toggle = new_image_set(5, - "ff_up.png", - "ff_hi.png", - "ff_checked.png", - "ff_down.png", + "ff_up.png", + "ff_hi.png", + "ff_checked.png", + "ff_down.png", "ff_checkedhi.png"); shbtn_data = new_image_set(3, @@ -701,6 +711,7 @@ void BrightTheme::initialize() 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); 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"); new_button("undo.png", editpanel_up, editpanel_hi, editpanel_dn, "undo"); new_button("wrench.png", editpanel_up, editpanel_hi, editpanel_dn, "wrench"); @@ -913,9 +924,9 @@ void BrightTheme::draw_mwindow_bg(MWindowGUI *gui) // Track canvas int patchbay_w = get_image("patchbay_bg")->get_w(); - gui->clear_box(mcanvas_x + patchbay_w, + gui->clear_box(mcanvas_x + patchbay_w, mcanvas_y + mtimebar_h, - mcanvas_w - BC_ScrollBar::get_span(SCROLL_VERT) - patchbay_w, + mcanvas_w - BC_ScrollBar::get_span(SCROLL_VERT) - patchbay_w, patchbay_h - BC_ScrollBar::get_span(SCROLL_HORIZ) - mtimebar_h); // Timebar @@ -926,7 +937,7 @@ void BrightTheme::draw_mwindow_bg(MWindowGUI *gui) // Zoombar // gui->set_color(0x373737); -// gui->draw_box(mzoom_x, +// gui->draw_box(mzoom_x, // mzoom_y, // mwindow->session->mwindow_w, // 25);