Andrew fixed Attach Transitions and added english tips

diff --git a/cinelerra-5.1/cinelerra/menuattachtransition.C b/cinelerra-5.1/cinelerra/menuattachtransition.C
index efd0a823b955d252f74c783ff702e90b11bd69c9..52e3dd389e3babe36df6311d946c91bdcde82970 100644 (file)
--- a/cinelerra-5.1/cinelerra/menuattachtransition.C
+++ b/cinelerra-5.1/cinelerra/menuattachtransition.C
@@ -73,9 +73,9 @@ void TransitionDialogThread::start()
 {
        if(!transition_names.total)
        {
 {
        if(!transition_names.total)
        {

-               strcpy(transition_title, data_type == TRACK_AUDIO ?
-                       mwindow->edl->session->default_atransition :
-                       mwindow->edl->session->default_vtransition);
+//             strcpy(transition_title, data_type == TRACK_AUDIO ?
+//                     mwindow->edl->session->default_atransition :
+//                     mwindow->edl->session->default_vtransition);

 
 // Construct listbox names
                ArrayList<PluginServer*> plugindb;
 
 // Construct listbox names
                ArrayList<PluginServer*> plugindb;


@@ -112,6 +112,17 @@ void TransitionDialogThread::handle_close_event(int result)
 {
        if(!result)
        {
 {
        if(!result)
        {

+       // Re-search plugindb and use untranslated plugin name
+                       ArrayList<PluginServer*> plugindb;
+               mwindow->search_plugindb(data_type == TRACK_AUDIO,
+                       data_type == TRACK_VIDEO, 0, 1, 0, plugindb);
+               for(int i = 0; i < plugindb.total; i++) {
+                       const char *title = _(plugindb.values[i]->title);
+                       if( !strcmp(transition_title, title)) {
+                       strcpy(transition_title, N_(plugindb.values[i]->title));
+                       }
+               }
+       

                mwindow->paste_transitions(data_type, transition_title);
        }
 }
                mwindow->paste_transitions(data_type, transition_title);
        }
 }


@@ -144,12 +155,26 @@ int TransitionSetDefault::handle_event()
        TransitionDialogThread *thread = (TransitionDialogThread *)window->thread;
        const char *transition_title = thread->transition_title;
        EDL *edl = window->mwindow->edl;
        TransitionDialogThread *thread = (TransitionDialogThread *)window->thread;
        const char *transition_title = thread->transition_title;
        EDL *edl = window->mwindow->edl;

+       
+       // Re-search plugindb and use untranslated plugin name
+               
+               ArrayList<PluginServer*> plugindb;
+               thread->mwindow->search_plugindb(thread->data_type == TRACK_AUDIO,
+                       thread->data_type == TRACK_VIDEO, 0, 1, 0, plugindb);
+               for(int i = 0; i < plugindb.total; i++) {
+                       const char *title = _(plugindb.values[i]->title);
+                       if( !strcmp(transition_title, title)) {
+                       strcpy(thread->transition_title_untranslated, N_(plugindb.values[i]->title));
+                       }
+               }
+       
+       

        switch( thread->data_type ) {
        case TRACK_AUDIO:
        switch( thread->data_type ) {
        case TRACK_AUDIO:

-               strcpy(edl->session->default_atransition, transition_title);
+               strcpy(edl->session->default_atransition, thread->transition_title_untranslated);

                break;
        case TRACK_VIDEO:
                break;
        case TRACK_VIDEO:

-               strcpy(edl->session->default_vtransition, transition_title);
+               strcpy(edl->session->default_vtransition, thread->transition_title_untranslated);

                break;
        }
        window->set_default_text->update(transition_title);
                break;
        }
        window->set_default_text->update(transition_title);

diff --git a/cinelerra-5.1/cinelerra/menuattachtransition.h b/cinelerra-5.1/cinelerra/menuattachtransition.h
index 00dcb62d68a1ebcfdb1458a382972af56508e4c0..71cfce6a54b4a4a69b1b88d29fe02ddf8b5553b4 100644 (file)
--- a/cinelerra-5.1/cinelerra/menuattachtransition.h
+++ b/cinelerra-5.1/cinelerra/menuattachtransition.h
@@ -77,6 +77,7 @@ public:
        void start();
 
        char transition_title[BCTEXTLEN];
        void start();
 
        char transition_title[BCTEXTLEN];

+       char transition_title_untranslated[BCTEXTLEN];

        MWindow *mwindow;
        int data_type;
        int number;
        MWindow *mwindow;
        int data_type;
        int number;

diff --git a/cinelerra-5.1/tips/tips.en b/cinelerra-5.1/tips/tips.en
index 781df9530a1292fbaef5db855648456f3c996537..bd7934f84710049bebf17b922fecba94f87d71ea 100644 (file)
--- a/cinelerra-5.1/tips/tips.en
+++ b/cinelerra-5.1/tips/tips.en
@@ -26,6 +26,14 @@ Use the +/- keys in the Compositor window to zoom in and out.
 Pressing Alt while clicking in the cropping window causes translation of
 all 4 points.
 
 Pressing Alt while clicking in the cropping window causes translation of
 all 4 points.
 

+Batch jobs in Batch Render, start rendering at the active region which
+will usually be the Insertion Pointer.  If you want the entire project
+to be rendered, be sure to set the pointer at the beginning when you save.
+
+When using Batch Render, define the region of the project you want to
+render by highlighting the desired section, setting in/out points, or
+moving the insertion pointer for the start point before saving your project.
+

 Pressing Tab over a track toggles the Record status.
 Pressing Shift-Tab over a track toggles the Record status of all the other tracks.
 
 Pressing Tab over a track toggles the Record status.
 Pressing Shift-Tab over a track toggles the Record status of all the other tracks.
 


@@ -38,10 +46,11 @@ Alt + right moves to the next edit handle.
 Settings->typeless keyframes allows keyframes from any track to be pasted on either
 audio or video tracks.
 
 Settings->typeless keyframes allows keyframes from any track to be pasted on either
 audio or video tracks.
 

-If colors in Compositor looks wrong, check "Setting/Preferences/Appearance" tab
-options YUV color space and YUV color range
+If colors in Compositor look wrong, check "Setting/Preferences/Appearance" tab
+options YUV color space and YUV color range.

 
 

-If you mistakingly saved empty backup, you still have  $HOME/.bcast5/backup.prev
+If you mistakingly saved empty backup and have performed no new operations, 
+you can still load $HOME/.bcast5/backup.prev to use as the backup.

 
 You can have more than one instance of Cinelerra-GG running.
 
 
 You can have more than one instance of Cinelerra-GG running.