X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitlewindow.C.stroker;h=1b0d066f15d16d0c3e24cdd7ef52f087828fc0d7;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hp=d92c854820c69df2d92432256fcdd69bf3f761f0;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/titler/titlewindow.C.stroker b/cinelerra-5.1/plugins/titler/titlewindow.C.stroker index d92c8548..1b0d066f 100644 --- a/cinelerra-5.1/plugins/titler/titlewindow.C.stroker +++ b/cinelerra-5.1/plugins/titler/titlewindow.C.stroker @@ -9,18 +9,18 @@ PLUGIN_THREAD_OBJECT(TitleMain, TitleThread, TitleWindow) TitleWindow::TitleWindow(TitleMain *client, int x, int y) - : BC_Window(client->gui_string, + : BC_Window(client->gui_string, x, y, - client->window_w, - client->window_h, - 100, - 100, - 1, + client->window_w, + client->window_h, + 100, + 100, + 1, 0, 1) -{ - this->client = client; +{ + this->client = client; } TitleWindow::~TitleWindow() @@ -38,7 +38,7 @@ TitleWindow::~TitleWindow() int TitleWindow::create_objects() { int x = 10, y = 10; - + encodings.append(new BC_ListBoxItem("ISO8859-1")); encodings.append(new BC_ListBoxItem("ISO8859-2")); encodings.append(new BC_ListBoxItem("ISO8859-3")); @@ -96,15 +96,15 @@ int TitleWindow::create_objects() int exists = 0; for(int j = 0; j < fonts.total; j++) { - if(!strcasecmp(fonts.values[j]->get_text(), - client->fonts->values[i]->fixed_title)) + if(!strcasecmp(fonts.values[j]->get_text(), + client->fonts->values[i]->fixed_title)) { exists = 1; break; } } - if(!exists) fonts.append(new + if(!exists) fonts.append(new BC_ListBoxItem(client->fonts->values[i]->fixed_title)); } @@ -123,7 +123,7 @@ int TitleWindow::create_objects() done = 0; } } - } + } @@ -165,7 +165,7 @@ int TitleWindow::create_objects() add_tool(top = new TitleTop(client, this, x, y + 20)); add_tool(mid = new TitleMid(client, this, x, y + 50)); add_tool(bottom= new TitleBottom(client, this, x, y + 80)); - + y += 50; @@ -186,10 +186,10 @@ int TitleWindow::create_objects() motion = new TitleMotion(client, this, x, y + 20); motion->create_objects(); x += 150; - + add_tool(loop = new TitleLoop(client, x, y + 20)); x += 100; - + x = 10; y += 50; @@ -226,16 +226,16 @@ int TitleWindow::create_objects() #ifdef USE_OUTLINE x += 160; add_tool(strokewidth_title = new BC_Title(x, y, _("Outline width:"))); - stroke_width = new TitleStrokeW(client, - this, - x, + stroke_width = new TitleStrokeW(client, + this, + x, y + 20); stroke_width->create_objects(); x += 210; - add_tool(color_stroke_button = new TitleColorStrokeButton(client, - this, - x, + add_tool(color_stroke_button = new TitleColorStrokeButton(client, + this, + x, y + 20)); color_stroke_x = color_x; color_stroke_y = y + 20; @@ -255,11 +255,11 @@ int TitleWindow::create_objects() x = 10; y += 30; - text = new TitleText(client, - this, - x, - y, - get_w() - x - 10, + text = new TitleText(client, + this, + x, + y, + get_w() - x - 10, get_h() - y - 20 - 10); text->create_objects(); @@ -313,8 +313,8 @@ int TitleWindow::resize_event(int w, int h) #endif timecode->reposition_window(timecode->get_x(), timecode->get_y()); - text->reposition_window(text->get_x(), - text->get_y(), + text->reposition_window(text->get_x(), + text->get_y(), w - text->get_x() - 10, BC_TextBox::pixels_to_rows(this, MEDIUMFONT, h - text->get_y() - 10)); @@ -484,8 +484,8 @@ TitleStroke::TitleStroke(TitleMain *client, TitleWindow *window, int x, int y) int TitleStroke::handle_event() { - client->config.style = - (client->config.style & ~FONT_OUTLINE) | + client->config.style = + (client->config.style & ~FONT_OUTLINE) | (get_value() ? FONT_OUTLINE : 0); client->send_configure_change(); return 1; @@ -494,11 +494,11 @@ int TitleStroke::handle_event() TitleSize::TitleSize(TitleMain *client, TitleWindow *window, int x, int y, char *text) - : BC_PopupTextBox(window, + : BC_PopupTextBox(window, &window->sizes, text, - x, - y, + x, + y, 100, 300) { @@ -522,11 +522,11 @@ void TitleSize::update(int size) BC_PopupTextBox::update(string); } TitleEncoding::TitleEncoding(TitleMain *client, TitleWindow *window, int x, int y) - : BC_PopupTextBox(window, + : BC_PopupTextBox(window, &window->encodings, client->config.encoding, - x, - y, + x, + y, 100, 300) { @@ -571,11 +571,11 @@ int TitleColorStrokeButton::handle_event() } TitleMotion::TitleMotion(TitleMain *client, TitleWindow *window, int x, int y) - : BC_PopupTextBox(window, + : BC_PopupTextBox(window, &window->paths, client->motion_to_text(client->config.motion_strategy), - x, - y, + x, + y, 120, 100) { @@ -613,10 +613,10 @@ int TitleTimecode::handle_event() return 1; } -TitleFade::TitleFade(TitleMain *client, - TitleWindow *window, - double *value, - int x, +TitleFade::TitleFade(TitleMain *client, + TitleWindow *window, + double *value, + int x, int y) : BC_TextBox(x, y, 90, 1, (float)*value) { @@ -633,11 +633,11 @@ int TitleFade::handle_event() } TitleFont::TitleFont(TitleMain *client, TitleWindow *window, int x, int y) - : BC_PopupTextBox(window, + : BC_PopupTextBox(window, &window->fonts, client->config.font, - x, - y, + x, + y, 200, 500) { @@ -651,15 +651,15 @@ int TitleFont::handle_event() return 1; } -TitleText::TitleText(TitleMain *client, - TitleWindow *window, - int x, - int y, - int w, +TitleText::TitleText(TitleMain *client, + TitleWindow *window, + int x, + int y, + int w, int h) - : BC_ScrollTextBox(window, - x, - y, + : BC_ScrollTextBox(window, + x, + y, w, BC_TextBox::pixels_to_rows(window, MEDIUMFONT, h), client->config.text) @@ -682,8 +682,8 @@ TitleDropShadow::TitleDropShadow(TitleMain *client, TitleWindow *window, int x, (int64_t)client->config.dropshadow, (int64_t)0, (int64_t)1000, - x, - y, + x, + y, 70) { this->client = client; @@ -702,8 +702,8 @@ TitleX::TitleX(TitleMain *client, TitleWindow *window, int x, int y) (int64_t)client->config.x, (int64_t)-2048, (int64_t)2048, - x, - y, + x, + y, 60) { this->client = client; @@ -718,11 +718,11 @@ int TitleX::handle_event() TitleY::TitleY(TitleMain *client, TitleWindow *window, int x, int y) : BC_TumbleTextBox(window, - (int64_t)client->config.y, + (int64_t)client->config.y, (int64_t)-2048, (int64_t)2048, - x, - y, + x, + y, 60) { this->client = client; @@ -735,16 +735,16 @@ int TitleY::handle_event() return 1; } -TitleStrokeW::TitleStrokeW(TitleMain *client, - TitleWindow *window, - int x, +TitleStrokeW::TitleStrokeW(TitleMain *client, + TitleWindow *window, + int x, int y) : BC_TumbleTextBox(window, (float)client->config.stroke_width, (float)-2048, (float)2048, - x, - y, + x, + y, 60) { this->client = client; @@ -760,11 +760,11 @@ int TitleStrokeW::handle_event() TitleSpeed::TitleSpeed(TitleMain *client, TitleWindow *window, int x, int y) : BC_TumbleTextBox(window, - (float)client->config.pixels_per_second, + (float)client->config.pixels_per_second, (float)0, (float)1000, - x, - y, + x, + y, 70) { this->client = client;