X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_blond_cv%2Fblondcvtheme.C.orig;h=8aff33a4e5260a08584915ecf86180d483a05683;hb=5ac2037d8e5ab71a1915389cd08b458cfb60d64f;hp=dc32712f55bf2062849ef18b73532aca82babf61;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C.orig b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C.orig index dc32712f..8aff33a4 100644 --- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C.orig +++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C.orig @@ -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" @@ -66,10 +66,7 @@ BlondThemeMain::~BlondThemeMain() { } -const char* BlondThemeMain::plugin_title() -{ - return _("Blond-cv"); -} +const char* BlondThemeMain::plugin_title() { return "Blond-cv"; } Theme* BlondThemeMain::new_theme() { @@ -147,7 +144,7 @@ void BlondTheme::initialize() resources->directory_color = 0x0000ff; - + resources->filebox_icons_images = new_button("icons.png", "fileboxbutton_up.png", @@ -181,30 +178,30 @@ void BlondTheme::initialize() resources->filebox_descend_images = new_button("openfolder.png", - "generic_up.png", - "generic_hi.png", + "generic_up.png", + "generic_hi.png", "generic_dn.png"); - resources->usethis_button_images = + resources->usethis_button_images = resources->ok_images = new_button("ok.png", - "generic_up.png", - "generic_hi.png", + "generic_up.png", + "generic_hi.png", "generic_dn.png"); 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_up.png", + "generic_hi.png", "generic_dn.png"); new_button("cancel.png", - "generic_up.png", - "generic_hi.png", + "generic_up.png", + "generic_hi.png", "generic_dn.png", "new_cancel_images"); @@ -222,9 +219,9 @@ void BlondTheme::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", @@ -266,12 +263,12 @@ void BlondTheme::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; @@ -294,14 +291,14 @@ void BlondTheme::initialize() "radial_dn.png", "radial_checkedhi.png"); - resources->xmeter_images = new_image_set(6, + resources->xmeter_images = new_image_set(6, "xmeter_normal.png", "xmeter_green.png", "xmeter_red.png", "xmeter_yellow.png", "xmeter_white.png", "xmeter_over.png"); - resources->ymeter_images = new_image_set(6, + resources->ymeter_images = new_image_set(6, "ymeter_normal.png", "ymeter_green.png", "ymeter_red.png", @@ -390,20 +387,20 @@ void BlondTheme::initialize() new_image("mode_subtract", "mode_subtract.png"); new_image("mode_max", "mode_max.png"); - new_toggle("plugin_on.png", - "pluginbutton_hi.png", - "pluginbutton_hi.png", - "pluginbutton_select.png", - "pluginbutton_dn.png", - "pluginbutton_selecthi.png", + new_toggle("plugin_on.png", + "pluginbutton_hi.png", + "pluginbutton_hi.png", + "pluginbutton_select.png", + "pluginbutton_dn.png", + "pluginbutton_selecthi.png", "plugin_on"); - 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"); // CWindow @@ -444,7 +441,7 @@ void BlondTheme::initialize() browse_pad = 20; - new_image_set("playpatch_data", + new_image_set("playpatch_data", 5, "playpatch_up.png", "playpatch_hi.png", @@ -452,7 +449,7 @@ void BlondTheme::initialize() "playpatch_dn.png", "playpatch_checkedhi.png"); - new_image_set("recordpatch_data", + new_image_set("recordpatch_data", 5, "recordpatch_up.png", "recordpatch_hi.png", @@ -460,7 +457,7 @@ void BlondTheme::initialize() "recordpatch_dn.png", "recordpatch_checkedhi.png"); - new_image_set("gangpatch_data", + new_image_set("gangpatch_data", 5, "gangpatch_up.png", "gangpatch_hi.png", @@ -468,7 +465,7 @@ void BlondTheme::initialize() "gangpatch_dn.png", "gangpatch_checkedhi.png"); - new_image_set("drawpatch_data", + new_image_set("drawpatch_data", 5, "drawpatch_up.png", "drawpatch_hi.png", @@ -477,7 +474,7 @@ void BlondTheme::initialize() "drawpatch_checkedhi.png"); - new_image_set("mutepatch_data", + new_image_set("mutepatch_data", 5, "mutepatch_up.png", "mutepatch_hi.png", @@ -485,7 +482,7 @@ void BlondTheme::initialize() "mutepatch_dn.png", "mutepatch_checkedhi.png"); - new_image_set("expandpatch_data", + new_image_set("expandpatch_data", 5, "expandpatch_up.png", "expandpatch_hi.png", @@ -501,23 +498,23 @@ void BlondTheme::initialize() 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"); 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"); @@ -632,7 +629,7 @@ void BlondTheme::initialize() VFrame *cpanel_dn = new_image("editpanel_dn.png"); VFrame *cpanel_checked = new_image("editpanel_checked.png"); VFrame *cpanel_checkedhi = new_image("editpanel_checkedhi.png"); - new_toggle("blank30x30.png", + new_toggle("blank30x30.png", new_image("locklabels_locked.png"), new_image("locklabels_lockedhi.png"), new_image("locklabels_unlocked.png"), @@ -673,10 +670,10 @@ void BlondTheme::initialize() //labels resources->label_images = new_image_set(5, - "radial_up.png", - "radial_hi.png", - "radial_checked.png", - "radial_dn.png", + "radial_up.png", + "radial_hi.png", + "radial_checked.png", + "radial_dn.png", "radial_checkedhi.png"); /* resources->type_to_icon = new_image_set(5, @@ -684,7 +681,7 @@ void BlondTheme::initialize() "file_unknown.png", "file_film.png", "file_sound.png", - "file_column.png"); + "file_column.png"); */ } @@ -746,14 +743,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; @@ -762,7 +759,7 @@ SET_TRACE cstatus_y = mwindow->session->cwindow_h - 40; if(mwindow->edl->session->cwindow_meter) { - cmeter_x = mwindow->session->cwindow_w - MeterPanel::get_meters_width(mwindow->edl->session->audio_channels, + cmeter_x = mwindow->session->cwindow_w - MeterPanel::get_meters_width(mwindow->edl->session->audio_channels, mwindow->edl->session->cwindow_meter); ccanvas_w = cmeter_x - ccanvas_x - 5; } @@ -825,17 +822,17 @@ SET_TRACE void BlondTheme::get_recordgui_sizes(RecordGUI *gui, int w, int h) { - + } -void BlondTheme::get_rmonitor_sizes(int do_audio, +void BlondTheme::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, @@ -859,9 +856,9 @@ void BlondTheme::get_vwindow_sizes(VWindowGUI *gui) if(mwindow->edl->session->vwindow_meter) { - vmeter_x = mwindow->session->vwindow_w - - VWINDOW_METER_MARGIN - - MeterPanel::get_meters_width(mwindow->edl->session->audio_channels, + vmeter_x = mwindow->session->vwindow_w - + VWINDOW_METER_MARGIN - + MeterPanel::get_meters_width(mwindow->edl->session->audio_channels, mwindow->edl->session->vwindow_meter); vcanvas_w = vmeter_x - vcanvas_x - VWINDOW_METER_MARGIN; } @@ -882,7 +879,7 @@ void BlondTheme::get_vwindow_sizes(VWindowGUI *gui) vedit_x = 10; vedit_y = vslider_y + BC_Slider::get_span(0); vtransport_x = 10; - vtransport_y = mwindow->session->vwindow_h - + vtransport_y = mwindow->session->vwindow_h - get_image_set("autokeyframe")[0]->get_h(); vtime_x = 380; vtime_y = vedit_y + 10; @@ -980,9 +977,9 @@ void BlondTheme::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, @@ -1003,21 +1000,21 @@ void BlondTheme::draw_mwindow_bg(MWindowGUI *gui) + get_image("end")->get_w() + 7 * get_image("play")->get_w() + get_image("end")->get_w() + mtransport_margin + 2 * get_image("arrow")->get_w() - + toggle_margin + + toggle_margin + 2 * get_image("autokeyframe")->get_w() - + toggle_margin + + toggle_margin + (14 + 1) * get_image("goto")->get_w() + 5; // I don't know why + 1!! - gui->draw_3segmenth(mbuttons_x, - mbuttons_y, - mbuttons_rightedge, + gui->draw_3segmenth(mbuttons_x, + mbuttons_y, + mbuttons_rightedge, mbuttons_x, mbuttons_rightedge, get_image("mbutton_bg"), 0); - gui->draw_3segmenth(mbuttons_x + mbuttons_rightedge, - mbuttons_y, - mwindow->session->mwindow_w, + gui->draw_3segmenth(mbuttons_x + mbuttons_rightedge, + mbuttons_y, + mwindow->session->mwindow_w, get_image("mbutton_blue")); int pdw = get_image("panel_divider")->get_w(); @@ -1040,53 +1037,53 @@ void BlondTheme::draw_mwindow_bg(MWindowGUI *gui) mbuttons_y - 1); // Clock - gui->draw_3segmenth(0, + gui->draw_3segmenth(0, mbuttons_y + get_image("mbutton_bg")->get_h() - 1, - get_image("patchbay_bg")->get_w(), + get_image("patchbay_bg")->get_w(), get_image("clock_bg")); // Patchbay - gui->draw_3segmentv(patchbay_x, - patchbay_y, - patchbay_h, + gui->draw_3segmentv(patchbay_x, + patchbay_y, + patchbay_h, get_image("patchbay_bg")); // Track canvas - gui->draw_9segment(mcanvas_x, - mcanvas_y, - mcanvas_w, - mcanvas_h, + gui->draw_9segment(mcanvas_x, + mcanvas_y, + mcanvas_w, + mcanvas_h, get_image("tracks_bg")); // Timebar - gui->draw_3segmenth(mtimebar_x, - mtimebar_y, - mtimebar_w, + gui->draw_3segmenth(mtimebar_x, + mtimebar_y, + mtimebar_w, get_image("timebar_bg")); // Zoombar #define ZOOMBAR_CENTER 888 - 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")); } @@ -1098,21 +1095,21 @@ void BlondTheme::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")); } } @@ -1120,27 +1117,27 @@ void BlondTheme::draw_cwindow_bg(CWindowGUI *gui) void BlondTheme::draw_vwindow_bg(VWindowGUI *gui) { const int button_division = 400; - 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("cbuttons_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("cmeter_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("cbuttons_right")); } }