X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_pinklady%2Fpinkladytheme.C;h=191187f0578d6fb724aee74521bb87b5f9c2fc65;hp=c4a2c9e07a78b5b26065d3c263a3fe858ec041b0;hb=1529091cdf16df199a901aabe6e8fa1813a933af;hpb=620f70a943c1f47880ec68a908aa03bf463e741f diff --git a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C index c4a2c9e0..191187f0 100644 --- a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C +++ b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C @@ -110,7 +110,7 @@ void PINKLADY::initialize() resources->popup_title_text = 0x1b0f11; resources->menu_item_text = 0x1b0f11; resources->menu_highlighted_fontcolor = WHITE; - resources->generic_button_margin = 30; + resources->generic_button_margin = xS(30); resources->pot_needle_color = resources->text_default; resources->pot_offset = 1; resources->progress_text = resources->text_default; @@ -121,13 +121,13 @@ void PINKLADY::initialize() resources->menu_down = 0x4b4b4b; resources->menu_up = 0x4b4b4b; resources->menu_shadow = 0x202020; - resources->popupmenu_margin = 15; - resources->popupmenu_triangle_margin = 15; + resources->popupmenu_margin = xS(15); + resources->popupmenu_triangle_margin = xS(15); resources->listbox_title_color = 0x1b0f11; - resources->listbox_title_margin = 20; - resources->listbox_title_hotspot = 20; + resources->listbox_title_margin = xS(20); + resources->listbox_title_hotspot = xS(20); resources->listbox_border1 = 0x1a1a1a; resources->listbox_border2 = 0xffb1d0; resources->listbox_border3 = 0xffb1d0; @@ -137,7 +137,7 @@ void PINKLADY::initialize() resources->listbox_bg = 0; resources->listbox_text = 0x1b0f11; - resources->filebox_margin = 130; + resources->filebox_margin = yS(130); resources->file_color = 0x1b0f11; resources->directory_color = 0xa0a0ff; @@ -191,14 +191,28 @@ void PINKLADY::initialize() "loadmode_dn.png", "loadmode_checkedhi.png", "loadmode_resource"); - new_toggle("loadmode_nested.png", + + new_toggle("loadmode_edl_clip.png", "loadmode_up.png", "loadmode_hi.png", "loadmode_checked.png", "loadmode_dn.png", "loadmode_checkedhi.png", - "loadmode_nested"); - + "loadmode_edl_clip"); + new_toggle("loadmode_edl_nested.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_edl_nested"); + new_toggle("loadmode_edl_fileref.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_edl_fileref"); resources->filebox_icons_images = new_button("icons.png", "fileboxbutton_up.png", @@ -268,6 +282,18 @@ void PINKLADY::initialize() "reset_dn.png", "reset_button"); + new_button("unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); + + new_button("keyframe.png", + "keyframe_up.png", + "keyframe_hi.png", + "keyframe_dn.png", + "keyframe_button"); + resources->cancel_images = new_button("cancel.png", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png", @@ -368,7 +394,7 @@ void PINKLADY::initialize() resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); - resources->min_menu_w = 96; + resources->min_menu_w = xS(96); resources->menu_popup_bg = new_image("menu_popup_bg.png"); resources->menu_item_bg = new_image_set(3, "menuitem_up.png", @@ -419,6 +445,11 @@ void PINKLADY::initialize() "tumble_hi.png", "tumble_bottom.png", "tumble_top.png"); + resources->tumblepatch_data = new_image_set(4, + "tumblepatch_up.png", + "tumblepatch_hi.png", + "tumblepatch_bottom.png", + "tumblepatch_top.png"); resources->listbox_button = new_button4("listbox_button.png", "editpanel_up.png", "editpanel_hi.png", @@ -500,7 +531,7 @@ void PINKLADY::initialize() "vscroll_right_up.png", "vscroll_right_hi.png", "vscroll_right_dn.png"); - resources->scroll_minhandle = 20; + resources->scroll_minhandle = xS(20); new_button("prevtip.png", "tipbutton_up.png", "tipbutton_hi.png", "tipbutton_dn.png", "prev_tip"); @@ -518,17 +549,17 @@ void PINKLADY::initialize() preferences_category_overlap = 0; preferencescategory_x = 0; - preferencescategory_y = 5; - preferencestitle_x = 5; - preferencestitle_y = 10; - preferencesoptions_x = 5; + preferencescategory_y = yS(5); + preferencestitle_x = xS(5); + preferencestitle_y = yS(10); + preferencesoptions_x = xS(5); preferencesoptions_y = 0; // MWindow message_normal = resources->text_default; audio_color = GREEN; - mtransport_margin = 10; - toggle_margin = 10; + mtransport_margin = xS(10); + toggle_margin = xS(10); new_button("pane.png", "pane_up.png", "pane_hi.png", "pane_dn.png", "pane"); new_image_set("xpane", 3, "xpane_up.png", "xpane_hi.png", "xpane_dn.png"); @@ -579,23 +610,21 @@ void PINKLADY::initialize() setformat_w = get_image("setformat_bg")->get_w(); setformat_h = get_image("setformat_bg")->get_h(); - setformat_x1 = 15; - setformat_x2 = 110; - - setformat_x3 = 315; - setformat_x4 = 425; - setformat_y1 = 20; - setformat_y2 = 85; - setformat_y3 = 125; - setformat_margin = 30; - setformat_channels_x = 25; - setformat_channels_y = 242; - setformat_channels_w = 250; - setformat_channels_h = 250; - - loadfile_pad = get_image_set("loadmode_new")[0]->get_h() + 10; - browse_pad = 20; - + setformat_x1 = xS(15); + setformat_x2 = xS(110); + setformat_x3 = xS(315); + setformat_x4 = xS(425); + setformat_y1 = yS(20); + setformat_y2 = yS(85); + setformat_y3 = yS(125); + setformat_margin = xS(30); + setformat_channels_x = xS(25); + setformat_channels_y = yS(242); + setformat_channels_w = xS(250); + setformat_channels_h = yS(250); + + loadfile_pad = get_image_set("loadmode_new")[0]->get_h() + yS(10); + browse_pad = yS(20); new_toggle("playpatch.png", "playpatch_up.png", @@ -907,7 +936,7 @@ void PINKLADY::initialize() recordgui_variable_color = RED; channel_position_color = MEYELLOW; - resources->meter_title_w = 25; + resources->meter_title_w = xS(28); // (asset) edit info text color edit_font_color = YELLOW; @@ -921,12 +950,12 @@ void PINKLADY::build_bg_data() channel_position_data = new VFramePng(get_image_data("channel_position.png")); // Track bitmaps - new_image("resource1024", "resource1024.png"); - new_image("resource512", "resource512.png"); - new_image("resource256", "resource256.png"); - new_image("resource128", "resource128.png"); - new_image("resource64", "resource64.png"); - new_image("resource32", "resource32.png"); + new_image1("resource1024", "resource1024.png"); + new_image1("resource512", "resource512.png"); + new_image1("resource256", "resource256.png"); + new_image1("resource128", "resource128.png"); + new_image1("resource64", "resource64.png"); + new_image1("resource32", "resource32.png"); new_image("plugin_bg_data", "plugin_bg.png"); new_image("title_bg_data", "title_bg.png"); new_image("vtimebar_bg_data", "vwindow_timebar.png"); @@ -946,18 +975,17 @@ void PINKLADY::build_overlays() void PINKLADY::draw_rwindow_bg(RecordGUI *gui) { // int y; -// int margin = 50; -// int margin2 = 80; -// gui->draw_9segment(recordgui_batch_x - margin, -// 0, +// int margin = xS(50); +// int margin2 = xS(80); +// gui->draw_9segment(recordgui_batch_x - margin, 0, // mwindow->session->rwindow_w - recordgui_status_x + margin, // recordgui_buttons_y, // rgui_batch); // gui->draw_3segmenth(recordgui_options_x - margin2, -// recordgui_buttons_y - 5, +// recordgui_buttons_y - yS(5), // mwindow->session->rwindow_w - recordgui_options_x + margin2, // rgui_controls); -// y = recordgui_buttons_y - 5 + rgui_controls->get_h(); +// y = recordgui_buttons_y - yS(5) + rgui_controls->get_h(); // gui->draw_9segment(0, // y, // mwindow->session->rwindow_w, @@ -967,27 +995,21 @@ void PINKLADY::draw_rwindow_bg(RecordGUI *gui) void PINKLADY::draw_rmonitor_bg(RecordMonitorGUI *gui) { -// int margin = 45; -// int panel_w = 300; +// int margin = xS(45); +// int panel_w = xS(300); // int x = rmonitor_meter_x - margin; // int w = mwindow->session->rmonitor_w - x; // if(w < rmonitor_meters->get_w()) w = rmonitor_meters->get_w(); -// gui->clear_box(0, -// 0, +// gui->clear_box(0, 0, // mwindow->session->rmonitor_w, // mwindow->session->rmonitor_h); -// gui->draw_9segment(x, -// 0, +// gui->draw_9segment(x, 0, // w, // mwindow->session->rmonitor_h, // rmonitor_meters); } - - - - void PINKLADY::draw_mwindow_bg(MWindowGUI *gui) { // Button bar @@ -998,32 +1020,28 @@ void PINKLADY::draw_mwindow_bg(MWindowGUI *gui) int x = mbuttons_x; x += 9 * get_image("play")->get_w(); x += mtransport_margin; // the control buttons - + int xs2 = xS(2); gui->draw_vframe(get_image("panel_divider"), - x - toggle_margin / 2 - pdw / 2 + 2, + x - toggle_margin / 2 - pdw / 2 + xs2, mbuttons_y - 1); x += 2 * get_image("arrow")->get_w() + toggle_margin; // the mode buttons gui->draw_vframe(get_image("panel_divider"), - x - toggle_margin / 2 - pdw / 2 + 2, + x - toggle_margin / 2 - pdw / 2 + xs2, mbuttons_y - 1); x += 3 * get_image("autokeyframe")->get_w() + toggle_margin; // the state toggle buttons gui->draw_vframe(get_image("panel_divider"), - x - toggle_margin / 2 - pdw / 2 + 2, + x - toggle_margin / 2 - pdw / 2 + xs2, mbuttons_y - 1); // Clock - gui->draw_3segmenth(0, - mbuttons_y - 1 + get_image("mbutton_bg")->get_h(), - get_image("patchbay_bg")->get_w(), - get_image("clock_bg")); + gui->draw_3segmenth(0, mbuttons_y - 1 + get_image("mbutton_bg")->get_h(), + get_image("patchbay_bg")->get_w(), get_image("clock_bg")); // Patchbay - gui->draw_3segmentv(patchbay_x, - patchbay_y, - patchbay_h, - get_image("patchbay_bg")); + gui->draw_3segmentv(patchbay_x, patchbay_y, + patchbay_h, get_image("patchbay_bg")); // Track canvas gui->set_color(BLACK); @@ -1033,17 +1051,13 @@ void PINKLADY::draw_mwindow_bg(MWindowGUI *gui) mcanvas_h - BC_ScrollBar::get_span(SCROLL_HORIZ) - mtimebar_h); // Timebar - gui->draw_3segmenth(mtimebar_x, - mtimebar_y, - mtimebar_w, - get_image("timebar_bg")); + gui->draw_3segmenth(mtimebar_x, mtimebar_y, + mtimebar_w, get_image("timebar_bg")); // Zoombar gui->set_color(0xffb1d0); - gui->draw_box(mzoom_x, - mzoom_y, - mwindow->session->mwindow_w, - 25); + gui->draw_box(mzoom_x, mzoom_y, + mwindow->session->mwindow_w, yS(25)); // Scrollbar filler // gui->draw_vframe(get_image("mscroll_filler"), @@ -1051,10 +1065,8 @@ void PINKLADY::draw_mwindow_bg(MWindowGUI *gui) // mcanvas_y + mcanvas_h - BC_ScrollBar::get_span(SCROLL_HORIZ)); // Status - gui->draw_3segmenth(mzoom_x, - mzoom_y, - mzoom_w, - get_image("statusbar")); + gui->draw_3segmenth(mzoom_x, mzoom_y, + mzoom_w, get_image("statusbar")); } @@ -1079,9 +1091,8 @@ void PINKLADY::draw_cwindow_bg(CWindowGUI *gui) } else { - gui->draw_3segmenth(cstatus_x, - ccomposite_h, - cmeter_x - widget_border - cstatus_x + 100, + gui->draw_3segmenth(cstatus_x, ccomposite_h, + cmeter_x - widget_border - cstatus_x + xS(100), get_image("cbuttons_right")); } } @@ -1094,29 +1105,24 @@ void PINKLADY::draw_vwindow_bg(VWindowGUI *gui) get_image("vbuttons_left")); if(mwindow->edl->session->vwindow_meter) { - gui->draw_3segmenth(vdivision_x, - vcanvas_h, + gui->draw_3segmenth(vdivision_x, vcanvas_h, vmeter_x - widget_border - vdivision_x, get_image("cbuttons_right")); - gui->draw_9segment(vmeter_x - widget_border, - 0, + gui->draw_9segment(vmeter_x - widget_border, 0, mwindow->session->vwindow_w - vmeter_x + widget_border, mwindow->session->vwindow_h, get_image("cmeter_bg")); } else { - gui->draw_3segmenth(vdivision_x, - vcanvas_h, - vmeter_x - widget_border - vdivision_x + 100, + gui->draw_3segmenth(vdivision_x, vcanvas_h, + vmeter_x - widget_border - vdivision_x + xS(100), get_image("cbuttons_right")); } // Clock border - gui->draw_3segmenth(vtime_x - 20, - vtime_y - 1, - vtime_w + 40, - get_image("vclock")); + gui->draw_3segmenth(vtime_x - xS(20), vtime_y - 1, + vtime_w + xS(40), get_image("vclock")); } void PINKLADY::draw_preferences_bg(PreferencesWindow *gui)