X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blue_dot%2Fbluedottheme.C;h=2915dc0b9fb595b0c9bde50fa8bb82f20330a79d;hp=4ab6a5a06c580cb39ad970f489562c3cb081f3e6;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C index 4ab6a5a0..2915dc0b 100644 --- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C +++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include "bcsignals.h" @@ -70,10 +70,7 @@ BlueDotThemeMain::~BlueDotThemeMain() { } -const char* BlueDotThemeMain::plugin_title() -{ - return _("Blue Dot"); -} +const char* BlueDotThemeMain::plugin_title() { return N_("Blue Dot"); } Theme* BlueDotThemeMain::new_theme() { @@ -117,6 +114,7 @@ void BlueDotTheme::initialize() // COPIED FROM DEFAULT THEME 1>> resources->text_default = 0x000000; resources->text_background = 0xffffff; + resources->text_background_disarmed = 0xff3939; //listbox borders resources->text_border1 = 0x4a484a; // (top outer) resources->text_border2 = 0x000000; // (top inner) @@ -236,7 +234,7 @@ void BlueDotTheme::initialize() "loadmode_checkedhi.png", "loadmode_nested"); -//There are differences here, but we won't change until the end. +//There are differences here, but we won't change until the end. //Specific to BD resources->filebox_icons_images = new_image_set(3, "file_icons_up.png", @@ -271,30 +269,32 @@ void BlueDotTheme::initialize() resources->filebox_descend_images = new_image_set(3, "file_openfolder_up.png", - "file_openfolder_uphi.png", + "file_openfolder_uphi.png", "file_openfolder_dn.png"); //Specific to BD - resources->usethis_button_images = + resources->usethis_button_images = resources->ok_images = new_button("ok.png", - "generic_up.png", - "generic_hi.png", - "generic_dn.png"); + "generic_up.png", + "generic_hi.png", + "generic_dn.png", + "ok_button"); new_button("ok.png", - "generic_up.png", - "generic_hi.png", + "generic_up.png", + "generic_hi.png", "generic_dn.png", "new_ok_images"); resources->cancel_images = new_button("cancel.png", - "generic_up.png", - "generic_hi.png", - "generic_dn.png"); + "generic_up.png", + "generic_hi.png", + "generic_dn.png", + "cancel_button"); new_button("cancel.png", - "generic_up.png", - "generic_hi.png", + "generic_up.png", + "generic_hi.png", "generic_dn.png", "new_cancel_images"); @@ -321,7 +321,7 @@ void BlueDotTheme::initialize() "black_e.png", "black_f.png", "black_space.png", - "black_dash.png"); + "black_dash.png"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); @@ -337,9 +337,9 @@ void BlueDotTheme::initialize() resources->toggle_highlight_bg = 0; // if (0) "Draw a plain box" as per bctoggle.C - resources->generic_button_images = new_image_set(3, - "generic_up.png", - "generic_hi.png", + resources->generic_button_images = new_image_set(3, + "generic_up.png", + "generic_hi.png", "generic_dn.png"); resources->horizontal_slider_data = new_image_set(6, "hslider_fg_up.png", @@ -381,12 +381,12 @@ void BlueDotTheme::initialize() resources->listbox_up = new_image("listbox_up.png"); resources->listbox_dn = new_image("listbox_dn.png"); resources->pan_data = new_image_set(7, - "pan_up.png", - "pan_hi.png", - "pan_popup.png", - "pan_channel.png", - "pan_stick.png", - "pan_channel_small.png", + "pan_up.png", + "pan_hi.png", + "pan_popup.png", + "pan_channel.png", + "pan_stick.png", + "pan_channel_small.png", "pan_stick_small.png"); resources->pan_text_color = WHITE; @@ -409,7 +409,7 @@ void BlueDotTheme::initialize() "radial_down.png", "radial_checkedhi.png"); - resources->xmeter_images = new_image_set(7, + resources->xmeter_images = new_image_set(7, "xmeter_normal.png", "xmeter_green.png", "xmeter_red.png", @@ -417,7 +417,7 @@ void BlueDotTheme::initialize() "xmeter_normal.png", "xmeter_over.png", "downmix51_2.png"); - resources->ymeter_images = new_image_set(7, + resources->ymeter_images = new_image_set(7, "ymeter_normal.png", "ymeter_green.png", "ymeter_red.png", @@ -508,7 +508,7 @@ void BlueDotTheme::initialize() new_image_set("zoombar_menu", 3, "generic_up.png", "generic_hi.png", "generic_dn.png"); new_image_set("zoombar_tumbler", 4, "tumble_up.png", "tumble_hi.png", "tumble_bottom.png", "tumble_top.png"); -//Graphic Copied from default. Improve!! +//Graphic Copied from default. Improve!! new_image_set("mode_popup", 3, "generic_up.png", "generic_hi.png", "generic_dn.png"); new_image("mode_add", "mode_add.png"); new_image("mode_divide", "mode_divide.png"); @@ -519,22 +519,22 @@ void BlueDotTheme::initialize() new_image("mode_max", "mode_max.png"); new_image("mode_min", "mode_min.png"); -//Graphic Copied from default. Improve!! - new_toggle("plugin_on.png", - "pluginbutton_hi.png", - "pluginbutton_hi.png", - "pluginbutton_select.png", - "pluginbutton_dn.png", - "pluginbutton_selecthi.png", +//Graphic Copied from default. Improve!! + new_toggle("plugin_on.png", + "pluginbutton_hi.png", + "pluginbutton_hi.png", + "pluginbutton_select.png", + "pluginbutton_dn.png", + "pluginbutton_selecthi.png", "plugin_on"); //Graphic Copied from default. Improve!! - new_toggle("plugin_show.png", - "plugin_show.png", - "pluginbutton_hi.png", - "pluginbutton_select.png", - "pluginbutton_dn.png", - "pluginbutton_selecthi.png", + new_toggle("plugin_show.png", + "plugin_show.png", + "pluginbutton_hi.png", + "pluginbutton_select.png", + "pluginbutton_dn.png", + "pluginbutton_selecthi.png", "plugin_show"); new_image("cpanel_bg", "cpanel_bg.png"); @@ -583,7 +583,7 @@ void BlueDotTheme::initialize() browse_pad = 20; //This buttons miss a bit. May need to be improved - new_image_set("playpatch_data", + new_image_set("playpatch_data", 5, "playpatch_up.png", "playpatch_hi.png", @@ -591,7 +591,7 @@ void BlueDotTheme::initialize() "playpatch_dn.png", "playpatch_checkedhi.png"); - new_image_set("recordpatch_data", + new_image_set("recordpatch_data", 5, "recordpatch_up.png", "recordpatch_hi.png", @@ -599,7 +599,7 @@ void BlueDotTheme::initialize() "recordpatch_dn.png", "recordpatch_checkedhi.png"); - new_image_set("gangpatch_data", + new_image_set("gangpatch_data", 5, "gangpatch_up.png", "gangpatch_hi.png", @@ -607,7 +607,7 @@ void BlueDotTheme::initialize() "gangpatch_dn.png", "gangpatch_checkedhi.png"); - new_image_set("drawpatch_data", + new_image_set("drawpatch_data", 5, "drawpatch_up.png", "drawpatch_hi.png", @@ -616,7 +616,7 @@ void BlueDotTheme::initialize() "drawpatch_checkedhi.png"); - new_image_set("mutepatch_data", + new_image_set("mutepatch_data", 5, "mutepatch_up.png", "mutepatch_hi.png", @@ -624,7 +624,7 @@ void BlueDotTheme::initialize() "mutepatch_dn.png", "mutepatch_checkedhi.png"); - new_image_set("expandpatch_data", + new_image_set("expandpatch_data", 5, "expandpatch_up.png", "expandpatch_hi.png", @@ -640,38 +640,51 @@ void BlueDotTheme::initialize() //Graphic Copied from default. Improve!! -> See outpoint.png/inpoint.png out_point = new_image_set(5, - "out_up.png", - "out_hi.png", - "out_checked.png", - "out_dn.png", + "out_up.png", + "out_hi.png", + "out_checked.png", + "out_dn.png", "out_checkedhi.png"); in_point = new_image_set(5, - "in_up.png", - "in_hi.png", - "in_checked.png", - "in_dn.png", + "in_up.png", + "in_hi.png", + "in_checked.png", + "in_dn.png", "in_checkedhi.png"); //Graphic Copied from default. Improve!! -> see label.png label_toggle = new_image_set(5, - "labeltoggle_up.png", - "labeltoggle_uphi.png", - "label_checked.png", - "labeltoggle_dn.png", + "labeltoggle_up.png", + "labeltoggle_uphi.png", + "label_checked.png", + "labeltoggle_dn.png", "label_checkedhi.png"); ffmpeg_toggle = new_image_set(5, - "ff_up.png", - "ff_hi.png", - "ff_checked.png", - "ff_down.png", + "ff_up.png", + "ff_hi.png", + "ff_checked.png", + "ff_down.png", "ff_checkedhi.png"); + proxy_toggle = new_image_set(5, + "proxy_up.png", + "proxy_hi.png", + "proxy_chkd.png", + "proxy_down.png", + "proxy_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"); + statusbar_cancel_data = new_image_set(3, "statusbar_cancel_up.png", "statusbar_cancel_hi.png", @@ -690,6 +703,44 @@ void BlueDotTheme::initialize() 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_toggle("histogram_toggle.png", + editpanel_up, + editpanel_hi, + editpanel_checked, + editpanel_dn, + editpanel_checkedhi, + "histogram_toggle"); + new_toggle("histogram_rgb.png", + editpanel_up, + editpanel_hi, + editpanel_checked, + editpanel_dn, + editpanel_checkedhi, + "histogram_rgb_toggle"); + new_toggle("waveform.png", + editpanel_up, + editpanel_hi, + editpanel_checked, + editpanel_dn, + editpanel_checkedhi, + "waveform_toggle"); + new_toggle("waveform_rgb.png", + editpanel_up, + editpanel_hi, + editpanel_checked, + editpanel_dn, + editpanel_checkedhi, + "waveform_rgb_toggle"); + new_toggle("scope.png", + editpanel_up, + editpanel_hi, + editpanel_checked, + editpanel_dn, + editpanel_checkedhi, + "scope_toggle"); + + new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture"); + 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"); @@ -697,7 +748,7 @@ void BlueDotTheme::initialize() new_button("fit.png", editpanel_up, editpanel_hi, editpanel_dn, "fit"); new_button("fitautos.png", editpanel_up, editpanel_hi, editpanel_dn, "fitautos"); new_button("inpoint.png", editpanel_up, editpanel_hi, editpanel_dn, "inbutton"); -// indelete_data = new_button("clearinpoint.png", editpanel_up, editpanel_hi, editpanel_dn); //Specific to BD +// indelete_data = new_button("clearinpoint.png", editpanel_up, editpanel_hi, editpanel_dn); //Specific to BD new_button("label.png", editpanel_up, editpanel_hi, editpanel_dn, "labelbutton"); new_button("left_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "left_justify"); new_button("magnifyS.png", "editpanelW_up.png", "editpanelW_hi.png", "editpanelW_dn.png", "magnify_button"); @@ -705,15 +756,15 @@ void BlueDotTheme::initialize() new_button("nextlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "nextlabel"); new_button("outpoint.png", editpanel_up, editpanel_hi, editpanel_dn, "outbutton"); // outdelete_data = new_button("clearoutpoint.png", editpanel_up, editpanel_hi, editpanel_dn); //Specific to BD - 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("prevlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "prevlabel"); new_button("nextedit.png", editpanel_up, editpanel_hi, editpanel_dn, "nextedit"); new_button("prevedit.png", editpanel_up, editpanel_hi, editpanel_dn, "prevedit"); 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"); @@ -731,7 +782,7 @@ void BlueDotTheme::initialize() new_button("play.png",TRANSPORT_CENTER_IMAGES, "play"); new_button("framefwd.png", TRANSPORT_CENTER_IMAGES, "framefwd"); new_button("framerev.png", TRANSPORT_CENTER_IMAGES, "framerev"); -//Graphic Copied from default. Improve!! +//Graphic Copied from default. Improve!! new_button("pause.png", TRANSPORT_CENTER_IMAGES, "pause"); new_button("record.png", TRANSPORT_CENTER_IMAGES, "record"); //Graphic Copied from default. Improve!! @@ -785,7 +836,7 @@ void BlueDotTheme::initialize() new_toggle("autokeyframe.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "autokeyframe"); new_toggle("ibeam.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "ibeam"); new_toggle("show_meters.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "meters"); - new_toggle("blank30x30.png", + new_toggle("blank30x30.png", new_image("locklabels_locked.png"), new_image("locklabels_lockedhi.png"), new_image("locklabels_unlocked.png"), @@ -827,6 +878,10 @@ void BlueDotTheme::initialize() // new_toggle("toolwindow.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi,"tool"); // MIHA: Commented out in favor of default version M4<< + // toggle for tangent mode (compositor/tool window) + 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(); @@ -855,7 +910,7 @@ void BlueDotTheme::initialize() //buttons resources->button_highlighted = LTGREY; resources->button_uphighlighted = DKGREY; - resources->button_light = WHITE; + resources->button_light = WHITE; resources->button_up = LTGREY; resources->button_shadow = DKGREY; resources->button_down = MDGREY; @@ -865,10 +920,10 @@ void BlueDotTheme::initialize() //labels resources->label_images = new_image_set(5, - "radial_up.png", - "radial_uphi.png", - "radial_checked.png", - "radial_down.png", + "radial_up.png", + "radial_uphi.png", + "radial_checked.png", + "radial_down.png", "radial_checkedhi.png"); /* resources->type_to_icon = new_image_set(5, @@ -876,7 +931,7 @@ void BlueDotTheme::initialize() "file_unknown.png", "file_film.png", "file_sound.png", - "file_column.png"); + "file_column.png"); */ //Specific to BD @@ -897,7 +952,7 @@ void BlueDotTheme::get_mwindow_sizes(MWindowGUI *gui, int w, int h) // Position of menu buttons (start, stop, ff, etc.) mbuttons_x = 0; mbuttons_y = gui->mainmenu->get_h(); - mbuttons_w = w; + mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_toggle[0]->get_w()+2); mbuttons_h = get_image("mbutton_left")->get_h(); mclock_x = 20; //x position of digits in clock window mclock_y = mbuttons_y + 1 + mbuttons_h + CWINDOW_METER_MARGIN; @@ -961,14 +1016,14 @@ SET_TRACE ccomposite_x = 0; ccomposite_y = 5; ccomposite_w = get_image("cpanel_bg")->get_w(); - ccomposite_h = mwindow->session->cwindow_h - + ccomposite_h = mwindow->session->cwindow_h - get_image("cbuttons_left")->get_h(); cslider_x = 5; cslider_y = ccomposite_h + 23; cedit_x = 10; cedit_y = cslider_y + 17; ctransport_x = 10; - ctransport_y = mwindow->session->cwindow_h - + ctransport_y = mwindow->session->cwindow_h - get_image_set("autokeyframe")[0]->get_h(); ccanvas_x = ccomposite_x + ccomposite_w; ccanvas_y = 0; @@ -1048,18 +1103,18 @@ SET_TRACE void BlueDotTheme::get_recordgui_sizes(RecordGUI *gui, int w, int h) { - + } // COPIED START-------- -void BlueDotTheme::get_rmonitor_sizes(int do_audio, +void BlueDotTheme::get_rmonitor_sizes(int do_audio, int do_video, int do_channel, int do_interlace, int do_avc, int audio_channels) { - Theme::get_rmonitor_sizes(do_audio, + Theme::get_rmonitor_sizes(do_audio, do_video, do_channel, do_interlace, @@ -1084,8 +1139,8 @@ void BlueDotTheme::get_vwindow_sizes(VWindowGUI *gui) if(mwindow->edl->session->vwindow_meter) { - vmeter_x = mwindow->session->vwindow_w - - VWINDOW_METER_MARGIN - + vmeter_x = mwindow->session->vwindow_w - + VWINDOW_METER_MARGIN - MeterPanel::get_meters_width(this, mwindow->edl->session->audio_channels, mwindow->edl->session->vwindow_meter); vcanvas_w = vmeter_x - vcanvas_x - VWINDOW_METER_MARGIN; @@ -1108,7 +1163,7 @@ void BlueDotTheme::get_vwindow_sizes(VWindowGUI *gui) vedit_x = 10; vedit_y = vslider_y + 17; vtransport_x = 10; - vtransport_y = mwindow->session->vwindow_h - + vtransport_y = mwindow->session->vwindow_h - get_image_set("autokeyframe")[0]->get_h(); vtime_x = 373; vtime_y = vedit_y + 7; @@ -1134,7 +1189,6 @@ void BlueDotTheme::build_icons() new_image("cwindow_icon", "heroine_icon.png"); new_image("awindow_icon", "heroine_icon.png"); new_image("record_icon", "heroine_icon.png"); - new_image("clip_icon", "clip_icon.png"); } @@ -1207,9 +1261,9 @@ void BlueDotTheme::draw_rmonitor_bg(RecordMonitorGUI *gui) // 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, -// mwindow->session->rmonitor_w, +// gui->clear_box(0, +// 0, +// mwindow->session->rmonitor_w, // mwindow->session->rmonitor_h); // gui->draw_9segment(x, // 0, @@ -1227,14 +1281,14 @@ void BlueDotTheme::draw_mwindow_bg(MWindowGUI *gui) { // Button bar (not menu bar) #define MBUTTONS_RIGHTEDGE 290 + 11 + 2*30 + 11 + 2*30 + 11 + 14*30 - gui->draw_3segmenth(mbuttons_x, - mbuttons_y, - MBUTTONS_RIGHTEDGE, + gui->draw_3segmenth(mbuttons_x, + mbuttons_y, + MBUTTONS_RIGHTEDGE, get_image("mbutton_left"), 0); - gui->draw_3segmenth(mbuttons_x + MBUTTONS_RIGHTEDGE, - mbuttons_y, - mbuttons_w - 500, + gui->draw_3segmenth(mbuttons_x + MBUTTONS_RIGHTEDGE, + mbuttons_y, + mbuttons_w - 500, get_image("mbutton_right")); // MIHA: COPIED FROM DEFAULT THEME M6>> @@ -1255,60 +1309,60 @@ void BlueDotTheme::draw_mwindow_bg(MWindowGUI *gui) //Specific to BD // Clock (here the background of the clock is drawn) - gui->draw_3segmenth(0, + gui->draw_3segmenth(0, mbuttons_y + get_image("mbutton_left")->get_h(), - get_image("patchbay_bg")->get_w(), + get_image("patchbay_bg")->get_w(), get_image("clock_bg")); //Specific to BD // Patchbay - gui->draw_3segmentv(patchbay_x, - patchbay_y, - patchbay_h, + gui->draw_3segmentv(patchbay_x, + patchbay_y, + patchbay_h, get_image("patchbay_bg")); -//patchbay_h + 10, +//patchbay_h + 10, //Specific to BD //Drawing of Track's canvas - gui->draw_9segment(mcanvas_x, - mcanvas_y, - mcanvas_w, - patchbay_h + 26, + gui->draw_9segment(mcanvas_x, + mcanvas_y, + mcanvas_w, + patchbay_h + 26, get_image("tracks_bg")); -//patchbay_h + 10, +//patchbay_h + 10, // Timebar - gui->draw_3segmenth(mtimebar_x, - mtimebar_y, - mtimebar_w, + gui->draw_3segmenth(mtimebar_x, + mtimebar_y, + mtimebar_w, get_image("timebar_bg")); //Specific to BD // Zoombar #define ZOOMBAR_CENTER 1100 - gui->draw_3segmenth(mzoom_x, + gui->draw_3segmenth(mzoom_x, mzoom_y, - ZOOMBAR_CENTER, + ZOOMBAR_CENTER, get_image("zoombar_left")); if(mzoom_w > ZOOMBAR_CENTER) - gui->draw_3segmenth(mzoom_x + ZOOMBAR_CENTER, - mzoom_y, - mzoom_w - ZOOMBAR_CENTER, + gui->draw_3segmenth(mzoom_x + ZOOMBAR_CENTER, + mzoom_y, + mzoom_w - ZOOMBAR_CENTER, get_image("zoombar_right")); // Status - gui->draw_3segmenth(mstatus_x, + gui->draw_3segmenth(mstatus_x, mstatus_y, - ZOOMBAR_CENTER, + ZOOMBAR_CENTER, get_image("statusbar_left")); if(mstatus_w > ZOOMBAR_CENTER) - gui->draw_3segmenth(mstatus_x + ZOOMBAR_CENTER, + gui->draw_3segmenth(mstatus_x + ZOOMBAR_CENTER, mstatus_y, - mstatus_w - ZOOMBAR_CENTER, + mstatus_w - ZOOMBAR_CENTER, get_image("statusbar_right")); } @@ -1321,21 +1375,21 @@ void BlueDotTheme::draw_cwindow_bg(CWindowGUI *gui) gui->draw_3segmenth(0, ccomposite_h, button_division, get_image("cbuttons_left")); if(mwindow->edl->session->cwindow_meter) { - gui->draw_3segmenth(button_division, - ccomposite_h, - cmeter_x - CWINDOW_METER_MARGIN - button_division, + gui->draw_3segmenth(button_division, + ccomposite_h, + cmeter_x - CWINDOW_METER_MARGIN - button_division, get_image("cbuttons_right")); - gui->draw_9segment(cmeter_x - CWINDOW_METER_MARGIN, - 0, - mwindow->session->cwindow_w - cmeter_x + CWINDOW_METER_MARGIN, - mwindow->session->cwindow_h, + gui->draw_9segment(cmeter_x - CWINDOW_METER_MARGIN, + 0, + mwindow->session->cwindow_w - cmeter_x + CWINDOW_METER_MARGIN, + mwindow->session->cwindow_h, get_image("cmeter_bg")); } else { - gui->draw_3segmenth(button_division, - ccomposite_h, - cmeter_x - CWINDOW_METER_MARGIN - button_division + 100, + gui->draw_3segmenth(button_division, + ccomposite_h, + cmeter_x - CWINDOW_METER_MARGIN - button_division + 100, get_image("cbuttons_right")); } } @@ -1344,27 +1398,27 @@ void BlueDotTheme::draw_vwindow_bg(VWindowGUI *gui) { //Specific to BD const int button_division = 535; - gui->draw_3segmenth(0, - vcanvas_h, - button_division, + gui->draw_3segmenth(0, + vcanvas_h, + button_division, get_image("vbuttons_left")); if(mwindow->edl->session->vwindow_meter) { - gui->draw_3segmenth(button_division, - vcanvas_h, - vmeter_x - VWINDOW_METER_MARGIN - button_division, + gui->draw_3segmenth(button_division, + vcanvas_h, + vmeter_x - VWINDOW_METER_MARGIN - button_division, get_image("vbuttons_right")); gui->draw_9segment(vmeter_x - VWINDOW_METER_MARGIN, 0, - mwindow->session->vwindow_w - vmeter_x + VWINDOW_METER_MARGIN, - mwindow->session->vwindow_h, + mwindow->session->vwindow_w - vmeter_x + VWINDOW_METER_MARGIN, + mwindow->session->vwindow_h, get_image("vmeter_bg")); } else { - gui->draw_3segmenth(button_division, - vcanvas_h, - vmeter_x - VWINDOW_METER_MARGIN - button_division + 100, + gui->draw_3segmenth(button_division, + vcanvas_h, + vmeter_x - VWINDOW_METER_MARGIN - button_division + 100, get_image("vbuttons_right")); } }