X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_bright%2Fbrighttheme.C;h=1060171675037dfc4cfa70ac3f82ada05e02c6e7;hb=HEAD;hp=2c6da4c67a8ba4f50ed3c1d4ac2cc3b4e82914bb;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;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 2c6da4c6..10601716 100644 --- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C +++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C @@ -66,10 +66,7 @@ BrightThemeMain::~BrightThemeMain() { } -const char* BrightThemeMain::plugin_title() -{ - return _("Bright"); -} +const char* BrightThemeMain::plugin_title() { return N_("Bright"); } Theme* BrightThemeMain::new_theme() { @@ -109,6 +106,7 @@ void BrightTheme::initialize() resources->text_default = 0x000000; resources->text_background = 0xffffff; + resources->text_background_disarmed = 0xaaaaaa; resources->text_background_hi = 0xffffff; resources->text_border1 = 0x000000; resources->text_border2 = 0xffffff; @@ -116,8 +114,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,53 +220,61 @@ 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_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_dn.png", + "ok_button"); new_button("ok.png", "bigbutton_up.png", @@ -278,7 +285,8 @@ void BrightTheme::initialize() resources->cancel_images = new_button("cancel.png", "bigbutton_up.png", "bigbutton_hi.png", - "bigbutton_dn.png"); + "bigbutton_dn.png", + "cancel_button"); new_button("cancel.png", "bigbutton_up.png", @@ -340,6 +348,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 +370,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", @@ -609,11 +628,31 @@ void BrightTheme::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"); + new_image_set("histogram_carrot", 5, "histogram_carrot_up.png", @@ -639,8 +678,9 @@ void BrightTheme::initialize() new_button("bottom_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "bottom_justify"); 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_button("lok.png", editpanel_up, editpanel_hi, editpanel_dn, "lok"); - new_toggle("histogram.png", + new_toggle("histogram_toggle.png", editpanel_up, editpanel_hi, editpanel_checked, @@ -677,7 +717,7 @@ void BrightTheme::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"); new_button("commercial.png", editpanel_up, editpanel_hi, editpanel_dn, "commercial"); @@ -694,12 +734,12 @@ 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");