From: Good Guy Date: Mon, 10 Jul 2017 01:55:51 +0000 (-0600) Subject: ff tooltip, shcmds doc, bld_prepare fix, edl load_xml fix X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=fee54016102a7a59d2181c8f16a7f2562f68540d;p=goodguy%2Fhistory.git ff tooltip, shcmds doc, bld_prepare fix, edl load_xml fix --- diff --git a/cinelerra-5.1/bld_scripts/bld_prepare.sh b/cinelerra-5.1/bld_scripts/bld_prepare.sh index 9b9a1056..8aea5d83 100755 --- a/cinelerra-5.1/bld_scripts/bld_prepare.sh +++ b/cinelerra-5.1/bld_scripts/bld_prepare.sh @@ -70,7 +70,7 @@ case "$dir" in libncurses5-dev libxinerama-dev libfreetype6-dev libxft-dev libgif-dev \ libtiff5-dev exuberant-ctags ttf-bitstream-vera xfonts-75dpi xfonts-100dpi \ fonts-dejavu libopenexr-dev festival libfftw3-dev gdb \ - libdc1394-22-dev libesd0-dev libflac-dev libjbig-dev libvdpau-dev + libdc1394-22-dev libesd0-dev libflac-dev libjbig-dev libvdpau-dev \ inkscape libsndfile1-dev libtheora-dev cmake udftools libxml2-utils git \ autoconf automake debhelper ;; diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C index 3dc2153e..9e14b082 100644 --- a/cinelerra-5.1/cinelerra/edl.C +++ b/cinelerra-5.1/cinelerra/edl.C @@ -301,7 +301,8 @@ int EDL::load_xml(FileXML *file, else if(file->tag.title_is("ASSETS")) { - if(load_flags & LOAD_ASSETS) + if((load_flags & LOAD_ASSETS) && + !parent_edl) assets->load(file, load_flags); else result = file->skip_tag(); diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C index 5301f7d1..2923c746 100644 --- a/cinelerra-5.1/cinelerra/file.C +++ b/cinelerra-5.1/cinelerra/file.C @@ -1672,6 +1672,7 @@ char File::cincfg_path[BCTEXTLEN]; char File::cinplg_path[BCTEXTLEN]; char File::cinlad_path[BCTEXTLEN]; char File::cinlcl_path[BCTEXTLEN]; +char File::cinbwr_path[BCTEXTLEN]; void File::init_cin_path() { @@ -1706,6 +1707,13 @@ void File::init_cin_path() getenv_path(env_path, LOCALE_DIR); snprintf(cinlcl_path, sizeof(cinlcl_path), "CIN_LOCALE=%s", env_path); putenv(cinlcl_path); + +#ifndef CIN_BROWSER +#define CIN_BROWSER "firefox" +#endif + getenv_path(env_path, CIN_BROWSER); + snprintf(cinbwr_path, sizeof(cinlcl_path), "CIN_BROWSER=%s", env_path); + putenv(cinbwr_path); } diff --git a/cinelerra-5.1/cinelerra/file.h b/cinelerra-5.1/cinelerra/file.h index a2ed78d5..08fdf709 100644 --- a/cinelerra-5.1/cinelerra/file.h +++ b/cinelerra-5.1/cinelerra/file.h @@ -321,6 +321,7 @@ public: static char cindat_path[BCTEXTLEN], cinlib_path[BCTEXTLEN]; static char cincfg_path[BCTEXTLEN], cinplg_path[BCTEXTLEN]; static char cinlad_path[BCTEXTLEN], cinlcl_path[BCTEXTLEN]; + static char cinbwr_path[BCTEXTLEN]; static const char *get_cin() { return getenv("CIN_PKG"); } static const char *get_cin_path() { return getenv("CIN_PATH"); } static const char *get_cindat_path() { return getenv("CIN_DAT"); } @@ -329,6 +330,7 @@ public: static const char *get_plugin_path() { return getenv("CIN_PLUGIN"); } static const char *get_ladspa_path() { return getenv("CIN_LADSPA"); } static const char *get_locale_path() { return getenv("CIN_LOCALE"); } + static const char *get_browser_path() { return getenv("CIN_BROWSER"); } static const char *default_probes[]; static const int nb_probes; diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C index a39e7f9e..78cbb2a1 100644 --- a/cinelerra-5.1/cinelerra/mwindowgui.C +++ b/cinelerra-5.1/cinelerra/mwindowgui.C @@ -2289,7 +2289,9 @@ FFMpegToggle::FFMpegToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y) { this->mwindow = mwindow; this->mbuttons = mbuttons; - set_tooltip( !get_value() ? _("Try FFMpeg first") : _("Try FFMpeg last") ); + set_tooltip(!get_value() ? + _("Currently: Try FFMpeg last\n Click to: Try FFMpeg first") : + _("Currently: Try FFMpeg first\n Click to: Try FFMpeg last")); } FFMpegToggle::~FFMpegToggle() @@ -2299,7 +2301,9 @@ FFMpegToggle::~FFMpegToggle() int FFMpegToggle::handle_event() { int ffmpeg_early_probe = get_value(); - set_tooltip( !ffmpeg_early_probe ? _("Try FFMpeg first") : _("Try FFMpeg last")); + set_tooltip(!ffmpeg_early_probe ? + _("Currently: Try FFMpeg last\n Click to: Try FFMpeg first") : + _("Currently: Try FFMpeg first\n Click to: Try FFMpeg last")); mwindow->preferences->set_file_probe_armed("FFMPEG_Early", ffmpeg_early_probe); mwindow->preferences->set_file_probe_armed("FFMPEG_Late", !ffmpeg_early_probe); diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C index 5bc21f62..0e2629ac 100644 --- a/cinelerra-5.1/cinelerra/preferences.C +++ b/cinelerra-5.1/cinelerra/preferences.C @@ -392,9 +392,10 @@ int Preferences::load_defaults(BC_Hash *defaults) shbtn_prefs.remove_all_objects(); int shbtns_total = defaults->get("SHBTNS_TOTAL", -1); if( shbtns_total < 0 ) { - shbtn_prefs.append(new ShBtnPref("Features5", "firefox file://$CIN_DAT/doc/Features5.pdf", 0)); - shbtn_prefs.append(new ShBtnPref("Online Help", "firefox https://cinelerra-cv.org/docs.php", 0)); - shbtn_prefs.append(new ShBtnPref("Orignal Manual", "firefox file://$CIN_DAT/doc/cinelerra.html", 0)); + shbtn_prefs.append(new ShBtnPref(_("Features5"), "$CIN_BROWSER file://$CIN_DAT/doc/Features5.pdf", 0)); + shbtn_prefs.append(new ShBtnPref(_("Online Help"), "$CIN_BROWSER https://cinelerra-cv.org/docs.php", 0)); + shbtn_prefs.append(new ShBtnPref(_("Original Manual"), "$CIN_BROWSER file://$CIN_DAT/doc/cinelerra.html", 0)); + shbtn_prefs.append(new ShBtnPref(_("Setting Shell Commands"), "$CIN_BROWSER file://$CIN_DAT/doc/ShellCmds.html", 0)); shbtns_total = 0; } for( int i=0; i + + + + + +The Shell Cmds popup menu items are configured in:
+Settings->Preferences->Interface->Shell Commands
+This runs a dialog that lets you Add/Del/Edit the items in the main menu popup.  Possible options are:
 
1) Add a new menu item/script: 
    click Add
    in the Label box, change the word "new" to the desired menu label
    in the Commands box, type the command lines to be included in the script
    (for example: Label => gimp; Commands => gimp)
    check-OK in the Commands window
    check-OK in the Shell window
    click on OK or Apply in the Preferences window (WILL NOT TAKE EFFECT UNTIL CLICK)
+2) Del to delete an existing menu item (for example manual):
     select to highlight an entry in the Cinelerra: Shell listbox
     click Del 
     check-OK in the Shell window
     click on OK or Apply in the Preferences window (the entry is destroyed)
+3) Edit an existing menu item:
    click Edit
    select to highlight an entry in the Cinelerra: Shell listbox
    click edit (the edit dialog appears)
    set the label and/or commands to the new desired values
    check-OK in the Shell window
    click on OK or Apply in the Preferences window
+
+

Document Outline

+ +
+ + diff --git a/cinelerra-5.1/doc/ShellCmds.pdf b/cinelerra-5.1/doc/ShellCmds.pdf new file mode 100644 index 00000000..38ff4b0f Binary files /dev/null and b/cinelerra-5.1/doc/ShellCmds.pdf differ