X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_bright%2Fbrighttheme.C;h=e7daaf97719a766ee38da6c0c795c6c88133239d;hp=13664f55c60adc1ad5f42ba3eb8fcc51aa22e272;hb=65eb7d06c462c2caaa7fabcb8956add9e6b8abc7;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C index 13664f55..e7daaf97 100644 --- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C +++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C @@ -116,8 +116,9 @@ void BrightTheme::initialize() resources->text_border2_hi = 0x000000; resources->text_border3_hi = 0x000000; resources->text_border4 = 0x000000; - resources->text_inactive_highlight = 0xe0e0e0; + resources->text_inactive_highlight = 0xd0d0d0; resources->text_highlight = 0xe0e0e0; + resources->text_selected_highlight = 0xf0e0e0; resources->bg_color = 0xffffff; resources->default_text_color = 0x000000; @@ -221,68 +222,77 @@ void BrightTheme::initialize() "loadmode_nested"); - 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", - "bigbutton_up.png", - "bigbutton_hi.png", - "bigbutton_dn.png"); + "bigbutton_up.png", + "bigbutton_hi.png", + "bigbutton_dn.png", + "filebox_descend"); resources->usethis_button_images = resources->ok_images = new_button("ok.png", - "bigbutton_up.png", - "bigbutton_hi.png", - "bigbutton_dn.png"); + "bigbutton_up.png", + "bigbutton_hi.png", + "bigbutton_dn.png", + "ok_button"); 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_dn.png"); + "bigbutton_up.png", + "bigbutton_hi.png", + "bigbutton_dn.png", + "cancel_button"); new_button("cancel.png", - "bigbutton_up.png", - "bigbutton_hi.png", + "bigbutton_up.png", + "bigbutton_hi.png", "bigbutton_dn.png", "new_cancel_images"); @@ -340,6 +350,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"); @@ -352,7 +372,8 @@ void BrightTheme::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", @@ -603,10 +624,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, @@ -694,13 +715,14 @@ void BrightTheme::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"); new_button("undo.png", editpanel_up, editpanel_hi, editpanel_dn, "undo"); new_button("wrench.png", editpanel_up, editpanel_hi, editpanel_dn, "wrench"); @@ -913,9 +935,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 +948,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);