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=d4083589f955d5a5c30c5e659b459e4d711cbb12;hb=c732a0ac2acad5f857d490ce0e7d4f22b41b1b54;hpb=c5feedfabe3ee87dfae9a254c9b67c566ec15d2e diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C index d4083589..e3e0055e 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C +++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C @@ -47,13 +47,20 @@ #include "vframe.h" #include "vwindowgui.h" -#define CWHITE 0xfffdee // creamy white without black - -// so einfach ist das nicht -// #undef RED -// #define RED 0xfffdee -// #undef BLUE -// #define BLUE 0xfffdee +#define ALARM 0xff00ff // not yet defined, to search for the element +#define CreamyWhite 0xe6e4dd // creamy white 10% black +#define CreamyWhiteBright 0xfffdee // creamy white without black +#define BlackNineTwo 0x141414 // 92% black +#define BlackSevenTwo 0x474747 // 72% black +#define BlackEightFive 0x262626 // 85% black +#define BlackFive 0xf2f2f2 // 5% black +#define BabyBlue 0x5f8dd3 // baby-blue +#define BabyBlueDark 0x162d50 // baby-blue -3 (inkscape), e.g. dialog Subtitle +// 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) { @@ -99,61 +106,117 @@ void NEOPHYTETHEME::initialize() { BC_Resources *resources = BC_WindowBase::get_resources(); - resources->text_default = 0xe6e4dd; // creamy white 10% black - resources->text_background = 0x141414; // 92% black - resources->text_background_disarmed = 0x400000; // lock-ed (!) - - resources->text_border2 = 0x141414; // l,t outside - 92% black - resources->text_border1 = 0x000000; // l,t inside - 100% black - resources->text_border3 = 0x474747; // r,d inside - 72% black - resources->text_border4 = 0x141414; // r,d outside - 92% black - - resources->text_inactive_highlight = 0x162d50; // z.B. Subtitle, baby-blue -3 - - resources->bg_color = 0x262626; // 85% black + // 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 (!) + + resources->text_border2 = BlackNineTwo; // l,t outside + resources->text_border1 = BLACK; // l,t inside + resources->text_border3 = BlackSevenTwo; // r,d inside + resources->text_border4 = BlackNineTwo; // r,d outside + 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; resources->border_light2 = resources->bg_color; resources->border_shadow2 = resources->bg_color; - resources->default_text_color = 0xffffff; //0xf2f2f2; timeline … - resources->menu_title_text = 0xffffff; // f2f2f2; - resources->popup_title_text = 0xffffff; // f2f2f2; - resources->menu_item_text = 0xffffff; // f2f2f2; + 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 = CWHITE; - resources->generic_button_margin = 30; // 30 - resources->pot_needle_color = 0xe6e4dd; // [resources->text_default] – marginal - resources->pot_offset = 1; // nur die Nadel. + resources->menu_highlighted_fontcolor = CreamyWhiteBright; + 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; resources->meter_font_color = resources->default_text_color; - resources->menu_light = 0x262626; // wird von Grafik überschrieben - resources->menu_down = 0x00ffff; // - resources->menu_up = 0x00ffff; // - resources->menu_shadow = 0x00ffff; // + resources->menu_light = BlackEightFive; // the following four are overwritten by graphics + resources->menu_down = ALARM; // + resources->menu_up = ALARM; // + resources->menu_shadow = ALARM; // - resources->menu_highlighted = 0x5f8dd3; // baby-blue - resources->popupmenu_margin = 15; // Einzug, verschiebt den Knopf-Text nach rechts + resources->menu_highlighted = BabyBlue; // + resources->popupmenu_margin = 15; // indent, moves the button text to the right resources->popupmenu_triangle_margin = 15; - resources->listbox_title_color = CWHITE; // Spalten Überschrift - resources->listbox_title_margin = 15; // [20] Einzug - resources->listbox_title_hotspot = 15; // [20] + resources->listbox_title_color = CreamyWhiteBright; // columns header + resources->listbox_title_margin = 15; // [20] indent + resources->listbox_title_hotspot = 15; // [20] + + resources->listbox_border2 = BlackNineTwo; // as text_border + resources->listbox_border1 = BLACK; + resources->listbox_border3 = BlackSevenTwo; + resources->listbox_border4 = BlackNineTwo; + // ../../guicast/bcresources.C:684: + resources->listbox_border2_hi = BabyBlue; // highlighting on mouseover + resources->listbox_border3_hi = BabyBlue; + + resources->listbox_highlighted = BabyBlue; // recources, loadfiles + resources->listbox_inactive = BlackNineTwo; // background + resources->listbox_bg = 0; // see ../theme_blond_cv/blondcvtheme.C:249 + resources->listbox_text = CreamyWhite; // + resources->listbox_selected = 0x3d5477; // approximately matches column_hi + + resources->filebox_margin = 130; // [130] + resources->file_color = WHITE; + resources->directory_color = BabyBlue; + + // Footage in the timeline + title_font = MEDIUMFONT; // ../../guicast/fonts.h + title_color = WHITE; + + // Because the colors of the text in the list are fixed. So it is at least uniform. + recordgui_fixed_color = YELLOW; // + recordgui_variable_color = RED; // [RED] + + channel_position_color = ComicYellow; // Set Format, speaker numbers + resources->meter_title_w = 25; - resources->listbox_border2 = 0x141414; // wie text_border - resources->listbox_border1 = 0x000000; // - resources->listbox_border3 = 0x474747; // - resources->listbox_border4 = 0x141414; // + // (asset) edit info text color + 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. + resources->tooltip_delay = 1500; // [1000] - resources->listbox_highlighted = 0x5f8dd3; // recources, loadfiles - resources->listbox_inactive = 0x141414; // Hintergrund - resources->listbox_bg = 0; // siehe ../theme_blond_cv/blondcvtheme.C:249 - resources->listbox_text = 0xe6e4dd; // -// es fehlt "markiert" in allen Themen, derzeit 0000ff. + // Waveform of audio tracks. + // Instead of squeaky [GREEN]. This three are soft, warm and matte. + // 848661 beige + // 6d876f green + // 665f8a purple + audio_color = 0x6d876f; + + // Resources: the text overlay location display. What for? + // Affects a) Preferences, Performace: BR "Video" (text). + // b) Render. + resources->audiovideo_color = CreamyWhite; // BlackNineTwo; + + // ../../guicast/bcresources.C-781 ff.: Delays must all be different for repeaters + resources->blink_rate = 750; // [250] - we're not on the run. + + // ../../cinelerra/theme.C:87 + // clock_bg_color = BLACK; // -> vclock + clock_fg_color = ComicYellow; - resources->filebox_margin = 130; - resources->file_color = 0xf2f2f2; - resources->directory_color = 0x5f8dd3; // 0xa0a0ff; - new_toggle( "loadmode_new.png", "loadmode_up.png", @@ -225,7 +288,7 @@ void NEOPHYTETHEME::initialize() "fileboxbutton_hi.png", "fileboxbutton_dn.png", "filebox_icons"); - + resources->filebox_text_images = new_button("text.png", "fileboxbutton_up.png", "fileboxbutton_hi.png", @@ -261,7 +324,7 @@ void NEOPHYTETHEME::initialize() "fileboxbutton_hi.png", "fileboxbutton_dn.png", "filebox_reload"); - + resources->filebox_descend_images = new_button("openfolder.png", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png", @@ -293,28 +356,28 @@ void NEOPHYTETHEME::initialize() "new_bigbutton_dn.png", "new_cancel_images"); - // Uhr – wo? - resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); + // Clock - is not used (AFAIK). See also clock color. + // resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, + // "0.png", + // "1.png", + // "2.png", + // "3.png", + // "4.png", + // "5.png", + // "6.png", + // "7.png", + // "8.png", + // "9.png", + // "colon.png", + // "period.png", + // "a.png", + // "b.png", + // "c.png", + // "d.png", + // "e.png", + // "f.png", + // "space.png", + // "dash.png"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); @@ -375,6 +438,22 @@ void NEOPHYTETHEME::initialize() "editpanel_dn.png", "editpanel_hi.png", "listbox_button"); + + // Dialog "Load files…" switch SI/IEC + resources->filebox_szfmt_images = new_image_set(12, + "file_size_capb_up.png", + "file_size_capb_hi.png", + "file_size_capb_dn.png", + "file_size_semi_up.png", + "file_size_semi_hi.png", + "file_size_semi_dn.png", + "file_size_lwrb_up.png", + "file_size_lwrb_hi.png", + "file_size_lwrb_dn.png", + "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", @@ -389,7 +468,7 @@ void NEOPHYTETHEME::initialize() "pan_stick.png", "pan_channel_small.png", "pan_stick_small.png"); - resources->pan_text_color = CWHITE; + resources->pan_text_color = CreamyWhiteBright; resources->pot_images = new_image_set(3, "pot_up.png", @@ -472,8 +551,8 @@ void NEOPHYTETHEME::initialize() // MWindow message_normal = resources->text_default; - audio_color = GREEN; - mtransport_margin = 10; + + mtransport_margin = 10; toggle_margin = 10; new_button("pane.png", "pane_up.png", "pane_hi.png", "pane_dn.png", "pane"); @@ -503,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"); @@ -624,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", @@ -706,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"); @@ -790,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"); @@ -806,22 +887,13 @@ void NEOPHYTETHEME::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - flush_images(); - title_font = MEDIUMFONT_3D; - title_color = 0xf2f2f2; - recordgui_fixed_color = YELLOW; - recordgui_variable_color = 0xffaaff; // RED; - - channel_position_color = MEYELLOW; - resources->meter_title_w = 25; - - // (asset) edit info text color - edit_font_color = YELLOW; } +// BD: CWINDOW is probalby ComposerWindow, V=ViewerWindow #define VWINDOW_METER_MARGIN 5 +//#define CWINDOW_METER_MARGIN 5 void NEOPHYTETHEME::build_bg_data() { @@ -941,7 +1013,7 @@ void NEOPHYTETHEME::draw_mwindow_bg(MWindowGUI *gui) get_image("timebar_bg")); // Zoombar - gui->set_color(0x141414); + gui->set_color(BlackNineTwo); gui->draw_box(mzoom_x, mzoom_y, mwindow->session->mwindow_w,