X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_neophyte%2Fneophyte.C;h=e3e0055e1a559f8477a8bd1bdd9097709c22673b;hp=bd974dc0ab104e0494f449c2f01335149056d565;hb=c732a0ac2acad5f857d490ce0e7d4f22b41b1b54;hpb=09415d6aba2e181c49863393a047d0947c969d21 diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C index bd974dc0..e3e0055e 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C +++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C @@ -56,11 +56,12 @@ #define BlackFive 0xf2f2f2 // 5% black #define BabyBlue 0x5f8dd3 // baby-blue #define BabyBlueDark 0x162d50 // baby-blue -3 (inkscape), e.g. dialog Subtitle -#define ComicYellow 0xffcc00 -#define DarkRed 0xaa0000 +// traffic lights +// light green 0x27ae60/0x37c871 - just on the buttons. +#define ComicYellow 0xffcc00 // heads up! +#define DarkRed 0xaa0000 // locked or not switched on. #define LockedRed 0x400000 - PluginClient* new_plugin(PluginServer *server) { return new NEOPHYTETHEMEMain(server); @@ -105,7 +106,15 @@ void NEOPHYTETHEME::initialize() { BC_Resources *resources = BC_WindowBase::get_resources(); - resources->text_default = CreamyWhite; // + // something own, fitting to the theme and independent of the integrated splash screen/about + about_bg = new_image("about_bg.png"); // Preferences: About (logo) + // new_image("mwindow_icon", "cinelerra_icon_mwin.png"); // replacement for the heroine icon, maybe + // new_image("vwindow_icon", "cinelerra_icon_vwin.png"); + // new_image("cwindow_icon", "cinelerra_icon_cwin.png"); + // new_image("awindow_icon", "cinelerra_icon_awin.png"); + // new_image("record_icon", "cinelerra_icon_rec.png"); + + resources->text_default = CreamyWhite; // general text color resources->text_background = BlackNineTwo; // resources->text_background_disarmed = LockedRed; // arm track locked (!) @@ -113,21 +122,23 @@ void NEOPHYTETHEME::initialize() resources->text_border1 = BLACK; // l,t inside resources->text_border3 = BlackSevenTwo; // r,d inside resources->text_border4 = BlackNineTwo; // r,d outside - - resources->text_inactive_highlight = BabyBlueDark; // e.g. Subtitle, baby-blue -3 + resources->text_border2_hi = ComicYellow; // highlighting on mouseover + resources->text_border3_hi = ComicYellow; + + resources->text_inactive_highlight = BabyBlueDark; // e.g. Subtitle (double click on inactive text, choose next or prev and be amazed). resources->text_highlight = BabyBlue; - resources->bg_color = BlackEightFive; // 85% black + resources->bg_color = BlackEightFive; resources->border_light2 = resources->bg_color; resources->border_shadow2 = resources->bg_color; - resources->default_text_color = CreamyWhite; // Timeline, dialogs and much more - resources->menu_title_text = WHITE; // + resources->default_text_color = CreamyWhite; // Timeline, dialogs and much more. + resources->menu_title_text = WHITE; // high contrast resources->popup_title_text = WHITE; // resources->menu_item_text = WHITE; // resources->menu_highlighted_fontcolor = CreamyWhiteBright; - resources->generic_button_margin = 30; // [15] + resources->generic_button_margin = 20; // [15] (Pref top right, 17) resources->pot_needle_color = CreamyWhite; // [resources->text_default] – marginal resources->pot_offset = 1; // only the needle resources->progress_text = resources->text_default; @@ -151,7 +162,7 @@ void NEOPHYTETHEME::initialize() resources->listbox_border3 = BlackSevenTwo; resources->listbox_border4 = BlackNineTwo; // ../../guicast/bcresources.C:684: - resources->listbox_border2_hi = BabyBlue; // Highlighting on mouseover + resources->listbox_border2_hi = BabyBlue; // highlighting on mouseover resources->listbox_border3_hi = BabyBlue; resources->listbox_highlighted = BabyBlue; // recources, loadfiles @@ -172,12 +183,16 @@ void NEOPHYTETHEME::initialize() recordgui_fixed_color = YELLOW; // recordgui_variable_color = RED; // [RED] - channel_position_color = ComicYellow; // Set Format + channel_position_color = ComicYellow; // Set Format, speaker numbers resources->meter_title_w = 25; // (asset) edit info text color - edit_font_color = ALARM; // ? ../../cinelerra/theme.h:282 + edit_font_color = ComicYellow; // ? ../../cinelerra/theme.h:282 + assetedit_color = CreamyWhiteBright; // variable attributes + // flash_color = ALARM; // ../../cinelerra/recordgui.C:135 + timebar_cursor_color = WHITE; // ../../cinelerra/theme.C:73 + // tooltip ../../guicast/bcresources.C:786 resources->tooltip_bg_color = CreamyWhiteBright; // resources->tooltip_fg_color = ALARM; // undefined. @@ -438,7 +453,7 @@ void NEOPHYTETHEME::initialize() "file_size_zero_up.png", "file_size_zero_hi.png", "file_size_zero_dn.png"); - + resources->listbox_column = new_image_set(3, "column_up.png", "column_hi.png", @@ -567,6 +582,9 @@ void NEOPHYTETHEME::initialize() new_image_set("plugin_on", 5, "plugin_on.png", "plugin_onhi.png", "plugin_onselect.png", "plugin_ondn.png", "plugin_onselecthi.png"); new_image_set("plugin_show", 5, "plugin_show.png", "plugin_showhi.png", "plugin_showselect.png", "plugin_showdn.png", "plugin_showselecthi.png"); + // Mixer + new_image_set("mixpatch_data", 5, "mixpatch_up.png", "mixpatch_hi.png", "mixpatch_checked.png", "mixpatch_dn.png", "mixpatch_checkedhi.png"); + // CWindow new_image("cpanel_bg", "cpanel_bg.png"); new_image("cbuttons_left", "cbuttons_left.png"); @@ -688,7 +706,7 @@ void NEOPHYTETHEME::initialize() "proxy_p_down.png", "proxy_p_chkdhi.png"); - proxy_s_toggle = new_image_set(5, + proxy_s_toggle = new_image_set(5, // proxy use ffmpeg scaler "proxy_s_up.png", "proxy_s_hi.png", "proxy_s_chkd.png", @@ -770,7 +788,7 @@ void NEOPHYTETHEME::initialize() 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"); + new_button("commercial.png", editpanel_up, editpanel_hi, editpanel_dn, "commercial"); // ? new_button("cut.png", editpanel_up, editpanel_hi, editpanel_dn, "cut"); new_button("fit.png", editpanel_up, editpanel_hi, editpanel_dn, "fit"); new_button("fitautos.png", editpanel_up, editpanel_hi, editpanel_dn, "fitautos"); @@ -854,7 +872,6 @@ void NEOPHYTETHEME::initialize() VFrame *cpanel_checked = new_image("cpanel_checked.png"); VFrame *cpanel_checkedhi = new_image("cpanel_checkedhi.png"); - new_toggle("camera.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "camera"); new_toggle("crop.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "crop"); new_toggle("eyedrop.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "eyedrop");