RafaMar + programmer friend Help button in Batch Render addition

diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C
index b83f2d6324ce75b3967c9480b2230d1c98186ce0..6238d6d6808386c2aaf3edd04c2b488b363e4cb5 100644 (file)
--- 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 "dvdcreate.h"
 #include "bdcreate.h"
 

+#include <stdlib.h>
+

 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")
 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")


@@ -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));
        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));
        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));
 
        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);
        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);
        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;
 }
 
        return 1;
 }
 


@@ -1430,6 +1436,20 @@ int BatchRenderCancel::keypress_event()
        return 0;
 }
 
        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"))
 {
 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 57309895827b3d42faef5d3c3b86d1cdf108a79f..2646b577c48855b3b83e595ea1a4afbdf148eb10 100644 (file)
--- a/cinelerra-5.1/cinelerra/batchrender.h
+++ b/cinelerra-5.1/cinelerra/batchrender.h
@@ -314,6 +314,14 @@ public:
        int *output;
 };
 
        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
 {
 
 class BatchRenderGUI : public BC_Window
 {


@@ -363,6 +371,7 @@ public:
        BatchRenderCurrentEDL *use_current_edl;
        BatchRenderUpdateEDL *update_selected_edl;
        BatchRenderUseFarm *use_renderfarm;
        BatchRenderCurrentEDL *use_current_edl;
        BatchRenderUpdateEDL *update_selected_edl;
        BatchRenderUseFarm *use_renderfarm;

+       BatchRenderHelp *help_button;

 };
 
 
 };
 
 

diff --git a/cinelerra-5.1/doc/Makefile b/cinelerra-5.1/doc/Makefile
index 882cb8dd7e4196819bd60c823999055220923d44..3b5d7350d35612213d2aaf3a7aa67aef88aa8e1e 100644 (file)
--- a/cinelerra-5.1/doc/Makefile
+++ b/cinelerra-5.1/doc/Makefile
@@ -54,6 +54,7 @@ install:      all
        mkdir -p $(TARGET_DIR)
        cp -a *.png $(TARGET_DIR)/.
        cp -a ShellCmds*.* $(TARGET_DIR)/.
        mkdir -p $(TARGET_DIR)
        cp -a *.png $(TARGET_DIR)/.
        cp -a ShellCmds*.* $(TARGET_DIR)/.

+       cp -a help_br_*.* $(TARGET_DIR)/.

        cp -a cinelerra.html $(TARGET_DIR)/.
        cp -a shortcuts.html $(TARGET_DIR)/.
        cp -a RenderMux.sh $(TARGET_DIR)/.
        cp -a cinelerra.html $(TARGET_DIR)/.
        cp -a shortcuts.html $(TARGET_DIR)/.
        cp -a RenderMux.sh $(TARGET_DIR)/.