From 8568f873b356bbe6b21dd591857e1d03e1739a4e Mon Sep 17 00:00:00 2001 From: Good Guy Date: Mon, 1 Feb 2021 16:54:21 -0700 Subject: [PATCH] re-thinking batch render help so revert to previous --- cinelerra-5.1/cinelerra/batchrender.C | 24 ++---------------------- cinelerra-5.1/cinelerra/batchrender.h | 10 ---------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C index 6238d6d6..b83f2d63 100644 --- a/cinelerra-5.1/cinelerra/batchrender.C +++ b/cinelerra-5.1/cinelerra/batchrender.C @@ -60,8 +60,6 @@ #include "dvdcreate.h" #include "bdcreate.h" -#include - int BatchRenderThread::column_widths[] = { 42, 42, 42, 222, 222, 150 }; const char *BatchRenderThread::column_titles[] = { N_("Enabled"), N_("Labeled"), N_("Farmed"), N_("Output"), N_("EDL"), N_("Elapsed") @@ -835,10 +833,8 @@ void BatchRenderGUI::create_objects() y += batch_list->get_h() + mwindow->theme->widget_border; add_subwindow(start_button = new BatchRenderStart(thread, x, y)); - x = get_w() / 3 - BC_GenericButton::calculate_w(this, _("Stop")) / 3; + x = get_w() / 2 - BC_GenericButton::calculate_w(this, _("Stop")) / 2; add_subwindow(stop_button = new BatchRenderStop(thread, x, y)); - x = get_w() / 1.5 - BC_GenericButton::calculate_w(this, _("?")) / 1.5; - add_subwindow(help_button = new BatchRenderHelp(thread, x, y)); x = get_w() - BC_GenericButton::calculate_w(this, _("Close")) - xs10; add_subwindow(cancel_button = new BatchRenderCancel(thread, x, y)); @@ -923,12 +919,10 @@ int BatchRenderGUI::resize_event(int w, int h) y += batch_list->get_h() + mwindow->theme->widget_border; start_button->reposition_window(x, y); - x = w / 3 - stop_button->get_w() / 3; + x = w / 2 - stop_button->get_w() / 2; stop_button->reposition_window(x, y); x = w - cancel_button->get_w() - xs10; cancel_button->reposition_window(x, y); - x = w / 1.5 - help_button->get_w() / 1.5; - help_button->reposition_window(x, y); return 1; } @@ -1436,20 +1430,6 @@ int BatchRenderCancel::keypress_event() return 0; } -//new help button -BatchRenderHelp::BatchRenderHelp(BatchRenderThread *thread, int x, int y) - : BC_GenericButton(x, y, _("?")) -{ - this->thread = thread; - set_tooltip(_("Open quick start guide")); -} - -int BatchRenderHelp::handle_event() -{ - system("$CIN_BROWSER file://$CIN_DAT/doc/help_br_index.html"); - return 0; -} - BatchRenderUseFarm::BatchRenderUseFarm(BatchRenderThread *thread, int x, int y, int *output) : BC_CheckBox(x, y, *output, _("Use render farm")) { diff --git a/cinelerra-5.1/cinelerra/batchrender.h b/cinelerra-5.1/cinelerra/batchrender.h index 2646b577..f84c15f0 100644 --- a/cinelerra-5.1/cinelerra/batchrender.h +++ b/cinelerra-5.1/cinelerra/batchrender.h @@ -314,15 +314,6 @@ public: int *output; }; -//new help button -class BatchRenderHelp : public BC_GenericButton -{ -public: - BatchRenderHelp(BatchRenderThread *thread, int x, int y); - int handle_event(); - BatchRenderThread *thread; -}; - class BatchRenderGUI : public BC_Window { public: @@ -371,7 +362,6 @@ public: BatchRenderCurrentEDL *use_current_edl; BatchRenderUpdateEDL *update_selected_edl; BatchRenderUseFarm *use_renderfarm; - BatchRenderHelp *help_button; }; -- 2.26.2