From: Good Guy Date: Sun, 12 Aug 2018 13:48:51 +0000 (-0600) Subject: olaf updates neophyte theme, keypad numlock tweaks X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=commitdiff_plain;h=09415d6aba2e181c49863393a047d0947c969d21;hp=c5feedfabe3ee87dfae9a254c9b67c566ec15d2e olaf updates neophyte theme, keypad numlock tweaks --- diff --git a/cinelerra-5.1/guicast/bctextbox.C b/cinelerra-5.1/guicast/bctextbox.C index da7afa0f..57a8c5dd 100644 --- a/cinelerra-5.1/guicast/bctextbox.C +++ b/cinelerra-5.1/guicast/bctextbox.C @@ -1128,9 +1128,19 @@ int BC_TextBox::repeat_event(int64_t duration) void BC_TextBox::default_keypress(int &dispatch_event, int &result) { int key = top_level->get_keypress(), len; - if( (key == RETURN) || ( key >= 32 && key <= 255 ) ) { + if( (key == RETURN) || ( key >= 32 && key <= 255 ) || + (key >= KP1 && key <= KP9) || key == KPINS ) { wchar_t *wkeys = top_level->get_wkeystring(&len); - if( key == RETURN ) { wkeys[0] = '\n'; wkeys[1] = 0; len = 1; } + switch( key ) { + case RETURN: key = '\n'; goto kpchr; + case KPINS: key = '0'; goto kpchr; + case KP1: case KP2: case KP3: case KP4: case KP5: + case KP6: case KP7: case KP8: case KP9: + key = key - KP1 + '1'; + kpchr: + wkeys[0] = key; wkeys[1] = 0; len = 1; + break; + } insert_text(wkeys, len); find_ibeam(1); draw(1); @@ -1185,6 +1195,10 @@ int BC_TextBox::keypress_event() result = 1; wlen = 0; break; } + case KPINS: last_keypress = KP1-'1'+'0'; // fall thru + case KP1: case KP2: case KP3: case KP4: case KP5: + case KP6: case KP7: case KP8: case KP9: + last_keypress = last_keypress-KP1 + '1'; case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': @@ -1618,7 +1632,7 @@ int BC_TextBox::keypress_event() default: { if( ctrl_down() ) { - switch( get_keypress() ) { + switch( last_keypress ) { case 'c': case 'C': { result = copy(0); break; } diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C index c380792e..d7440bde 100644 --- a/cinelerra-5.1/guicast/bcwindowbase.C +++ b/cinelerra-5.1/guicast/bcwindowbase.C @@ -1233,25 +1233,25 @@ locking_message = event->xclient.message_type; case XK_KP_Subtract: key_pressed = KPMINUS; break; case XK_KP_Multiply: key_pressed = KPSTAR; break; case XK_KP_Divide: key_pressed = KPSLASH; break; - case XK_KP_1: key_pressed = '1'; break; + case XK_KP_1: case XK_KP_End: key_pressed = KP1; break; - case XK_KP_2: key_pressed = '2'; break; + case XK_KP_2: case XK_KP_Down: key_pressed = KP2; break; - case XK_KP_3: key_pressed = '3'; break; + case XK_KP_3: case XK_KP_Page_Down: key_pressed = KP3; break; - case XK_KP_4: key_pressed = '4'; break; + case XK_KP_4: case XK_KP_Left: key_pressed = KP4; break; - case XK_KP_5: key_pressed = '5'; break; + case XK_KP_5: case XK_KP_Begin: key_pressed = KP5; break; - case XK_KP_6: key_pressed = '6'; break; + case XK_KP_6: case XK_KP_Right: key_pressed = KP6; break; - case XK_KP_7: key_pressed = '7'; break; + case XK_KP_7: case XK_KP_Home: key_pressed = KP7; break; - case XK_KP_8: key_pressed = '8'; break; + case XK_KP_8: case XK_KP_Up: key_pressed = KP8; break; - case XK_KP_9: key_pressed = '9'; break; + case XK_KP_9: case XK_KP_Page_Up: key_pressed = KP9; break; - case XK_KP_0: key_pressed = '0'; break; + case XK_KP_0: case XK_KP_Insert: key_pressed = KPINS; break; case XK_KP_Decimal: case XK_KP_Delete: key_pressed = KPDEL; break; diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checked.png b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checked.png index 160035f6..1d1d0a9f 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checked.png and b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checked.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checkedhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checkedhi.png index 9a7bb0b7..626c7355 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checkedhi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checkedhi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_dn.png index e59a99e4..3577008c 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_hi.png index 500fea80..60fee090 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_up.png index 9e1621eb..9b003a3b 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_dn.png new file mode 100644 index 00000000..abcf3abc Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_hi.png new file mode 100644 index 00000000..17be052c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_up.png new file mode 100644 index 00000000..19a00611 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_dn.png new file mode 100644 index 00000000..117657ee Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_hi.png new file mode 100644 index 00000000..ba8d117a Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_up.png new file mode 100644 index 00000000..221263c5 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_dn.png new file mode 100644 index 00000000..5a75f273 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_hi.png new file mode 100644 index 00000000..7e3cdf9b Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_up.png new file mode 100644 index 00000000..2c99274b Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_dn.png new file mode 100644 index 00000000..19b98035 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_hi.png new file mode 100644 index 00000000..afae450a Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_up.png new file mode 100644 index 00000000..50429831 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_bg.png b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_bg.png index 9b4f7f1d..8f3d92d7 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_bg.png and b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_bg.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_dn.png index 2746ce3d..acc2bda6 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_hi.png index 9b2127dc..f9740c7c 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_up.png index 42b827e0..9f870e2f 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_bg.png b/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_bg.png index 7dabf8e3..8e000fb3 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_bg.png and b/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_bg.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_dn.png index 8bc0b935..44bed0fb 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_hi.png index f88759cd..7046a65d 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_up.png index 995d5045..58ca69a5 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C index d4083589..bd974dc0 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C +++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C @@ -47,13 +47,19 @@ #include "vframe.h" #include "vwindowgui.h" -#define CWHITE 0xfffdee // creamy white without black +#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 +#define ComicYellow 0xffcc00 +#define DarkRed 0xaa0000 +#define LockedRed 0x400000 -// so einfach ist das nicht -// #undef RED -// #define RED 0xfffdee -// #undef BLUE -// #define BLUE 0xfffdee PluginClient* new_plugin(PluginServer *server) { @@ -99,61 +105,103 @@ 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_default = CreamyWhite; // + resources->text_background = BlackNineTwo; // + resources->text_background_disarmed = LockedRed; // arm track locked (!) - 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_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_inactive_highlight = 0x162d50; // z.B. Subtitle, baby-blue -3 - - resources->bg_color = 0x262626; // 85% black + resources->text_inactive_highlight = BabyBlueDark; // e.g. Subtitle, baby-blue -3 + resources->text_highlight = BabyBlue; + + resources->bg_color = BlackEightFive; // 85% black 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; // + 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 = 30; // [15] + 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 + resources->meter_title_w = 25; + + // (asset) edit info text color + edit_font_color = ALARM; // ? ../../cinelerra/theme.h:282 - resources->listbox_border2 = 0x141414; // wie text_border - resources->listbox_border1 = 0x000000; // - resources->listbox_border3 = 0x474747; // - resources->listbox_border4 = 0x141414; // + // 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 +273,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 +309,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 +341,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 +423,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 +453,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 +536,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"); @@ -806,22 +870,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 +996,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,