X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbatchrender.C;h=9e4dbc3cdfe6ecf92eac4d69d80d318d524b04ac;hp=27cd834288e78a1d79c25bffbdee0eb6ec1b42fb;hb=81fc9cd689dd964a4736fa1f8986a64db6b4a937;hpb=09fd1385e786587799d1181fa5e94a32fe453af8 diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C index 27cd8342..9e4dbc3c 100644 --- a/cinelerra-5.1/cinelerra/batchrender.C +++ b/cinelerra-5.1/cinelerra/batchrender.C @@ -60,6 +60,8 @@ #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") @@ -197,7 +199,7 @@ BatchRenderThread::BatchRenderThread(MWindow *mwindow) default_job = 0; boot_defaults = 0; preferences = 0; - warn = 1; + warn = 0; render = 0; batch_path[0] = 0; do_farmed = 0; @@ -268,9 +270,9 @@ void BatchRenderThread::load_jobs(char *path, Preferences *preferences) while( !result ) { if( !(result = file.read_tag()) ) { if( file.tag.title_is("JOBS") ) { - if (mwindow->preferences->unsafe_gui) + if (mwindow && mwindow->preferences->unsafe_gui) warn = file.tag.get_property("WARN", 1); - if (!mwindow->preferences->unsafe_gui) + if (mwindow && !mwindow->preferences->unsafe_gui) warn = 0; } else if( file.tag.title_is("JOB") ) { @@ -296,7 +298,7 @@ void BatchRenderThread::save_jobs(char *path) { FileXML file; file.tag.set_title("JOBS"); - if (mwindow->preferences->unsafe_gui) + if (mwindow && mwindow->preferences->unsafe_gui) file.tag.set_property("WARN", warn); file.append_tag(); file.append_newline(); @@ -833,8 +835,10 @@ 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() / 2 - BC_GenericButton::calculate_w(this, _("Stop")) / 2; + x = get_w() / 3 - BC_GenericButton::calculate_w(this, _("Stop")) / 3; 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)); @@ -919,10 +923,12 @@ 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 / 2 - stop_button->get_w() / 2; + x = w / 3 - stop_button->get_w() / 3; 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; } @@ -1430,6 +1436,20 @@ 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 in default browser")); +} + +int BatchRenderHelp::handle_event() +{ + system("xdg-open 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")) {